Skip to content

Commit 2eb9eeb

Browse files
Update botan {en,de}crypt with OAEP SHA-2
1 parent 8498fa2 commit 2eb9eeb

File tree

1 file changed

+28
-4
lines changed

1 file changed

+28
-4
lines changed

src/lib/crypto/BotanRSA.cpp

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -761,8 +761,20 @@ bool BotanRSA::encrypt(PublicKey* publicKey, const ByteString& data,
761761
case AsymMech::RSA_PKCS:
762762
eme = "PKCS1v15";
763763
break;
764-
case AsymMech::RSA_PKCS_OAEP:
765-
eme = "EME1(SHA-160)";
764+
case AsymMech::RSA_PKCS_OAEP_SHA1:
765+
eme = "OAEP(SHA-160)";
766+
break;
767+
case AsymMech::RSA_PKCS_OAEP_SHA224:
768+
eme = "OAEP(SHA-224)";
769+
break;
770+
case AsymMech::RSA_PKCS_OAEP_SHA256:
771+
eme = "OAEP(SHA-256)";
772+
break;
773+
case AsymMech::RSA_PKCS_OAEP_SHA384:
774+
eme = "OAEP(SHA-384)";
775+
break;
776+
case AsymMech::RSA_PKCS_OAEP_SHA512:
777+
eme = "OAEP(SHA-512)";
766778
break;
767779
case AsymMech::RSA:
768780
eme = "Raw";
@@ -840,8 +852,20 @@ bool BotanRSA::decrypt(PrivateKey* privateKey, const ByteString& encryptedData,
840852
case AsymMech::RSA_PKCS:
841853
eme = "PKCS1v15";
842854
break;
843-
case AsymMech::RSA_PKCS_OAEP:
844-
eme = "EME1(SHA-160)";
855+
case AsymMech::RSA_PKCS_OAEP_SHA1:
856+
eme = "OAEP(SHA-160)";
857+
break;
858+
case AsymMech::RSA_PKCS_OAEP_SHA224:
859+
eme = "OAEP(SHA-224)";
860+
break;
861+
case AsymMech::RSA_PKCS_OAEP_SHA256:
862+
eme = "OAEP(SHA-256)";
863+
break;
864+
case AsymMech::RSA_PKCS_OAEP_SHA384:
865+
eme = "OAEP(SHA-384)";
866+
break;
867+
case AsymMech::RSA_PKCS_OAEP_SHA512:
868+
eme = "OAEP(SHA-512)";
845869
break;
846870
case AsymMech::RSA:
847871
eme = "Raw";

0 commit comments

Comments
 (0)