diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libcrypto/Makefile | 4 | ||||
| -rw-r--r-- | src/lib/libcrypto/x509/v3err.c | 226 | ||||
| -rw-r--r-- | src/lib/libcrypto/x509/x509_err.c | 156 |
3 files changed, 157 insertions, 229 deletions
diff --git a/src/lib/libcrypto/Makefile b/src/lib/libcrypto/Makefile index 633d65b592..8970ca3918 100644 --- a/src/lib/libcrypto/Makefile +++ b/src/lib/libcrypto/Makefile | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | # $OpenBSD: Makefile,v 1.40 2020/06/04 15:19:31 jsing Exp $ | 1 | # $OpenBSD: Makefile,v 1.41 2020/06/05 15:28:33 jsing Exp $ |
| 2 | 2 | ||
| 3 | LIB= crypto | 3 | LIB= crypto |
| 4 | LIBREBUILD=y | 4 | LIBREBUILD=y |
| @@ -274,7 +274,7 @@ SRCS+= x509name.c x509_v3.c x509_ext.c x509_att.c | |||
| 274 | SRCS+= x509type.c x509_lu.c x_all.c x509_txt.c | 274 | SRCS+= x509type.c x509_lu.c x_all.c x509_txt.c |
| 275 | SRCS+= x509_trs.c by_file.c by_dir.c by_mem.c x509_vpm.c | 275 | SRCS+= x509_trs.c by_file.c by_dir.c by_mem.c x509_vpm.c |
| 276 | SRCS+= x509_bcons.c x509_bitst.c x509_conf.c x509_extku.c x509_ia5.c x509_lib.c | 276 | SRCS+= x509_bcons.c x509_bitst.c x509_conf.c x509_extku.c x509_ia5.c x509_lib.c |
| 277 | SRCS+= x509_prn.c x509_utl.c v3err.c x509_genn.c x509_alt.c x509_skey.c x509_akey.c x509_pku.c | 277 | SRCS+= x509_prn.c x509_utl.c x509_genn.c x509_alt.c x509_skey.c x509_akey.c x509_pku.c |
| 278 | SRCS+= x509_int.c x509_enum.c x509_sxnet.c x509_cpols.c x509_crld.c x509_purp.c x509_info.c | 278 | SRCS+= x509_int.c x509_enum.c x509_sxnet.c x509_cpols.c x509_crld.c x509_purp.c x509_info.c |
| 279 | SRCS+= x509_ocsp.c x509_akeya.c x509_pmaps.c x509_pcons.c x509_ncons.c x509_pcia.c x509_pci.c | 279 | SRCS+= x509_ocsp.c x509_akeya.c x509_pmaps.c x509_pcons.c x509_ncons.c x509_pcia.c x509_pci.c |
| 280 | SRCS+= pcy_cache.c pcy_node.c pcy_data.c pcy_map.c pcy_tree.c pcy_lib.c | 280 | SRCS+= pcy_cache.c pcy_node.c pcy_data.c pcy_map.c pcy_tree.c pcy_lib.c |
diff --git a/src/lib/libcrypto/x509/v3err.c b/src/lib/libcrypto/x509/v3err.c deleted file mode 100644 index f7850effb1..0000000000 --- a/src/lib/libcrypto/x509/v3err.c +++ /dev/null | |||
| @@ -1,226 +0,0 @@ | |||
| 1 | /* $OpenBSD: v3err.c,v 1.1 2020/06/04 15:19:31 jsing Exp $ */ | ||
| 2 | /* ==================================================================== | ||
| 3 | * Copyright (c) 1999-2007 The OpenSSL Project. All rights reserved. | ||
| 4 | * | ||
| 5 | * Redistribution and use in source and binary forms, with or without | ||
| 6 | * modification, are permitted provided that the following conditions | ||
| 7 | * are met: | ||
| 8 | * | ||
| 9 | * 1. Redistributions of source code must retain the above copyright | ||
| 10 | * notice, this list of conditions and the following disclaimer. | ||
| 11 | * | ||
| 12 | * 2. Redistributions in binary form must reproduce the above copyright | ||
| 13 | * notice, this list of conditions and the following disclaimer in | ||
| 14 | * the documentation and/or other materials provided with the | ||
| 15 | * distribution. | ||
| 16 | * | ||
| 17 | * 3. All advertising materials mentioning features or use of this | ||
| 18 | * software must display the following acknowledgment: | ||
| 19 | * "This product includes software developed by the OpenSSL Project | ||
| 20 | * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)" | ||
| 21 | * | ||
| 22 | * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to | ||
| 23 | * endorse or promote products derived from this software without | ||
| 24 | * prior written permission. For written permission, please contact | ||
| 25 | * openssl-core@OpenSSL.org. | ||
| 26 | * | ||
| 27 | * 5. Products derived from this software may not be called "OpenSSL" | ||
| 28 | * nor may "OpenSSL" appear in their names without prior written | ||
| 29 | * permission of the OpenSSL Project. | ||
| 30 | * | ||
| 31 | * 6. Redistributions of any form whatsoever must retain the following | ||
| 32 | * acknowledgment: | ||
| 33 | * "This product includes software developed by the OpenSSL Project | ||
| 34 | * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)" | ||
| 35 | * | ||
| 36 | * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY | ||
| 37 | * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 38 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
| 39 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR | ||
| 40 | * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
| 41 | * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
| 42 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
| 43 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 44 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | ||
| 45 | * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
| 46 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | ||
| 47 | * OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| 48 | * ==================================================================== | ||
| 49 | * | ||
| 50 | * This product includes cryptographic software written by Eric Young | ||
| 51 | * (eay@cryptsoft.com). This product includes software written by Tim | ||
| 52 | * Hudson (tjh@cryptsoft.com). | ||
| 53 | * | ||
| 54 | */ | ||
| 55 | |||
| 56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes | ||
| 57 | * made to it will be overwritten when the script next updates this file, | ||
| 58 | * only reason strings will be preserved. | ||
| 59 | */ | ||
| 60 | |||
| 61 | #include <stdio.h> | ||
| 62 | |||
| 63 | #include <openssl/opensslconf.h> | ||
| 64 | |||
| 65 | #include <openssl/err.h> | ||
| 66 | #include <openssl/x509v3.h> | ||
| 67 | |||
| 68 | /* BEGIN ERROR CODES */ | ||
| 69 | #ifndef OPENSSL_NO_ERR | ||
| 70 | |||
| 71 | #define ERR_FUNC(func) ERR_PACK(ERR_LIB_X509V3,func,0) | ||
| 72 | #define ERR_REASON(reason) ERR_PACK(ERR_LIB_X509V3,0,reason) | ||
| 73 | |||
| 74 | static ERR_STRING_DATA X509V3_str_functs[] = { | ||
| 75 | {ERR_FUNC(X509V3_F_A2I_GENERAL_NAME), "A2I_GENERAL_NAME"}, | ||
| 76 | {ERR_FUNC(X509V3_F_ASIDENTIFIERCHOICE_CANONIZE), "ASIDENTIFIERCHOICE_CANONIZE"}, | ||
| 77 | {ERR_FUNC(X509V3_F_ASIDENTIFIERCHOICE_IS_CANONICAL), "ASIDENTIFIERCHOICE_IS_CANONICAL"}, | ||
| 78 | {ERR_FUNC(X509V3_F_COPY_EMAIL), "COPY_EMAIL"}, | ||
| 79 | {ERR_FUNC(X509V3_F_COPY_ISSUER), "COPY_ISSUER"}, | ||
| 80 | {ERR_FUNC(X509V3_F_DO_DIRNAME), "DO_DIRNAME"}, | ||
| 81 | {ERR_FUNC(X509V3_F_DO_EXT_CONF), "DO_EXT_CONF"}, | ||
| 82 | {ERR_FUNC(X509V3_F_DO_EXT_I2D), "DO_EXT_I2D"}, | ||
| 83 | {ERR_FUNC(X509V3_F_DO_EXT_NCONF), "DO_EXT_NCONF"}, | ||
| 84 | {ERR_FUNC(X509V3_F_DO_I2V_NAME_CONSTRAINTS), "DO_I2V_NAME_CONSTRAINTS"}, | ||
| 85 | {ERR_FUNC(X509V3_F_GNAMES_FROM_SECTNAME), "GNAMES_FROM_SECTNAME"}, | ||
| 86 | {ERR_FUNC(X509V3_F_HEX_TO_STRING), "hex_to_string"}, | ||
| 87 | {ERR_FUNC(X509V3_F_I2S_ASN1_ENUMERATED), "i2s_ASN1_ENUMERATED"}, | ||
| 88 | {ERR_FUNC(X509V3_F_I2S_ASN1_IA5STRING), "I2S_ASN1_IA5STRING"}, | ||
| 89 | {ERR_FUNC(X509V3_F_I2S_ASN1_INTEGER), "i2s_ASN1_INTEGER"}, | ||
| 90 | {ERR_FUNC(X509V3_F_I2V_AUTHORITY_INFO_ACCESS), "I2V_AUTHORITY_INFO_ACCESS"}, | ||
| 91 | {ERR_FUNC(X509V3_F_NOTICE_SECTION), "NOTICE_SECTION"}, | ||
| 92 | {ERR_FUNC(X509V3_F_NREF_NOS), "NREF_NOS"}, | ||
| 93 | {ERR_FUNC(X509V3_F_POLICY_SECTION), "POLICY_SECTION"}, | ||
| 94 | {ERR_FUNC(X509V3_F_PROCESS_PCI_VALUE), "PROCESS_PCI_VALUE"}, | ||
| 95 | {ERR_FUNC(X509V3_F_R2I_CERTPOL), "R2I_CERTPOL"}, | ||
| 96 | {ERR_FUNC(X509V3_F_R2I_PCI), "R2I_PCI"}, | ||
| 97 | {ERR_FUNC(X509V3_F_S2I_ASN1_IA5STRING), "S2I_ASN1_IA5STRING"}, | ||
| 98 | {ERR_FUNC(X509V3_F_S2I_ASN1_INTEGER), "s2i_ASN1_INTEGER"}, | ||
| 99 | {ERR_FUNC(X509V3_F_S2I_ASN1_OCTET_STRING), "s2i_ASN1_OCTET_STRING"}, | ||
| 100 | {ERR_FUNC(X509V3_F_S2I_ASN1_SKEY_ID), "S2I_ASN1_SKEY_ID"}, | ||
| 101 | {ERR_FUNC(X509V3_F_S2I_SKEY_ID), "S2I_SKEY_ID"}, | ||
| 102 | {ERR_FUNC(X509V3_F_SET_DIST_POINT_NAME), "SET_DIST_POINT_NAME"}, | ||
| 103 | {ERR_FUNC(X509V3_F_STRING_TO_HEX), "string_to_hex"}, | ||
| 104 | {ERR_FUNC(X509V3_F_SXNET_ADD_ID_ASC), "SXNET_add_id_asc"}, | ||
| 105 | {ERR_FUNC(X509V3_F_SXNET_ADD_ID_INTEGER), "SXNET_add_id_INTEGER"}, | ||
| 106 | {ERR_FUNC(X509V3_F_SXNET_ADD_ID_ULONG), "SXNET_add_id_ulong"}, | ||
| 107 | {ERR_FUNC(X509V3_F_SXNET_GET_ID_ASC), "SXNET_get_id_asc"}, | ||
| 108 | {ERR_FUNC(X509V3_F_SXNET_GET_ID_ULONG), "SXNET_get_id_ulong"}, | ||
| 109 | {ERR_FUNC(X509V3_F_V2I_ASIDENTIFIERS), "V2I_ASIDENTIFIERS"}, | ||
| 110 | {ERR_FUNC(X509V3_F_V2I_ASN1_BIT_STRING), "v2i_ASN1_BIT_STRING"}, | ||
| 111 | {ERR_FUNC(X509V3_F_V2I_AUTHORITY_INFO_ACCESS), "V2I_AUTHORITY_INFO_ACCESS"}, | ||
| 112 | {ERR_FUNC(X509V3_F_V2I_AUTHORITY_KEYID), "V2I_AUTHORITY_KEYID"}, | ||
| 113 | {ERR_FUNC(X509V3_F_V2I_BASIC_CONSTRAINTS), "V2I_BASIC_CONSTRAINTS"}, | ||
| 114 | {ERR_FUNC(X509V3_F_V2I_CRLD), "V2I_CRLD"}, | ||
| 115 | {ERR_FUNC(X509V3_F_V2I_EXTENDED_KEY_USAGE), "V2I_EXTENDED_KEY_USAGE"}, | ||
| 116 | {ERR_FUNC(X509V3_F_V2I_GENERAL_NAMES), "v2i_GENERAL_NAMES"}, | ||
| 117 | {ERR_FUNC(X509V3_F_V2I_GENERAL_NAME_EX), "v2i_GENERAL_NAME_ex"}, | ||
| 118 | {ERR_FUNC(X509V3_F_V2I_IDP), "V2I_IDP"}, | ||
| 119 | {ERR_FUNC(X509V3_F_V2I_IPADDRBLOCKS), "V2I_IPADDRBLOCKS"}, | ||
| 120 | {ERR_FUNC(X509V3_F_V2I_ISSUER_ALT), "V2I_ISSUER_ALT"}, | ||
| 121 | {ERR_FUNC(X509V3_F_V2I_NAME_CONSTRAINTS), "V2I_NAME_CONSTRAINTS"}, | ||
| 122 | {ERR_FUNC(X509V3_F_V2I_POLICY_CONSTRAINTS), "V2I_POLICY_CONSTRAINTS"}, | ||
| 123 | {ERR_FUNC(X509V3_F_V2I_POLICY_MAPPINGS), "V2I_POLICY_MAPPINGS"}, | ||
| 124 | {ERR_FUNC(X509V3_F_V2I_SUBJECT_ALT), "V2I_SUBJECT_ALT"}, | ||
| 125 | {ERR_FUNC(X509V3_F_V3_ADDR_VALIDATE_PATH_INTERNAL), "V3_ADDR_VALIDATE_PATH_INTERNAL"}, | ||
| 126 | {ERR_FUNC(X509V3_F_V3_GENERIC_EXTENSION), "V3_GENERIC_EXTENSION"}, | ||
| 127 | {ERR_FUNC(X509V3_F_X509V3_ADD1_I2D), "X509V3_add1_i2d"}, | ||
| 128 | {ERR_FUNC(X509V3_F_X509V3_ADD_VALUE), "X509V3_add_value"}, | ||
| 129 | {ERR_FUNC(X509V3_F_X509V3_EXT_ADD), "X509V3_EXT_add"}, | ||
| 130 | {ERR_FUNC(X509V3_F_X509V3_EXT_ADD_ALIAS), "X509V3_EXT_add_alias"}, | ||
| 131 | {ERR_FUNC(X509V3_F_X509V3_EXT_CONF), "X509V3_EXT_conf"}, | ||
| 132 | {ERR_FUNC(X509V3_F_X509V3_EXT_I2D), "X509V3_EXT_i2d"}, | ||
| 133 | {ERR_FUNC(X509V3_F_X509V3_EXT_NCONF), "X509V3_EXT_nconf"}, | ||
| 134 | {ERR_FUNC(X509V3_F_X509V3_GET_SECTION), "X509V3_get_section"}, | ||
| 135 | {ERR_FUNC(X509V3_F_X509V3_GET_STRING), "X509V3_get_string"}, | ||
| 136 | {ERR_FUNC(X509V3_F_X509V3_GET_VALUE_BOOL), "X509V3_get_value_bool"}, | ||
| 137 | {ERR_FUNC(X509V3_F_X509V3_PARSE_LIST), "X509V3_parse_list"}, | ||
| 138 | {ERR_FUNC(X509V3_F_X509_PURPOSE_ADD), "X509_PURPOSE_add"}, | ||
| 139 | {ERR_FUNC(X509V3_F_X509_PURPOSE_SET), "X509_PURPOSE_set"}, | ||
| 140 | {0, NULL} | ||
| 141 | }; | ||
| 142 | |||
| 143 | static ERR_STRING_DATA X509V3_str_reasons[] = { | ||
| 144 | {ERR_REASON(X509V3_R_BAD_IP_ADDRESS) , "bad ip address"}, | ||
| 145 | {ERR_REASON(X509V3_R_BAD_OBJECT) , "bad object"}, | ||
| 146 | {ERR_REASON(X509V3_R_BN_DEC2BN_ERROR) , "bn dec2bn error"}, | ||
| 147 | {ERR_REASON(X509V3_R_BN_TO_ASN1_INTEGER_ERROR), "bn to asn1 integer error"}, | ||
| 148 | {ERR_REASON(X509V3_R_DIRNAME_ERROR) , "dirname error"}, | ||
| 149 | {ERR_REASON(X509V3_R_DISTPOINT_ALREADY_SET), "distpoint already set"}, | ||
| 150 | {ERR_REASON(X509V3_R_DUPLICATE_ZONE_ID) , "duplicate zone id"}, | ||
| 151 | {ERR_REASON(X509V3_R_ERROR_CONVERTING_ZONE), "error converting zone"}, | ||
| 152 | {ERR_REASON(X509V3_R_ERROR_CREATING_EXTENSION), "error creating extension"}, | ||
| 153 | {ERR_REASON(X509V3_R_ERROR_IN_EXTENSION) , "error in extension"}, | ||
| 154 | {ERR_REASON(X509V3_R_EXPECTED_A_SECTION_NAME), "expected a section name"}, | ||
| 155 | {ERR_REASON(X509V3_R_EXTENSION_EXISTS) , "extension exists"}, | ||
| 156 | {ERR_REASON(X509V3_R_EXTENSION_NAME_ERROR), "extension name error"}, | ||
| 157 | {ERR_REASON(X509V3_R_EXTENSION_NOT_FOUND), "extension not found"}, | ||
| 158 | {ERR_REASON(X509V3_R_EXTENSION_SETTING_NOT_SUPPORTED), "extension setting not supported"}, | ||
| 159 | {ERR_REASON(X509V3_R_EXTENSION_VALUE_ERROR), "extension value error"}, | ||
| 160 | {ERR_REASON(X509V3_R_ILLEGAL_EMPTY_EXTENSION), "illegal empty extension"}, | ||
| 161 | {ERR_REASON(X509V3_R_ILLEGAL_HEX_DIGIT) , "illegal hex digit"}, | ||
| 162 | {ERR_REASON(X509V3_R_INCORRECT_POLICY_SYNTAX_TAG), "incorrect policy syntax tag"}, | ||
| 163 | {ERR_REASON(X509V3_R_INVALID_MULTIPLE_RDNS), "invalid multiple rdns"}, | ||
| 164 | {ERR_REASON(X509V3_R_INVALID_ASNUMBER) , "invalid asnumber"}, | ||
| 165 | {ERR_REASON(X509V3_R_INVALID_ASRANGE) , "invalid asrange"}, | ||
| 166 | {ERR_REASON(X509V3_R_INVALID_BOOLEAN_STRING), "invalid boolean string"}, | ||
| 167 | {ERR_REASON(X509V3_R_INVALID_EXTENSION_STRING), "invalid extension string"}, | ||
| 168 | {ERR_REASON(X509V3_R_INVALID_INHERITANCE), "invalid inheritance"}, | ||
| 169 | {ERR_REASON(X509V3_R_INVALID_IPADDRESS) , "invalid ipaddress"}, | ||
| 170 | {ERR_REASON(X509V3_R_INVALID_NAME) , "invalid name"}, | ||
| 171 | {ERR_REASON(X509V3_R_INVALID_NULL_ARGUMENT), "invalid null argument"}, | ||
| 172 | {ERR_REASON(X509V3_R_INVALID_NULL_NAME) , "invalid null name"}, | ||
| 173 | {ERR_REASON(X509V3_R_INVALID_NULL_VALUE) , "invalid null value"}, | ||
| 174 | {ERR_REASON(X509V3_R_INVALID_NUMBER) , "invalid number"}, | ||
| 175 | {ERR_REASON(X509V3_R_INVALID_NUMBERS) , "invalid numbers"}, | ||
| 176 | {ERR_REASON(X509V3_R_INVALID_OBJECT_IDENTIFIER), "invalid object identifier"}, | ||
| 177 | {ERR_REASON(X509V3_R_INVALID_OPTION) , "invalid option"}, | ||
| 178 | {ERR_REASON(X509V3_R_INVALID_POLICY_IDENTIFIER), "invalid policy identifier"}, | ||
| 179 | {ERR_REASON(X509V3_R_INVALID_PROXY_POLICY_SETTING), "invalid proxy policy setting"}, | ||
| 180 | {ERR_REASON(X509V3_R_INVALID_PURPOSE) , "invalid purpose"}, | ||
| 181 | {ERR_REASON(X509V3_R_INVALID_SAFI) , "invalid safi"}, | ||
| 182 | {ERR_REASON(X509V3_R_INVALID_SECTION) , "invalid section"}, | ||
| 183 | {ERR_REASON(X509V3_R_INVALID_SYNTAX) , "invalid syntax"}, | ||
| 184 | {ERR_REASON(X509V3_R_ISSUER_DECODE_ERROR), "issuer decode error"}, | ||
| 185 | {ERR_REASON(X509V3_R_MISSING_VALUE) , "missing value"}, | ||
| 186 | {ERR_REASON(X509V3_R_NEED_ORGANIZATION_AND_NUMBERS), "need organization and numbers"}, | ||
| 187 | {ERR_REASON(X509V3_R_NO_CONFIG_DATABASE) , "no config database"}, | ||
| 188 | {ERR_REASON(X509V3_R_NO_ISSUER_CERTIFICATE), "no issuer certificate"}, | ||
| 189 | {ERR_REASON(X509V3_R_NO_ISSUER_DETAILS) , "no issuer details"}, | ||
| 190 | {ERR_REASON(X509V3_R_NO_POLICY_IDENTIFIER), "no policy identifier"}, | ||
| 191 | {ERR_REASON(X509V3_R_NO_PROXY_CERT_POLICY_LANGUAGE_DEFINED), "no proxy cert policy language defined"}, | ||
| 192 | {ERR_REASON(X509V3_R_NO_PUBLIC_KEY) , "no public key"}, | ||
| 193 | {ERR_REASON(X509V3_R_NO_SUBJECT_DETAILS) , "no subject details"}, | ||
| 194 | {ERR_REASON(X509V3_R_ODD_NUMBER_OF_DIGITS), "odd number of digits"}, | ||
| 195 | {ERR_REASON(X509V3_R_OPERATION_NOT_DEFINED), "operation not defined"}, | ||
| 196 | {ERR_REASON(X509V3_R_OTHERNAME_ERROR) , "othername error"}, | ||
| 197 | {ERR_REASON(X509V3_R_POLICY_LANGUAGE_ALREADY_DEFINED), "policy language already defined"}, | ||
| 198 | {ERR_REASON(X509V3_R_POLICY_PATH_LENGTH) , "policy path length"}, | ||
| 199 | {ERR_REASON(X509V3_R_POLICY_PATH_LENGTH_ALREADY_DEFINED), "policy path length already defined"}, | ||
| 200 | {ERR_REASON(X509V3_R_POLICY_SYNTAX_NOT_CURRENTLY_SUPPORTED), "policy syntax not currently supported"}, | ||
| 201 | {ERR_REASON(X509V3_R_POLICY_WHEN_PROXY_LANGUAGE_REQUIRES_NO_POLICY), "policy when proxy language requires no policy"}, | ||
| 202 | {ERR_REASON(X509V3_R_SECTION_NOT_FOUND) , "section not found"}, | ||
| 203 | {ERR_REASON(X509V3_R_UNABLE_TO_GET_ISSUER_DETAILS), "unable to get issuer details"}, | ||
| 204 | {ERR_REASON(X509V3_R_UNABLE_TO_GET_ISSUER_KEYID), "unable to get issuer keyid"}, | ||
| 205 | {ERR_REASON(X509V3_R_UNKNOWN_BIT_STRING_ARGUMENT), "unknown bit string argument"}, | ||
| 206 | {ERR_REASON(X509V3_R_UNKNOWN_EXTENSION) , "unknown extension"}, | ||
| 207 | {ERR_REASON(X509V3_R_UNKNOWN_EXTENSION_NAME), "unknown extension name"}, | ||
| 208 | {ERR_REASON(X509V3_R_UNKNOWN_OPTION) , "unknown option"}, | ||
| 209 | {ERR_REASON(X509V3_R_UNSUPPORTED_OPTION) , "unsupported option"}, | ||
| 210 | {ERR_REASON(X509V3_R_UNSUPPORTED_TYPE) , "unsupported type"}, | ||
| 211 | {ERR_REASON(X509V3_R_USER_TOO_LONG) , "user too long"}, | ||
| 212 | {0, NULL} | ||
| 213 | }; | ||
| 214 | |||
| 215 | #endif | ||
| 216 | |||
| 217 | void | ||
| 218 | ERR_load_X509V3_strings(void) | ||
| 219 | { | ||
| 220 | #ifndef OPENSSL_NO_ERR | ||
| 221 | if (ERR_func_error_string(X509V3_str_functs[0].error) == NULL) { | ||
| 222 | ERR_load_strings(0, X509V3_str_functs); | ||
| 223 | ERR_load_strings(0, X509V3_str_reasons); | ||
| 224 | } | ||
| 225 | #endif | ||
| 226 | } | ||
diff --git a/src/lib/libcrypto/x509/x509_err.c b/src/lib/libcrypto/x509/x509_err.c index 3b321376ad..7afb10896b 100644 --- a/src/lib/libcrypto/x509/x509_err.c +++ b/src/lib/libcrypto/x509/x509_err.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: x509_err.c,v 1.13 2017/01/29 17:49:23 beck Exp $ */ | 1 | /* $OpenBSD: x509_err.c,v 1.14 2020/06/05 15:28:33 jsing Exp $ */ |
| 2 | /* ==================================================================== | 2 | /* ==================================================================== |
| 3 | * Copyright (c) 1999-2006 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 1999-2006 The OpenSSL Project. All rights reserved. |
| 4 | * | 4 | * |
| @@ -64,6 +64,7 @@ | |||
| 64 | 64 | ||
| 65 | #include <openssl/err.h> | 65 | #include <openssl/err.h> |
| 66 | #include <openssl/x509.h> | 66 | #include <openssl/x509.h> |
| 67 | #include <openssl/x509v3.h> | ||
| 67 | 68 | ||
| 68 | /* BEGIN ERROR CODES */ | 69 | /* BEGIN ERROR CODES */ |
| 69 | #ifndef OPENSSL_NO_ERR | 70 | #ifndef OPENSSL_NO_ERR |
| @@ -76,6 +77,75 @@ static ERR_STRING_DATA X509_str_functs[] = { | |||
| 76 | {0, NULL} | 77 | {0, NULL} |
| 77 | }; | 78 | }; |
| 78 | 79 | ||
| 80 | static ERR_STRING_DATA X509V3_str_functs[] = { | ||
| 81 | {ERR_FUNC(X509V3_F_A2I_GENERAL_NAME), "A2I_GENERAL_NAME"}, | ||
| 82 | {ERR_FUNC(X509V3_F_ASIDENTIFIERCHOICE_CANONIZE), "ASIDENTIFIERCHOICE_CANONIZE"}, | ||
| 83 | {ERR_FUNC(X509V3_F_ASIDENTIFIERCHOICE_IS_CANONICAL), "ASIDENTIFIERCHOICE_IS_CANONICAL"}, | ||
| 84 | {ERR_FUNC(X509V3_F_COPY_EMAIL), "COPY_EMAIL"}, | ||
| 85 | {ERR_FUNC(X509V3_F_COPY_ISSUER), "COPY_ISSUER"}, | ||
| 86 | {ERR_FUNC(X509V3_F_DO_DIRNAME), "DO_DIRNAME"}, | ||
| 87 | {ERR_FUNC(X509V3_F_DO_EXT_CONF), "DO_EXT_CONF"}, | ||
| 88 | {ERR_FUNC(X509V3_F_DO_EXT_I2D), "DO_EXT_I2D"}, | ||
| 89 | {ERR_FUNC(X509V3_F_DO_EXT_NCONF), "DO_EXT_NCONF"}, | ||
| 90 | {ERR_FUNC(X509V3_F_DO_I2V_NAME_CONSTRAINTS), "DO_I2V_NAME_CONSTRAINTS"}, | ||
| 91 | {ERR_FUNC(X509V3_F_GNAMES_FROM_SECTNAME), "GNAMES_FROM_SECTNAME"}, | ||
| 92 | {ERR_FUNC(X509V3_F_HEX_TO_STRING), "hex_to_string"}, | ||
| 93 | {ERR_FUNC(X509V3_F_I2S_ASN1_ENUMERATED), "i2s_ASN1_ENUMERATED"}, | ||
| 94 | {ERR_FUNC(X509V3_F_I2S_ASN1_IA5STRING), "I2S_ASN1_IA5STRING"}, | ||
| 95 | {ERR_FUNC(X509V3_F_I2S_ASN1_INTEGER), "i2s_ASN1_INTEGER"}, | ||
| 96 | {ERR_FUNC(X509V3_F_I2V_AUTHORITY_INFO_ACCESS), "I2V_AUTHORITY_INFO_ACCESS"}, | ||
| 97 | {ERR_FUNC(X509V3_F_NOTICE_SECTION), "NOTICE_SECTION"}, | ||
| 98 | {ERR_FUNC(X509V3_F_NREF_NOS), "NREF_NOS"}, | ||
| 99 | {ERR_FUNC(X509V3_F_POLICY_SECTION), "POLICY_SECTION"}, | ||
| 100 | {ERR_FUNC(X509V3_F_PROCESS_PCI_VALUE), "PROCESS_PCI_VALUE"}, | ||
| 101 | {ERR_FUNC(X509V3_F_R2I_CERTPOL), "R2I_CERTPOL"}, | ||
| 102 | {ERR_FUNC(X509V3_F_R2I_PCI), "R2I_PCI"}, | ||
| 103 | {ERR_FUNC(X509V3_F_S2I_ASN1_IA5STRING), "S2I_ASN1_IA5STRING"}, | ||
| 104 | {ERR_FUNC(X509V3_F_S2I_ASN1_INTEGER), "s2i_ASN1_INTEGER"}, | ||
| 105 | {ERR_FUNC(X509V3_F_S2I_ASN1_OCTET_STRING), "s2i_ASN1_OCTET_STRING"}, | ||
| 106 | {ERR_FUNC(X509V3_F_S2I_ASN1_SKEY_ID), "S2I_ASN1_SKEY_ID"}, | ||
| 107 | {ERR_FUNC(X509V3_F_S2I_SKEY_ID), "S2I_SKEY_ID"}, | ||
| 108 | {ERR_FUNC(X509V3_F_SET_DIST_POINT_NAME), "SET_DIST_POINT_NAME"}, | ||
| 109 | {ERR_FUNC(X509V3_F_STRING_TO_HEX), "string_to_hex"}, | ||
| 110 | {ERR_FUNC(X509V3_F_SXNET_ADD_ID_ASC), "SXNET_add_id_asc"}, | ||
| 111 | {ERR_FUNC(X509V3_F_SXNET_ADD_ID_INTEGER), "SXNET_add_id_INTEGER"}, | ||
| 112 | {ERR_FUNC(X509V3_F_SXNET_ADD_ID_ULONG), "SXNET_add_id_ulong"}, | ||
| 113 | {ERR_FUNC(X509V3_F_SXNET_GET_ID_ASC), "SXNET_get_id_asc"}, | ||
| 114 | {ERR_FUNC(X509V3_F_SXNET_GET_ID_ULONG), "SXNET_get_id_ulong"}, | ||
| 115 | {ERR_FUNC(X509V3_F_V2I_ASIDENTIFIERS), "V2I_ASIDENTIFIERS"}, | ||
| 116 | {ERR_FUNC(X509V3_F_V2I_ASN1_BIT_STRING), "v2i_ASN1_BIT_STRING"}, | ||
| 117 | {ERR_FUNC(X509V3_F_V2I_AUTHORITY_INFO_ACCESS), "V2I_AUTHORITY_INFO_ACCESS"}, | ||
| 118 | {ERR_FUNC(X509V3_F_V2I_AUTHORITY_KEYID), "V2I_AUTHORITY_KEYID"}, | ||
| 119 | {ERR_FUNC(X509V3_F_V2I_BASIC_CONSTRAINTS), "V2I_BASIC_CONSTRAINTS"}, | ||
| 120 | {ERR_FUNC(X509V3_F_V2I_CRLD), "V2I_CRLD"}, | ||
| 121 | {ERR_FUNC(X509V3_F_V2I_EXTENDED_KEY_USAGE), "V2I_EXTENDED_KEY_USAGE"}, | ||
| 122 | {ERR_FUNC(X509V3_F_V2I_GENERAL_NAMES), "v2i_GENERAL_NAMES"}, | ||
| 123 | {ERR_FUNC(X509V3_F_V2I_GENERAL_NAME_EX), "v2i_GENERAL_NAME_ex"}, | ||
| 124 | {ERR_FUNC(X509V3_F_V2I_IDP), "V2I_IDP"}, | ||
| 125 | {ERR_FUNC(X509V3_F_V2I_IPADDRBLOCKS), "V2I_IPADDRBLOCKS"}, | ||
| 126 | {ERR_FUNC(X509V3_F_V2I_ISSUER_ALT), "V2I_ISSUER_ALT"}, | ||
| 127 | {ERR_FUNC(X509V3_F_V2I_NAME_CONSTRAINTS), "V2I_NAME_CONSTRAINTS"}, | ||
| 128 | {ERR_FUNC(X509V3_F_V2I_POLICY_CONSTRAINTS), "V2I_POLICY_CONSTRAINTS"}, | ||
| 129 | {ERR_FUNC(X509V3_F_V2I_POLICY_MAPPINGS), "V2I_POLICY_MAPPINGS"}, | ||
| 130 | {ERR_FUNC(X509V3_F_V2I_SUBJECT_ALT), "V2I_SUBJECT_ALT"}, | ||
| 131 | {ERR_FUNC(X509V3_F_V3_ADDR_VALIDATE_PATH_INTERNAL), "V3_ADDR_VALIDATE_PATH_INTERNAL"}, | ||
| 132 | {ERR_FUNC(X509V3_F_V3_GENERIC_EXTENSION), "V3_GENERIC_EXTENSION"}, | ||
| 133 | {ERR_FUNC(X509V3_F_X509V3_ADD1_I2D), "X509V3_add1_i2d"}, | ||
| 134 | {ERR_FUNC(X509V3_F_X509V3_ADD_VALUE), "X509V3_add_value"}, | ||
| 135 | {ERR_FUNC(X509V3_F_X509V3_EXT_ADD), "X509V3_EXT_add"}, | ||
| 136 | {ERR_FUNC(X509V3_F_X509V3_EXT_ADD_ALIAS), "X509V3_EXT_add_alias"}, | ||
| 137 | {ERR_FUNC(X509V3_F_X509V3_EXT_CONF), "X509V3_EXT_conf"}, | ||
| 138 | {ERR_FUNC(X509V3_F_X509V3_EXT_I2D), "X509V3_EXT_i2d"}, | ||
| 139 | {ERR_FUNC(X509V3_F_X509V3_EXT_NCONF), "X509V3_EXT_nconf"}, | ||
| 140 | {ERR_FUNC(X509V3_F_X509V3_GET_SECTION), "X509V3_get_section"}, | ||
| 141 | {ERR_FUNC(X509V3_F_X509V3_GET_STRING), "X509V3_get_string"}, | ||
| 142 | {ERR_FUNC(X509V3_F_X509V3_GET_VALUE_BOOL), "X509V3_get_value_bool"}, | ||
| 143 | {ERR_FUNC(X509V3_F_X509V3_PARSE_LIST), "X509V3_parse_list"}, | ||
| 144 | {ERR_FUNC(X509V3_F_X509_PURPOSE_ADD), "X509_PURPOSE_add"}, | ||
| 145 | {ERR_FUNC(X509V3_F_X509_PURPOSE_SET), "X509_PURPOSE_set"}, | ||
| 146 | {0, NULL} | ||
| 147 | }; | ||
| 148 | |||
| 79 | static ERR_STRING_DATA X509_str_reasons[] = { | 149 | static ERR_STRING_DATA X509_str_reasons[] = { |
| 80 | {ERR_REASON(X509_R_BAD_X509_FILETYPE) , "bad x509 filetype"}, | 150 | {ERR_REASON(X509_R_BAD_X509_FILETYPE) , "bad x509 filetype"}, |
| 81 | {ERR_REASON(X509_R_BASE64_DECODE_ERROR) , "base64 decode error"}, | 151 | {ERR_REASON(X509_R_BASE64_DECODE_ERROR) , "base64 decode error"}, |
| @@ -106,6 +176,78 @@ static ERR_STRING_DATA X509_str_reasons[] = { | |||
| 106 | {0, NULL} | 176 | {0, NULL} |
| 107 | }; | 177 | }; |
| 108 | 178 | ||
| 179 | static ERR_STRING_DATA X509V3_str_reasons[] = { | ||
| 180 | {ERR_REASON(X509V3_R_BAD_IP_ADDRESS) , "bad ip address"}, | ||
| 181 | {ERR_REASON(X509V3_R_BAD_OBJECT) , "bad object"}, | ||
| 182 | {ERR_REASON(X509V3_R_BN_DEC2BN_ERROR) , "bn dec2bn error"}, | ||
| 183 | {ERR_REASON(X509V3_R_BN_TO_ASN1_INTEGER_ERROR), "bn to asn1 integer error"}, | ||
| 184 | {ERR_REASON(X509V3_R_DIRNAME_ERROR) , "dirname error"}, | ||
| 185 | {ERR_REASON(X509V3_R_DISTPOINT_ALREADY_SET), "distpoint already set"}, | ||
| 186 | {ERR_REASON(X509V3_R_DUPLICATE_ZONE_ID) , "duplicate zone id"}, | ||
| 187 | {ERR_REASON(X509V3_R_ERROR_CONVERTING_ZONE), "error converting zone"}, | ||
| 188 | {ERR_REASON(X509V3_R_ERROR_CREATING_EXTENSION), "error creating extension"}, | ||
| 189 | {ERR_REASON(X509V3_R_ERROR_IN_EXTENSION) , "error in extension"}, | ||
| 190 | {ERR_REASON(X509V3_R_EXPECTED_A_SECTION_NAME), "expected a section name"}, | ||
| 191 | {ERR_REASON(X509V3_R_EXTENSION_EXISTS) , "extension exists"}, | ||
| 192 | {ERR_REASON(X509V3_R_EXTENSION_NAME_ERROR), "extension name error"}, | ||
| 193 | {ERR_REASON(X509V3_R_EXTENSION_NOT_FOUND), "extension not found"}, | ||
| 194 | {ERR_REASON(X509V3_R_EXTENSION_SETTING_NOT_SUPPORTED), "extension setting not supported"}, | ||
| 195 | {ERR_REASON(X509V3_R_EXTENSION_VALUE_ERROR), "extension value error"}, | ||
| 196 | {ERR_REASON(X509V3_R_ILLEGAL_EMPTY_EXTENSION), "illegal empty extension"}, | ||
| 197 | {ERR_REASON(X509V3_R_ILLEGAL_HEX_DIGIT) , "illegal hex digit"}, | ||
| 198 | {ERR_REASON(X509V3_R_INCORRECT_POLICY_SYNTAX_TAG), "incorrect policy syntax tag"}, | ||
| 199 | {ERR_REASON(X509V3_R_INVALID_MULTIPLE_RDNS), "invalid multiple rdns"}, | ||
| 200 | {ERR_REASON(X509V3_R_INVALID_ASNUMBER) , "invalid asnumber"}, | ||
| 201 | {ERR_REASON(X509V3_R_INVALID_ASRANGE) , "invalid asrange"}, | ||
| 202 | {ERR_REASON(X509V3_R_INVALID_BOOLEAN_STRING), "invalid boolean string"}, | ||
| 203 | {ERR_REASON(X509V3_R_INVALID_EXTENSION_STRING), "invalid extension string"}, | ||
| 204 | {ERR_REASON(X509V3_R_INVALID_INHERITANCE), "invalid inheritance"}, | ||
| 205 | {ERR_REASON(X509V3_R_INVALID_IPADDRESS) , "invalid ipaddress"}, | ||
| 206 | {ERR_REASON(X509V3_R_INVALID_NAME) , "invalid name"}, | ||
| 207 | {ERR_REASON(X509V3_R_INVALID_NULL_ARGUMENT), "invalid null argument"}, | ||
| 208 | {ERR_REASON(X509V3_R_INVALID_NULL_NAME) , "invalid null name"}, | ||
| 209 | {ERR_REASON(X509V3_R_INVALID_NULL_VALUE) , "invalid null value"}, | ||
| 210 | {ERR_REASON(X509V3_R_INVALID_NUMBER) , "invalid number"}, | ||
| 211 | {ERR_REASON(X509V3_R_INVALID_NUMBERS) , "invalid numbers"}, | ||
| 212 | {ERR_REASON(X509V3_R_INVALID_OBJECT_IDENTIFIER), "invalid object identifier"}, | ||
| 213 | {ERR_REASON(X509V3_R_INVALID_OPTION) , "invalid option"}, | ||
| 214 | {ERR_REASON(X509V3_R_INVALID_POLICY_IDENTIFIER), "invalid policy identifier"}, | ||
| 215 | {ERR_REASON(X509V3_R_INVALID_PROXY_POLICY_SETTING), "invalid proxy policy setting"}, | ||
| 216 | {ERR_REASON(X509V3_R_INVALID_PURPOSE) , "invalid purpose"}, | ||
| 217 | {ERR_REASON(X509V3_R_INVALID_SAFI) , "invalid safi"}, | ||
| 218 | {ERR_REASON(X509V3_R_INVALID_SECTION) , "invalid section"}, | ||
| 219 | {ERR_REASON(X509V3_R_INVALID_SYNTAX) , "invalid syntax"}, | ||
| 220 | {ERR_REASON(X509V3_R_ISSUER_DECODE_ERROR), "issuer decode error"}, | ||
| 221 | {ERR_REASON(X509V3_R_MISSING_VALUE) , "missing value"}, | ||
| 222 | {ERR_REASON(X509V3_R_NEED_ORGANIZATION_AND_NUMBERS), "need organization and numbers"}, | ||
| 223 | {ERR_REASON(X509V3_R_NO_CONFIG_DATABASE) , "no config database"}, | ||
| 224 | {ERR_REASON(X509V3_R_NO_ISSUER_CERTIFICATE), "no issuer certificate"}, | ||
| 225 | {ERR_REASON(X509V3_R_NO_ISSUER_DETAILS) , "no issuer details"}, | ||
| 226 | {ERR_REASON(X509V3_R_NO_POLICY_IDENTIFIER), "no policy identifier"}, | ||
| 227 | {ERR_REASON(X509V3_R_NO_PROXY_CERT_POLICY_LANGUAGE_DEFINED), "no proxy cert policy language defined"}, | ||
| 228 | {ERR_REASON(X509V3_R_NO_PUBLIC_KEY) , "no public key"}, | ||
| 229 | {ERR_REASON(X509V3_R_NO_SUBJECT_DETAILS) , "no subject details"}, | ||
| 230 | {ERR_REASON(X509V3_R_ODD_NUMBER_OF_DIGITS), "odd number of digits"}, | ||
| 231 | {ERR_REASON(X509V3_R_OPERATION_NOT_DEFINED), "operation not defined"}, | ||
| 232 | {ERR_REASON(X509V3_R_OTHERNAME_ERROR) , "othername error"}, | ||
| 233 | {ERR_REASON(X509V3_R_POLICY_LANGUAGE_ALREADY_DEFINED), "policy language already defined"}, | ||
| 234 | {ERR_REASON(X509V3_R_POLICY_PATH_LENGTH) , "policy path length"}, | ||
| 235 | {ERR_REASON(X509V3_R_POLICY_PATH_LENGTH_ALREADY_DEFINED), "policy path length already defined"}, | ||
| 236 | {ERR_REASON(X509V3_R_POLICY_SYNTAX_NOT_CURRENTLY_SUPPORTED), "policy syntax not currently supported"}, | ||
| 237 | {ERR_REASON(X509V3_R_POLICY_WHEN_PROXY_LANGUAGE_REQUIRES_NO_POLICY), "policy when proxy language requires no policy"}, | ||
| 238 | {ERR_REASON(X509V3_R_SECTION_NOT_FOUND) , "section not found"}, | ||
| 239 | {ERR_REASON(X509V3_R_UNABLE_TO_GET_ISSUER_DETAILS), "unable to get issuer details"}, | ||
| 240 | {ERR_REASON(X509V3_R_UNABLE_TO_GET_ISSUER_KEYID), "unable to get issuer keyid"}, | ||
| 241 | {ERR_REASON(X509V3_R_UNKNOWN_BIT_STRING_ARGUMENT), "unknown bit string argument"}, | ||
| 242 | {ERR_REASON(X509V3_R_UNKNOWN_EXTENSION) , "unknown extension"}, | ||
| 243 | {ERR_REASON(X509V3_R_UNKNOWN_EXTENSION_NAME), "unknown extension name"}, | ||
| 244 | {ERR_REASON(X509V3_R_UNKNOWN_OPTION) , "unknown option"}, | ||
| 245 | {ERR_REASON(X509V3_R_UNSUPPORTED_OPTION) , "unsupported option"}, | ||
| 246 | {ERR_REASON(X509V3_R_UNSUPPORTED_TYPE) , "unsupported type"}, | ||
| 247 | {ERR_REASON(X509V3_R_USER_TOO_LONG) , "user too long"}, | ||
| 248 | {0, NULL} | ||
| 249 | }; | ||
| 250 | |||
| 109 | #endif | 251 | #endif |
| 110 | 252 | ||
| 111 | void | 253 | void |
| @@ -118,3 +260,15 @@ ERR_load_X509_strings(void) | |||
| 118 | } | 260 | } |
| 119 | #endif | 261 | #endif |
| 120 | } | 262 | } |
| 263 | |||
| 264 | |||
| 265 | void | ||
| 266 | ERR_load_X509V3_strings(void) | ||
| 267 | { | ||
| 268 | #ifndef OPENSSL_NO_ERR | ||
| 269 | if (ERR_func_error_string(X509V3_str_functs[0].error) == NULL) { | ||
| 270 | ERR_load_strings(0, X509V3_str_functs); | ||
| 271 | ERR_load_strings(0, X509V3_str_reasons); | ||
| 272 | } | ||
| 273 | #endif | ||
| 274 | } | ||
