2 files changed, 12 insertions, 2 deletions

diff --git a/src/lib/libcrypto/ec/ec.h b/src/lib/libcrypto/ec/ec.h
index 6b5d7b4af7..f711d55050 100644
--- a/src/lib/libcrypto/ec/ec.h
+++ b/src/lib/libcrypto/ec/ec.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ec.h,v 1.41 2023/04/27 07:10:05 tb Exp $ */
+/* $OpenBSD: ec.h,v 1.42 2023/07/05 17:10:10 tb Exp $ */
 /*
  * Originally written by Bodo Moeller for the OpenSSL project.
  */
@@ -606,6 +606,7 @@ void ERR_load_EC_strings(void);
 /* Reason codes. */
 #define EC_R_ASN1_ERROR                                  115
 #define EC_R_ASN1_UNKNOWN_FIELD                          116
+#define EC_R_BAD_SIGNATURE                               166
 #define EC_R_BIGNUM_OUT_OF_RANGE                         144
 #define EC_R_BUFFER_TOO_SMALL                            100
 #define EC_R_COORDINATES_OUT_OF_RANGE                    146
@@ -633,10 +634,13 @@ void ERR_load_EC_strings(void);
 #define EC_R_INVALID_PENTANOMIAL_BASIS                   132
 #define EC_R_INVALID_PRIVATE_KEY                         123
 #define EC_R_INVALID_TRINOMIAL_BASIS                     137
+#define EC_R_KDF_FAILED                                  167
 #define EC_R_KDF_PARAMETER_ERROR                         148
+#define EC_R_KEY_TRUNCATION                              168
 #define EC_R_KEYS_NOT_SET                                140
 #define EC_R_MISSING_PARAMETERS                          124
 #define EC_R_MISSING_PRIVATE_KEY                         125
+#define EC_R_NEED_NEW_SETUP_VALUES                       170
 #define EC_R_NOT_A_NIST_PRIME                            135
 #define EC_R_NOT_A_SUPPORTED_NIST_PRIME                  136
 #define EC_R_NOT_IMPLEMENTED                             126
@@ -647,6 +651,7 @@ void ERR_load_EC_strings(void);
 #define EC_R_PEER_KEY_ERROR                              149
 #define EC_R_PKPARAMETERS2GROUP_FAILURE                  127
 #define EC_R_POINT_AT_INFINITY                           106
+#define EC_R_POINT_ARITHMETIC_FAILURE                    169
 #define EC_R_POINT_IS_NOT_ON_CURVE                       107
 #define EC_R_SHARED_INFO_ERROR                           150
 #define EC_R_SLOT_FULL                                   108
diff --git a/src/lib/libcrypto/ec/ec_err.c b/src/lib/libcrypto/ec/ec_err.c
index be6a284599..d10b8e6f7d 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.15 2022/11/19 07:00:57 tb Exp $ */
+/* $OpenBSD: ec_err.c,v 1.16 2023/07/05 17:10:10 tb Exp $ */
 /* ====================================================================
  * Copyright (c) 1999-2011 The OpenSSL Project.  All rights reserved.
  *
@@ -74,6 +74,7 @@ static ERR_STRING_DATA EC_str_reasons[] =
 {
         {ERR_REASON(EC_R_ASN1_ERROR), "asn1 error"},
         {ERR_REASON(EC_R_ASN1_UNKNOWN_FIELD), "asn1 unknown field"},
+        {ERR_REASON(EC_R_BAD_SIGNATURE), "bad signature"},
         {ERR_REASON(EC_R_BIGNUM_OUT_OF_RANGE), "bignum out of range"},
         {ERR_REASON(EC_R_BUFFER_TOO_SMALL), "buffer too small"},
         {ERR_REASON(EC_R_COORDINATES_OUT_OF_RANGE), "coordinates out of range"},
@@ -101,10 +102,13 @@ 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_FAILED), "kdf failed"},
         {ERR_REASON(EC_R_KDF_PARAMETER_ERROR), "kdf parameter error"},
+        {ERR_REASON(EC_R_KEY_TRUNCATION), "key would be truncated"},
         {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"},
+        {ERR_REASON(EC_R_NEED_NEW_SETUP_VALUES), "need new setup values"},
         {ERR_REASON(EC_R_NOT_A_NIST_PRIME), "not a NIST prime"},
         {ERR_REASON(EC_R_NOT_A_SUPPORTED_NIST_PRIME), "not a supported NIST prime"},
         {ERR_REASON(EC_R_NOT_IMPLEMENTED), "not implemented"},
@@ -114,6 +118,7 @@ static ERR_STRING_DATA EC_str_reasons[] =
         {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_ARITHMETIC_FAILURE), "point arithmetic 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"},