1 files changed, 30 insertions, 2 deletions

diff --git a/src/PolarSSL++/PublicKey.h b/src/PolarSSL++/PublicKey.h
index 5a0a57147..df52a4143 100644
--- a/src/PolarSSL++/PublicKey.h
+++ b/src/PolarSSL++/PublicKey.h
@@ -18,9 +18,18 @@
 
 class cPublicKey
 {
+	friend class cSslContext;
+	
 public:
-	/** Constructs the public key out of the DER-encoded pubkey data */
-	cPublicKey(const AString & a_PublicKeyDER);
+	/** Constructs an empty key instance. Before use, it needs to be filled by ParsePublic() or ParsePrivate() */
+	cPublicKey(void);
+	
+	/** Constructs the public key out of the DER- or PEM-encoded pubkey data */
+	cPublicKey(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. */
+	cPublicKey(const AString & a_PrivateKeyData, const AString & a_Password);
 	
 	~cPublicKey();
 	
@@ -33,6 +42,20 @@ public:
 	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, PolarSSL 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, PolarSSL 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 public key PolarSSL representation */
@@ -40,8 +63,13 @@ protected:
 	
 	/** The random generator used in encryption and decryption */
 	cCtrDrbgContext m_CtrDrbg;
+	
+	
+	/** Returns the internal context ptr. Only use in PolarSSL API calls. */
+	pk_context * GetInternal(void) { return &m_Pk; }
 } ;
 
+typedef SharedPtr<cPublicKey> cPublicKeyPtr;