fixes #4149 (OpenSSL: switch to OpenSSL 3.x)

1 files changed, 13 insertions, 73 deletions

diff --git a/include/openssl/x509err.h b/include/openssl/x509err.h
index 5f907ef5dc..33e47962be 100644
--- a/include/openssl/x509err.h
+++ b/include/openssl/x509err.h
@@ -1,88 +1,22 @@
 /*

  * Generated by util/mkerr.pl DO NOT EDIT

- * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.

+ * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.

  *

- * Licensed under the OpenSSL license (the "License").  You may not use

+ * 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_X509ERR_H

-# define HEADER_X509ERR_H

+#ifndef OPENSSL_X509ERR_H

+# define OPENSSL_X509ERR_H

+# pragma once

 

+# include <openssl/opensslconf.h>

 # include <openssl/symhacks.h>

+# include <openssl/cryptoerr_legacy.h>

 

-# ifdef  __cplusplus

-extern "C"

-# endif

-int ERR_load_X509_strings(void);

 

-/*

- * X509 function codes.

- */

-# 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

-# define X509_F_GET_CERT_BY_SUBJECT                       103

-# define X509_F_I2D_X509_AUX                              151

-# define X509_F_LOOKUP_CERTS_SK                           152

-# define X509_F_NETSCAPE_SPKI_B64_DECODE                  129

-# define X509_F_NETSCAPE_SPKI_B64_ENCODE                  130

-# define X509_F_NEW_DIR                                   153

-# define X509_F_X509AT_ADD1_ATTR                          135

-# define X509_F_X509V3_ADD_EXT                            104

-# define X509_F_X509_ATTRIBUTE_CREATE_BY_NID              136

-# define X509_F_X509_ATTRIBUTE_CREATE_BY_OBJ              137

-# define X509_F_X509_ATTRIBUTE_CREATE_BY_TXT              140

-# define X509_F_X509_ATTRIBUTE_GET0_DATA                  139

-# define X509_F_X509_ATTRIBUTE_SET1_DATA                  138

-# define X509_F_X509_CHECK_PRIVATE_KEY                    128

-# define X509_F_X509_CRL_DIFF                             105

-# define X509_F_X509_CRL_METHOD_NEW                       154

-# define X509_F_X509_CRL_PRINT_FP                         147

-# define X509_F_X509_EXTENSION_CREATE_BY_NID              108

-# define X509_F_X509_EXTENSION_CREATE_BY_OBJ              109

-# define X509_F_X509_GET_PUBKEY_PARAMETERS                110

-# define X509_F_X509_LOAD_CERT_CRL_FILE                   132

-# define X509_F_X509_LOAD_CERT_FILE                       111

-# define X509_F_X509_LOAD_CRL_FILE                        112

-# define X509_F_X509_LOOKUP_METH_NEW                      160

-# define X509_F_X509_LOOKUP_NEW                           155

-# define X509_F_X509_NAME_ADD_ENTRY                       113

-# define X509_F_X509_NAME_CANON                           156

-# define X509_F_X509_NAME_ENTRY_CREATE_BY_NID             114

-# define X509_F_X509_NAME_ENTRY_CREATE_BY_TXT             131

-# define X509_F_X509_NAME_ENTRY_SET_OBJECT                115

-# define X509_F_X509_NAME_ONELINE                         116

-# define X509_F_X509_NAME_PRINT                           117

-# define X509_F_X509_OBJECT_NEW                           150

-# define X509_F_X509_PRINT_EX_FP                          118

-# define X509_F_X509_PUBKEY_DECODE                        148

-# define X509_F_X509_PUBKEY_GET                           161

-# define X509_F_X509_PUBKEY_GET0                          119

-# define X509_F_X509_PUBKEY_SET                           120

-# define X509_F_X509_REQ_CHECK_PRIVATE_KEY                144

-# define X509_F_X509_REQ_PRINT_EX                         121

-# define X509_F_X509_REQ_PRINT_FP                         122

-# define X509_F_X509_REQ_TO_X509                          123

-# define X509_F_X509_STORE_ADD_CERT                       124

-# define X509_F_X509_STORE_ADD_CRL                        125

-# define X509_F_X509_STORE_ADD_LOOKUP                     157

-# define X509_F_X509_STORE_CTX_GET1_ISSUER                146

-# define X509_F_X509_STORE_CTX_INIT                       143

-# define X509_F_X509_STORE_CTX_NEW                        142

-# define X509_F_X509_STORE_CTX_PURPOSE_INHERIT            134

-# define X509_F_X509_STORE_NEW                            158

-# define X509_F_X509_TO_X509_REQ                          126

-# define X509_F_X509_TRUST_ADD                            133

-# define X509_F_X509_TRUST_SET                            141

-# define X509_F_X509_VERIFY_CERT                          127

-# define X509_F_X509_VERIFY_PARAM_NEW                     159

 

 /*

  * X509 reason codes.

@@ -92,12 +26,17 @@ int ERR_load_X509_strings(void);
 # define X509_R_BAD_X509_FILETYPE                         100

 # define X509_R_BASE64_DECODE_ERROR                       118

 # define X509_R_CANT_CHECK_DH_KEY                         114

+# define X509_R_CERTIFICATE_VERIFICATION_FAILED           139

 # define X509_R_CERT_ALREADY_IN_HASH_TABLE                101

 # define X509_R_CRL_ALREADY_DELTA                         127

 # define X509_R_CRL_VERIFY_FAILURE                        131

+# define X509_R_DUPLICATE_ATTRIBUTE                       140

+# define X509_R_ERROR_GETTING_MD_BY_NID                   141

+# define X509_R_ERROR_USING_SIGINF_SET                    142

 # define X509_R_IDP_MISMATCH                              128

 # define X509_R_INVALID_ATTRIBUTES                        138

 # define X509_R_INVALID_DIRECTORY                         113

+# define X509_R_INVALID_DISTPOINT                         143

 # define X509_R_INVALID_FIELD_NAME                        119

 # define X509_R_INVALID_TRUST                             123

 # define X509_R_ISSUER_MISMATCH                           129

@@ -121,6 +60,7 @@ int ERR_load_X509_strings(void);
 # define X509_R_UNKNOWN_KEY_TYPE                          117

 # define X509_R_UNKNOWN_NID                               109

 # define X509_R_UNKNOWN_PURPOSE_ID                        121

+# define X509_R_UNKNOWN_SIGID_ALGS                        144

 # define X509_R_UNKNOWN_TRUST_ID                          120

 # define X509_R_UNSUPPORTED_ALGORITHM                     111

 # define X509_R_WRONG_LOOKUP_TYPE                         112