Merge pull request #225 from christianpaquin/cp-issue219

Added macro to determine if a NID is an OQS KEM/SIG one.

Author: christianpaquin

include/openssl/evp.h

@@ -104,6 +104,8 @@
 # define EVP_PKEY_RSA3072_SPHINCSHARAKA128FROBUST NID_rsa3072_sphincsharaka128frobust
 #define OQS_OPENSSL_SIG_algs_length 38
 #define OQS_OPENSSL_KEM_algs_length 39
+#define IS_OQS_OPENSSL_KEM_NID(a) ((a >= NID_oqs_kem_default) && (a <= NID_p521_papabearephem))
+#define IS_OQS_OPENSSL_SIG_NID(a) ((a >= NID_oqs_sig_default) && (a <= NID_rsa3072_sphincsharaka128frobust))
 /////// OQS_TEMPLATE_FRAGMENT_DEFINE_EVP_PKEYS_END
 const char *OQSKEM_options(void);
 const char *OQSSIG_options(void);

oqs-template/include/openssl/evp.h/define_evp_pkeys.fragment

@@ -11,4 +11,17 @@
 {%- endfor %}
 #define OQS_OPENSSL_SIG_algs_length {{ count.val }}
 #define OQS_OPENSSL_KEM_algs_length {{ config['kems']|length }}
+{%- set last_kem_hybrid_level = (config['kems']|last)['bit_security'] -%}
+{%- if last_kem_hybrid_level == 128 -%}
+   {%- set hybrid_curve = "p256_" -%}
+{%- elif last_kem_hybrid_level == 192 -%}
+   {%- set hybrid_curve = "p384_" -%}
+{%- elif last_kem_hybrid_level == 256 -%}
+   {%- set hybrid_curve = "p521_" -%}
+{%- else -%}
+   {%- set hybrid_curve = "" -%}
+{%- endif %}
+#define IS_OQS_OPENSSL_KEM_NID(a) ((a >= NID_oqs_kem_default) && (a <= NID_{{ hybrid_curve }}{{ (config['kems'] | last)['name_group'] }}))
+{%- set last_sig_variant = (config['sigs']|last)['variants']|last %}
+#define IS_OQS_OPENSSL_SIG_NID(a) ((a >= NID_oqs_sig_default) && (a <= NID_{{ (last_sig_variant['mix_with']|last)['name'] }}_{{ last_sig_variant['name'] }}))
 //

ssl/ssl_local.h

@@ -519,14 +519,6 @@
 #define CERT_PRIVATE_KEY        2
 */
 
-
-/* Returns true if the nid is for an OQS KEM */
-#define NID_OQS_START NID_oqs_kem_default
-#define NID_OQS_END NID_bike1l3fo
-#define NID_HYBRID_START NID_p256_oqs_kem_default
-#define NID_HYBRID_END NID_p256_bike1l3fo
-#define IS_OQS_KEM_NID(nid) (nid >= NID_OQS_START && nid <= NID_OQS_END)
-
 /* Returns the curve ID for an OQS KEM NID */
 ///// OQS_TEMPLATE_FRAGMENT_OQS_KEM_CURVEID_START
 #define OQS_KEM_CURVEID(nid) \