remove duplicates; remove des_random_key; remove unused; sort MLINKS; ok jmc@

1 files changed, 8 insertions, 113 deletions

diff --git a/src/lib/libssl/man/Makefile b/src/lib/libssl/man/Makefile
index 4f08f043a8..2fc252def4 100644
--- a/src/lib/libssl/man/Makefile
+++ b/src/lib/libssl/man/Makefile
@@ -1,8 +1,7 @@
-# $OpenBSD: Makefile,v 1.11 2006/11/09 09:45:17 markus Exp $
+# $OpenBSD: Makefile,v 1.12 2008/05/07 09:22:33 markus Exp $
 
 .include <bsd.own.mk>           # for NOMAN
 
-
 POD2MAN=pod2man --official --release="OpenBSD ${OSREV}" --center=OpenSSL
 
 .ifndef NOMAN
@@ -26,7 +25,6 @@ MANALL=	\
         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 \
@@ -172,8 +170,6 @@ MANALL=	\
         d2i_DHparams.cat3 \
         d2i_RSAPublicKey.cat3 \
         d2i_SSL_SESSION.cat3 \
-        des_modes.cat7 \
-        des_random_key.cat3 \
         dh.cat3 \
         dsa.cat3 \
         lh_stats.cat3 \
@@ -187,49 +183,6 @@ PSALL=	${MANALL:S/.cat1/.ps1/g:S/.cat2/.ps2/g:S/.cat3/.ps3/g:S/.cat4/.ps4/g:S/.c
 
 # these are a real problem, since they re-document functions described in
 # other pages.
-#
-# err.pod -> ERR_get_error.pod
-# ERR_peek_error ERR_get_error_line
-# ERR_peek_error_line ERR_get_error_line_data ERR_peek_error_line_data
-# ERR_GET_LIB ERR_GET_FUNC ERR_GET_REASON ERR_clear_error ERR_error_string
-# ERR_lib_error_string ERR_func_error_string ERR_reason_error_string
-# ERR_print_errors ERR_print_errors_fp ERR_load_crypto_strings ERR_free_strings
-# ERR_remove_state ERR_put_error ERR_add_error_data ERR_load_strings ERR_PACK
-# ERR_get_next_error_library
-#
-# rand.pod -> RAND_bytes.pod
-# RAND_pseudo_bytes RAND_seed RAND_add RAND_status RAND_event
-# RAND_screen RAND_load_file RAND_write_file RAND_file_name RAND_egd
-# RAND_set_rand_method RAND_get_rand_method RAND_SSLeay RAND_cleanup
-
-# buffer.pod -> BUF_MEM_new.pod
-# BUF_MEM_free BUF_MEM_grow BUF_strdup
-
-# rc4.pod -> RC4.pod
-# RC4_set_key
-
-# threads.pod -> CRYPTO_set_locking_callback.pod
-# CRYPTO_set_id_callback CRYPTO_num_locks
-
-# ripemd.pod -> RIPEMD160.pod
-# RIPEMD160_Init RIPEMD160_Update RIPEMD160_Final
-
-# sha.pod -> SHA1.pod
-
-# md5.pod -> MD5.pod
-
-# hmac.pod -> HMAC.pod
-
-# des.pod -> des_random_key, des_set_key, des_key_sched, des_set_key_checked,
-# des_set_key_unchecked, des_set_odd_parity, des_is_weak_key, des_ecb_encrypt,
-# des_ecb2_encrypt, des_ecb3_encrypt, des_ncbc_encrypt, des_cfb_encrypt,
-# des_ofb_encrypt, des_pcbc_encrypt, des_cfb64_encrypt, des_ofb64_encrypt,
-# des_xcbc_encrypt, des_ede2_cbc_encrypt, des_ede2_cfb64_encrypt,
-# des_ede2_ofb64_encrypt, des_ede3_cbc_encrypt, des_ede3_cbcm_encrypt,
-# des_ede3_cfb64_encrypt, des_ede3_ofb64_encrypt, des_read_password,
-# des_read_2passwords, des_read_pw_string, des_cbc_cksum, des_quad_cksum,
-# des_string_to_key, des_string_to_2keys, des_fcrypt, des_crypt,
-# des_enc_read, des_enc_write
 
 .for page src in \
         BF_set_key blowfish \
@@ -241,7 +194,6 @@ PSALL=	${MANALL:S/.cat1/.ps1/g:S/.cat2/.ps2/g:S/.cat3/.ps3/g:S/.cat4/.ps4/g:S/.c
         RC4 rc4 \
         RIPEMD160 ripemd \
         SHA1 sha \
-        des_random_key des
 
 ${page}.cat3: ${src}.pod
         ${POD2MAN} --section=3 --name=${page:U} ${.ALLSRC} | \
@@ -254,6 +206,13 @@ ${page}.ps3: ${src}.pod
 .endfor
 
 MLINKS+=\
+        BF_set_key.3 BF_cbc_encrypt.3 \
+        BF_set_key.3 BF_cfb64_encrypt.3 \
+        BF_set_key.3 BF_decrypt.3 \
+        BF_set_key.3 BF_ecb_encrypt.3 \
+        BF_set_key.3 BF_encrypt.3 \
+        BF_set_key.3 BF_ofb64_encrypt.3 \
+        BF_set_key.3 BF_options.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 \
@@ -382,17 +341,12 @@ MLINKS+=\
         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_digestbyname.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 \
@@ -406,7 +360,6 @@ MLINKS+=\
         EVP_DigestInit.3 OBJ_obj2nid.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 \
@@ -421,7 +374,6 @@ MLINKS+=\
         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 \
@@ -431,8 +383,6 @@ MLINKS+=\
         EVP_EncryptInit.3 EVP_EncryptFinal.3 \
         EVP_EncryptInit.3 EVP_EncryptUpdate.3 \
         EVP_EncryptInit.3 EVP_get_cipherbyname.3 \
-        EVP_EncryptInit.3 EVP_get_cipherbyname.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 \
@@ -536,16 +486,11 @@ MLINKS+=\
         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_load_file.3 RAND_write_file.3 \
-        RAND_set_rand_method.3 RAND_SSLeay.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 \
@@ -564,17 +509,11 @@ MLINKS+=\
         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 \
@@ -723,15 +662,6 @@ MLINKS+=\
         SSL_want.3 SSL_want_write.3 \
         SSL_want.3 SSL_want_x509_lookup.3 \
         acss.3 acss_setkey.3 \
-        BF_set_key.3 BF_cbc.3 \
-        BF_set_key.3 BF_cbc_encrypt.3 \
-        BF_set_key.3 BF_cfb64_encrypt.3 \
-        BF_set_key.3 BF_decrypt.3 \
-        BF_set_key.3 BF_ecb.3 \
-        BF_set_key.3 BF_ecb_encrypt.3 \
-        BF_set_key.3 BF_encrypt.3 \
-        BF_set_key.3 BF_ofb64_encrypt.3 \
-        BF_set_key.3 BF_options.3 \
         bn_internal.3 bn_add_words.3 \
         bn_internal.3 bn_check_top.3 \
         bn_internal.3 bn_cmp_words.3 \
@@ -771,41 +701,6 @@ MLINKS+=\
         d2i_RSAPublicKey.3 i2d_RSAPrivateKey.3 \
         d2i_RSAPublicKey.3 i2d_RSAPublicKey.3 \
         d2i_SSL_SESSION.3 i2d_SSL_SESSION.3 \
-        des_random_key.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 \