missed a few more

1 files changed, 161 insertions, 59 deletions

diff --git a/lib/libssl/Makefile.bsd-wrapper b/lib/libssl/Makefile.bsd-wrapper
index 5f196146cba..b1588d277c9 100644
--- a/lib/libssl/Makefile.bsd-wrapper
+++ b/lib/libssl/Makefile.bsd-wrapper
@@ -1,5 +1,5 @@
 # Build wrapper for OpenSSL
-# $OpenBSD: Makefile.bsd-wrapper,v 1.48 2002/05/16 12:50:32 deraadt Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.49 2002/05/16 13:01:37 deraadt Exp $
 
 # Our lndir is hacked; specify a full path to avoid potential conflicts
 # with the one installed with X11.
@@ -34,76 +34,178 @@ MUNGEDFILES= \
 .include <bsd.own.mk>		# for NOMAN
 
 .ifndef NOMAN
-MANALL=	BN_CTX_new.cat3 OPENSSL_VERSION_NUMBER.cat3 BN_CTX_start.cat3 \
-	OpenSSL_add_all_algorithms.cat3 BN_add.cat3 RAND_add.cat3 BN_add_word.cat3 \
-	RAND_bytes.cat3 BN_bn2bin.cat3 RAND_cleanup.cat3 BN_cmp.cat3 RAND_egd.cat3 \
-	BN_copy.cat3 RAND_load_file.cat3 BN_generate_prime.cat3 \
-	RAND_set_rand_method.cat3 BN_mod_inverse.cat3 RSA_blinding_on.cat3 \
-	BN_mod_mul_montgomery.cat3 RSA_check_key.cat3 BN_mod_mul_reciprocal.cat3 \
-	RSA_generate_key.cat3 BN_new.cat3 RSA_get_ex_new_index.cat3 BN_num_bytes.cat3 \
-	RSA_new.cat3 BN_rand.cat3 RSA_padding_add_PKCS1_type_1.cat3 BN_set_bit.cat3 \
-	RSA_print.cat3 BN_zero.cat3 RSA_private_encrypt.cat3 CRYPTO_set_ex_data.cat3 \
-	RSA_public_encrypt.cat3 DH_generate_key.cat3 RSA_set_method.cat3 \
-	DH_generate_parameters.cat3 RSA_sign.cat3 DH_get_ex_new_index.cat3 \
-	RSA_sign_ASN1_OCTET_STRING.cat3 DH_new.cat3 RSA_size.cat3 DH_set_method.cat3 \
-	blowfish.cat3 DH_size.cat3 bn.cat3 DSA_SIG_new.cat3 bn_internal.cat3 \
-	DSA_do_sign.cat3 DSA_dup_DH.cat3 crypto.cat3 DSA_generate_key.cat3 \
-	DSA_generate_parameters.cat3 d2i_DHparams.cat3 d2i_RSAPublicKey.cat3 \
-	DSA_get_ex_new_index.cat3 des_random_key.cat3 des_modes.cat7 \
-	DSA_new.cat3 dh.cat3 \
-	DSA_set_method.cat3 dsa.cat3 DSA_sign.cat3 DSA_size.cat3 HMAC.cat3 \
-	ERR_GET_LIB.cat3 lh_stats.cat3 ERR_clear_error.cat3 lhash.cat3 \
-	ERR_error_string.cat3 MD5.cat3 ERR_get_error.cat3 MDC2.cat3 \
-	ERR_load_crypto_strings.cat3 ERR_load_strings.cat3  \
-	ERR_print_errors.cat3 ERR_put_error.cat3 rsa.cat3 \
-	ERR_remove_state.cat3 SHA1.cat3 EVP_DigestInit.cat3 \
-	EVP_EncryptInit.cat3 BUF_MEM_new.cat3 \
-	EVP_OpenInit.cat3 EVP_SealInit.cat3 \
-	EVP_SignInit.cat3 EVP_VerifyInit.cat3 \
-	openssl.cat1 \
-	BUF_MEM_new.cat3 RC4.cat3 \
-	RIPEMD160.cat3 CRYPTO_set_locking_callback.cat3 \
-	SSL_CIPHER_get_name.cat3 SSL_CTX_add_extra_chain_cert.cat3 \
-	SSL_CTX_add_session.cat3 SSL_CTX_flush_sessions.cat3 \
-	SSL_CTX_free.cat3 SSL_CTX_get_ex_new_index.cat3 \
-	SSL_CTX_get_verify_mode.cat3 SSL_CTX_load_verify_locations.cat3 \
-	SSL_CTX_new.cat3 SSL_CTX_sess_number.cat3 \
-	SSL_CTX_sess_set_cache_size.cat3 SSL_CTX_sess_set_get_cb.cat3 \
-	SSL_CTX_sessions.cat3 SSL_CTX_set_cipher_list.cat3 \
-	SSL_CTX_set_client_CA_list.cat3 SSL_CTX_set_default_passwd_cb.cat3 \
-	SSL_CTX_set_mode.cat3 SSL_CTX_set_options.cat3 \
-	SSL_CTX_set_session_cache_mode.cat3 \
-	SSL_CTX_set_session_id_context.cat3 SSL_CTX_set_ssl_version.cat3 \
-	SSL_CTX_set_timeout.cat3 SSL_CTX_set_verify.cat3 \
-	SSL_CTX_use_certificate.cat3 SSL_SESSION_free.cat3 \
-	SSL_SESSION_get_ex_new_index.cat3 SSL_SESSION_get_time.cat3 \
-	SSL_accept.cat3 SSL_clear.cat3 SSL_connect.cat3 SSL_free.cat3 \
-	SSL_get_ciphers.cat3 SSL_get_client_CA_list.cat3 \
-	SSL_get_current_cipher.cat3 SSL_get_error.cat3 \
-	SSL_get_ex_data_X509_STORE_CTX_idx.cat3 SSL_get_ex_new_index.cat3 \
-	SSL_get_fd.cat3 SSL_get_peer_cert_chain.cat3 \
-	SSL_get_peer_certificate.cat3 SSL_get_rbio.cat3 SSL_get_session.cat3 \
-	SSL_get_verify_result.cat3 SSL_get_version.cat3 \
-	SSL_library_init.cat3 SSL_load_client_CA_file.cat3 \
-	SSL_new.cat3 SSL_pending.cat3 SSL_read.cat3 SSL_set_bio.cat3 \
-	SSL_set_connect_state.cat3 SSL_set_fd.cat3 SSL_set_session.cat3 \
-	SSL_set_shutdown.cat3 SSL_set_verify_result.cat3 SSL_shutdown.cat3 \
-	SSL_write.cat3 d2i_SSL_SESSION.cat3 SSL_want.cat3 \
-	SSL_state_string.cat3 SSL_session_reused.cat3 \
-	SSL_rstate_string.cat3 SSL_get_default_timeout.cat3 \
-	SSL_get_SSL_CTX.cat3 SSL_alert_type_string.cat3 \
+MANALL=	\
+	BN_CTX_new.cat3 \
+	BN_CTX_start.cat3 \
+	BN_add.cat3 \
+	BN_add_word.cat3 \
+	BN_bn2bin.cat3 \
+	BN_cmp.cat3 \
+	BN_copy.cat3 \
+	BN_generate_prime.cat3 \
+	BN_mod_inverse.cat3 \
+	BN_mod_mul_montgomery.cat3 \
+	BN_mod_mul_reciprocal.cat3 \
+	BN_new.cat3 \
+	BN_num_bytes.cat3 \
+	BN_rand.cat3 \
+	BN_set_bit.cat3 \
+	BN_swap.cat3 \
+	BN_zero.cat3 \
+	BUF_MEM_new.cat3 \
+	BUF_MEM_new.cat3 \
+	CRYPTO_set_ex_data.cat3 \
+	CRYPTO_set_locking_callback.cat3 \
+	DH_generate_key.cat3 \
+	DH_generate_parameters.cat3 \
+	DH_get_ex_new_index.cat3 \
+	DH_new.cat3 \
+	DH_set_method.cat3 \
+	DH_size.cat3 \
+	DSA_SIG_new.cat3 \
+	DSA_do_sign.cat3 \
+	DSA_dup_DH.cat3 \
+	DSA_generate_key.cat3 \
+	DSA_generate_parameters.cat3 \
+	DSA_get_ex_new_index.cat3 \
+	DSA_new.cat3 \
+	DSA_set_method.cat3 \
+	DSA_sign.cat3 \
+	DSA_size.cat3 \
+	ERR_GET_LIB.cat3 \
+	ERR_clear_error.cat3 \
+	ERR_error_string.cat3 \
+	ERR_get_error.cat3 \
+	ERR_load_crypto_strings.cat3 \
+	ERR_load_strings.cat3 \
+	ERR_print_errors.cat3 \
+	ERR_put_error.cat3 \
+	ERR_remove_state.cat3 \
+	EVP_BytesToKey.cat3 \
+	EVP_DigestInit.cat3 \
+	EVP_EncryptInit.cat3 \
+	EVP_OpenInit.cat3 \
+	EVP_SealInit.cat3 \
+	EVP_SignInit.cat3 \
+	EVP_VerifyInit.cat3 \
+	HMAC.cat3 \
+	MD5.cat3 \
+	MDC2.cat3 \
+	OPENSSL_VERSION_NUMBER.cat3 \
+	OpenSSL_add_all_algorithms.cat3 \
+	RAND_add.cat3 \
+	RAND_bytes.cat3 \
+	RAND_cleanup.cat3 \
+	RAND_egd.cat3 \
+	RAND_load_file.cat3 \
+	RAND_set_rand_method.cat3 \
+	RC4.cat3 \
+	RIPEMD160.cat3 \
+	RSA_blinding_on.cat3 \
+	RSA_check_key.cat3 \
+	RSA_generate_key.cat3 \
+	RSA_get_ex_new_index.cat3 \
+	RSA_new.cat3 \
+	RSA_padding_add_PKCS1_type_1.cat3 \
+	RSA_print.cat3 \
+	RSA_private_encrypt.cat3 \
+	RSA_public_encrypt.cat3 \
+	RSA_set_method.cat3 \
+	RSA_sign.cat3 \
+	RSA_sign_ASN1_OCTET_STRING.cat3 \
+	RSA_size.cat3 \
+	SHA1.cat3 \
+	SSL_CIPHER_get_name.cat3 \
 	SSL_COMP_add_compression_method.cat3 \
+	SSL_CTX_add_extra_chain_cert.cat3 \
+	SSL_CTX_add_session.cat3 \
 	SSL_CTX_ctrl.cat3 \
+	SSL_CTX_flush_sessions.cat3 \
+	SSL_CTX_free.cat3 \
+	SSL_CTX_get_ex_new_index.cat3 \
+	SSL_CTX_get_verify_mode.cat3 \
+	SSL_CTX_load_verify_locations.cat3 \
+	SSL_CTX_new.cat3 \
+	SSL_CTX_sess_number.cat3 \
+	SSL_CTX_sess_set_cache_size.cat3 \
+	SSL_CTX_sess_set_get_cb.cat3 \
+	SSL_CTX_sessions.cat3 \
 	SSL_CTX_set_cert_store.cat3 \
 	SSL_CTX_set_cert_verify_callback.cat3 \
+	SSL_CTX_set_cipher_list.cat3 \
+	SSL_CTX_set_client_CA_list.cat3 \
 	SSL_CTX_set_client_cert_cb.cat3 \
+	SSL_CTX_set_default_passwd_cb.cat3 \
 	SSL_CTX_set_generate_session_id.cat3 \
 	SSL_CTX_set_info_callback.cat3 \
 	SSL_CTX_set_max_cert_list.cat3 \
+	SSL_CTX_set_mode.cat3 \
 	SSL_CTX_set_msg_callback.cat3 \
+	SSL_CTX_set_options.cat3 \
 	SSL_CTX_set_quiet_shutdown.cat3 \
+	SSL_CTX_set_session_cache_mode.cat3 \
+	SSL_CTX_set_session_id_context.cat3 \
+	SSL_CTX_set_ssl_version.cat3 \
+	SSL_CTX_set_timeout.cat3 \
 	SSL_CTX_set_tmp_dh_callback.cat3 \
 	SSL_CTX_set_tmp_rsa_callback.cat3 \
+	SSL_CTX_set_verify.cat3 \
+	SSL_CTX_use_certificate.cat3 \
+	SSL_SESSION_free.cat3 \
+	SSL_SESSION_get_ex_new_index.cat3 \
+	SSL_SESSION_get_time.cat3 \
+	SSL_accept.cat3 \
+	SSL_alert_type_string.cat3 \
+	SSL_clear.cat3 \
+	SSL_connect.cat3 \
+	SSL_free.cat3 \
+	SSL_get_SSL_CTX.cat3 \
+	SSL_get_ciphers.cat3 \
+	SSL_get_client_CA_list.cat3 \
+	SSL_get_current_cipher.cat3 \
+	SSL_get_default_timeout.cat3 \
+	SSL_get_error.cat3 \
+	SSL_get_ex_data_X509_STORE_CTX_idx.cat3 \
+	SSL_get_ex_new_index.cat3 \
+	SSL_get_fd.cat3 \
+	SSL_get_peer_cert_chain.cat3 \
+	SSL_get_peer_certificate.cat3 \
+	SSL_get_rbio.cat3 \
+	SSL_get_session.cat3 \
+	SSL_get_verify_result.cat3 \
+	SSL_get_version.cat3 \
+	SSL_library_init.cat3 \
+	SSL_load_client_CA_file.cat3 \
+	SSL_new.cat3 \
+	SSL_pending.cat3 \
+	SSL_read.cat3 \
+	SSL_rstate_string.cat3 \
+	SSL_session_reused.cat3 \
+	SSL_set_bio.cat3 \
+	SSL_set_connect_state.cat3 \
+	SSL_set_fd.cat3 \
+	SSL_set_session.cat3 \
+	SSL_set_shutdown.cat3 \
+	SSL_set_verify_result.cat3 \
+	SSL_shutdown.cat3 \
+	SSL_state_string.cat3 \
+	SSL_want.cat3 \
+	SSL_write.cat3 \
+	blowfish.cat3 \
+	bn.cat3 \
+	bn_internal.cat3 \
+	crypto.cat3 \
+	d2i_DHparams.cat3 \
+	d2i_RSAPublicKey.cat3 \
+	d2i_SSL_SESSION.cat3 \
+	des_modes.cat7 \
+	des_random_key.cat3 \
+	dh.cat3 \
+	dsa.cat3 \
+	lh_stats.cat3 \
+	lhash.cat3 \
+	openssl.cat1 \
+	rsa.cat3 \
 	ssl.cat3
 
 .if MANPS