Adds build for OpenSSL 1.1.1a
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
/*
|
||||
* Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
|
||||
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
|
||||
*
|
||||
* Licensed under the OpenSSL license (the "License"). You may not use
|
||||
* this file except in compliance with the License. You can obtain a copy
|
||||
@@ -7,12 +8,6 @@
|
||||
* https://www.openssl.org/source/license.html
|
||||
*/
|
||||
|
||||
/* ====================================================================
|
||||
* Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
|
||||
* ECDH support in OpenSSL originally developed by
|
||||
* SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
|
||||
*/
|
||||
|
||||
#ifndef HEADER_X509_H
|
||||
# define HEADER_X509_H
|
||||
|
||||
@@ -22,7 +17,6 @@
|
||||
# include <openssl/buffer.h>
|
||||
# include <openssl/evp.h>
|
||||
# include <openssl/bio.h>
|
||||
# include <openssl/stack.h>
|
||||
# include <openssl/asn1.h>
|
||||
# include <openssl/safestack.h>
|
||||
# include <openssl/ec.h>
|
||||
@@ -34,11 +28,19 @@
|
||||
# endif
|
||||
|
||||
# include <openssl/sha.h>
|
||||
# include <openssl/x509err.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
|
||||
/* Flags for X509_get_signature_info() */
|
||||
/* Signature info is valid */
|
||||
# define X509_SIG_INFO_VALID 0x1
|
||||
/* Signature is suitable for TLS use */
|
||||
# define X509_SIG_INFO_TLS 0x2
|
||||
|
||||
# define X509_FILETYPE_PEM 1
|
||||
# define X509_FILETYPE_ASN1 2
|
||||
# define X509_FILETYPE_DEFAULT 3
|
||||
@@ -252,9 +254,8 @@ typedef struct X509_info_st {
|
||||
DEFINE_STACK_OF(X509_INFO)
|
||||
|
||||
/*
|
||||
* The next 2 structures and their 8 routines were sent to me by Pat Richard
|
||||
* <patr@x509.com> and are used to manipulate Netscapes spki structures -
|
||||
* useful if you are writing a CA web page
|
||||
* The next 2 structures and their 8 routines are used to manipulate Netscape's
|
||||
* spki structures - useful if you are writing a CA web page
|
||||
*/
|
||||
typedef struct Netscape_spkac_st {
|
||||
X509_PUBKEY *pubkey;
|
||||
@@ -302,6 +303,16 @@ typedef struct PBKDF2PARAM_st {
|
||||
X509_ALGOR *prf;
|
||||
} PBKDF2PARAM;
|
||||
|
||||
#ifndef OPENSSL_NO_SCRYPT
|
||||
typedef struct SCRYPT_PARAMS_st {
|
||||
ASN1_OCTET_STRING *salt;
|
||||
ASN1_INTEGER *costParameter;
|
||||
ASN1_INTEGER *blockSize;
|
||||
ASN1_INTEGER *parallelizationParameter;
|
||||
ASN1_INTEGER *keyLength;
|
||||
} SCRYPT_PARAMS;
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
@@ -549,6 +560,14 @@ X509 *d2i_X509_AUX(X509 **a, const unsigned char **pp, long length);
|
||||
|
||||
int i2d_re_X509_tbs(X509 *x, unsigned char **pp);
|
||||
|
||||
int X509_SIG_INFO_get(const X509_SIG_INFO *siginf, int *mdnid, int *pknid,
|
||||
int *secbits, uint32_t *flags);
|
||||
void X509_SIG_INFO_set(X509_SIG_INFO *siginf, int mdnid, int pknid,
|
||||
int secbits, uint32_t flags);
|
||||
|
||||
int X509_get_signature_info(X509 *x, int *mdnid, int *pknid, int *secbits,
|
||||
uint32_t *flags);
|
||||
|
||||
void X509_get0_signature(const ASN1_BIT_STRING **psig,
|
||||
const X509_ALGOR **palg, const X509 *x);
|
||||
int X509_get_signature_nid(const X509 *x);
|
||||
@@ -641,7 +660,7 @@ int X509_get_signature_type(const X509 *x);
|
||||
|
||||
/*
|
||||
* This one is only used so that a binary form can output, as in
|
||||
* i2d_X509_NAME(X509_get_X509_PUBKEY(x), &buf)
|
||||
* i2d_X509_PUBKEY(X509_get_X509_PUBKEY(x), &buf)
|
||||
*/
|
||||
X509_PUBKEY *X509_get_X509_PUBKEY(const X509 *x);
|
||||
const STACK_OF(X509_EXTENSION) *X509_get0_extensions(const X509 *x);
|
||||
@@ -773,6 +792,7 @@ int X509_print_ex(BIO *bp, X509 *x, unsigned long nmflag,
|
||||
unsigned long cflag);
|
||||
int X509_print(BIO *bp, X509 *x);
|
||||
int X509_ocspid_print(BIO *bp, X509 *x);
|
||||
int X509_CRL_print_ex(BIO *out, X509_CRL *x, unsigned long nmflag);
|
||||
int X509_CRL_print(BIO *bp, X509_CRL *x);
|
||||
int X509_REQ_print_ex(BIO *bp, X509_REQ *x, unsigned long nmflag,
|
||||
unsigned long cflag);
|
||||
@@ -805,7 +825,7 @@ X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_txt(X509_NAME_ENTRY **ne,
|
||||
const unsigned char *bytes,
|
||||
int len);
|
||||
X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_NID(X509_NAME_ENTRY **ne, int nid,
|
||||
int type,
|
||||
int type,
|
||||
const unsigned char *bytes,
|
||||
int len);
|
||||
int X509_NAME_add_entry_by_txt(X509_NAME *name, const char *field, int type,
|
||||
@@ -959,6 +979,9 @@ X509 *X509_find_by_subject(STACK_OF(X509) *sk, X509_NAME *name);
|
||||
DECLARE_ASN1_FUNCTIONS(PBEPARAM)
|
||||
DECLARE_ASN1_FUNCTIONS(PBE2PARAM)
|
||||
DECLARE_ASN1_FUNCTIONS(PBKDF2PARAM)
|
||||
#ifndef OPENSSL_NO_SCRYPT
|
||||
DECLARE_ASN1_FUNCTIONS(SCRYPT_PARAMS)
|
||||
#endif
|
||||
|
||||
int PKCS5_pbe_set0_algor(X509_ALGOR *algor, int alg, int iter,
|
||||
const unsigned char *salt, int saltlen);
|
||||
@@ -1018,106 +1041,6 @@ int X509_TRUST_get_flags(const X509_TRUST *xp);
|
||||
char *X509_TRUST_get0_name(const X509_TRUST *xp);
|
||||
int X509_TRUST_get_trust(const X509_TRUST *xp);
|
||||
|
||||
/* BEGIN ERROR CODES */
|
||||
/*
|
||||
* The following lines are auto generated by the script mkerr.pl. Any changes
|
||||
* made after this point may be overwritten when the script is next run.
|
||||
*/
|
||||
|
||||
int ERR_load_X509_strings(void);
|
||||
|
||||
/* Error codes for the X509 functions. */
|
||||
|
||||
/* 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_NETSCAPE_SPKI_B64_DECODE 129
|
||||
# define X509_F_NETSCAPE_SPKI_B64_ENCODE 130
|
||||
# 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_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_NAME_ADD_ENTRY 113
|
||||
# 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_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_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_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
|
||||
|
||||
/* Reason codes. */
|
||||
# define X509_R_AKID_MISMATCH 110
|
||||
# define X509_R_BAD_SELECTOR 133
|
||||
# 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_CERT_ALREADY_IN_HASH_TABLE 101
|
||||
# define X509_R_CRL_ALREADY_DELTA 127
|
||||
# define X509_R_CRL_VERIFY_FAILURE 131
|
||||
# define X509_R_IDP_MISMATCH 128
|
||||
# define X509_R_INVALID_DIRECTORY 113
|
||||
# define X509_R_INVALID_FIELD_NAME 119
|
||||
# define X509_R_INVALID_TRUST 123
|
||||
# define X509_R_ISSUER_MISMATCH 129
|
||||
# define X509_R_KEY_TYPE_MISMATCH 115
|
||||
# define X509_R_KEY_VALUES_MISMATCH 116
|
||||
# define X509_R_LOADING_CERT_DIR 103
|
||||
# define X509_R_LOADING_DEFAULTS 104
|
||||
# define X509_R_METHOD_NOT_SUPPORTED 124
|
||||
# define X509_R_NAME_TOO_LONG 134
|
||||
# define X509_R_NEWER_CRL_NOT_NEWER 132
|
||||
# define X509_R_NO_CERT_SET_FOR_US_TO_VERIFY 105
|
||||
# define X509_R_NO_CRL_NUMBER 130
|
||||
# define X509_R_PUBLIC_KEY_DECODE_ERROR 125
|
||||
# define X509_R_PUBLIC_KEY_ENCODE_ERROR 126
|
||||
# define X509_R_SHOULD_RETRY 106
|
||||
# define X509_R_UNABLE_TO_FIND_PARAMETERS_IN_CHAIN 107
|
||||
# define X509_R_UNABLE_TO_GET_CERTS_PUBLIC_KEY 108
|
||||
# define X509_R_UNKNOWN_KEY_TYPE 117
|
||||
# define X509_R_UNKNOWN_NID 109
|
||||
# define X509_R_UNKNOWN_PURPOSE_ID 121
|
||||
# define X509_R_UNKNOWN_TRUST_ID 120
|
||||
# define X509_R_UNSUPPORTED_ALGORITHM 111
|
||||
# define X509_R_WRONG_LOOKUP_TYPE 112
|
||||
# define X509_R_WRONG_TYPE 122
|
||||
|
||||
# ifdef __cplusplus
|
||||
}
|
||||
# endif
|
||||
|
||||
Reference in New Issue
Block a user