From 84941bcc9f25cbe3fd3b2604080d0a1cfd8fbaa7 Mon Sep 17 00:00:00 2001
From: peterbell10 <peterbell10@live.co.uk>
Date: Wed, 30 Aug 2017 15:00:06 +0100
Subject: Update mbedtls to 2.5.1 (#3964)

* Renaming changes:
  * macro prefix "POLARSSL" -> "MBEDTLS"
  * functions now prefixed with "mbedtls_"
  * rename PolarSSL++ -> mbedTLS++
  * rename polarssl submodule

* Use mbedtls' AES-CFB8 implementation.

* Add cSslConfig to wrap mbedtls_ssl_config

* Update cTCPLink and cBlockingSslClientSocket to use cSslConfig

* Use cSslConfig in cHTTPServer

* Use cSslConfig for cMojangAPI::SecureRequest

* CI Fixes

* Set -fomit-frame-pointer on the right target
---
 src/mbedTLS++/CryptoKey.h | 76 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 76 insertions(+)
 create mode 100644 src/mbedTLS++/CryptoKey.h

(limited to 'src/mbedTLS++/CryptoKey.h')

diff --git a/src/mbedTLS++/CryptoKey.h b/src/mbedTLS++/CryptoKey.h
new file mode 100644
index 000000000..1a74090ac
--- /dev/null
+++ b/src/mbedTLS++/CryptoKey.h
@@ -0,0 +1,76 @@
+
+// CryptoKey.h
+
+// Declares the cCryptoKey class representing a RSA public key in mbedTLS
+
+
+
+
+
+#pragma once
+
+#include "CtrDrbgContext.h"
+#include "mbedtls/pk.h"
+
+
+
+
+
+class cCryptoKey
+{
+	friend class cSslConfig;
+
+public:
+	/** Constructs an empty key instance. Before use, it needs to be filled by ParsePublic() or ParsePrivate() */
+	cCryptoKey(void);
+
+	/** Constructs the public key out of the DER- or PEM-encoded pubkey data */
+	cCryptoKey(const AString & a_PublicKeyData);
+
+	/** Constructs the private key out of the DER- or PEM-encoded privkey data, with the specified password.
+	If a_Password is empty, no password is assumed. */
+	cCryptoKey(const AString & a_PrivateKeyData, const AString & a_Password);
+
+	~cCryptoKey();
+
+	/** Decrypts the data using the stored public key
+	Both a_EncryptedData and a_DecryptedData must be at least <KeySizeBytes> bytes large.
+	Returns the number of bytes decrypted, or negative number for error. */
+	int Decrypt(const Byte * a_EncryptedData, size_t a_EncryptedLength, Byte * a_DecryptedData, size_t a_DecryptedMaxLength);
+
+	/** Encrypts the data using the stored public key
+	Both a_EncryptedData and a_DecryptedData must be at least <KeySizeBytes> bytes large.
+	Returns the number of bytes decrypted, or negative number for error. */
+	int Encrypt(const Byte * a_PlainData, size_t a_PlainLength, Byte * a_EncryptedData, size_t a_EncryptedMaxLength);
+
+	/** Parses the specified data into a public key representation.
+	The key can be DER- or PEM-encoded.
+	Returns 0 on success, mbedTLS error code on failure. */
+	int ParsePublic(const void * a_Data, size_t a_NumBytes);
+
+	/** Parses the specified data into a private key representation.
+	If a_Password is empty, no password is assumed.
+	The key can be DER- or PEM-encoded.
+	Returns 0 on success, mbedTLS error code on failure. */
+	int ParsePrivate(const void * a_Data, size_t a_NumBytes, const AString & a_Password);
+
+	/** Returns true if the contained key is valid. */
+	bool IsValid(void) const;
+
+protected:
+	/** The mbedTLS representation of the key data */
+	mbedtls_pk_context m_Pk;
+
+	/** The random generator used in encryption and decryption */
+	cCtrDrbgContext m_CtrDrbg;
+
+
+	/** Returns the internal context ptr. Only use in mbedTLS API calls. */
+	mbedtls_pk_context * GetInternal(void) { return &m_Pk; }
+} ;
+
+typedef std::shared_ptr<cCryptoKey> cCryptoKeyPtr;
+
+
+
+
-- 
cgit v1.2.3