svn commit: r290947 - in head: crypto/openssl/doc/crypto secure/lib/libcrypto secure/lib/libcrypto/man
Jung-uk Kim
jkim at FreeBSD.org
Mon Nov 16 21:36:17 UTC 2015
Author: jkim
Date: Mon Nov 16 21:36:15 2015
New Revision: 290947
URL: https://svnweb.freebsd.org/changeset/base/290947
Log:
Remove duplicate manual pages.
Reported by: brd
Deleted:
head/secure/lib/libcrypto/man/SSLeay_version.3
Modified:
head/crypto/openssl/doc/crypto/EVP_EncryptInit.pod
head/crypto/openssl/doc/crypto/EVP_PKEY_CTX_ctrl.pod
head/secure/lib/libcrypto/Makefile.inc
head/secure/lib/libcrypto/Makefile.man
head/secure/lib/libcrypto/man/EVP_EncryptInit.3
head/secure/lib/libcrypto/man/EVP_PKEY_CTX_ctrl.3
Modified: head/crypto/openssl/doc/crypto/EVP_EncryptInit.pod
==============================================================================
--- head/crypto/openssl/doc/crypto/EVP_EncryptInit.pod Mon Nov 16 21:13:57 2015 (r290946)
+++ head/crypto/openssl/doc/crypto/EVP_EncryptInit.pod Mon Nov 16 21:36:15 2015 (r290947)
@@ -20,7 +20,7 @@ EVP_CIPHER_CTX_set_padding, EVP_enc_nul
EVP_des_cfb, EVP_des_ofb, EVP_des_ede_cbc, EVP_des_ede, EVP_des_ede_ofb,
EVP_des_ede_cfb, EVP_des_ede3_cbc, EVP_des_ede3, EVP_des_ede3_ofb,
EVP_des_ede3_cfb, EVP_desx_cbc, EVP_rc4, EVP_rc4_40, EVP_idea_cbc,
-EVP_idea_ecb, EVP_idea_cfb, EVP_idea_ofb, EVP_idea_cbc, EVP_rc2_cbc,
+EVP_idea_ecb, EVP_idea_cfb, EVP_idea_ofb, EVP_rc2_cbc,
EVP_rc2_ecb, EVP_rc2_cfb, EVP_rc2_ofb, EVP_rc2_40_cbc, EVP_rc2_64_cbc,
EVP_bf_cbc, EVP_bf_ecb, EVP_bf_cfb, EVP_bf_ofb, EVP_cast5_cbc,
EVP_cast5_ecb, EVP_cast5_cfb, EVP_cast5_ofb, EVP_rc5_32_12_16_cbc,
@@ -315,7 +315,7 @@ RC4 stream cipher. This is a variable ke
RC4 stream cipher with 40 bit key length. This is obsolete and new code should use EVP_rc4()
and the EVP_CIPHER_CTX_set_key_length() function.
-=item EVP_idea_cbc() EVP_idea_ecb(void), EVP_idea_cfb(void), EVP_idea_ofb(void), EVP_idea_cbc(void)
+=item EVP_idea_cbc() EVP_idea_ecb(void), EVP_idea_cfb(void), EVP_idea_ofb(void)
IDEA encryption algorithm in CBC, ECB, CFB and OFB modes respectively.
Modified: head/crypto/openssl/doc/crypto/EVP_PKEY_CTX_ctrl.pod
==============================================================================
--- head/crypto/openssl/doc/crypto/EVP_PKEY_CTX_ctrl.pod Mon Nov 16 21:13:57 2015 (r290946)
+++ head/crypto/openssl/doc/crypto/EVP_PKEY_CTX_ctrl.pod Mon Nov 16 21:36:15 2015 (r290947)
@@ -2,7 +2,7 @@
=head1 NAME
-EVP_PKEY_CTX_ctrl, EVP_PKEY_CTX_ctrl_str, EVP_PKEY_get_default_digest_nid,
+EVP_PKEY_CTX_ctrl, EVP_PKEY_CTX_ctrl_str,
EVP_PKEY_CTX_set_signature_md, EVP_PKEY_CTX_set_rsa_padding,
EVP_PKEY_CTX_set_rsa_pss_saltlen, EVP_PKEY_CTX_set_rsa_rsa_keygen_bits,
EVP_PKEY_CTX_set_rsa_keygen_pubexp, EVP_PKEY_CTX_set_dsa_paramgen_bits,
@@ -19,8 +19,6 @@ EVP_PKEY_CTX_set_ec_paramgen_curve_nid -
int EVP_PKEY_CTX_ctrl_str(EVP_PKEY_CTX *ctx, const char *type,
const char *value);
- int EVP_PKEY_get_default_digest_nid(EVP_PKEY *pkey, int *pnid);
-
#include <openssl/rsa.h>
int EVP_PKEY_CTX_set_signature_md(EVP_PKEY_CTX *ctx, const EVP_MD *md);
Modified: head/secure/lib/libcrypto/Makefile.inc
==============================================================================
--- head/secure/lib/libcrypto/Makefile.inc Mon Nov 16 21:13:57 2015 (r290946)
+++ head/secure/lib/libcrypto/Makefile.inc Mon Nov 16 21:36:15 2015 (r290947)
@@ -45,7 +45,7 @@ MANDIR= ${SHAREDIR}/openssl/man/man
.if defined(LIB)
_docs= ${LIB}
-_skip= des_modes
+_skip= SSLeay_version des_modes
_sec= 3
.else
_docs= apps
@@ -72,13 +72,13 @@ man-makefile-update:
${.CURDIR}/Makefile.man
for i in ${LCRYPTO_DOC}/${_docs}/*.pod; do \
fn=`basename $$i .pod`; \
- if [ "$$fn" != "${_skip}" ]; then \
+ if ! echo ' ${_skip} ' | grep -q " $$fn "; then \
${ECHO} "MAN+= $$fn.${_sec}" >> ${.CURDIR}/Makefile.man; \
fi; \
done
for i in ${LCRYPTO_DOC}/${_docs}/*.pod; do \
fn=`basename $$i .pod`; \
- if [ "$$fn" != "${_skip}" ]; then \
+ if ! echo ' ${_skip} ' | grep -q " $$fn "; then \
perl ${LCRYPTO_SRC}/util/extract-names.pl < $$i | \
awk "/^$$fn\$$/ { next; } \
{ print \"MLINKS+= $$fn.${_sec} \" \$$1 \".${_sec}\" }" >> \
Modified: head/secure/lib/libcrypto/Makefile.man
==============================================================================
--- head/secure/lib/libcrypto/Makefile.man Mon Nov 16 21:13:57 2015 (r290946)
+++ head/secure/lib/libcrypto/Makefile.man Mon Nov 16 21:36:15 2015 (r290947)
@@ -160,7 +160,6 @@ MAN+= SMIME_read_CMS.3
MAN+= SMIME_read_PKCS7.3
MAN+= SMIME_write_CMS.3
MAN+= SMIME_write_PKCS7.3
-MAN+= SSLeay_version.3
MAN+= X509_NAME_ENTRY_get_object.3
MAN+= X509_NAME_add_entry_by_txt.3
MAN+= X509_NAME_get_index_by_NID.3
@@ -695,7 +694,6 @@ MLINKS+= EVP_EncryptInit.3 EVP_idea_cbc.
MLINKS+= EVP_EncryptInit.3 EVP_idea_ecb.3
MLINKS+= EVP_EncryptInit.3 EVP_idea_cfb.3
MLINKS+= EVP_EncryptInit.3 EVP_idea_ofb.3
-MLINKS+= EVP_EncryptInit.3 EVP_idea_cbc.3
MLINKS+= EVP_EncryptInit.3 EVP_rc2_cbc.3
MLINKS+= EVP_EncryptInit.3 EVP_rc2_ecb.3
MLINKS+= EVP_EncryptInit.3 EVP_rc2_cfb.3
@@ -723,7 +721,6 @@ MLINKS+= EVP_EncryptInit.3 EVP_aes_256_c
MLINKS+= EVP_OpenInit.3 EVP_OpenUpdate.3
MLINKS+= EVP_OpenInit.3 EVP_OpenFinal.3
MLINKS+= EVP_PKEY_CTX_ctrl.3 EVP_PKEY_CTX_ctrl_str.3
-MLINKS+= EVP_PKEY_CTX_ctrl.3 EVP_PKEY_get_default_digest_nid.3
MLINKS+= EVP_PKEY_CTX_ctrl.3 EVP_PKEY_CTX_set_signature_md.3
MLINKS+= EVP_PKEY_CTX_ctrl.3 EVP_PKEY_CTX_set_rsa_padding.3
MLINKS+= EVP_PKEY_CTX_ctrl.3 EVP_PKEY_CTX_set_rsa_pss_saltlen.3
Modified: head/secure/lib/libcrypto/man/EVP_EncryptInit.3
==============================================================================
--- head/secure/lib/libcrypto/man/EVP_EncryptInit.3 Mon Nov 16 21:13:57 2015 (r290946)
+++ head/secure/lib/libcrypto/man/EVP_EncryptInit.3 Mon Nov 16 21:36:15 2015 (r290947)
@@ -157,7 +157,7 @@ EVP_CIPHER_CTX_set_padding, EVP_enc_nul
EVP_des_cfb, EVP_des_ofb, EVP_des_ede_cbc, EVP_des_ede, EVP_des_ede_ofb,
EVP_des_ede_cfb, EVP_des_ede3_cbc, EVP_des_ede3, EVP_des_ede3_ofb,
EVP_des_ede3_cfb, EVP_desx_cbc, EVP_rc4, EVP_rc4_40, EVP_idea_cbc,
-EVP_idea_ecb, EVP_idea_cfb, EVP_idea_ofb, EVP_idea_cbc, EVP_rc2_cbc,
+EVP_idea_ecb, EVP_idea_cfb, EVP_idea_ofb, EVP_rc2_cbc,
EVP_rc2_ecb, EVP_rc2_cfb, EVP_rc2_ofb, EVP_rc2_40_cbc, EVP_rc2_64_cbc,
EVP_bf_cbc, EVP_bf_ecb, EVP_bf_cfb, EVP_bf_ofb, EVP_cast5_cbc,
EVP_cast5_ecb, EVP_cast5_cfb, EVP_cast5_ofb, EVP_rc5_32_12_16_cbc,
@@ -440,8 +440,8 @@ Three key triple \s-1DES\s0 in \s-1CBC,
.IX Item "EVP_rc4_40(void)"
\&\s-1RC4\s0 stream cipher with 40 bit key length. This is obsolete and new code should use \fIEVP_rc4()\fR
and the \fIEVP_CIPHER_CTX_set_key_length()\fR function.
-.IP "\fIEVP_idea_cbc()\fR EVP_idea_ecb(void), EVP_idea_cfb(void), EVP_idea_ofb(void), EVP_idea_cbc(void)" 4
-.IX Item "EVP_idea_cbc() EVP_idea_ecb(void), EVP_idea_cfb(void), EVP_idea_ofb(void), EVP_idea_cbc(void)"
+.IP "\fIEVP_idea_cbc()\fR EVP_idea_ecb(void), EVP_idea_cfb(void), EVP_idea_ofb(void)" 4
+.IX Item "EVP_idea_cbc() EVP_idea_ecb(void), EVP_idea_cfb(void), EVP_idea_ofb(void)"
\&\s-1IDEA\s0 encryption algorithm in \s-1CBC, ECB, CFB\s0 and \s-1OFB\s0 modes respectively.
.IP "EVP_rc2_cbc(void), EVP_rc2_ecb(void), EVP_rc2_cfb(void), EVP_rc2_ofb(void)" 4
.IX Item "EVP_rc2_cbc(void), EVP_rc2_ecb(void), EVP_rc2_cfb(void), EVP_rc2_ofb(void)"
Modified: head/secure/lib/libcrypto/man/EVP_PKEY_CTX_ctrl.3
==============================================================================
--- head/secure/lib/libcrypto/man/EVP_PKEY_CTX_ctrl.3 Mon Nov 16 21:13:57 2015 (r290946)
+++ head/secure/lib/libcrypto/man/EVP_PKEY_CTX_ctrl.3 Mon Nov 16 21:36:15 2015 (r290947)
@@ -139,7 +139,7 @@
.if n .ad l
.nh
.SH "NAME"
-EVP_PKEY_CTX_ctrl, EVP_PKEY_CTX_ctrl_str, EVP_PKEY_get_default_digest_nid,
+EVP_PKEY_CTX_ctrl, EVP_PKEY_CTX_ctrl_str,
EVP_PKEY_CTX_set_signature_md, EVP_PKEY_CTX_set_rsa_padding,
EVP_PKEY_CTX_set_rsa_pss_saltlen, EVP_PKEY_CTX_set_rsa_rsa_keygen_bits,
EVP_PKEY_CTX_set_rsa_keygen_pubexp, EVP_PKEY_CTX_set_dsa_paramgen_bits,
@@ -156,8 +156,6 @@ EVP_PKEY_CTX_set_ec_paramgen_curve_nid \
\& int EVP_PKEY_CTX_ctrl_str(EVP_PKEY_CTX *ctx, const char *type,
\& const char *value);
\&
-\& int EVP_PKEY_get_default_digest_nid(EVP_PKEY *pkey, int *pnid);
-\&
\& #include <openssl/rsa.h>
\&
\& int EVP_PKEY_CTX_set_signature_md(EVP_PKEY_CTX *ctx, const EVP_MD *md);
More information about the svn-src-head
mailing list