head	1.6;
access;
symbols
	RELENG_4_11_0_RELEASE:1.1.2.4
	RELENG_4_11:1.1.2.4.0.18
	RELENG_4_11_BP:1.1.2.4
	RELENG_4_10_0_RELEASE:1.1.2.4
	RELENG_4_10:1.1.2.4.0.16
	RELENG_4_10_BP:1.1.2.4
	RELENG_4_9_0_RELEASE:1.1.2.4
	RELENG_4_9:1.1.2.4.0.14
	RELENG_4_9_BP:1.1.2.4
	RELENG_4_8_0_RELEASE:1.1.2.4
	RELENG_4_8:1.1.2.4.0.12
	RELENG_4_8_BP:1.1.2.4
	RELENG_4_7_0_RELEASE:1.1.2.4
	RELENG_4_7:1.1.2.4.0.10
	RELENG_4_7_BP:1.1.2.4
	RELENG_4_6_2_RELEASE:1.1.2.4
	RELENG_4_6_1_RELEASE:1.1.2.4
	RELENG_4_6_0_RELEASE:1.1.2.4
	RELENG_4_6:1.1.2.4.0.8
	RELENG_4_6_BP:1.1.2.4
	RELENG_4_5_0_RELEASE:1.1.2.4
	RELENG_4_5:1.1.2.4.0.6
	RELENG_4_5_BP:1.1.2.4
	RELENG_4_4_0_RELEASE:1.1.2.4
	RELENG_4_4:1.1.2.4.0.4
	RELENG_4_4_BP:1.1.2.4
	RELENG_4_3_0_RELEASE:1.1.2.4
	RELENG_4_3:1.1.2.4.0.2
	RELENG_4_3_BP:1.1.2.4
	RELENG_4_2_0_RELEASE:1.1.2.4
	RELENG_4_1_1_RELEASE:1.1.2.4
	PRE_SMPNG:1.5
	RELENG_4_1_0_RELEASE:1.1.2.2
	RELENG_4_0_0_RELEASE:1.1.2.1
	RELENG_4:1.1.0.2
	RELENG_4_BP:1.1;
locks; strict;
comment	@# @;


1.6
date	2000.09.10.00.09.37;	author kris;	state dead;
branches;
next	1.5;

1.5
date	2000.07.16.05.52.53;	author peter;	state Exp;
branches;
next	1.4;

1.4
date	2000.04.13.07.37.21;	author kris;	state Exp;
branches;
next	1.3;

1.3
date	2000.04.04.07.31.01;	author kris;	state Exp;
branches;
next	1.2;

1.2
date	2000.03.13.09.55.53;	author kris;	state Exp;
branches;
next	1.1;

1.1
date	2000.02.26.13.12.57;	author peter;	state Exp;
branches
	1.1.2.1;
next	;

1.1.2.1
date	2000.03.13.23.07.57;	author kris;	state Exp;
branches;
next	1.1.2.2;

1.1.2.2
date	2000.04.04.07.44.57;	author kris;	state Exp;
branches;
next	1.1.2.3;

1.1.2.3
date	2000.08.20.09.09.47;	author kris;	state Exp;
branches;
next	1.1.2.4;

1.1.2.4
date	2000.09.18.03.00.06;	author kris;	state dead;
branches;
next	;


desc
@@


1.6
log
@Nuke RSAREF support from orbit.

It's the only way to be sure.
@
text
@# $FreeBSD: src/secure/lib/librsaintl/Makefile,v 1.5 2000/07/16 05:52:53 peter Exp $

.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>
@


1.5
log
@Forced commit.  This is to try and help folks that used the international
crypto repo and have slightly different files but with the same version.
cvsup in 'checkout mode' has no trouble with this, but cvs can get really
silly about it.
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/lib/librsaintl/Makefile,v 1.4 2000/04/13 07:37:21 kris Exp $
@


1.4
log
@Update for OpenSSL 0.9.5a and clean up a bit.
Take responsibility for this makefile again :-)
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/lib/librsaintl/Makefile,v 1.3 2000/04/04 07:31:01 kris Exp $
@


1.3
log
@Add libcrypto to LDADD. This fixes problems seen with e.g. apache-modssl

Submitted by:	Jim Bloom <bloom@@acm.org>
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/lib/librsaintl/Makefile,v 1.2 2000/03/13 09:55:53 kris Exp $
d5 2
a6 1
# Don't blame kris.. -peter
d28 3
a30 18
beforedepend: headers ${.OBJDIR}/openssl/opensslconf.h 

DPADD+=	${.OBJDIR}/openssl/opensslconf.h

CLEANDIRS+=	${.OBJDIR}/openssl

${.OBJDIR}/openssl/opensslconf.h: ../libcrypto/opensslconf-${MACHINE_ARCH}.h
	@@test -d ${.OBJDIR}/openssl || mkdir -p ${.OBJDIR}/openssl; \
	cp ${.OODATE} ${.TARGET}

headers:
	@@test -d ${.OBJDIR}/openssl || mkdir -p ${.OBJDIR}/openssl; \
	for i in ${HDRS}; do \
		${INSTALL} ${COPY} -m 444 ${LCRYPTO_SRC}/$$i \
			${.OBJDIR}/openssl; \
	done

.PATH:	${LCRYPTO_SRC}/rsa
@


1.2
log
@Add a new function stub to libcrypto() which resolves to a symbol in
the librsa* library and reports which version of the library (OpenSSL/RSAREF)
is being used.

This is then used in openssh to detect the failure case of RSAREF and a RSA key
>1024 bits, to print a more helpful error message than 'rsa_public_encrypt() fai
led.'

This is a 4.0-RELEASE candidate.
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/lib/librsaintl/Makefile,v 1.1 2000/02/26 13:12:57 peter Exp $
d12 1
@


1.1
log
@Merge from internat.freebsd.org repo, minus change to rsa_eay.c (missing)

Reorganize and unify libcrypto's interface so that the RSA implementation
is chosen at runtime via dlopen().

This is a checkpoint and may require more tweaks still.
@
text
@d1 1
a1 1
# $FreeBSD$
d14 1
a14 1
SRCS+=	rsa_err.c rsa_eay.c
@


1.1.2.1
log
@MFC: Allow detection of RSAREF and use it to provide a more verbose
error message when openssh fails from a >1024 bit key.

Approved by:	jkh
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/lib/librsaintl/Makefile,v 1.1 2000/02/26 13:12:57 peter Exp $
d14 1
a14 1
SRCS+=	rsa_err.c rsa_eay.c rsa_intlstubs.c
@


1.1.2.2
log
@MFC: Add libcrypto to LDADD
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/lib/librsaintl/Makefile,v 1.1.2.1 2000/03/13 23:07:57 kris Exp $
a11 1
LDADD+=		-L${.OBJDIR}/../libcrypto -lcrypto
@


1.1.2.3
log
@MFC: OpenSSL 0.9.5a
@
text
@d1 1
a1 1
# $FreeBSD$
d5 1
a5 2
.PATH:	${LCRYPTO_SRC}/rsa

d27 18
a44 3
.for h in ${HDRS}
CRYPTO_HDRS+= ${LCRYPTO_SRC}/${h}
.endfor
@


1.1.2.4
log
@MFC: Roll librsa* back into libcrypto
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/lib/librsaintl/Makefile,v 1.1.2.3 2000/08/20 09:09:47 kris Exp $
@


