Permalink
Browse files

OS-1869 upgrade openssl1x to 1.0.1d

  • Loading branch information...
wesolows committed Feb 6, 2013
1 parent 24adcab commit 68ffb46f54efa6a3384a9f8cd87e9c76e56c9510
View
@@ -22,7 +22,7 @@
# Copyright (c) 2012-2013, Joyent, Inc. All rights reserved.
#
-VER = openssl-1.0.1c
+VER = openssl-1.0.1d
LIBVER = 1.0.0
include ../Makefile.defs
@@ -1,11 +0,0 @@
---- openssl-1.0.1c-64/crypto/cms/cms_enc.c 2012-05-10 13:34:21.000000000 +0000
-+++ openssl-1.0.1c-32/crypto/cms/cms_enc.c 2013-01-08 22:52:02.972099339 +0000
-@@ -74,7 +74,7 @@
- X509_ALGOR *calg = ec->contentEncryptionAlgorithm;
- unsigned char iv[EVP_MAX_IV_LENGTH], *piv = NULL;
- unsigned char *tkey = NULL;
-- size_t tkeylen;
-+ size_t tkeylen = 0;
-
- int ok = 0;
-
View
@@ -76,7 +76,7 @@ _install L ../openssl ${DESTDIR}/etc/sfw/openssl
# Install header files
mkdir -p ${INCDIR}/openssl
cd include/openssl
-for header in !(ec*|fips*|idea*); do
+for header in !(ec*|fips*|idea*|pq_compat.h|tmdiff.h); do
_install N ${header} ${INCDIR}/openssl/${header} 0444
done
Binary file not shown.
Binary file not shown.
View
@@ -944,6 +944,7 @@
#pragma redefine_extname CRYPTO_lock sunw_CRYPTO_lock
#pragma redefine_extname CRYPTO_malloc sunw_CRYPTO_malloc
#pragma redefine_extname CRYPTO_malloc_locked sunw_CRYPTO_malloc_locked
+#pragma redefine_extname CRYPTO_memcmp sunw_CRYPTO_memcmp
#pragma redefine_extname CRYPTO_mem_ctrl sunw_CRYPTO_mem_ctrl
#pragma redefine_extname CRYPTO_mem_leaks sunw_CRYPTO_mem_leaks
#pragma redefine_extname CRYPTO_mem_leaks_cb sunw_CRYPTO_mem_leaks_cb
@@ -1549,6 +1550,7 @@
#pragma redefine_extname ESS_SIGNING_CERT_free sunw_ESS_SIGNING_CERT_free
#pragma redefine_extname ESS_SIGNING_CERT_it sunw_ESS_SIGNING_CERT_it
#pragma redefine_extname ESS_SIGNING_CERT_new sunw_ESS_SIGNING_CERT_new
+#pragma redefine_extname EVP_add_alg_module sunw_EVP_add_alg_module
#pragma redefine_extname EVP_add_cipher sunw_EVP_add_cipher
#pragma redefine_extname EVP_add_digest sunw_EVP_add_digest
#pragma redefine_extname EVP_aes_128_cbc sunw_EVP_aes_128_cbc
@@ -2541,6 +2543,7 @@
#pragma redefine_extname PEM_write_bio_DSA_PUBKEY sunw_PEM_write_bio_DSA_PUBKEY
#pragma redefine_extname PEM_write_bio_DSAparams sunw_PEM_write_bio_DSAparams
#pragma redefine_extname PEM_write_bio_DSAPrivateKey sunw_PEM_write_bio_DSAPrivateKey
+#pragma redefine_extname PEM_write_bio_ECPrivateKey sunw_PEM_write_bio_ECPrivateKey
#pragma redefine_extname PEM_write_bio_NETSCAPE_CERT_SEQUENCE sunw_PEM_write_bio_NETSCAPE_CERT_SEQUENCE
#pragma redefine_extname PEM_write_bio_Parameters sunw_PEM_write_bio_Parameters
#pragma redefine_extname PEM_write_bio_PKCS7 sunw_PEM_write_bio_PKCS7
@@ -2565,6 +2568,7 @@
#pragma redefine_extname PEM_write_DSA_PUBKEY sunw_PEM_write_DSA_PUBKEY
#pragma redefine_extname PEM_write_DSAparams sunw_PEM_write_DSAparams
#pragma redefine_extname PEM_write_DSAPrivateKey sunw_PEM_write_DSAPrivateKey
+#pragma redefine_extname PEM_write_ECPrivateKey sunw_PEM_write_ECPrivateKey
#pragma redefine_extname PEM_write_NETSCAPE_CERT_SEQUENCE sunw_PEM_write_NETSCAPE_CERT_SEQUENCE
#pragma redefine_extname PEM_write_PKCS7 sunw_PEM_write_PKCS7
#pragma redefine_extname PEM_write_PKCS8 sunw_PEM_write_PKCS8
@@ -3830,7 +3834,8 @@
#pragma redefine_extname ssl_cert_inst sunw_ssl_cert_inst
#pragma redefine_extname ssl_cert_new sunw_ssl_cert_new
#pragma redefine_extname ssl_cert_type sunw_ssl_cert_type
-#pragma redefine_extname ssl_check_clienthello_tlsext sunw_ssl_check_clienthello_tlsext
+#pragma redefine_extname ssl_check_clienthello_tlsext_early sunw_ssl_check_clienthello_tlsext_early
+#pragma redefine_extname ssl_check_clienthello_tlsext_late sunw_ssl_check_clienthello_tlsext_late
#pragma redefine_extname SSL_check_private_key sunw_SSL_check_private_key
#pragma redefine_extname ssl_check_serverhello_tlsext sunw_ssl_check_serverhello_tlsext
#pragma redefine_extname SSL_CIPHER_description sunw_SSL_CIPHER_description
@@ -3971,6 +3976,7 @@
#pragma redefine_extname SSL_get_rfd sunw_SSL_get_rfd
#pragma redefine_extname SSL_get_selected_srtp_profile sunw_SSL_get_selected_srtp_profile
#pragma redefine_extname ssl_get_server_send_cert sunw_ssl_get_server_send_cert
+#pragma redefine_extname ssl_get_server_send_pkey sunw_ssl_get_server_send_pkey
#pragma redefine_extname SSL_get_servername sunw_SSL_get_servername
#pragma redefine_extname SSL_get_servername_type sunw_SSL_get_servername_type
#pragma redefine_extname SSL_get_session sunw_SSL_get_session
@@ -4148,6 +4154,10 @@
#pragma redefine_extname ssl3_accept sunw_ssl3_accept
#pragma redefine_extname ssl3_alert_code sunw_ssl3_alert_code
#pragma redefine_extname ssl3_callback_ctrl sunw_ssl3_callback_ctrl
+#pragma redefine_extname ssl3_cbc_copy_mac sunw_ssl3_cbc_copy_mac
+#pragma redefine_extname ssl3_cbc_digest_record sunw_ssl3_cbc_digest_record
+#pragma redefine_extname ssl3_cbc_record_digest_supported sunw_ssl3_cbc_record_digest_supported
+#pragma redefine_extname ssl3_cbc_remove_padding sunw_ssl3_cbc_remove_padding
#pragma redefine_extname ssl3_cert_verify_mac sunw_ssl3_cert_verify_mac
#pragma redefine_extname ssl3_change_cipher_state sunw_ssl3_change_cipher_state
#pragma redefine_extname ssl3_check_cert_and_algorithm sunw_ssl3_check_cert_and_algorithm
@@ -4244,6 +4254,7 @@
#pragma redefine_extname SSLv3_method sunw_SSLv3_method
#pragma redefine_extname SSLv3_server_method sunw_SSLv3_server_method
#pragma redefine_extname tls1_alert_code sunw_tls1_alert_code
+#pragma redefine_extname tls1_cbc_remove_padding sunw_tls1_cbc_remove_padding
#pragma redefine_extname tls1_cert_verify_mac sunw_tls1_cert_verify_mac
#pragma redefine_extname tls1_change_cipher_state sunw_tls1_change_cipher_state
#pragma redefine_extname tls1_clear sunw_tls1_clear
@@ -4275,5 +4286,6 @@
#pragma redefine_extname TLSv1_enc_data sunw_TLSv1_enc_data
#pragma redefine_extname TLSv1_method sunw_TLSv1_method
#pragma redefine_extname TLSv1_server_method sunw_TLSv1_server_method
+#pragma redefine_extname tls_fips_digest_extra sunw_tls_fips_digest_extra
#endif /* _SUNW_PREFIX_H */

0 comments on commit 68ffb46

Please sign in to comment.