root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Fix GCC build; make update; fix number re-use 

Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
Rich Salz 2016-06-16 14:49:37 -04:00
parent 0ad69cd6c0
commit d3b64b89ed
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/openssl/evp.h
View File

@ -1485,7 +1485,7 @@ void ERR_load_EVP_strings(void);
# define EVP_F_EVP_PKEY_GET0_DH 119 # define EVP_F_EVP_PKEY_GET0_DH 119
# define EVP_F_EVP_PKEY_GET0_DSA 120 # define EVP_F_EVP_PKEY_GET0_DSA 120
# define EVP_F_EVP_PKEY_GET0_EC_KEY 131 # define EVP_F_EVP_PKEY_GET0_EC_KEY 131
# define EVP_F_EVP_PKEY_GET0_HMAC 182 # define EVP_F_EVP_PKEY_GET0_HMAC 183
# define EVP_F_EVP_PKEY_GET0_RSA 121 # define EVP_F_EVP_PKEY_GET0_RSA 121
# define EVP_F_EVP_PKEY_KEYGEN 146 # define EVP_F_EVP_PKEY_KEYGEN 146
# define EVP_F_EVP_PKEY_KEYGEN_INIT 147 # define EVP_F_EVP_PKEY_KEYGEN_INIT 147

4
test/ssl_test_ctx.h
View File

@ -36,12 +36,12 @@ typedef enum {
SSL_TEST_SESSION_TICKET_IGNORE = 0, /* Default */ SSL_TEST_SESSION_TICKET_IGNORE = 0, /* Default */
SSL_TEST_SESSION_TICKET_YES, SSL_TEST_SESSION_TICKET_YES,
SSL_TEST_SESSION_TICKET_NO, SSL_TEST_SESSION_TICKET_NO,
SSL_TEST_SESSION_TICKET_BROKEN, /* Special test */ SSL_TEST_SESSION_TICKET_BROKEN /* Special test */
} ssl_session_ticket_t; } ssl_session_ticket_t;
typedef enum { typedef enum {
SSL_TEST_METHOD_TLS = 0, /* Default */ SSL_TEST_METHOD_TLS = 0, /* Default */
SSL_TEST_METHOD_DTLS, SSL_TEST_METHOD_DTLS
} ssl_test_method_t; } ssl_test_method_t;
typedef struct ssl_test_ctx { typedef struct ssl_test_ctx {

6
util/libcrypto.num
View File

@ -2704,7 +2704,7 @@ EVP_PKEY_assign 2662 1_1_0 EXIST::FUNCTION:
EVP_aes_128_ofb 2663 1_1_0 EXIST::FUNCTION: EVP_aes_128_ofb 2663 1_1_0 EXIST::FUNCTION:
CMS_data 2664 1_1_0 EXIST::FUNCTION:CMS CMS_data 2664 1_1_0 EXIST::FUNCTION:CMS
X509_load_cert_file 2665 1_1_0 EXIST::FUNCTION: X509_load_cert_file 2665 1_1_0 EXIST::FUNCTION:
EC_GFp_nistp521_method 2667 1_1_0 EXIST:!WIN32:FUNCTION:EC,EC_NISTP_64_GCC_128 EC_GFp_nistp521_method 2667 1_1_0 EXIST::FUNCTION:EC,EC_NISTP_64_GCC_128
ECDSA_SIG_free 2668 1_1_0 EXIST::FUNCTION:EC ECDSA_SIG_free 2668 1_1_0 EXIST::FUNCTION:EC
d2i_PKCS12_BAGS 2669 1_1_0 EXIST::FUNCTION: d2i_PKCS12_BAGS 2669 1_1_0 EXIST::FUNCTION:
RSA_public_encrypt 2670 1_1_0 EXIST::FUNCTION:RSA RSA_public_encrypt 2670 1_1_0 EXIST::FUNCTION:RSA
@ -2910,7 +2910,7 @@ X509_EXTENSION_dup 2861 1_1_0 EXIST::FUNCTION:
EVP_PKEY_asn1_new 2862 1_1_0 EXIST::FUNCTION: EVP_PKEY_asn1_new 2862 1_1_0 EXIST::FUNCTION:
BIO_socket_nbio 2863 1_1_0 EXIST::FUNCTION:SOCK BIO_socket_nbio 2863 1_1_0 EXIST::FUNCTION:SOCK
EVP_CIPHER_set_asn1_iv 2864 1_1_0 EXIST::FUNCTION: EVP_CIPHER_set_asn1_iv 2864 1_1_0 EXIST::FUNCTION:
EC_GFp_nistp224_method 2865 1_1_0 EXIST:!WIN32:FUNCTION:EC,EC_NISTP_64_GCC_128 EC_GFp_nistp224_method 2865 1_1_0 EXIST::FUNCTION:EC,EC_NISTP_64_GCC_128
BN_swap 2866 1_1_0 EXIST::FUNCTION: BN_swap 2866 1_1_0 EXIST::FUNCTION:
d2i_ECParameters 2867 1_1_0 EXIST::FUNCTION:EC d2i_ECParameters 2867 1_1_0 EXIST::FUNCTION:EC
X509_NAME_add_entry_by_OBJ 2868 1_1_0 EXIST::FUNCTION: X509_NAME_add_entry_by_OBJ 2868 1_1_0 EXIST::FUNCTION:
@ -3501,7 +3501,7 @@ ERR_get_next_error_library 3446 1_1_0 EXIST::FUNCTION:
OCSP_RESPONSE_print 3447 1_1_0 EXIST::FUNCTION:OCSP OCSP_RESPONSE_print 3447 1_1_0 EXIST::FUNCTION:OCSP
BN_get_rfc3526_prime_2048 3448 1_1_0 EXIST::FUNCTION: BN_get_rfc3526_prime_2048 3448 1_1_0 EXIST::FUNCTION:
BIO_new_bio_pair 3449 1_1_0 EXIST::FUNCTION: BIO_new_bio_pair 3449 1_1_0 EXIST::FUNCTION:
EC_GFp_nistp256_method 3450 1_1_0 EXIST:!WIN32:FUNCTION:EC,EC_NISTP_64_GCC_128 EC_GFp_nistp256_method 3450 1_1_0 EXIST::FUNCTION:EC,EC_NISTP_64_GCC_128
BIO_method_type 3451 1_1_0 EXIST::FUNCTION: BIO_method_type 3451 1_1_0 EXIST::FUNCTION:
ECPKParameters_print 3452 1_1_0 EXIST::FUNCTION:EC ECPKParameters_print 3452 1_1_0 EXIST::FUNCTION:EC
EVP_rc4 3453 1_1_0 EXIST::FUNCTION:RC4 EVP_rc4 3453 1_1_0 EXIST::FUNCTION:RC4