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/regen
details: https://anonhg.NetBSD.org/src/rev/634b57b07020
branches: trunk
changeset: 328576:634b57b07020
user: christos <christos%NetBSD.org@localhost>
date: Tue Apr 08 02:18:13 2014 +0000
description:
merge/regen
diffstat:
crypto/external/bsd/openssl/dist/Configure | 2 +-
crypto/external/bsd/openssl/dist/crypto/bio/bss_log.c | 2 +-
crypto/external/bsd/openssl/dist/crypto/cryptlib.c | 2 +-
crypto/external/bsd/openssl/dist/crypto/opensslv.h | 6 +-
crypto/external/bsd/openssl/dist/crypto/rand/md_rand.c | 3 +
crypto/external/bsd/openssl/dist/crypto/x509/x509_vfy.c | 5 +-
crypto/external/bsd/openssl/dist/ssl/s23_clnt.c | 2 +-
crypto/external/bsd/openssl/dist/ssl/s3_srvr.c | 4 +-
crypto/external/bsd/openssl/dist/ssl/ssl.h | 2 +-
crypto/external/bsd/openssl/dist/ssl/t1_enc.c | 3 +-
crypto/external/bsd/openssl/dist/ssl/t1_lib.c | 46 ++++++++-
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 | 6 +-
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 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BN_set_bit.3 | 4 +-
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_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_add1_signer.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 | 11 +-
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 | 6 +-
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 | 6 +-
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_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_tmp_dh_callback.3 | 4 +-
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 | 8 +-
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 | 6 +-
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_DHparams.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/d2i_DSAPublicKey.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 | 6 +-
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_ca.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_ciphers.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_cms.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_crl.1 | 8 +-
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 | 4 +-
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 | 6 +-
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 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_passwd.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_pem.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_pkcs12.1 | 14 +-
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 | 6 +-
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 | 19 +++-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_s_server.1 | 6 +-
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 | 4 +-
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 | 8 +-
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 | 4 +-
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 +-
345 files changed, 765 insertions(+), 708 deletions(-)
diffs (truncated from 6424 to 300 lines):
diff -r ad3d3cfdff28 -r 634b57b07020 crypto/external/bsd/openssl/dist/Configure
--- a/crypto/external/bsd/openssl/dist/Configure Tue Apr 08 01:59:07 2014 +0000
+++ b/crypto/external/bsd/openssl/dist/Configure Tue Apr 08 02:18:13 2014 +0000
@@ -526,7 +526,7 @@
# 'perl Configure VC-WIN32' with '-DUNICODE -D_UNICODE'
"VC-WIN32","cl:-W3 -Gs0 -GF -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN
${x86_gcc_opts}:${x86_asm}:win32n:win32",
# Unified CE target
-"debug-VC-WIN32","cl:-W3 -WX -Gs0 -GF -Gy -Zi -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN
${x86_gcc_opts}:${x86_asm}:win32n:win32",
+"debug-VC-WIN32","cl:-W3 -Gs0 -GF -Gy -Zi -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN
${x86_gcc_opts}:${x86_asm}:win32n:win32",
"VC-CE","cl::::WINCE::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${no_asm}:win32",
# Borland C++ 4.5
diff -r ad3d3cfdff28 -r 634b57b07020 crypto/external/bsd/openssl/dist/crypto/bio/bss_log.c
--- a/crypto/external/bsd/openssl/dist/crypto/bio/bss_log.c Tue Apr 08 01:59:07 2014 +0000
+++ b/crypto/external/bsd/openssl/dist/crypto/bio/bss_log.c Tue Apr 08 02:18:13 2014 +0000
@@ -245,7 +245,7 @@
static void xopenlog(BIO* bp, char* name, int level)
{
- if (GetVersion() < 0x80000000)
+ if (check_winnt())
bp->ptr = RegisterEventSourceA(NULL,name);
else
bp->ptr = NULL;
diff -r ad3d3cfdff28 -r 634b57b07020 crypto/external/bsd/openssl/dist/crypto/cryptlib.c
--- a/crypto/external/bsd/openssl/dist/crypto/cryptlib.c Tue Apr 08 01:59:07 2014 +0000
+++ b/crypto/external/bsd/openssl/dist/crypto/cryptlib.c Tue Apr 08 02:18:13 2014 +0000
@@ -889,7 +889,7 @@
#if defined(_WIN32_WINNT) && _WIN32_WINNT>=0x0333
/* this -------------v--- guards NT-specific calls */
- if (GetVersion() < 0x80000000 && OPENSSL_isservice() > 0)
+ if (check_winnt() && OPENSSL_isservice() > 0)
{ HANDLE h = RegisterEventSource(0,_T("OPENSSL"));
const TCHAR *pmsg=buf;
ReportEvent(h,EVENTLOG_ERROR_TYPE,0,0,0,1,0,&pmsg,0);
diff -r ad3d3cfdff28 -r 634b57b07020 crypto/external/bsd/openssl/dist/crypto/opensslv.h
--- a/crypto/external/bsd/openssl/dist/crypto/opensslv.h Tue Apr 08 01:59:07 2014 +0000
+++ b/crypto/external/bsd/openssl/dist/crypto/opensslv.h Tue Apr 08 02:18:13 2014 +0000
@@ -25,11 +25,11 @@
* (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
* major minor fix final patch/beta)
*/
-#define OPENSSL_VERSION_NUMBER 0x1000106fL
+#define OPENSSL_VERSION_NUMBER 0x1000107fL
#ifdef OPENSSL_FIPS
-#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1f-fips 6 Jan 2014"
+#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1g-fips 7 Apr 2014"
#else
-#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1f 6 Jan 2014"
+#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1g 7 Apr 2014"
#endif
#define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT
diff -r ad3d3cfdff28 -r 634b57b07020 crypto/external/bsd/openssl/dist/crypto/rand/md_rand.c
--- a/crypto/external/bsd/openssl/dist/crypto/rand/md_rand.c Tue Apr 08 01:59:07 2014 +0000
+++ b/crypto/external/bsd/openssl/dist/crypto/rand/md_rand.c Tue Apr 08 02:18:13 2014 +0000
@@ -196,6 +196,9 @@
EVP_MD_CTX m;
int do_not_lock;
+ if (!num)
+ return;
+
/*
* (Based on the rand(3) manpage)
*
diff -r ad3d3cfdff28 -r 634b57b07020 crypto/external/bsd/openssl/dist/crypto/x509/x509_vfy.c
--- a/crypto/external/bsd/openssl/dist/crypto/x509/x509_vfy.c Tue Apr 08 01:59:07 2014 +0000
+++ b/crypto/external/bsd/openssl/dist/crypto/x509/x509_vfy.c Tue Apr 08 02:18:13 2014 +0000
@@ -1462,10 +1462,9 @@
* a certificate was revoked. This has since been changed since
* critical extension can change the meaning of CRL entries.
*/
- if (crl->flags & EXFLAG_CRITICAL)
+ if (!(ctx->param->flags & X509_V_FLAG_IGNORE_CRITICAL)
+ && (crl->flags & EXFLAG_CRITICAL))
{
- if (ctx->param->flags & X509_V_FLAG_IGNORE_CRITICAL)
- return 1;
ctx->error = X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION;
ok = ctx->verify_cb(0, ctx);
if(!ok)
diff -r ad3d3cfdff28 -r 634b57b07020 crypto/external/bsd/openssl/dist/ssl/s23_clnt.c
--- a/crypto/external/bsd/openssl/dist/ssl/s23_clnt.c Tue Apr 08 01:59:07 2014 +0000
+++ b/crypto/external/bsd/openssl/dist/ssl/s23_clnt.c Tue Apr 08 02:18:13 2014 +0000
@@ -283,7 +283,7 @@
send_time = (s->mode & SSL_MODE_SEND_CLIENTHELLO_TIME) != 0;
if (send_time)
{
- unsigned long Time = time(NULL);
+ unsigned long Time = (unsigned long)time(NULL);
unsigned char *p = result;
l2n(Time, p);
return RAND_pseudo_bytes(p, len-4);
diff -r ad3d3cfdff28 -r 634b57b07020 crypto/external/bsd/openssl/dist/ssl/s3_srvr.c
--- a/crypto/external/bsd/openssl/dist/ssl/s3_srvr.c Tue Apr 08 01:59:07 2014 +0000
+++ b/crypto/external/bsd/openssl/dist/ssl/s3_srvr.c Tue Apr 08 02:18:13 2014 +0000
@@ -1840,7 +1840,7 @@
SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,SSL_R_UNKNOWN_KEY_EXCHANGE_TYPE);
goto f_err;
}
- for (i=0; r[i] != NULL && i<4; i++)
+ for (i=0; i < 4 && r[i] != NULL; i++)
{
nr[i]=BN_num_bytes(r[i]);
#ifndef OPENSSL_NO_SRP
@@ -1876,7 +1876,7 @@
d=(unsigned char *)s->init_buf->data;
p= &(d[4]);
- for (i=0; r[i] != NULL && i<4; i++)
+ for (i=0; i < 4 && r[i] != NULL; i++)
{
#ifndef OPENSSL_NO_SRP
if ((i == 2) && (type & SSL_kSRP))
diff -r ad3d3cfdff28 -r 634b57b07020 crypto/external/bsd/openssl/dist/ssl/ssl.h
--- a/crypto/external/bsd/openssl/dist/ssl/ssl.h Tue Apr 08 01:59:07 2014 +0000
+++ b/crypto/external/bsd/openssl/dist/ssl/ssl.h Tue Apr 08 02:18:13 2014 +0000
@@ -915,7 +915,7 @@
*/
unsigned int max_send_fragment;
-#ifndef OPENSSL_ENGINE
+#ifndef OPENSSL_NO_ENGINE
/* Engine to pass requests for client certs to
*/
ENGINE *client_cert_engine;
diff -r ad3d3cfdff28 -r 634b57b07020 crypto/external/bsd/openssl/dist/ssl/t1_enc.c
--- a/crypto/external/bsd/openssl/dist/ssl/t1_enc.c Tue Apr 08 01:59:07 2014 +0000
+++ b/crypto/external/bsd/openssl/dist/ssl/t1_enc.c Tue Apr 08 02:18:13 2014 +0000
@@ -988,7 +988,8 @@
}
else
{
- EVP_MD_CTX_copy(&hmac,hash);
+ if (!EVP_MD_CTX_copy(&hmac,hash))
+ return -1;
mac_ctx = &hmac;
}
diff -r ad3d3cfdff28 -r 634b57b07020 crypto/external/bsd/openssl/dist/ssl/t1_lib.c
--- a/crypto/external/bsd/openssl/dist/ssl/t1_lib.c Tue Apr 08 01:59:07 2014 +0000
+++ b/crypto/external/bsd/openssl/dist/ssl/t1_lib.c Tue Apr 08 02:18:13 2014 +0000
@@ -662,6 +662,36 @@
}
#endif
+#ifdef TLSEXT_TYPE_padding
+ /* Add padding to workaround bugs in F5 terminators.
+ * See https://tools.ietf.org/html/draft-agl-tls-padding-03
+ *
+ * NB: because this code works out the length of all existing
+ * extensions it MUST always appear last.
+ */
+ {
+ int hlen = ret - (unsigned char *)s->init_buf->data;
+ /* The code in s23_clnt.c to build ClientHello messages includes the
+ * 5-byte record header in the buffer, while the code in s3_clnt.c does
+ * not. */
+ if (s->state == SSL23_ST_CW_CLNT_HELLO_A)
+ hlen -= 5;
+ if (hlen > 0xff && hlen < 0x200)
+ {
+ hlen = 0x200 - hlen;
+ if (hlen >= 4)
+ hlen -= 4;
+ else
+ hlen = 0;
+
+ s2n(TLSEXT_TYPE_padding, ret);
+ s2n(hlen, ret);
+ memset(ret, 0, hlen);
+ ret += hlen;
+ }
+ }
+#endif
+
if ((extdatalen = ret-p-2)== 0)
return p;
@@ -1261,7 +1291,7 @@
}
}
else if (type == TLSEXT_TYPE_status_request &&
- s->version != DTLS1_VERSION && s->ctx->tlsext_status_cb)
+ s->version != DTLS1_VERSION)
{
if (size < 5)
@@ -2558,16 +2588,20 @@
unsigned int payload;
unsigned int padding = 16; /* Use minimum padding */
- /* Read type and payload length first */
- hbtype = *p++;
- n2s(p, payload);
- pl = p;
-
if (s->msg_callback)
s->msg_callback(0, s->version, TLS1_RT_HEARTBEAT,
&s->s3->rrec.data[0], s->s3->rrec.length,
s, s->msg_callback_arg);
+ /* Read type and payload length first */
+ if (1 + 2 + 16 > s->s3->rrec.length)
+ return 0; /* silently discard */
+ hbtype = *p++;
+ n2s(p, payload);
+ if (1 + 2 + payload + 16 > s->s3->rrec.length)
+ return 0; /* silently discard per RFC 6520 sec. 4 */
+ pl = p;
+
if (hbtype == TLS1_HB_REQUEST)
{
unsigned char *buffer, *bp;
diff -r ad3d3cfdff28 -r 634b57b07020 crypto/external/bsd/openssl/lib/libcrypto/man/ASN1_OBJECT_new.3
--- a/crypto/external/bsd/openssl/lib/libcrypto/man/ASN1_OBJECT_new.3 Tue Apr 08 01:59:07 2014 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/man/ASN1_OBJECT_new.3 Tue Apr 08 02:18:13 2014 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: ASN1_OBJECT_new.3,v 1.8 2014/01/11 18:25:31 christos Exp $
+.\" $NetBSD: ASN1_OBJECT_new.3,v 1.9 2014/04/08 02:18:14 christos Exp $
.\"
.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.28)
.\"
@@ -135,7 +135,7 @@
.\" ========================================================================
.\"
.IX Title "ASN1_OBJECT_new 3"
-.TH ASN1_OBJECT_new 3 "2009-07-19" "1.0.1f" "OpenSSL"
+.TH ASN1_OBJECT_new 3 "2009-07-19" "1.0.1g" "OpenSSL"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff -r ad3d3cfdff28 -r 634b57b07020 crypto/external/bsd/openssl/lib/libcrypto/man/ASN1_STRING_length.3
--- a/crypto/external/bsd/openssl/lib/libcrypto/man/ASN1_STRING_length.3 Tue Apr 08 01:59:07 2014 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/man/ASN1_STRING_length.3 Tue Apr 08 02:18:13 2014 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: ASN1_STRING_length.3,v 1.8 2014/01/11 18:25:31 christos Exp $
+.\" $NetBSD: ASN1_STRING_length.3,v 1.9 2014/04/08 02:18:14 christos Exp $
.\"
.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.28)
.\"
@@ -135,7 +135,7 @@
.\" ========================================================================
.\"
.IX Title "ASN1_STRING_length 3"
-.TH ASN1_STRING_length 3 "2009-07-19" "1.0.1f" "OpenSSL"
+.TH ASN1_STRING_length 3 "2009-07-19" "1.0.1g" "OpenSSL"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff -r ad3d3cfdff28 -r 634b57b07020 crypto/external/bsd/openssl/lib/libcrypto/man/ASN1_STRING_new.3
--- a/crypto/external/bsd/openssl/lib/libcrypto/man/ASN1_STRING_new.3 Tue Apr 08 01:59:07 2014 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/man/ASN1_STRING_new.3 Tue Apr 08 02:18:13 2014 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: ASN1_STRING_new.3,v 1.8 2014/01/11 18:25:31 christos Exp $
+.\" $NetBSD: ASN1_STRING_new.3,v 1.9 2014/04/08 02:18:14 christos Exp $
.\"
.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.28)
.\"
@@ -135,7 +135,7 @@
.\" ========================================================================
.\"
.IX Title "ASN1_STRING_new 3"
-.TH ASN1_STRING_new 3 "2009-07-19" "1.0.1f" "OpenSSL"
+.TH ASN1_STRING_new 3 "2009-07-19" "1.0.1g" "OpenSSL"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff -r ad3d3cfdff28 -r 634b57b07020 crypto/external/bsd/openssl/lib/libcrypto/man/ASN1_STRING_print_ex.3
--- a/crypto/external/bsd/openssl/lib/libcrypto/man/ASN1_STRING_print_ex.3 Tue Apr 08 01:59:07 2014 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/man/ASN1_STRING_print_ex.3 Tue Apr 08 02:18:13 2014 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: ASN1_STRING_print_ex.3,v 1.8 2014/01/11 18:25:31 christos Exp $
+.\" $NetBSD: ASN1_STRING_print_ex.3,v 1.9 2014/04/08 02:18:14 christos Exp $
.\"
.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.28)
.\"
@@ -135,7 +135,7 @@
.\" ========================================================================
.\"
.IX Title "ASN1_STRING_print_ex 3"
-.TH ASN1_STRING_print_ex 3 "2009-07-19" "1.0.1f" "OpenSSL"
+.TH ASN1_STRING_print_ex 3 "2009-07-19" "1.0.1g" "OpenSSL"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff -r ad3d3cfdff28 -r 634b57b07020 crypto/external/bsd/openssl/lib/libcrypto/man/ASN1_generate_nconf.3
--- a/crypto/external/bsd/openssl/lib/libcrypto/man/ASN1_generate_nconf.3 Tue Apr 08 01:59:07 2014 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/man/ASN1_generate_nconf.3 Tue Apr 08 02:18:13 2014 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: ASN1_generate_nconf.3,v 1.8 2014/01/11 18:25:31 christos Exp $
+.\" $NetBSD: ASN1_generate_nconf.3,v 1.9 2014/04/08 02:18:14 christos Exp $
.\"
.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.28)
.\"
@@ -135,7 +135,7 @@
.\" ========================================================================
.\"
Home |
Main Index |
Thread Index |
Old Index