[Midnightbsd-cvs] src [12155] trunk/secure/lib/libcrypto: update build

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sun Jan 20 00:39:50 EST 2019


Revision: 12155
          http://svnweb.midnightbsd.org/src/?rev=12155
Author:   laffer1
Date:     2019-01-20 00:39:21 -0500 (Sun, 20 Jan 2019)
Log Message:
-----------
update build

Modified Paths:
--------------
    trunk/secure/lib/libcrypto/Makefile
    trunk/secure/lib/libcrypto/Makefile.asm
    trunk/secure/lib/libcrypto/Makefile.inc
    trunk/secure/lib/libcrypto/Makefile.man
    trunk/secure/lib/libcrypto/engines/Makefile
    trunk/secure/lib/libcrypto/engines/Makefile.inc
    trunk/secure/lib/libcrypto/engines/lib4758cca/Makefile
    trunk/secure/lib/libcrypto/engines/libaep/Makefile
    trunk/secure/lib/libcrypto/engines/libatalla/Makefile
    trunk/secure/lib/libcrypto/engines/libchil/Makefile
    trunk/secure/lib/libcrypto/engines/libcswift/Makefile
    trunk/secure/lib/libcrypto/engines/libgost/Makefile
    trunk/secure/lib/libcrypto/engines/libnuron/Makefile
    trunk/secure/lib/libcrypto/engines/libsureware/Makefile
    trunk/secure/lib/libcrypto/engines/libubsec/Makefile
    trunk/secure/lib/libcrypto/opensslconf-arm.h.in
    trunk/secure/lib/libcrypto/opensslconf-mips.h.in
    trunk/secure/lib/libcrypto/opensslconf-powerpc.h.in
    trunk/secure/lib/libcrypto/opensslconf-sparc64.h.in
    trunk/secure/lib/libcrypto/opensslconf-x86.h.in

Property Changed:
----------------
    trunk/secure/lib/libcrypto/engines/Makefile.inc

Modified: trunk/secure/lib/libcrypto/Makefile
===================================================================
--- trunk/secure/lib/libcrypto/Makefile	2019-01-20 05:38:27 UTC (rev 12154)
+++ trunk/secure/lib/libcrypto/Makefile	2019-01-20 05:39:21 UTC (rev 12155)
@@ -7,7 +7,7 @@
 .include <bsd.own.mk>
 
 LIB=		crypto
-SHLIB_MAJOR=	7
+SHLIB_MAJOR=	8
 
 NO_LINT=
 
@@ -14,17 +14,22 @@
 .if exists(Makefile.man)
 .include "Makefile.man"
 .endif
+.include "Makefile.inc"
+
 .if defined(NOTYET)
 MAN+=	config.5 des_modes.7
 .endif
 
-.include "Makefile.inc"
-
 # base sources
-SRCS=	cpt_err.c cryptlib.c cversion.c ex_data.c mem.c mem_dbg.c o_dir.c \
-	o_fips.c o_init.c o_str.c o_time.c uid.c
-.if defined(ASM_amd64)
+SRCS=	cpt_err.c cryptlib.c cversion.c ex_data.c getenv.c mem.c mem_dbg.c \
+	o_dir.c o_fips.c o_init.c o_str.c o_time.c uid.c
+.if defined(ASM_aarch64)
+SRCS+=	arm64cpuid.S armcap.c mem_clr.c
+ACFLAGS.arm64cpuid.S=	-march=armv8-a+crypto
+.elif defined(ASM_amd64)
 SRCS+=	x86_64cpuid.S
+.elif defined(ASM_arm)
+SRCS+=	armcap.c armv4cpuid.S
 .elif defined(ASM_i386)
 SRCS+=	x86cpuid.S
 .else
@@ -34,9 +39,14 @@
 
 # aes
 SRCS+=	aes_cfb.c aes_ctr.c aes_ecb.c aes_ige.c aes_misc.c aes_ofb.c aes_wrap.c
-.if defined(ASM_amd64)
-SRCS+=	aes-x86_64.S aesni-sha1-x86_64.S aesni-x86_64.S bsaes-x86_64.S \
-	vpaes-x86_64.S
+.if defined(ASM_aarch64)
+SRCS+=	aes_cbc.c aes_core.c aesv8-armx.S
+ACFLAGS.aesv8-armx.S=	-march=armv8-a+crypto
+.elif defined(ASM_amd64)
+SRCS+=	aes-x86_64.S aesni-mb-x86_64.S aesni-sha1-x86_64.S \
+	aesni-sha256-x86_64.S aesni-x86_64.S bsaes-x86_64.S vpaes-x86_64.S
+.elif defined(ASM_arm)
+SRCS+= aes-armv4.S aes_cbc.c aesv8-armx.S bsaes-armv7.S
 .elif defined(ASM_i386)
 SRCS+=	aes-586.S aesni-x86.S vpaes-x86.S
 .else
@@ -84,8 +94,10 @@
 	bn_mont.c bn_mpi.c bn_mul.c bn_nist.c bn_prime.c bn_print.c bn_rand.c \
 	bn_recp.c bn_shift.c bn_sqr.c bn_sqrt.c bn_word.c bn_x931p.c
 .if defined(ASM_amd64)
-SRCS+=	modexp512-x86_64.S x86_64-gcc.c x86_64-gf2m.S x86_64-mont.S \
-	x86_64-mont5.S
+SRCS+=	rsaz-avx2.S rsaz-x86_64.S rsaz_exp.c x86_64-gcc.c x86_64-gf2m.S \
+	x86_64-mont.S x86_64-mont5.S
+.elif defined(ASM_arm)
+SRCS+=	armv4-mont.S armv4-gf2m.S bn_asm.c
 .elif defined(ASM_i386)
 SRCS+=	bn-586.S co-586.S x86-gf2m.S x86-mont.S
 .else
@@ -118,7 +130,8 @@
 
 # cms
 SRCS+=	cms_asn1.c cms_att.c cms_dd.c cms_enc.c cms_env.c cms_err.c \
-	cms_ess.c cms_io.c cms_lib.c cms_pwri.c cms_sd.c cms_smime.c
+	cms_ess.c cms_io.c cms_kari.c cms_lib.c cms_pwri.c cms_sd.c \
+	cms_smime.c
 INCS+=	cms.h
 
 # comp
@@ -143,8 +156,8 @@
 INCS+=	des.h des_old.h
 
 # dh
-SRCS+=	dh_ameth.c dh_asn1.c dh_check.c dh_depr.c dh_err.c dh_gen.c dh_key.c \
-	dh_lib.c dh_pmeth.c dh_prn.c
+SRCS+=	dh_ameth.c dh_asn1.c dh_check.c dh_depr.c dh_err.c dh_gen.c dh_kdf.c \
+	dh_key.c dh_lib.c dh_pmeth.c dh_prn.c dh_rfc5114.c
 INCS+=	dh.h
 
 # dsa
@@ -161,10 +174,13 @@
 	ec_curve.c ec_cvt.c ec_err.c ec_key.c ec_lib.c ec_mult.c ec_oct.c \
 	ec_pmeth.c ec_print.c eck_prn.c ecp_mont.c ecp_nist.c ecp_oct.c \
 	ecp_smpl.c
+.if defined(ASM_amd64)
+SRCS+=	ecp_nistz256.c ecp_nistz256-x86_64.S
+.endif
 INCS+=	ec.h
 
 # ecdh
-SRCS+=	ech_err.c ech_key.c ech_lib.c ech_ossl.c
+SRCS+=	ech_err.c ech_kdf.c ech_key.c ech_lib.c ech_ossl.c
 INCS+=	ecdh.h
 
 # ecdsa
@@ -174,9 +190,8 @@
 # engine
 SRCS+=	eng_all.c eng_cnf.c eng_cryptodev.c eng_ctrl.c eng_dyn.c eng_err.c \
 	eng_fat.c eng_init.c eng_lib.c eng_list.c eng_openssl.c eng_pkey.c \
-	eng_rdrand.c eng_rsax.c eng_table.c tb_asnmth.c tb_cipher.c tb_dh.c \
-	tb_digest.c tb_dsa.c tb_ecdh.c tb_ecdsa.c tb_pkmeth.c tb_rand.c \
-	tb_rsa.c tb_store.c
+	eng_rdrand.c eng_table.c tb_asnmth.c tb_cipher.c tb_dh.c tb_digest.c \
+	tb_dsa.c tb_ecdh.c tb_ecdsa.c tb_pkmeth.c tb_rand.c tb_rsa.c tb_store.c
 INCS+=	engine.h
 
 # err
@@ -185,14 +200,14 @@
 
 # evp
 SRCS+=	bio_b64.c bio_enc.c bio_md.c bio_ok.c c_all.c c_allc.c c_alld.c \
-	digest.c e_aes.c e_aes_cbc_hmac_sha1.c e_bf.c e_camellia.c e_cast.c \
-	e_des.c e_des3.c e_idea.c e_null.c e_old.c e_rc2.c e_rc4.c \
-	e_rc4_hmac_md5.c e_rc5.c e_seed.c e_xcbc_d.c encode.c evp_acnf.c \
-	evp_cnf.c evp_enc.c evp_err.c evp_key.c evp_lib.c evp_pbe.c \
-	evp_pkey.c m_dss.c m_dss1.c m_ecdsa.c m_md4.c m_md5.c m_mdc2.c \
-	m_null.c m_ripemd.c m_sha.c m_sha1.c m_sigver.c m_wp.c names.c \
-	p5_crpt.c p5_crpt2.c p_dec.c p_enc.c p_lib.c p_open.c p_seal.c \
-	p_sign.c p_verify.c pmeth_fn.c pmeth_gn.c pmeth_lib.c
+	digest.c e_aes.c e_aes_cbc_hmac_sha1.c e_aes_cbc_hmac_sha256.c e_bf.c \
+	e_camellia.c e_cast.c e_des.c e_des3.c e_idea.c e_null.c e_old.c \
+	e_rc2.c e_rc4.c e_rc4_hmac_md5.c e_rc5.c e_seed.c e_xcbc_d.c encode.c \
+	evp_acnf.c evp_cnf.c evp_enc.c evp_err.c evp_key.c evp_lib.c \
+	evp_pbe.c evp_pkey.c m_dss.c m_dss1.c m_ecdsa.c m_md4.c m_md5.c \
+	m_mdc2.c m_null.c m_ripemd.c m_sha.c m_sha1.c m_sigver.c m_wp.c \
+	names.c p5_crpt.c p5_crpt2.c p_dec.c p_enc.c p_lib.c p_open.c \
+	p_seal.c p_sign.c p_verify.c pmeth_fn.c pmeth_gn.c pmeth_lib.c
 INCS+=	evp.h
 
 # hmac
@@ -228,9 +243,15 @@
 INCS+=	mdc2.h
 
 # modes
-SRCS+=	cbc128.c ccm128.c cfb128.c ctr128.c cts128.c gcm128.c ofb128.c xts128.c
-.if defined(ASM_amd64)
-SRCS+=	ghash-x86_64.S
+SRCS+=	cbc128.c ccm128.c cfb128.c ctr128.c cts128.c gcm128.c ofb128.c \
+	wrap128.c xts128.c
+.if defined(ASM_aarch64)
+SRCS+=	ghashv8-armx.S
+ACFLAGS.ghashv8-armx.S=	-march=armv8-a+crypto
+.elif defined(ASM_amd64)
+SRCS+=	aesni-gcm-x86_64.S ghash-x86_64.S
+.elif defined(ASM_arm)
+SRCS+=	ghash-armv4.S ghashv8-armx.S
 .elif defined(ASM_i386)
 SRCS+=	ghash-x86.S
 .endif
@@ -313,8 +334,13 @@
 
 # sha
 SRCS+=	sha1_one.c sha1dgst.c sha256.c sha512.c sha_dgst.c sha_one.c
-.if defined(ASM_amd64)
-SRCS+=	sha1-x86_64.S sha256-x86_64.S sha512-x86_64.S
+.if defined(ASM_aarch64)
+SRCS+=	sha1-armv8.S sha256-armv8.S sha512-armv8.S
+.elif defined(ASM_amd64)
+SRCS+=	sha1-mb-x86_64.S sha1-x86_64.S sha256-mb-x86_64.S sha256-x86_64.S \
+	sha512-x86_64.S
+.elif defined(ASM_arm)
+SRCS+=	sha1-armv4-large.S sha256-armv4.S sha512-armv4.S
 .elif defined(ASM_i386)
 SRCS+=	sha1-586.S sha256-586.S sha512-586.S
 .endif
@@ -366,7 +392,7 @@
 	v3_bitst.c v3_conf.c v3_cpols.c v3_crld.c v3_enum.c v3_extku.c \
 	v3_genn.c v3_ia5.c v3_info.c v3_int.c v3_lib.c v3_ncons.c v3_ocsp.c \
 	v3_pci.c v3_pcia.c v3_pcons.c v3_pku.c v3_pmaps.c v3_prn.c v3_purp.c \
-	v3_skey.c v3_sxnet.c v3_utl.c v3err.c
+	v3_scts.c v3_skey.c v3_sxnet.c v3_utl.c v3err.c
 INCS+=	x509v3.h
 
 SRCS+=	buildinf.h
@@ -375,6 +401,8 @@
 
 CSTD=	gnu89
 
+CFLAGS+=	-I${.OBJDIR}
+CFLAGS+=	-I${LCRYPTO_SRC}/crypto
 CFLAGS+=	-I${LCRYPTO_SRC}/crypto/asn1
 CFLAGS+=	-I${LCRYPTO_SRC}/crypto/evp
 CFLAGS+=	-I${LCRYPTO_SRC}/crypto/modes

Modified: trunk/secure/lib/libcrypto/Makefile.asm
===================================================================
--- trunk/secure/lib/libcrypto/Makefile.asm	2019-01-20 05:38:27 UTC (rev 12154)
+++ trunk/secure/lib/libcrypto/Makefile.asm	2019-01-20 05:39:21 UTC (rev 12155)
@@ -7,40 +7,82 @@
 
 .include "Makefile.inc"
 
-.if defined(ASM_amd64)
+.if defined(ASM_aarch64)
 
 .PATH:	${LCRYPTO_SRC}/crypto \
 	${LCRYPTO_SRC}/crypto/aes/asm \
+	${LCRYPTO_SRC}/crypto/modes/asm \
+	${LCRYPTO_SRC}/crypto/sha/asm
+
+PERLPATH=	-I${LCRYPTO_SRC}/crypto/perlasm
+
+# aes
+SRCS=	aesv8-armx.pl
+
+# modes
+SRCS+=	ghashv8-armx.pl
+
+# sha
+SRCS+=	sha1-armv8.pl sha512-armv8.pl
+
+ASM=	${SRCS:R:S/$/.S/} sha256-armv8.S
+
+all:	${ASM}
+
+CLEANFILES=	${ASM} ${SRCS:R:S/$/.s/} sha256-armv8.s
+.SUFFIXES:	.pl
+
+sha256-armv8.S:	sha512-armv8.pl
+	env CC=cc perl ${.ALLSRC} 64 ${.TARGET:R:S/$/.s/}
+	( echo '/* $$'FreeBSD'$$ */' ;\
+	echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\
+	cat ${.TARGET:R:S/$/.s/}) > ${.TARGET}
+
+.pl.S:
+	env CC=cc perl ${.IMPSRC} 64 ${.TARGET:R:S/$/.s/}
+	( echo '/* $$'FreeBSD'$$ */' ;\
+	echo '/* Do not modify. This file is auto-generated from ${.IMPSRC:T:R:S/$/.pl/}. */' ;\
+	cat ${.TARGET:R:S/$/.s/}) > ${.TARGET}
+
+.elif defined(ASM_amd64)
+
+.PATH:	${LCRYPTO_SRC}/crypto \
+	${LCRYPTO_SRC}/crypto/aes/asm \
 	${LCRYPTO_SRC}/crypto/bn/asm \
 	${LCRYPTO_SRC}/crypto/camellia/asm \
+	${LCRYPTO_SRC}/crypto/ec/asm \
 	${LCRYPTO_SRC}/crypto/md5/asm \
 	${LCRYPTO_SRC}/crypto/modes/asm \
 	${LCRYPTO_SRC}/crypto/rc4/asm \
-	${LCRYPTO_SRC}/crypto/rc5/asm \
 	${LCRYPTO_SRC}/crypto/sha/asm \
 	${LCRYPTO_SRC}/crypto/whrlpool/asm
 
 # aes
-SRCS=	aes-x86_64.pl aesni-sha1-x86_64.pl aesni-x86_64.pl bsaes-x86_64.pl \
+SRCS=	aes-x86_64.pl aesni-mb-x86_64.pl aesni-sha1-x86_64.pl \
+	aesni-sha256-x86_64.pl aesni-x86_64.pl bsaes-x86_64.pl \
 	vpaes-x86_64.pl
 
 # bn
-SRCS+=	modexp512-x86_64.pl x86_64-gf2m.pl x86_64-mont.pl x86_64-mont5.pl
+SRCS+=	rsaz-avx2.pl rsaz-x86_64.pl x86_64-gf2m.pl x86_64-mont.pl \
+	x86_64-mont5.pl
 
 # camellia
 SRCS+=	cmll-x86_64.pl
 
+# ec
+SRCS+=	ecp_nistz256-x86_64.pl
+
 # md5
 SRCS+=	md5-x86_64.pl
 
 # modes
-SRCS+=	ghash-x86_64.pl
+SRCS+=	aesni-gcm-x86_64.pl ghash-x86_64.pl
 
 # rc4
 SRCS+=	rc4-md5-x86_64.pl rc4-x86_64.pl
 
 # sha
-SRCS+=	sha1-x86_64.pl
+SRCS+=	sha1-mb-x86_64.pl sha1-x86_64.pl sha256-mb-x86_64.pl
 
 # whrlpool
 SRCS+=	wp-x86_64.pl
@@ -60,8 +102,8 @@
 .SUFFIXES:	.pl
 
 .pl.S:
-	( echo '# $$'FreeBSD'$$' ;\
-	echo '# Do not modify. This file is auto-generated from ${.IMPSRC:T}.' ;\
+	( echo '/* $$'MidnightBSD'$$ */' ;\
+	echo '/* Do not modify. This file is auto-generated from ${.IMPSRC:T}. */' ;\
 	env CC=cc perl ${.IMPSRC} elf ) > ${.TARGET}
 
 ${SHA_TMP}: ${SHA_SRC}
@@ -69,11 +111,51 @@
 
 .for s in ${SHA_ASM}
 ${s}.S: ${s}.s
-	( echo '	# $$'FreeBSD'$$' ;\
-	echo '	# Do not modify. This file is auto-generated from ${SHA_SRC}.' ;\
+	( echo '/* $$'MidnightBSD'$$ */' ;\
+	echo '/* Do not modify. This file is auto-generated from ${SHA_SRC}. */' ;\
 	cat ${s}.s ) > ${.TARGET}
 .endfor
 
+.elif defined(ASM_arm)
+
+.PATH:	${LCRYPTO_SRC}/crypto \
+	${LCRYPTO_SRC}/crypto/aes/asm \
+	${LCRYPTO_SRC}/crypto/bn/asm \
+	${LCRYPTO_SRC}/crypto/modes/asm \
+	${LCRYPTO_SRC}/crypto/sha/asm
+
+PERLPATH=	-I${LCRYPTO_SRC}/crypto/perlasm
+
+# aes
+SRCS=	aesv8-armx.pl bsaes-armv7.pl
+
+# bn
+SRCS+=	armv4-mont.pl armv4-gf2m.pl
+
+# modes
+SRCS+=	ghash-armv4.pl ghashv8-armx.pl
+
+# sha
+SRCS+=	sha1-armv4-large.pl sha256-armv4.pl sha512-armv4.pl
+
+ASM=	aes-armv4.S ${SRCS:R:S/$/.S/}
+
+all:	${ASM}
+
+CLEANFILES=	${ASM} ${SRCS:R:S/$/.s/}
+.SUFFIXES:	.pl
+
+aes-armv4.S:	aes-armv4.pl
+	( echo '/* $$'FreeBSD'$$ */' ;\
+	echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T}. */' ;\
+	env CC=cc perl ${.ALLSRC} elf ) > ${.TARGET}
+
+.pl.S:
+	env CC=cc perl ${.IMPSRC} elf ${.TARGET:R:S/$/.s/}
+	( echo '/* $$'FreeBSD'$$ */' ;\
+	echo '/* Do not modify. This file is auto-generated from ${.IMPSRC:T:R:S/$/.pl/}. */' ;\
+	cat ${.TARGET:R:S/$/.s/}) > ${.TARGET}
+
 .elif defined(ASM_i386)
 
 .PATH:	${LCRYPTO_SRC}/crypto \
@@ -81,7 +163,6 @@
 	${LCRYPTO_SRC}/crypto/bf/asm \
 	${LCRYPTO_SRC}/crypto/bn/asm \
 	${LCRYPTO_SRC}/crypto/camellia/asm \
-	${LCRYPTO_SRC}/crypto/cast/asm \
 	${LCRYPTO_SRC}/crypto/des/asm \
 	${LCRYPTO_SRC}/crypto/md5/asm \
 	${LCRYPTO_SRC}/crypto/modes/asm \
@@ -105,9 +186,6 @@
 # camellia
 SRCS+=	cmll-x86.pl
 
-# cast
-SRCS+=	cast-586.pl
-
 # des
 SRCS+=	crypt586.pl des-586.pl
 
@@ -143,8 +221,8 @@
 .SUFFIXES:	.pl
 
 .pl.S:
-	( echo '# $$'FreeBSD'$$' ;\
-	echo '# Do not modify. This file is auto-generated from ${.IMPSRC:T}.' ;\
+	( echo '/* $$'MidnightBSD'$$ */' ;\
+	echo '/* Do not modify. This file is auto-generated from ${.IMPSRC:T}. */' ;\
 	echo '#ifdef PIC' ;\
 	env CC=cc perl ${PERLPATH} ${.IMPSRC} elf ${CFLAGS} -fpic -DPIC ;\
 	echo '#else' ;\

Modified: trunk/secure/lib/libcrypto/Makefile.inc
===================================================================
--- trunk/secure/lib/libcrypto/Makefile.inc	2019-01-20 05:38:27 UTC (rev 12154)
+++ trunk/secure/lib/libcrypto/Makefile.inc	2019-01-20 05:39:21 UTC (rev 12155)
@@ -1,11 +1,11 @@
 # $MidnightBSD$
-# $FreeBSD: stable/10/secure/lib/libcrypto/Makefile.inc 312851 2017-01-26 23:29:30Z jkim $
+# $FreeBSD: stable/11/secure/lib/libcrypto/Makefile.inc 340704 2018-11-20 21:26:25Z jkim $
 
 .include <bsd.own.mk>
 
 # OpenSSL version used for manual page generation
-OPENSSL_VER=	1.0.1u
-OPENSSL_DATE=	2016-09-22
+OPENSSL_VER=	1.0.2q
+OPENSSL_DATE=	2018-11-20
 
 LCRYPTO_SRC=	${.CURDIR}/../../../crypto/openssl
 LCRYPTO_DOC=	${.CURDIR}/../../../crypto/openssl/doc
@@ -22,7 +22,9 @@
 CFLAGS+=-DB_ENDIAN
 .endif
 
-.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386"
+.if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "arm"
+ASM_${MACHINE_CPUARCH}=
+.elif ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386"
 _ASM_AVX!=	{ \
 		    echo vzeroall | \
 		    ${CC} -x assembler -o /dev/null -c - 2> /dev/null; \
@@ -32,14 +34,22 @@
 .endif
 .endif
 
-.if defined(ASM_amd64)
+.if defined(ASM_aarch64)
+CFLAGS+=-DSHA1_ASM -DSHA256_ASM -DSHA512_ASM
+.elif defined(ASM_amd64)
 CFLAGS+=-DOPENSSL_IA32_SSE2
 CFLAGS+=-DAES_ASM -DBSAES_ASM -DVPAES_ASM
+CFLAGS+=-DECP_NISTZ256_ASM
 CFLAGS+=-DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_MONT5 -DOPENSSL_BN_ASM_GF2m
 CFLAGS+=-DMD5_ASM
 CFLAGS+=-DGHASH_ASM
 CFLAGS+=-DSHA1_ASM -DSHA256_ASM -DSHA512_ASM
 CFLAGS+=-DWHIRLPOOL_ASM
+.elif defined(ASM_arm)
+CFLAGS+=-DAES_ASM -DBSAES_ASM
+CFLAGS+=-DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_GF2m
+CFLAGS+=-DGHASH_ASM
+CFLAGS+=-DSHA1_ASM -DSHA256_ASM -DSHA512_ASM
 .elif defined(ASM_i386)
 CFLAGS+=-DOPENSSL_IA32_SSE2
 CFLAGS+=-DAES_ASM -DVPAES_ASM
@@ -55,11 +65,14 @@
 
 .if defined(LIB)
 _docs=	${LIB}
-_skip=	des_modes
+.if ${LIB} == crypto
+_docs+=	man3
+.endif
+_skip=	SSLeay_version des_modes
 _sec=	3
 .else
 _docs=	apps
-_skip=	config
+_skip=	c_rehash config
 _sec=	1
 .endif
 
@@ -67,7 +80,10 @@
 .for manpage in ${MAN}
 	@(sec=${manpage:E}; \
 	pod=${manpage:R}.pod; \
-	cp ${LCRYPTO_DOC}/${_docs}/$$pod .; \
+	for i in ${_docs}; do \
+		test -f ${LCRYPTO_DOC}/$$i/$$pod && \
+		cp ${LCRYPTO_DOC}/$$i/$$pod .; \
+	done; \
 	pod2man --section=$$sec --release="${OPENSSL_VER}" \
 	  --date="${OPENSSL_DATE}" --center="OpenSSL"  \
 	  $$pod > ${.CURDIR}/man/${manpage}; \
@@ -80,18 +96,23 @@
 	echo '# $$'FreeBSD'$$' >> ${.CURDIR}/Makefile.man
 	echo '# DO NOT EDIT: generated from man-makefile-update target' >> \
 	    ${.CURDIR}/Makefile.man
-	for i in ${LCRYPTO_DOC}/${_docs}/*.pod; do \
-		fn=`basename $$i .pod`; \
-		if [ "$$fn" != "${_skip}" ]; 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 \
-		perl ${LCRYPTO_SRC}/util/extract-names.pl < $$i | \
-		  awk "/^$$fn\$$/ { next; } \
-		  { print \"MLINKS+= $$fn.${_sec} \" \$$1 \".${_sec}\" }" >> \
-		  ${.CURDIR}/Makefile.man; \
-		fi; \
-	done
+	for i in ${_docs}; do \
+		for j in ${LCRYPTO_DOC}/$$i/*.pod; do \
+			test -f $$j || continue; \
+			fn=`basename $$j .pod`; \
+			if ! echo '${_skip}' | grep -qw "$$fn"; then \
+			${ECHO} "MAN+= $$fn.${_sec}"; \
+			fi; \
+		done; \
+	done | env LANG=C sort >> ${.CURDIR}/Makefile.man
+	for i in ${_docs}; do \
+		for j in ${LCRYPTO_DOC}/$$i/*.pod; do \
+			test -f $$j || continue; \
+			fn=`basename $$j .pod`; \
+			if ! echo '${_skip}' | grep -qw "$$fn"; then \
+			perl ${LCRYPTO_SRC}/util/extract-names.pl < $$j | \
+			  awk "/^$$fn\$$/ { next; } \
+			  { print \"MLINKS+= $$fn.${_sec} \" \$$1 \".${_sec}\" }"; \
+			fi; \
+		done; \
+	done | env LANG=C sort >> ${.CURDIR}/Makefile.man

Modified: trunk/secure/lib/libcrypto/Makefile.man
===================================================================
--- trunk/secure/lib/libcrypto/Makefile.man	2019-01-20 05:38:27 UTC (rev 12154)
+++ trunk/secure/lib/libcrypto/Makefile.man	2019-01-20 05:39:21 UTC (rev 12155)
@@ -5,6 +5,7 @@
 MAN+= ASN1_STRING_length.3
 MAN+= ASN1_STRING_new.3
 MAN+= ASN1_STRING_print_ex.3
+MAN+= ASN1_TIME_set.3
 MAN+= ASN1_generate_nconf.3
 MAN+= BIO_ctrl.3
 MAN+= BIO_f_base64.3
@@ -81,6 +82,12 @@
 MAN+= DSA_set_method.3
 MAN+= DSA_sign.3
 MAN+= DSA_size.3
+MAN+= EC_GFp_simple_method.3
+MAN+= EC_GROUP_copy.3
+MAN+= EC_GROUP_new.3
+MAN+= EC_KEY_new.3
+MAN+= EC_POINT_add.3
+MAN+= EC_POINT_new.3
 MAN+= ERR_GET_LIB.3
 MAN+= ERR_clear_error.3
 MAN+= ERR_error_string.3
@@ -106,6 +113,7 @@
 MAN+= EVP_PKEY_encrypt.3
 MAN+= EVP_PKEY_get_default_digest.3
 MAN+= EVP_PKEY_keygen.3
+MAN+= EVP_PKEY_meth_new.3
 MAN+= EVP_PKEY_new.3
 MAN+= EVP_PKEY_print_private.3
 MAN+= EVP_PKEY_set1_RSA.3
@@ -120,6 +128,7 @@
 MAN+= OPENSSL_VERSION_NUMBER.3
 MAN+= OPENSSL_config.3
 MAN+= OPENSSL_ia32cap.3
+MAN+= OPENSSL_instrument_bus.3
 MAN+= OPENSSL_load_builtin_modules.3
 MAN+= OpenSSL_add_all_algorithms.3
 MAN+= PEM_write_bio_CMS_stream.3
@@ -164,6 +173,9 @@
 MAN+= X509_STORE_CTX_set_verify_cb.3
 MAN+= X509_STORE_set_verify_cb_func.3
 MAN+= X509_VERIFY_PARAM_set_flags.3
+MAN+= X509_check_host.3
+MAN+= X509_check_private_key.3
+MAN+= X509_cmp_time.3
 MAN+= X509_new.3
 MAN+= X509_verify_cert.3
 MAN+= bio.3
@@ -176,6 +188,7 @@
 MAN+= d2i_CMS_ContentInfo.3
 MAN+= d2i_DHparams.3
 MAN+= d2i_DSAPublicKey.3
+MAN+= d2i_ECPKParameters.3
 MAN+= d2i_ECPrivateKey.3
 MAN+= d2i_PKCS8PrivateKey.3
 MAN+= d2i_PrivateKey.3
@@ -189,6 +202,7 @@
 MAN+= des.3
 MAN+= dh.3
 MAN+= dsa.3
+MAN+= ec.3
 MAN+= ecdsa.3
 MAN+= engine.3
 MAN+= err.3
@@ -211,215 +225,238 @@
 MAN+= ui_compat.3
 MAN+= x509.3
 MLINKS+= ASN1_OBJECT_new.3 ASN1_OBJECT_free.3
+MLINKS+= ASN1_STRING_length.3 ASN1_STRING_cmp.3
+MLINKS+= ASN1_STRING_length.3 ASN1_STRING_data.3
 MLINKS+= ASN1_STRING_length.3 ASN1_STRING_dup.3
-MLINKS+= ASN1_STRING_length.3 ASN1_STRING_cmp.3
+MLINKS+= ASN1_STRING_length.3 ASN1_STRING_length_set.3
 MLINKS+= ASN1_STRING_length.3 ASN1_STRING_set.3
-MLINKS+= ASN1_STRING_length.3 ASN1_STRING_length_set.3
+MLINKS+= ASN1_STRING_length.3 ASN1_STRING_to_UTF8.3
 MLINKS+= ASN1_STRING_length.3 ASN1_STRING_type.3
-MLINKS+= ASN1_STRING_length.3 ASN1_STRING_data.3
+MLINKS+= ASN1_STRING_new.3 ASN1_STRING_free.3
 MLINKS+= ASN1_STRING_new.3 ASN1_STRING_type_new.3
-MLINKS+= ASN1_STRING_new.3 ASN1_STRING_free.3
+MLINKS+= ASN1_STRING_print_ex.3 ASN1_STRING_print.3
 MLINKS+= ASN1_STRING_print_ex.3 ASN1_STRING_print_ex_fp.3
+MLINKS+= ASN1_TIME_set.3 ASN1_TIME_adj.3
+MLINKS+= ASN1_TIME_set.3 ASN1_TIME_check.3
+MLINKS+= ASN1_TIME_set.3 ASN1_TIME_diff.3
+MLINKS+= ASN1_TIME_set.3 ASN1_TIME_print.3
+MLINKS+= ASN1_TIME_set.3 ASN1_TIME_set_string.3
 MLINKS+= ASN1_generate_nconf.3 ASN1_generate_v3.3
 MLINKS+= BIO_ctrl.3 BIO_callback_ctrl.3
+MLINKS+= BIO_ctrl.3 BIO_ctrl_pending.3
+MLINKS+= BIO_ctrl.3 BIO_ctrl_wpending.3
+MLINKS+= BIO_ctrl.3 BIO_eof.3
+MLINKS+= BIO_ctrl.3 BIO_flush.3
+MLINKS+= BIO_ctrl.3 BIO_get_close.3
+MLINKS+= BIO_ctrl.3 BIO_get_info_callback.3
+MLINKS+= BIO_ctrl.3 BIO_int_ctrl.3
+MLINKS+= BIO_ctrl.3 BIO_pending.3
 MLINKS+= BIO_ctrl.3 BIO_ptr_ctrl.3
-MLINKS+= BIO_ctrl.3 BIO_int_ctrl.3
 MLINKS+= BIO_ctrl.3 BIO_reset.3
 MLINKS+= BIO_ctrl.3 BIO_seek.3
+MLINKS+= BIO_ctrl.3 BIO_set_close.3
+MLINKS+= BIO_ctrl.3 BIO_set_info_callback.3
 MLINKS+= BIO_ctrl.3 BIO_tell.3
-MLINKS+= BIO_ctrl.3 BIO_flush.3
-MLINKS+= BIO_ctrl.3 BIO_eof.3
-MLINKS+= BIO_ctrl.3 BIO_set_close.3
-MLINKS+= BIO_ctrl.3 BIO_get_close.3
-MLINKS+= BIO_ctrl.3 BIO_pending.3
 MLINKS+= BIO_ctrl.3 BIO_wpending.3
-MLINKS+= BIO_ctrl.3 BIO_ctrl_pending.3
-MLINKS+= BIO_ctrl.3 BIO_ctrl_wpending.3
-MLINKS+= BIO_ctrl.3 BIO_get_info_callback.3
-MLINKS+= BIO_ctrl.3 BIO_set_info_callback.3
+MLINKS+= BIO_f_cipher.3 BIO_get_cipher_ctx.3
+MLINKS+= BIO_f_cipher.3 BIO_get_cipher_status.3
 MLINKS+= BIO_f_cipher.3 BIO_set_cipher.3
-MLINKS+= BIO_f_cipher.3 BIO_get_cipher_status.3
-MLINKS+= BIO_f_cipher.3 BIO_get_cipher_ctx.3
-MLINKS+= BIO_f_md.3 BIO_set_md.3
 MLINKS+= BIO_f_md.3 BIO_get_md.3
 MLINKS+= BIO_f_md.3 BIO_get_md_ctx.3
+MLINKS+= BIO_f_md.3 BIO_set_md.3
+MLINKS+= BIO_f_ssl.3 BIO_get_num_renegotiates.3
+MLINKS+= BIO_f_ssl.3 BIO_get_ssl.3
+MLINKS+= BIO_f_ssl.3 BIO_new_buffer_ssl_connect.3
+MLINKS+= BIO_f_ssl.3 BIO_new_ssl.3
+MLINKS+= BIO_f_ssl.3 BIO_new_ssl_connect.3
 MLINKS+= BIO_f_ssl.3 BIO_set_ssl.3
-MLINKS+= BIO_f_ssl.3 BIO_get_ssl.3
 MLINKS+= BIO_f_ssl.3 BIO_set_ssl_mode.3
 MLINKS+= BIO_f_ssl.3 BIO_set_ssl_renegotiate_bytes.3
-MLINKS+= BIO_f_ssl.3 BIO_get_num_renegotiates.3
 MLINKS+= BIO_f_ssl.3 BIO_set_ssl_renegotiate_timeout.3
-MLINKS+= BIO_f_ssl.3 BIO_new_ssl.3
-MLINKS+= BIO_f_ssl.3 BIO_new_ssl_connect.3
-MLINKS+= BIO_f_ssl.3 BIO_new_buffer_ssl_connect.3
 MLINKS+= BIO_f_ssl.3 BIO_ssl_copy_session_id.3
 MLINKS+= BIO_f_ssl.3 BIO_ssl_shutdown.3
+MLINKS+= BIO_find_type.3 BIO_method_type.3
 MLINKS+= BIO_find_type.3 BIO_next.3
+MLINKS+= BIO_new.3 BIO_free.3
+MLINKS+= BIO_new.3 BIO_free_all.3
 MLINKS+= BIO_new.3 BIO_set.3
-MLINKS+= BIO_new.3 BIO_free.3
 MLINKS+= BIO_new.3 BIO_vfree.3
-MLINKS+= BIO_new.3 BIO_free_all.3
 MLINKS+= BIO_push.3 BIO_pop.3
-MLINKS+= BIO_read.3 BIO_write.3
 MLINKS+= BIO_read.3 BIO_gets.3
 MLINKS+= BIO_read.3 BIO_puts.3
-MLINKS+= BIO_s_accept.3 BIO_set_accept_port.3
+MLINKS+= BIO_read.3 BIO_write.3
+MLINKS+= BIO_s_accept.3 BIO_do_accept.3
 MLINKS+= BIO_s_accept.3 BIO_get_accept_port.3
-MLINKS+= BIO_s_accept.3 BIO_set_nbio_accept.3
+MLINKS+= BIO_s_accept.3 BIO_get_bind_mode.3
+MLINKS+= BIO_s_accept.3 BIO_new_accept.3
 MLINKS+= BIO_s_accept.3 BIO_set_accept_bios.3
+MLINKS+= BIO_s_accept.3 BIO_set_accept_port.3
 MLINKS+= BIO_s_accept.3 BIO_set_bind_mode.3
-MLINKS+= BIO_s_accept.3 BIO_get_bind_mode.3
-MLINKS+= BIO_s_accept.3 BIO_do_accept.3
-MLINKS+= BIO_s_bio.3 BIO_make_bio_pair.3
+MLINKS+= BIO_s_accept.3 BIO_set_nbio_accept.3
+MLINKS+= BIO_s_bio.3 BIO_ctrl_get_read_request.3
+MLINKS+= BIO_s_bio.3 BIO_ctrl_get_write_guarantee.3
+MLINKS+= BIO_s_bio.3 BIO_ctrl_reset_read_request.3
 MLINKS+= BIO_s_bio.3 BIO_destroy_bio_pair.3
-MLINKS+= BIO_s_bio.3 BIO_shutdown_wr.3
-MLINKS+= BIO_s_bio.3 BIO_set_write_buf_size.3
+MLINKS+= BIO_s_bio.3 BIO_get_read_request.3
 MLINKS+= BIO_s_bio.3 BIO_get_write_buf_size.3
+MLINKS+= BIO_s_bio.3 BIO_get_write_guarantee.3
+MLINKS+= BIO_s_bio.3 BIO_make_bio_pair.3
 MLINKS+= BIO_s_bio.3 BIO_new_bio_pair.3
-MLINKS+= BIO_s_bio.3 BIO_get_write_guarantee.3
-MLINKS+= BIO_s_bio.3 BIO_ctrl_get_write_guarantee.3
-MLINKS+= BIO_s_bio.3 BIO_get_read_request.3
-MLINKS+= BIO_s_bio.3 BIO_ctrl_get_read_request.3
-MLINKS+= BIO_s_bio.3 BIO_ctrl_reset_read_request.3
+MLINKS+= BIO_s_bio.3 BIO_set_write_buf_size.3
+MLINKS+= BIO_s_bio.3 BIO_shutdown_wr.3
+MLINKS+= BIO_s_connect.3 BIO_do_connect.3
+MLINKS+= BIO_s_connect.3 BIO_get_conn_hostname.3
+MLINKS+= BIO_s_connect.3 BIO_get_conn_int_port.3
+MLINKS+= BIO_s_connect.3 BIO_get_conn_ip.3
+MLINKS+= BIO_s_connect.3 BIO_get_conn_port.3
+MLINKS+= BIO_s_connect.3 BIO_new_connect.3
 MLINKS+= BIO_s_connect.3 BIO_set_conn_hostname.3
+MLINKS+= BIO_s_connect.3 BIO_set_conn_int_port.3
+MLINKS+= BIO_s_connect.3 BIO_set_conn_ip.3
 MLINKS+= BIO_s_connect.3 BIO_set_conn_port.3
-MLINKS+= BIO_s_connect.3 BIO_set_conn_ip.3
-MLINKS+= BIO_s_connect.3 BIO_set_conn_int_port.3
-MLINKS+= BIO_s_connect.3 BIO_get_conn_hostname.3
-MLINKS+= BIO_s_connect.3 BIO_get_conn_port.3
-MLINKS+= BIO_s_connect.3 BIO_get_conn_ip.3
-MLINKS+= BIO_s_connect.3 BIO_get_conn_int_port.3
 MLINKS+= BIO_s_connect.3 BIO_set_nbio.3
-MLINKS+= BIO_s_connect.3 BIO_do_connect.3
-MLINKS+= BIO_s_fd.3 BIO_set_fd.3
 MLINKS+= BIO_s_fd.3 BIO_get_fd.3
 MLINKS+= BIO_s_fd.3 BIO_new_fd.3
+MLINKS+= BIO_s_fd.3 BIO_set_fd.3
+MLINKS+= BIO_s_file.3 BIO_append_filename.3
+MLINKS+= BIO_s_file.3 BIO_get_fp.3
 MLINKS+= BIO_s_file.3 BIO_new_file.3
 MLINKS+= BIO_s_file.3 BIO_new_fp.3
+MLINKS+= BIO_s_file.3 BIO_read_filename.3
+MLINKS+= BIO_s_file.3 BIO_rw_filename.3
 MLINKS+= BIO_s_file.3 BIO_set_fp.3
-MLINKS+= BIO_s_file.3 BIO_get_fp.3
-MLINKS+= BIO_s_file.3 BIO_read_filename.3
 MLINKS+= BIO_s_file.3 BIO_write_filename.3
-MLINKS+= BIO_s_file.3 BIO_append_filename.3
-MLINKS+= BIO_s_file.3 BIO_rw_filename.3
-MLINKS+= BIO_s_mem.3 BIO_set_mem_eof_return.3
 MLINKS+= BIO_s_mem.3 BIO_get_mem_data.3
-MLINKS+= BIO_s_mem.3 BIO_set_mem_buf.3
 MLINKS+= BIO_s_mem.3 BIO_get_mem_ptr.3
 MLINKS+= BIO_s_mem.3 BIO_new_mem_buf.3
+MLINKS+= BIO_s_mem.3 BIO_set_mem_buf.3
+MLINKS+= BIO_s_mem.3 BIO_set_mem_eof_return.3
 MLINKS+= BIO_s_socket.3 BIO_new_socket.3
+MLINKS+= BIO_set_callback.3 BIO_debug_callback.3
 MLINKS+= BIO_set_callback.3 BIO_get_callback.3
+MLINKS+= BIO_set_callback.3 BIO_get_callback_arg.3
 MLINKS+= BIO_set_callback.3 BIO_set_callback_arg.3
-MLINKS+= BIO_set_callback.3 BIO_get_callback_arg.3
-MLINKS+= BIO_set_callback.3 BIO_debug_callback.3
+MLINKS+= BIO_should_retry.3 BIO_get_retry_BIO.3
+MLINKS+= BIO_should_retry.3 BIO_get_retry_reason.3
+MLINKS+= BIO_should_retry.3 BIO_retry_type.3
+MLINKS+= BIO_should_retry.3 BIO_should_io_special.3
 MLINKS+= BIO_should_retry.3 BIO_should_read.3
 MLINKS+= BIO_should_retry.3 BIO_should_write.3
-MLINKS+= BIO_should_retry.3 BIO_should_io_special.3
-MLINKS+= BIO_should_retry.3 BIO_retry_type.3
-MLINKS+= BIO_should_retry.3 BIO_get_retry_BIO.3
-MLINKS+= BIO_should_retry.3 BIO_get_retry_reason.3
+MLINKS+= BN_BLINDING_new.3 BN_BLINDING_convert.3
+MLINKS+= BN_BLINDING_new.3 BN_BLINDING_convert_ex.3
+MLINKS+= BN_BLINDING_new.3 BN_BLINDING_create_param.3
 MLINKS+= BN_BLINDING_new.3 BN_BLINDING_free.3
-MLINKS+= BN_BLINDING_new.3 BN_BLINDING_update.3
-MLINKS+= BN_BLINDING_new.3 BN_BLINDING_convert.3
+MLINKS+= BN_BLINDING_new.3 BN_BLINDING_get_flags.3
+MLINKS+= BN_BLINDING_new.3 BN_BLINDING_get_thread_id.3
 MLINKS+= BN_BLINDING_new.3 BN_BLINDING_invert.3
-MLINKS+= BN_BLINDING_new.3 BN_BLINDING_convert_ex.3
 MLINKS+= BN_BLINDING_new.3 BN_BLINDING_invert_ex.3
-MLINKS+= BN_BLINDING_new.3 BN_BLINDING_get_thread_id.3
+MLINKS+= BN_BLINDING_new.3 BN_BLINDING_set_flags.3
 MLINKS+= BN_BLINDING_new.3 BN_BLINDING_set_thread_id.3
-MLINKS+= BN_BLINDING_new.3 BN_BLINDING_get_flags.3
-MLINKS+= BN_BLINDING_new.3 BN_BLINDING_set_flags.3
-MLINKS+= BN_BLINDING_new.3 BN_BLINDING_create_param.3
+MLINKS+= BN_BLINDING_new.3 BN_BLINDING_thread_id.3
+MLINKS+= BN_BLINDING_new.3 BN_BLINDING_update.3
+MLINKS+= BN_CTX_new.3 BN_CTX_free.3
 MLINKS+= BN_CTX_new.3 BN_CTX_init.3
-MLINKS+= BN_CTX_new.3 BN_CTX_free.3
+MLINKS+= BN_CTX_start.3 BN_CTX_end.3
 MLINKS+= BN_CTX_start.3 BN_CTX_get.3
-MLINKS+= BN_CTX_start.3 BN_CTX_end.3
-MLINKS+= BN_add.3 BN_sub.3
-MLINKS+= BN_add.3 BN_mul.3
-MLINKS+= BN_add.3 BN_sqr.3
 MLINKS+= BN_add.3 BN_div.3
+MLINKS+= BN_add.3 BN_exp.3
+MLINKS+= BN_add.3 BN_gcd.3
 MLINKS+= BN_add.3 BN_mod.3
-MLINKS+= BN_add.3 BN_nnmod.3
 MLINKS+= BN_add.3 BN_mod_add.3
-MLINKS+= BN_add.3 BN_mod_sub.3
+MLINKS+= BN_add.3 BN_mod_exp.3
 MLINKS+= BN_add.3 BN_mod_mul.3
 MLINKS+= BN_add.3 BN_mod_sqr.3
-MLINKS+= BN_add.3 BN_exp.3
-MLINKS+= BN_add.3 BN_mod_exp.3
-MLINKS+= BN_add.3 BN_gcd.3
-MLINKS+= BN_add_word.3 BN_sub_word.3
-MLINKS+= BN_add_word.3 BN_mul_word.3
+MLINKS+= BN_add.3 BN_mod_sub.3
+MLINKS+= BN_add.3 BN_mul.3
+MLINKS+= BN_add.3 BN_nnmod.3
+MLINKS+= BN_add.3 BN_sqr.3
+MLINKS+= BN_add.3 BN_sub.3
 MLINKS+= BN_add_word.3 BN_div_word.3
 MLINKS+= BN_add_word.3 BN_mod_word.3
+MLINKS+= BN_add_word.3 BN_mul_word.3
+MLINKS+= BN_add_word.3 BN_sub_word.3
 MLINKS+= BN_bn2bin.3 BN_bin2bn.3
+MLINKS+= BN_bn2bin.3 BN_bn2dec.3
 MLINKS+= BN_bn2bin.3 BN_bn2hex.3
-MLINKS+= BN_bn2bin.3 BN_bn2dec.3
+MLINKS+= BN_bn2bin.3 BN_bn2mpi.3
+MLINKS+= BN_bn2bin.3 BN_dec2bn.3
 MLINKS+= BN_bn2bin.3 BN_hex2bn.3
-MLINKS+= BN_bn2bin.3 BN_dec2bn.3
+MLINKS+= BN_bn2bin.3 BN_mpi2bn.3
 MLINKS+= BN_bn2bin.3 BN_print.3
 MLINKS+= BN_bn2bin.3 BN_print_fp.3
-MLINKS+= BN_bn2bin.3 BN_bn2mpi.3
-MLINKS+= BN_bn2bin.3 BN_mpi2bn.3
-MLINKS+= BN_cmp.3 BN_ucmp.3
-MLINKS+= BN_cmp.3 BN_is_zero.3
+MLINKS+= BN_cmp.3 BN_is_odd.3
 MLINKS+= BN_cmp.3 BN_is_one.3
 MLINKS+= BN_cmp.3 BN_is_word.3
-MLINKS+= BN_cmp.3 BN_is_odd.3
+MLINKS+= BN_cmp.3 BN_is_zero.3
+MLINKS+= BN_cmp.3 BN_ucmp.3
 MLINKS+= BN_copy.3 BN_dup.3
+MLINKS+= BN_generate_prime.3 BN_GENCB_call.3
+MLINKS+= BN_generate_prime.3 BN_GENCB_set.3
+MLINKS+= BN_generate_prime.3 BN_GENCB_set_old.3
+MLINKS+= BN_generate_prime.3 BN_generate_prime_ex.3
 MLINKS+= BN_generate_prime.3 BN_is_prime.3
+MLINKS+= BN_generate_prime.3 BN_is_prime_ex.3
 MLINKS+= BN_generate_prime.3 BN_is_prime_fasttest.3
+MLINKS+= BN_generate_prime.3 BN_is_prime_fasttest_ex.3
+MLINKS+= BN_mod_mul_montgomery.3 BN_MONT_CTX_copy.3
+MLINKS+= BN_mod_mul_montgomery.3 BN_MONT_CTX_free.3
+MLINKS+= BN_mod_mul_montgomery.3 BN_MONT_CTX_init.3
 MLINKS+= BN_mod_mul_montgomery.3 BN_MONT_CTX_new.3
-MLINKS+= BN_mod_mul_montgomery.3 BN_MONT_CTX_init.3
-MLINKS+= BN_mod_mul_montgomery.3 BN_MONT_CTX_free.3
 MLINKS+= BN_mod_mul_montgomery.3 BN_MONT_CTX_set.3
-MLINKS+= BN_mod_mul_montgomery.3 BN_MONT_CTX_copy.3
 MLINKS+= BN_mod_mul_montgomery.3 BN_from_montgomery.3
 MLINKS+= BN_mod_mul_montgomery.3 BN_to_montgomery.3
-MLINKS+= BN_mod_mul_reciprocal.3 BN_div_recp.3
+MLINKS+= BN_mod_mul_reciprocal.3 BN_RECP_CTX_free.3
+MLINKS+= BN_mod_mul_reciprocal.3 BN_RECP_CTX_init.3
 MLINKS+= BN_mod_mul_reciprocal.3 BN_RECP_CTX_new.3
-MLINKS+= BN_mod_mul_reciprocal.3 BN_RECP_CTX_init.3
-MLINKS+= BN_mod_mul_reciprocal.3 BN_RECP_CTX_free.3
 MLINKS+= BN_mod_mul_reciprocal.3 BN_RECP_CTX_set.3
-MLINKS+= BN_new.3 BN_init.3
+MLINKS+= BN_mod_mul_reciprocal.3 BN_div_recp.3
 MLINKS+= BN_new.3 BN_clear.3
+MLINKS+= BN_new.3 BN_clear_free.3
 MLINKS+= BN_new.3 BN_free.3
-MLINKS+= BN_new.3 BN_clear_free.3
+MLINKS+= BN_new.3 BN_init.3
 MLINKS+= BN_num_bytes.3 BN_num_bits.3
 MLINKS+= BN_num_bytes.3 BN_num_bits_word.3
 MLINKS+= BN_rand.3 BN_pseudo_rand.3
+MLINKS+= BN_rand.3 BN_pseudo_rand_range.3
+MLINKS+= BN_rand.3 BN_rand_range.3
 MLINKS+= BN_set_bit.3 BN_clear_bit.3
 MLINKS+= BN_set_bit.3 BN_is_bit_set.3
-MLINKS+= BN_set_bit.3 BN_mask_bits.3
 MLINKS+= BN_set_bit.3 BN_lshift.3
 MLINKS+= BN_set_bit.3 BN_lshift1.3
+MLINKS+= BN_set_bit.3 BN_mask_bits.3
 MLINKS+= BN_set_bit.3 BN_rshift.3
 MLINKS+= BN_set_bit.3 BN_rshift1.3
+MLINKS+= BN_zero.3 BN_get_word.3
 MLINKS+= BN_zero.3 BN_one.3
+MLINKS+= BN_zero.3 BN_set_word.3
 MLINKS+= BN_zero.3 BN_value_one.3
-MLINKS+= BN_zero.3 BN_set_word.3
-MLINKS+= BN_zero.3 BN_get_word.3
+MLINKS+= CMS_add0_cert.3 CMS_add0_crl.3
 MLINKS+= CMS_add0_cert.3 CMS_add1_cert.3
+MLINKS+= CMS_add0_cert.3 CMS_add1_crl.3
 MLINKS+= CMS_add0_cert.3 CMS_get1_certs.3
-MLINKS+= CMS_add0_cert.3 CMS_add0_crl.3
 MLINKS+= CMS_add0_cert.3 CMS_get1_crls.3
 MLINKS+= CMS_add1_recipient_cert.3 CMS_add0_recipient_key.3
 MLINKS+= CMS_add1_signer.3 CMS_SignerInfo_sign.3
-MLINKS+= CMS_get0_RecipientInfos.3 CMS_RecipientInfo_type.3
-MLINKS+= CMS_get0_RecipientInfos.3 CMS_RecipientInfo_ktri_get0_signer_id.3
-MLINKS+= CMS_get0_RecipientInfos.3 CMS_RecipientInfo_ktri_cert_cmp.3
-MLINKS+= CMS_get0_RecipientInfos.3 CMS_RecipientInfo_set0_pkey.3
+MLINKS+= CMS_get0_RecipientInfos.3 CMS_RecipientInfo_decrypt.3
+MLINKS+= CMS_get0_RecipientInfos.3 CMS_RecipientInfo_encrypt.3
 MLINKS+= CMS_get0_RecipientInfos.3 CMS_RecipientInfo_kekri_get0_id.3
 MLINKS+= CMS_get0_RecipientInfos.3 CMS_RecipientInfo_kekri_id_cmp.3
+MLINKS+= CMS_get0_RecipientInfos.3 CMS_RecipientInfo_ktri_cert_cmp.3
+MLINKS+= CMS_get0_RecipientInfos.3 CMS_RecipientInfo_ktri_get0_signer_id.3
 MLINKS+= CMS_get0_RecipientInfos.3 CMS_RecipientInfo_set0_key.3
-MLINKS+= CMS_get0_RecipientInfos.3 CMS_RecipientInfo_decrypt.3
+MLINKS+= CMS_get0_RecipientInfos.3 CMS_RecipientInfo_set0_pkey.3
+MLINKS+= CMS_get0_RecipientInfos.3 CMS_RecipientInfo_type.3
+MLINKS+= CMS_get0_SignerInfos.3 CMS_SignerInfo_cert_cmp.3
+MLINKS+= CMS_get0_SignerInfos.3 CMS_SignerInfo_get0_signature.3
 MLINKS+= CMS_get0_SignerInfos.3 CMS_SignerInfo_get0_signer_id.3
-MLINKS+= CMS_get0_SignerInfos.3 CMS_SignerInfo_cert_cmp.3
-MLINKS+= CMS_get0_SignerInfos.3 CMS_set1_signer_certs.3
+MLINKS+= CMS_get0_SignerInfos.3 CMS_set1_signer_cert.3
+MLINKS+= CMS_get0_type.3 CMS_get0_content.3
+MLINKS+= CMS_get0_type.3 CMS_get0_eContentType.3
 MLINKS+= CMS_get0_type.3 CMS_set1_eContentType.3
-MLINKS+= CMS_get0_type.3 CMS_get0_eContentType.3
-MLINKS+= CMS_get0_type.3 CMS_get0_content.3
 MLINKS+= CMS_get1_ReceiptRequest.3 CMS_ReceiptRequest_create0.3
+MLINKS+= CMS_get1_ReceiptRequest.3 CMS_ReceiptRequest_get0_values.3
 MLINKS+= CMS_get1_ReceiptRequest.3 CMS_add1_ReceiptRequest.3
-MLINKS+= CMS_get1_ReceiptRequest.3 CMS_ReceiptRequest_get0_values.3
+MLINKS+= CMS_verify.3 CMS_get0_signers.3
 MLINKS+= CONF_modules_free.3 CONF_modules_finish.3
 MLINKS+= CONF_modules_free.3 CONF_modules_unload.3
 MLINKS+= CONF_modules_load_file.3 CONF_modules_load.3
@@ -426,66 +463,172 @@
 MLINKS+= CRYPTO_set_ex_data.3 CRYPTO_get_ex_data.3
 MLINKS+= DH_generate_key.3 DH_compute_key.3
 MLINKS+= DH_generate_parameters.3 DH_check.3
+MLINKS+= DH_generate_parameters.3 DH_generate_parameters_ex.3
+MLINKS+= DH_get_ex_new_index.3 DH_get_ex_data.3
 MLINKS+= DH_get_ex_new_index.3 DH_set_ex_data.3
-MLINKS+= DH_get_ex_new_index.3 DH_get_ex_data.3
 MLINKS+= DH_new.3 DH_free.3
-MLINKS+= DH_set_method.3 DH_set_default_method.3
+MLINKS+= DH_set_method.3 DH_OpenSSL.3
 MLINKS+= DH_set_method.3 DH_get_default_method.3
 MLINKS+= DH_set_method.3 DH_new_method.3
-MLINKS+= DH_set_method.3 DH_OpenSSL.3
+MLINKS+= DH_set_method.3 DH_set_default_method.3
 MLINKS+= DSA_SIG_new.3 DSA_SIG_free.3
 MLINKS+= DSA_do_sign.3 DSA_do_verify.3
+MLINKS+= DSA_generate_parameters.3 DSA_generate_parameters_ex.3
+MLINKS+= DSA_get_ex_new_index.3 DSA_get_ex_data.3
 MLINKS+= DSA_get_ex_new_index.3 DSA_set_ex_data.3
-MLINKS+= DSA_get_ex_new_index.3 DSA_get_ex_data.3
 MLINKS+= DSA_new.3 DSA_free.3
-MLINKS+= DSA_set_method.3 DSA_set_default_method.3
+MLINKS+= DSA_set_method.3 DSA_OpenSSL.3
 MLINKS+= DSA_set_method.3 DSA_get_default_method.3
 MLINKS+= DSA_set_method.3 DSA_new_method.3
-MLINKS+= DSA_set_method.3 DSA_OpenSSL.3
+MLINKS+= DSA_set_method.3 DSA_set_default_method.3
 MLINKS+= DSA_sign.3 DSA_sign_setup.3
 MLINKS+= DSA_sign.3 DSA_verify.3
+MLINKS+= EC_GFp_simple_method.3 EC_GF2m_simple_method.3
+MLINKS+= EC_GFp_simple_method.3 EC_GFp_mont_method.3
+MLINKS+= EC_GFp_simple_method.3 EC_GFp_nist_method.3
+MLINKS+= EC_GFp_simple_method.3 EC_GFp_nistp224_method.3
+MLINKS+= EC_GFp_simple_method.3 EC_GFp_nistp256_method.3
+MLINKS+= EC_GFp_simple_method.3 EC_GFp_nistp521_method.3
+MLINKS+= EC_GFp_simple_method.3 EC_METHOD_get_field_type.3
+MLINKS+= EC_GROUP_copy.3 EC_GROUP_check.3
+MLINKS+= EC_GROUP_copy.3 EC_GROUP_check_discriminant.3
+MLINKS+= EC_GROUP_copy.3 EC_GROUP_cmp.3
+MLINKS+= EC_GROUP_copy.3 EC_GROUP_dup.3
+MLINKS+= EC_GROUP_copy.3 EC_GROUP_get0_generator.3
+MLINKS+= EC_GROUP_copy.3 EC_GROUP_get0_seed.3
+MLINKS+= EC_GROUP_copy.3 EC_GROUP_get_asn1_flag.3
+MLINKS+= EC_GROUP_copy.3 EC_GROUP_get_basis_type.3
+MLINKS+= EC_GROUP_copy.3 EC_GROUP_get_cofactor.3
+MLINKS+= EC_GROUP_copy.3 EC_GROUP_get_curve_name.3
+MLINKS+= EC_GROUP_copy.3 EC_GROUP_get_degree.3
+MLINKS+= EC_GROUP_copy.3 EC_GROUP_get_order.3
+MLINKS+= EC_GROUP_copy.3 EC_GROUP_get_pentanomial_basis.3
+MLINKS+= EC_GROUP_copy.3 EC_GROUP_get_point_conversion_form.3
+MLINKS+= EC_GROUP_copy.3 EC_GROUP_get_seed_len.3
+MLINKS+= EC_GROUP_copy.3 EC_GROUP_get_trinomial_basis.3
+MLINKS+= EC_GROUP_copy.3 EC_GROUP_method_of.3
+MLINKS+= EC_GROUP_copy.3 EC_GROUP_set_asn1_flag.3
+MLINKS+= EC_GROUP_copy.3 EC_GROUP_set_curve_name.3
+MLINKS+= EC_GROUP_copy.3 EC_GROUP_set_generator.3
+MLINKS+= EC_GROUP_copy.3 EC_GROUP_set_point_conversion_form.3
+MLINKS+= EC_GROUP_copy.3 EC_GROUP_set_seed.3
+MLINKS+= EC_GROUP_new.3 EC_GROUP_clear_free.3
+MLINKS+= EC_GROUP_new.3 EC_GROUP_free.3
+MLINKS+= EC_GROUP_new.3 EC_GROUP_get_curve_GF2m.3
+MLINKS+= EC_GROUP_new.3 EC_GROUP_get_curve_GFp.3
+MLINKS+= EC_GROUP_new.3 EC_GROUP_new_by_curve_name.3
+MLINKS+= EC_GROUP_new.3 EC_GROUP_new_curve_GF2m.3
+MLINKS+= EC_GROUP_new.3 EC_GROUP_new_curve_GFp.3
+MLINKS+= EC_GROUP_new.3 EC_GROUP_set_curve_GF2m.3
+MLINKS+= EC_GROUP_new.3 EC_GROUP_set_curve_GFp.3
+MLINKS+= EC_GROUP_new.3 EC_get_builtin_curves.3
+MLINKS+= EC_KEY_new.3 EC_KEY_check_key.3
+MLINKS+= EC_KEY_new.3 EC_KEY_clear_flags.3
+MLINKS+= EC_KEY_new.3 EC_KEY_copy.3
+MLINKS+= EC_KEY_new.3 EC_KEY_dup.3
+MLINKS+= EC_KEY_new.3 EC_KEY_free.3
+MLINKS+= EC_KEY_new.3 EC_KEY_generate_key.3
+MLINKS+= EC_KEY_new.3 EC_KEY_get0_group.3
+MLINKS+= EC_KEY_new.3 EC_KEY_get0_private_key.3
+MLINKS+= EC_KEY_new.3 EC_KEY_get0_public_key.3
+MLINKS+= EC_KEY_new.3 EC_KEY_get_conv_form.3
+MLINKS+= EC_KEY_new.3 EC_KEY_get_enc_flags.3
+MLINKS+= EC_KEY_new.3 EC_KEY_get_flags.3
+MLINKS+= EC_KEY_new.3 EC_KEY_get_key_method_data.3
+MLINKS+= EC_KEY_new.3 EC_KEY_insert_key_method_data.3
+MLINKS+= EC_KEY_new.3 EC_KEY_new_by_curve_name.3
+MLINKS+= EC_KEY_new.3 EC_KEY_precompute_mult.3
+MLINKS+= EC_KEY_new.3 EC_KEY_set_asn1_flag.3
+MLINKS+= EC_KEY_new.3 EC_KEY_set_conv_form.3
+MLINKS+= EC_KEY_new.3 EC_KEY_set_enc_flags.3
+MLINKS+= EC_KEY_new.3 EC_KEY_set_flags.3
+MLINKS+= EC_KEY_new.3 EC_KEY_set_group.3
+MLINKS+= EC_KEY_new.3 EC_KEY_set_private_key.3
+MLINKS+= EC_KEY_new.3 EC_KEY_set_public_key.3
+MLINKS+= EC_KEY_new.3 EC_KEY_set_public_key_affine_coordinates.3
+MLINKS+= EC_KEY_new.3 EC_KEY_up_ref.3
+MLINKS+= EC_POINT_add.3 EC_GROUP_have_precompute_mult.3
+MLINKS+= EC_POINT_add.3 EC_GROUP_precompute_mult.3
+MLINKS+= EC_POINT_add.3 EC_POINT_cmp.3
+MLINKS+= EC_POINT_add.3 EC_POINT_dbl.3
+MLINKS+= EC_POINT_add.3 EC_POINT_invert.3
+MLINKS+= EC_POINT_add.3 EC_POINT_is_at_infinity.3
+MLINKS+= EC_POINT_add.3 EC_POINT_is_on_curve.3
+MLINKS+= EC_POINT_add.3 EC_POINT_make_affine.3
+MLINKS+= EC_POINT_add.3 EC_POINT_mul.3
+MLINKS+= EC_POINT_add.3 EC_POINTs_make_affine.3
+MLINKS+= EC_POINT_add.3 EC_POINTs_mul.3
+MLINKS+= EC_POINT_new.3 EC_POINT_bn2point.3
+MLINKS+= EC_POINT_new.3 EC_POINT_clear_free.3
+MLINKS+= EC_POINT_new.3 EC_POINT_copy.3
+MLINKS+= EC_POINT_new.3 EC_POINT_dup.3
+MLINKS+= EC_POINT_new.3 EC_POINT_free.3
+MLINKS+= EC_POINT_new.3 EC_POINT_get_Jprojective_coordinates_GFp.3
+MLINKS+= EC_POINT_new.3 EC_POINT_get_affine_coordinates_GF2m.3
+MLINKS+= EC_POINT_new.3 EC_POINT_get_affine_coordinates_GFp.3
+MLINKS+= EC_POINT_new.3 EC_POINT_hex2point.3
+MLINKS+= EC_POINT_new.3 EC_POINT_method_of.3
+MLINKS+= EC_POINT_new.3 EC_POINT_oct2point.3
+MLINKS+= EC_POINT_new.3 EC_POINT_point2bn.3
+MLINKS+= EC_POINT_new.3 EC_POINT_point2hex.3
+MLINKS+= EC_POINT_new.3 EC_POINT_point2oct.3
+MLINKS+= EC_POINT_new.3 EC_POINT_set_Jprojective_coordinates.3
+MLINKS+= EC_POINT_new.3 EC_POINT_set_affine_coordinates_GF2m.3
+MLINKS+= EC_POINT_new.3 EC_POINT_set_affine_coordinates_GFp.3
+MLINKS+= EC_POINT_new.3 EC_POINT_set_compressed_coordinates_GF2m.3
+MLINKS+= EC_POINT_new.3 EC_POINT_set_compressed_coordinates_GFp.3
+MLINKS+= EC_POINT_new.3 EC_POINT_set_to_infinity.3
 MLINKS+= ERR_GET_LIB.3 ERR_GET_FUNC.3
 MLINKS+= ERR_GET_LIB.3 ERR_GET_REASON.3
 MLINKS+= ERR_error_string.3 ERR_error_string_n.3
+MLINKS+= ERR_error_string.3 ERR_func_error_string.3
 MLINKS+= ERR_error_string.3 ERR_lib_error_string.3
-MLINKS+= ERR_error_string.3 ERR_func_error_string.3
 MLINKS+= ERR_error_string.3 ERR_reason_error_string.3
+MLINKS+= ERR_get_error.3 ERR_get_error_line.3
+MLINKS+= ERR_get_error.3 ERR_get_error_line_data.3
 MLINKS+= ERR_get_error.3 ERR_peek_error.3
+MLINKS+= ERR_get_error.3 ERR_peek_error_line.3
+MLINKS+= ERR_get_error.3 ERR_peek_error_line_data.3
 MLINKS+= ERR_get_error.3 ERR_peek_last_error.3
-MLINKS+= ERR_get_error.3 ERR_get_error_line.3
-MLINKS+= ERR_get_error.3 ERR_peek_error_line.3
 MLINKS+= ERR_get_error.3 ERR_peek_last_error_line.3
-MLINKS+= ERR_get_error.3 ERR_get_error_line_data.3
-MLINKS+= ERR_get_error.3 ERR_peek_error_line_data.3
 MLINKS+= ERR_get_error.3 ERR_peek_last_error_line_data.3
+MLINKS+= ERR_load_crypto_strings.3 ERR_free_strings.3
 MLINKS+= ERR_load_crypto_strings.3 SSL_load_error_strings.3
-MLINKS+= ERR_load_crypto_strings.3 ERR_free_strings.3
 MLINKS+= ERR_load_strings.3 ERR_PACK.3
 MLINKS+= ERR_load_strings.3 ERR_get_next_error_library.3
 MLINKS+= ERR_print_errors.3 ERR_print_errors_fp.3
 MLINKS+= ERR_put_error.3 ERR_add_error_data.3
+MLINKS+= ERR_remove_state.3 ERR_remove_thread_state.3
 MLINKS+= ERR_set_mark.3 ERR_pop_to_mark.3
-MLINKS+= EVP_DigestInit.3 EVP_MD_CTX_init.3
-MLINKS+= EVP_DigestInit.3 EVP_MD_CTX_create.3
+MLINKS+= EVP_DigestInit.3 EVP_DigestFinal.3
+MLINKS+= EVP_DigestInit.3 EVP_DigestFinal_ex.3
 MLINKS+= EVP_DigestInit.3 EVP_DigestInit_ex.3
 MLINKS+= EVP_DigestInit.3 EVP_DigestUpdate.3
-MLINKS+= EVP_DigestInit.3 EVP_DigestFinal_ex.3
+MLINKS+= EVP_DigestInit.3 EVP_MAX_MD_SIZE.3
+MLINKS+= EVP_DigestInit.3 EVP_MD_CTX_block_size.3
 MLINKS+= EVP_DigestInit.3 EVP_MD_CTX_cleanup.3
+MLINKS+= EVP_DigestInit.3 EVP_MD_CTX_copy.3
+MLINKS+= EVP_DigestInit.3 EVP_MD_CTX_copy_ex.3
+MLINKS+= EVP_DigestInit.3 EVP_MD_CTX_create.3
 MLINKS+= EVP_DigestInit.3 EVP_MD_CTX_destroy.3
-MLINKS+= EVP_DigestInit.3 EVP_MAX_MD_SIZE.3
-MLINKS+= EVP_DigestInit.3 EVP_MD_CTX_copy_ex.3
-MLINKS+= EVP_DigestInit.3 EVP_MD_CTX_copy.3
-MLINKS+= EVP_DigestInit.3 EVP_MD_type.3
-MLINKS+= EVP_DigestInit.3 EVP_MD_pkey_type.3
-MLINKS+= EVP_DigestInit.3 EVP_MD_size.3
-MLINKS+= EVP_DigestInit.3 EVP_MD_block_size.3
+MLINKS+= EVP_DigestInit.3 EVP_MD_CTX_init.3
 MLINKS+= EVP_DigestInit.3 EVP_MD_CTX_md.3
 MLINKS+= EVP_DigestInit.3 EVP_MD_CTX_size.3
-MLINKS+= EVP_DigestInit.3 EVP_MD_CTX_block_size.3
 MLINKS+= EVP_DigestInit.3 EVP_MD_CTX_type.3
-MLINKS+= EVP_DigestInit.3 EVP_md_null.3
+MLINKS+= EVP_DigestInit.3 EVP_MD_block_size.3
+MLINKS+= EVP_DigestInit.3 EVP_MD_pkey_type.3
+MLINKS+= EVP_DigestInit.3 EVP_MD_size.3
+MLINKS+= EVP_DigestInit.3 EVP_MD_type.3
+MLINKS+= EVP_DigestInit.3 EVP_dss.3
+MLINKS+= EVP_DigestInit.3 EVP_dss1.3
+MLINKS+= EVP_DigestInit.3 EVP_get_digestbyname.3
+MLINKS+= EVP_DigestInit.3 EVP_get_digestbynid.3
+MLINKS+= EVP_DigestInit.3 EVP_get_digestbyobj.3
 MLINKS+= EVP_DigestInit.3 EVP_md2.3
 MLINKS+= EVP_DigestInit.3 EVP_md5.3
+MLINKS+= EVP_DigestInit.3 EVP_md_null.3
+MLINKS+= EVP_DigestInit.3 EVP_mdc2.3
+MLINKS+= EVP_DigestInit.3 EVP_ripemd160.3
 MLINKS+= EVP_DigestInit.3 EVP_sha.3
 MLINKS+= EVP_DigestInit.3 EVP_sha1.3
 MLINKS+= EVP_DigestInit.3 EVP_sha224.3
@@ -492,274 +635,387 @@
 MLINKS+= EVP_DigestInit.3 EVP_sha256.3
 MLINKS+= EVP_DigestInit.3 EVP_sha384.3
 MLINKS+= EVP_DigestInit.3 EVP_sha512.3
-MLINKS+= EVP_DigestInit.3 EVP_dss.3
-MLINKS+= EVP_DigestInit.3 EVP_dss1.3
-MLINKS+= EVP_DigestInit.3 EVP_mdc2.3
-MLINKS+= EVP_DigestInit.3 EVP_ripemd160.3
-MLINKS+= EVP_DigestInit.3 EVP_get_digestbyname.3
-MLINKS+= EVP_DigestInit.3 EVP_get_digestbynid.3
-MLINKS+= EVP_DigestInit.3 EVP_get_digestbyobj.3
+MLINKS+= EVP_DigestSignInit.3 EVP_DigestSignFinal.3
 MLINKS+= EVP_DigestSignInit.3 EVP_DigestSignUpdate.3
-MLINKS+= EVP_DigestSignInit.3 EVP_DigestSignFinal.3
+MLINKS+= EVP_DigestVerifyInit.3 EVP_DigestVerifyFinal.3
 MLINKS+= EVP_DigestVerifyInit.3 EVP_DigestVerifyUpdate.3
-MLINKS+= EVP_DigestVerifyInit.3 EVP_DigestVerifyFinal.3
-MLINKS+= EVP_EncodeInit.3 EVP_EncodeUpdate.3
-MLINKS+= EVP_EncodeInit.3 EVP_EncodeFinal.3
-MLINKS+= EVP_EncodeInit.3 EVP_EncodeBlock.3
+MLINKS+= EVP_EncodeInit.3 EVP_DecodeBlock.3
+MLINKS+= EVP_EncodeInit.3 EVP_DecodeFinal.3
 MLINKS+= EVP_EncodeInit.3 EVP_DecodeInit.3
 MLINKS+= EVP_EncodeInit.3 EVP_DecodeUpdate.3
-MLINKS+= EVP_EncodeInit.3 EVP_DecodeFinal.3
-MLINKS+= EVP_EncodeInit.3 EVP_DecodeBlock.3
+MLINKS+= EVP_EncodeInit.3 EVP_EncodeBlock.3
+MLINKS+= EVP_EncodeInit.3 EVP_EncodeFinal.3
+MLINKS+= EVP_EncodeInit.3 EVP_EncodeUpdate.3
+MLINKS+= EVP_EncryptInit.3 EVP_CIPHER_CTX_block_size.3
+MLINKS+= EVP_EncryptInit.3 EVP_CIPHER_CTX_cipher.3
+MLINKS+= EVP_EncryptInit.3 EVP_CIPHER_CTX_cleanup.3
+MLINKS+= EVP_EncryptInit.3 EVP_CIPHER_CTX_ctrl.3
+MLINKS+= EVP_EncryptInit.3 EVP_CIPHER_CTX_flags.3
+MLINKS+= EVP_EncryptInit.3 EVP_CIPHER_CTX_get_app_data.3
 MLINKS+= EVP_EncryptInit.3 EVP_CIPHER_CTX_init.3
-MLINKS+= EVP_EncryptInit.3 EVP_EncryptInit_ex.3
-MLINKS+= EVP_EncryptInit.3 EVP_EncryptUpdate.3
-MLINKS+= EVP_EncryptInit.3 EVP_EncryptFinal_ex.3
+MLINKS+= EVP_EncryptInit.3 EVP_CIPHER_CTX_iv_length.3
+MLINKS+= EVP_EncryptInit.3 EVP_CIPHER_CTX_key_length.3
+MLINKS+= EVP_EncryptInit.3 EVP_CIPHER_CTX_mode.3
+MLINKS+= EVP_EncryptInit.3 EVP_CIPHER_CTX_nid.3
+MLINKS+= EVP_EncryptInit.3 EVP_CIPHER_CTX_set_app_data.3
+MLINKS+= EVP_EncryptInit.3 EVP_CIPHER_CTX_set_key_length.3
+MLINKS+= EVP_EncryptInit.3 EVP_CIPHER_CTX_set_padding.3
+MLINKS+= EVP_EncryptInit.3 EVP_CIPHER_CTX_type.3
+MLINKS+= EVP_EncryptInit.3 EVP_CIPHER_asn1_to_param.3
+MLINKS+= EVP_EncryptInit.3 EVP_CIPHER_block_size.3
+MLINKS+= EVP_EncryptInit.3 EVP_CIPHER_flags.3
+MLINKS+= EVP_EncryptInit.3 EVP_CIPHER_iv_length.3
+MLINKS+= EVP_EncryptInit.3 EVP_CIPHER_key_length.3
+MLINKS+= EVP_EncryptInit.3 EVP_CIPHER_mode.3
+MLINKS+= EVP_EncryptInit.3 EVP_CIPHER_nid.3
+MLINKS+= EVP_EncryptInit.3 EVP_CIPHER_param_to_asn1.3
+MLINKS+= EVP_EncryptInit.3 EVP_CIPHER_type.3
+MLINKS+= EVP_EncryptInit.3 EVP_CipherFinal.3
+MLINKS+= EVP_EncryptInit.3 EVP_CipherFinal_ex.3
+MLINKS+= EVP_EncryptInit.3 EVP_CipherInit.3
+MLINKS+= EVP_EncryptInit.3 EVP_CipherInit_ex.3
+MLINKS+= EVP_EncryptInit.3 EVP_CipherUpdate.3
+MLINKS+= EVP_EncryptInit.3 EVP_DecryptFinal.3
+MLINKS+= EVP_EncryptInit.3 EVP_DecryptFinal_ex.3
+MLINKS+= EVP_EncryptInit.3 EVP_DecryptInit.3
 MLINKS+= EVP_EncryptInit.3 EVP_DecryptInit_ex.3
 MLINKS+= EVP_EncryptInit.3 EVP_DecryptUpdate.3
-MLINKS+= EVP_EncryptInit.3 EVP_DecryptFinal_ex.3
-MLINKS+= EVP_EncryptInit.3 EVP_CipherInit_ex.3
-MLINKS+= EVP_EncryptInit.3 EVP_CipherUpdate.3
-MLINKS+= EVP_EncryptInit.3 EVP_CipherFinal_ex.3
-MLINKS+= EVP_EncryptInit.3 EVP_CIPHER_CTX_set_key_length.3
-MLINKS+= EVP_EncryptInit.3 EVP_CIPHER_CTX_ctrl.3
-MLINKS+= EVP_EncryptInit.3 EVP_CIPHER_CTX_cleanup.3
 MLINKS+= EVP_EncryptInit.3 EVP_EncryptFinal.3
-MLINKS+= EVP_EncryptInit.3 EVP_DecryptInit.3
-MLINKS+= EVP_EncryptInit.3 EVP_DecryptFinal.3
-MLINKS+= EVP_EncryptInit.3 EVP_CipherInit.3
-MLINKS+= EVP_EncryptInit.3 EVP_CipherFinal.3
+MLINKS+= EVP_EncryptInit.3 EVP_EncryptFinal_ex.3
+MLINKS+= EVP_EncryptInit.3 EVP_EncryptInit_ex.3
+MLINKS+= EVP_EncryptInit.3 EVP_EncryptUpdate.3
+MLINKS+= EVP_EncryptInit.3 EVP_aes_128_cbc_hmac_sha1.3
+MLINKS+= EVP_EncryptInit.3 EVP_aes_128_cbc_hmac_sha256.3
+MLINKS+= EVP_EncryptInit.3 EVP_aes_128_ccm.3
+MLINKS+= EVP_EncryptInit.3 EVP_aes_128_gcm.3
+MLINKS+= EVP_EncryptInit.3 EVP_aes_192_ccm.3
+MLINKS+= EVP_EncryptInit.3 EVP_aes_192_gcm.3
+MLINKS+= EVP_EncryptInit.3 EVP_aes_256_cbc_hmac_sha1.3
+MLINKS+= EVP_EncryptInit.3 EVP_aes_256_cbc_hmac_sha256.3
+MLINKS+= EVP_EncryptInit.3 EVP_aes_256_ccm.3
+MLINKS+= EVP_EncryptInit.3 EVP_aes_256_gcm.3
+MLINKS+= EVP_EncryptInit.3 EVP_bf_cbc.3
+MLINKS+= EVP_EncryptInit.3 EVP_bf_cfb.3
+MLINKS+= EVP_EncryptInit.3 EVP_bf_ecb.3
+MLINKS+= EVP_EncryptInit.3 EVP_bf_ofb.3
+MLINKS+= EVP_EncryptInit.3 EVP_cast5_cbc.3
+MLINKS+= EVP_EncryptInit.3 EVP_cast5_cfb.3
+MLINKS+= EVP_EncryptInit.3 EVP_cast5_ecb.3
+MLINKS+= EVP_EncryptInit.3 EVP_cast5_ofb.3
+MLINKS+= EVP_EncryptInit.3 EVP_des_cbc.3
+MLINKS+= EVP_EncryptInit.3 EVP_des_cfb.3
+MLINKS+= EVP_EncryptInit.3 EVP_des_ecb.3
+MLINKS+= EVP_EncryptInit.3 EVP_des_ede.3
+MLINKS+= EVP_EncryptInit.3 EVP_des_ede3.3
+MLINKS+= EVP_EncryptInit.3 EVP_des_ede3_cbc.3
+MLINKS+= EVP_EncryptInit.3 EVP_des_ede3_cfb.3
+MLINKS+= EVP_EncryptInit.3 EVP_des_ede3_ofb.3
+MLINKS+= EVP_EncryptInit.3 EVP_des_ede_cbc.3
+MLINKS+= EVP_EncryptInit.3 EVP_des_ede_cfb.3
+MLINKS+= EVP_EncryptInit.3 EVP_des_ede_ofb.3
+MLINKS+= EVP_EncryptInit.3 EVP_des_ofb.3
+MLINKS+= EVP_EncryptInit.3 EVP_desx_cbc.3
+MLINKS+= EVP_EncryptInit.3 EVP_enc_null.3
 MLINKS+= EVP_EncryptInit.3 EVP_get_cipherbyname.3
 MLINKS+= EVP_EncryptInit.3 EVP_get_cipherbynid.3
 MLINKS+= EVP_EncryptInit.3 EVP_get_cipherbyobj.3
-MLINKS+= EVP_EncryptInit.3 EVP_CIPHER_nid.3
-MLINKS+= EVP_EncryptInit.3 EVP_CIPHER_block_size.3
-MLINKS+= EVP_EncryptInit.3 EVP_CIPHER_key_length.3
-MLINKS+= EVP_EncryptInit.3 EVP_CIPHER_iv_length.3
-MLINKS+= EVP_EncryptInit.3 EVP_CIPHER_flags.3
-MLINKS+= EVP_EncryptInit.3 EVP_CIPHER_mode.3
-MLINKS+= EVP_EncryptInit.3 EVP_CIPHER_type.3
-MLINKS+= EVP_EncryptInit.3 EVP_CIPHER_CTX_cipher.3
-MLINKS+= EVP_EncryptInit.3 EVP_CIPHER_CTX_nid.3
-MLINKS+= EVP_EncryptInit.3 EVP_CIPHER_CTX_block_size.3
-MLINKS+= EVP_EncryptInit.3 EVP_CIPHER_CTX_key_length.3
-MLINKS+= EVP_EncryptInit.3 EVP_CIPHER_CTX_iv_length.3
-MLINKS+= EVP_EncryptInit.3 EVP_CIPHER_CTX_get_app_data.3
-MLINKS+= EVP_EncryptInit.3 EVP_CIPHER_CTX_set_app_data.3
-MLINKS+= EVP_EncryptInit.3 EVP_CIPHER_CTX_type.3
-MLINKS+= EVP_EncryptInit.3 EVP_CIPHER_CTX_flags.3
-MLINKS+= EVP_EncryptInit.3 EVP_CIPHER_CTX_mode.3
-MLINKS+= EVP_EncryptInit.3 EVP_CIPHER_param_to_asn1.3
-MLINKS+= EVP_EncryptInit.3 EVP_CIPHER_asn1_to_param.3
-MLINKS+= EVP_EncryptInit.3 EVP_CIPHER_CTX_set_padding.3
+MLINKS+= EVP_EncryptInit.3 EVP_idea_cbc.3
+MLINKS+= EVP_EncryptInit.3 EVP_idea_cfb.3
+MLINKS+= EVP_EncryptInit.3 EVP_idea_ecb.3
+MLINKS+= EVP_EncryptInit.3 EVP_idea_ofb.3
+MLINKS+= EVP_EncryptInit.3 EVP_rc2_40_cbc.3
+MLINKS+= EVP_EncryptInit.3 EVP_rc2_64_cbc.3
+MLINKS+= EVP_EncryptInit.3 EVP_rc2_cbc.3
+MLINKS+= EVP_EncryptInit.3 EVP_rc2_cfb.3
+MLINKS+= EVP_EncryptInit.3 EVP_rc2_ecb.3
+MLINKS+= EVP_EncryptInit.3 EVP_rc2_ofb.3
+MLINKS+= EVP_EncryptInit.3 EVP_rc4.3
+MLINKS+= EVP_EncryptInit.3 EVP_rc4_40.3
+MLINKS+= EVP_EncryptInit.3 EVP_rc4_hmac_md5.3
+MLINKS+= EVP_EncryptInit.3 EVP_rc5_32_12_16_cbc.3
+MLINKS+= EVP_EncryptInit.3 EVP_rc5_32_12_16_cfb.3
+MLINKS+= EVP_EncryptInit.3 EVP_rc5_32_12_16_ecb.3
+MLINKS+= EVP_EncryptInit.3 EVP_rc5_32_12_16_ofb.3
+MLINKS+= EVP_OpenInit.3 EVP_OpenFinal.3
 MLINKS+= EVP_OpenInit.3 EVP_OpenUpdate.3
-MLINKS+= EVP_OpenInit.3 EVP_OpenFinal.3
-MLINKS+= EVP_PKEY_CTX_ctrl.3 EVP_PKEY_ctrl.3
-MLINKS+= EVP_PKEY_CTX_ctrl.3 EVP_PKEY_ctrl_str.3
-MLINKS+= EVP_PKEY_CTX_new.3 EVP_PKEY_CTX_new_id.3
+MLINKS+= EVP_PKEY_CTX_ctrl.3 EVP_PKEY_CTX_ctrl_str.3
+MLINKS+= EVP_PKEY_CTX_ctrl.3 EVP_PKEY_CTX_set_dh_paramgen_generator.3
+MLINKS+= EVP_PKEY_CTX_ctrl.3 EVP_PKEY_CTX_set_dh_paramgen_prime_len.3
+MLINKS+= EVP_PKEY_CTX_ctrl.3 EVP_PKEY_CTX_set_dsa_paramgen_bits.3
+MLINKS+= EVP_PKEY_CTX_ctrl.3 EVP_PKEY_CTX_set_ec_paramgen_curve_nid.3
+MLINKS+= EVP_PKEY_CTX_ctrl.3 EVP_PKEY_CTX_set_rsa_keygen_pubexp.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
+MLINKS+= EVP_PKEY_CTX_ctrl.3 EVP_PKEY_CTX_set_rsa_rsa_keygen_bits.3
+MLINKS+= EVP_PKEY_CTX_ctrl.3 EVP_PKEY_CTX_set_signature_md.3
 MLINKS+= EVP_PKEY_CTX_new.3 EVP_PKEY_CTX_dup.3
 MLINKS+= EVP_PKEY_CTX_new.3 EVP_PKEY_CTX_free.3
+MLINKS+= EVP_PKEY_CTX_new.3 EVP_PKEY_CTX_new_id.3
+MLINKS+= EVP_PKEY_cmp.3 EVP_PKEY_cmp_parameters.3
 MLINKS+= EVP_PKEY_cmp.3 EVP_PKEY_copy_parameters.3
 MLINKS+= EVP_PKEY_cmp.3 EVP_PKEY_missing_parameters.3
-MLINKS+= EVP_PKEY_cmp.3 EVP_PKEY_cmp_parameters.3
 MLINKS+= EVP_PKEY_decrypt.3 EVP_PKEY_decrypt_init.3
 MLINKS+= EVP_PKEY_derive.3 EVP_PKEY_derive_init.3
 MLINKS+= EVP_PKEY_derive.3 EVP_PKEY_derive_set_peer.3
 MLINKS+= EVP_PKEY_encrypt.3 EVP_PKEY_encrypt_init.3
 MLINKS+= EVP_PKEY_get_default_digest.3 EVP_PKEY_get_default_digest_nid.3
+MLINKS+= EVP_PKEY_keygen.3 EVP_PKEVP_PKEY_CTX_set_app_data.3
+MLINKS+= EVP_PKEY_keygen.3 EVP_PKEY_CTX_get_app_data.3
+MLINKS+= EVP_PKEY_keygen.3 EVP_PKEY_CTX_get_cb.3
+MLINKS+= EVP_PKEY_keygen.3 EVP_PKEY_CTX_get_keygen_info.3
+MLINKS+= EVP_PKEY_keygen.3 EVP_PKEY_CTX_set_cb.3
 MLINKS+= EVP_PKEY_keygen.3 EVP_PKEY_keygen_init.3
+MLINKS+= EVP_PKEY_keygen.3 EVP_PKEY_paramgen.3
 MLINKS+= EVP_PKEY_keygen.3 EVP_PKEY_paramgen_init.3
-MLINKS+= EVP_PKEY_keygen.3 EVP_PKEY_paramgen.3
-MLINKS+= EVP_PKEY_keygen.3 EVP_PKEY_CTX_set_cb.3
-MLINKS+= EVP_PKEY_keygen.3 EVP_PKEY_CTX_get_cb.3
-MLINKS+= EVP_PKEY_keygen.3 EVP_PKEY_CTX_get_keygen_info.3
-MLINKS+= EVP_PKEY_keygen.3 EVP_PKEVP_PKEY_CTX_set_app_data.3
-MLINKS+= EVP_PKEY_keygen.3 EVP_PKEY_CTX_get_app_data.3
+MLINKS+= EVP_PKEY_meth_new.3 EVP_PKEY_METHOD.3
+MLINKS+= EVP_PKEY_meth_new.3 EVP_PKEY_meth_add0.3
+MLINKS+= EVP_PKEY_meth_new.3 EVP_PKEY_meth_copy.3
+MLINKS+= EVP_PKEY_meth_new.3 EVP_PKEY_meth_find.3
+MLINKS+= EVP_PKEY_meth_new.3 EVP_PKEY_meth_free.3
+MLINKS+= EVP_PKEY_meth_new.3 EVP_PKEY_meth_get_cleanup.3
+MLINKS+= EVP_PKEY_meth_new.3 EVP_PKEY_meth_get_copy.3
+MLINKS+= EVP_PKEY_meth_new.3 EVP_PKEY_meth_get_ctrl.3
+MLINKS+= EVP_PKEY_meth_new.3 EVP_PKEY_meth_get_decrypt.3
+MLINKS+= EVP_PKEY_meth_new.3 EVP_PKEY_meth_get_derive.3
+MLINKS+= EVP_PKEY_meth_new.3 EVP_PKEY_meth_get_encrypt.3
+MLINKS+= EVP_PKEY_meth_new.3 EVP_PKEY_meth_get_init.3
+MLINKS+= EVP_PKEY_meth_new.3 EVP_PKEY_meth_get_keygen.3
+MLINKS+= EVP_PKEY_meth_new.3 EVP_PKEY_meth_get_paramgen.3
+MLINKS+= EVP_PKEY_meth_new.3 EVP_PKEY_meth_get_sign.3
+MLINKS+= EVP_PKEY_meth_new.3 EVP_PKEY_meth_get_signctx.3
+MLINKS+= EVP_PKEY_meth_new.3 EVP_PKEY_meth_get_verify.3
+MLINKS+= EVP_PKEY_meth_new.3 EVP_PKEY_meth_get_verify_recover.3
+MLINKS+= EVP_PKEY_meth_new.3 EVP_PKEY_meth_get_verifyctx.3
+MLINKS+= EVP_PKEY_meth_new.3 EVP_PKEY_meth_set_cleanup.3
+MLINKS+= EVP_PKEY_meth_new.3 EVP_PKEY_meth_set_copy.3
+MLINKS+= EVP_PKEY_meth_new.3 EVP_PKEY_meth_set_ctrl.3
+MLINKS+= EVP_PKEY_meth_new.3 EVP_PKEY_meth_set_decrypt.3
+MLINKS+= EVP_PKEY_meth_new.3 EVP_PKEY_meth_set_derive.3
+MLINKS+= EVP_PKEY_meth_new.3 EVP_PKEY_meth_set_encrypt.3
+MLINKS+= EVP_PKEY_meth_new.3 EVP_PKEY_meth_set_init.3
+MLINKS+= EVP_PKEY_meth_new.3 EVP_PKEY_meth_set_keygen.3
+MLINKS+= EVP_PKEY_meth_new.3 EVP_PKEY_meth_set_paramgen.3
+MLINKS+= EVP_PKEY_meth_new.3 EVP_PKEY_meth_set_sign.3
+MLINKS+= EVP_PKEY_meth_new.3 EVP_PKEY_meth_set_signctx.3
+MLINKS+= EVP_PKEY_meth_new.3 EVP_PKEY_meth_set_verify.3
+MLINKS+= EVP_PKEY_meth_new.3 EVP_PKEY_meth_set_verify_recover.3
+MLINKS+= EVP_PKEY_meth_new.3 EVP_PKEY_meth_set_verifyctx.3
 MLINKS+= EVP_PKEY_new.3 EVP_PKEY_free.3
+MLINKS+= EVP_PKEY_print_private.3 EVP_PKEY_print_params.3
 MLINKS+= EVP_PKEY_print_private.3 EVP_PKEY_print_public.3
-MLINKS+= EVP_PKEY_print_private.3 EVP_PKEY_print_params.3
+MLINKS+= EVP_PKEY_set1_RSA.3 EVP_PKEY_assign_DH.3
+MLINKS+= EVP_PKEY_set1_RSA.3 EVP_PKEY_assign_DSA.3
+MLINKS+= EVP_PKEY_set1_RSA.3 EVP_PKEY_assign_EC_KEY.3
+MLINKS+= EVP_PKEY_set1_RSA.3 EVP_PKEY_assign_RSA.3
+MLINKS+= EVP_PKEY_set1_RSA.3 EVP_PKEY_get1_DH.3
+MLINKS+= EVP_PKEY_set1_RSA.3 EVP_PKEY_get1_DSA.3
+MLINKS+= EVP_PKEY_set1_RSA.3 EVP_PKEY_get1_EC_KEY.3
+MLINKS+= EVP_PKEY_set1_RSA.3 EVP_PKEY_get1_RSA.3
+MLINKS+= EVP_PKEY_set1_RSA.3 EVP_PKEY_set1_DH.3
 MLINKS+= EVP_PKEY_set1_RSA.3 EVP_PKEY_set1_DSA.3
-MLINKS+= EVP_PKEY_set1_RSA.3 EVP_PKEY_set1_DH.3
 MLINKS+= EVP_PKEY_set1_RSA.3 EVP_PKEY_set1_EC_KEY.3
-MLINKS+= EVP_PKEY_set1_RSA.3 EVP_PKEY_get1_RSA.3
-MLINKS+= EVP_PKEY_set1_RSA.3 EVP_PKEY_get1_DSA.3
-MLINKS+= EVP_PKEY_set1_RSA.3 EVP_PKEY_get1_DH.3
-MLINKS+= EVP_PKEY_set1_RSA.3 EVP_PKEY_get1_EC_KEY.3
-MLINKS+= EVP_PKEY_set1_RSA.3 EVP_PKEY_assign_RSA.3
-MLINKS+= EVP_PKEY_set1_RSA.3 EVP_PKEY_assign_DSA.3
-MLINKS+= EVP_PKEY_set1_RSA.3 EVP_PKEY_assign_DH.3
-MLINKS+= EVP_PKEY_set1_RSA.3 EVP_PKEY_assign_EC_KEY.3
 MLINKS+= EVP_PKEY_set1_RSA.3 EVP_PKEY_type.3
 MLINKS+= EVP_PKEY_sign.3 EVP_PKEY_sign_init.3
 MLINKS+= EVP_PKEY_verify.3 EVP_PKEY_verify_init.3
 MLINKS+= EVP_PKEY_verify_recover.3 EVP_PKEY_verify_recover_init.3
+MLINKS+= EVP_SealInit.3 EVP_SealFinal.3
 MLINKS+= EVP_SealInit.3 EVP_SealUpdate.3
-MLINKS+= EVP_SealInit.3 EVP_SealFinal.3
+MLINKS+= EVP_SignInit.3 EVP_SignFinal.3
 MLINKS+= EVP_SignInit.3 EVP_SignInit_ex.3
 MLINKS+= EVP_SignInit.3 EVP_SignUpdate.3
-MLINKS+= EVP_SignInit.3 EVP_SignFinal.3
+MLINKS+= EVP_VerifyInit.3 EVP_VerifyFinal.3
 MLINKS+= EVP_VerifyInit.3 EVP_VerifyUpdate.3
-MLINKS+= EVP_VerifyInit.3 EVP_VerifyFinal.3
+MLINKS+= OBJ_nid2obj.3 OBJ_cleanup.3
+MLINKS+= OBJ_nid2obj.3 OBJ_cmp.3
+MLINKS+= OBJ_nid2obj.3 OBJ_create.3
+MLINKS+= OBJ_nid2obj.3 OBJ_dup.3
+MLINKS+= OBJ_nid2obj.3 OBJ_ln2nid.3
 MLINKS+= OBJ_nid2obj.3 OBJ_nid2ln.3
 MLINKS+= OBJ_nid2obj.3 OBJ_nid2sn.3
 MLINKS+= OBJ_nid2obj.3 OBJ_obj2nid.3
+MLINKS+= OBJ_nid2obj.3 OBJ_obj2txt.3
+MLINKS+= OBJ_nid2obj.3 OBJ_sn2nid.3
 MLINKS+= OBJ_nid2obj.3 OBJ_txt2nid.3
-MLINKS+= OBJ_nid2obj.3 OBJ_ln2nid.3
-MLINKS+= OBJ_nid2obj.3 OBJ_sn2nid.3
-MLINKS+= OBJ_nid2obj.3 OBJ_cmp.3
-MLINKS+= OBJ_nid2obj.3 OBJ_dup.3
 MLINKS+= OBJ_nid2obj.3 OBJ_txt2obj.3
-MLINKS+= OBJ_nid2obj.3 OBJ_obj2txt.3
-MLINKS+= OBJ_nid2obj.3 OBJ_create.3
-MLINKS+= OBJ_nid2obj.3 OBJ_cleanup.3
+MLINKS+= OPENSSL_VERSION_NUMBER.3 OPENSSL_VERSION_TEXT.3
 MLINKS+= OPENSSL_VERSION_NUMBER.3 SSLeay.3
 MLINKS+= OPENSSL_VERSION_NUMBER.3 SSLeay_version.3
 MLINKS+= OPENSSL_config.3 OPENSSL_no_config.3
+MLINKS+= OPENSSL_ia32cap.3 OPENSSL_ia32cap_loc.3
+MLINKS+= OPENSSL_instrument_bus.3 OPENSSL_instrument_bus2.3
+MLINKS+= OPENSSL_load_builtin_modules.3 ASN1_add_oid_module.3
+MLINKS+= OPENSSL_load_builtin_modules.3 ENGINE_add_conf_module.3
+MLINKS+= OpenSSL_add_all_algorithms.3 EVP_cleanup.3
 MLINKS+= OpenSSL_add_all_algorithms.3 OpenSSL_add_all_ciphers.3
 MLINKS+= OpenSSL_add_all_algorithms.3 OpenSSL_add_all_digests.3
+MLINKS+= PKCS7_verify.3 PKCS7_get0_signers.3
+MLINKS+= RAND_add.3 RAND_event.3
+MLINKS+= RAND_add.3 RAND_screen.3
 MLINKS+= RAND_add.3 RAND_seed.3
 MLINKS+= RAND_add.3 RAND_status.3
-MLINKS+= RAND_add.3 RAND_event.3
-MLINKS+= RAND_add.3 RAND_screen.3
 MLINKS+= RAND_bytes.3 RAND_pseudo_bytes.3
+MLINKS+= RAND_egd.3 RAND_egd_bytes.3
+MLINKS+= RAND_egd.3 RAND_query_egd_bytes.3
+MLINKS+= RAND_load_file.3 RAND_file_name.3
 MLINKS+= RAND_load_file.3 RAND_write_file.3
-MLINKS+= RAND_load_file.3 RAND_file_name.3
+MLINKS+= RAND_set_rand_method.3 RAND_SSLeay.3
 MLINKS+= RAND_set_rand_method.3 RAND_get_rand_method.3
-MLINKS+= RAND_set_rand_method.3 RAND_SSLeay.3
 MLINKS+= RSA_blinding_on.3 RSA_blinding_off.3
+MLINKS+= RSA_generate_key.3 RSA_generate_key_ex.3
+MLINKS+= RSA_get_ex_new_index.3 RSA_get_ex_data.3
 MLINKS+= RSA_get_ex_new_index.3 RSA_set_ex_data.3
-MLINKS+= RSA_get_ex_new_index.3 RSA_get_ex_data.3
 MLINKS+= RSA_new.3 RSA_free.3
+MLINKS+= RSA_padding_add_PKCS1_type_1.3 RSA_padding_add_PKCS1_OAEP.3
+MLINKS+= RSA_padding_add_PKCS1_type_1.3 RSA_padding_add_PKCS1_type_2.3
+MLINKS+= RSA_padding_add_PKCS1_type_1.3 RSA_padding_add_SSLv23.3
+MLINKS+= RSA_padding_add_PKCS1_type_1.3 RSA_padding_add_none.3
+MLINKS+= RSA_padding_add_PKCS1_type_1.3 RSA_padding_check_PKCS1_OAEP.3
 MLINKS+= RSA_padding_add_PKCS1_type_1.3 RSA_padding_check_PKCS1_type_1.3
-MLINKS+= RSA_padding_add_PKCS1_type_1.3 RSA_padding_add_PKCS1_type_2.3
 MLINKS+= RSA_padding_add_PKCS1_type_1.3 RSA_padding_check_PKCS1_type_2.3
-MLINKS+= RSA_padding_add_PKCS1_type_1.3 RSA_padding_add_PKCS1_OAEP.3
-MLINKS+= RSA_padding_add_PKCS1_type_1.3 RSA_padding_check_PKCS1_OAEP.3
-MLINKS+= RSA_padding_add_PKCS1_type_1.3 RSA_padding_add_SSLv23.3
 MLINKS+= RSA_padding_add_PKCS1_type_1.3 RSA_padding_check_SSLv23.3
-MLINKS+= RSA_padding_add_PKCS1_type_1.3 RSA_padding_add_none.3
 MLINKS+= RSA_padding_add_PKCS1_type_1.3 RSA_padding_check_none.3
-MLINKS+= RSA_print.3 RSA_print_fp.3
+MLINKS+= RSA_print.3 DHparams_print.3
+MLINKS+= RSA_print.3 DHparams_print_fp.3
+MLINKS+= RSA_print.3 DSA_print.3
+MLINKS+= RSA_print.3 DSA_print_fp.3
 MLINKS+= RSA_print.3 DSAparams_print.3
 MLINKS+= RSA_print.3 DSAparams_print_fp.3
-MLINKS+= RSA_print.3 DSA_print.3
-MLINKS+= RSA_print.3 DSA_print_fp.3
-MLINKS+= RSA_print.3 DHparams_print.3
-MLINKS+= RSA_print.3 DHparams_print_fp.3
+MLINKS+= RSA_print.3 RSA_print_fp.3
 MLINKS+= RSA_private_encrypt.3 RSA_public_decrypt.3
 MLINKS+= RSA_public_encrypt.3 RSA_private_decrypt.3
-MLINKS+= RSA_set_method.3 RSA_set_default_method.3
+MLINKS+= RSA_set_method.3 RSA_PKCS1_SSLeay.3
+MLINKS+= RSA_set_method.3 RSA_flags.3
 MLINKS+= RSA_set_method.3 RSA_get_default_method.3
 MLINKS+= RSA_set_method.3 RSA_get_method.3
-MLINKS+= RSA_set_method.3 RSA_PKCS1_SSLeay.3
+MLINKS+= RSA_set_method.3 RSA_new_method.3
 MLINKS+= RSA_set_method.3 RSA_null_method.3
-MLINKS+= RSA_set_method.3 RSA_flags.3
-MLINKS+= RSA_set_method.3 RSA_new_method.3
+MLINKS+= RSA_set_method.3 RSA_set_default_method.3
 MLINKS+= RSA_sign.3 RSA_verify.3
 MLINKS+= RSA_sign_ASN1_OCTET_STRING.3 RSA_verify_ASN1_OCTET_STRING.3
+MLINKS+= X509_NAME_ENTRY_get_object.3 X509_NAME_ENTRY_create_by_NID.3
+MLINKS+= X509_NAME_ENTRY_get_object.3 X509_NAME_ENTRY_create_by_OBJ.3
+MLINKS+= X509_NAME_ENTRY_get_object.3 X509_NAME_ENTRY_create_by_txt.3
 MLINKS+= X509_NAME_ENTRY_get_object.3 X509_NAME_ENTRY_get_data.3
+MLINKS+= X509_NAME_ENTRY_get_object.3 X509_NAME_ENTRY_set_data.3
 MLINKS+= X509_NAME_ENTRY_get_object.3 X509_NAME_ENTRY_set_object.3
-MLINKS+= X509_NAME_ENTRY_get_object.3 X509_NAME_ENTRY_set_data.3
-MLINKS+= X509_NAME_ENTRY_get_object.3 X509_NAME_ENTRY_create_by_txt.3
-MLINKS+= X509_NAME_ENTRY_get_object.3 X509_NAME_ENTRY_create_by_NID.3
-MLINKS+= X509_NAME_ENTRY_get_object.3 X509_NAME_ENTRY_create_by_OBJ.3
+MLINKS+= X509_NAME_add_entry_by_txt.3 X509_NAME_add_entry.3
+MLINKS+= X509_NAME_add_entry_by_txt.3 X509_NAME_add_entry_by_NID.3
 MLINKS+= X509_NAME_add_entry_by_txt.3 X509_NAME_add_entry_by_OBJ.3
-MLINKS+= X509_NAME_add_entry_by_txt.3 X509_NAME_add_entry_by_NID.3
-MLINKS+= X509_NAME_add_entry_by_txt.3 X509_NAME_add_entry.3
 MLINKS+= X509_NAME_add_entry_by_txt.3 X509_NAME_delete_entry.3
+MLINKS+= X509_NAME_get_index_by_NID.3 X509_NAME_entry_count.3
+MLINKS+= X509_NAME_get_index_by_NID.3 X509_NAME_get_entry.3
 MLINKS+= X509_NAME_get_index_by_NID.3 X509_NAME_get_index_by_OBJ.3
-MLINKS+= X509_NAME_get_index_by_NID.3 X509_NAME_get_entry.3
-MLINKS+= X509_NAME_get_index_by_NID.3 X509_NAME_entry_count.3
 MLINKS+= X509_NAME_get_index_by_NID.3 X509_NAME_get_text_by_NID.3
 MLINKS+= X509_NAME_get_index_by_NID.3 X509_NAME_get_text_by_OBJ.3
+MLINKS+= X509_NAME_print_ex.3 X509_NAME_oneline.3
+MLINKS+= X509_NAME_print_ex.3 X509_NAME_print.3
 MLINKS+= X509_NAME_print_ex.3 X509_NAME_print_ex_fp.3
-MLINKS+= X509_NAME_print_ex.3 X509_NAME_print.3
-MLINKS+= X509_NAME_print_ex.3 X509_NAME_oneline.3
+MLINKS+= X509_STORE_CTX_get_error.3 X509_STORE_CTX_get1_chain.3
+MLINKS+= X509_STORE_CTX_get_error.3 X509_STORE_CTX_get_current_cert.3
+MLINKS+= X509_STORE_CTX_get_error.3 X509_STORE_CTX_get_error_depth.3
 MLINKS+= X509_STORE_CTX_get_error.3 X509_STORE_CTX_set_error.3
-MLINKS+= X509_STORE_CTX_get_error.3 X509_STORE_CTX_get_error_depth.3
-MLINKS+= X509_STORE_CTX_get_error.3 X509_STORE_CTX_get_current_cert.3
-MLINKS+= X509_STORE_CTX_get_error.3 X509_STORE_CTX_get1_chain.3
 MLINKS+= X509_STORE_CTX_get_error.3 X509_verify_cert_error_string.3
+MLINKS+= X509_STORE_CTX_get_ex_new_index.3 X509_STORE_CTX_get_ex_data.3
 MLINKS+= X509_STORE_CTX_get_ex_new_index.3 X509_STORE_CTX_set_ex_data.3
-MLINKS+= X509_STORE_CTX_get_ex_new_index.3 X509_STORE_CTX_get_ex_data.3
 MLINKS+= X509_STORE_CTX_new.3 X509_STORE_CTX_cleanup.3
 MLINKS+= X509_STORE_CTX_new.3 X509_STORE_CTX_free.3
+MLINKS+= X509_STORE_CTX_new.3 X509_STORE_CTX_get0_param.3
 MLINKS+= X509_STORE_CTX_new.3 X509_STORE_CTX_init.3
-MLINKS+= X509_STORE_CTX_new.3 X509_STORE_CTX_trusted_stack.3
+MLINKS+= X509_STORE_CTX_new.3 X509_STORE_CTX_set0_crls.3
+MLINKS+= X509_STORE_CTX_new.3 X509_STORE_CTX_set0_param.3
 MLINKS+= X509_STORE_CTX_new.3 X509_STORE_CTX_set_cert.3
 MLINKS+= X509_STORE_CTX_new.3 X509_STORE_CTX_set_chain.3
-MLINKS+= X509_STORE_CTX_new.3 X509_STORE_CTX_set0_crls.3
-MLINKS+= X509_STORE_CTX_new.3 X509_STORE_CTX_get0_param.3
-MLINKS+= X509_STORE_CTX_new.3 X509_STORE_CTX_set0_param.3
 MLINKS+= X509_STORE_CTX_new.3 X509_STORE_CTX_set_default.3
+MLINKS+= X509_STORE_CTX_new.3 X509_STORE_CTX_trusted_stack.3
 MLINKS+= X509_STORE_set_verify_cb_func.3 X509_STORE_set_verify_cb.3
+MLINKS+= X509_VERIFY_PARAM_set_flags.3 X509_VERIFY_PARAM_add0_policy.3
+MLINKS+= X509_VERIFY_PARAM_set_flags.3 X509_VERIFY_PARAM_add1_host.3
 MLINKS+= X509_VERIFY_PARAM_set_flags.3 X509_VERIFY_PARAM_clear_flags.3
+MLINKS+= X509_VERIFY_PARAM_set_flags.3 X509_VERIFY_PARAM_get0_peername.3
+MLINKS+= X509_VERIFY_PARAM_set_flags.3 X509_VERIFY_PARAM_get_depth.3
 MLINKS+= X509_VERIFY_PARAM_set_flags.3 X509_VERIFY_PARAM_get_flags.3
+MLINKS+= X509_VERIFY_PARAM_set_flags.3 X509_VERIFY_PARAM_set1_email.3
+MLINKS+= X509_VERIFY_PARAM_set_flags.3 X509_VERIFY_PARAM_set1_host.3
+MLINKS+= X509_VERIFY_PARAM_set_flags.3 X509_VERIFY_PARAM_set1_ip.3
+MLINKS+= X509_VERIFY_PARAM_set_flags.3 X509_VERIFY_PARAM_set1_ip_asc.3
+MLINKS+= X509_VERIFY_PARAM_set_flags.3 X509_VERIFY_PARAM_set1_policies.3
+MLINKS+= X509_VERIFY_PARAM_set_flags.3 X509_VERIFY_PARAM_set_depth.3
+MLINKS+= X509_VERIFY_PARAM_set_flags.3 X509_VERIFY_PARAM_set_hostflags.3
 MLINKS+= X509_VERIFY_PARAM_set_flags.3 X509_VERIFY_PARAM_set_purpose.3
+MLINKS+= X509_VERIFY_PARAM_set_flags.3 X509_VERIFY_PARAM_set_time.3
 MLINKS+= X509_VERIFY_PARAM_set_flags.3 X509_VERIFY_PARAM_set_trust.3
-MLINKS+= X509_VERIFY_PARAM_set_flags.3 X509_VERIFY_PARAM_set_depth.3
-MLINKS+= X509_VERIFY_PARAM_set_flags.3 X509_VERIFY_PARAM_get_depth.3
-MLINKS+= X509_VERIFY_PARAM_set_flags.3 X509_VERIFY_PARAM_set_time.3
-MLINKS+= X509_VERIFY_PARAM_set_flags.3 X509_VERIFY_PARAM_add0_policy.3
-MLINKS+= X509_VERIFY_PARAM_set_flags.3 X509_VERIFY_PARAM_set1_policies.3
+MLINKS+= X509_check_host.3 X509_check_email.3
+MLINKS+= X509_check_host.3 X509_check_ip.3
+MLINKS+= X509_check_host.3 X509_check_ip_asc.3
+MLINKS+= X509_check_private_key.3 X509_REQ_check_private_key.3
 MLINKS+= X509_new.3 X509_free.3
-MLINKS+= blowfish.3 BF_set_key.3
-MLINKS+= blowfish.3 BF_encrypt.3
+MLINKS+= blowfish.3 BF_cbc_encrypt.3
+MLINKS+= blowfish.3 BF_cfb64_encrypt.3
 MLINKS+= blowfish.3 BF_decrypt.3
 MLINKS+= blowfish.3 BF_ecb_encrypt.3
-MLINKS+= blowfish.3 BF_cbc_encrypt.3
-MLINKS+= blowfish.3 BF_cfb64_encrypt.3
+MLINKS+= blowfish.3 BF_encrypt.3
 MLINKS+= blowfish.3 BF_ofb64_encrypt.3
 MLINKS+= blowfish.3 BF_options.3
-MLINKS+= bn_internal.3 bn_mul_words.3
+MLINKS+= blowfish.3 BF_set_key.3
+MLINKS+= bn_internal.3 bn_add_words.3
+MLINKS+= bn_internal.3 bn_check_top.3
+MLINKS+= bn_internal.3 bn_cmp_words.3
+MLINKS+= bn_internal.3 bn_div_words.3
+MLINKS+= bn_internal.3 bn_dump.3
+MLINKS+= bn_internal.3 bn_expand.3
+MLINKS+= bn_internal.3 bn_expand2.3
+MLINKS+= bn_internal.3 bn_fix_top.3
 MLINKS+= bn_internal.3 bn_mul_add_words.3
-MLINKS+= bn_internal.3 bn_sqr_words.3
-MLINKS+= bn_internal.3 bn_div_words.3
-MLINKS+= bn_internal.3 bn_add_words.3
-MLINKS+= bn_internal.3 bn_sub_words.3
 MLINKS+= bn_internal.3 bn_mul_comba4.3
 MLINKS+= bn_internal.3 bn_mul_comba8.3
+MLINKS+= bn_internal.3 bn_mul_high.3
+MLINKS+= bn_internal.3 bn_mul_low_normal.3
+MLINKS+= bn_internal.3 bn_mul_low_recursive.3
+MLINKS+= bn_internal.3 bn_mul_normal.3
+MLINKS+= bn_internal.3 bn_mul_part_recursive.3
+MLINKS+= bn_internal.3 bn_mul_recursive.3
+MLINKS+= bn_internal.3 bn_mul_words.3
+MLINKS+= bn_internal.3 bn_print.3
+MLINKS+= bn_internal.3 bn_set_high.3
+MLINKS+= bn_internal.3 bn_set_low.3
+MLINKS+= bn_internal.3 bn_set_max.3
 MLINKS+= bn_internal.3 bn_sqr_comba4.3
 MLINKS+= bn_internal.3 bn_sqr_comba8.3
-MLINKS+= bn_internal.3 bn_cmp_words.3
-MLINKS+= bn_internal.3 bn_mul_normal.3
-MLINKS+= bn_internal.3 bn_mul_low_normal.3
-MLINKS+= bn_internal.3 bn_mul_recursive.3
-MLINKS+= bn_internal.3 bn_mul_part_recursive.3
-MLINKS+= bn_internal.3 bn_mul_low_recursive.3
-MLINKS+= bn_internal.3 bn_mul_high.3
 MLINKS+= bn_internal.3 bn_sqr_normal.3
 MLINKS+= bn_internal.3 bn_sqr_recursive.3
-MLINKS+= bn_internal.3 bn_expand.3
+MLINKS+= bn_internal.3 bn_sqr_words.3
+MLINKS+= bn_internal.3 bn_sub_words.3
 MLINKS+= bn_internal.3 bn_wexpand.3
-MLINKS+= bn_internal.3 bn_expand2.3
-MLINKS+= bn_internal.3 bn_fix_top.3
-MLINKS+= bn_internal.3 bn_check_top.3
-MLINKS+= bn_internal.3 bn_print.3
-MLINKS+= bn_internal.3 bn_dump.3
-MLINKS+= bn_internal.3 bn_set_max.3
-MLINKS+= bn_internal.3 bn_set_high.3
-MLINKS+= bn_internal.3 bn_set_low.3
+MLINKS+= buffer.3 BUF_MEM_free.3
+MLINKS+= buffer.3 BUF_MEM_grow.3
 MLINKS+= buffer.3 BUF_MEM_new.3
 MLINKS+= buffer.3 BUF_MEM_new_ex.3
-MLINKS+= buffer.3 BUF_MEM_free.3
-MLINKS+= buffer.3 BUF_MEM_grow.3
+MLINKS+= buffer.3 BUF_memdup.3
 MLINKS+= buffer.3 BUF_strdup.3
+MLINKS+= buffer.3 BUF_strlcat.3
+MLINKS+= buffer.3 BUF_strlcpy.3
 MLINKS+= buffer.3 BUF_strndup.3
-MLINKS+= buffer.3 BUF_memdup.3
-MLINKS+= buffer.3 BUF_strlcpy.3
-MLINKS+= buffer.3 BUF_strlcat.3
 MLINKS+= d2i_ASN1_OBJECT.3 i2d_ASN1_OBJECT.3
 MLINKS+= d2i_CMS_ContentInfo.3 i2d_CMS_ContentInfo.3
 MLINKS+= d2i_DHparams.3 i2d_DHparams.3
-MLINKS+= d2i_DSAPublicKey.3 i2d_DSAPublicKey.3
 MLINKS+= d2i_DSAPublicKey.3 d2i_DSAPrivateKey.3
+MLINKS+= d2i_DSAPublicKey.3 d2i_DSA_PUBKEY.3
+MLINKS+= d2i_DSAPublicKey.3 d2i_DSA_SIG.3
+MLINKS+= d2i_DSAPublicKey.3 d2i_DSAparams.3
 MLINKS+= d2i_DSAPublicKey.3 i2d_DSAPrivateKey.3
-MLINKS+= d2i_DSAPublicKey.3 d2i_DSA_PUBKEY.3
+MLINKS+= d2i_DSAPublicKey.3 i2d_DSAPublicKey.3
 MLINKS+= d2i_DSAPublicKey.3 i2d_DSA_PUBKEY.3
-MLINKS+= d2i_DSAPublicKey.3 d2i_DSA_SIG.3
 MLINKS+= d2i_DSAPublicKey.3 i2d_DSA_SIG.3
+MLINKS+= d2i_DSAPublicKey.3 i2d_DSAparams.3
+MLINKS+= d2i_ECPKParameters.3 ECPKParameters_print.3
+MLINKS+= d2i_ECPKParameters.3 ECPKParameters_print_fp.3
+MLINKS+= d2i_ECPKParameters.3 d2i_ECPKParameters_bio.3
+MLINKS+= d2i_ECPKParameters.3 d2i_ECPKParameters_fp.3
+MLINKS+= d2i_ECPKParameters.3 i2d_ECPKParameters.3
+MLINKS+= d2i_ECPKParameters.3 i2d_ECPKParameters_bio.3
+MLINKS+= d2i_ECPKParameters.3 i2d_ECPKParameters_fp.3
+MLINKS+= d2i_ECPrivateKey.3 d2i_ECPrivate_key.3
 MLINKS+= d2i_ECPrivateKey.3 i2d_ECPrivateKey.3
-MLINKS+= d2i_ECPrivateKey.3 d2i_ECPrivate_key.3
 MLINKS+= d2i_PKCS8PrivateKey.3 d2i_PKCS8PrivateKey_bio.3
 MLINKS+= d2i_PKCS8PrivateKey.3 d2i_PKCS8PrivateKey_fp.3
 MLINKS+= d2i_PKCS8PrivateKey.3 i2d_PKCS8PrivateKey_bio.3
@@ -766,51 +1022,41 @@
 MLINKS+= d2i_PKCS8PrivateKey.3 i2d_PKCS8PrivateKey_fp.3
 MLINKS+= d2i_PKCS8PrivateKey.3 i2d_PKCS8PrivateKey_nid_bio.3
 MLINKS+= d2i_PKCS8PrivateKey.3 i2d_PKCS8PrivateKey_nid_fp.3
+MLINKS+= d2i_PrivateKey.3 d2i_AutoPrivateKey.3
 MLINKS+= d2i_PrivateKey.3 d2i_Private_key.3
-MLINKS+= d2i_PrivateKey.3 d2i_AutoPrivateKey.3
 MLINKS+= d2i_PrivateKey.3 i2d_PrivateKey.3
-MLINKS+= d2i_RSAPublicKey.3 i2d_RSAPublicKey.3
+MLINKS+= d2i_RSAPublicKey.3 d2i_Netscape_RSA.3
 MLINKS+= d2i_RSAPublicKey.3 d2i_RSAPrivateKey.3
+MLINKS+= d2i_RSAPublicKey.3 d2i_RSA_PUBKEY.3
+MLINKS+= d2i_RSAPublicKey.3 i2d_Netscape_RSA.3
 MLINKS+= d2i_RSAPublicKey.3 i2d_RSAPrivateKey.3
-MLINKS+= d2i_RSAPublicKey.3 d2i_RSA_PUBKEY.3
+MLINKS+= d2i_RSAPublicKey.3 i2d_RSAPublicKey.3
 MLINKS+= d2i_RSAPublicKey.3 i2d_RSA_PUBKEY.3
-MLINKS+= d2i_RSAPublicKey.3 i2d_Netscape_RSA.3
-MLINKS+= d2i_RSAPublicKey.3 d2i_Netscape_RSA.3
-MLINKS+= d2i_X509.3 i2d_X509.3
 MLINKS+= d2i_X509.3 d2i_X509_bio.3
 MLINKS+= d2i_X509.3 d2i_X509_fp.3
+MLINKS+= d2i_X509.3 i2d_X509.3
 MLINKS+= d2i_X509.3 i2d_X509_bio.3
 MLINKS+= d2i_X509.3 i2d_X509_fp.3
 MLINKS+= d2i_X509_ALGOR.3 i2d_X509_ALGOR.3
+MLINKS+= d2i_X509_CRL.3 d2i_X509_CRL_bio.3
+MLINKS+= d2i_X509_CRL.3 d2i_X509_CRL_fp.3
 MLINKS+= d2i_X509_CRL.3 i2d_X509_CRL.3
-MLINKS+= d2i_X509_CRL.3 d2i_X509_CRL_bio.3
-MLINKS+= d2i_X509_CRL.3 d2i_509_CRL_fp.3
 MLINKS+= d2i_X509_CRL.3 i2d_X509_CRL_bio.3
 MLINKS+= d2i_X509_CRL.3 i2d_X509_CRL_fp.3
 MLINKS+= d2i_X509_NAME.3 i2d_X509_NAME.3
-MLINKS+= d2i_X509_REQ.3 i2d_X509_REQ.3
 MLINKS+= d2i_X509_REQ.3 d2i_X509_REQ_bio.3
 MLINKS+= d2i_X509_REQ.3 d2i_X509_REQ_fp.3
+MLINKS+= d2i_X509_REQ.3 i2d_X509_REQ.3
 MLINKS+= d2i_X509_REQ.3 i2d_X509_REQ_bio.3
 MLINKS+= d2i_X509_REQ.3 i2d_X509_REQ_fp.3
 MLINKS+= d2i_X509_SIG.3 i2d_X509_SIG.3
-MLINKS+= des.3 DES_random_key.3
-MLINKS+= des.3 DES_set_key.3
-MLINKS+= des.3 DES_key_sched.3
-MLINKS+= des.3 DES_set_key_checked.3
-MLINKS+= des.3 DES_set_key_unchecked.3
-MLINKS+= des.3 DES_set_odd_parity.3
-MLINKS+= des.3 DES_is_weak_key.3
-MLINKS+= des.3 DES_ecb_encrypt.3
+MLINKS+= des.3 DES_cbc_cksum.3
+MLINKS+= des.3 DES_cfb64_encrypt.3
+MLINKS+= des.3 DES_cfb_encrypt.3
+MLINKS+= des.3 DES_crypt.3
 MLINKS+= des.3 DES_ecb2_encrypt.3
 MLINKS+= des.3 DES_ecb3_encrypt.3
-MLINKS+= des.3 DES_ncbc_encrypt.3
-MLINKS+= des.3 DES_cfb_encrypt.3
-MLINKS+= des.3 DES_ofb_encrypt.3
-MLINKS+= des.3 DES_pcbc_encrypt.3
-MLINKS+= des.3 DES_cfb64_encrypt.3
-MLINKS+= des.3 DES_ofb64_encrypt.3
-MLINKS+= des.3 DES_xcbc_encrypt.3
+MLINKS+= des.3 DES_ecb_encrypt.3
 MLINKS+= des.3 DES_ede2_cbc_encrypt.3
 MLINKS+= des.3 DES_ede2_cfb64_encrypt.3
 MLINKS+= des.3 DES_ede2_ofb64_encrypt.3
@@ -818,165 +1064,206 @@
 MLINKS+= des.3 DES_ede3_cbcm_encrypt.3
 MLINKS+= des.3 DES_ede3_cfb64_encrypt.3
 MLINKS+= des.3 DES_ede3_ofb64_encrypt.3
-MLINKS+= des.3 DES_cbc_cksum.3
+MLINKS+= des.3 DES_enc_read.3
+MLINKS+= des.3 DES_enc_write.3
+MLINKS+= des.3 DES_fcrypt.3
+MLINKS+= des.3 DES_is_weak_key.3
+MLINKS+= des.3 DES_key_sched.3
+MLINKS+= des.3 DES_ncbc_encrypt.3
+MLINKS+= des.3 DES_ofb64_encrypt.3
+MLINKS+= des.3 DES_ofb_encrypt.3
+MLINKS+= des.3 DES_pcbc_encrypt.3
 MLINKS+= des.3 DES_quad_cksum.3
+MLINKS+= des.3 DES_random_key.3
+MLINKS+= des.3 DES_set_key.3
+MLINKS+= des.3 DES_set_key_checked.3
+MLINKS+= des.3 DES_set_key_unchecked.3
+MLINKS+= des.3 DES_set_odd_parity.3
+MLINKS+= des.3 DES_string_to_2keys.3
 MLINKS+= des.3 DES_string_to_key.3
-MLINKS+= des.3 DES_string_to_2keys.3
-MLINKS+= des.3 DES_fcrypt.3
-MLINKS+= des.3 DES_crypt.3
-MLINKS+= des.3 DES_enc_read.3
-MLINKS+= des.3 DES_enc_write.3
+MLINKS+= des.3 DES_xcbc_encrypt.3
+MLINKS+= ecdsa.3 ECDSA_SIG_free.3
+MLINKS+= ecdsa.3 ECDSA_SIG_new.3
+MLINKS+= ecdsa.3 ECDSA_do_sign.3
+MLINKS+= ecdsa.3 ECDSA_do_sign_ex.3
+MLINKS+= ecdsa.3 ECDSA_do_verify.3
+MLINKS+= ecdsa.3 ECDSA_sign.3
+MLINKS+= ecdsa.3 ECDSA_sign_ex.3
+MLINKS+= ecdsa.3 ECDSA_sign_setup.3
+MLINKS+= ecdsa.3 ECDSA_size.3
+MLINKS+= ecdsa.3 ECDSA_verify.3
+MLINKS+= ecdsa.3 d2i_ECDSA_SIG.3
+MLINKS+= ecdsa.3 i2d_ECDSA_SIG.3
 MLINKS+= hmac.3 HMAC.3
+MLINKS+= hmac.3 HMAC_CTX_cleanup.3
+MLINKS+= hmac.3 HMAC_CTX_init.3
+MLINKS+= hmac.3 HMAC_Final.3
 MLINKS+= hmac.3 HMAC_Init.3
+MLINKS+= hmac.3 HMAC_Init_ex.3
 MLINKS+= hmac.3 HMAC_Update.3
-MLINKS+= hmac.3 HMAC_Final.3
 MLINKS+= hmac.3 HMAC_cleanup.3
 MLINKS+= lh_stats.3 lh_node_stats.3
+MLINKS+= lh_stats.3 lh_node_stats_bio.3
 MLINKS+= lh_stats.3 lh_node_usage_stats.3
+MLINKS+= lh_stats.3 lh_node_usage_stats_bio.3
 MLINKS+= lh_stats.3 lh_stats_bio.3
-MLINKS+= lh_stats.3 lh_node_stats_bio.3
-MLINKS+= lh_stats.3 lh_node_usage_stats_bio.3
-MLINKS+= lhash.3 lh_new.3
-MLINKS+= lhash.3 lh_free.3
-MLINKS+= lhash.3 lh_insert.3
 MLINKS+= lhash.3 lh_delete.3
-MLINKS+= lhash.3 lh_retrieve.3
 MLINKS+= lhash.3 lh_doall.3
 MLINKS+= lhash.3 lh_doall_arg.3
 MLINKS+= lhash.3 lh_error.3
+MLINKS+= lhash.3 lh_free.3
+MLINKS+= lhash.3 lh_insert.3
+MLINKS+= lhash.3 lh_new.3
+MLINKS+= lhash.3 lh_retrieve.3
 MLINKS+= md5.3 MD2.3
-MLINKS+= md5.3 MD4.3
-MLINKS+= md5.3 MD5.3
+MLINKS+= md5.3 MD2_Final.3
 MLINKS+= md5.3 MD2_Init.3
 MLINKS+= md5.3 MD2_Update.3
-MLINKS+= md5.3 MD2_Final.3
+MLINKS+= md5.3 MD4.3
+MLINKS+= md5.3 MD4_Final.3
 MLINKS+= md5.3 MD4_Init.3
 MLINKS+= md5.3 MD4_Update.3
-MLINKS+= md5.3 MD4_Final.3
+MLINKS+= md5.3 MD5.3
+MLINKS+= md5.3 MD5_Final.3
 MLINKS+= md5.3 MD5_Init.3
 MLINKS+= md5.3 MD5_Update.3
-MLINKS+= md5.3 MD5_Final.3
 MLINKS+= mdc2.3 MDC2.3
+MLINKS+= mdc2.3 MDC2_Final.3
 MLINKS+= mdc2.3 MDC2_Init.3
 MLINKS+= mdc2.3 MDC2_Update.3
-MLINKS+= mdc2.3 MDC2_Final.3
 MLINKS+= pem.3 PEM.3
+MLINKS+= pem.3 PEM_read_DHparams.3
+MLINKS+= pem.3 PEM_read_DSAPrivateKey.3
+MLINKS+= pem.3 PEM_read_DSA_PUBKEY.3
+MLINKS+= pem.3 PEM_read_DSAparams.3
+MLINKS+= pem.3 PEM_read_NETSCAPE_CERT_SEQUENCE.3
+MLINKS+= pem.3 PEM_read_PKCS7.3
+MLINKS+= pem.3 PEM_read_PUBKEY.3
+MLINKS+= pem.3 PEM_read_PrivateKey.3
+MLINKS+= pem.3 PEM_read_RSAPrivateKey.3
+MLINKS+= pem.3 PEM_read_RSAPublicKey.3
+MLINKS+= pem.3 PEM_read_RSA_PUBKEY.3
+MLINKS+= pem.3 PEM_read_X509.3
+MLINKS+= pem.3 PEM_read_X509_AUX.3
+MLINKS+= pem.3 PEM_read_X509_CRL.3
+MLINKS+= pem.3 PEM_read_X509_REQ.3
+MLINKS+= pem.3 PEM_read_bio_DHparams.3
+MLINKS+= pem.3 PEM_read_bio_DSAPrivateKey.3
+MLINKS+= pem.3 PEM_read_bio_DSA_PUBKEY.3
+MLINKS+= pem.3 PEM_read_bio_DSAparams.3
+MLINKS+= pem.3 PEM_read_bio_NETSCAPE_CERT_SEQUENCE.3
+MLINKS+= pem.3 PEM_read_bio_PKCS7.3
+MLINKS+= pem.3 PEM_read_bio_PUBKEY.3
 MLINKS+= pem.3 PEM_read_bio_PrivateKey.3
-MLINKS+= pem.3 PEM_read_PrivateKey.3
-MLINKS+= pem.3 PEM_write_bio_PrivateKey.3
-MLINKS+= pem.3 PEM_write_PrivateKey.3
-MLINKS+= pem.3 PEM_write_bio_PKCS8PrivateKey.3
+MLINKS+= pem.3 PEM_read_bio_RSAPrivateKey.3
+MLINKS+= pem.3 PEM_read_bio_RSAPublicKey.3
+MLINKS+= pem.3 PEM_read_bio_RSA_PUBKEY.3
+MLINKS+= pem.3 PEM_read_bio_X509.3
+MLINKS+= pem.3 PEM_read_bio_X509_AUX.3
+MLINKS+= pem.3 PEM_read_bio_X509_CRL.3
+MLINKS+= pem.3 PEM_read_bio_X509_REQ.3
+MLINKS+= pem.3 PEM_write_DHparams.3
+MLINKS+= pem.3 PEM_write_DSAPrivateKey.3
+MLINKS+= pem.3 PEM_write_DSA_PUBKEY.3
+MLINKS+= pem.3 PEM_write_DSAparams.3
+MLINKS+= pem.3 PEM_write_NETSCAPE_CERT_SEQUENCE.3
+MLINKS+= pem.3 PEM_write_PKCS7.3
 MLINKS+= pem.3 PEM_write_PKCS8PrivateKey.3
-MLINKS+= pem.3 PEM_write_bio_PKCS8PrivateKey_nid.3
 MLINKS+= pem.3 PEM_write_PKCS8PrivateKey_nid.3
-MLINKS+= pem.3 PEM_read_bio_PUBKEY.3
-MLINKS+= pem.3 PEM_read_PUBKEY.3
-MLINKS+= pem.3 PEM_write_bio_PUBKEY.3
 MLINKS+= pem.3 PEM_write_PUBKEY.3
-MLINKS+= pem.3 PEM_read_bio_RSAPrivateKey.3
-MLINKS+= pem.3 PEM_read_RSAPrivateKey.3
-MLINKS+= pem.3 PEM_write_bio_RSAPrivateKey.3
+MLINKS+= pem.3 PEM_write_PrivateKey.3
 MLINKS+= pem.3 PEM_write_RSAPrivateKey.3
-MLINKS+= pem.3 PEM_read_bio_RSAPublicKey.3
-MLINKS+= pem.3 PEM_read_RSAPublicKey.3
-MLINKS+= pem.3 PEM_write_bio_RSAPublicKey.3
 MLINKS+= pem.3 PEM_write_RSAPublicKey.3
-MLINKS+= pem.3 PEM_read_bio_RSA_PUBKEY.3
-MLINKS+= pem.3 PEM_read_RSA_PUBKEY.3
-MLINKS+= pem.3 PEM_write_bio_RSA_PUBKEY.3
 MLINKS+= pem.3 PEM_write_RSA_PUBKEY.3
-MLINKS+= pem.3 PEM_read_bio_DSAPrivateKey.3
-MLINKS+= pem.3 PEM_read_DSAPrivateKey.3
+MLINKS+= pem.3 PEM_write_X509.3
+MLINKS+= pem.3 PEM_write_X509_AUX.3
+MLINKS+= pem.3 PEM_write_X509_CRL.3
+MLINKS+= pem.3 PEM_write_X509_REQ.3
+MLINKS+= pem.3 PEM_write_X509_REQ_NEW.3
+MLINKS+= pem.3 PEM_write_bio_DHparams.3
 MLINKS+= pem.3 PEM_write_bio_DSAPrivateKey.3
-MLINKS+= pem.3 PEM_write_DSAPrivateKey.3
-MLINKS+= pem.3 PEM_read_bio_DSA_PUBKEY.3
-MLINKS+= pem.3 PEM_read_DSA_PUBKEY.3
 MLINKS+= pem.3 PEM_write_bio_DSA_PUBKEY.3
-MLINKS+= pem.3 PEM_write_DSA_PUBKEY.3
-MLINKS+= pem.3 PEM_read_bio_DSAparams.3
-MLINKS+= pem.3 PEM_read_DSAparams.3
 MLINKS+= pem.3 PEM_write_bio_DSAparams.3
-MLINKS+= pem.3 PEM_write_DSAparams.3
-MLINKS+= pem.3 PEM_read_bio_DHparams.3
-MLINKS+= pem.3 PEM_read_DHparams.3
-MLINKS+= pem.3 PEM_write_bio_DHparams.3
-MLINKS+= pem.3 PEM_write_DHparams.3
-MLINKS+= pem.3 PEM_read_bio_X509.3
-MLINKS+= pem.3 PEM_read_X509.3
+MLINKS+= pem.3 PEM_write_bio_NETSCAPE_CERT_SEQUENCE.3
+MLINKS+= pem.3 PEM_write_bio_PKCS7.3
+MLINKS+= pem.3 PEM_write_bio_PKCS8PrivateKey.3
+MLINKS+= pem.3 PEM_write_bio_PKCS8PrivateKey_nid.3
+MLINKS+= pem.3 PEM_write_bio_PUBKEY.3
+MLINKS+= pem.3 PEM_write_bio_PrivateKey.3
+MLINKS+= pem.3 PEM_write_bio_RSAPrivateKey.3
+MLINKS+= pem.3 PEM_write_bio_RSAPublicKey.3
+MLINKS+= pem.3 PEM_write_bio_RSA_PUBKEY.3
 MLINKS+= pem.3 PEM_write_bio_X509.3
-MLINKS+= pem.3 PEM_write_X509.3
-MLINKS+= pem.3 PEM_read_bio_X509_AUX.3
-MLINKS+= pem.3 PEM_read_X509_AUX.3
 MLINKS+= pem.3 PEM_write_bio_X509_AUX.3
-MLINKS+= pem.3 PEM_write_X509_AUX.3
-MLINKS+= pem.3 PEM_read_bio_X509_REQ.3
-MLINKS+= pem.3 PEM_read_X509_REQ.3
+MLINKS+= pem.3 PEM_write_bio_X509_CRL.3
 MLINKS+= pem.3 PEM_write_bio_X509_REQ.3
-MLINKS+= pem.3 PEM_write_X509_REQ.3
 MLINKS+= pem.3 PEM_write_bio_X509_REQ_NEW.3
-MLINKS+= pem.3 PEM_write_X509_REQ_NEW.3
-MLINKS+= pem.3 PEM_read_bio_X509_CRL.3
-MLINKS+= pem.3 PEM_read_X509_CRL.3
-MLINKS+= pem.3 PEM_write_bio_X509_CRL.3
-MLINKS+= pem.3 PEM_write_X509_CRL.3
-MLINKS+= pem.3 PEM_read_bio_PKCS7.3
-MLINKS+= pem.3 PEM_read_PKCS7.3
-MLINKS+= pem.3 PEM_write_bio_PKCS7.3
-MLINKS+= pem.3 PEM_write_PKCS7.3
-MLINKS+= pem.3 PEM_read_bio_NETSCAPE_CERT_SEQUENCE.3
-MLINKS+= pem.3 PEM_read_NETSCAPE_CERT_SEQUENCE.3
-MLINKS+= pem.3 PEM_write_bio_NETSCAPE_CERT_SEQUENCE.3
-MLINKS+= pem.3 PEM_write_NETSCAPE_CERT_SEQUENCE.3
+MLINKS+= rc4.3 RC4.3
 MLINKS+= rc4.3 RC4_set_key.3
-MLINKS+= rc4.3 RC4.3
 MLINKS+= ripemd.3 RIPEMD160.3
+MLINKS+= ripemd.3 RIPEMD160_Final.3
 MLINKS+= ripemd.3 RIPEMD160_Init.3
 MLINKS+= ripemd.3 RIPEMD160_Update.3
-MLINKS+= ripemd.3 RIPEMD160_Final.3
 MLINKS+= sha.3 SHA1.3
+MLINKS+= sha.3 SHA1_Final.3
 MLINKS+= sha.3 SHA1_Init.3
 MLINKS+= sha.3 SHA1_Update.3
-MLINKS+= sha.3 SHA1_Final.3
-MLINKS+= threads.3 CRYPTO_THREADID_set_callback.3
-MLINKS+= threads.3 CRYPTO_THREADID_get_callback.3
-MLINKS+= threads.3 CRYPTO_THREADID_current.3
+MLINKS+= sha.3 SHA224.3
+MLINKS+= sha.3 SHA224_Final.3
+MLINKS+= sha.3 SHA224_Init.3
+MLINKS+= sha.3 SHA224_Update.3
+MLINKS+= sha.3 SHA256.3
+MLINKS+= sha.3 SHA256_Final.3
+MLINKS+= sha.3 SHA256_Init.3
+MLINKS+= sha.3 SHA256_Update.3
+MLINKS+= sha.3 SHA384.3
+MLINKS+= sha.3 SHA384_Final.3
+MLINKS+= sha.3 SHA384_Init.3
+MLINKS+= sha.3 SHA384_Update.3
+MLINKS+= sha.3 SHA512.3
+MLINKS+= sha.3 SHA512_Final.3
+MLINKS+= sha.3 SHA512_Init.3
+MLINKS+= sha.3 SHA512_Update.3
 MLINKS+= threads.3 CRYPTO_THREADID_cmp.3
 MLINKS+= threads.3 CRYPTO_THREADID_cpy.3
+MLINKS+= threads.3 CRYPTO_THREADID_current.3
+MLINKS+= threads.3 CRYPTO_THREADID_get_callback.3
 MLINKS+= threads.3 CRYPTO_THREADID_hash.3
-MLINKS+= threads.3 CRYPTO_set_locking_callback.3
+MLINKS+= threads.3 CRYPTO_THREADID_set_callback.3
+MLINKS+= threads.3 CRYPTO_destroy_dynlockid.3
+MLINKS+= threads.3 CRYPTO_get_new_dynlockid.3
+MLINKS+= threads.3 CRYPTO_lock.3
 MLINKS+= threads.3 CRYPTO_num_locks.3
 MLINKS+= threads.3 CRYPTO_set_dynlock_create_callback.3
+MLINKS+= threads.3 CRYPTO_set_dynlock_destroy_callback.3
 MLINKS+= threads.3 CRYPTO_set_dynlock_lock_callback.3
-MLINKS+= threads.3 CRYPTO_set_dynlock_destroy_callback.3
-MLINKS+= threads.3 CRYPTO_get_new_dynlockid.3
-MLINKS+= threads.3 CRYPTO_destroy_dynlockid.3
-MLINKS+= threads.3 CRYPTO_lock.3
-MLINKS+= ui.3 UI_new.3
-MLINKS+= ui.3 UI_new_method.3
-MLINKS+= ui.3 UI_free.3
+MLINKS+= threads.3 CRYPTO_set_locking_callback.3
+MLINKS+= ui.3 ERR_load_UI_strings.3
+MLINKS+= ui.3 UI_OpenSSL.3
+MLINKS+= ui.3 UI_add_error_string.3
+MLINKS+= ui.3 UI_add_info_string.3
+MLINKS+= ui.3 UI_add_input_boolean.3
 MLINKS+= ui.3 UI_add_input_string.3
+MLINKS+= ui.3 UI_add_user_data.3
+MLINKS+= ui.3 UI_add_verify_string.3
+MLINKS+= ui.3 UI_construct_prompt.3
+MLINKS+= ui.3 UI_ctrl.3
+MLINKS+= ui.3 UI_dup_error_string.3
+MLINKS+= ui.3 UI_dup_info_string.3
+MLINKS+= ui.3 UI_dup_input_boolean.3
 MLINKS+= ui.3 UI_dup_input_string.3
-MLINKS+= ui.3 UI_add_verify_string.3
 MLINKS+= ui.3 UI_dup_verify_string.3
-MLINKS+= ui.3 UI_add_input_boolean.3
-MLINKS+= ui.3 UI_dup_input_boolean.3
-MLINKS+= ui.3 UI_add_info_string.3
-MLINKS+= ui.3 UI_dup_info_string.3
-MLINKS+= ui.3 UI_add_error_string.3
-MLINKS+= ui.3 UI_dup_error_string.3
-MLINKS+= ui.3 UI_construct_prompt.3
-MLINKS+= ui.3 UI_add_user_data.3
+MLINKS+= ui.3 UI_free.3
+MLINKS+= ui.3 UI_get0_result.3
 MLINKS+= ui.3 UI_get0_user_data.3
-MLINKS+= ui.3 UI_get0_result.3
+MLINKS+= ui.3 UI_get_default_method.3
+MLINKS+= ui.3 UI_get_method.3
+MLINKS+= ui.3 UI_new.3
+MLINKS+= ui.3 UI_new_method.3
 MLINKS+= ui.3 UI_process.3
-MLINKS+= ui.3 UI_ctrl.3
 MLINKS+= ui.3 UI_set_default_method.3
-MLINKS+= ui.3 UI_get_default_method.3
-MLINKS+= ui.3 UI_get_method.3
 MLINKS+= ui.3 UI_set_method.3
-MLINKS+= ui.3 UI_OpenSSL.3
-MLINKS+= ui.3 ERR_load_UI_strings.3
+MLINKS+= ui_compat.3 des_read_2passwords.3
 MLINKS+= ui_compat.3 des_read_password.3
-MLINKS+= ui_compat.3 des_read_2passwords.3
+MLINKS+= ui_compat.3 des_read_pw.3
 MLINKS+= ui_compat.3 des_read_pw_string.3
-MLINKS+= ui_compat.3 des_read_pw.3

Modified: trunk/secure/lib/libcrypto/engines/Makefile
===================================================================
--- trunk/secure/lib/libcrypto/engines/Makefile	2019-01-20 05:38:27 UTC (rev 12154)
+++ trunk/secure/lib/libcrypto/engines/Makefile	2019-01-20 05:39:21 UTC (rev 12155)
@@ -1,6 +1,7 @@
-# $FreeBSD: stable/10/secure/lib/libcrypto/engines/Makefile 238405 2012-07-12 19:30:53Z jkim $
+# $MidnightBSD$
+# $FreeBSD: stable/11/secure/lib/libcrypto/engines/Makefile 292287 2015-12-15 19:57:56Z bdrewery $
 
-SUBDIR=	lib4758cca libaep libatalla libchil libcswift libgost libnuron \
-	libsureware libubsec
-
+SUBDIR=	lib4758cca libaep libatalla libcapi libchil libcswift libgost \
+	libnuron libsureware libubsec
+SUBDIR_PARALLEL=
 .include <bsd.subdir.mk>

Modified: trunk/secure/lib/libcrypto/engines/Makefile.inc
===================================================================
--- trunk/secure/lib/libcrypto/engines/Makefile.inc	2019-01-20 05:38:27 UTC (rev 12154)
+++ trunk/secure/lib/libcrypto/engines/Makefile.inc	2019-01-20 05:39:21 UTC (rev 12155)
@@ -1,6 +1,7 @@
-# $FreeBSD: stable/10/secure/lib/libcrypto/engines/Makefile.inc 238405 2012-07-12 19:30:53Z jkim $
+# $MidnightBSD$
+# $FreeBSD: stable/11/secure/lib/libcrypto/engines/Makefile.inc 319189 2017-05-30 04:42:36Z ngie $
 
-LCRYPTO_SRC=	${.CURDIR}/../../../../../crypto/openssl
+LCRYPTO_SRC=	${SRCTOP}/crypto/openssl
 .PATH: ${LCRYPTO_SRC}/engines ${LCRYPTO_SRC}/engines/ccgost
 
 SHLIBDIR?= /usr/lib/engines


Property changes on: trunk/secure/lib/libcrypto/engines/Makefile.inc
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/secure/lib/libcrypto/engines/lib4758cca/Makefile
===================================================================
--- trunk/secure/lib/libcrypto/engines/lib4758cca/Makefile	2019-01-20 05:38:27 UTC (rev 12154)
+++ trunk/secure/lib/libcrypto/engines/lib4758cca/Makefile	2019-01-20 05:39:21 UTC (rev 12155)
@@ -1,4 +1,5 @@
-# $FreeBSD: stable/10/secure/lib/libcrypto/engines/lib4758cca/Makefile 276486 2014-12-31 23:25:37Z ngie $
+# $MidnightBSD$
+# $FreeBSD: stable/11/secure/lib/libcrypto/engines/lib4758cca/Makefile 264400 2014-04-13 05:21:56Z imp $
 
 SHLIB_NAME?= lib4758cca.so
 SRCS=	e_4758cca.c

Modified: trunk/secure/lib/libcrypto/engines/libaep/Makefile
===================================================================
--- trunk/secure/lib/libcrypto/engines/libaep/Makefile	2019-01-20 05:38:27 UTC (rev 12154)
+++ trunk/secure/lib/libcrypto/engines/libaep/Makefile	2019-01-20 05:39:21 UTC (rev 12155)
@@ -1,4 +1,5 @@
-# $FreeBSD: stable/10/secure/lib/libcrypto/engines/libaep/Makefile 160819 2006-07-29 19:41:41Z simon $
+# $MidnightBSD$
+# $FreeBSD: stable/11/secure/lib/libcrypto/engines/libaep/Makefile 160819 2006-07-29 19:41:41Z simon $
 
 SHLIB_NAME?= libaep.so
 SRCS=	e_aep.c

Modified: trunk/secure/lib/libcrypto/engines/libatalla/Makefile
===================================================================
--- trunk/secure/lib/libcrypto/engines/libatalla/Makefile	2019-01-20 05:38:27 UTC (rev 12154)
+++ trunk/secure/lib/libcrypto/engines/libatalla/Makefile	2019-01-20 05:39:21 UTC (rev 12155)
@@ -1,4 +1,5 @@
-# $FreeBSD: stable/10/secure/lib/libcrypto/engines/libatalla/Makefile 160819 2006-07-29 19:41:41Z simon $
+# $MidnightBSD$
+# $FreeBSD: stable/11/secure/lib/libcrypto/engines/libatalla/Makefile 160819 2006-07-29 19:41:41Z simon $
 
 SHLIB_NAME?= libatalla.so
 SRCS=	e_atalla.c

Modified: trunk/secure/lib/libcrypto/engines/libchil/Makefile
===================================================================
--- trunk/secure/lib/libcrypto/engines/libchil/Makefile	2019-01-20 05:38:27 UTC (rev 12154)
+++ trunk/secure/lib/libcrypto/engines/libchil/Makefile	2019-01-20 05:39:21 UTC (rev 12155)
@@ -1,4 +1,5 @@
-# $FreeBSD: stable/10/secure/lib/libcrypto/engines/libchil/Makefile 160819 2006-07-29 19:41:41Z simon $
+# $MidnightBSD$
+# $FreeBSD: stable/11/secure/lib/libcrypto/engines/libchil/Makefile 160819 2006-07-29 19:41:41Z simon $
 
 SHLIB_NAME?= libchil.so
 SRCS=	e_chil.c

Modified: trunk/secure/lib/libcrypto/engines/libcswift/Makefile
===================================================================
--- trunk/secure/lib/libcrypto/engines/libcswift/Makefile	2019-01-20 05:38:27 UTC (rev 12154)
+++ trunk/secure/lib/libcrypto/engines/libcswift/Makefile	2019-01-20 05:39:21 UTC (rev 12155)
@@ -1,4 +1,5 @@
-# $FreeBSD: stable/10/secure/lib/libcrypto/engines/libcswift/Makefile 160819 2006-07-29 19:41:41Z simon $
+# $MidnightBSD$
+# $FreeBSD: stable/11/secure/lib/libcrypto/engines/libcswift/Makefile 160819 2006-07-29 19:41:41Z simon $
 
 SHLIB_NAME?= libcswift.so
 SRCS=	e_cswift.c

Modified: trunk/secure/lib/libcrypto/engines/libgost/Makefile
===================================================================
--- trunk/secure/lib/libcrypto/engines/libgost/Makefile	2019-01-20 05:38:27 UTC (rev 12154)
+++ trunk/secure/lib/libcrypto/engines/libgost/Makefile	2019-01-20 05:39:21 UTC (rev 12155)
@@ -1,10 +1,10 @@
 # $MidnightBSD$
-# $FreeBSD: stable/10/secure/lib/libcrypto/engines/libgost/Makefile 290575 2015-11-09 06:55:04Z ngie $
+# $FreeBSD: stable/11/secure/lib/libcrypto/engines/libgost/Makefile 290207 2015-10-30 20:51:33Z jkim $
 
 SHLIB_NAME?= libgost.so
-SRCS=	gost2001.c gost2001_keyx.c gost89.c gost94_keyx.c gost_ameth.c \
-	gost_asn1.c gost_crypt.c gost_ctl.c gost_eng.c gost_keywrap.c \
-	gost_md.c gost_params.c gost_pmeth.c gost_sign.c gosthash.c \
-	e_gost_err.c
+SRCS=	e_gost_err.c gost2001.c gost2001_keyx.c gost89.c gost94_keyx.c \
+	gost_ameth.c gost_asn1.c gost_crypt.c gost_ctl.c gost_eng.c \
+	gost_keywrap.c gost_md.c gost_params.c gost_pmeth.c gost_sign.c \
+	gosthash.c
 
 .include <bsd.lib.mk>

Modified: trunk/secure/lib/libcrypto/engines/libnuron/Makefile
===================================================================
--- trunk/secure/lib/libcrypto/engines/libnuron/Makefile	2019-01-20 05:38:27 UTC (rev 12154)
+++ trunk/secure/lib/libcrypto/engines/libnuron/Makefile	2019-01-20 05:39:21 UTC (rev 12155)
@@ -1,4 +1,5 @@
-# $FreeBSD: stable/10/secure/lib/libcrypto/engines/libnuron/Makefile 160819 2006-07-29 19:41:41Z simon $
+# $MidnightBSD$
+# $FreeBSD: stable/11/secure/lib/libcrypto/engines/libnuron/Makefile 160819 2006-07-29 19:41:41Z simon $
 
 SHLIB_NAME?= libnuron.so
 SRCS=	e_nuron.c

Modified: trunk/secure/lib/libcrypto/engines/libsureware/Makefile
===================================================================
--- trunk/secure/lib/libcrypto/engines/libsureware/Makefile	2019-01-20 05:38:27 UTC (rev 12154)
+++ trunk/secure/lib/libcrypto/engines/libsureware/Makefile	2019-01-20 05:39:21 UTC (rev 12155)
@@ -1,4 +1,5 @@
-# $FreeBSD: stable/10/secure/lib/libcrypto/engines/libsureware/Makefile 160819 2006-07-29 19:41:41Z simon $
+# $MidnightBSD$
+# $FreeBSD: stable/11/secure/lib/libcrypto/engines/libsureware/Makefile 160819 2006-07-29 19:41:41Z simon $
 
 SHLIB_NAME?= libsureware.so
 SRCS=	e_sureware.c

Modified: trunk/secure/lib/libcrypto/engines/libubsec/Makefile
===================================================================
--- trunk/secure/lib/libcrypto/engines/libubsec/Makefile	2019-01-20 05:38:27 UTC (rev 12154)
+++ trunk/secure/lib/libcrypto/engines/libubsec/Makefile	2019-01-20 05:39:21 UTC (rev 12155)
@@ -1,4 +1,5 @@
-# $FreeBSD: stable/10/secure/lib/libcrypto/engines/libubsec/Makefile 160819 2006-07-29 19:41:41Z simon $
+# $MidnightBSD$
+# $FreeBSD: stable/11/secure/lib/libcrypto/engines/libubsec/Makefile 160819 2006-07-29 19:41:41Z simon $
 
 SHLIB_NAME?= libubsec.so
 SRCS=	e_ubsec.c

Modified: trunk/secure/lib/libcrypto/opensslconf-arm.h.in
===================================================================
--- trunk/secure/lib/libcrypto/opensslconf-arm.h.in	2019-01-20 05:38:27 UTC (rev 12154)
+++ trunk/secure/lib/libcrypto/opensslconf-arm.h.in	2019-01-20 05:39:21 UTC (rev 12155)
@@ -22,6 +22,9 @@
 #ifndef OPENSSL_NO_KRB5
 # define OPENSSL_NO_KRB5
 #endif
+#ifndef OPENSSL_NO_LIBUNBOUND
+# define OPENSSL_NO_LIBUNBOUND
+#endif
 #ifndef OPENSSL_NO_MD2
 # define OPENSSL_NO_MD2
 #endif
@@ -28,6 +31,12 @@
 #ifndef OPENSSL_NO_SCTP
 # define OPENSSL_NO_SCTP
 #endif
+#ifndef OPENSSL_NO_SSL_TRACE
+# define OPENSSL_NO_SSL_TRACE
+#endif
+#ifndef OPENSSL_NO_SSL2
+# define OPENSSL_NO_SSL2
+#endif
 #ifndef OPENSSL_NO_STORE
 # define OPENSSL_NO_STORE
 #endif
@@ -67,6 +76,9 @@
 # if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
 #  define NO_KRB5
 # endif
+# if defined(OPENSSL_NO_LIBUNBOUND) && !defined(NO_LIBUNBOUND)
+#  define NO_LIBUNBOUND
+# endif
 # if defined(OPENSSL_NO_MD2) && !defined(NO_MD2)
 #  define NO_MD2
 # endif
@@ -73,6 +85,12 @@
 # if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP)
 #  define NO_SCTP
 # endif
+# if defined(OPENSSL_NO_SSL_TRACE) && !defined(NO_SSL_TRACE)
+#  define NO_SSL_TRACE
+# endif
+# if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2)
+#  define NO_SSL2
+# endif
 # if defined(OPENSSL_NO_STORE) && !defined(NO_STORE)
 #  define NO_STORE
 # endif
@@ -189,7 +207,7 @@
 #endif
 
 #if defined(DES_RISC1) && defined(DES_RISC2)
-YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
+#error YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
 #endif
 
 /* Unroll the inner loop, this sometimes helps, sometimes hinders.
@@ -208,7 +226,7 @@
    optimization options.  Older Sparc's work better with only UNROLL, but
    there's no way to tell at compile time what it is you're running on */
  
-#if defined( sun )		/* Newer Sparc's */
+#if defined( __sun ) || defined ( sun )		/* Newer Sparc's */
 #  define DES_PTR
 #  define DES_RISC1
 #  define DES_UNROLL

Modified: trunk/secure/lib/libcrypto/opensslconf-mips.h.in
===================================================================
--- trunk/secure/lib/libcrypto/opensslconf-mips.h.in	2019-01-20 05:38:27 UTC (rev 12154)
+++ trunk/secure/lib/libcrypto/opensslconf-mips.h.in	2019-01-20 05:39:21 UTC (rev 12155)
@@ -22,6 +22,9 @@
 #ifndef OPENSSL_NO_KRB5
 # define OPENSSL_NO_KRB5
 #endif
+#ifndef OPENSSL_NO_LIBUNBOUND
+# define OPENSSL_NO_LIBUNBOUND
+#endif
 #ifndef OPENSSL_NO_MD2
 # define OPENSSL_NO_MD2
 #endif
@@ -28,6 +31,12 @@
 #ifndef OPENSSL_NO_SCTP
 # define OPENSSL_NO_SCTP
 #endif
+#ifndef OPENSSL_NO_SSL_TRACE
+# define OPENSSL_NO_SSL_TRACE
+#endif
+#ifndef OPENSSL_NO_SSL2
+# define OPENSSL_NO_SSL2
+#endif
 #ifndef OPENSSL_NO_STORE
 # define OPENSSL_NO_STORE
 #endif
@@ -67,6 +76,9 @@
 # if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
 #  define NO_KRB5
 # endif
+# if defined(OPENSSL_NO_LIBUNBOUND) && !defined(NO_LIBUNBOUND)
+#  define NO_LIBUNBOUND
+# endif
 # if defined(OPENSSL_NO_MD2) && !defined(NO_MD2)
 #  define NO_MD2
 # endif
@@ -73,6 +85,12 @@
 # if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP)
 #  define NO_SCTP
 # endif
+# if defined(OPENSSL_NO_SSL_TRACE) && !defined(NO_SSL_TRACE)
+#  define NO_SSL_TRACE
+# endif
+# if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2)
+#  define NO_SSL2
+# endif
 # if defined(OPENSSL_NO_STORE) && !defined(NO_STORE)
 #  define NO_STORE
 # endif
@@ -201,7 +219,7 @@
 #endif
 
 #if defined(DES_RISC1) && defined(DES_RISC2)
-YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
+#error YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
 #endif
 
 /* Unroll the inner loop, this sometimes helps, sometimes hinders.
@@ -220,7 +238,7 @@
    optimization options.  Older Sparc's work better with only UNROLL, but
    there's no way to tell at compile time what it is you're running on */
  
-#if defined( sun )		/* Newer Sparc's */
+#if defined( __sun ) || defined ( sun )		/* Newer Sparc's */
 #  define DES_PTR
 #  define DES_RISC1
 #  define DES_UNROLL

Modified: trunk/secure/lib/libcrypto/opensslconf-powerpc.h.in
===================================================================
--- trunk/secure/lib/libcrypto/opensslconf-powerpc.h.in	2019-01-20 05:38:27 UTC (rev 12154)
+++ trunk/secure/lib/libcrypto/opensslconf-powerpc.h.in	2019-01-20 05:39:21 UTC (rev 12155)
@@ -22,6 +22,9 @@
 #ifndef OPENSSL_NO_KRB5
 # define OPENSSL_NO_KRB5
 #endif
+#ifndef OPENSSL_NO_LIBUNBOUND
+# define OPENSSL_NO_LIBUNBOUND
+#endif
 #ifndef OPENSSL_NO_MD2
 # define OPENSSL_NO_MD2
 #endif
@@ -28,6 +31,12 @@
 #ifndef OPENSSL_NO_SCTP
 # define OPENSSL_NO_SCTP
 #endif
+#ifndef OPENSSL_NO_SSL_TRACE
+# define OPENSSL_NO_SSL_TRACE
+#endif
+#ifndef OPENSSL_NO_SSL2
+# define OPENSSL_NO_SSL2
+#endif
 #ifndef OPENSSL_NO_STORE
 # define OPENSSL_NO_STORE
 #endif
@@ -67,6 +76,9 @@
 # if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
 #  define NO_KRB5
 # endif
+# if defined(OPENSSL_NO_LIBUNBOUND) && !defined(NO_LIBUNBOUND)
+#  define NO_LIBUNBOUND
+# endif
 # if defined(OPENSSL_NO_MD2) && !defined(NO_MD2)
 #  define NO_MD2
 # endif
@@ -73,6 +85,12 @@
 # if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP)
 #  define NO_SCTP
 # endif
+# if defined(OPENSSL_NO_SSL_TRACE) && !defined(NO_SSL_TRACE)
+#  define NO_SSL_TRACE
+# endif
+# if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2)
+#  define NO_SSL2
+# endif
 # if defined(OPENSSL_NO_STORE) && !defined(NO_STORE)
 #  define NO_STORE
 # endif
@@ -198,7 +216,7 @@
 #endif
 
 #if defined(DES_RISC1) && defined(DES_RISC2)
-YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
+#error YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
 #endif
 
 /* Unroll the inner loop, this sometimes helps, sometimes hinders.
@@ -217,7 +235,7 @@
    optimization options.  Older Sparc's work better with only UNROLL, but
    there's no way to tell at compile time what it is you're running on */
  
-#if defined( sun )		/* Newer Sparc's */
+#if defined( __sun ) || defined ( sun )		/* Newer Sparc's */
 #  define DES_PTR
 #  define DES_RISC1
 #  define DES_UNROLL

Modified: trunk/secure/lib/libcrypto/opensslconf-sparc64.h.in
===================================================================
--- trunk/secure/lib/libcrypto/opensslconf-sparc64.h.in	2019-01-20 05:38:27 UTC (rev 12154)
+++ trunk/secure/lib/libcrypto/opensslconf-sparc64.h.in	2019-01-20 05:39:21 UTC (rev 12155)
@@ -22,6 +22,9 @@
 #ifndef OPENSSL_NO_KRB5
 # define OPENSSL_NO_KRB5
 #endif
+#ifndef OPENSSL_NO_LIBUNBOUND
+# define OPENSSL_NO_LIBUNBOUND
+#endif
 #ifndef OPENSSL_NO_MD2
 # define OPENSSL_NO_MD2
 #endif
@@ -28,6 +31,12 @@
 #ifndef OPENSSL_NO_SCTP
 # define OPENSSL_NO_SCTP
 #endif
+#ifndef OPENSSL_NO_SSL_TRACE
+# define OPENSSL_NO_SSL_TRACE
+#endif
+#ifndef OPENSSL_NO_SSL2
+# define OPENSSL_NO_SSL2
+#endif
 #ifndef OPENSSL_NO_STORE
 # define OPENSSL_NO_STORE
 #endif
@@ -67,6 +76,9 @@
 # if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
 #  define NO_KRB5
 # endif
+# if defined(OPENSSL_NO_LIBUNBOUND) && !defined(NO_LIBUNBOUND)
+#  define NO_LIBUNBOUND
+# endif
 # if defined(OPENSSL_NO_MD2) && !defined(NO_MD2)
 #  define NO_MD2
 # endif
@@ -73,6 +85,12 @@
 # if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP)
 #  define NO_SCTP
 # endif
+# if defined(OPENSSL_NO_SSL_TRACE) && !defined(NO_SSL_TRACE)
+#  define NO_SSL_TRACE
+# endif
+# if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2)
+#  define NO_SSL2
+# endif
 # if defined(OPENSSL_NO_STORE) && !defined(NO_STORE)
 #  define NO_STORE
 # endif
@@ -189,7 +207,7 @@
 #endif
 
 #if defined(DES_RISC1) && defined(DES_RISC2)
-YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
+#error YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
 #endif
 
 /* Unroll the inner loop, this sometimes helps, sometimes hinders.
@@ -208,7 +226,7 @@
    optimization options.  Older Sparc's work better with only UNROLL, but
    there's no way to tell at compile time what it is you're running on */
  
-#if defined( sun )		/* Newer Sparc's */
+#if defined( __sun ) || defined ( sun )		/* Newer Sparc's */
 #  define DES_PTR
 #  define DES_RISC1
 #  define DES_UNROLL

Modified: trunk/secure/lib/libcrypto/opensslconf-x86.h.in
===================================================================
--- trunk/secure/lib/libcrypto/opensslconf-x86.h.in	2019-01-20 05:38:27 UTC (rev 12154)
+++ trunk/secure/lib/libcrypto/opensslconf-x86.h.in	2019-01-20 05:39:21 UTC (rev 12155)
@@ -22,6 +22,9 @@
 #ifndef OPENSSL_NO_KRB5
 # define OPENSSL_NO_KRB5
 #endif
+#ifndef OPENSSL_NO_LIBUNBOUND
+# define OPENSSL_NO_LIBUNBOUND
+#endif
 #ifndef OPENSSL_NO_MD2
 # define OPENSSL_NO_MD2
 #endif
@@ -28,6 +31,12 @@
 #ifndef OPENSSL_NO_SCTP
 # define OPENSSL_NO_SCTP
 #endif
+#ifndef OPENSSL_NO_SSL_TRACE
+# define OPENSSL_NO_SSL_TRACE
+#endif
+#ifndef OPENSSL_NO_SSL2
+# define OPENSSL_NO_SSL2
+#endif
 #ifndef OPENSSL_NO_STORE
 # define OPENSSL_NO_STORE
 #endif
@@ -67,6 +76,9 @@
 # if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
 #  define NO_KRB5
 # endif
+# if defined(OPENSSL_NO_LIBUNBOUND) && !defined(NO_LIBUNBOUND)
+#  define NO_LIBUNBOUND
+# endif
 # if defined(OPENSSL_NO_MD2) && !defined(NO_MD2)
 #  define NO_MD2
 # endif
@@ -73,6 +85,12 @@
 # if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP)
 #  define NO_SCTP
 # endif
+# if defined(OPENSSL_NO_SSL_TRACE) && !defined(NO_SSL_TRACE)
+#  define NO_SSL_TRACE
+# endif
+# if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2)
+#  define NO_SSL2
+# endif
 # if defined(OPENSSL_NO_STORE) && !defined(NO_STORE)
 #  define NO_STORE
 # endif
@@ -219,7 +237,7 @@
 #endif
 
 #if defined(DES_RISC1) && defined(DES_RISC2)
-YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
+#error YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
 #endif
 
 /* Unroll the inner loop, this sometimes helps, sometimes hinders.
@@ -238,7 +256,7 @@
    optimization options.  Older Sparc's work better with only UNROLL, but
    there's no way to tell at compile time what it is you're running on */
  
-#if defined( sun )		/* Newer Sparc's */
+#if defined( __sun ) || defined ( sun )		/* Newer Sparc's */
 #  define DES_PTR
 #  define DES_RISC1
 #  define DES_UNROLL



More information about the Midnightbsd-cvs mailing list