diff options
| author | Jack Lloyd <[email protected]> | 2018-02-08 07:34:10 -0500 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2018-02-13 07:48:56 -0500 |
| commit | 2a9e0a9cd5aacdb74cb12e0faaa9f8f5342549c7 (patch) | |
| tree | 6c20361c4febfc82fd5c14ada03aff41e1d57d48 /src/lib | |
| parent | af6b860d327e523503da694a7dca9316b6501e34 (diff) | |
Remove house curve support
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/asn1/oids.cpp | 10 | ||||
| -rw-r--r-- | src/lib/pubkey/ec_group/ec_named.cpp | 3 | ||||
| -rw-r--r-- | src/lib/tls/tls_algos.cpp | 5 | ||||
| -rw-r--r-- | src/lib/tls/tls_algos.h | 4 |
4 files changed, 0 insertions, 22 deletions
diff --git a/src/lib/asn1/oids.cpp b/src/lib/asn1/oids.cpp index b9ba1f858..59ce08b35 100644 --- a/src/lib/asn1/oids.cpp +++ b/src/lib/asn1/oids.cpp @@ -44,11 +44,6 @@ class OID_Map { const std::string oid_str = oid.as_string(); -#if defined(BOTAN_HOUSE_ECC_CURVE_NAME) - if(oid_str == BOTAN_HOUSE_ECC_CURVE_OID) - return BOTAN_HOUSE_ECC_CURVE_NAME; -#endif - lock_guard_type<mutex_type> lock(m_mutex); auto i = m_oid2str.find(oid_str); @@ -60,11 +55,6 @@ class OID_Map OID lookup(const std::string& str) { -#if defined(BOTAN_HOUSE_ECC_CURVE_NAME) - if(str == BOTAN_HOUSE_ECC_CURVE_NAME) - return OID(BOTAN_HOUSE_ECC_CURVE_OID); -#endif - lock_guard_type<mutex_type> lock(m_mutex); auto i = m_str2oid.find(str); if(i != m_str2oid.end()) diff --git a/src/lib/pubkey/ec_group/ec_named.cpp b/src/lib/pubkey/ec_group/ec_named.cpp index cfab1fafd..ba91b5eaa 100644 --- a/src/lib/pubkey/ec_group/ec_named.cpp +++ b/src/lib/pubkey/ec_group/ec_named.cpp @@ -283,9 +283,6 @@ const std::set<std::string>& EC_Group::known_named_groups() "gost_256A", "frp256v1", "sm2p256v1" -#if defined(BOTAN_HOUSE_ECC_CURVE_NAME) - ,BOTAN_HOUSE_ECC_CURVE_NAME -#endif }; return named_groups; } diff --git a/src/lib/tls/tls_algos.cpp b/src/lib/tls/tls_algos.cpp index ce32963b7..db75bf14e 100644 --- a/src/lib/tls/tls_algos.cpp +++ b/src/lib/tls/tls_algos.cpp @@ -182,11 +182,6 @@ std::string group_param_to_string(Group_Params group) case Group_Params::FFDHE_8192: return "ffdhe/ietf/8192"; -#if defined(BOTAN_HOUSE_ECC_CURVE_NAME) - case BOTAN_HOUSE_ECC_CURVE_TLS_ID: - return BOTAN_HOUSE_ECC_CURVE_NAME; -#endif - default: return ""; } diff --git a/src/lib/tls/tls_algos.h b/src/lib/tls/tls_algos.h index 9ad1a7a85..e0b2dabc2 100644 --- a/src/lib/tls/tls_algos.h +++ b/src/lib/tls/tls_algos.h @@ -134,10 +134,6 @@ enum class Group_Params : uint16_t { FFDHE_4096 = 258, FFDHE_6144 = 259, FFDHE_8192 = 260, - -#if defined(BOTAN_HOUSE_ECC_CURVE_NAME) - HOUSE_CURVE = BOTAN_HOUSE_ECC_CURVE_TLS_ID, -#endif }; std::string group_param_to_string(Group_Params group); |