The branch master has been updated
via d3b64b89eda1dc040bf3c06764a6832acfd4f4d1 (commit)
from 0ad69cd6c0e14a8257246f84c3117b0ba075bc24 (commit)
- Log -----------------------------------------------------------------
commit d3b64b89eda1dc040bf3c06764a6832acfd4f4d1
Author: Rich Salz <[email protected]>
Date: Thu Jun 16 14:49:37 2016 -0400
Fix GCC build; make update; fix number re-use
Reviewed-by: Richard Levitte <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
include/openssl/evp.h | 2 +-
test/ssl_test_ctx.h | 4 ++--
util/libcrypto.num | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/include/openssl/evp.h b/include/openssl/evp.h
index 975862f..207d772 100644
--- a/include/openssl/evp.h
+++ b/include/openssl/evp.h
@@ -1485,7 +1485,7 @@ void ERR_load_EVP_strings(void);
# define EVP_F_EVP_PKEY_GET0_DH 119
# define EVP_F_EVP_PKEY_GET0_DSA 120
# 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_KEYGEN 146
# define EVP_F_EVP_PKEY_KEYGEN_INIT 147
diff --git a/test/ssl_test_ctx.h b/test/ssl_test_ctx.h
index b75cf08..492d1d7 100644
--- a/test/ssl_test_ctx.h
+++ b/test/ssl_test_ctx.h
@@ -36,12 +36,12 @@ typedef enum {
SSL_TEST_SESSION_TICKET_IGNORE = 0, /* Default */
SSL_TEST_SESSION_TICKET_YES,
SSL_TEST_SESSION_TICKET_NO,
- SSL_TEST_SESSION_TICKET_BROKEN, /* Special test */
+ SSL_TEST_SESSION_TICKET_BROKEN /* Special test */
} ssl_session_ticket_t;
typedef enum {
SSL_TEST_METHOD_TLS = 0, /* Default */
- SSL_TEST_METHOD_DTLS,
+ SSL_TEST_METHOD_DTLS
} ssl_test_method_t;
typedef struct ssl_test_ctx {
diff --git a/util/libcrypto.num b/util/libcrypto.num
index ef5dcde..408677c 100644
--- a/util/libcrypto.num
+++ b/util/libcrypto.num
@@ -2704,7 +2704,7 @@ EVP_PKEY_assign 2662 1_1_0
EXIST::FUNCTION:
EVP_aes_128_ofb 2663 1_1_0 EXIST::FUNCTION:
CMS_data 2664 1_1_0 EXIST::FUNCTION:CMS
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
d2i_PKCS12_BAGS 2669 1_1_0 EXIST::FUNCTION:
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:
BIO_socket_nbio 2863 1_1_0 EXIST::FUNCTION:SOCK
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:
d2i_ECParameters 2867 1_1_0 EXIST::FUNCTION:EC
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
BN_get_rfc3526_prime_2048 3448 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:
ECPKParameters_print 3452 1_1_0 EXIST::FUNCTION:EC
EVP_rc4 3453 1_1_0 EXIST::FUNCTION:RC4
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
