diff options
| author | Jack Lloyd <[email protected]> | 2019-08-04 06:32:32 -0400 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2019-08-04 16:26:48 -0400 |
| commit | b7434defb0769f1f06a7b55f5435ceb690856713 (patch) | |
| tree | 6e4e86f22dc01b75db8a59ad86f8b7261791a840 /src/cli | |
| parent | 67fddcd63e065eaf8bafbb15f615cbf203a305bd (diff) | |
Deprecate and replace OIDS::lookup
Diffstat (limited to 'src/cli')
| -rw-r--r-- | src/cli/pk_crypt.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/cli/pk_crypt.cpp b/src/cli/pk_crypt.cpp index b7fd62ac1..2189690bd 100644 --- a/src/cli/pk_crypt.cpp +++ b/src/cli/pk_crypt.cpp @@ -59,7 +59,7 @@ class PK_Encrypt final : public Command if(!aead) throw CLI_Usage_Error("The AEAD '" + aead_algo + "' is not available"); - const Botan::OID aead_oid = Botan::OIDS::lookup(aead_algo); + const Botan::OID aead_oid = Botan::OIDS::str2oid_or_empty(aead_algo); if(aead_oid.empty()) throw CLI_Usage_Error("No OID defined for AEAD '" + aead_algo + "'"); @@ -159,14 +159,14 @@ class PK_Decrypt final : public Command return set_return_code(1); } - const std::string aead_algo = Botan::OIDS::lookup(aead_oid); + const std::string aead_algo = Botan::OIDS::oid2str_or_empty(aead_oid); if(aead_algo == "") { error_output() << "Ciphertext was encrypted with an unknown algorithm"; return set_return_code(1); } - if(pk_alg_id.get_oid() != Botan::OIDS::lookup("RSA/OAEP")) + if(pk_alg_id.get_oid() != Botan::OIDS::str2oid_or_throw("RSA/OAEP")) { error_output() << "Ciphertext was encrypted with something other than RSA/OAEP"; return set_return_code(1); @@ -175,7 +175,7 @@ class PK_Decrypt final : public Command Botan::AlgorithmIdentifier oaep_hash_id; Botan::BER_Decoder(pk_alg_id.get_parameters()).decode(oaep_hash_id); - const std::string oaep_hash = Botan::OIDS::lookup(oaep_hash_id.get_oid()); + const std::string oaep_hash = Botan::OIDS::oid2str_or_empty(oaep_hash_id.get_oid()); if(oaep_hash.empty()) { |