From 946ac84930edecd917d4b99896ad4448e629b1f0 Mon Sep 17 00:00:00 2001 From: René Korthaus Date: Thu, 3 Nov 2016 21:57:53 +0100 Subject: Change oids.py and regenerate oids.cpp --- src/lib/asn1/oids.cpp | 2 +- src/scripts/oids.py | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/lib/asn1/oids.cpp b/src/lib/asn1/oids.cpp index 1ad2d06f1..b07e8a8b9 100644 --- a/src/lib/asn1/oids.cpp +++ b/src/lib/asn1/oids.cpp @@ -1,7 +1,7 @@ /* * OID maps * -* This file was automatically generated by ./src/scripts/oids.py on 2016-11-02 +* This file was automatically generated by ./src/scripts/oids.py on 2016-11-03 * * Botan is released under the Simplified BSD License (see license.txt) */ diff --git a/src/scripts/oids.py b/src/scripts/oids.py index e3c232211..8d5cd6d8f 100755 --- a/src/scripts/oids.py +++ b/src/scripts/oids.py @@ -94,12 +94,22 @@ std::string lookup(const OID& oid) { const std::string oid_str = oid.as_string(); %s + +#if defined(BOTAN_HOUSE_ECC_CURVE_NAME) + if(oid_str == BOTAN_HOUSE_ECC_CURVE_OID) return BOTAN_HOUSE_ECC_CURVE_NAME; +#endif + return std::string(); } OID lookup(const std::string& name) { %s + +#if defined(BOTAN_HOUSE_ECC_CURVE_NAME) + if(name == BOTAN_HOUSE_ECC_CURVE_NAME) return OID(BOTAN_HOUSE_ECC_CURVE_OID); +#endif + return OID(); } -- cgit v1.2.3