Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/crypto/external/bsd/openssl merge conflicts, restore binary ...
details: https://anonhg.NetBSD.org/src/rev/c4355f4c32a5
branches: trunk
changeset: 338861:c4355f4c32a5
user: christos <christos%NetBSD.org@localhost>
date: Fri Jun 12 17:01:11 2015 +0000
description:
merge conflicts, restore binary compatibility in hmac, regen.
diffstat:
crypto/external/bsd/openssl/dist/CHANGES | 71 ++
crypto/external/bsd/openssl/dist/Configure | 10 +-
crypto/external/bsd/openssl/dist/Makefile | 28 +-
crypto/external/bsd/openssl/dist/NEWS | 8 +
crypto/external/bsd/openssl/dist/README | 2 +-
crypto/external/bsd/openssl/dist/apps/ca.c | 10 +-
crypto/external/bsd/openssl/dist/apps/ocsp.c | 2 +
crypto/external/bsd/openssl/dist/apps/s_client.c | 15 +-
crypto/external/bsd/openssl/dist/apps/s_server.c | 73 +-
crypto/external/bsd/openssl/dist/apps/s_time.c | 2 +-
crypto/external/bsd/openssl/dist/crypto/Makefile | 11 +-
crypto/external/bsd/openssl/dist/crypto/aes/Makefile | 2 +
crypto/external/bsd/openssl/dist/crypto/asn1/asn_mime.c | 3 +-
crypto/external/bsd/openssl/dist/crypto/bn/bn.h | 5 +
crypto/external/bsd/openssl/dist/crypto/bn/bn_lcl.h | 8 +
crypto/external/bsd/openssl/dist/crypto/buffer/buffer.c | 2 +-
crypto/external/bsd/openssl/dist/crypto/cms/cms_pwri.c | 7 +-
crypto/external/bsd/openssl/dist/crypto/cryptlib.c | 2 -
crypto/external/bsd/openssl/dist/crypto/des/des.c | 6 +-
crypto/external/bsd/openssl/dist/crypto/ec/ec_asn1.c | 20 +-
crypto/external/bsd/openssl/dist/crypto/ec/ectest.c | 24 +-
crypto/external/bsd/openssl/dist/crypto/engine/Makefile | 2 +
crypto/external/bsd/openssl/dist/crypto/evp/Makefile | 2 +
crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c | 7 +-
crypto/external/bsd/openssl/dist/crypto/hmac/hmac.c | 17 +-
crypto/external/bsd/openssl/dist/crypto/hmac/hmac.h | 1 -
crypto/external/bsd/openssl/dist/crypto/hmac/hmactest.c | 176 ++++++-
crypto/external/bsd/openssl/dist/crypto/md32_common.h | 4 +-
crypto/external/bsd/openssl/dist/crypto/mem.c | 3 +
crypto/external/bsd/openssl/dist/crypto/objects/o_names.c | 2 +-
crypto/external/bsd/openssl/dist/crypto/ocsp/ocsp_vfy.c | 21 +-
crypto/external/bsd/openssl/dist/crypto/opensslv.h | 6 +-
crypto/external/bsd/openssl/dist/crypto/pkcs7/p7/cert.p7c | Bin
crypto/external/bsd/openssl/dist/crypto/pkcs7/p7/smime.p7m | Bin
crypto/external/bsd/openssl/dist/crypto/pkcs7/p7/smime.p7s | Bin
crypto/external/bsd/openssl/dist/crypto/pkcs7/pk7_doit.c | 16 +-
crypto/external/bsd/openssl/dist/crypto/rc4/Makefile | 2 +
crypto/external/bsd/openssl/dist/crypto/rsa/Makefile | 2 +
crypto/external/bsd/openssl/dist/crypto/threads/th-lock.c | 12 +-
crypto/external/bsd/openssl/dist/crypto/x509/x509_vfy.c | 226 +++++--
crypto/external/bsd/openssl/dist/doc/ssl/SSL_CTX_set_tmp_dh_callback.pod | 110 +--
crypto/external/bsd/openssl/dist/engines/ccgost/gost94_keyx.c | 6 +-
crypto/external/bsd/openssl/dist/openssl.spec | 2 +-
crypto/external/bsd/openssl/dist/ssl/Makefile | 54 +-
crypto/external/bsd/openssl/dist/ssl/d1_both.c | 46 +-
crypto/external/bsd/openssl/dist/ssl/d1_lib.c | 3 +
crypto/external/bsd/openssl/dist/ssl/d1_pkt.c | 2 +-
crypto/external/bsd/openssl/dist/ssl/d1_srvr.c | 28 +-
crypto/external/bsd/openssl/dist/ssl/s2_srvr.c | 104 +-
crypto/external/bsd/openssl/dist/ssl/s3_cbc.c | 16 +-
crypto/external/bsd/openssl/dist/ssl/s3_clnt.c | 275 ++++++++-
crypto/external/bsd/openssl/dist/ssl/s3_pkt.c | 13 +-
crypto/external/bsd/openssl/dist/ssl/s3_srvr.c | 256 ++++++---
crypto/external/bsd/openssl/dist/ssl/ssl.h | 4 +
crypto/external/bsd/openssl/dist/ssl/ssl_err.c | 3 +
crypto/external/bsd/openssl/dist/ssl/ssl_lib.c | 8 +-
crypto/external/bsd/openssl/dist/ssl/ssl_locl.h | 1 +
crypto/external/bsd/openssl/dist/ssl/ssltest.c | 20 +-
crypto/external/bsd/openssl/dist/ssl/t1_enc.c | 9 +-
crypto/external/bsd/openssl/dist/ssl/t1_lib.c | 176 ++---
crypto/external/bsd/openssl/dist/ssl/tls_srp.c | 3 +-
crypto/external/bsd/openssl/dist/test/Makefile | 17 +-
crypto/external/bsd/openssl/dist/test/testssl | 38 +-
crypto/external/bsd/openssl/dist/util/mk1mf.pl | 2 +-
crypto/external/bsd/openssl/lib/libcrypto/man/ASN1_OBJECT_new.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/ASN1_STRING_length.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/ASN1_STRING_new.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/ASN1_STRING_print_ex.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/ASN1_generate_nconf.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_ctrl.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_f_base64.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_f_buffer.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_f_cipher.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_f_md.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_f_null.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_f_ssl.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_find_type.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_new.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_new_CMS.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_push.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_read.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_s_accept.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_s_bio.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_s_connect.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_s_fd.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_s_file.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_s_mem.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_s_null.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_s_socket.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_set_callback.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_should_retry.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BN_BLINDING_new.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BN_CTX_new.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BN_CTX_start.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BN_add.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BN_add_word.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BN_bn2bin.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BN_cmp.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BN_copy.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BN_generate_prime.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BN_mod_inverse.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BN_mod_mul_montgomery.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BN_mod_mul_reciprocal.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BN_new.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BN_num_bytes.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BN_rand.3 | 7 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BN_set_bit.3 | 12 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BN_swap.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BN_zero.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/CMS_add0_cert.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/CMS_add1_recipient_cert.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/CMS_add1_signer.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/CMS_compress.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/CMS_decrypt.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/CMS_encrypt.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/CMS_final.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/CMS_get0_RecipientInfos.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/CMS_get0_SignerInfos.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/CMS_get0_type.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/CMS_get1_ReceiptRequest.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/CMS_sign.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/CMS_sign_receipt.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/CMS_uncompress.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/CMS_verify.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/CMS_verify_receipt.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/CONF_modules_free.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/CONF_modules_load_file.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/CRYPTO_set_ex_data.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/DH_generate_key.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/DH_generate_parameters.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/DH_get_ex_new_index.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/DH_new.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/DH_set_method.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/DH_size.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/DSA_SIG_new.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/DSA_do_sign.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/DSA_dup_DH.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/DSA_generate_key.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/DSA_generate_parameters.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/DSA_get_ex_new_index.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/DSA_new.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/DSA_set_method.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/DSA_sign.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/DSA_size.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/ERR_GET_LIB.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/ERR_clear_error.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/ERR_error_string.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/ERR_get_error.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/ERR_load_crypto_strings.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/ERR_load_strings.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/ERR_print_errors.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/ERR_put_error.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/ERR_remove_state.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/ERR_set_mark.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_BytesToKey.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_DigestInit.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_DigestSignInit.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_DigestVerifyInit.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_EncryptInit.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_OpenInit.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_PKEY_CTX_ctrl.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_PKEY_CTX_new.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_PKEY_cmp.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_PKEY_decrypt.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_PKEY_derive.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_PKEY_encrypt.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_PKEY_get_default_digest.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_PKEY_keygen.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_PKEY_new.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_PKEY_print_private.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_PKEY_set1_RSA.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_PKEY_sign.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_PKEY_verify.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_PKEY_verify_recover.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_SealInit.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_SignInit.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_VerifyInit.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/OBJ_nid2obj.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/OPENSSL_Applink.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/OPENSSL_config.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/OPENSSL_ia32cap.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/OPENSSL_load_builtin_modules.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/OpenSSL_add_all_algorithms.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/PEM_write_bio_CMS_stream.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/PEM_write_bio_PKCS7_stream.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/PKCS12_create.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/PKCS12_parse.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/PKCS7_decrypt.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/PKCS7_encrypt.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/PKCS7_sign.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/PKCS7_sign_add_signer.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/PKCS7_verify.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/RAND_add.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/RAND_bytes.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/RAND_cleanup.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/RAND_egd.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/RAND_load_file.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/RAND_set_rand_method.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/RSA_blinding_on.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/RSA_check_key.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/RSA_generate_key.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/RSA_get_ex_new_index.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/RSA_new.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/RSA_print.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/RSA_private_encrypt.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/RSA_public_encrypt.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/RSA_set_method.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/RSA_sign.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/RSA_size.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SMIME_read_CMS.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SMIME_read_PKCS7.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SMIME_write_CMS.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SMIME_write_PKCS7.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CIPHER_get_name.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_COMP_add_compression_method.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_add_extra_chain_cert.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_add_session.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_ctrl.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_flush_sessions.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_free.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_get_ex_new_index.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_get_verify_mode.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_load_verify_locations.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_new.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_sess_number.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_sess_set_cache_size.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_sess_set_get_cb.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_sessions.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_cert_store.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_cert_verify_callback.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_cipher_list.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_client_CA_list.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_client_cert_cb.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_default_passwd_cb.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_generate_session_id.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_info_callback.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_max_cert_list.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_mode.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_msg_callback.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_options.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_psk_client_callback.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_quiet_shutdown.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_read_ahead.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_session_cache_mode.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_session_id_context.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_ssl_version.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_timeout.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_tlsext_ticket_key_cb.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_tmp_dh_callback.3 | 116 +--
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_tmp_rsa_callback.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_verify.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_use_certificate.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_use_psk_identity_hint.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_SESSION_free.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_SESSION_get_ex_new_index.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_SESSION_get_time.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_accept.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_alert_type_string.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_clear.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_connect.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_do_handshake.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_free.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_get_SSL_CTX.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_get_ciphers.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_get_client_CA_list.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_get_current_cipher.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_get_default_timeout.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_get_error.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_get_ex_data_X509_STORE_CTX_idx.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_get_ex_new_index.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_get_fd.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_get_peer_cert_chain.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_get_peer_certificate.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_get_psk_identity.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_get_rbio.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_get_session.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_get_verify_result.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_get_version.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_library_init.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_load_client_CA_file.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_new.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_pending.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_read.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_rstate_string.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_session_reused.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_set_bio.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_set_connect_state.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_set_fd.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_set_session.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_set_shutdown.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_set_verify_result.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_shutdown.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_state_string.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_want.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_write.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/X509_NAME_get_index_by_NID.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/X509_NAME_print_ex.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/X509_STORE_CTX_get_error.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/X509_STORE_CTX_get_ex_new_index.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/X509_STORE_CTX_new.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/X509_STORE_CTX_set_verify_cb.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/X509_STORE_set_verify_cb_func.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/X509_VERIFY_PARAM_set_flags.3 | 12 +-
crypto/external/bsd/openssl/lib/libcrypto/man/X509_new.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/X509_verify_cert.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/crypto.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/d2i_ASN1_OBJECT.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/d2i_CMS_ContentInfo.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/d2i_DHparams.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/d2i_DSAPublicKey.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/d2i_ECPrivateKey.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/d2i_PKCS8PrivateKey.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/d2i_RSAPublicKey.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/d2i_SSL_SESSION.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/d2i_X509.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/d2i_X509_ALGOR.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/d2i_X509_CRL.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/d2i_X509_NAME.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/d2i_X509_REQ.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/d2i_X509_SIG.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/des_modes.7 | 2 +-
crypto/external/bsd/openssl/lib/libcrypto/man/i2d_CMS_bio_stream.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/i2d_PKCS7_bio_stream.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/lh_stats.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl.cnf.5 | 65 ++-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_CA.pl.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_asn1parse.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_bio.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_blowfish.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_bn.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_bn_internal.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_buffer.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_c_rehash.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_ca.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_ciphers.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_cms.1 | 11 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_crl.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_crl2pkcs7.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_des.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_dgst.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_dh.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_dhparam.1 | 17 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_dsa.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_dsa.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_dsaparam.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_ec.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_ecdsa.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_ecparam.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_enc.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_engine.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_err.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_errstr.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_evp.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_gendsa.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_genpkey.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_genrsa.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_hmac.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_lhash.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_md5.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_mdc2.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_nseq.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_ocsp.1 | 11 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_passwd.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_pem.3 | 31 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_pkcs12.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_pkcs7.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_pkcs8.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_pkey.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_pkeyparam.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_pkeyutl.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_rand.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_rand.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_rc4.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_req.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_ripemd.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_rsa.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_rsa.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_rsautl.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_s_client.1 | 12 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_s_server.1 | 11 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_s_time.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_sess_id.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_sha.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_smime.1 | 11 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_speed.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_spkac.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_threads.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_ts.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_tsget.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_ui.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_ui_compat.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_verify.1 | 15 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_version.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_x509.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_x509.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_x509v3_config.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/ssl.3 | 4 +-
403 files changed, 2239 insertions(+), 1400 deletions(-)
diffs (truncated from 10906 to 300 lines):
diff -r 6f1c3c36272a -r c4355f4c32a5 crypto/external/bsd/openssl/dist/CHANGES
--- a/crypto/external/bsd/openssl/dist/CHANGES Fri Jun 12 16:34:57 2015 +0000
+++ b/crypto/external/bsd/openssl/dist/CHANGES Fri Jun 12 17:01:11 2015 +0000
@@ -2,6 +2,77 @@
OpenSSL CHANGES
_______________
+ Changes between 1.0.1m and 1.0.1n [11 Jun 2015]
+
+ *) Malformed ECParameters causes infinite loop
+
+ When processing an ECParameters structure OpenSSL enters an infinite loop
+ if the curve specified is over a specially malformed binary polynomial
+ field.
+
+ This can be used to perform denial of service against any
+ system which processes public keys, certificate requests or
+ certificates. This includes TLS clients and TLS servers with
+ client authentication enabled.
+
+ This issue was reported to OpenSSL by Joseph Barr-Pixton.
+ (CVE-2015-1788)
+ [Andy Polyakov]
+
+ *) Exploitable out-of-bounds read in X509_cmp_time
+
+ X509_cmp_time does not properly check the length of the ASN1_TIME
+ string and can read a few bytes out of bounds. In addition,
+ X509_cmp_time accepts an arbitrary number of fractional seconds in the
+ time string.
+
+ An attacker can use this to craft malformed certificates and CRLs of
+ various sizes and potentially cause a segmentation fault, resulting in
+ a DoS on applications that verify certificates or CRLs. TLS clients
+ that verify CRLs are affected. TLS clients and servers with client
+ authentication enabled may be affected if they use custom verification
+ callbacks.
+
+ This issue was reported to OpenSSL by Robert Swiecki (Google), and
+ independently by Hanno Böck.
+ (CVE-2015-1789)
+ [Emilia Käsper]
+
+ *) PKCS7 crash with missing EnvelopedContent
+
+ The PKCS#7 parsing code does not handle missing inner EncryptedContent
+ correctly. An attacker can craft malformed ASN.1-encoded PKCS#7 blobs
+ with missing content and trigger a NULL pointer dereference on parsing.
+
+ Applications that decrypt PKCS#7 data or otherwise parse PKCS#7
+ structures from untrusted sources are affected. OpenSSL clients and
+ servers are not affected.
+
+ This issue was reported to OpenSSL by Michal Zalewski (Google).
+ (CVE-2015-1790)
+ [Emilia Käsper]
+
+ *) CMS verify infinite loop with unknown hash function
+
+ When verifying a signedData message the CMS code can enter an infinite loop
+ if presented with an unknown hash function OID. This can be used to perform
+ denial of service against any system which verifies signedData messages using
+ the CMS code.
+ This issue was reported to OpenSSL by Johannes Bauer.
+ (CVE-2015-1792)
+ [Stephen Henson]
+
+ *) Race condition handling NewSessionTicket
+
+ If a NewSessionTicket is received by a multi-threaded client when attempting to
+ reuse a previous ticket then a race condition can occur potentially leading to
+ a double free of the ticket data.
+ (CVE-2015-1791)
+ [Matt Caswell]
+
+ *) Reject DH handshakes with parameters shorter than 768 bits.
+ [Kurt Roeckx and Emilia Kasper]
+
Changes between 1.0.1l and 1.0.1m [19 Mar 2015]
*) Segmentation fault in ASN1_TYPE_cmp fix
diff -r 6f1c3c36272a -r c4355f4c32a5 crypto/external/bsd/openssl/dist/Configure
--- a/crypto/external/bsd/openssl/dist/Configure Fri Jun 12 16:34:57 2015 +0000
+++ b/crypto/external/bsd/openssl/dist/Configure Fri Jun 12 17:01:11 2015 +0000
@@ -230,12 +230,12 @@
#### SPARC Solaris with GNU C setups
"solaris-sparcv7-gcc","gcc:-O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL
BF_PTR:${no_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"solaris-sparcv8-gcc","gcc:-mv8 -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL
BF_PTR:${sparcv8_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"solaris-sparcv8-gcc","gcc:-mcpu=v8 -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL
BF_PTR:${sparcv8_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
# -m32 should be safe to add as long as driver recognizes -mcpu=ultrasparc
"solaris-sparcv9-gcc","gcc:-m32 -mcpu=ultrasparc -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL
BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
"solaris64-sparcv9-gcc","gcc:-m64 -mcpu=ultrasparc -O3 -Wall -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL
BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-fPIC:-m64 -shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/64",
####
-"debug-solaris-sparcv8-gcc","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -O -g -mv8 -Wall -DB_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK
DES_UNROLL BF_PTR:${sparcv8_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"debug-solaris-sparcv8-gcc","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -O -g -mcpu=v8 -Wall -DB_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK
DES_UNROLL BF_PTR:${sparcv8_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
"debug-solaris-sparcv9-gcc","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -DPEDANTIC -O -g -mcpu=ultrasparc -pedantic -ansi -Wall -Wshadow -Wno-long-long
-D__EXTENSIONS__ -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL
BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
#### SPARC Solaris with Sun C setups
@@ -252,7 +252,7 @@
#### SunOS configs, assuming sparc for the gcc one.
#"sunos-cc", "cc:-O4 -DNOPROTO -DNOCONST::(unknown):SUNOS::DES_UNROLL:${no_asm}::",
-"sunos-gcc","gcc:-O3 -mv8 -Dssize_t=int::(unknown):SUNOS::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL DES_PTR DES_RISC1:${no_asm}::",
+"sunos-gcc","gcc:-O3 -mcpu=v8 -Dssize_t=int::(unknown):SUNOS::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL DES_PTR DES_RISC1:${no_asm}::",
#### IRIX 5.x configs
# -mips2 flag is added by ./config when appropriate.
@@ -379,7 +379,7 @@
#### SPARC Linux setups
# Ray Miller <ray.miller%computing-services.oxford.ac.uk@localhost> has patiently
# assisted with debugging of following two configs.
-"linux-sparcv8","gcc:-mv8 -DB_ENDIAN -O3 -fomit-frame-pointer -Wall -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL
BF_PTR:${sparcv8_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-sparcv8","gcc:-mcpu=v8 -DB_ENDIAN -O3 -fomit-frame-pointer -Wall -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL
BF_PTR:${sparcv8_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
# it's a real mess with -mcpu=ultrasparc option under Linux, but
# -Wa,-Av8plus should do the trick no matter what.
"linux-sparcv9","gcc:-m32 -mcpu=ultrasparc -DB_ENDIAN -O3 -fomit-frame-pointer -Wall -Wa,-Av8plus -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL
BF_PTR:${sparcv9_asm}:dlfcn:linux-shared:-fPIC:-m32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
@@ -413,7 +413,7 @@
"BSD-x86", "gcc:-DL_ENDIAN -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_asm}:a.out:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
"BSD-x86-elf", "gcc:-DL_ENDIAN -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
"debug-BSD-x86-elf", "gcc:-DL_ENDIAN -O3 -Wall -g::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"BSD-sparcv8", "gcc:-DB_ENDIAN -O3 -mv8 -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${sparcv8_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"BSD-sparcv8", "gcc:-DB_ENDIAN -O3 -mcpu=v8 -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${sparcv8_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
"BSD-generic64","gcc:-O3 -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
# -DMD32_REG_T=int doesn't actually belong in sparc64 target, it
diff -r 6f1c3c36272a -r c4355f4c32a5 crypto/external/bsd/openssl/dist/Makefile
--- a/crypto/external/bsd/openssl/dist/Makefile Fri Jun 12 16:34:57 2015 +0000
+++ b/crypto/external/bsd/openssl/dist/Makefile Fri Jun 12 17:01:11 2015 +0000
@@ -4,7 +4,7 @@
## Makefile for OpenSSL
##
-VERSION=1.0.1m
+VERSION=1.0.1n
MAJOR=1
MINOR=0.1
SHLIB_VERSION_NUMBER=1.0.0
@@ -186,7 +186,7 @@
EXHEADER= e_os2.h
HEADER= e_os.h
-all: Makefile build_all openssl.pc libssl.pc libcrypto.pc
+all: Makefile build_all
# as we stick to -e, CLEARENV ensures that local variables in lower
# Makefiles remain local and variable. $${VAR+VAR} is tribute to Korn
@@ -272,7 +272,10 @@
sub_all: build_all
build_all: build_libs build_apps build_tests build_tools
-build_libs: build_crypto build_ssl build_engines
+build_libs: build_libcrypto build_libssl openssl.pc
+
+build_libcrypto: build_crypto build_engines libcrypto.pc
+build_libssl: build_ssl libssl.pc
build_crypto:
@dir=crypto; target=all; $(BUILD_ONE_CMD)
@@ -461,6 +464,9 @@
report:
@$(PERL) util/selftest.pl
+update: errors stacks util/libeay.num util/ssleay.num TABLE
+ @set -e; target=update; $(RECURSIVE_BUILD_CMD)
+
depend:
@set -e; target=depend; $(RECURSIVE_BUILD_CMD)
@@ -485,26 +491,10 @@
util/ssleay.num::
$(PERL) util/mkdef.pl ssl update
-crypto/objects/obj_dat.h: crypto/objects/obj_dat.pl crypto/objects/obj_mac.h
- $(PERL) crypto/objects/obj_dat.pl crypto/objects/obj_mac.h crypto/objects/obj_dat.h
-crypto/objects/obj_mac.h: crypto/objects/objects.pl crypto/objects/objects.txt crypto/objects/obj_mac.num
- $(PERL) crypto/objects/objects.pl crypto/objects/objects.txt crypto/objects/obj_mac.num crypto/objects/obj_mac.h
-crypto/objects/obj_xref.h: crypto/objects/objxref.pl crypto/objects/obj_xref.txt crypto/objects/obj_mac.num
- $(PERL) crypto/objects/objxref.pl crypto/objects/obj_mac.num crypto/objects/obj_xref.txt >crypto/objects/obj_xref.h
-
-apps/openssl-vms.cnf: apps/openssl.cnf
- $(PERL) VMS/VMSify-conf.pl < apps/openssl.cnf > apps/openssl-vms.cnf
-
-crypto/bn/bn_prime.h: crypto/bn/bn_prime.pl
- $(PERL) crypto/bn/bn_prime.pl >crypto/bn/bn_prime.h
-
-
TABLE: Configure
(echo 'Output of `Configure TABLE'"':"; \
$(PERL) Configure TABLE) > TABLE
-update: errors stacks util/libeay.num util/ssleay.num crypto/objects/obj_dat.h crypto/objects/obj_xref.h apps/openssl-vms.cnf crypto/bn/bn_prime.h TABLE depend
-
# Build distribution tar-file. As the list of files returned by "find" is
# pretty long, on several platforms a "too many arguments" error or similar
# would occur. Therefore the list of files is temporarily stored into a file
diff -r 6f1c3c36272a -r c4355f4c32a5 crypto/external/bsd/openssl/dist/NEWS
--- a/crypto/external/bsd/openssl/dist/NEWS Fri Jun 12 16:34:57 2015 +0000
+++ b/crypto/external/bsd/openssl/dist/NEWS Fri Jun 12 17:01:11 2015 +0000
@@ -5,6 +5,14 @@
This file gives a brief overview of the major changes between each OpenSSL
release. For more details please read the CHANGES file.
+ Major changes between OpenSSL 1.0.1m and OpenSSL 1.0.1n [11 Jun 2015]
+
+ o Malformed ECParameters causes infinite loop (CVE-2015-1788)
+ o Exploitable out-of-bounds read in X509_cmp_time (CVE-2015-1789)
+ o PKCS7 crash with missing EnvelopedContent (CVE-2015-1790)
+ o CMS verify infinite loop with unknown hash function (CVE-2015-1792)
+ o Race condition handling NewSessionTicket (CVE-2015-1791)
+
Major changes between OpenSSL 1.0.1l and OpenSSL 1.0.1m [19 Mar 2015]
o Segmentation fault in ASN1_TYPE_cmp fix (CVE-2015-0286)
diff -r 6f1c3c36272a -r c4355f4c32a5 crypto/external/bsd/openssl/dist/README
--- a/crypto/external/bsd/openssl/dist/README Fri Jun 12 16:34:57 2015 +0000
+++ b/crypto/external/bsd/openssl/dist/README Fri Jun 12 17:01:11 2015 +0000
@@ -1,5 +1,5 @@
- OpenSSL 1.0.1m 19 Mar 2015
+ OpenSSL 1.0.1n 11 Jun 2015
Copyright (c) 1998-2011 The OpenSSL Project
Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
diff -r 6f1c3c36272a -r c4355f4c32a5 crypto/external/bsd/openssl/dist/apps/ca.c
--- a/crypto/external/bsd/openssl/dist/apps/ca.c Fri Jun 12 16:34:57 2015 +0000
+++ b/crypto/external/bsd/openssl/dist/apps/ca.c Fri Jun 12 17:01:11 2015 +0000
@@ -558,7 +558,7 @@
#ifdef OPENSSL_SYS_VMS
len = strlen(s) + sizeof(CONFIG_FILE);
tofree = OPENSSL_malloc(len);
- if(!tofree) {
+ if (!tofree) {
BIO_printf(bio_err, "Out of memory\n");
goto err;
}
@@ -566,7 +566,7 @@
#else
len = strlen(s) + sizeof(CONFIG_FILE) + 1;
tofree = OPENSSL_malloc(len);
- if(!tofree) {
+ if (!tofree) {
BIO_printf(bio_err, "Out of memory\n");
goto err;
}
@@ -2803,7 +2803,7 @@
ASN1_GENERALIZEDTIME *comp_time = NULL;
tmp = BUF_strdup(str);
- if(!tmp) {
+ if (!tmp) {
BIO_printf(bio_err, "memory allocation failure\n");
goto err;
}
@@ -2825,7 +2825,7 @@
if (prevtm) {
*prevtm = ASN1_UTCTIME_new();
- if(!*prevtm) {
+ if (!*prevtm) {
BIO_printf(bio_err, "memory allocation failure\n");
goto err;
}
@@ -2869,7 +2869,7 @@
goto err;
}
comp_time = ASN1_GENERALIZEDTIME_new();
- if(!comp_time) {
+ if (!comp_time) {
BIO_printf(bio_err, "memory allocation failure\n");
goto err;
}
diff -r 6f1c3c36272a -r c4355f4c32a5 crypto/external/bsd/openssl/dist/apps/ocsp.c
--- a/crypto/external/bsd/openssl/dist/apps/ocsp.c Fri Jun 12 16:34:57 2015 +0000
+++ b/crypto/external/bsd/openssl/dist/apps/ocsp.c Fri Jun 12 17:01:11 2015 +0000
@@ -519,6 +519,8 @@
BIO_printf(bio_err,
"-CAfile file trusted certificates file\n");
BIO_printf(bio_err,
+ "-no_alt_chains only ever use the first certificate chain found\n");
+ BIO_printf(bio_err,
"-VAfile file validator certificates file\n");
BIO_printf(bio_err,
"-validity_period n maximum validity discrepancy in seconds\n");
diff -r 6f1c3c36272a -r c4355f4c32a5 crypto/external/bsd/openssl/dist/apps/s_client.c
--- a/crypto/external/bsd/openssl/dist/apps/s_client.c Fri Jun 12 16:34:57 2015 +0000
+++ b/crypto/external/bsd/openssl/dist/apps/s_client.c Fri Jun 12 17:01:11 2015 +0000
@@ -323,6 +323,8 @@
BIO_printf(bio_err, " -CApath arg - PEM format directory of CA's\n");
BIO_printf(bio_err, " -CAfile arg - PEM format file of CA's\n");
BIO_printf(bio_err,
+ " -no_alt_chains - only ever use the first certificate chain found\n");
+ BIO_printf(bio_err,
" -reconnect - Drop and re-make the connection with the same Session-ID\n");
BIO_printf(bio_err,
" -pause - sleep(1) after each read(2) and write(2) system call\n");
@@ -547,7 +549,7 @@
PW_CB_DATA cb_tmp;
int l;
Home |
Main Index |
Thread Index |
Old Index