10000 Adds build for OpenSSL 1.1.0h · python/cpython-bin-deps@fdc8bfe · GitHub
[go: up one dir, main page]
Skip to content

Commit fdc8bfe

Browse files
zoobazooba
committed
Adds build for OpenSSL 1.1.0h
1 parent 9429523 commit fdc8bfe

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+194
-134
lines changed

‎amd64/LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
---------------
1111

1212
/* ====================================================================
13-
* Copyright (c) 1998-2017 The OpenSSL Project. All rights reserved.
13+
* Copyright (c) 1998-2018 The OpenSSL Project. All rights reserved.
1414
*
1515
* Redistribution and use in source and binary forms, with or without
1616
* modification, are permitted provided that the following conditions

‎amd64/include/openssl/asn1.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
2+
* Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
33
*
44
* Licensed under the OpenSSL license (the "License"). You may not use
55
* this file except in compliance with the License. You can obtain a copy
@@ -1051,6 +1051,7 @@ int ERR_load_ASN1_strings(void);
10511051
# define ASN1_R_MSTRING_NOT_UNIVERSAL 139
10521052
# define ASN1_R_MSTRING_WRONG_TAG 140
10531053
# define ASN1_R_NESTED_ASN1_STRING 197
1054+
# define ASN1_R_NESTED_TOO_DEEP 201
10541055
# define ASN1_R_NON_HEX_CHARACTERS 141
10551056
# define ASN1_R_NOT_ASCII_FORMAT 190
10561057
# define ASN1_R_NOT_ENOUGH_DATA 142

‎amd64/include/openssl/asn1_mac.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
/*
2+
* Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved.
3+
*
4+
* Licensed under the OpenSSL license (the "License"). You may not use
5+
* this file except in compliance with the License. You can obtain a copy
6+
* in the file LICENSE in the source distribution or at
7+
* https://www.openssl.org/source/license.html
8+
*/
9+
10+
#error "This file is obsolete; please update your software."

‎amd64/include/openssl/bio.h

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
2+
* Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
33
*
44
* Licensed under the OpenSSL license (the "License"). You may not use
55
* this file except in compliance with the License. You can obtain a copy
@@ -125,11 +125,10 @@ extern "C" {
125125

126126
# define BIO_CTRL_DGRAM_GET_MTU_OVERHEAD 49
127127

128-
# define BIO_CTRL_DGRAM_SET_PEEK_MODE 50
129-
128+
/* Deliberately outside of OPENSSL_NO_SCTP - used in bss_dgram.c */
129+
# define BIO_CTRL_DGRAM_SCTP_SET_IN_HANDSHAKE 50
130130
# ifndef OPENSSL_NO_SCTP
131131
/* SCTP stuff */
132-
# define BIO_CTRL_DGRAM_SCTP_SET_IN_HANDSHAKE 50
133132
# define BIO_CTRL_DGRAM_SCTP_ADD_AUTH_KEY 51
134133
# define BIO_CTRL_DGRAM_SCTP_NEXT_AUTH_KEY 52
135134
# define BIO_CTRL_DGRAM_SCTP_AUTH_CCS_RCVD 53
@@ -142,6 +141,8 @@ extern "C" {
142141
# define BIO_CTRL_DGRAM_SCTP_SAVE_SHUTDOWN 70
143142
# endif
144143

144+
# define BIO_CTRL_DGRAM_SET_PEEK_MODE 71
145+
145146
/* modifiers */
146147
# define BIO_FP_READ 0x02
147148
# define BIO_FP_WRITE 0x04
@@ -245,7 +246,8 @@ typedef struct bio_method_st BIO_METHOD;
245246
const char *BIO_method_name(const BIO *b);
246247
int BIO_method_type(const BIO *b);
247248

248-
typedef void bio_info_cb(BIO *, int, const char *, int, long, long);
249+
typedef int BIO_info_cb(BIO *, int, int);
250+
typedef BIO_info_cb bio_info_cb; /* backward compatibility */
249251

250252
DEFINE_STACK_OF(BIO)
251253

@@ -546,8 +548,7 @@ int BIO_write(BIO *b, const void *data, int len);
546548
int BIO_puts(BIO *bp, const char *buf);
547549
int BIO_indent(BIO *b, int indent, int max);
548550
long BIO_ctrl(BIO *bp, int cmd, long larg, void *parg);
549-
long BIO_callback_ctrl(BIO *b, int cmd,
550-
void (*fp) (BIO *, int, const char *, int, long, long));
551+
long BIO_callback_ctrl(BIO *b, int cmd, BIO_info_cb *fp);
551552
void *BIO_ptr_ctrl(BIO *bp, int cmd, long larg);
552553
long BIO_int_ctrl(BIO *bp, int cmd, long larg, int iarg);
553554
BIO *BIO_push(BIO *b, BIO *append);
@@ -749,10 +750,10 @@ int BIO_meth_set_create(BIO_METHOD *biom, int (*create) (BIO *));
749750
int (*BIO_meth_get_destroy(BIO_METHOD *biom)) (BIO *);
750751
int BIO_meth_set_destroy(BIO_METHOD *biom, int (*destroy) (BIO *));
751752
long (*BIO_meth_get_callback_ctrl(BIO_METHOD *biom))
752-
(BIO *, int, bio_info_cb *);
753+
(BIO *, int, BIO_info_cb *);
753754
int BIO_meth_set_callback_ctrl(BIO_METHOD *biom,
754755
long (*callback_ctrl) (BIO *, int,
755-
bio_info_cb *));
756+
BIO_info_cb *));
756757

757758
/* BEGIN ERROR CODES */
758759
/*
@@ -780,6 +781,7 @@ int ERR_load_BIO_strings(void);
780781
# define BIO_F_BIO_LISTEN 139
781782
# define BIO_F_BIO_LOOKUP 135
782783
# define BIO_F_BIO_MAKE_PAIR 121
784+
# define BIO_F_BIO_METH_NEW 146
783785
# define BIO_F_BIO_NEW 108
784786
# define BIO_F_BIO_NEW_FILE 109
785787
# define BIO_F_BIO_NEW_MEM_BUF 126

‎amd64/include/openssl/bn.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ int BN_sqr(BIGNUM *r, const BIGNUM *a, BN_CTX *ctx);
196196
*/
197197
void BN_set_negative(BIGNUM *b, int n);
198198
/** BN_is_negative returns 1 if the BIGNUM is negative
199-
* \param a pointer to the BIGNUM object
199+
* \param b pointer to the BIGNUM object
200200
* \return 1 if a < 0 and 0 otherwise
201201
*/
202202
int BN_is_negative(const BIGNUM *b);

‎amd64/include/openssl/buffer.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,7 @@ extern "C" {
2121
#endif
2222

2323
# include <stddef.h>
24-
25-
# if !defined(NO_SYS_TYPES_H)
26-
# include <sys/types.h>
27-
# endif
24+
# include <sys/types.h>
2825

2926
/*
3027
* These names are outdated as of OpenSSL 1.1; a future release

‎amd64/include/openssl/crypto.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,8 @@ int CRYPTO_mem_ctrl(int mode);
146146
CRYPTO_secure_zalloc(num, OPENSSL_FILE, OPENSSL_LINE)
147147
# define OPENSSL_secure_free(addr) \
148148
CRYPTO_secure_free(addr, OPENSSL_FILE, OPENSSL_LINE)
149+
# define OPENSSL_secure_clear_free(addr, num) \
150+
CRYPTO_secure_clear_free(addr, num, OPENSSL_FILE, OPENSSL_LINE)
149151
# define OPENSSL_secure_actual_size(ptr) \
150152
CRYPTO_secure_actual_size(ptr)
151153

@@ -285,6 +287,8 @@ int CRYPTO_secure_malloc_done(void);
285287
void *CRYPTO_secure_malloc(size_t num, const char *file, int line);
286288
void *CRYPTO_secure_zalloc(size_t num, const char *file, int line);
287289
void CRYPTO_secure_free(void *ptr, const char *file, int line);
290+
void CRYPTO_secure_clear_free(void *ptr, size_t num,
291+
const char *file, int line);
288292
int CRYPTO_secure_allocated(const void *ptr);
289293
int CRYPTO_secure_malloc_initialized(void);
290294
size_t CRYPTO_secure_actual_size(void *ptr);

‎amd64/include/openssl/e_os2.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
2+
* Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
33
*
44
* Licensed under the OpenSSL license (the "License"). You may not use
55
* this file except in compliance with the License. You can obtain a copy
@@ -49,7 +49,6 @@ extern "C" {
4949
# define OPENSSL_SYS_WIN32_UWIN
5050
# else
5151
# if defined(__CYGWIN__) || defined(OPENSSL_SYS_CYGWIN)
52-
# undef OPENSSL_SYS_UNIX
5352
# define OPENSSL_SYS_WIN32_CYGWIN
5453
# else
5554
# if defined(_WIN32) || defined(OPENSSL_SYS_WIN32)

‎amd64/include/openssl/ec.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1223,7 +1223,7 @@ void EC_KEY_METHOD_set_verify(EC_KEY_METHOD *meth,
12231223
const ECDSA_SIG *sig,
12241224
EC_KEY *eckey));
12251225

1226-
void EC_KEY_METHOD_get_init(EC_KEY_METHOD *meth,
1226+
void EC_KEY_METHOD_get_init(const EC_KEY_METHOD *meth,
12271227
int (**pinit)(EC_KEY *key),
12281228
void (**pfinish)(EC_KEY *key),
12291229
int (**pcopy)(EC_KEY *dest, const EC_KEY *src),
@@ -1234,16 +1234,16 @@ void EC_KEY_METHOD_get_init(EC_KEY_METHOD *meth,
12341234
int (**pset_public)(EC_KEY *key,
12351235
const EC_POINT *pub_key));
12361236

1237-
void EC_KEY_METHOD_get_keygen(EC_KEY_METHOD *meth,
1237+
void EC_KEY_METHOD_get_keygen(const EC_KEY_METHOD *meth,
12381238
int (**pkeygen)(EC_KEY *key));
12391239

1240-
void EC_KEY_METHOD_get_compute_key(EC_KEY_METHOD *meth,
1240+
void EC_KEY_METHOD_get_compute_key(const EC_KEY_METHOD *meth,
12411241
int (**pck)(unsigned char **psec,
12421242
size_t *pseclen,
12431243
const EC_POINT *pub_key,
12441244
const EC_KEY *ecdh));
12451245

1246-
void EC_KEY_METHOD_get_sign(EC_KEY_METHOD *meth,
1246+
void EC_KEY_METHOD_get_sign(const EC_KEY_METHOD *meth,
12471247
int (**psign)(int type, const unsigned char *dgst,
12481248
int dlen, unsigned char *sig,
12491249
unsigned int *siglen,
@@ -1257,7 +1257,7 @@ void EC_KEY_METHOD_get_sign(EC_KEY_METHOD *meth,
12571257
const BIGNUM *in_r,
12581258
EC_KEY *eckey));
12591259

1260-
void EC_KEY_METHOD_get_verify(EC_KEY_METHOD *meth,
1260+
void EC_KEY_METHOD_get_verify(const EC_KEY_METHOD *meth,
12611261
int (**pverify)(int type, const unsigned
12621262
char *dgst, int dgst_len,
12631263
const unsigned char *sigbuf,

‎amd64/include/openssl/evp.h

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
2+
* Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
33
*
44
* Licensed under the OpenSSL license (the "License"). You may not use
55
* this file except in compliance with the License. You can obtain a copy
@@ -900,6 +900,9 @@ int EVP_PKEY_security_bits(const EVP_PKEY *pkey);
900900
int EVP_PKEY_size(EVP_PKEY *pkey);
901901
int EVP_PKEY_set_type(EVP_PKEY *pkey, int type);
902902
int EVP_PKEY_set_type_str(EVP_PKEY *pkey, const char *str, int len);
903+
# ifndef OPENSSL_NO_ENGINE
904+
int EVP_PKEY_set1_engine(EVP_PKEY *pkey, ENGINE *e);
905+
# endif
903906
int EVP_PKEY_assign(EVP_PKEY *pkey, int type, void *key);
904907
void *EVP_PKEY_get0(const EVP_PKEY *pkey);
905908
const unsigned char *EVP_PKEY_get0_hmac(const EVP_PKEY *pkey, size_t *len);
@@ -1482,6 +1485,7 @@ int ERR_load_EVP_strings(void);
14821485
# define EVP_F_EVP_PBE_SCRYPT 181
14831486
# define EVP_F_EVP_PKCS82PKEY 111
14841487
# define EVP_F_EVP_PKEY2PKCS8 113
1488+
# define EVP_F_EVP_PKEY_ASN1_ADD0 168
14851489
# define EVP_F_EVP_PKEY_COPY_PARAMETERS 103
14861490
# define EVP_F_EVP_PKEY_CTX_CTRL 137
14871491
# define EVP_F_EVP_PKEY_CTX_CTRL_STR 150
@@ -1505,6 +1509,7 @@ int ERR_load_EVP_strings(void);
15051509
# define EVP_F_EVP_PKEY_NEW 106
15061510
# define EVP_F_EVP_PKEY_PARAMGEN 148
15071511
# define EVP_F_EVP_PKEY_PARAMGEN_INIT 149
1512+
# define EVP_F_EVP_PKEY_SET1_ENGINE 187
15081513
# define EVP_F_EVP_PKEY_SIGN 140
15091514
# define EVP_F_EVP_PKEY_SIGN_INIT 141
15101515
# define EVP_F_EVP_PKEY_VERIFY 142
@@ -1565,6 +1570,8 @@ int ERR_load_EVP_strings(void);
15651570
# define EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE 150
15661571
# define EVP_R_OPERATON_NOT_INITIALIZED 151
15671572
# define EVP_R_PARTIALLY_OVERLAPPING 162
1573+
# define EVP_R_PKEY_APPLICATION_ASN1_METHOD_ALREADY_REGISTERED 175
1574+
# define EVP_R_PKEY_ASN1_METHOD_ALREADY_REGISTERED 164
15681575
# define EVP_R_PRIVATE_KEY_DECODE_ERROR 145
15691576
# define EVP_R_PRIVATE_KEY_ENCODE_ERROR 146
15701577
# define EVP_R_PUBLIC_KEY_NOT_RSA 106

0 commit comments

Comments
 (0)
0