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 in 1.0.1e
details: https://anonhg.NetBSD.org/src/rev/7b229240a886
branches: trunk
changeset: 784871:7b229240a886
user: christos <christos%NetBSD.org@localhost>
date: Tue Feb 12 19:52:11 2013 +0000
description:
merge in 1.0.1e
diffstat:
crypto/external/bsd/openssl/dist/Configure | 1 +
crypto/external/bsd/openssl/dist/apps/s_client.c | 10 +
crypto/external/bsd/openssl/dist/apps/s_server.c | 10 +
crypto/external/bsd/openssl/dist/crypto/opensslv.h | 6 +-
crypto/external/bsd/openssl/dist/crypto/sparccpuid.S | 6 +-
crypto/external/bsd/openssl/dist/doc/crypto/EVP_PKEY_verifyrecover.pod | 103 ----------
crypto/external/bsd/openssl/dist/ssl/d1_pkt.c | 4 +-
crypto/external/bsd/openssl/dist/ssl/s3_clnt.c | 3 +
crypto/external/bsd/openssl/dist/ssl/s3_pkt.c | 4 +-
crypto/external/bsd/openssl/dist/ssl/s3_srvr.c | 3 +
crypto/external/bsd/openssl/dist/ssl/t1_lib.c | 16 +-
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 | 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 | 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_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 | 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 | 4 +-
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 | 4 +-
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 | 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 | 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 | 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 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_passwd.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_pem.3 | 4 +-
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 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_s_server.1 | 4 +-
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 | 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 | 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, 718 insertions(+), 782 deletions(-)
diffs (truncated from 6424 to 300 lines):
diff -r 32887029892a -r 7b229240a886 crypto/external/bsd/openssl/dist/Configure
--- a/crypto/external/bsd/openssl/dist/Configure Tue Feb 12 19:14:50 2013 +0000
+++ b/crypto/external/bsd/openssl/dist/Configure Tue Feb 12 19:52:11 2013 +0000
@@ -174,6 +174,7 @@
"debug-ben-debug-64", "gcc:$gcc_devteam_warn -Wno-error=overlength-strings -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -O3 -pipe::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK
DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
"debug-ben-macos", "cc:$gcc_devteam_warn -arch i386 -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -O3 -DL_ENDIAN -g3
-pipe::(unknown)::-Wl,-search_paths_first::::",
"debug-ben-macos-gcc46", "gcc-mp-4.6:$gcc_devteam_warn -Wconversion -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -O3
-DL_ENDIAN -g3 -pipe::(unknown)::::::",
+"debug-ben-darwin64","cc:$gcc_devteam_warn -Wno-language-extension-token -Wno-extended-offsetof -arch x86_64 -O3 -DL_ENDIAN -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG
RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:".eval{my $asm=$x86_64_asm;$asm=~s/rc4\-[^:]+//;$asm}.":macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64
-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
"debug-ben-no-opt", "gcc: -Wall -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG -Werror -DL_ENDIAN -DTERMIOS -Wall -g3::(unknown)::::::",
"debug-ben-strict", "gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DCONST_STRICT -O2 -Wall -Wshadow -Werror -Wpointer-arith -Wcast-qual -Wwrite-strings
-pipe::(unknown)::::::",
"debug-rse","cc:-DTERMIOS -DL_ENDIAN -pipe -O -g -ggdb3 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}",
diff -r 32887029892a -r 7b229240a886 crypto/external/bsd/openssl/dist/apps/s_client.c
--- a/crypto/external/bsd/openssl/dist/apps/s_client.c Tue Feb 12 19:14:50 2013 +0000
+++ b/crypto/external/bsd/openssl/dist/apps/s_client.c Tue Feb 12 19:52:11 2013 +0000
@@ -362,7 +362,9 @@
# endif
#endif
BIO_printf(bio_err," -legacy_renegotiation - enable use of legacy renegotiation (dangerous)\n");
+#ifndef OPENSSL_NO_SRTP
BIO_printf(bio_err," -use_srtp profiles - Offer SRTP key management with a colon-separated profile list\n");
+#endif
BIO_printf(bio_err," -keymatexport label - Export keying material using label\n");
BIO_printf(bio_err," -keymatexportlen len - Export len bytes of keying material (default 20)\n");
}
@@ -502,7 +504,9 @@
}
#endif
+#ifndef OPENSSL_NO_SRTP
char *srtp_profiles = NULL;
+#endif
# ifndef OPENSSL_NO_NEXTPROTONEG
/* This the context that we pass to next_proto_cb */
@@ -946,11 +950,13 @@
jpake_secret = *++argv;
}
#endif
+#ifndef OPENSSL_NO_SRTP
else if (strcmp(*argv,"-use_srtp") == 0)
{
if (--argc < 1) goto bad;
srtp_profiles = *(++argv);
}
+#endif
else if (strcmp(*argv,"-keymatexport") == 0)
{
if (--argc < 1) goto bad;
@@ -1131,6 +1137,8 @@
BIO_printf(bio_c_out, "PSK key given or JPAKE in use, setting client callback\n");
SSL_CTX_set_psk_client_callback(ctx, psk_client_cb);
}
+#endif
+#ifndef OPENSSL_NO_SRTP
if (srtp_profiles != NULL)
SSL_CTX_set_tlsext_use_srtp(ctx, srtp_profiles);
#endif
@@ -2080,6 +2088,7 @@
}
#endif
+#ifndef OPENSSL_NO_SRTP
{
SRTP_PROTECTION_PROFILE *srtp_profile=SSL_get_selected_srtp_profile(s);
@@ -2087,6 +2096,7 @@
BIO_printf(bio,"SRTP Extension negotiated, profile=%s\n",
srtp_profile->name);
}
+#endif
SSL_SESSION_print(bio,SSL_get_session(s));
if (keymatexportlabel != NULL)
diff -r 32887029892a -r 7b229240a886 crypto/external/bsd/openssl/dist/apps/s_server.c
--- a/crypto/external/bsd/openssl/dist/apps/s_server.c Tue Feb 12 19:14:50 2013 +0000
+++ b/crypto/external/bsd/openssl/dist/apps/s_server.c Tue Feb 12 19:52:11 2013 +0000
@@ -556,7 +556,9 @@
# ifndef OPENSSL_NO_NEXTPROTONEG
BIO_printf(bio_err," -nextprotoneg arg - set the advertised protocols for the NPN extension (comma-separated list)\n");
# endif
+# ifndef OPENSSL_NO_SRTP
BIO_printf(bio_err," -use_srtp profiles - Offer SRTP key management with a colon-separated profile list\n");
+# endif
#endif
BIO_printf(bio_err," -keymatexport label - Export keying material using label\n");
BIO_printf(bio_err," -keymatexportlen len - Export len bytes of keying material (default 20)\n");
@@ -923,7 +925,9 @@
#ifndef OPENSSL_NO_SRP
static srpsrvparm srp_callback_parm;
#endif
+#ifndef OPENSSL_NO_SRTP
static char *srtp_profiles = NULL;
+#endif
int MAIN(int argc, char *argv[])
{
@@ -1319,11 +1323,13 @@
jpake_secret = *(++argv);
}
#endif
+#ifndef OPENSSL_NO_SRTP
else if (strcmp(*argv,"-use_srtp") == 0)
{
if (--argc < 1) goto bad;
srtp_profiles = *(++argv);
}
+#endif
else if (strcmp(*argv,"-keymatexport") == 0)
{
if (--argc < 1) goto bad;
@@ -1549,8 +1555,10 @@
else
SSL_CTX_sess_set_cache_size(ctx,128);
+#ifndef OPENSSL_NO_SRTP
if (srtp_profiles != NULL)
SSL_CTX_set_tlsext_use_srtp(ctx, srtp_profiles);
+#endif
#if 0
if (cipher == NULL) cipher=getenv("SSL_CIPHER");
@@ -2456,6 +2464,7 @@
BIO_printf(bio_s_out, "\n");
}
#endif
+#ifndef OPENSSL_NO_SRTP
{
SRTP_PROTECTION_PROFILE *srtp_profile
= SSL_get_selected_srtp_profile(con);
@@ -2464,6 +2473,7 @@
BIO_printf(bio_s_out,"SRTP Extension negotiated, profile=%s\n",
srtp_profile->name);
}
+#endif
if (SSL_cache_hit(con)) BIO_printf(bio_s_out,"Reused session-id\n");
if (SSL_ctrl(con,SSL_CTRL_GET_FLAGS,0,NULL) &
TLS1_FLAGS_TLS_PADDING_BUG)
diff -r 32887029892a -r 7b229240a886 crypto/external/bsd/openssl/dist/crypto/opensslv.h
--- a/crypto/external/bsd/openssl/dist/crypto/opensslv.h Tue Feb 12 19:14:50 2013 +0000
+++ b/crypto/external/bsd/openssl/dist/crypto/opensslv.h Tue Feb 12 19:52:11 2013 +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 0x1000104fL
+#define OPENSSL_VERSION_NUMBER 0x1000105fL
#ifdef OPENSSL_FIPS
-#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1d-fips 5 Feb 2013"
+#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1e-fips 11 Feb 2013"
#else
-#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1d 5 Feb 2013"
+#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1e 11 Feb 2013"
#endif
#define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT
diff -r 32887029892a -r 7b229240a886 crypto/external/bsd/openssl/dist/crypto/sparccpuid.S
--- a/crypto/external/bsd/openssl/dist/crypto/sparccpuid.S Tue Feb 12 19:14:50 2013 +0000
+++ b/crypto/external/bsd/openssl/dist/crypto/sparccpuid.S Tue Feb 12 19:52:11 2013 +0000
@@ -235,10 +235,10 @@
.global _sparcv9_vis1_probe
.align 8
_sparcv9_vis1_probe:
+ add %sp,BIAS+2,%o1
+ .word 0xc19a5a40 !ldda [%o1]ASI_FP16_P,%f0
+ retl
.word 0x81b00d80 !fxor %f0,%f0,%f0
- add %sp,BIAS+2,%o1
- retl
- .word 0xc19a5a40 !ldda [%o1]ASI_FP16_P,%f0
.type _sparcv9_vis1_probe,#function
.size _sparcv9_vis1_probe,.-_sparcv9_vis1_probe
diff -r 32887029892a -r 7b229240a886 crypto/external/bsd/openssl/dist/doc/crypto/EVP_PKEY_verifyrecover.pod
--- a/crypto/external/bsd/openssl/dist/doc/crypto/EVP_PKEY_verifyrecover.pod Tue Feb 12 19:14:50 2013 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,103 +0,0 @@
-=pod
-
-=head1 NAME
-
-EVP_PKEY_verifyrecover_init, EVP_PKEY_verifyrecover - recover signature using a public key algorithm
-
-=head1 SYNOPSIS
-
- #include <openssl/evp.h>
-
- int EVP_PKEY_verifyrecover_init(EVP_PKEY_CTX *ctx);
- int EVP_PKEY_verifyrecover(EVP_PKEY_CTX *ctx,
- unsigned char *rout, size_t *routlen,
- const unsigned char *sig, size_t siglen);
-
-=head1 DESCRIPTION
-
-The EVP_PKEY_verifyrecover_init() function initializes a public key algorithm
-context using key B<pkey> for a verify recover operation.
-
-The EVP_PKEY_verifyrecover() function recovers signed data
-using B<ctx>. The signature is specified using the B<sig> and
-B<siglen> parameters. If B<rout> is B<NULL> then the maximum size of the output
-buffer is written to the B<routlen> parameter. If B<rout> is not B<NULL> then
-before the call the B<routlen> parameter should contain the length of the
-B<rout> buffer, if the call is successful recovered data is written to
-B<rout> and the amount of data written to B<routlen>.
-
-=head1 NOTES
-
-Normally an application is only interested in whether a signature verification
-operation is successful in those cases the EVP_verify() function should be
-used.
-
-Sometimes however it is useful to obtain the data originally signed using a
-signing operation. Only certain public key algorithms can recover a signature
-in this way (for example RSA in PKCS padding mode).
-
-After the call to EVP_PKEY_verifyrecover_init() algorithm specific control
-operations can be performed to set any appropriate parameters for the
-operation.
-
-The function EVP_PKEY_verifyrecover() can be called more than once on the same
-context if several operations are performed using the same parameters.
-
-=head1 RETURN VALUES
-
-EVP_PKEY_verifyrecover_init() and EVP_PKEY_verifyrecover() return 1 for success
-and 0 or a negative value for failure. In particular a return value of -2
-indicates the operation is not supported by the public key algorithm.
-
-=head1 EXAMPLE
-
-Recover digest originally signed using PKCS#1 and SHA256 digest:
-
- #include <openssl/evp.h>
- #include <openssl/rsa.h>
-
- EVP_PKEY_CTX *ctx;
- unsigned char *rout, *sig;
- size_t routlen, siglen;
- EVP_PKEY *verify_key;
- /* NB: assumes verify_key, sig and siglen are already set up
- * and that verify_key is an RSA public key
- */
- ctx = EVP_PKEY_CTX_new(verify_key);
- if (!ctx)
- /* Error occurred */
- if (EVP_PKEY_verifyrecover_init(ctx) <= 0)
- /* Error */
- if (EVP_PKEY_CTX_set_rsa_padding(ctx, RSA_PKCS1_PADDING) <= 0)
- /* Error */
- if (EVP_PKEY_CTX_set_signature_md(ctx, EVP_sha256()) <= 0)
- /* Error */
-
- /* Determine buffer length */
- if (EVP_PKEY_verifyrecover(ctx, NULL, &routlen, sig, siglen) <= 0)
- /* Error */
-
- rout = OPENSSL_malloc(routlen);
-
- if (!rout)
- /* malloc failure */
-
- if (EVP_PKEY_verifyrecover(ctx, rout, &routlen, sig, siglen) <= 0)
- /* Error */
-
- /* Recovered data is routlen bytes written to buffer rout */
-
-=head1 SEE ALSO
-
-L<EVP_PKEY_CTX_new(3)|EVP_PKEY_CTX_new(3)>,
-L<EVP_PKEY_encrypt(3)|EVP_PKEY_encrypt(3)>,
-L<EVP_PKEY_decrypt(3)|EVP_PKEY_decrypt(3)>,
-L<EVP_PKEY_sign(3)|EVP_PKEY_sign(3)>,
-L<EVP_PKEY_verify(3)|EVP_PKEY_verify(3)>,
-L<EVP_PKEY_derive(3)|EVP_PKEY_derive(3)>
-
-=head1 HISTORY
-
-These functions were first added to OpenSSL 1.0.0.
-
-=cut
diff -r 32887029892a -r 7b229240a886 crypto/external/bsd/openssl/dist/ssl/d1_pkt.c
--- a/crypto/external/bsd/openssl/dist/ssl/d1_pkt.c Tue Feb 12 19:14:50 2013 +0000
+++ b/crypto/external/bsd/openssl/dist/ssl/d1_pkt.c Tue Feb 12 19:52:11 2013 +0000
@@ -410,7 +410,6 @@
/* decrypt in place in 'rr->input' */
rr->data=rr->input;
- orig_len=rr->length;
enc_err = s->method->ssl3_enc->enc(s,0);
/* enc_err is:
@@ -442,6 +441,9 @@
mac_size=EVP_MD_CTX_size(s->read_hash);
OPENSSL_assert(mac_size <= EVP_MAX_MD_SIZE);
+ /* kludge: *_cbc_remove_padding passes padding length in rr->type */
+ orig_len = rr->length+((unsigned int)rr->type>>8);
+
/* orig_len is the length of the record before any padding was
* removed. This is public information, as is the MAC in use,
* therefore we can safely process the record in a different
Home |
Main Index |
Thread Index |
Old Index