summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2014-01-25 19:19:17 +0100
committermadmaxoft <github@xoft.cz>2014-01-25 19:19:17 +0100
commitca0e51d89c5b3979f38918b3df7e0f9137f251ce (patch)
tree065d0a7a84fe04b91113893f95b67064d64ec58f
parentMerged branch 'master' into ChangeToPolarSSL. (diff)
downloadcuberite-ca0e51d89c5b3979f38918b3df7e0f9137f251ce.tar
cuberite-ca0e51d89c5b3979f38918b3df7e0f9137f251ce.tar.gz
cuberite-ca0e51d89c5b3979f38918b3df7e0f9137f251ce.tar.bz2
cuberite-ca0e51d89c5b3979f38918b3df7e0f9137f251ce.tar.lz
cuberite-ca0e51d89c5b3979f38918b3df7e0f9137f251ce.tar.xz
cuberite-ca0e51d89c5b3979f38918b3df7e0f9137f251ce.tar.zst
cuberite-ca0e51d89c5b3979f38918b3df7e0f9137f251ce.zip
-rw-r--r--src/Crypto.cpp34
-rw-r--r--src/Crypto.h5
2 files changed, 39 insertions, 0 deletions
diff --git a/src/Crypto.cpp b/src/Crypto.cpp
index 5ad866f34..2045d0385 100644
--- a/src/Crypto.cpp
+++ b/src/Crypto.cpp
@@ -196,6 +196,40 @@ int cRSAPrivateKey::Decrypt(const Byte * a_EncryptedData, size_t a_EncryptedLeng
+int cRSAPrivateKey::Encrypt(const Byte * a_PlainData, size_t a_PlainLength, Byte * a_EncryptedData, size_t a_EncryptedMaxLength)
+{
+ if (a_EncryptedMaxLength < m_Rsa.len)
+ {
+ LOGD("%s: Invalid a_EncryptedMaxLength: got %u, exp at least %u",
+ __FUNCTION__, (unsigned)a_EncryptedMaxLength, (unsigned)(m_Rsa.len)
+ );
+ ASSERT(!"Invalid a_DecryptedMaxLength!");
+ return -1;
+ }
+ if (a_PlainLength < m_Rsa.len)
+ {
+ LOGD("%s: Invalid a_PlainLength: got %u, exp at least %u",
+ __FUNCTION__, (unsigned)a_PlainLength, (unsigned)(m_Rsa.len)
+ );
+ ASSERT(!"Invalid a_PlainLength!");
+ return -1;
+ }
+ size_t DecryptedLength;
+ int res = rsa_pkcs1_encrypt(
+ &m_Rsa, ctr_drbg_random, &m_Ctr_drbg, RSA_PUBLIC,
+ a_PlainLength, a_PlainData, a_EncryptedData
+ );
+ if (res != 0)
+ {
+ return -1;
+ }
+ return (int)DecryptedLength;
+}
+
+
+
+
+
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// cAESCFBDecryptor:
diff --git a/src/Crypto.h b/src/Crypto.h
index 6b576f55b..a97f34fbf 100644
--- a/src/Crypto.h
+++ b/src/Crypto.h
@@ -43,6 +43,11 @@ public:
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 RSAES-PKCS#1 algorithm.
+ 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);
+
protected:
rsa_context m_Rsa;
entropy_context m_Entropy;