diff options
| author | Jack Lloyd <[email protected]> | 2018-02-19 12:38:11 -0500 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2018-02-19 12:38:11 -0500 |
| commit | bf337951e36f1be8f64f4ea2aa3d401cfb591f6d (patch) | |
| tree | 1fbf9d5f6a3a56c80124c913b5f3e7a0ad680b69 /src/lib/asn1 | |
| parent | 9792c0eb8203a4982d28afebb19b027444753f90 (diff) | |
| parent | 9abd3b8ac7927c40082e4e2956bdce7f5254fdea (diff) | |
Merge GH #1448 Support custom curves in TLS handshake
Diffstat (limited to 'src/lib/asn1')
| -rw-r--r-- | src/lib/asn1/oids.cpp | 10 |
1 files changed, 0 insertions, 10 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()) |