diff options
Diffstat (limited to 'checks')
| -rw-r--r-- | checks/pk.cpp | 12 | ||||
| -rw-r--r-- | checks/pk_bench.cpp | 8 |
2 files changed, 10 insertions, 10 deletions
diff --git a/checks/pk.cpp b/checks/pk.cpp index cee298f6b..a69fa7bc7 100644 --- a/checks/pk.cpp +++ b/checks/pk.cpp @@ -238,8 +238,8 @@ u32bit validate_rsa_enc_pkcs8(const std::string& algo, std::string eme = algo.substr(12, std::string::npos); - PK_Encryptor_MR_with_EME e(*rsapub, eme); - PK_Decryptor_MR_with_EME d(*rsapriv, eme); + PK_Encryptor_EME e(*rsapub, eme); + PK_Decryptor_EME d(*rsapriv, eme); bool failure = false; validate_encryption(e, d, algo, str[1], str[2], str[3], failure); @@ -265,8 +265,8 @@ u32bit validate_rsa_enc(const std::string& algo, std::string eme = algo.substr(6, std::string::npos); - PK_Encryptor_MR_with_EME e(pubkey, eme); - PK_Decryptor_MR_with_EME d(privkey, eme); + PK_Encryptor_EME e(pubkey, eme); + PK_Decryptor_EME d(privkey, eme); bool failure = false; validate_encryption(e, d, algo, str[3], str[4], str[5], failure); @@ -291,12 +291,12 @@ u32bit validate_elg_enc(const std::string& algo, std::string eme = algo.substr(8, std::string::npos); - PK_Decryptor_MR_with_EME d(privkey, eme); + PK_Decryptor_EME d(privkey, eme); bool failure = false; if(str.size() == 7) { - PK_Encryptor_MR_with_EME e(pubkey, eme); + PK_Encryptor_EME e(pubkey, eme); validate_encryption(e, d, algo, str[4], str[5], str[6], failure); } else diff --git a/checks/pk_bench.cpp b/checks/pk_bench.cpp index 0cc1bea3a..c9e79e997 100644 --- a/checks/pk_bench.cpp +++ b/checks/pk_bench.cpp @@ -214,8 +214,8 @@ void benchmark_rsa(RandomNumberGenerator& rng, while(verify_timer.seconds() < seconds || sig_timer.seconds() < seconds) { - PK_Encryptor_MR_with_EME enc(key, enc_padding); - PK_Decryptor_MR_with_EME dec(key, enc_padding); + PK_Encryptor_EME enc(key, enc_padding); + PK_Decryptor_EME dec(key, enc_padding); benchmark_enc_dec(enc, dec, enc_timer, dec_timer, rng, 10000, seconds); @@ -675,8 +675,8 @@ void benchmark_elg(RandomNumberGenerator& rng, ElGamal_PrivateKey key(rng, group); keygen_timer.stop(); - PK_Decryptor_MR_with_EME dec(key, padding); - PK_Encryptor_MR_with_EME enc(key, padding); + PK_Decryptor_EME dec(key, padding); + PK_Encryptor_EME enc(key, padding); benchmark_enc_dec(enc, dec, enc_timer, dec_timer, rng, 1000, seconds); |