From: Richard Levitte <levitte@openssl.org>
Date: Tue, 19 Jul 2016 19:01:11 +0000 (+0200)
Subject: make update
X-Git-Tag: OpenSSL_1_1_0-pre6~151
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=963f043d04206ae9e4d484eee37a3ebd5a3aa701;p=oweals%2Fopenssl.git

make update

Reviewed-by: Kurt Roeckx <kurt@openssl.org>
---

diff --git a/crypto/engine/eng_err.c b/crypto/engine/eng_err.c
index c8f628b9cf..5eb8771969 100644
--- a/crypto/engine/eng_err.c
+++ b/crypto/engine/eng_err.c
@@ -32,6 +32,8 @@ static ERR_STRING_DATA ENGINE_str_functs[] = {
     {ERR_FUNC(ENGINE_F_ENGINE_FINISH), "ENGINE_finish"},
     {ERR_FUNC(ENGINE_F_ENGINE_GET_CIPHER), "ENGINE_get_cipher"},
     {ERR_FUNC(ENGINE_F_ENGINE_GET_DIGEST), "ENGINE_get_digest"},
+    {ERR_FUNC(ENGINE_F_ENGINE_GET_FIRST), "ENGINE_get_first"},
+    {ERR_FUNC(ENGINE_F_ENGINE_GET_LAST), "ENGINE_get_last"},
     {ERR_FUNC(ENGINE_F_ENGINE_GET_NEXT), "ENGINE_get_next"},
     {ERR_FUNC(ENGINE_F_ENGINE_GET_PKEY_ASN1_METH),
      "ENGINE_get_pkey_asn1_meth"},
@@ -45,6 +47,8 @@ static ERR_STRING_DATA ENGINE_str_functs[] = {
     {ERR_FUNC(ENGINE_F_ENGINE_LOAD_SSL_CLIENT_CERT),
      "ENGINE_load_ssl_client_cert"},
     {ERR_FUNC(ENGINE_F_ENGINE_NEW), "ENGINE_new"},
+    {ERR_FUNC(ENGINE_F_ENGINE_PKEY_ASN1_FIND_STR),
+     "ENGINE_pkey_asn1_find_str"},
     {ERR_FUNC(ENGINE_F_ENGINE_REMOVE), "ENGINE_remove"},
     {ERR_FUNC(ENGINE_F_ENGINE_SET_DEFAULT_STRING),
      "ENGINE_set_default_string"},
diff --git a/include/openssl/engine.h b/include/openssl/engine.h
index f359c9ee57..b1e5c1f7d2 100644
--- a/include/openssl/engine.h
+++ b/include/openssl/engine.h
@@ -773,6 +773,8 @@ void ERR_load_ENGINE_strings(void);
 # define ENGINE_F_ENGINE_FINISH                           107
 # define ENGINE_F_ENGINE_GET_CIPHER                       185
 # define ENGINE_F_ENGINE_GET_DIGEST                       186
+# define ENGINE_F_ENGINE_GET_FIRST                        195
+# define ENGINE_F_ENGINE_GET_LAST                         196
 # define ENGINE_F_ENGINE_GET_NEXT                         115
 # define ENGINE_F_ENGINE_GET_PKEY_ASN1_METH               193
 # define ENGINE_F_ENGINE_GET_PKEY_METH                    192
@@ -784,6 +786,7 @@ void ERR_load_ENGINE_strings(void);
 # define ENGINE_F_ENGINE_LOAD_PUBLIC_KEY                  151
 # define ENGINE_F_ENGINE_LOAD_SSL_CLIENT_CERT             194
 # define ENGINE_F_ENGINE_NEW                              122
+# define ENGINE_F_ENGINE_PKEY_ASN1_FIND_STR               197
 # define ENGINE_F_ENGINE_REMOVE                           123
 # define ENGINE_F_ENGINE_SET_DEFAULT_STRING               189
 # define ENGINE_F_ENGINE_SET_ID                           129