make update

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4503)

diff --git a/crypto/evp/evp_err.c b/crypto/evp/evp_err.c
index e32a1c01cae338365a7e93bcb50f82b997cb8c03..ab4b614026af3b1b560ef95b786eaf6c74ce820a 100644 (file)
--- a/crypto/evp/evp_err.c
+++ b/crypto/evp/evp_err.c
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -72,6 +72,7 @@ static ERR_STRING_DATA EVP_str_functs[] = {
     {ERR_FUNC(EVP_F_EVP_PKEY_NEW), "EVP_PKEY_new"},
     {ERR_FUNC(EVP_F_EVP_PKEY_PARAMGEN), "EVP_PKEY_paramgen"},
     {ERR_FUNC(EVP_F_EVP_PKEY_PARAMGEN_INIT), "EVP_PKEY_paramgen_init"},
+    {ERR_FUNC(EVP_F_EVP_PKEY_SET1_ENGINE), "EVP_PKEY_set1_engine"},
     {ERR_FUNC(EVP_F_EVP_PKEY_SIGN), "EVP_PKEY_sign"},
     {ERR_FUNC(EVP_F_EVP_PKEY_SIGN_INIT), "EVP_PKEY_sign_init"},
     {ERR_FUNC(EVP_F_EVP_PKEY_VERIFY), "EVP_PKEY_verify"},

diff --git a/include/openssl/evp.h b/include/openssl/evp.h
index 6bc283c2a59a65e3fc27649f3cc28083b91e180a..41920fa77d9b3f66379c66c68a43e04469fd1499 100644 (file)
--- a/include/openssl/evp.h
+++ b/include/openssl/evp.h
@@ -1508,6 +1508,7 @@ int ERR_load_EVP_strings(void);
 # define EVP_F_EVP_PKEY_NEW                               106
 # define EVP_F_EVP_PKEY_PARAMGEN                          148
 # define EVP_F_EVP_PKEY_PARAMGEN_INIT                     149
+# define EVP_F_EVP_PKEY_SET1_ENGINE                       187
 # define EVP_F_EVP_PKEY_SIGN                              140
 # define EVP_F_EVP_PKEY_SIGN_INIT                         141
 # define EVP_F_EVP_PKEY_VERIFY                            142

diff --git a/util/libcrypto.num b/util/libcrypto.num
index fddb49b0ac81d4f9dcd13ff45123ab0a845ef26d..a6d313f89f3f4a2c827e3edff7a2b1d3896ee97c 100644 (file)
--- a/util/libcrypto.num
+++ b/util/libcrypto.num
@@ -4231,3 +4231,4 @@ UINT32_it                               4214      1_1_0f  EXIST:EXPORT_VAR_AS_FUNCTION
 ZINT64_it                               4215   1_1_0f  EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 ZINT64_it                               4215   1_1_0f  EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 CRYPTO_secure_clear_free                4315   1_1_0g  EXIST::FUNCTION:
+EVP_PKEY_set1_engine                    4347   1_1_0g  EXIST::FUNCTION:ENGINE