summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorPaul Yang <kaishen.yy@antfin.com>2019-07-30 23:05:44 +0800
committerPaul Yang <kaishen.yy@antfin.com>2019-08-22 10:29:28 +0800
commita45eb7e8918f055115e0a1f206f8b74a2ed06dc6 (patch)
tree9a77fbfe998f92c122df0f914c9b09dd57be3216 /include
parente1178600cc5d40b1e21c4a01d224afd2d8c7498a (diff)
Support parsing of SM2 ID in hexdecimal
The current EVP_PEKY_ctrl for SM2 has no capability of parsing an ID input in hexdecimal. The newly added ctrl string is called: sm2_hex_id Test cases and documentation are updated. Reviewed-by: Tim Hudson <tjh@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/9584)
Diffstat (limited to 'include')
-rw-r--r--include/openssl/ec.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/openssl/ec.h b/include/openssl/ec.h
index 3e87fac9b4..807a64b31d 100644
--- a/include/openssl/ec.h
+++ b/include/openssl/ec.h
@@ -1494,7 +1494,6 @@ void EC_KEY_METHOD_get_verify(const EC_KEY_METHOD *meth,
# define EVP_PKEY_CTX_set1_id(ctx, id, id_len) \
EVP_PKEY_CTX_ctrl(ctx, -1, -1, \
EVP_PKEY_CTRL_SET1_ID, (int)id_len, (void*)(id))
-
# define EVP_PKEY_CTX_get1_id(ctx, id) \
EVP_PKEY_CTX_ctrl(ctx, -1, -1, \
EVP_PKEY_CTRL_GET1_ID, 0, (void*)(id))