generated files

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

diff --git a/crypto/err/openssl.txt b/crypto/err/openssl.txt
index 8d183fb5cd7b498788c0134a21e885ef35e0089d..e944b57153fc0852c497baec510979188dfe6d9c 100644 (file)
--- a/crypto/err/openssl.txt
+++ b/crypto/err/openssl.txt
@@ -1044,6 +1044,14 @@ PKCS7_F_PKCS7_SIGNER_INFO_SIGN:139:PKCS7_SIGNER_INFO_sign
 PKCS7_F_PKCS7_SIGN_ADD_SIGNER:137:PKCS7_sign_add_signer
 PKCS7_F_PKCS7_SIMPLE_SMIMECAP:119:PKCS7_simple_smimecap
 PKCS7_F_PKCS7_VERIFY:117:PKCS7_verify
+PROP_F_OSSL_PARSE_PROPERTY:100:ossl_parse_property
+PROP_F_OSSL_PARSE_QUERY:101:ossl_parse_query
+PROP_F_PARSE_HEX:102:parse_hex
+PROP_F_PARSE_NAME:103:parse_name
+PROP_F_PARSE_NUMBER:104:parse_number
+PROP_F_PARSE_OCT:105:parse_oct
+PROP_F_PARSE_STRING:106:parse_string
+PROP_F_PARSE_UNQUOTED:107:parse_unquoted
 RAND_F_DRBG_BYTES:101:drbg_bytes
 RAND_F_DRBG_GET_ENTROPY:105:drbg_get_entropy
 RAND_F_DRBG_SETUP:117:drbg_setup
@@ -2497,6 +2505,17 @@ PKCS7_R_UNSUPPORTED_CIPHER_TYPE:111:unsupported cipher type
 PKCS7_R_UNSUPPORTED_CONTENT_TYPE:112:unsupported content type
 PKCS7_R_WRONG_CONTENT_TYPE:113:wrong content type
 PKCS7_R_WRONG_PKCS7_TYPE:114:wrong pkcs7 type
+PROP_R_NAME_TOO_LONG:100:name too long
+PROP_R_NOT_AN_ASCII_CHARACTER:101:not an ascii character
+PROP_R_NOT_AN_HEXADECIMAL_DIGIT:102:not an hexadecimal digit
+PROP_R_NOT_AN_IDENTIFIER:103:not an identifier
+PROP_R_NOT_AN_OCTAL_DIGIT:104:not an octal digit
+PROP_R_NOT_A_DECIMAL_DIGIT:105:not a decimal digit
+PROP_R_NO_MATCHING_STRING_DELIMETER:106:no matching string delimeter
+PROP_R_NO_VALUE:107:no value
+PROP_R_PARSE_FAILED:108:parse failed
+PROP_R_STRING_TOO_LONG:109:string too long
+PROP_R_TRAILING_CHARACTERS:110:trailing characters
 RAND_R_ADDITIONAL_INPUT_TOO_LONG:102:additional input too long
 RAND_R_ALREADY_INSTANTIATED:103:already instantiated
 RAND_R_ARGUMENT_OUT_OF_RANGE:105:argument out of range

diff --git a/crypto/property/property_err.c b/crypto/property/property_err.c
new file mode 100644 (file)
index 0000000..619e5e7
--- /dev/null
+++ b/crypto/property/property_err.c
@@ -0,0 +1,61 @@
+/*
+ * Generated by util/mkerr.pl DO NOT EDIT
+ * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License 2.0 (the "License").  You may not use
+ * this file except in compliance with the License.  You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+#include <openssl/err.h>
+#include "internal/propertyerr.h"
+
+#ifndef OPENSSL_NO_ERR
+
+static const ERR_STRING_DATA PROP_str_functs[] = {
+    {ERR_PACK(ERR_LIB_PROP, PROP_F_OSSL_PARSE_PROPERTY, 0),
+     "ossl_parse_property"},
+    {ERR_PACK(ERR_LIB_PROP, PROP_F_OSSL_PARSE_QUERY, 0), "ossl_parse_query"},
+    {ERR_PACK(ERR_LIB_PROP, PROP_F_PARSE_HEX, 0), "parse_hex"},
+    {ERR_PACK(ERR_LIB_PROP, PROP_F_PARSE_NAME, 0), "parse_name"},
+    {ERR_PACK(ERR_LIB_PROP, PROP_F_PARSE_NUMBER, 0), "parse_number"},
+    {ERR_PACK(ERR_LIB_PROP, PROP_F_PARSE_OCT, 0), "parse_oct"},
+    {ERR_PACK(ERR_LIB_PROP, PROP_F_PARSE_STRING, 0), "parse_string"},
+    {ERR_PACK(ERR_LIB_PROP, PROP_F_PARSE_UNQUOTED, 0), "parse_unquoted"},
+    {0, NULL}
+};
+
+static const ERR_STRING_DATA PROP_str_reasons[] = {
+    {ERR_PACK(ERR_LIB_PROP, 0, PROP_R_NAME_TOO_LONG), "name too long"},
+    {ERR_PACK(ERR_LIB_PROP, 0, PROP_R_NOT_AN_ASCII_CHARACTER),
+    "not an ascii character"},
+    {ERR_PACK(ERR_LIB_PROP, 0, PROP_R_NOT_AN_HEXADECIMAL_DIGIT),
+    "not an hexadecimal digit"},
+    {ERR_PACK(ERR_LIB_PROP, 0, PROP_R_NOT_AN_IDENTIFIER), "not an identifier"},
+    {ERR_PACK(ERR_LIB_PROP, 0, PROP_R_NOT_AN_OCTAL_DIGIT),
+    "not an octal digit"},
+    {ERR_PACK(ERR_LIB_PROP, 0, PROP_R_NOT_A_DECIMAL_DIGIT),
+    "not a decimal digit"},
+    {ERR_PACK(ERR_LIB_PROP, 0, PROP_R_NO_MATCHING_STRING_DELIMETER),
+    "no matching string delimeter"},
+    {ERR_PACK(ERR_LIB_PROP, 0, PROP_R_NO_VALUE), "no value"},
+    {ERR_PACK(ERR_LIB_PROP, 0, PROP_R_PARSE_FAILED), "parse failed"},
+    {ERR_PACK(ERR_LIB_PROP, 0, PROP_R_STRING_TOO_LONG), "string too long"},
+    {ERR_PACK(ERR_LIB_PROP, 0, PROP_R_TRAILING_CHARACTERS),
+    "trailing characters"},
+    {0, NULL}
+};
+
+#endif
+
+int ERR_load_PROP_strings(void)
+{
+#ifndef OPENSSL_NO_ERR
+    if (ERR_func_error_string(PROP_str_functs[0].error) == NULL) {
+        ERR_load_strings_const(PROP_str_functs);
+        ERR_load_strings_const(PROP_str_reasons);
+    }
+#endif
+    return 1;
+}

diff --git a/include/internal/propertyerr.h b/include/internal/propertyerr.h
new file mode 100644 (file)
index 0000000..908c910
--- /dev/null
+++ b/include/internal/propertyerr.h
@@ -0,0 +1,46 @@
+/*
+ * Generated by util/mkerr.pl DO NOT EDIT
+ * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License 2.0 (the "License").  You may not use
+ * this file except in compliance with the License.  You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+#ifndef HEADER_PROPERR_H
+# define HEADER_PROPERR_H
+
+# ifdef  __cplusplus
+extern "C"
+# endif
+int ERR_load_PROP_strings(void);
+
+/*
+ * PROP function codes.
+ */
+# define PROP_F_OSSL_PARSE_PROPERTY                       100
+# define PROP_F_OSSL_PARSE_QUERY                          101
+# define PROP_F_PARSE_HEX                                 102
+# define PROP_F_PARSE_NAME                                103
+# define PROP_F_PARSE_NUMBER                              104
+# define PROP_F_PARSE_OCT                                 105
+# define PROP_F_PARSE_STRING                              106
+# define PROP_F_PARSE_UNQUOTED                            107
+
+/*
+ * PROP reason codes.
+ */
+# define PROP_R_NAME_TOO_LONG                             100
+# define PROP_R_NOT_AN_ASCII_CHARACTER                    101
+# define PROP_R_NOT_AN_HEXADECIMAL_DIGIT                  102
+# define PROP_R_NOT_AN_IDENTIFIER                         103
+# define PROP_R_NOT_AN_OCTAL_DIGIT                        104
+# define PROP_R_NOT_A_DECIMAL_DIGIT                       105
+# define PROP_R_NO_MATCHING_STRING_DELIMETER              106
+# define PROP_R_NO_VALUE                                  107
+# define PROP_R_PARSE_FAILED                              108
+# define PROP_R_STRING_TOO_LONG                           109
+# define PROP_R_TRAILING_CHARACTERS                       110
+
+#endif

diff --git a/util/libcrypto.num b/util/libcrypto.num
index 560f47fb66a11fe2fc7520d089d7032f0509fc3e..991a9feea8e5949d4dee61dde52a028fe89c8fc8 100644 (file)
--- a/util/libcrypto.num
+++ b/util/libcrypto.num
@@ -4643,3 +4643,4 @@ EC_GROUP_get0_field                     4598      3_0_0   EXIST::FUNCTION:EC
 CRYPTO_alloc_ex_data                    4599   3_0_0   EXIST::FUNCTION:
 OPENSSL_CTX_new                         4600   3_0_0   EXIST::FUNCTION:
 OPENSSL_CTX_free                        4601   3_0_0   EXIST::FUNCTION:
+OPENSSL_LH_flush                        4602   3_0_0   EXIST::FUNCTION: