From: Richard Levitte <levitte@openssl.org>
Date: Sun, 19 Jun 2016 08:55:59 +0000 (+0200)
Subject: make update
X-Git-Tag: OpenSSL_1_1_0-pre6~383
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d0ba7bc8a0d577c73b942a99faa266f392e7f211;p=oweals%2Fopenssl.git

make update

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Stephen Henson <steve@openssl.org>
---

diff --git a/crypto/x509/x509_err.c b/crypto/x509/x509_err.c
index dbebbaa479..13f5a24f87 100644
--- a/crypto/x509/x509_err.c
+++ b/crypto/x509/x509_err.c
@@ -22,6 +22,7 @@ static ERR_STRING_DATA X509_str_functs[] = {
     {ERR_FUNC(X509_F_ADD_CERT_DIR), "add_cert_dir"},
     {ERR_FUNC(X509_F_BUILD_CHAIN), "build_chain"},
     {ERR_FUNC(X509_F_BY_FILE_CTRL), "by_file_ctrl"},
+    {ERR_FUNC(X509_F_CHECK_NAME_CONSTRAINTS), "check_name_constraints"},
     {ERR_FUNC(X509_F_CHECK_POLICY), "check_policy"},
     {ERR_FUNC(X509_F_DANE_I2D), "dane_i2d"},
     {ERR_FUNC(X509_F_DIR_CTRL), "dir_ctrl"},
diff --git a/include/openssl/x509.h b/include/openssl/x509.h
index 3c364dde01..4b7a1f640a 100644
--- a/include/openssl/x509.h
+++ b/include/openssl/x509.h
@@ -1009,6 +1009,7 @@ void ERR_load_X509_strings(void);
 # define X509_F_ADD_CERT_DIR                              100
 # define X509_F_BUILD_CHAIN                               106
 # define X509_F_BY_FILE_CTRL                              101
+# define X509_F_CHECK_NAME_CONSTRAINTS                    149
 # define X509_F_CHECK_POLICY                              145
 # define X509_F_DANE_I2D                                  107
 # define X509_F_DIR_CTRL                                  102