Add various macros and controls for EC_PKEY_CTX.

These are needed for the upcoming EC CMS support (nothing else appears
to use them). This largely syncs our ec_pmeth.c with OpenSSL 1.1.1b.

With input from inoguchi@ and tb@.

ok inoguchi@ tb@

1 files changed, 5 insertions, 1 deletions

diff --git a/src/lib/libcrypto/ec/ec_err.c b/src/lib/libcrypto/ec/ec_err.c
index fa5deceda5..7c42618881 100644
--- a/src/lib/libcrypto/ec/ec_err.c
+++ b/src/lib/libcrypto/ec/ec_err.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ec_err.c,v 1.10 2017/01/29 17:49:23 beck Exp $ */
+/* $OpenBSD: ec_err.c,v 1.11 2019/09/06 17:59:25 jsing Exp $ */
 /* ====================================================================
  * Copyright (c) 1999-2011 The OpenSSL Project.  All rights reserved.
  *
@@ -96,6 +96,7 @@ static ERR_STRING_DATA EC_str_reasons[] =
         {ERR_REASON(EC_R_INVALID_COMPRESSED_POINT), "invalid compressed point"},
         {ERR_REASON(EC_R_INVALID_COMPRESSION_BIT), "invalid compression bit"},
         {ERR_REASON(EC_R_INVALID_CURVE), "invalid curve"},
+        {ERR_REASON(EC_R_INVALID_DIGEST), "invalid digest"},
         {ERR_REASON(EC_R_INVALID_DIGEST_TYPE), "invalid digest type"},
         {ERR_REASON(EC_R_INVALID_ENCODING), "invalid encoding"},
         {ERR_REASON(EC_R_INVALID_FIELD), "invalid field"},
@@ -104,6 +105,7 @@ static ERR_STRING_DATA EC_str_reasons[] =
         {ERR_REASON(EC_R_INVALID_PENTANOMIAL_BASIS), "invalid pentanomial basis"},
         {ERR_REASON(EC_R_INVALID_PRIVATE_KEY), "invalid private key"},
         {ERR_REASON(EC_R_INVALID_TRINOMIAL_BASIS), "invalid trinomial basis"},
+        {ERR_REASON(EC_R_KDF_PARAMETER_ERROR), "kdf parameter error"},
         {ERR_REASON(EC_R_KEYS_NOT_SET), "keys not set"},
         {ERR_REASON(EC_R_MISSING_PARAMETERS), "missing parameters"},
         {ERR_REASON(EC_R_MISSING_PRIVATE_KEY), "missing private key"},
@@ -114,9 +116,11 @@ static ERR_STRING_DATA EC_str_reasons[] =
         {ERR_REASON(EC_R_NO_FIELD_MOD), "no field mod"},
         {ERR_REASON(EC_R_NO_PARAMETERS_SET), "no parameters set"},
         {ERR_REASON(EC_R_PASSED_NULL_PARAMETER), "passed null parameter"},
+        {ERR_REASON(EC_R_PEER_KEY_ERROR), "peer key error"},
         {ERR_REASON(EC_R_PKPARAMETERS2GROUP_FAILURE), "pkparameters2group failure"},
         {ERR_REASON(EC_R_POINT_AT_INFINITY), "point at infinity"},
         {ERR_REASON(EC_R_POINT_IS_NOT_ON_CURVE), "point is not on curve"},
+        {ERR_REASON(EC_R_SHARED_INFO_ERROR), "shared info error"},
         {ERR_REASON(EC_R_SLOT_FULL), "slot full"},
         {ERR_REASON(EC_R_UNDEFINED_GENERATOR), "undefined generator"},
         {ERR_REASON(EC_R_UNDEFINED_ORDER), "undefined order"},