4 files changed, 3 insertions, 75 deletions

diff --git a/secure/lib/Makefile b/secure/lib/Makefile
index d061f66bcdeb..a3aa74cf17dd 100644
--- a/secure/lib/Makefile
+++ b/secure/lib/Makefile
@@ -5,14 +5,7 @@ SUBDIR= libcipher
 SUBDIR+=libtelnet
 .endif
 .if !defined(NO_OPENSSL)
-SUBDIR+=libcrypto librsaglue libssl
-.if exists(${.CURDIR}/../../crypto/openssl/rsaref)
-SUBDIR+=librsausa
-.endif
-.if exists(${.CURDIR}/../../crypto/openssl/crypto/rsa/rsa_eay.c) && \
-    !defined(NO_RSAINTL)
-SUBDIR+=librsaintl
-.endif
+SUBDIR+=libcrypto libssl
 .endif
 .if !defined(NO_OPENSSH)
 SUBDIR+=libssh
diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile
index 226a504c0732..a0cbd78b2d72 100644
--- a/secure/lib/libcrypto/Makefile
+++ b/secure/lib/libcrypto/Makefile
@@ -150,8 +150,8 @@ SRCS+=	rmd_dgst.c rmd_one.c
 
 # rsa
 .if defined(WITH_RSA) && ${WITH_RSA} == YES
-SRCS+=	rsa_chk.c rsa_err.c rsa_gen.c rsa_lib.c rsa_none.c rsa_null.c \
-	rsa_oaep.c rsa_pk1.c rsa_saos.c rsa_sign.c rsa_ssl.c rsa_stubs.c
+SRCS+=	rsa_chk.c rsa_eay.c rsa_err.c rsa_gen.c rsa_lib.c rsa_none.c \
+	rsa_null.c rsa_oaep.c rsa_pk1.c rsa_saos.c rsa_sign.c rsa_ssl.c
 .endif
 
 # sha
diff --git a/secure/lib/librsaintl/Makefile b/secure/lib/librsaintl/Makefile
deleted file mode 100644
index d5b2a37bd338..000000000000
--- a/secure/lib/librsaintl/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# $FreeBSD$
-
-.include "../libcrypto/Makefile.inc"
-
-.PATH:	${LCRYPTO_SRC}/rsa
-
-MAINTAINER=	kris
-
-LIB=		rsaINTL
-SHLIB_MAJOR=	1
-
-CFLAGS+=	-I${.OBJDIR}
-LDADD+=		-L${.OBJDIR}/../libcrypto -lcrypto
-
-# rsaref
-SRCS+=	rsa_err.c rsa_eay.c rsa_intlstubs.c
-
-HDRS=	asn1/asn1.h asn1/asn1_mac.h bio/bio.h bf/blowfish.h bn/bn.h \
-	buffer/buffer.h cast/cast.h comp/comp.h conf/conf.h crypto.h \
-	des/des.h dh/dh.h dsa/dsa.h ../e_os.h ../e_os2.h ebcdic.h \
-	err/err.h evp/evp.h hmac/hmac.h lhash/lhash.h md2/md2.h \
-	md5/md5.h mdc2/mdc2.h objects/objects.h opensslv.h pem/pem.h \
-	pem/pem2.h pkcs12/pkcs12.h pkcs7/pkcs7.h rand/rand.h rc2/rc2.h \
-	rc4/rc4.h rc5/rc5.h ripemd/ripemd.h rsa/rsa.h ../rsaref/rsaref.h \
-	stack/safestack.h sha/sha.h stack/stack.h tmdiff.h txt_db/txt_db.h \
-	x509/x509.h x509/x509_vfy.h x509v3/x509v3.h
-
-.for h in ${HDRS}
-CRYPTO_HDRS+= ${LCRYPTO_SRC}/${h}
-.endfor
-
-.include <bsd.lib.mk>
diff --git a/secure/lib/librsausa/Makefile b/secure/lib/librsausa/Makefile
deleted file mode 100644
index 70dbcb785a8d..000000000000
--- a/secure/lib/librsausa/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# $FreeBSD$
-
-.include "../libcrypto/Makefile.inc"
-
-.PATH:	${LCRYPTO_SRC}/../rsaref
-
-MAINTAINER=	kris
-
-LIB=		rsaUSA
-SHLIB_MAJOR=	1
-
-CFLAGS+=	-I${.OBJDIR}
-
-LDADD+=		-L${.OBJDIR}/../libcrypto -lcrypto
-
-# rsaref
-SRCS+=	rsar_err.c rsaref.c rsaref_stubs.c
-
-HDRS=	asn1/asn1.h asn1/asn1_mac.h bio/bio.h bf/blowfish.h bn/bn.h \
-	buffer/buffer.h cast/cast.h comp/comp.h conf/conf.h crypto.h \
-	des/des.h dh/dh.h dsa/dsa.h ../e_os.h ../e_os2.h ebcdic.h \
-	err/err.h evp/evp.h hmac/hmac.h lhash/lhash.h md2/md2.h \
-	md5/md5.h mdc2/mdc2.h objects/objects.h opensslv.h pem/pem.h \
-	pem/pem2.h pkcs12/pkcs12.h pkcs7/pkcs7.h rand/rand.h rc2/rc2.h \
-	rc4/rc4.h rc5/rc5.h ripemd/ripemd.h rsa/rsa.h ../rsaref/rsaref.h \
-	stack/safestack.h sha/sha.h stack/stack.h tmdiff.h txt_db/txt_db.h \
-	x509/x509.h x509/x509_vfy.h x509v3/x509v3.h
-
-.for h in ${HDRS}
-CRYPTO_HDRS+= ${LCRYPTO_SRC}/${h}
-.endfor
-
-.include <bsd.lib.mk>