- Update to 0.9.7

- rnd_keys.c now in distribution
- drop lib/libRSAglue.a
- build on i386, alpha, sparc64, ia64
- build on 2.2.8 with the gas-patch as noted in FAQ

11 files changed, 848 insertions, 614 deletions

diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index f9736d0dd6b1..bd32e14f5202 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	openssl
-PORTVERSION=	0.9.6h
+PORTVERSION=	0.9.7
 CATEGORIES=	security devel
 MASTER_SITES=	http://www.openssl.org/source/ \
 		ftp://ftp.openssl.org/source/ \
@@ -55,81 +55,797 @@ PLIST_SUB+=	NOBASE=""
 .endif
 
 MAKE_ENV+=	MANPREFIX=${MANPREFIX}
+NOPRECIOUSMAKEVARS=	To much _MLINKS for fetch
 
-MAN1=		CA.pl.1 asn1parse.1 ca.1 ciphers.1 crl.1 crl2pkcs7.1 dgst.1 \
-		dhparam.1 dsa.1 dsaparam.1 enc.1 gendsa.1 genrsa.1 nseq.1 \
-		openssl.1 passwd.1 pkcs12.1 pkcs7.1 pkcs8.1 rand.1 req.1 \
-		rsa.1 s_client.1 s_server.1 sess_id.1 smime.1 speed.1 \
-		spkac.1 verify.1 version.1 x509.1 rsautl.1
-
-MAN3=		BN_CTX_new.3 BN_CTX_start.3 BN_add.3 BN_add_word.3 \
-		BN_bn2bin.3 BN_cmp.3 BN_copy.3 BN_generate_prime.3 \
-		BN_mod_inverse.3 BN_mod_mul_montgomery.3 \
-		BN_mod_mul_reciprocal.3 BN_new.3 BN_num_bytes.3 BN_rand.3 \
-		BN_set_bit.3 BN_zero.3 CRYPTO_set_ex_data.3 \
-		DH_generate_key.3 DH_generate_parameters.3 \
-		DH_get_ex_new_index.3 DH_new.3 DH_set_method.3 DH_size.3 \
-		DSA_SIG_new.3 DSA_do_sign.3 DSA_dup_DH.3 DSA_generate_key.3 \
-		DSA_generate_parameters.3 DSA_get_ex_new_index.3 DSA_new.3 \
-		DSA_set_method.3 DSA_sign.3 DSA_size.3 ERR_GET_LIB.3 \
-		ERR_clear_error.3 ERR_error_string.3 ERR_get_error.3 \
-		ERR_load_crypto_strings.3 ERR_load_strings.3 \
-		ERR_print_errors.3 ERR_put_error.3 ERR_remove_state.3 \
-		EVP_DigestInit.3 EVP_EncryptInit.3 EVP_OpenInit.3 \
-		EVP_SealInit.3 EVP_SignInit.3 EVP_VerifyInit.3 \
-		OPENSSL_VERSION_NUMBER.3 OpenSSL_add_all_algorithms.3 \
-		RAND_add.3 RAND_bytes.3 RAND_cleanup.3 RAND_egd.3 \
-		RAND_load_file.3 RAND_set_rand_method.3 RSA_blinding_on.3 \
-		RSA_check_key.3 RSA_generate_key.3 RSA_get_ex_new_index.3 \
-		RSA_new.3 RSA_padding_add_PKCS1_type_1.3 RSA_print.3 \
-		RSA_private_encrypt.3 RSA_public_encrypt.3 RSA_set_method.3 \
-		RSA_sign.3 RSA_sign_ASN1_OCTET_STRING.3 RSA_size.3 \
-		SSL_get_error.3 blowfish.3 bn.3 bn_internal.3 buffer.3 \
-		crypto.3 d2i_DHparams.3 d2i_RSAPublicKey.3 des.3 dh.3 dsa.3 \
-		err.3 hmac.3 lh_stats.3 lhash.3 md5.3 mdc2.3 rand.3 rc4.3 \
-		ripemd.3 rsa.3 sha.3 ssl.3 threads.3 BIO_ctrl.3 BIO_f_base64.3 \
-		BIO_f_buffer.3 BIO_f_cipher.3 BIO_f_md.3 BIO_f_null.3 \
-		BIO_f_ssl.3 BIO_find_type.3 BIO_new.3 BIO_new_bio_pair.3 \
-		BIO_push.3 BIO_read.3 BIO_s_accept.3 BIO_s_bio.3 \
-		BIO_s_connect.3 BIO_s_fd.3 BIO_s_file.3 BIO_s_mem.3 \
-		BIO_s_null.3 BIO_s_socket.3 BIO_set_callback.3 \
-		BIO_should_retry.3 SSL_CIPHER_get_name.3 \
-		SSL_COMP_add_compression_method.3 \
-		SSL_CTX_add_extra_chain_cert.3 SSL_CTX_add_session.3 \
-		SSL_CTX_ctrl.3 SSL_CTX_flush_sessions.3 SSL_CTX_free.3 \
-		SSL_CTX_get_ex_new_index.3 SSL_CTX_get_verify_mode.3 \
-		SSL_CTX_load_verify_locations.3 SSL_CTX_new.3 \
-		SSL_CTX_sess_number.3 SSL_CTX_sess_set_cache_size.3 \
-		SSL_CTX_sess_set_get_cb.3 SSL_CTX_sessions.3 \
-		SSL_CTX_set_cert_store.3 SSL_CTX_set_cert_verify_callback.3 \
-		SSL_CTX_set_cipher_list.3 SSL_CTX_set_client_CA_list.3 \
-		SSL_CTX_set_client_cert_cb.3 \
-		SSL_CTX_set_default_passwd_cb.3 SSL_CTX_set_info_callback.3 \
-		SSL_CTX_set_mode.3 SSL_CTX_set_options.3 \
-		SSL_CTX_set_quiet_shutdown.3 SSL_CTX_set_session_cache_mode.3 \
-		SSL_CTX_set_session_id_context.3 SSL_CTX_set_ssl_version.3 \
-		SSL_CTX_set_tmp_dh_callback.3 SSL_CTX_set_tmp_rsa_callback.3 \
-		SSL_CTX_set_timeout.3 SSL_CTX_set_verify.3 \
-		SSL_CTX_use_certificate.3 SSL_SESSION_free.3 \
-		SSL_SESSION_get_ex_new_index.3 SSL_SESSION_get_time.3 \
-		SSL_accept.3 SSL_alert_type_string.3 SSL_clear.3 \
-		SSL_connect.3 SSL_free.3 SSL_get_SSL_CTX.3 SSL_get_ciphers.3 \
-		SSL_do_handshake.3 SSL_get_client_CA_list.3 \
-		SSL_get_current_cipher.3 SSL_get_default_timeout.3 \
-		SSL_get_ex_data_X509_STORE_CTX_idx.3 SSL_get_ex_new_index.3 \
-		SSL_get_fd.3 SSL_get_peer_cert_chain.3 \
-		SSL_get_peer_certificate.3 SSL_get_rbio.3 SSL_get_session.3 \
-		SSL_get_verify_result.3 SSL_get_version.3 SSL_library_init.3 \
-		SSL_load_client_CA_file.3 SSL_new.3 SSL_pending.3 SSL_read.3 \
-		SSL_rstate_string.3 SSL_session_reused.3 SSL_set_bio.3 \
-		SSL_set_connect_state.3 SSL_set_fd.3 SSL_set_session.3 \
-		SSL_set_shutdown.3 SSL_set_verify_result.3 SSL_shutdown.3 \
-		SSL_state_string.3 SSL_want.3 SSL_write.3 \
-		bio.3 d2i_SSL_SESSION.3 evp.3
-
-MAN5=		config.5
-
-MAN7=		des_modes.7
+MAN1=	CA.pl.1 asn1parse.1 ca.1 ciphers.1 crl.1 crl2pkcs7.1 dgst.1 dhparam.1 \
+	dsa.1 dsaparam.1 enc.1 gendsa.1 genrsa.1 nseq.1 ocsp.1 openssl.1 \
+	passwd.1 pkcs12.1 pkcs7.1 pkcs8.1 rand.1 req.1 rsa.1 s_client.1 \
+	s_server.1 sess_id.1 smime.1 speed.1 spkac.1 verify.1 version.1 \
+	x509.1 rsautl.1
+
+MAN3=	ASN1_OBJECT_new.3 ASN1_STRING_length.3 ASN1_STRING_new.3 \
+	ASN1_STRING_print_ex.3 BIO_ctrl.3 BIO_f_base64.3 BIO_f_buffer.3 \
+	BIO_f_cipher.3 BIO_f_md.3 BIO_f_null.3 BIO_f_ssl.3 BIO_find_type.3 \
+	BIO_new.3 BIO_new_bio_pair.3 BIO_push.3 BIO_read.3 BIO_s_accept.3 \
+	BIO_s_bio.3 BIO_s_connect.3 BIO_s_fd.3 BIO_s_file.3 BIO_s_mem.3 \
+	BIO_s_null.3 BIO_s_socket.3 BIO_set_callback.3 BIO_should_retry.3 \
+	BN_CTX_new.3 BN_CTX_start.3 BN_add.3 BN_add_word.3 BN_bn2bin.3 \
+	BN_cmp.3 BN_copy.3 BN_generate_prime.3 BN_mod_inverse.3 \
+	BN_mod_mul_montgomery.3 BN_mod_mul_reciprocal.3 BN_new.3 \
+	BN_num_bytes.3 BN_rand.3 BN_set_bit.3 BN_swap.3 BN_zero.3 \
+	CRYPTO_set_ex_data.3 DH_generate_key.3 DH_generate_parameters.3 \
+	DH_get_ex_new_index.3 DH_new.3 DH_set_method.3 DH_size.3 \
+	DSA_SIG_new.3 DSA_do_sign.3 DSA_dup_DH.3 DSA_generate_key.3 \
+	DSA_generate_parameters.3 DSA_get_ex_new_index.3 DSA_new.3 \
+	DSA_set_method.3 DSA_sign.3 DSA_size.3 ERR_GET_LIB.3 \
+	ERR_clear_error.3 ERR_error_string.3 ERR_get_error.3 \
+	ERR_load_crypto_strings.3 ERR_load_strings.3 ERR_print_errors.3 \
+	ERR_put_error.3 ERR_remove_state.3 EVP_BytesToKey.3 EVP_DigestInit.3 \
+	EVP_EncryptInit.3 EVP_OpenInit.3 EVP_PKEY_new.3 EVP_PKEY_set1_RSA.3 \
+	EVP_SealInit.3 EVP_SignInit.3 EVP_VerifyInit.3 OBJ_nid2obj.3 \
+	OPENSSL_VERSION_NUMBER.3 OpenSSL_add_all_algorithms.3 PKCS12_create.3 \
+	PKCS12_parse.3 PKCS7_sign.3 PKCS7_verify.3 PKCS7_encrypt.3 \
+	PKCS7_decrypt.3 RAND_add.3 RAND_bytes.3 RAND_cleanup.3 RAND_egd.3 \
+	RAND_load_file.3 RAND_set_rand_method.3 RSA_blinding_on.3 \
+	RSA_check_key.3 RSA_generate_key.3 RSA_get_ex_new_index.3 RSA_new.3 \
+	RSA_padding_add_PKCS1_type_1.3 RSA_print.3 RSA_private_encrypt.3 \
+	RSA_public_encrypt.3 RSA_set_method.3 RSA_sign.3 \
+	RSA_sign_ASN1_OCTET_STRING.3 RSA_size.3 SSL_CIPHER_get_name.3 \
+	SSL_COMP_add_compression_method.3 SSL_CTX_add_extra_chain_cert.3 \
+	SSL_CTX_add_session.3 SSL_CTX_ctrl.3 SSL_CTX_flush_sessions.3 \
+	SSL_CTX_free.3 SSL_CTX_get_ex_new_index.3 SSL_CTX_get_verify_mode.3 \
+	SSL_CTX_load_verify_locations.3 SSL_CTX_new.3 SSL_CTX_sess_number.3 \
+	SSL_CTX_sess_set_cache_size.3 SSL_CTX_sess_set_get_cb.3 \
+	SSL_CTX_sessions.3 SSL_CTX_set_cert_store.3 \
+	SSL_CTX_set_cert_verify_callback.3 SSL_CTX_set_cipher_list.3 \
+	SSL_CTX_set_client_CA_list.3 SSL_CTX_set_client_cert_cb.3 \
+	SSL_CTX_set_default_passwd_cb.3 SSL_CTX_set_generate_session_id.3 \
+	SSL_CTX_set_info_callback.3 SSL_CTX_set_max_cert_list.3 \
+	SSL_CTX_set_mode.3 SSL_CTX_set_msg_callback.3 SSL_CTX_set_options.3 \
+	SSL_CTX_set_quiet_shutdown.3 SSL_CTX_set_session_cache_mode.3 \
+	SSL_CTX_set_session_id_context.3 SSL_CTX_set_ssl_version.3 \
+	SSL_CTX_set_tmp_dh_callback.3 SSL_CTX_set_tmp_rsa_callback.3 \
+	SSL_CTX_set_timeout.3 SSL_CTX_set_verify.3 SSL_CTX_use_certificate.3 \
+	SSL_SESSION_free.3 SSL_SESSION_get_ex_new_index.3 \
+	SSL_SESSION_get_time.3 SSL_accept.3 SSL_alert_type_string.3 \
+	SSL_clear.3 SSL_connect.3 SSL_do_handshake.3 SSL_free.3 \
+	SSL_get_SSL_CTX.3 SSL_get_ciphers.3 SSL_get_client_CA_list.3 \
+	SSL_get_current_cipher.3 SSL_get_default_timeout.3 SSL_get_error.3 \
+	SSL_get_ex_data_X509_STORE_CTX_idx.3 SSL_get_ex_new_index.3 \
+	SSL_get_fd.3 SSL_get_peer_cert_chain.3 SSL_get_peer_certificate.3 \
+	SSL_get_rbio.3 SSL_get_session.3 SSL_get_verify_result.3 \
+	SSL_get_version.3 SSL_library_init.3 SSL_load_client_CA_file.3 \
+	SSL_new.3 SSL_pending.3 SSL_read.3 SSL_rstate_string.3 \
+	SSL_session_reused.3 SSL_set_bio.3 SSL_set_connect_state.3 \
+	SSL_set_fd.3 SSL_set_session.3 SSL_set_shutdown.3 \
+	SSL_set_verify_result.3 SSL_shutdown.3 SSL_state_string.3 SSL_want.3 \
+	SSL_write.3 SMIME_write_PKCS7.3 SMIME_read_PKCS7.3 \
+	X509_NAME_ENTRY_get_object.3 X509_NAME_add_entry_by_txt.3 \
+	X509_NAME_get_index_by_NID.3 X509_new.3 X509_NAME_print_ex.3 \
+	blowfish.3 bn.3 bn_internal.3 bio.3 buffer.3 crypto.3 \
+	d2i_ASN1_OBJECT.3 d2i_DHparams.3 d2i_DSAPublicKey.3 \
+	d2i_PKCS8PrivateKey.3 d2i_RSAPublicKey.3 d2i_X509_ALGOR.3 \
+	d2i_X509_CRL.3 d2i_X509.3 d2i_X509_NAME.3 d2i_X509_REQ.3 \
+	d2i_X509_SIG.3 d2i_SSL_SESSION.3 des.3 dh.3 dsa.3 engine.3 err.3 \
+	evp.3 hmac.3 lh_stats.3 lhash.3 md5.3 mdc2.3 pem.3 rand.3 rc4.3 \
+	ripemd.3 rsa.3 sha.3 ssl.3 threads.3 ui.3 ui_compat.3
+
+MAN5=	config.5
+
+MAN7=	des_modes.7
+
+MLINKS=	dgst.1 md4.1 \
+	dgst.1 sha.1 \
+	dgst.1 mdc2.1 \
+	dgst.1 ripemd160.1 \
+	dgst.1 md2.1 \
+	dgst.1 sha1.1 \
+	dgst.1 md5.1 \
+	ASN1_OBJECT_new.3 ASN1_OBJECT_free.3 \
+	ASN1_STRING_length.3 ASN1_STRING_cmp.3 \
+	ASN1_STRING_length.3 ASN1_STRING_data.3 \
+	ASN1_STRING_length.3 ASN1_STRING_dup.3 \
+	ASN1_STRING_length.3 ASN1_STRING_set.3 \
+	ASN1_STRING_length.3 ASN1_STRING_type.3 \
+	ASN1_STRING_length.3 ASN1_STRING_length_set.3 \
+	ASN1_STRING_new.3 ASN1_STRING_free.3 \
+	ASN1_STRING_new.3 ASN1_STRING_type_new.3 \
+	ASN1_STRING_print_ex.3 ASN1_STRING_print_ex_fp.3 \
+	BIO_ctrl.3 BIO_callback_ctrl.3 \
+	BIO_ctrl.3 BIO_ctrl_pending.3 \
+	BIO_ctrl.3 BIO_ctrl_wpending.3 \
+	BIO_ctrl.3 BIO_eof.3 \
+	BIO_ctrl.3 BIO_flush.3 \
+	BIO_ctrl.3 BIO_get_close.3 \
+	BIO_ctrl.3 BIO_get_info_callback.3 \
+	BIO_ctrl.3 BIO_int_ctrl.3 \
+	BIO_ctrl.3 BIO_pending.3 \
+	BIO_ctrl.3 BIO_ptr_ctrl.3 \
+	BIO_ctrl.3 BIO_reset.3 \
+	BIO_ctrl.3 BIO_seek.3 \
+	BIO_ctrl.3 BIO_set_callback_arg.3 \
+	BIO_ctrl.3 BIO_set_close.3 \
+	BIO_ctrl.3 BIO_set_info_callback.3 \
+	BIO_ctrl.3 BIO_tell.3 \
+	BIO_ctrl.3 BIO_wpending.3 \
+	BIO_f_cipher.3 BIO_get_cipher_ctx.3 \
+	BIO_f_cipher.3 BIO_get_cipher_status.3 \
+	BIO_f_cipher.3 BIO_set_cipher.3 \
+	BIO_f_md.3 BIO_get_md.3 \
+	BIO_f_md.3 BIO_get_md_ctx.3 \
+	BIO_f_md.3 BIO_set_md.3 \
+	BIO_f_ssl.3 BIO_get_num_renegotiates.3 \
+	BIO_f_ssl.3 BIO_get_ssl.3 \
+	BIO_f_ssl.3 BIO_new_buffer_ssl_connect.3 \
+	BIO_f_ssl.3 BIO_new_ssl.3 \
+	BIO_f_ssl.3 BIO_new_ssl_connect.3 \
+	BIO_f_ssl.3 BIO_set_ssl.3 \
+	BIO_f_ssl.3 BIO_set_ssl_mode.3 \
+	BIO_f_ssl.3 BIO_set_ssl_renegotiate_bytes.3 \
+	BIO_f_ssl.3 BIO_set_ssl_renegotiate_timeout.3 \
+	BIO_f_ssl.3 BIO_ssl_copy_session_id.3 \
+	BIO_f_ssl.3 BIO_ssl_shutdown.3 \
+	BIO_find_type.3 BIO_next.3 \
+	BIO_new.3 BIO_free.3 \
+	BIO_new.3 BIO_free_all.3 \
+	BIO_new.3 BIO_set.3 \
+	BIO_new.3 BIO_vfree.3 \
+	BIO_push.3 BIO_pop.3 \
+	BIO_read.3 BIO_gets.3 \
+	BIO_read.3 BIO_puts.3 \
+	BIO_read.3 BIO_write.3 \
+	BIO_s_accept.3 BIO_do_accept.3 \
+	BIO_s_accept.3 BIO_get_accept_port.3 \
+	BIO_s_accept.3 BIO_get_bind_mode.3 \
+	BIO_s_accept.3 BIO_set_accept_bios.3 \
+	BIO_s_accept.3 BIO_set_accept_port.3 \
+	BIO_s_accept.3 BIO_set_bind_mode.3 \
+	BIO_s_accept.3 BIO_set_nbio_accept.3 \
+	BIO_s_bio.3 BIO_ctrl_get_read_request.3 \
+	BIO_s_bio.3 BIO_ctrl_get_write_guarantee.3 \
+	BIO_s_bio.3 BIO_ctrl_reset_read_request.3 \
+	BIO_s_bio.3 BIO_destroy_bio_pair.3 \
+	BIO_s_bio.3 BIO_get_read_request.3 \
+	BIO_s_bio.3 BIO_get_write_buf_size.3 \
+	BIO_s_bio.3 BIO_get_write_guarantee.3 \
+	BIO_s_bio.3 BIO_make_bio_pair.3 \
+	BIO_s_bio.3 BIO_set_write_buf_size.3 \
+	BIO_s_bio.3 BIO_shutdown_wr.3 \
+	BIO_s_connect.3 BIO_do_connect.3 \
+	BIO_s_connect.3 BIO_get_conn_hostname.3 \
+	BIO_s_connect.3 BIO_get_conn_int_port.3 \
+	BIO_s_connect.3 BIO_get_conn_ip.3 \
+	BIO_s_connect.3 BIO_get_conn_port.3 \
+	BIO_s_connect.3 BIO_set_conn_hostname.3 \
+	BIO_s_connect.3 BIO_set_conn_int_port.3 \
+	BIO_s_connect.3 BIO_set_conn_ip.3 \
+	BIO_s_connect.3 BIO_set_conn_port.3 \
+	BIO_s_connect.3 BIO_set_nbio.3 \
+	BIO_s_fd.3 BIO_get_fd.3 \
+	BIO_s_fd.3 BIO_new_fd.3 \
+	BIO_s_fd.3 BIO_set_fd.3 \
+	BIO_s_file.3 BIO_append_filename.3 \
+	BIO_s_file.3 BIO_get_fp.3 \
+	BIO_s_file.3 BIO_new_file.3 \
+	BIO_s_file.3 BIO_new_fp.3 \
+	BIO_s_file.3 BIO_read_filename.3 \
+	BIO_s_file.3 BIO_rw_filename.3 \
+	BIO_s_file.3 BIO_set_fp.3 \
+	BIO_s_file.3 BIO_write_filename.3 \
+	BIO_s_mem.3 BIO_get_mem_data.3 \
+	BIO_s_mem.3 BIO_get_mem_ptr.3 \
+	BIO_s_mem.3 BIO_new_mem_buf.3 \
+	BIO_s_mem.3 BIO_set_mem_buf.3 \
+	BIO_s_mem.3 BIO_set_mem_eof_return.3 \
+	BIO_s_socket.3 BIO_new_socket.3 \
+	BIO_set_callback.3 BIO_debug_callback.3 \
+	BIO_set_callback.3 BIO_get_callback.3 \
+	BIO_set_callback.3 BIO_get_callback_arg.3 \
+	BIO_should_retry.3 BIO_get_retry_BIO.3 \
+	BIO_should_retry.3 BIO_get_retry_reason.3 \
+	BIO_should_retry.3 BIO_retry_type.3 \
+	BIO_should_retry.3 BIO_should_io_special.3 \
+	BIO_should_retry.3 BIO_should_read.3 \
+	BIO_should_retry.3 BIO_should_write.3 \
+	BN_CTX_new.3 BN_CTX_free.3 \
+	BN_CTX_new.3 BN_CTX_init.3 \
+	BN_CTX_start.3 BN_CTX_end.3 \
+	BN_CTX_start.3 BN_CTX_get.3 \
+	BN_add.3 BN_div.3 \
+	BN_add.3 BN_exp.3 \
+	BN_add.3 BN_gcd.3 \
+	BN_add.3 BN_mod.3 \
+	BN_add.3 BN_mod_add.3 \
+	BN_add.3 BN_mod_exp.3 \
+	BN_add.3 BN_mod_mul.3 \
+	BN_add.3 BN_mod_sqr.3 \
+	BN_add.3 BN_mod_sub.3 \
+	BN_add.3 BN_mul.3 \
+	BN_add.3 BN_nnmod.3 \
+	BN_add.3 BN_sqr.3 \
+	BN_add.3 BN_sub.3 \
+	BN_add_word.3 BN_div_word.3 \
+	BN_add_word.3 BN_mod_word.3 \
+	BN_add_word.3 BN_mul_word.3 \
+	BN_add_word.3 BN_sub_word.3 \
+	BN_bn2bin.3 BN_bin2bn.3 \
+	BN_bn2bin.3 BN_bn2dec.3 \
+	BN_bn2bin.3 BN_bn2hex.3 \
+	BN_bn2bin.3 BN_bn2mpi.3 \
+	BN_bn2bin.3 BN_dec2bn.3 \
+	BN_bn2bin.3 BN_hex2bn.3 \
+	BN_bn2bin.3 BN_mpi2bn.3 \
+	BN_bn2bin.3 BN_print.3 \
+	BN_bn2bin.3 BN_print_fp.3 \
+	BN_cmp.3 BN_is_odd.3 \
+	BN_cmp.3 BN_is_one.3 \
+	BN_cmp.3 BN_is_word.3 \
+	BN_cmp.3 BN_is_zero.3 \
+	BN_cmp.3 BN_ucmp.3 \
+	BN_copy.3 BN_dup.3 \
+	BN_generate_prime.3 BN_is_prime.3 \
+	BN_generate_prime.3 BN_is_prime_fasttest.3 \
+	BN_mod_mul_montgomery.3 BN_MONT_CTX_copy.3 \
+	BN_mod_mul_montgomery.3 BN_MONT_CTX_free.3 \
+	BN_mod_mul_montgomery.3 BN_MONT_CTX_init.3 \
+	BN_mod_mul_montgomery.3 BN_MONT_CTX_new.3 \
+	BN_mod_mul_montgomery.3 BN_MONT_CTX_set.3 \
+	BN_mod_mul_montgomery.3 BN_from_montgomery.3 \
+	BN_mod_mul_montgomery.3 BN_to_montgomery.3 \
+	BN_mod_mul_reciprocal.3 BN_RECP_CTX_free.3 \
+	BN_mod_mul_reciprocal.3 BN_RECP_CTX_init.3 \
+	BN_mod_mul_reciprocal.3 BN_RECP_CTX_new.3 \
+	BN_mod_mul_reciprocal.3 BN_RECP_CTX_set.3 \
+	BN_mod_mul_reciprocal.3 BN_div_recp.3 \
+	BN_new.3 BN_clear.3 \
+	BN_new.3 BN_clear_free.3 \
+	BN_new.3 BN_free.3 \
+	BN_new.3 BN_init.3 \
+	BN_num_bytes.3 BN_num_bits.3 \
+	BN_num_bytes.3 BN_num_bits_word.3 \
+	BN_rand.3 BN_pseudo_rand.3 \
+	BN_set_bit.3 BN_clear_bit.3 \
+	BN_set_bit.3 BN_is_bit_set.3 \
+	BN_set_bit.3 BN_lshift.3 \
+	BN_set_bit.3 BN_lshift1.3 \
+	BN_set_bit.3 BN_mask_bits.3 \
+	BN_set_bit.3 BN_rshift.3 \
+	BN_set_bit.3 BN_rshift1.3 \
+	BN_zero.3 BN_get_word.3 \
+	BN_zero.3 BN_one.3 \
+	BN_zero.3 BN_set_word.3 \
+	BN_zero.3 BN_value_one.3 \
+	CRYPTO_set_ex_data.3 CRYPTO_get_ex_data.3 \
+	DH_generate_key.3 DH_compute_key.3 \
+	DH_generate_parameters.3 DH_check.3 \
+	DH_get_ex_new_index.3 DH_get_ex_data.3 \
+	DH_get_ex_new_index.3 DH_set_ex_data.3 \
+	DH_new.3 DH_free.3 \
+	DH_set_method.3 DH_OpenSSL.3 \
+	DH_set_method.3 DH_get_default_method.3 \
+	DH_set_method.3 DH_new_method.3 \
+	DH_set_method.3 DH_set_default_method.3 \
+	DSA_SIG_new.3 DSA_SIG_free.3 \
+	DSA_do_sign.3 DSA_do_verify.3 \
+	DSA_get_ex_new_index.3 DSA_get_ex_data.3 \
+	DSA_get_ex_new_index.3 DSA_set_ex_data.3 \
+	DSA_new.3 DSA_free.3 \
+	DSA_set_method.3 DSA_OpenSSL.3 \
+	DSA_set_method.3 DSA_get_default_method.3 \
+	DSA_set_method.3 DSA_new_method.3 \
+	DSA_set_method.3 DSA_set_default_method.3 \
+	DSA_sign.3 DSA_sign_setup.3 \
+	DSA_sign.3 DSA_verify.3 \
+	ERR_GET_LIB.3 ERR_GET_FUNC.3 \
+	ERR_GET_LIB.3 ERR_GET_REASON.3 \
+	ERR_error_string.3 ERR_error_string_n.3 \
+	ERR_error_string.3 ERR_func_error_string.3 \
+	ERR_error_string.3 ERR_lib_error_string.3 \
+	ERR_error_string.3 ERR_reason_error_string.3 \
+	ERR_get_error.3 ERR_get_error_line.3 \
+	ERR_get_error.3 ERR_get_error_line_data.3 \
+	ERR_get_error.3 ERR_peek_error.3 \
+	ERR_get_error.3 ERR_peek_error_line.3 \
+	ERR_get_error.3 ERR_peek_error_line_data.3 \
+	ERR_get_error.3 ERR_peek_last_error.3 \
+	ERR_get_error.3 ERR_peek_last_error_line.3 \
+	ERR_get_error.3 ERR_peek_last_error_line_data.3 \
+	ERR_load_crypto_strings.3 ERR_free_strings.3 \
+	ERR_load_crypto_strings.3 SSL_load_error_strings.3 \
+	ERR_load_strings.3 ERR_PACK.3 \
+	ERR_load_strings.3 ERR_get_next_error_library.3 \
+	ERR_print_errors.3 ERR_print_errors_fp.3 \
+	ERR_put_error.3 ERR_add_error_data.3 \
+	EVP_DigestInit.3 EVP_DigestFinal_ex.3 \
+	EVP_DigestInit.3 EVP_DigestInit_ex.3 \
+	EVP_DigestInit.3 EVP_DigestUpdate.3 \
+	EVP_DigestInit.3 EVP_MAX_MD_SIZE.3 \
+	EVP_DigestInit.3 EVP_MD_CTX_block_size.3 \
+	EVP_DigestInit.3 EVP_MD_CTX_cleanup.3 \
+	EVP_DigestInit.3 EVP_MD_CTX_copy.3 \
+	EVP_DigestInit.3 EVP_MD_CTX_copy_ex.3 \
+	EVP_DigestInit.3 EVP_MD_CTX_create.3 \
+	EVP_DigestInit.3 EVP_MD_CTX_destroy.3 \
+	EVP_DigestInit.3 EVP_MD_CTX_init.3 \
+	EVP_DigestInit.3 EVP_MD_CTX_md.3 \
+	EVP_DigestInit.3 EVP_MD_CTX_size.3 \
+	EVP_DigestInit.3 EVP_MD_CTX_type.3 \
+	EVP_DigestInit.3 EVP_MD_block_size.3 \
+	EVP_DigestInit.3 EVP_MD_pkey_type.3 \
+	EVP_DigestInit.3 EVP_MD_size.3 \
+	EVP_DigestInit.3 EVP_MD_type.3 \
+	EVP_DigestInit.3 EVP_dss.3 \
+	EVP_DigestInit.3 EVP_dss1.3 \
+	EVP_DigestInit.3 EVP_get_digestbyname.3 \
+	EVP_DigestInit.3 EVP_get_digestbynid.3 \
+	EVP_DigestInit.3 EVP_get_digestbyobj.3 \
+	EVP_DigestInit.3 EVP_md2.3 \
+	EVP_DigestInit.3 EVP_md5.3 \
+	EVP_DigestInit.3 EVP_md_null.3 \
+	EVP_DigestInit.3 EVP_mdc2.3 \
+	EVP_DigestInit.3 EVP_ripemd160.3 \
+	EVP_DigestInit.3 EVP_sha.3 \
+	EVP_DigestInit.3 EVP_sha1.3 \
+	EVP_EncryptInit.3 EVP_CIPHER_CTX_block_size.3 \
+	EVP_EncryptInit.3 EVP_CIPHER_CTX_cipher.3 \
+	EVP_EncryptInit.3 EVP_CIPHER_CTX_cleanup.3 \
+	EVP_EncryptInit.3 EVP_CIPHER_CTX_ctrl.3 \
+	EVP_EncryptInit.3 EVP_CIPHER_CTX_flags.3 \
+	EVP_EncryptInit.3 EVP_CIPHER_CTX_get_app_data.3 \
+	EVP_EncryptInit.3 EVP_CIPHER_CTX_init.3 \
+	EVP_EncryptInit.3 EVP_CIPHER_CTX_iv_length.3 \
+	EVP_EncryptInit.3 EVP_CIPHER_CTX_key_length.3 \
+	EVP_EncryptInit.3 EVP_CIPHER_CTX_mode.3 \
+	EVP_EncryptInit.3 EVP_CIPHER_CTX_nid.3 \
+	EVP_EncryptInit.3 EVP_CIPHER_CTX_set_app_data.3 \
+	EVP_EncryptInit.3 EVP_CIPHER_CTX_set_key_length.3 \
+	EVP_EncryptInit.3 EVP_CIPHER_CTX_set_padding.3 \
+	EVP_EncryptInit.3 EVP_CIPHER_CTX_type.3 \
+	EVP_EncryptInit.3 EVP_CIPHER_asn1_to_param.3 \
+	EVP_EncryptInit.3 EVP_CIPHER_block_size.3 \
+	EVP_EncryptInit.3 EVP_CIPHER_flags.3 \
+	EVP_EncryptInit.3 EVP_CIPHER_iv_length.3 \
+	EVP_EncryptInit.3 EVP_CIPHER_key_length.3 \
+	EVP_EncryptInit.3 EVP_CIPHER_mode.3 \
+	EVP_EncryptInit.3 EVP_CIPHER_nid.3 \
+	EVP_EncryptInit.3 EVP_CIPHER_param_to_asn1.3 \
+	EVP_EncryptInit.3 EVP_CIPHER_type.3 \
+	EVP_EncryptInit.3 EVP_CipherFinal.3 \
+	EVP_EncryptInit.3 EVP_CipherFinal_ex.3 \
+	EVP_EncryptInit.3 EVP_CipherInit.3 \
+	EVP_EncryptInit.3 EVP_CipherInit_ex.3 \
+	EVP_EncryptInit.3 EVP_CipherUpdate.3 \
+	EVP_EncryptInit.3 EVP_DecryptFinal.3 \
+	EVP_EncryptInit.3 EVP_DecryptFinal_ex.3 \
+	EVP_EncryptInit.3 EVP_DecryptInit.3 \
+	EVP_EncryptInit.3 EVP_DecryptInit_ex.3 \
+	EVP_EncryptInit.3 EVP_DecryptUpdate.3 \
+	EVP_EncryptInit.3 EVP_EncryptFinal.3 \
+	EVP_EncryptInit.3 EVP_EncryptInit_ex.3 \
+	EVP_EncryptInit.3 EVP_EncryptFinal_ex.3 \
+	EVP_EncryptInit.3 EVP_EncryptUpdate.3 \
+	EVP_EncryptInit.3 EVP_get_cipherbyname.3 \
+	EVP_EncryptInit.3 EVP_get_cipherbynid.3 \
+	EVP_EncryptInit.3 EVP_get_cipherbyobj.3 \
+	EVP_OpenInit.3 EVP_OpenFinal.3 \
+	EVP_OpenInit.3 EVP_OpenUpdate.3 \
+	EVP_PKEY_new.3 EVP_PKEY_free.3 \
+	EVP_PKEY_set1_RSA.3 EVP_PKEY_assign_DH.3 \
+	EVP_PKEY_set1_RSA.3 EVP_PKEY_assign_DSA.3 \
+	EVP_PKEY_set1_RSA.3 EVP_PKEY_assign_EC_KEY.3 \
+	EVP_PKEY_set1_RSA.3 EVP_PKEY_assign_RSA.3 \
+	EVP_PKEY_set1_RSA.3 EVP_PKEY_get1_DH.3 \
+	EVP_PKEY_set1_RSA.3 EVP_PKEY_get1_DSA.3 \
+	EVP_PKEY_set1_RSA.3 EVP_PKEY_get1_EC_KEY.3 \
+	EVP_PKEY_set1_RSA.3 EVP_PKEY_get1_RSA.3 \
+	EVP_PKEY_set1_RSA.3 EVP_PKEY_set1_DH.3 \
+	EVP_PKEY_set1_RSA.3 EVP_PKEY_set1_DSA.3 \
+	EVP_PKEY_set1_RSA.3 EVP_PKEY_set1_EC_KEY.3 \
+	EVP_PKEY_set1_RSA.3 EVP_PKEY_type.3 \
+	EVP_SealInit.3 EVP_SealFinal.3 \
+	EVP_SealInit.3 EVP_SealUpdate.3 \
+	EVP_SignInit.3 EVP_SignFinal.3 \
+	EVP_SignInit.3 EVP_SignUpdate.3 \
+	EVP_VerifyInit.3 EVP_VerifyFinal.3 \
+	EVP_VerifyInit.3 EVP_VerifyUpdate.3 \
+	OBJ_nid2obj.3 OBJ_cleanup.3 \
+	OBJ_nid2obj.3 OBJ_cmp.3 \
+	OBJ_nid2obj.3 OBJ_create.3 \
+	OBJ_nid2obj.3 OBJ_dup.3 \
+	OBJ_nid2obj.3 OBJ_ln2nid.3 \
+	OBJ_nid2obj.3 OBJ_nid2ln.3 \
+	OBJ_nid2obj.3 OBJ_nid2sn.3 \
+	OBJ_nid2obj.3 OBJ_obj2nid.3 \
+	OBJ_nid2obj.3 OBJ_obj2txt.3 \
+	OBJ_nid2obj.3 OBJ_sn2nid.3 \
+	OBJ_nid2obj.3 OBJ_txt2nid.3 \
+	OBJ_nid2obj.3 OBJ_txt2obj.3 \
+	OPENSSL_VERSION_NUMBER.3 SSLeay.3 \
+	OPENSSL_VERSION_NUMBER.3 SSLeay_version.3 \
+	OpenSSL_add_all_algorithms.3 OpenSSL_add_all_ciphers.3 \
+	OpenSSL_add_all_algorithms.3 OpenSSL_add_all_digests.3 \
+	RAND_add.3 RAND_event.3 \
+	RAND_add.3 RAND_screen.3 \
+	RAND_add.3 RAND_seed.3 \
+	RAND_add.3 RAND_status.3 \
+	RAND_bytes.3 RAND_pseudo_bytes.3 \
+	RAND_load_file.3 RAND_file_name.3 \
+	RAND_load_file.3 RAND_write_file.3 \
+	RAND_set_rand_method.3 RAND_SSLeay.3 \
+	RAND_set_rand_method.3 RAND_get_rand_method.3 \
+	RSA_blinding_on.3 RSA_blinding_off.3 \
+	RSA_get_ex_new_index.3 RSA_get_ex_data.3 \
+	RSA_get_ex_new_index.3 RSA_set_ex_data.3 \
+	RSA_new.3 RSA_free.3 \
+	RSA_padding_add_PKCS1_type_1.3 RSA_padding_add_PKCS1_OAEP.3 \
+	RSA_padding_add_PKCS1_type_1.3 RSA_padding_add_PKCS1_type_2.3 \
+	RSA_padding_add_PKCS1_type_1.3 RSA_padding_add_SSLv23.3 \
+	RSA_padding_add_PKCS1_type_1.3 RSA_padding_add_none.3 \
+	RSA_padding_add_PKCS1_type_1.3 RSA_padding_check_PKCS1_OAEP.3 \
+	RSA_padding_add_PKCS1_type_1.3 RSA_padding_check_PKCS1_type_1.3 \
+	RSA_padding_add_PKCS1_type_1.3 RSA_padding_check_PKCS1_type_2.3 \
+	RSA_padding_add_PKCS1_type_1.3 RSA_padding_check_SSLv23.3 \
+	RSA_padding_add_PKCS1_type_1.3 RSA_padding_check_none.3 \
+	RSA_print.3 DHparams_print.3 \
+	RSA_print.3 DHparams_print_fp.3 \
+	RSA_print.3 DSA_print.3 \
+	RSA_print.3 DSA_print_fp.3 \
+	RSA_print.3 DSAparams_print.3 \
+	RSA_print.3 DSAparams_print_fp.3 \
+	RSA_print.3 RSA_print_fp.3 \
+	RSA_private_encrypt.3 RSA_public_decrypt.3 \
+	RSA_public_encrypt.3 RSA_private_decrypt.3 \
+	RSA_set_method.3 RSA_PKCS1_SSLeay.3 \
+	RSA_set_method.3 RSA_flags.3 \
+	RSA_set_method.3 RSA_get_default_method.3 \
+	RSA_set_method.3 RSA_get_method.3 \
+	RSA_set_method.3 RSA_new_method.3 \
+	RSA_set_method.3 RSA_null_method.3 \
+	RSA_set_method.3 RSA_set_default_method.3 \
+	RSA_sign.3 RSA_verify.3 \
+	RSA_sign_ASN1_OCTET_STRING.3 RSA_verify_ASN1_OCTET_STRING.3 \
+	SSL_CIPHER_get_name.3 SSL_CIPHER_description.3 \
+	SSL_CIPHER_get_name.3 SSL_CIPHER_get_bits.3 \
+	SSL_CIPHER_get_name.3 SSL_CIPHER_get_version.3 \
+	SSL_CTX_add_session.3 SSL_CTX_remove_session.3 \
+	SSL_CTX_add_session.3 SSL_add_session.3 \
+	SSL_CTX_add_session.3 SSL_remove_session.3 \
+	SSL_CTX_ctrl.3 SSL_CTX_callback_ctrl.3 \
+	SSL_CTX_ctrl.3 SSL_callback_ctrl.3 \
+	SSL_CTX_ctrl.3 SSL_ctrl.3 \
+	SSL_CTX_flush_sessions.3 SSL_flush_sessions.3 \
+	SSL_CTX_get_ex_new_index.3 SSL_CTX_get_ex_data.3 \
+	SSL_CTX_get_ex_new_index.3 SSL_CTX_set_ex_data.3 \
+	SSL_CTX_get_verify_mode.3 SSL_CTX_get_verify_callback.3 \
+	SSL_CTX_get_verify_mode.3 SSL_CTX_get_verify_depth.3 \
+	SSL_CTX_get_verify_mode.3 SSL_get_verify_callback.3 \
+	SSL_CTX_get_verify_mode.3 SSL_get_verify_depth.3 \
+	SSL_CTX_get_verify_mode.3 SSL_get_verify_mode.3 \
+	SSL_CTX_sess_number.3 SSL_CTX_sess_accept.3 \
+	SSL_CTX_sess_number.3 SSL_CTX_sess_accept_good.3 \
+	SSL_CTX_sess_number.3 SSL_CTX_sess_accept_renegotiate.3 \
+	SSL_CTX_sess_number.3 SSL_CTX_sess_cache_full.3 \
+	SSL_CTX_sess_number.3 SSL_CTX_sess_cb_hits.3 \
+	SSL_CTX_sess_number.3 SSL_CTX_sess_connect.3 \
+	SSL_CTX_sess_number.3 SSL_CTX_sess_connect_good.3 \
+	SSL_CTX_sess_number.3 SSL_CTX_sess_connect_renegotiate.3 \
+	SSL_CTX_sess_number.3 SSL_CTX_sess_hits.3 \
+	SSL_CTX_sess_number.3 SSL_CTX_sess_misses.3 \
+	SSL_CTX_sess_number.3 SSL_CTX_sess_timeouts.3 \
+	SSL_CTX_sess_set_cache_size.3 SSL_CTX_sess_get_cache_size.3 \
+	SSL_CTX_sess_set_get_cb.3 SSL_CTX_sess_get_get_cb.3 \
+	SSL_CTX_sess_set_get_cb.3 SSL_CTX_sess_get_new_cb.3 \
+	SSL_CTX_sess_set_get_cb.3 SSL_CTX_sess_get_remove_cb.3 \
+	SSL_CTX_sess_set_get_cb.3 SSL_CTX_sess_set_new_cb.3 \
+	SSL_CTX_sess_set_get_cb.3 SSL_CTX_sess_set_remove_cb.3 \
+	SSL_CTX_set_cert_store.3 SSL_CTX_get_cert_store.3 \
+	SSL_CTX_set_cipher_list.3 SSL_set_cipher_list.3 \
+	SSL_CTX_set_client_CA_list.3 SSL_CTX_add_client_CA.3 \
+	SSL_CTX_set_client_CA_list.3 SSL_add_client_CA.3 \
+	SSL_CTX_set_client_CA_list.3 SSL_set_client_CA_list.3 \
+	SSL_CTX_set_client_cert_cb.3 SSL_CTX_get_client_cert_cb.3 \
+	SSL_CTX_set_default_passwd_cb.3 SSL_CTX_set_default_passwd_cb_userdata.3 \
+	SSL_CTX_set_generate_session_id.3 SSL_has_matching_session_id.3 \
+	SSL_CTX_set_generate_session_id.3 SSL_set_generate_session_id.3 \
+	SSL_CTX_set_info_callback.3 SSL_CTX_get_info_callback.3 \
+	SSL_CTX_set_info_callback.3 SSL_get_info_callback.3 \
+	SSL_CTX_set_info_callback.3 SSL_set_info_callback.3 \
+	SSL_CTX_set_max_cert_list.3 SSL_CTX_get_max_cert_list.3 \
+	SSL_CTX_set_max_cert_list.3 SSL_get_max_cert_list.3 \
+	SSL_CTX_set_max_cert_list.3 SSL_set_max_cert_list.3 \
+	SSL_CTX_set_mode.3 SSL_CTX_get_mode.3 \
+	SSL_CTX_set_mode.3 SSL_get_mode.3 \
+	SSL_CTX_set_mode.3 SSL_set_mode.3 \
+	SSL_CTX_set_msg_callback.3 SSL_CTX_set_msg_callback_arg.3 \
+	SSL_CTX_set_msg_callback.3 SSL_get_msg_callback_arg.3 \
+	SSL_CTX_set_msg_callback.3 SSL_set_msg_callback.3 \
+	SSL_CTX_set_options.3 SSL_CTX_get_options.3 \
+	SSL_CTX_set_options.3 SSL_get_options.3 \
+	SSL_CTX_set_options.3 SSL_set_options.3 \
+	SSL_CTX_set_quiet_shutdown.3 SSL_CTX_get_quiet_shutdown.3 \
+	SSL_CTX_set_quiet_shutdown.3 SSL_get_quiet_shutdown.3 \
+	SSL_CTX_set_quiet_shutdown.3 SSL_set_quiet_shutdown.3 \
+	SSL_CTX_set_session_cache_mode.3 SSL_CTX_get_session_cache_mode.3 \
+	SSL_CTX_set_session_id_context.3 SSL_set_session_id_context.3 \
+	SSL_CTX_set_ssl_version.3 SSL_get_ssl_method.3 \
+	SSL_CTX_set_ssl_version.3 SSL_set_ssl_method.3 \
+	SSL_CTX_set_timeout.3 SSL_CTX_get_timeout.3 \
+	SSL_CTX_set_tmp_dh_callback.3 SSL_CTX_set_tmp_dh.3 \
+	SSL_CTX_set_tmp_dh_callback.3 SSL_set_tmp_dh.3 \
+	SSL_CTX_set_tmp_dh_callback.3 SSL_set_tmp_dh_callback.3 \
+	SSL_CTX_set_tmp_rsa_callback.3 SSL_CTX_need_tmp_rsa.3 \
+	SSL_CTX_set_tmp_rsa_callback.3 SSL_CTX_set_tmp_rsa.3 \
+	SSL_CTX_set_tmp_rsa_callback.3 SSL_need_tmp_rsa.3 \
+	SSL_CTX_set_tmp_rsa_callback.3 SSL_set_tmp_rsa.3 \
+	SSL_CTX_set_tmp_rsa_callback.3 SSL_set_tmp_rsa_callback.3 \
+	SSL_CTX_set_verify.3 SSL_CTX_set_verify_depth.3 \
+	SSL_CTX_set_verify.3 SSL_set_verify.3 \
+	SSL_CTX_set_verify.3 SSL_set_verify_depth.3 \
+	SSL_CTX_use_certificate.3 SSL_CTX_check_private_key.3 \
+	SSL_CTX_use_certificate.3 SSL_CTX_use_PrivateKey.3 \
+	SSL_CTX_use_certificate.3 SSL_CTX_use_PrivateKey_ASN1.3 \
+	SSL_CTX_use_certificate.3 SSL_CTX_use_PrivateKey_file.3 \
+	SSL_CTX_use_certificate.3 SSL_CTX_use_RSAPrivateKey.3 \
+	SSL_CTX_use_certificate.3 SSL_CTX_use_RSAPrivateKey_ASN1.3 \
+	SSL_CTX_use_certificate.3 SSL_CTX_use_RSAPrivateKey_file.3 \
+	SSL_CTX_use_certificate.3 SSL_CTX_use_certificate_ASN1.3 \
+	SSL_CTX_use_certificate.3 SSL_CTX_use_certificate_file.3 \
+	SSL_CTX_use_certificate.3 SSL_CTX_use_certificate_chain_file.3 \
+	SSL_CTX_use_certificate.3 SSL_check_private_key.3 \
+	SSL_CTX_use_certificate.3 SSL_use_PrivateKey.3 \
+	SSL_CTX_use_certificate.3 SSL_use_PrivateKey_ASN1.3 \
+	SSL_CTX_use_certificate.3 SSL_use_PrivateKey_file.3 \
+	SSL_CTX_use_certificate.3 SSL_use_RSAPrivateKey.3 \
+	SSL_CTX_use_certificate.3 SSL_use_RSAPrivateKey_ASN1.3 \
+	SSL_CTX_use_certificate.3 SSL_use_RSAPrivateKey_file.3 \
+	SSL_CTX_use_certificate.3 SSL_use_certificate.3 \
+	SSL_CTX_use_certificate.3 SSL_use_certificate_ASN1.3 \
+	SSL_CTX_use_certificate.3 SSL_use_certificate_file.3 \
+	SSL_SESSION_get_ex_new_index.3 SSL_SESSION_get_ex_data.3 \
+	SSL_SESSION_get_ex_new_index.3 SSL_SESSION_set_ex_data.3 \
+	SSL_SESSION_get_time.3 SSL_SESSION_get_timeout.3 \
+	SSL_SESSION_get_time.3 SSL_SESSION_set_time.3 \
+	SSL_alert_type_string.3 SSL_alert_desc_string.3 \
+	SSL_alert_type_string.3 SSL_alert_desc_string_long.3 \
+	SSL_alert_type_string.3 SSL_alert_type_string_long.3 \
+	SSL_get_ciphers.3 SSL_get_cipher_list.3 \
+	SSL_get_client_CA_list.3 SSL_CTX_get_client_CA_list.3 \
+	SSL_get_current_cipher.3 SSL_get_cipher.3 \
+	SSL_get_current_cipher.3 SSL_get_cipher_bits.3 \
+	SSL_get_current_cipher.3 SSL_get_cipher_name.3 \
+	SSL_get_current_cipher.3 SSL_get_cipher_version.3 \
+	SSL_get_ex_new_index.3 SSL_get_ex_data.3 \
+	SSL_get_ex_new_index.3 SSL_set_ex_data.3 \
+	SSL_library_init.3 OpenSSL_add_ssl_algorithms.3 \
+	SSL_library_init.3 SSLeay_add_ssl_algorithms.3 \
+	SSL_rstate_string.3 SSL_rstate_string_long.3 \
+	SSL_set_connect_state.3 SSL_get_accept_state.3 \
+	SSL_set_shutdown.3 SSL_get_shutdown.3 \
+	SSL_state_string.3 SSL_state_string_long.3 \
+	SSL_want.3 SSL_want_nothing.3 \
+	SSL_want.3 SSL_want_read.3 \
+	SSL_want.3 SSL_want_write.3 \
+	SSL_want.3 SSL_want_x509_lookup.3 \
+	X509_NAME_ENTRY_get_object.3 X509_NAME_ENTRY_create_by_NID.3 \
+	X509_NAME_ENTRY_get_object.3 X509_NAME_ENTRY_create_by_OBJ.3 \
+	X509_NAME_ENTRY_get_object.3 X509_NAME_ENTRY_create_by_txt.3 \
+	X509_NAME_ENTRY_get_object.3 X509_NAME_ENTRY_get_data.3 \
+	X509_NAME_ENTRY_get_object.3 X509_NAME_ENTRY_set_data.3 \
+	X509_NAME_ENTRY_get_object.3 X509_NAME_ENTRY_set_object.3 \
+	X509_NAME_add_entry_by_txt.3 X509_NAME_add_entry.3 \
+	X509_NAME_add_entry_by_txt.3 X509_NAME_add_entry_by_NID.3 \
+	X509_NAME_add_entry_by_txt.3 X509_NAME_add_entry_by_OBJ.3 \
+	X509_NAME_add_entry_by_txt.3 X509_NAME_delete_entry.3 \
+	X509_NAME_get_index_by_NID.3 X509_NAME_entry_count.3 \
+	X509_NAME_get_index_by_NID.3 X509_NAME_get_entry.3 \
+	X509_NAME_get_index_by_NID.3 X509_NAME_get_index_by_OBJ.3 \
+	X509_NAME_get_index_by_NID.3 X509_NAME_get_text_by_NID.3 \
+	X509_NAME_get_index_by_NID.3 X509_NAME_get_text_by_OBJ.3 \
+	X509_NAME_print_ex.3 X509_NAME_oneline.3 \
+	X509_NAME_print_ex.3 X509_NAME_print.3 \
+	X509_NAME_print_ex.3 X509_NAME_print_ex_fp.3 \
+	X509_new.3 X509_free.3 \
+	blowfish.3 BF_cbc_encrypt.3 \
+	blowfish.3 BF_cfb64_encrypt.3 \
+	blowfish.3 BF_decrypt.3 \
+	blowfish.3 BF_ecb_encrypt.3 \
+	blowfish.3 BF_encrypt.3 \
+	blowfish.3 BF_ofb64_encrypt.3 \
+	blowfish.3 BF_options.3 \
+	blowfish.3 BF_set_key.3 \
+	bn_internal.3 bn_add_words.3 \
+	bn_internal.3 bn_check_top.3 \
+	bn_internal.3 bn_cmp_words.3 \
+	bn_internal.3 bn_div_words.3 \
+	bn_internal.3 bn_dump.3 \
+	bn_internal.3 bn_expand.3 \
+	bn_internal.3 bn_expand2.3 \
+	bn_internal.3 bn_fix_top.3 \
+	bn_internal.3 bn_mul_add_words.3 \
+	bn_internal.3 bn_mul_comba4.3 \
+	bn_internal.3 bn_mul_comba8.3 \
+	bn_internal.3 bn_mul_high.3 \
+	bn_internal.3 bn_mul_low_normal.3 \
+	bn_internal.3 bn_mul_low_recursive.3 \
+	bn_internal.3 bn_mul_normal.3 \
+	bn_internal.3 bn_mul_part_recursive.3 \
+	bn_internal.3 bn_mul_recursive.3 \
+	bn_internal.3 bn_mul_words.3 \
+	bn_internal.3 bn_print.3 \
+	bn_internal.3 bn_set_high.3 \
+	bn_internal.3 bn_set_low.3 \
+	bn_internal.3 bn_set_max.3 \
+	bn_internal.3 bn_sqr_comba4.3 \
+	bn_internal.3 bn_sqr_comba8.3 \
+	bn_internal.3 bn_sqr_normal.3 \
+	bn_internal.3 bn_sqr_recursive.3 \
+	bn_internal.3 bn_sqr_words.3 \
+	bn_internal.3 bn_sub_words.3 \
+	bn_internal.3 bn_wexpand.3 \
+	buffer.3 BUF_MEM_free.3 \
+	buffer.3 BUF_MEM_grow.3 \
+	buffer.3 BUF_MEM_new.3 \
+	buffer.3 BUF_strdup.3 \
+	d2i_ASN1_OBJECT.3 i2d_ASN1_OBJECT.3 \
+	d2i_DHparams.3 i2d_DHparams.3 \
+	d2i_DSAPublicKey.3 d2i_DSAPrivateKey.3 \
+	d2i_DSAPublicKey.3 d2i_DSA_PUBKEY.3 \
+	d2i_DSAPublicKey.3 d2i_DSA_SIG.3 \
+	d2i_DSAPublicKey.3 i2d_DSAPrivateKey.3 \
+	d2i_DSAPublicKey.3 i2d_DSAPublicKey.3 \
+	d2i_DSAPublicKey.3 i2d_DSA_PUBKEY.3 \
+	d2i_DSAPublicKey.3 i2d_DSA_SIG.3 \
+	d2i_PKCS8PrivateKey.3 d2i_PKCS8PrivateKey_bio.3 \
+	d2i_PKCS8PrivateKey.3 d2i_PKCS8PrivateKey_fp.3 \
+	d2i_PKCS8PrivateKey.3 i2d_PKCS8PrivateKey_bio.3 \
+	d2i_PKCS8PrivateKey.3 i2d_PKCS8PrivateKey_fp.3 \
+	d2i_PKCS8PrivateKey.3 i2d_PKCS8PrivateKey_nid_bio.3 \
+	d2i_PKCS8PrivateKey.3 i2d_PKCS8PrivateKey_nid_fp.3 \
+	d2i_RSAPublicKey.3 d2i_Netscape_RSA.3 \
+	d2i_RSAPublicKey.3 d2i_RSAPrivateKey.3 \
+	d2i_RSAPublicKey.3 d2i_RSA_PUBKEY.3 \
+	d2i_RSAPublicKey.3 i2d_Netscape_RSA.3 \
+	d2i_RSAPublicKey.3 i2d_RSAPrivateKey.3 \
+	d2i_RSAPublicKey.3 i2d_RSAPublicKey.3 \
+	d2i_RSAPublicKey.3 i2d_RSA_PUBKEY.3 \
+	d2i_SSL_SESSION.3 i2d_SSL_SESSION.3 \
+	d2i_X509.3 i2d_X509.3 \
+	d2i_X509.3 d2i_X509_REQ_bio.3 \
+	d2i_X509.3 d2i_X509_REQ_fp.3 \
+	d2i_X509.3 i2d_X509_bio.3 \
+	d2i_X509.3 i2d_X509_fp.3 \
+	d2i_X509_ALGOR.3 i2d_X509_ALGOR.3 \
+	d2i_X509_CRL.3 d2i_509_CRL_fp.3 \
+	d2i_X509_CRL.3 d2i_X509_bio.3 \
+	d2i_X509_CRL.3 i2d_X509_CRL.3 \
+	d2i_X509_CRL.3 i2d_X509_CRL_bio.3 \
+	d2i_X509_CRL.3 i2d_X509_CRL_fp.3 \
+	d2i_X509_NAME.3 i2d_X509_NAME.3 \
+	d2i_X509_REQ.3 i2d_X509_REQ.3 \
+	d2i_X509_REQ.3 i2d_X509_REQ_bio.3 \
+	d2i_X509_REQ.3 i2d_X509_REQ_fp.3 \
+	d2i_X509_SIG.3 i2d_X509_SIG.3 \
+	d2i_X509_REQ.3 d2i_X509_fp.3 \
+	d2i_X509_REQ.3 d2i_X509_CRL_bio.3 \
+	des.3 DES_cbc_cksum.3 \
+	des.3 DES_cfb64_encrypt.3 \
+	des.3 DES_cfb_encrypt.3 \
+	des.3 DES_crypt.3 \
+	des.3 DES_ecb2_encrypt.3 \
+	des.3 DES_ecb3_encrypt.3 \
+	des.3 DES_ecb_encrypt.3 \
+	des.3 DES_ede2_cbc_encrypt.3 \
+	des.3 DES_ede2_cfb64_encrypt.3 \
+	des.3 DES_ede2_ofb64_encrypt.3 \
+	des.3 DES_ede3_cbc_encrypt.3 \
+	des.3 DES_ede3_cbcm_encrypt.3 \
+	des.3 DES_ede3_cfb64_encrypt.3 \
+	des.3 DES_ede3_ofb64_encrypt.3 \
+	des.3 DES_enc_read.3 \
+	des.3 DES_enc_write.3 \
+	des.3 DES_fcrypt.3 \
+	des.3 DES_is_weak_key.3 \
+	des.3 DES_key_sched.3 \
+	des.3 DES_ncbc_encrypt.3 \
+	des.3 DES_ofb64_encrypt.3 \
+	des.3 DES_ofb_encrypt.3 \
+	des.3 DES_pcbc_encrypt.3 \
+	des.3 DES_quad_cksum.3 \
+	des.3 DES_random_key.3 \
+	des.3 DES_set_key.3 \
+	des.3 DES_set_key_checked.3 \
+	des.3 DES_set_key_unchecked.3 \
+	des.3 DES_set_odd_parity.3 \
+	des.3 DES_string_to_2keys.3 \
+	des.3 DES_string_to_key.3 \
+	des.3 DES_xcbc_encrypt.3 \
+	hmac.3 HMAC.3 \
+	hmac.3 HMAC_Final.3 \
+	hmac.3 HMAC_Init.3 \
+	hmac.3 HMAC_Update.3 \
+	hmac.3 HMAC_cleanup.3 \
+	lh_stats.3 lh_node_stats.3 \
+	lh_stats.3 lh_node_stats_bio.3 \
+	lh_stats.3 lh_node_usage_stats.3 \
+	lh_stats.3 lh_node_usage_stats_bio.3 \
+	lh_stats.3 lh_stats_bio.3 \
+	lhash.3 lh_delete.3 \
+	lhash.3 lh_doall.3 \
+	lhash.3 lh_doall_arg.3 \
+	lhash.3 lh_error.3 \
+	lhash.3 lh_free.3 \
+	lhash.3 lh_insert.3 \
+	lhash.3 lh_new.3 \
+	lhash.3 lh_retrieve.3 \
+	md5.3 MD2.3 \
+	md5.3 MD2_Final.3 \
+	md5.3 MD2_Init.3 \
+	md5.3 MD2_Update.3 \
+	md5.3 MD4.3 \
+	md5.3 MD4_Final.3 \
+	md5.3 MD4_Init.3 \
+	md5.3 MD4_Update.3 \
+	md5.3 MD5.3 \
+	md5.3 MD5_Final.3 \
+	md5.3 MD5_Init.3 \
+	md5.3 MD5_Update.3 \
+	mdc2.3 MDC2.3 \
+	mdc2.3 MDC2_Final.3 \
+	mdc2.3 MDC2_Init.3 \
+	mdc2.3 MDC2_Update.3 \
+	pem.3 PEM.3 \
+	rc4.3 RC4.3 \
+	rc4.3 RC4_set_key.3 \
+	ripemd.3 RIPEMD160.3 \
+	ripemd.3 RIPEMD160_Final.3 \
+	ripemd.3 RIPEMD160_Init.3 \
+	ripemd.3 RIPEMD160_Update.3 \
+	sha.3 SHA1.3 \
+	sha.3 SHA1_Final.3 \
+	sha.3 SHA1_Init.3 \
+	sha.3 SHA1_Update.3 \
+	ssl.3 SSL.3 \
+	threads.3 CRYPTO_destroy_dynlockid.3 \
+	threads.3 CRYPTO_get_new_dynlockid.3 \
+	threads.3 CRYPTO_lock.3 \
+	threads.3 CRYPTO_num_locks.3 \
+	threads.3 CRYPTO_set_dynlock_create_callback.3 \
+	threads.3 CRYPTO_set_dynlock_destroy_callback.3 \
+	threads.3 CRYPTO_set_dynlock_lock_callback.3 \
+	threads.3 CRYPTO_set_id_callback.3 \
+	threads.3 CRYPTO_set_locking_callback.3 \
+	ui.3 ERR_load_UI_strings.3 \
+	ui.3 UI_OpenSSL.3 \
+	ui.3 UI_add_error_string.3 \
+	ui.3 UI_add_info_string.3 \
+	ui.3 UI_add_input_boolean.3 \
+	ui.3 UI_add_input_string.3 \
+	ui.3 UI_add_user_data.3 \
+	ui.3 UI_add_verify_string.3 \
+	ui.3 UI_construct_prompt.3 \
+	ui.3 UI_ctrl.3 \
+	ui.3 UI_dup_error_string.3 \
+	ui.3 UI_dup_info_string.3 \
+	ui.3 UI_dup_input_boolean.3 \
+	ui.3 UI_dup_input_string.3 \
+	ui.3 UI_dup_verify_string.3 \
+	ui.3 UI_free.3 \
+	ui.3 UI_get0_result.3 \
+	ui.3 UI_get0_user_data.3 \
+	ui.3 UI_get_default_method.3 \
+	ui.3 UI_get_method.3 \
+	ui.3 UI_new.3 \
+	ui.3 UI_new_method.3 \
+	ui.3 UI_process.3 \
+	ui.3 UI_set_default_method.3 \
+	ui.3 UI_set_method.3 \
+	ui_compat.3 des_read_2passwords.3 \
+	ui_compat.3 des_read_password.3 \
+	ui_compat.3 des_read_pw.3 \
+	ui_compat.3 des_read_pw_string.3 \
+	des_modes.7 DES.7 \
+	des_modes.7 Modes.7 \
+	des_modes.7 of.7
 
 .if defined(BATCH) || defined(OPENSSL_WITH_386)
 .if ${MACHINE_ARCH} == "i386"
@@ -138,13 +854,6 @@ EXTRACONFIGURE=	386
 .endif
 
 do-configure:
-.if exists(/usr/src/crypto/openssl/crypto/des/rnd_keys.c)
-	${CP} /usr/src/crypto/openssl/crypto/des/rnd_keys.c \
-		${WRKSRC}/crypto/des/rnd_keys.c
-.else
-	${CP} ${FILESDIR}/rnd_keys.c \
-		${WRKSRC}/crypto/des/rnd_keys.c
-.endif
 	cd ${WRKSRC} \
 	&& ${SETENV} CC="${CC}" CFLAGS="${CFLAGS}" PERL="${PERL}" \
 	./config --prefix=${PREFIX} --openssldir=${OPENSSLDIR} \
diff --git a/security/openssl/Makefile.ssl b/security/openssl/Makefile.ssl
index fe32cb47df0f..643704f89b83 100644
--- a/security/openssl/Makefile.ssl
+++ b/security/openssl/Makefile.ssl
@@ -42,8 +42,8 @@ MAKE_ARGS+=		OPENSSL_CFLAGS="${OPENSSL_CFLAGS}"
 
 OPENSSLBASE=		${LOCALBASE}
 .if defined(USE_OPENSSL_BETA)
-OPENSSLDIR=		${OPENSSLBASE}/openssl-beta
-LIB_DEPENDS+=		crypto.3:${PORTSDIR}/security/openssl
+OPENSSLDIR=		${OPENSSLBASE}/openssl
+LIB_DEPENDS+=		crypto.3:${PORTSDIR}/security/openssl-beta
 .else
 OPENSSLDIR=		${OPENSSLBASE}/openssl
 LIB_DEPENDS+=		crypto.3:${PORTSDIR}/security/openssl
diff --git a/security/openssl/distinfo b/security/openssl/distinfo
index 6bc00f09b54d..bef51b441d0e 100644
--- a/security/openssl/distinfo
+++ b/security/openssl/distinfo
@@ -1,2 +1 @@
-MD5 (openssl-0.9.6h.tar.gz) = 621bef36ad61012bb71945a1cb449073
-MD5 (openssl-0.9.6h.tar.gz) = 1a0c2bee9f6b0af95ce65106462411f5
+MD5 (openssl-0.9.7.tar.gz) = ef376d14205afcfb831cd3720f705d79
diff --git a/security/openssl/files/patch-ab b/security/openssl/files/patch-ab
index c5bd5f73382a..2aeb3617967e 100644
--- a/security/openssl/files/patch-ab
+++ b/security/openssl/files/patch-ab
@@ -9,15 +9,6 @@
  MAN1=1
  MAN3=3
  SHELL=/bin/sh
-@@ -178,7 +178,7 @@
- ONEDIRS=out tmp
- EDIRS=  times doc bugs util include certs ms shlib mt demos perl sf dep VMS
- WDIRS=  windows
--LIBS=   libcrypto.a libssl.a
-+LIBS=   libcrypto.a libssl.a libRSAglue.a
- SHARED_CRYPTO=libcrypto$(SHLIB_EXT)
- SHARED_SSL=libssl$(SHLIB_EXT)
- SHARED_LIBS=
 @@ -250,6 +250,21 @@
  	done
  
diff --git a/security/openssl/files/patch-ac b/security/openssl/files/patch-ac
index 7695196e55e4..e0c621fba728 100644
--- a/security/openssl/files/patch-ac
+++ b/security/openssl/files/patch-ac
@@ -1,23 +1,24 @@
---- Configure.orig	Fri Nov 15 02:28:38 2002
-+++ Configure	Wed Dec 11 22:05:06 2002
-@@ -311,7 +311,8 @@
+--- Configure.orig	Fri Dec 27 17:35:11 2002
++++ Configure	Sat Jan 11 01:44:38 2003
+@@ -350,7 +350,9 @@
  #
  # This probably belongs in a different section.
  #
--"FreeBSD-alpha","gcc:-DTERMIOS -O -fomit-frame-pointer::(unknown)::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC2::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"FreeBSD-alpha","$ENV{CC}:-DTERMIOS $ENV{CFLAGS}::(unknown)::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC2:::",
-+"FreeBSD-sparc64","$ENV{CC}:-DB_ENDIAN -DTERMIOS -DULTRASPARC -DBN_DIV2W $ENV{CFLAGS}::(unknown)::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::asm/md5-sparcv9.o:",
+-"FreeBSD-alpha","gcc:-DTERMIOS -O -fomit-frame-pointer::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC2::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"FreeBSD-alpha","$ENV{CC}:-DTERMIOS $ENV{CFLAGS}::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC2::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"FreeBSD-sparc64","$ENV{CC}:-DTERMIOS -DB_ENDIAN -DULTRASPARC -DBN_DIV2W $ENV{CFLAGS}::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"FreeBSD-ia64","$ENV{CC}:-DL_ENDIAN -DTERMIOS $ENV{CFLAGS}::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:asm/ia64-cpp.o:::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  
  #### Alpha Linux with GNU C and Compaq C setups
  # Special notes:
-@@ -350,8 +351,8 @@
- "NetBSD-sparc",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -mv8 -Wall -DB_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- "NetBSD-m68",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- "NetBSD-x86",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
--"FreeBSD-elf",  "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::-pthread -D_REENTRANT -D_THREAD_SAFE -D_THREADSAFE::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
--"FreeBSD",      "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}",
-+"FreeBSD-elf",  "$ENV{CC}:-DTERMIOS -DL_ENDIAN $ENV{CFLAGS}::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}",
-+"FreeBSD",      "$ENV{CC}:-DTERMIOS -DL_ENDIAN $ENV{CFLAGS}::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}",
- "bsdi-gcc",     "gcc:-O3 -ffast-math -DL_ENDIAN -DPERL5 -m486::(unknown)::RSA_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_bsdi_asm}",
- "bsdi-elf-gcc",     "gcc:-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown):-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- "nextstep",	"cc:-O -Wall:<libc.h>:(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::",
+@@ -395,8 +397,8 @@
+ "NetBSD-sparc",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -mv8 -Wall -DB_ENDIAN::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "NetBSD-m68",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "NetBSD-x86",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+-"FreeBSD-elf",  "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::-pthread -D_REENTRANT -D_THREAD_SAFE -D_THREADSAFE:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+-"FreeBSD",      "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}",
++"FreeBSD-elf",  "$ENV{CC}:-DTERMIOS -DL_ENDIAN $ENV{CFLAGS} -Wall::-pthread -D_REENTRANT -D_THREAD_SAFE -D_THREADSAFE:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"FreeBSD",      "$ENV{CC}:-DTERMIOS -DL_ENDIAN $ENV{CFLAGS} -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}",
+ "bsdi-gcc",     "gcc:-O3 -ffast-math -DL_ENDIAN -DPERL5 -m486::(unknown):::RSA_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_bsdi_asm}",
+ "bsdi-elf-gcc",     "gcc:-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown)::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "nextstep",	"cc:-O -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::",
diff --git a/security/openssl/files/patch-ag b/security/openssl/files/patch-ag
index e0faf51d9bfa..b768d1ec5012 100644
--- a/security/openssl/files/patch-ag
+++ b/security/openssl/files/patch-ag
@@ -1,11 +1,11 @@
---- apps/dgst.c.orig	Thu Apr  5 13:08:50 2001
-+++ apps/dgst.c	Fri Apr 13 00:58:32 2001
-@@ -318,7 +318,7 @@
- 				err++;
- 				continue;
+--- apps/dgst.c.orig	Tue Jun 11 13:41:17 2002
++++ apps/dgst.c	Sat Aug 10 14:40:26 2002
+@@ -340,7 +340,7 @@
+ 			if(!out_bin)
+ 				{
+ 				tmp=tofree=OPENSSL_malloc(strlen(name)+strlen(argv[i])+5);
+-				sprintf(tmp,"%s(%s)= ",name,argv[i]);
++				sprintf(tmp,"%s(%s) = ",name,argv[i]);
  				}
--			if(!out_bin) BIO_printf(out, "%s(%s)= ",name,argv[i]);
-+			if(!out_bin) BIO_printf(out, "%s(%s) = ",name,argv[i]);
- 			do_fp(out, buf,inp,separator, out_bin, sigkey, 
- 								sigbuf, siglen);
- 			(void)BIO_reset(bmd);
+ 			else
+ 				tmp="";
diff --git a/security/openssl/files/patch-ak b/security/openssl/files/patch-ak
index 819def697e15..cdc35edc1a3a 100644
--- a/security/openssl/files/patch-ak
+++ b/security/openssl/files/patch-ak
@@ -1,13 +1,11 @@
---- apps/Makefile.ssl.orig	Sun May 23 14:36:09 1999
-+++ apps/Makefile.ssl	Fri May 28 22:29:19 1999
-@@ -101,8 +101,8 @@
- 	 cp $$i $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i; \
- 	 chmod 755 $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i ); \
+--- apps/Makefile.ssl.orig	Tue Dec 24 11:50:16 2002
++++ apps/Makefile.ssl	Thu Jan  2 17:58:03 2003
+@@ -111,7 +111,7 @@
  	 done
--	@cp openssl.cnf $(INSTALL_PREFIX)$(OPENSSLDIR); \
--	chmod 644 $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf
-+	@cp openssl.cnf $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.sample; \
-+	chmod 644 $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.sample
+ 	@cp openssl.cnf $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new; \
+ 	chmod 644 $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new; \
+-	mv -f  $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf
++	mv -f  $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.sample
  
  tags:
  	ctags $(SRC)
diff --git a/security/openssl/files/patch-config b/security/openssl/files/patch-config
index 8b31a44cfa03..13e7a230da9f 100644
--- a/security/openssl/files/patch-config
+++ b/security/openssl/files/patch-config
@@ -1,18 +1,20 @@
---- config.orig	Thu Nov 14 08:30:29 2002
-+++ config	Wed Dec 11 23:10:05 2002
-@@ -180,6 +180,7 @@
+--- config.orig	Fri Dec  6 08:45:11 2002
++++ config	Sat Jan 11 01:37:40 2003
+@@ -206,6 +206,8 @@
             Pentium\ II*) MACH="i686"     ;;
             Pentium*    ) MACH="i586"     ;;
             Alpha*      ) MACH="alpha"    ;;
 +           UltraSparc* ) MACH="sparc64"  ;;
++           Itanium*    ) MACH="ia64"     ;;
             *           ) MACH="$MACHINE" ;;
          esac
          case ${MACH} in
-@@ -585,6 +586,7 @@
+@@ -640,6 +642,8 @@
    *86*-*-solaris2) OUT="solaris-x86-$CC" ;;
    *-*-sunos4) OUT="sunos-$CC" ;;
    alpha*-*-freebsd*) OUT="FreeBSD-alpha" ;;
 +  sparc64*-*-freebsd*) OUT="FreeBSD-sparc64" ;;
++  ia64*-*-freebsd*) OUT="FreeBSD-ia64" ;;
    *-freebsd[3-9]*) OUT="FreeBSD-elf" ;;
    *-freebsd[1-2]*) OUT="FreeBSD" ;;
    *86*-*-netbsd) OUT="NetBSD-x86" ;;
diff --git a/security/openssl/files/patch-rnd_keys b/security/openssl/files/patch-rnd_keys
deleted file mode 100644
index 20d38b47ce7b..000000000000
--- a/security/openssl/files/patch-rnd_keys
+++ /dev/null
@@ -1,33 +0,0 @@
---- crypto/des/Makefile.ssl.bak	Thu Oct 17 10:21:30 2002
-+++ crypto/des/Makefile.ssl	Thu Oct 17 10:31:20 2002
-@@ -32,14 +32,14 @@
- 	fcrypt.c ofb64enc.c ofb_enc.c  pcbc_enc.c \
- 	qud_cksm.c rand_key.c read_pwd.c rpc_enc.c  set_key.c  \
- 	des_enc.c fcrypt_b.c read2pwd.c \
--	xcbc_enc.c \
-+	xcbc_enc.c rnd_keys.c \
- 	str2key.c  cfb64ede.c ofb64ede.c ede_cbcm_enc.c
- 
- LIBOBJ= set_key.o  ecb_enc.o  cbc_enc.o \
- 	ecb3_enc.o cfb64enc.o cfb64ede.o cfb_enc.o  ofb64ede.o \
- 	enc_read.o enc_writ.o ofb64enc.o \
- 	ofb_enc.o  str2key.o  pcbc_enc.o qud_cksm.o rand_key.o \
--	${DES_ENC} read2pwd.o \
-+	${DES_ENC} read2pwd.o rnd_keys.o \
- 	fcrypt.o xcbc_enc.o read_pwd.o rpc_enc.o  cbc_cksm.o \
- 	ede_cbcm_enc.o
- 
---- crypto/des/des.h.bak	Thu Oct 17 10:25:47 2002
-+++ crypto/des/des.h	Thu Oct 17 10:30:00 2002
-@@ -200,6 +200,11 @@
- DES_LONG des_quad_cksum(const unsigned char *input,des_cblock output[],
- 			long length,int out_count,des_cblock *seed);
- void des_random_seed(des_cblock *key);
-+
-+int des_new_random_key(des_cblock *key);
-+void des_init_random_number_generator(des_cblock *seed);
-+void des_rand_data(unsigned char *data, int size);
-+
- int des_random_key(des_cblock *ret);
- int des_read_password(des_cblock *key,const char *prompt,int verify);
- int des_read_2passwords(des_cblock *key1,des_cblock *key2,
diff --git a/security/openssl/files/rnd_keys.c b/security/openssl/files/rnd_keys.c
deleted file mode 100644
index 454ceb43ae7d..000000000000
--- a/security/openssl/files/rnd_keys.c
+++ /dev/null
@@ -1,444 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997, 1999 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	$Id$
- * $FreeBSD: /tmp/pcvs/ports/security/openssl/files/Attic/rnd_keys.c,v 1.1 2002-10-25 20:41:47 dinoex Exp $
- */
-
-#include <openssl/des.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <string.h>
-#include <time.h>
-#include <unistd.h>
-
-#ifndef RETSIGTYPE
-#define RETSIGTYPE void
-#define SIGRETURN(x) return
-#else
-#define SIGRETURN(x) return (RETSIGTYPE)(x)
-#endif
-
-/*
- * Generate "random" data by checksumming a file.
- *
- * Returns -1 if there were any problems with permissions or I/O
- * errors.
- */
-static
-int
-sumFile (const char *name, int len, void *res)
-{
-  u_int32_t sum[2];
-  u_int32_t buf[1024*2];
-  int fd, i;
-
-  fd = open (name, 0);
-  if (fd < 0)
-    return -1;
-
-  while (len > 0)
-    {
-      int n = read(fd, buf, sizeof(buf));
-      if (n < 0)
-	{
-	  close(fd);
-	  return n;
-	}
-      for (i = 0; i < (n/sizeof(buf[0])); i++)
-	{
-	  sum[0] += buf[i];
-	  i++;
-	  sum[1] += buf[i];
-	}
-      len -= n;
-    }
-  close (fd);
-  memcpy (res, &sum, sizeof(sum));
-  return 0;
-}
-
-/*
- * Create a sequence of random 64 bit blocks.
- * The sequence is indexed with a long long and 
- * based on an initial des key used as a seed.
- */
-static des_key_schedule sequence_seed;
-static u_int32_t sequence_index[2];
-
-/* 
- * Random number generator based on ideas from truerand in cryptolib
- * as described on page 424 in Applied Cryptography 2 ed. by Bruce
- * Schneier.
- */
-
-static volatile int counter;
-static volatile unsigned char *gdata; /* Global data */
-static volatile int igdata;	/* Index into global data */
-static int gsize;
-
-#if !defined(WIN32) && !defined(__EMX__) && !defined(__OS2__) && !defined(__CYGWIN32__)
-/* Visual C++ 4.0 (Windows95/NT) */
-
-static
-RETSIGTYPE
-sigALRM(int sig)
-{
-    if (igdata < gsize)
-	gdata[igdata++] ^= counter & 0xff;
-
-#ifndef HAVE_SIGACTION
-    signal(SIGALRM, sigALRM); /* Reinstall SysV signal handler */
-#endif
-    SIGRETURN(0);
-}
-
-#endif
-
-#if !defined(HAVE_RANDOM) && defined(HAVE_RAND)
-#ifndef srandom
-#define srandom srand
-#endif
-#ifndef random
-#define random rand
-#endif
-#endif
-
-static void
-des_not_rand_data(unsigned char *data, int size)
-{
-  int i;
-
-  srandom (time (NULL));
-
-  for(i = 0; i < size; ++i)
-    data[i] ^= random() % 0x100;
-}
-
-#if !defined(WIN32) && !defined(__EMX__) && !defined(__OS2__) && !defined(__CYGWIN32__)
-
-#ifndef HAVE_SETITIMER
-static void
-pacemaker(struct timeval *tv)
-{
-    fd_set fds;
-    pid_t pid;
-    pid = getppid();
-    while(1){
-	FD_ZERO(&fds);
-	FD_SET(0, &fds);
-	select(1, &fds, NULL, NULL, tv);
-	kill(pid, SIGALRM);
-    }
-}
-#endif
-
-#ifdef HAVE_SIGACTION
-/* XXX ugly hack, should perhaps use function from roken */
-static RETSIGTYPE 
-(*fake_signal(int sig, RETSIGTYPE (*f)(int)))(int)
-{
-    struct sigaction sa, osa;
-    sa.sa_handler = f;
-    sa.sa_flags = 0;
-    sigemptyset(&sa.sa_mask);
-    sigaction(sig, &sa, &osa);
-    return osa.sa_handler;
-}
-#define signal(S, F) fake_signal((S), (F))
-#endif
-
-/*
- * Generate size bytes of "random" data using timed interrupts.
- * It takes about 40ms/byte random data.
- * It's not neccessary to be root to run it.
- */
-void
-des_rand_data(unsigned char *data, int size)
-{
-    struct itimerval tv;
-#ifdef HAVE_SETITIMER
-    struct itimerval otv;
-#endif
-    RETSIGTYPE (*osa)(int);
-    int i, j;
-#ifndef HAVE_SETITIMER 
-    RETSIGTYPE (*ochld)(int);
-    pid_t pid;
-#endif
-    char *rnd_devices[] = {"/dev/random",
-			   "/dev/srandom",
-			   "/dev/urandom",
-			   NULL};
-    char **p;
-
-    for(p = rnd_devices; *p; p++) {
-      int fd = open(*p, O_RDONLY | O_NDELAY);
-      
-      if(fd >= 0 && read(fd, data, size) == size) {
-	close(fd);
-	return;
-      }
-      close(fd);
-    }
-
-    /* Paranoia? Initialize data from /dev/mem if we can read it. */
-    if (size >= 8)
-      sumFile("/dev/mem", (1024*1024*2), data);
-
-    gdata = data;
-    gsize = size;
-    igdata = 0;
-
-    osa = signal(SIGALRM, sigALRM);
-  
-    /* Start timer */
-    tv.it_value.tv_sec = 0;
-    tv.it_value.tv_usec = 10 * 1000; /* 10 ms */
-    tv.it_interval = tv.it_value;
-#ifdef HAVE_SETITIMER
-    setitimer(ITIMER_REAL, &tv, &otv);
-#else
-    ochld = signal(SIGCHLD, SIG_IGN);
-    pid = fork();
-    if(pid == -1){
-	signal(SIGCHLD, ochld != SIG_ERR ? ochld : SIG_DFL);
-	des_not_rand_data(data, size);
-	return;
-    }
-    if(pid == 0)
-	pacemaker(&tv.it_interval);
-#endif
-
-    for(i = 0; i < 4; i++) {
-	for (igdata = 0; igdata < size;) /* igdata++ in sigALRM */
-	    counter++;
-	for (j = 0; j < size; j++) /* Only use 2 bits each lap */
-	    gdata[j] = (gdata[j]>>2) | (gdata[j]<<6);
-    }
-#ifdef HAVE_SETITIMER
-    setitimer(ITIMER_REAL, &otv, 0);
-#else
-    kill(pid, SIGKILL);
-    while(waitpid(pid, NULL, 0) != pid);
-    signal(SIGCHLD, ochld != SIG_ERR ? ochld : SIG_DFL);
-#endif
-    signal(SIGALRM, osa != SIG_ERR ? osa : SIG_DFL);
-}
-#else
-void
-des_rand_data(unsigned char *p, int s)
-{
-  des_not_rand_data (p, s);
-}
-#endif
-
-void
-des_generate_random_block(des_cblock *block)
-{
-  des_rand_data((unsigned char *)block, sizeof(*block));
-}
-
-/*
- * Generate a "random" DES key.
- */
-void
-des_rand_data_key(des_cblock *key)
-{
-    unsigned char data[8];
-    des_key_schedule sched;
-    do {
-	des_rand_data(data, sizeof(data));
-	des_rand_data((unsigned char*)key, sizeof(des_cblock));
-	des_set_odd_parity(key);
-	des_key_sched(key, sched);
-	des_ecb_encrypt(&data, key, sched, DES_ENCRYPT);
-	memset(&data, 0, sizeof(data));
-	memset(&sched, 0, sizeof(sched));
-	des_set_odd_parity(key);
-    } while(des_is_weak_key(key));
-}
-
-/*
- * Generate "random" data by checksumming /dev/mem
- *
- * It's neccessary to be root to run it. Returns -1 if there were any
- * problems with permissions.
- */
-int
-des_mem_rand8(unsigned char *data)
-{
-  return 1;
-}
-
-/*
- * In case the generator does not get initialized use this as fallback.
- */
-static int initialized;
-
-static void
-do_initialize(void)
-{
-    des_cblock default_seed;
-    do {
-	des_generate_random_block(&default_seed);
-	des_set_odd_parity(&default_seed);
-    } while (des_is_weak_key(&default_seed));
-    des_init_random_number_generator(&default_seed);
-}
-
-#define zero_long_long(ll) do { ll[0] = ll[1] = 0; } while (0)
-
-#define incr_long_long(ll) do { if (++ll[0] == 0) ++ll[1]; } while (0)
-
-#define set_sequence_number(ll) \
-memcpy((char *)sequence_index, (ll), sizeof(sequence_index));
-
-/*
- * Set the sequnce number to this value (a long long).
- */
-void
-des_set_sequence_number(unsigned char *ll)
-{
-    set_sequence_number(ll);
-}
-
-/*
- * Set the generator seed and reset the sequence number to 0.
- */
-void
-des_set_random_generator_seed(des_cblock *seed)
-{
-    des_key_sched(seed, sequence_seed);
-    zero_long_long(sequence_index);
-    initialized = 1;
-}
-
-/*
- * Generate a sequence of random des keys
- * using the random block sequence, fixup
- * parity and skip weak keys.
- */
-int
-des_new_random_key(des_cblock *key)
-{
-    if (!initialized)
-	do_initialize();
-
-    do {
-	des_ecb_encrypt((des_cblock *) sequence_index,
-			key,
-			sequence_seed,
-			DES_ENCRYPT);
-	incr_long_long(sequence_index);
-	/* random key must have odd parity and not be weak */
-	des_set_odd_parity(key);
-    } while (des_is_weak_key(key));
-    return(0);
-}
-
-/*
- * des_init_random_number_generator:
- *
- * Initialize the sequence of random 64 bit blocks.  The input seed
- * can be a secret key since it should be well hidden and is also not
- * kept.
- *
- */
-void 
-des_init_random_number_generator(des_cblock *seed)
-{
-    struct timeval now;
-    des_cblock uniq;
-    des_cblock new_key;
-
-    gettimeofday(&now, (struct timezone *)0);
-    des_generate_random_block(&uniq);
-
-    /* Pick a unique random key from the shared sequence. */
-    des_set_random_generator_seed(seed);
-    set_sequence_number((unsigned char *)&uniq);
-    des_new_random_key(&new_key);
-
-    /* Select a new nonshared sequence, */
-    des_set_random_generator_seed(&new_key);
-
-    /* and use the current time to pick a key for the new sequence. */
-    set_sequence_number((unsigned char *)&now);
-    des_new_random_key(&new_key);
-    des_set_random_generator_seed(&new_key);
-}
-
-#ifdef TESTRUN
-int
-main()
-{
-    unsigned char data[8];
-    int i;
-
-    while (1)
-        {
-	    if (sumFile("/dev/mem", (1024*1024*8), data) != 0)
-	      { perror("sumFile"); exit(1); }
-            for (i = 0; i < 8; i++)
-                printf("%02x", data[i]);
-            printf("\n");
-        }
-}
-#endif
-
-#ifdef TESTRUN2
-int
-main()
-{
-    des_cblock data;
-    int i;
-
-    while (1)
-        {
-	    do_initialize();
-            des_random_key(data);
-            for (i = 0; i < 8; i++)
-                printf("%02x", data[i]);
-            printf("\n");
-        }
-}
-#endif
diff --git a/security/openssl/pkg-plist b/security/openssl/pkg-plist
index 286b1e53c129..c8feedcfdec8 100644
--- a/security/openssl/pkg-plist
+++ b/security/openssl/pkg-plist
@@ -1,7 +1,9 @@
 bin/c_rehash
 bin/openssl
+include/openssl/aes.h
 include/openssl/asn1.h
 include/openssl/asn1_mac.h
+include/openssl/asn1t.h
 include/openssl/bio.h
 include/openssl/blowfish.h
 include/openssl/bn.h
@@ -12,25 +14,31 @@ include/openssl/conf.h
 include/openssl/conf_api.h
 include/openssl/crypto.h
 include/openssl/des.h
+include/openssl/des_old.h
 include/openssl/dh.h
 include/openssl/dsa.h
 include/openssl/dso.h
-include/openssl/e_os.h
 include/openssl/e_os2.h
 include/openssl/ebcdic.h
+include/openssl/ec.h
+include/openssl/engine.h
 include/openssl/err.h
 include/openssl/evp.h
 include/openssl/hmac.h
 include/openssl/idea.h
+include/openssl/krb5_asn.h
+include/openssl/kssl.h
 include/openssl/lhash.h
 include/openssl/md2.h
 include/openssl/md4.h
 include/openssl/md5.h
 include/openssl/mdc2.h
+include/openssl/ocsp.h
 include/openssl/obj_mac.h
 include/openssl/objects.h
 include/openssl/opensslconf.h
 include/openssl/opensslv.h
+include/openssl/ossl_typ.h
 include/openssl/pem.h
 include/openssl/pem2.h
 include/openssl/pkcs12.h
@@ -52,16 +60,18 @@ include/openssl/symhacks.h
 include/openssl/tls1.h
 include/openssl/tmdiff.h
 include/openssl/txt_db.h
+include/openssl/ui.h
+include/openssl/ui_compat.h
 include/openssl/x509.h
 include/openssl/x509_vfy.h
 include/openssl/x509v3.h
-lib/libRSAglue.a
 lib/libcrypto.a
 %%SHARED%%lib/libcrypto.so
 %%SHARED%%lib/libcrypto.so.%%SHLIBVER%%
 lib/libssl.a
 %%SHARED%%lib/libssl.so
 %%SHARED%%lib/libssl.so.%%SHLIBVER%%
+lib/pkgconfig/openssl.pc
 %%NOBASE%%openssl/misc/CA.pl
 %%NOBASE%%openssl/misc/CA.sh
 %%NOBASE%%openssl/misc/c_hash
@@ -72,6 +82,7 @@ lib/libssl.a
 %%NOBASE%%openssl/openssl.cnf.sample
 %%PORTDOCS%%share/doc/openssl/openssl.txt
 @dirrm include/openssl
+@dirrm lib/pkgconfig
 %%NOBASE%%@dirrm openssl/certs
 %%NOBASE%%@dirrm openssl/lib
 %%MANDIR%%@dirrm openssl/man/man1