clean MLINK tree

1 files changed, 338 insertions, 249 deletions

diff --git a/lib/libssl/Makefile.bsd-wrapper b/lib/libssl/Makefile.bsd-wrapper
index b1588d277c9..7ee052ae693 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.49 2002/05/16 13:01:37 deraadt Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.50 2002/05/16 22:32:37 deraadt Exp $
 
 # Our lndir is hacked; specify a full path to avoid potential conflicts
 # with the one installed with X11.
@@ -352,310 +352,284 @@ des_random_key.ps3: des.pod
 	  des_random_key.pm ) | nroff -Tps -man > ${.TARGET}
 .endif
 
-MLINKS+=BN_CTX_new.3 BN_CTX_init.3 BN_CTX_new.3 BN_CTX_free.3 \
-	BN_CTX_start.3 BN_CTX_get.3 BN_CTX_start.3 BN_CTX_end.3 \
-	BN_add.3 BN_sub.3 BN_add.3 BN_mul.3 BN_add.3 BN_div.3 \
-	BN_add.3 BN_sqr.3 BN_add.3 BN_mod.3 BN_add.3 BN_mod_mul.3 \
-	BN_add.3 BN_exp.3 BN_add.3 BN_mod_exp.3 BN_add.3 BN_gcd.3 \
-	BN_add_word.3 BN_sub_word.3 BN_add_word.3 BN_mul_word.3 \
-	BN_add_word.3 BN_div_word.3 BN_add_word.3 BN_mod_word.3 \
-	BN_bn2bin.3 BN_bin2bn.3 BN_bn2bin.3 BN_bn2hex.3 \
-	BN_bn2bin.3 BN_bn2dec.3 BN_bn2bin.3 BN_hex2bn.3 \
-	BN_bn2bin.3 BN_dec2bn.3 BN_bn2bin.3 BN_print.3 \
-	BN_bn2bin.3 BN_print_fp.3 BN_bn2bin.3 BN_bn2mpi.3 \
+MLINKS+=\
+	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_exp.3 \
+	BN_add.3 BN_mod_mul.3 \
+	BN_add.3 BN_mul.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_cmp.3 BN_ucmp.3 BN_cmp.3 BN_is_zero.3 BN_cmp.3 BN_is_one.3 \
-	BN_cmp.3 BN_is_word.3 BN_cmp.3 BN_is_odd.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_new.3 \
-	BN_mod_mul_montgomery.3 BN_MONT_CTX_init.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_MONT_CTX_copy.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_new.3 \
-	BN_mod_mul_reciprocal.3 BN_RECP_CTX_init.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_init.3 BN_new.3 BN_clear.3 \
-	BN_new.3 BN_free.3 BN_new.3 BN_clear_free.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_rand.3 BN_rand_range.3 \
-	BN_set_bit.3 BN_clear_bit.3 BN_set_bit.3 BN_is_bit_set.3 \
-	BN_set_bit.3 BN_mask_bits.3 BN_set_bit.3 BN_lshift.3 \
-	BN_set_bit.3 BN_lshift1.3 BN_set_bit.3 BN_rshift.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_one.3 BN_zero.3 BN_value_one.3 \
-	BN_zero.3 BN_set_word.3 BN_zero.3 BN_get_word.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 \
+	BUF_MEM_new.3 BUF_MEM_free.3 \
+	BUF_MEM_new.3 BUF_MEM_grow.3 \
+	BUF_MEM_new.3 BUF_strdup.3 \
 	CRYPTO_set_ex_data.3 CRYPTO_get_ex_data.3 \
+	CRYPTO_set_locking_callback.3 CRYPTO_add.3 \
+	CRYPTO_set_locking_callback.3 CRYPTO_add_lock.3 \
+	CRYPTO_set_locking_callback.3 CRYPTO_destroy_dynlockid.3 \
+	CRYPTO_set_locking_callback.3 CRYPTO_get_new_dynlockid.3 \
+	CRYPTO_set_locking_callback.3 CRYPTO_lock.3 \
+	CRYPTO_set_locking_callback.3 CRYPTO_num_locks.3 \
+	CRYPTO_set_locking_callback.3 CRYPTO_r_lock.3 \
+	CRYPTO_set_locking_callback.3 CRYPTO_r_unlock.3 \
+	CRYPTO_set_locking_callback.3 CRYPTO_set_dynlock_create_callback.3 \
+	CRYPTO_set_locking_callback.3 CRYPTO_set_dynlock_destroy_callback.3 \
+	CRYPTO_set_locking_callback.3 CRYPTO_set_dynlock_lock_callback.3 \
+	CRYPTO_set_locking_callback.3 CRYPTO_set_id_callback.3 \
+	CRYPTO_set_locking_callback.3 CRYPTO_w_lock.3 \
+	CRYPTO_set_locking_callback.3 CRYPTO_w_unlock.3 \
 	DH_generate_key.3 DH_compute_key.3 \
 	DH_generate_parameters.3 DH_check.3 \
-	DH_get_ex_new_index.3 DH_set_ex_data.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_set_default_method.3 \
+	DH_set_method.3 DH_OpenSSL.3 \
 	DH_set_method.3 DH_get_default_method.3 \
+	DH_set_method.3 DH_get_default_openssl_method.3 \
 	DH_set_method.3 DH_new_method.3 \
-	DH_set_method.3 DH_OpenSSL.3 \
+	DH_set_method.3 DH_set_default_method.3 \
 	DH_set_method.3 DH_set_default_openssl_method.3 \
-	DH_set_method.3 DH_get_default_openssl_method.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_get_default_openssl_method.3 \
+	DSA_set_method.3 DSA_new_method.3 \
+	DSA_set_method.3 DSA_set_default_method.3 \
+	DSA_set_method.3 DSA_set_default_openssl_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_lib_error_string.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_error_string.3 ERR_error_string_n.3 \
-	ERR_get_error.3 ERR_peek_error.3 \
 	ERR_get_error.3 ERR_get_error_line.3 \
-	ERR_get_error.3 ERR_peek_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_load_crypto_strings.3 ERR_free_strings.3 \
 	ERR_load_crypto_strings.3 SSL_load_error_strings.3 \
-	ERR_load_strings.3 ERR_get_next_error_library.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 \
-	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 \
-	OpenSSL_add_all_algorithms.3 EVP_cleanup.3 \
-	RAND_add.3 RAND_seed.3 RAND_add.3 RAND_status.3 \
-	RAND_add.3 RAND_event.3 RAND_add.3 RAND_screen.3 \
-	RAND_egd.3 RAND_egd_bytes.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_get_rand_method.3 \
-	RAND_set_rand_method.3 RAND_SSLeay.3 \
-	RSA_blinding_on.3 RSA_blinding_off.3 \
-	RSA_get_ex_new_index.3 RSA_set_ex_data.3 \
-	RSA_get_ex_new_index.3 RSA_get_ex_data.3 \
-	RSA_new.3 RSA_free.3 \
-	RSA_padding_add_PKCS1_type_1.3 RSA_padding_check_PKCS1_type_1.3 \
-	RSA_padding_add_PKCS1_type_1.3 RSA_padding_add_PKCS1_type_2.3 \
-	RSA_padding_add_PKCS1_type_1.3 RSA_padding_check_PKCS1_type_2.3 \
-	RSA_padding_add_PKCS1_type_1.3 RSA_padding_add_PKCS1_OAEP.3 \
-	RSA_padding_add_PKCS1_type_1.3 RSA_padding_check_PKCS1_OAEP.3 \
-	RSA_padding_add_PKCS1_type_1.3 RSA_padding_add_SSLv23.3 \
-	RSA_padding_add_PKCS1_type_1.3 RSA_padding_check_SSLv23.3 \
-	RSA_padding_add_PKCS1_type_1.3 RSA_padding_add_none.3 \
-	RSA_padding_add_PKCS1_type_1.3 RSA_padding_check_none.3 \
-	RSA_print.3 RSA_print_fp.3 RSA_print.3 DSAparams_print.3 \
-	RSA_print.3 DSAparams_print_fp.3 RSA_print.3 DSA_print_fp.3 \
-	RSA_print.3 DHparams_print.3 RSA_print.3 DHparams_print_fp.3 \
-	RSA_private_encrypt.3 RSA_public_decrypt.3 \
-	RSA_public_encrypt.3 RSA_private_decrypt.3 \
-	RSA_set_method.3 RSA_get_method.3 \
-	RSA_set_method.3 RSA_set_default_method.3 \
-	RSA_set_method.3 RSA_get_default_method.3 \
-	RSA_set_method.3 RSA_PKCS1_SSLeay.3 \
-	RSA_set_method.3 RSA_PKCS1_RSAref.3 \
-	RSA_set_method.3 RSA_null_method.3 \
-	RSA_set_method.3 RSA_flags.3 \
-	RSA_set_method.3 RSA_new_method.3 \
-	RSA_set_method.3 RSA_set_default_openssl_method.3 \
-	RSA_set_method.3 RSA_get_default_openssl_method.3 \
-	RSA_sign.3 RSA_verify.3 \
-	RSA_sign_ASN1_OCTET_STRING.3 RSA_verify_ASN1_OCTET_STRING.3 \
-	BUF_MEM_new.3 BUF_MEM_free.3 \
-	BUF_MEM_new.3 BUF_MEM_grow.3 BUF_MEM_new.3 BUF_strdup.3 \
-	d2i_DHparams.3 i2d_DHparams.3 \
-	blowfish.3 BF_set_key.3 blowfish.3 BF_encrypt.3 \
-	blowfish.3 BF_decrypt.3 blowfish.3 BF_ecb.3 \
-	blowfish.3 BF_cbc.3 blowfish.3 BF_cfb64_encrypt.3 \
-	blowfish.3 BF_ofb64_encrypt.3 blowfish.3 BF_options.3 \
-	blowfish.3 BF_ecb_encrypt.3 blowfish.3 BF_cbc_encrypt.3 \
-	des_crypt.3 des_string_to_2keys.3 \
-	des_random_key.3 des_set_key.3 des_random_key.3 des_key_sched.3 \
-	des_random_key.3 des_set_key_checked.3 \
-	des_random_key.3 des_set_key_unchecked.3 \
-	des_random_key.3 des_set_odd_parity.3 des_random_key.3 des_is_weak_key.3 \
-	des_random_key.3 des_ecb_encrypt.3 des_random_key.3 des_ecb2_encrypt.3 \
-	des_random_key.3 des_ecb3_encrypt.3 des_random_key.3 des_ncbc_encrypt.3 \
-	des_random_key.3 des_cfb_encrypt.3 des_random_key.3 des_ofb_encrypt.3 \
-	des_random_key.3 des_pcbc_encrypt.3 des_random_key.3 des_cfb64_encrypt.3 \
-	des_random_key.3 des_ofb64_encrypt.3 des_random_key.3 des_xcbc_encrypt.3 \
-	des_random_key.3 des_ede2_cbc_encrypt.3 \
-	des_random_key.3 des_ede2_cfb64_encrypt.3 \
-	des_random_key.3 des_ede2_ofb64_encrypt.3 \
-	des_random_key.3 des_ede3_cbc_encrypt.3 \
-	des_random_key.3 des_ede3_cbcm_encrypt.3 \
-	des_random_key.3 des_ede3_cfb64_encrypt.3 \
-	des_random_key.3 des_ede3_ofb64_encrypt.3 \
-	des_random_key.3 des_read_password.3 \
-	des_random_key.3 des_read_2passwords.3 des_random_key.3 des_read_pw_string.3 \
-	des_random_key.3 des_cbc_cksum.3 des_random_key.3 des_quad_cksum.3 \
-	des_random_key.3 des_string_to_key.3 des_random_key.3 des_string_to_2keys.3 \
-	des_random_key.3 des_fcrypt.3 des_random_key.3 des_crypt.3 \
-	des_random_key.3 des_enc_read.3 des_random_key.3 des_enc_write.3 \
-	MD5.3 MD2.3 \
-	MD5.3 MD2_Init.3 MD5.3 MD2_Update.3 MD5.3 MD2_Final.3 \
-	MD5.3 MD4.3 \
-	MD5.3 MD4_Init.3 MD5.3 MD4_Update.3 MD5.3 MD4_Final.3 \
-	MD5.3 MD5_Init.3 MD5.3 MD5_Update.3 MD5.3 MD5_Final.3 \
-	bn_internal.3 bn_mul_words.3 \
-	bn_internal.3 bn_mul_add_words.3 \
-	bn_internal.3 bn_sqr_words.3 \
-	bn_internal.3 bn_div_words.3 \
-	bn_internal.3 bn_add_words.3 \
-	bn_internal.3 bn_sub_words.3 \
-	bn_internal.3 bn_mul_comba4.3 \
-	bn_internal.3 bn_mul_comba8.3 \
-	bn_internal.3 bn_sqr_comba4.3 \
-	bn_internal.3 bn_sqr_comba8.3 \
-	bn_internal.3 bn_cmp_words.3 \
-	bn_internal.3 bn_mul_normal.3 \
-	bn_internal.3 bn_mul_low_normal.3 \
-	bn_internal.3 bn_mul_recursive.3 \
-	bn_internal.3 bn_mul_part_recursive.3 \
-	bn_internal.3 bn_mul_low_recursive.3 \
-	bn_internal.3 bn_mul_high.3 \
-	bn_internal.3 bn_sqr_normal.3 \
-	bn_internal.3 bn_sqr_recursive.3 \
-	bn_internal.3 mul.3 \
-	bn_internal.3 mul_add.3 \
-	bn_internal.3 sqr.3 \
-	bn_internal.3 bn_expand.3 \
-	bn_internal.3 bn_wexpand.3 \
-	bn_internal.3 bn_expand2.3 \
-	bn_internal.3 bn_fix_top.3 \
-	bn_internal.3 bn_check_top.3 \
-	bn_internal.3 bn_print.3 \
-	bn_internal.3 bn_dump.3 \
-	bn_internal.3 bn_set_max.3 \
-	bn_internal.3 bn_set_high.3 \
-	bn_internal.3 bn_set_low.3 \
-	EVP_DigestInit.3 EVP_DigestUpdate.3 EVP_DigestInit.3 EVP_DigestFinal.3 \
-	EVP_DigestInit.3 EVP_MD_CTX_copy.3 EVP_DigestInit.3 EVP_MD_type.3 \
-	EVP_DigestInit.3 EVP_MD_pkey_type.3 EVP_DigestInit.3 EVP_MD_size.3 \
-	EVP_DigestInit.3 EVP_MD_block_size.3 EVP_DigestInit.3 EVP_MD_CTX_md.3 \
-	EVP_DigestInit.3 EVP_MD_CTX_size.3 EVP_DigestInit.3 EVP_MD_size.3 \
+	EVP_DigestInit.3 EVP_DigestFinal.3 \
+	EVP_DigestInit.3 EVP_DigestUpdate.3 \
 	EVP_DigestInit.3 EVP_MD_CTX_block_size.3 \
-	EVP_DigestInit.3 EVP_MD_block_size.3 EVP_DigestInit.3 EVP_MD_CTX_type.3 \
-	EVP_DigestInit.3 EVP_MD_type.3 EVP_DigestInit.3 EVP_md_null.3 \
-	EVP_DigestInit.3 EVP_md2.3 EVP_DigestInit.3 EVP_md5.3 \
-	EVP_DigestInit.3 EVP_sha.3 EVP_DigestInit.3 EVP_sha1.3 \
-	EVP_DigestInit.3 EVP_dss.3 EVP_DigestInit.3 EVP_dss1.3 \
-	EVP_DigestInit.3 EVP_mdc2.3 EVP_DigestInit.3 EVP_ripemd160.3 \
+	EVP_DigestInit.3 EVP_MD_CTX_copy.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_block_size.3 \
+	EVP_DigestInit.3 EVP_MD_pkey_type.3 \
+	EVP_DigestInit.3 EVP_MD_size.3 \
+	EVP_DigestInit.3 EVP_MD_size.3 \
+	EVP_DigestInit.3 EVP_MD_type.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_digestbyname.3 \
-	EVP_DigestInit.3 OBJ_nid2sn.3 \
-	EVP_DigestInit.3 EVP_get_digestbyobj.3 \
 	EVP_DigestInit.3 EVP_get_digestbynid.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_DigestInit.3 OBJ_nid2sn.3 \
 	EVP_DigestInit.3 OBJ_obj2nid.3 \
-	EVP_EncryptInit.3 EVP_EncryptUpdate.3 \
-	EVP_EncryptInit.3 EVP_EncryptFinal.3 \
-	EVP_EncryptInit.3 EVP_DecryptInit.3 \
-	EVP_EncryptInit.3 EVP_DecryptUpdate.3 \
-	EVP_EncryptInit.3 EVP_DecryptFinal.3 \
+	EVP_EncryptInit.3 EVP_CIPHER_CTX_block_size.3 \
+	EVP_EncryptInit.3 EVP_CIPHER_CTX_cipher.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_iv_length.3 \
+	EVP_EncryptInit.3 EVP_CIPHER_CTX_key_length.3 \
+	EVP_EncryptInit.3 EVP_CIPHER_CTX_nid.3 \
+	EVP_EncryptInit.3 EVP_CIPHER_CTX_set_key_length.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_iv_length.3 \
+	EVP_EncryptInit.3 EVP_CIPHER_key_length.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_CIPHER_type.3 \
+	EVP_EncryptInit.3 EVP_CipherFinal.3 \
 	EVP_EncryptInit.3 EVP_CipherInit.3 \
 	EVP_EncryptInit.3 EVP_CipherUpdate.3 \
-	EVP_EncryptInit.3 EVP_CipherFinal.3 \
-	EVP_EncryptInit.3 EVP_CIPHER_CTX_cleanup.3 \
+	EVP_EncryptInit.3 EVP_DecryptFinal.3 \
+	EVP_EncryptInit.3 EVP_DecryptInit.3 \
+	EVP_EncryptInit.3 EVP_DecryptUpdate.3 \
+	EVP_EncryptInit.3 EVP_EncryptFinal.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_cipherbyname.3 \
-	EVP_EncryptInit.3 OBJ_nid2sn.3 \
-	EVP_EncryptInit.3 EVP_get_cipherbyobj.3 \
 	EVP_EncryptInit.3 EVP_get_cipherbynid.3 \
+	EVP_EncryptInit.3 EVP_get_cipherbynid.3 \
+	EVP_EncryptInit.3 EVP_get_cipherbyobj.3 \
+	EVP_EncryptInit.3 OBJ_nid2sn.3 \
 	EVP_EncryptInit.3 OBJ_obj2nid.3 \
-	EVP_EncryptInit.3 EVP_CIPHER_nid.3 \
-	EVP_EncryptInit.3 EVP_CIPHER_block_size.3 \
-	EVP_EncryptInit.3 EVP_CIPHER_key_length.3 \
-	EVP_EncryptInit.3 EVP_CIPHER_iv_length.3 \
-	EVP_EncryptInit.3 EVP_CIPHER_type.3 \
-	EVP_EncryptInit.3 EVP_CIPHER_CTX_cipher.3 \
-	EVP_EncryptInit.3 EVP_CIPHER_CTX_nid.3 \
-	EVP_EncryptInit.3 EVP_CIPHER_CTX_block_size.3 \
-	EVP_EncryptInit.3 EVP_CIPHER_CTX_key_length.3 \
-	EVP_EncryptInit.3 EVP_CIPHER_CTX_iv_length.3 \
-	EVP_EncryptInit.3 EVP_CIPHER_CTX_type.3 \
-	EVP_EncryptInit.3 EVP_CIPHER_type.3 \
-	EVP_EncryptInit.3 EVP_CIPHER_CTX_cipher.3 \
-	EVP_EncryptInit.3 EVP_CIPHER_param_to_asn1.3 \
-	EVP_EncryptInit.3 EVP_CIPHER_asn1_to_param.3 \
-	EVP_EncryptInit.3 EVP_CIPHER_CTX_ctrl.3 \
-	EVP_EncryptInit.3 EVP_CIPHER_CTX_set_key_length.3 \
-	EVP_OpenInit.3 EVP_OpenUpdate.3 \
 	EVP_OpenInit.3 EVP_OpenFinal.3 \
-	EVP_SealInit.3 EVP_SealUpdate.3 \
+	EVP_OpenInit.3 EVP_OpenUpdate.3 \
 	EVP_SealInit.3 EVP_SealFinal.3 \
-	EVP_SignInit.3 EVP_SignUpdate.3 \
-	EVP_SignInit.3 EVP_SignFinal.3 \
+	EVP_SealInit.3 EVP_SealUpdate.3 \
 	EVP_SignInit.3 EVP_PKEY_size.3 \
-	EVP_VerifyInit.3 EVP_VerifyUpdate.3 \
+	EVP_SignInit.3 EVP_SignFinal.3 \
+	EVP_SignInit.3 EVP_SignUpdate.3 \
 	EVP_VerifyInit.3 EVP_VerifyFinal.3 \
-	RSA_print.3 RSA_print_fp.3 \
-	RSA_print.3 DSAparams_print.3 \
-	RSA_print.3 DSAparams_print_fp.3 \
-	RSA_print.3 DSA_print.3 \
-	RSA_print.3 DSA_print_fp.3 \
-	RSA_print.3 DHparams_print.3 \
-	RSA_print.3 DHparams_print_fp.3 \
-	DSA_new.3 DSA_free.3 \
-	DSA_set_method.3 DSA_set_default_method.3 \
-	DSA_set_method.3 DSA_get_default_method.3 \
-	DSA_set_method.3 DSA_new_method.3 \
-	DSA_set_method.3 DSA_OpenSSL.3 \
-	DSA_set_method.3 DSA_get_default_openssl_method.3 \
-	DSA_set_method.3 DSA_set_default_openssl_method.3 \
-	dsa.3 DSA_free.3 dsa.3 DSA_sign_setup.3 \
-	dsa.3 DSA_verify.3 dsa.3 DSA_set_default_method.3 \
-	dsa.3 DSA_get_default_method.3 dsa.3 DSA_new_method.3 \
-	dsa.3 DSA_OpenSSL.3 dsa.3 DSA_set_ex_data.3 \
-	dsa.3 DSA_get_ex_data.3 dsa.3 DSA_SIG_free.3 \
-	dsa.3 i2d_DSA_SIG.3 dsa.3 d2i_DSA_SIG.3 \
-	dsa.3 DSA_do_verify.3 dsa.3 d2i_DSAPublicKey.3 \
-	dsa.3 d2i_DSAPrivateKey.3 dsa.3 d2i_DSAparams.3 \
-	dsa.3 i2d_DSAPublicKey.3 dsa.3 i2d_DSAPrivateKey.3 \
-	dsa.3 i2d_DSAparams.3 \
-	DSA_sign.3 DSA_sign_setup.3 DSA_sign.3 DSA_verify.3 \
-	lhash.3 lh_new.3 lhash.3 lh_free.3 lhash.3 lh_insert.3 \
-	lhash.3 lh_delete.3 lhash.3 lh_retrieve.3 lhash.3 lh_doall.3 \
-	lhash.3 lh_doall_arg.3 lhash.3 lh_error.3 \
-	d2i_RSAPublicKey.3 i2d_RSAPublicKey.3 \
-	d2i_RSAPublicKey.3 d2i_RSAPrivateKey.3 \
-	d2i_RSAPublicKey.3 i2d_RSAPrivateKey.3 \
-	d2i_RSAPublicKey.3 i2d_Netscape_RSA.3 \
-	d2i_RSAPublicKey.3 d2i_Netscape_RSA.3 \
-	lh_stats.3 lh_node_stats.3 lh_stats.3 lh_node_usage_stats.3 \
-	lh_stats.3 lh_stats_bio.3 lh_stats.3 lh_node_stats_bio.3 \
-	lh_stats.3 lh_node_usage_stats_bio.3 \
-	HMAC.3 HMAC_Init.3 HMAC.3 HMAC_Update.3 \
-	HMAC.3 HMAC_Final.3 HMAC.3 HMAC_cleanup.3 \
-	MDC2.3 MDC2_Init.3 MDC2.3 MDC2_Update.3 \
+	EVP_VerifyInit.3 EVP_VerifyUpdate.3 \
+	HMAC.3 HMAC_Final.3 \
+	HMAC.3 HMAC_Init.3 \
+	HMAC.3 HMAC_Update.3 \
+	HMAC.3 HMAC_cleanup.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_Final.3 \
+	MD5.3 MD5_Init.3 \
+	MD5.3 MD5_Update.3 \
 	MDC2.3 MDC2_Final.3 \
-	SHA1.3 SHA1_Init.3 SHA1.3 SHA1_Update.3 SHA1.3 SHA1_Final.3 \
-	RC4.3 RC4_set_key.3 \
+	MDC2.3 MDC2_Init.3 \
+	MDC2.3 MDC2_Update.3 \
+	OPENSSL_VERSION_NUMBER.3 SSLeay.3 \
+	OPENSSL_VERSION_NUMBER.3 SSLeay_version.3 \
+	OpenSSL_add_all_algorithms.3 EVP_cleanup.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_bytes.3 RAND_pseudo_bytes.3 \
+	RAND_egd.3 RAND_egd_bytes.3 \
+	RAND_load_file.3 RAND_file_name.3 \
 	RAND_load_file.3 RAND_file_name.3 \
 	RAND_load_file.3 RAND_write_file.3 \
-	RAND_set_rand_method.3 RAND_get_rand_method.3 \
+	RAND_load_file.3 RAND_write_file.3 \
 	RAND_set_rand_method.3 RAND_SSLeay.3 \
-	CRYPTO_set_locking_callback.3 CRYPTO_set_id_callback.3 \
-	CRYPTO_set_locking_callback.3 CRYPTO_num_locks.3 \
-	CRYPTO_set_locking_callback.3 CRYPTO_set_dynlock_create_callback.3 \
-	CRYPTO_set_locking_callback.3 CRYPTO_set_dynlock_lock_callback.3 \
-	CRYPTO_set_locking_callback.3 CRYPTO_set_dynlock_destroy_callback.3 \
-	CRYPTO_set_locking_callback.3 CRYPTO_get_new_dynlockid.3 \
-	CRYPTO_set_locking_callback.3 CRYPTO_destroy_dynlockid.3 \
-	CRYPTO_set_locking_callback.3 CRYPTO_lock.3 \
-	CRYPTO_set_locking_callback.3 CRYPTO_w_lock.3 \
-	CRYPTO_set_locking_callback.3 CRYPTO_w_unlock.3 \
-	CRYPTO_set_locking_callback.3 CRYPTO_r_lock.3 \
-	CRYPTO_set_locking_callback.3 CRYPTO_r_unlock.3 \
-	CRYPTO_set_locking_callback.3 CRYPTO_add.3 \
-	CRYPTO_set_locking_callback.3 CRYPTO_add_lock.3 \
-	RIPEMD160.3 RIPEMD160_Init.3 RIPEMD160.3 RIPEMD160_Update.3 \
+	RAND_set_rand_method.3 RAND_SSLeay.3 \
+	RAND_set_rand_method.3 RAND_get_rand_method.3 \
+	RAND_set_rand_method.3 RAND_get_rand_method.3 \
+	RC4.3 RC4_set_key.3 \
 	RIPEMD160.3 RIPEMD160_Final.3 \
+	RIPEMD160.3 RIPEMD160_Init.3 \
+	RIPEMD160.3 RIPEMD160_Update.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.3 \
+	RSA_print.3 DHparams_print_fp.3 \
+	RSA_print.3 DHparams_print_fp.3 \
+	RSA_print.3 DSA_print.3 \
+	RSA_print.3 DSA_print_fp.3 \
+	RSA_print.3 DSA_print_fp.3 \
+	RSA_print.3 DSAparams_print.3 \
+	RSA_print.3 DSAparams_print.3 \
+	RSA_print.3 DSAparams_print_fp.3 \
+	RSA_print.3 DSAparams_print_fp.3 \
+	RSA_print.3 RSA_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_RSAref.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_default_openssl_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_set_method.3 RSA_set_default_openssl_method.3 \
+	RSA_sign.3 RSA_verify.3 \
+	RSA_sign_ASN1_OCTET_STRING.3 RSA_verify_ASN1_OCTET_STRING.3 \
+	SHA1.3 SHA1_Final.3 \
+	SHA1.3 SHA1_Init.3 \
+	SHA1.3 SHA1_Update.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 \
@@ -785,7 +759,122 @@ MLINKS+=BN_CTX_new.3 BN_CTX_init.3 BN_CTX_new.3 BN_CTX_free.3 \
 	SSL_want.3 SSL_want_read.3 \
 	SSL_want.3 SSL_want_write.3 \
 	SSL_want.3 SSL_want_x509_lookup.3 \
-	d2i_SSL_SESSION.3 i2d_SSL_SESSION.3
+	blowfish.3 BF_cbc.3 \
+	blowfish.3 BF_cbc_encrypt.3 \
+	blowfish.3 BF_cfb64_encrypt.3 \
+	blowfish.3 BF_decrypt.3 \
+	blowfish.3 BF_ecb.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 \
+	bn_internal.3 mul.3 \
+	bn_internal.3 mul_add.3 \
+	bn_internal.3 sqr.3 \
+	d2i_DHparams.3 i2d_DHparams.3 \
+	d2i_RSAPublicKey.3 d2i_Netscape_RSA.3 \
+	d2i_RSAPublicKey.3 d2i_RSAPrivateKey.3 \
+	d2i_RSAPublicKey.3 i2d_Netscape_RSA.3 \
+	d2i_RSAPublicKey.3 i2d_RSAPrivateKey.3 \
+	d2i_RSAPublicKey.3 i2d_RSAPublicKey.3 \
+	d2i_SSL_SESSION.3 i2d_SSL_SESSION.3 \
+	des_crypt.3 des_string_to_2keys.3 \
+	des_random_key.3 des_cbc_cksum.3 \
+	des_random_key.3 des_cfb64_encrypt.3 \
+	des_random_key.3 des_cfb_encrypt.3 \
+	des_random_key.3 des_crypt.3 \
+	des_random_key.3 des_ecb2_encrypt.3 \
+	des_random_key.3 des_ecb3_encrypt.3 \
+	des_random_key.3 des_ecb_encrypt.3 \
+	des_random_key.3 des_ede2_cbc_encrypt.3 \
+	des_random_key.3 des_ede2_cfb64_encrypt.3 \
+	des_random_key.3 des_ede2_ofb64_encrypt.3 \
+	des_random_key.3 des_ede3_cbc_encrypt.3 \
+	des_random_key.3 des_ede3_cbcm_encrypt.3 \
+	des_random_key.3 des_ede3_cfb64_encrypt.3 \
+	des_random_key.3 des_ede3_ofb64_encrypt.3 \
+	des_random_key.3 des_enc_read.3 \
+	des_random_key.3 des_enc_write.3 \
+	des_random_key.3 des_fcrypt.3 \
+	des_random_key.3 des_is_weak_key.3 \
+	des_random_key.3 des_key_sched.3 \
+	des_random_key.3 des_ncbc_encrypt.3 \
+	des_random_key.3 des_ofb64_encrypt.3 \
+	des_random_key.3 des_ofb_encrypt.3 \
+	des_random_key.3 des_pcbc_encrypt.3 \
+	des_random_key.3 des_quad_cksum.3 \
+	des_random_key.3 des_read_2passwords.3 \
+	des_random_key.3 des_read_password.3 \
+	des_random_key.3 des_read_pw_string.3 \
+	des_random_key.3 des_set_key.3 \
+	des_random_key.3 des_set_key_checked.3 \
+	des_random_key.3 des_set_key_unchecked.3 \
+	des_random_key.3 des_set_odd_parity.3 \
+	des_random_key.3 des_string_to_2keys.3 \
+	des_random_key.3 des_string_to_key.3 \
+	des_random_key.3 des_xcbc_encrypt.3 \
+	dsa.3 DSA_OpenSSL.3 \
+	dsa.3 DSA_SIG_free.3 \
+	dsa.3 DSA_do_verify.3 \
+	dsa.3 DSA_free.3 \
+	dsa.3 DSA_get_default_method.3 \
+	dsa.3 DSA_get_ex_data.3 \
+	dsa.3 DSA_new_method.3 \
+	dsa.3 DSA_set_default_method.3 \
+	dsa.3 DSA_set_ex_data.3 \
+	dsa.3 DSA_sign_setup.3 \
+	dsa.3 DSA_verify.3 \
+	dsa.3 d2i_DSAPrivateKey.3 \
+	dsa.3 d2i_DSAPublicKey.3 \
+	dsa.3 d2i_DSA_SIG.3 \
+	dsa.3 d2i_DSAparams.3 \
+	dsa.3 i2d_DSAPrivateKey.3 \
+	dsa.3 i2d_DSAPublicKey.3 \
+	dsa.3 i2d_DSA_SIG.3 \
+	dsa.3 i2d_DSAparams.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
 
 .include <bsd.man.mk>
 .else