diff options
| author | Jack Lloyd <[email protected]> | 2019-08-04 08:26:06 -0400 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2019-08-04 16:26:50 -0400 |
| commit | 0006bd1db9a96c294f2da852218d3f8579f422a9 (patch) | |
| tree | 15600a4e8369eb167be052e8343c58dcb6693a3a /src/lib/pk_pad | |
| parent | 247df8cae3fbec8d9b608c5dc8b42a4f6bdeef8b (diff) | |
Reduce usage of oids.h with the addition of some helpers on OID
Diffstat (limited to 'src/lib/pk_pad')
| -rw-r--r-- | src/lib/pk_pad/emsa1/emsa1.cpp | 3 | ||||
| -rw-r--r-- | src/lib/pk_pad/emsa_pkcs1/emsa_pkcs1.cpp | 3 | ||||
| -rw-r--r-- | src/lib/pk_pad/emsa_pssr/pssr.cpp | 1 |
3 files changed, 2 insertions, 5 deletions
diff --git a/src/lib/pk_pad/emsa1/emsa1.cpp b/src/lib/pk_pad/emsa1/emsa1.cpp index 295d23cd0..f7293db27 100644 --- a/src/lib/pk_pad/emsa1/emsa1.cpp +++ b/src/lib/pk_pad/emsa1/emsa1.cpp @@ -7,7 +7,6 @@ #include <botan/emsa1.h> #include <botan/exceptn.h> -#include <botan/oids.h> #include <botan/pk_keys.h> #include <botan/internal/padding.h> @@ -109,7 +108,7 @@ AlgorithmIdentifier EMSA1::config_for_x509(const Private_Key& key, " not supported for signature algorithm " + key.algo_name()); } - const OID oid = OIDS::str2oid_or_throw(key.algo_name() + "/" + name()); + const OID oid = OID::from_string(key.algo_name() + "/" + name()); const std::string algo_name = key.algo_name(); std::vector<uint8_t> parameters; diff --git a/src/lib/pk_pad/emsa_pkcs1/emsa_pkcs1.cpp b/src/lib/pk_pad/emsa_pkcs1/emsa_pkcs1.cpp index e17858598..85556a39e 100644 --- a/src/lib/pk_pad/emsa_pkcs1/emsa_pkcs1.cpp +++ b/src/lib/pk_pad/emsa_pkcs1/emsa_pkcs1.cpp @@ -8,7 +8,6 @@ #include <botan/emsa_pkcs1.h> #include <botan/hash_id.h> #include <botan/exceptn.h> -#include <botan/oids.h> #include <botan/pk_keys.h> #include <botan/internal/padding.h> @@ -99,7 +98,7 @@ AlgorithmIdentifier EMSA_PKCS1v15::config_for_x509(const Private_Key& key, // for RSA PKCSv1.5 parameters "SHALL" be NULL - const OID oid = OIDS::str2oid_or_throw(key.algo_name() + "/" + name()); + const OID oid = OID::from_string(key.algo_name() + "/" + name()); return AlgorithmIdentifier(oid, AlgorithmIdentifier::USE_NULL_PARAM); } diff --git a/src/lib/pk_pad/emsa_pssr/pssr.cpp b/src/lib/pk_pad/emsa_pssr/pssr.cpp index cc1aed814..652a7628b 100644 --- a/src/lib/pk_pad/emsa_pssr/pssr.cpp +++ b/src/lib/pk_pad/emsa_pssr/pssr.cpp @@ -10,7 +10,6 @@ #include <botan/rng.h> #include <botan/mgf1.h> #include <botan/internal/bit_ops.h> -#include <botan/oids.h> #include <botan/der_enc.h> #include <botan/pk_keys.h> #include <botan/internal/padding.h> |