Adds build for OpenSSL 1.1.1a
This commit is contained in:
@@ -12,10 +12,10 @@
|
||||
|
||||
# include <openssl/e_os2.h>
|
||||
# include <openssl/bio.h>
|
||||
# include <openssl/stack.h>
|
||||
# include <openssl/safestack.h>
|
||||
# include <openssl/evp.h>
|
||||
# include <openssl/x509.h>
|
||||
# include <openssl/pem2.h>
|
||||
# include <openssl/pemerr.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
@@ -54,56 +54,6 @@ extern "C" {
|
||||
# define PEM_TYPE_MIC_CLEAR 30
|
||||
# define PEM_TYPE_CLEAR 40
|
||||
|
||||
typedef struct pem_recip_st {
|
||||
char *name;
|
||||
X509_NAME *dn;
|
||||
int cipher;
|
||||
int key_enc;
|
||||
/* char iv[8]; unused and wrong size */
|
||||
} PEM_USER;
|
||||
|
||||
typedef struct pem_ctx_st {
|
||||
int type; /* what type of object */
|
||||
struct {
|
||||
int version;
|
||||
int mode;
|
||||
} proc_type;
|
||||
|
||||
char *domain;
|
||||
|
||||
struct {
|
||||
int cipher;
|
||||
/*-
|
||||
unused, and wrong size
|
||||
unsigned char iv[8]; */
|
||||
} DEK_info;
|
||||
|
||||
PEM_USER *originator;
|
||||
|
||||
int num_recipient;
|
||||
PEM_USER **recipient;
|
||||
|
||||
/*-
|
||||
XXX(ben): don#t think this is used!
|
||||
STACK *x509_chain; / * certificate chain */
|
||||
EVP_MD *md; /* signature type */
|
||||
|
||||
int md_enc; /* is the md encrypted or not? */
|
||||
int md_len; /* length of md_data */
|
||||
char *md_data; /* message digest, could be pkey encrypted */
|
||||
|
||||
EVP_CIPHER *dec; /* date encryption cipher */
|
||||
int key_len; /* key length */
|
||||
unsigned char *key; /* key */
|
||||
/*-
|
||||
unused, and wrong size
|
||||
unsigned char iv[8]; */
|
||||
|
||||
int data_enc; /* is the data encrypted */
|
||||
int data_len;
|
||||
unsigned char *data;
|
||||
} PEM_CTX;
|
||||
|
||||
/*
|
||||
* These macros make the PEM_read/PEM_write functions easier to maintain and
|
||||
* write. Now they are all implemented with either: IMPLEMENT_PEM_rw(...) or
|
||||
@@ -286,6 +236,14 @@ int PEM_do_header(EVP_CIPHER_INFO *cipher, unsigned char *data, long *len,
|
||||
|
||||
int PEM_read_bio(BIO *bp, char **name, char **header,
|
||||
unsigned char **data, long *len);
|
||||
# define PEM_FLAG_SECURE 0x1
|
||||
# define PEM_FLAG_EAY_COMPATIBLE 0x2
|
||||
# define PEM_FLAG_ONLY_B64 0x4
|
||||
int PEM_read_bio_ex(BIO *bp, char **name, char **header,
|
||||
unsigned char **data, long *len, unsigned int flags);
|
||||
int PEM_bytes_read_bio_secmem(unsigned char **pdata, long *plen, char **pnm,
|
||||
const char *name, BIO *bp, pem_password_cb *cb,
|
||||
void *u);
|
||||
int PEM_write_bio(BIO *bp, const char *name, const char *hdr,
|
||||
const unsigned char *data, long len);
|
||||
int PEM_bytes_read_bio(unsigned char **pdata, long *plen, char **pnm,
|
||||
@@ -414,88 +372,6 @@ int i2b_PVK_bio(BIO *out, EVP_PKEY *pk, int enclevel,
|
||||
# endif
|
||||
# endif
|
||||
|
||||
/* 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_PEM_strings(void);
|
||||
|
||||
/* Error codes for the PEM functions. */
|
||||
|
||||
/* Function codes. */
|
||||
# define PEM_F_B2I_DSS 127
|
||||
# define PEM_F_B2I_PVK_BIO 128
|
||||
# define PEM_F_B2I_RSA 129
|
||||
# define PEM_F_CHECK_BITLEN_DSA 130
|
||||
# define PEM_F_CHECK_BITLEN_RSA 131
|
||||
# define PEM_F_D2I_PKCS8PRIVATEKEY_BIO 120
|
||||
# define PEM_F_D2I_PKCS8PRIVATEKEY_FP 121
|
||||
# define PEM_F_DO_B2I 132
|
||||
# define PEM_F_DO_B2I_BIO 133
|
||||
# define PEM_F_DO_BLOB_HEADER 134
|
||||
# define PEM_F_DO_PK8PKEY 126
|
||||
# define PEM_F_DO_PK8PKEY_FP 125
|
||||
# define PEM_F_DO_PVK_BODY 135
|
||||
# define PEM_F_DO_PVK_HEADER 136
|
||||
# define PEM_F_I2B_PVK 137
|
||||
# define PEM_F_I2B_PVK_BIO 138
|
||||
# define PEM_F_LOAD_IV 101
|
||||
# define PEM_F_PEM_ASN1_READ 102
|
||||
# define PEM_F_PEM_ASN1_READ_BIO 103
|
||||
# define PEM_F_PEM_ASN1_WRITE 104
|
||||
# define PEM_F_PEM_ASN1_WRITE_BIO 105
|
||||
# define PEM_F_PEM_DEF_CALLBACK 100
|
||||
# define PEM_F_PEM_DO_HEADER 106
|
||||
# define PEM_F_PEM_GET_EVP_CIPHER_INFO 107
|
||||
# define PEM_F_PEM_READ 108
|
||||
# define PEM_F_PEM_READ_BIO 109
|
||||
# define PEM_F_PEM_READ_BIO_DHPARAMS 141
|
||||
# define PEM_F_PEM_READ_BIO_PARAMETERS 140
|
||||
# define PEM_F_PEM_READ_BIO_PRIVATEKEY 123
|
||||
# define PEM_F_PEM_READ_DHPARAMS 142
|
||||
# define PEM_F_PEM_READ_PRIVATEKEY 124
|
||||
# define PEM_F_PEM_SIGNFINAL 112
|
||||
# define PEM_F_PEM_WRITE 113
|
||||
# define PEM_F_PEM_WRITE_BIO 114
|
||||
# define PEM_F_PEM_WRITE_PRIVATEKEY 139
|
||||
# define PEM_F_PEM_X509_INFO_READ 115
|
||||
# define PEM_F_PEM_X509_INFO_READ_BIO 116
|
||||
# define PEM_F_PEM_X509_INFO_WRITE_BIO 117
|
||||
|
||||
/* Reason codes. */
|
||||
# define PEM_R_BAD_BASE64_DECODE 100
|
||||
# define PEM_R_BAD_DECRYPT 101
|
||||
# define PEM_R_BAD_END_LINE 102
|
||||
# define PEM_R_BAD_IV_CHARS 103
|
||||
# define PEM_R_BAD_MAGIC_NUMBER 116
|
||||
# define PEM_R_BAD_PASSWORD_READ 104
|
||||
# define PEM_R_BAD_VERSION_NUMBER 117
|
||||
# define PEM_R_BIO_WRITE_FAILURE 118
|
||||
# define PEM_R_CIPHER_IS_NULL 127
|
||||
# define PEM_R_ERROR_CONVERTING_PRIVATE_KEY 115
|
||||
# define PEM_R_EXPECTING_PRIVATE_KEY_BLOB 119
|
||||
# define PEM_R_EXPECTING_PUBLIC_KEY_BLOB 120
|
||||
# define PEM_R_HEADER_TOO_LONG 128
|
||||
# define PEM_R_INCONSISTENT_HEADER 121
|
||||
# define PEM_R_KEYBLOB_HEADER_PARSE_ERROR 122
|
||||
# define PEM_R_KEYBLOB_TOO_SHORT 123
|
||||
# define PEM_R_MISSING_DEK_IV 129
|
||||
# define PEM_R_NOT_DEK_INFO 105
|
||||
# define PEM_R_NOT_ENCRYPTED 106
|
||||
# define PEM_R_NOT_PROC_TYPE 107
|
||||
# define PEM_R_NO_START_LINE 108
|
||||
# define PEM_R_PROBLEMS_GETTING_PASSWORD 109
|
||||
# define PEM_R_PVK_DATA_TOO_SHORT 124
|
||||
# define PEM_R_PVK_TOO_SHORT 125
|
||||
# define PEM_R_READ_KEY 111
|
||||
# define PEM_R_SHORT_HEADER 112
|
||||
# define PEM_R_UNEXPECTED_DEK_IV 130
|
||||
# define PEM_R_UNSUPPORTED_CIPHER 113
|
||||
# define PEM_R_UNSUPPORTED_ENCRYPTION 114
|
||||
# define PEM_R_UNSUPPORTED_KEY_COMPONENTS 126
|
||||
|
||||
# ifdef __cplusplus
|
||||
}
|
||||
# endif
|
||||
|
||||
Reference in New Issue
Block a user