diff options
| author | Jack Lloyd <[email protected]> | 2019-06-23 07:36:47 -0400 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2019-06-23 07:39:54 -0400 |
| commit | 54425979e7297357e28108f0830910f497384ac7 (patch) | |
| tree | c2b1118453b20d9e9c410cbb5d46fb40c22ab06a /src/lib/pubkey | |
| parent | db1d2a16973cf71e19a240d305309aefe15effed (diff) | |
Change XMSS OIDs and feature macro name
Since draft6 and final RFC are not compatible ...
Diffstat (limited to 'src/lib/pubkey')
| -rw-r--r-- | src/lib/pubkey/pk_algs.cpp | 8 | ||||
| -rw-r--r-- | src/lib/pubkey/xmss/info.txt | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/pubkey/pk_algs.cpp b/src/lib/pubkey/pk_algs.cpp index db4638fe1..16bfbfb1f 100644 --- a/src/lib/pubkey/pk_algs.cpp +++ b/src/lib/pubkey/pk_algs.cpp @@ -65,7 +65,7 @@ #include <botan/mceliece.h> #endif -#if defined(BOTAN_HAS_XMSS) +#if defined(BOTAN_HAS_XMSS_RFC8391) #include <botan/xmss.h> #endif @@ -155,7 +155,7 @@ load_public_key(const AlgorithmIdentifier& alg_id, return std::unique_ptr<Public_Key>(new SM2_PublicKey(alg_id, key_bits)); #endif -#if defined(BOTAN_HAS_XMSS) +#if defined(BOTAN_HAS_XMSS_RFC8391) if(alg_name == "XMSS") return std::unique_ptr<Public_Key>(new XMSS_PublicKey(key_bits)); #endif @@ -236,7 +236,7 @@ load_private_key(const AlgorithmIdentifier& alg_id, return std::unique_ptr<Private_Key>(new ElGamal_PrivateKey(alg_id, key_bits)); #endif -#if defined(BOTAN_HAS_XMSS) +#if defined(BOTAN_HAS_XMSS_RFC8391) if(alg_name == "XMSS") return std::unique_ptr<Private_Key>(new XMSS_PrivateKey(key_bits)); #endif @@ -314,7 +314,7 @@ create_private_key(const std::string& alg_name, } #endif -#if defined(BOTAN_HAS_XMSS) +#if defined(BOTAN_HAS_XMSS_RFC8391) if(alg_name == "XMSS") { return std::unique_ptr<Private_Key>( diff --git a/src/lib/pubkey/xmss/info.txt b/src/lib/pubkey/xmss/info.txt index 154401af7..72b127831 100644 --- a/src/lib/pubkey/xmss/info.txt +++ b/src/lib/pubkey/xmss/info.txt @@ -1,5 +1,5 @@ <defines> -XMSS -> 20161008 +XMSS_RFC8391 -> 20190623 </defines> <header:public> |