--- ./crypto-patent/Makefile.orig	Tue Mar 21 04:02:23 2000
+++ ./crypto-patent/Makefile	Sun Mar 26 20:19:50 2000
@@ -5,6 +5,8 @@ SSLEAYDIST= src-patent
 
 LCRYPTO_SRC= ${.CURDIR}/../${SSLEAYDIST}/crypto
 LCRYPTO_INC= ${.CURDIR}/../${SSLEAYDIST}/include
+LRSAGLUE_SRC=  ${.CURDIR}/../${SSLEAYDIST}/rsaref
+LRSAREF_SRC= ${RSAREFDIR}
 
 .if ${MACHINE_ARCH} == "i386"
 CFLAGS+= -DL_ENDIAN -DBN_ASM
@@ -20,6 +22,7 @@ CFLAGS+= -DB_ENDIAN
 .endif
 .endif 
 
+CFLAGS+= -DRSAref
 CFLAGS+= -DNO_IDEA -DTERMIOS -DANSI_SOURCE -DNO_ERR -DNO_WINDOWS_BRAINDEATH
 CFLAGS+= -I${.CURDIR}/../${SSLEAYDIST}
 CFLAGS+= -I${LCRYPTO_SRC}
@@ -67,8 +70,12 @@ SRCS+=	bn_word.c bn_blind.c bn_gcd.c bn_
 SRCS+=	bn_sqr.c bn_recp.c bn_mont.c bn_mpi.c bn_asm.c 
 #SRCS+=	bn_comba.c d.c exp.c
 SRCS+=	bn_exp2.c bn_ctx.c
+CFLAGS+= -I${LRSAGLUE_SRC}
+SRCS+=	rsaref.c rsar_err.c
+CFLAGS+= -I${LRSAREF_SRC}
+SRCS+=	digit.c nn.c rsa.c r_random.c r_stdlib.c
 CFLAGS+= -I${LCRYPTO_SRC}/rsa
-SRCS+=	rsa_eay.c rsa_gen.c rsa_lib.c rsa_sign.c
+SRCS+=	rsa_gen.c rsa_lib.c rsa_sign.c
 SRCS+=	rsa_saos.c rsa_err.c rsa_pk1.c rsa_ssl.c
 SRCS+=	rsa_none.c rsa_chk.c rsa_oaep.c rsa_null.c
 CFLAGS+= -I${LCRYPTO_SRC}/dsa
@@ -172,7 +179,7 @@ HDRS= asn1.h dh.h md5.h rc4.h stack.h as
 .PATH:	${LCRYPTO_SRC}/md2 ${LCRYPTO_SRC}/md5 ${LCRYPTO_SRC}/sha ${LCRYPTO_SRC}/mdc2	\
 	${LCRYPTO_SRC}/hmac ${LCRYPTO_SRC}/ripemd ${LCRYPTO_SRC}/des  ${LCRYPTO_SRC}/rc2 \
 	${LCRYPTO_SRC}/rc4 ${LCRYPTO_SRC}/rc5 ${LCRYPTO_SRC}/idea ${LCRYPTO_SRC}/bf    \
-	${LCRYPTO_SRC}/cast ${LCRYPTO_SRC}/bn  ${LCRYPTO_SRC}/rsa ${LCRYPTO_SRC}/dsa   \
+	${LCRYPTO_SRC}/cast ${LCRYPTO_SRC}/bn ${LRSAGLUE_SRC} ${LRSAREF_SRC} ${LCRYPTO_SRC}/rsa ${LCRYPTO_SRC}/dsa   \
 	${LCRYPTO_SRC}/dh ${LCRYPTO_SRC}/buffer ${LCRYPTO_SRC}/bio ${LCRYPTO_SRC}/stack \
    	${LCRYPTO_SRC}/lhash ${LCRYPTO_SRC}/rand ${LCRYPTO_SRC}/err ${LCRYPTO_SRC}/objects \
 	${LCRYPTO_SRC}/evp ${LCRYPTO_SRC}/pem ${LCRYPTO_SRC}/asn1  ${LCRYPTO_SRC}/asn1 \
--- ./src/crypto/rsa/rsa_gen.c.orig	Sun Mar 19 16:02:49 2000
+++ ./src/crypto/rsa/rsa_gen.c	Sun Mar 26 20:17:48 2000
@@ -74,11 +74,107 @@ RSA *RSA_generate_key(int bits, unsigned
 	if (ctx == NULL) goto err;
 	ctx2=BN_CTX_new();
 	if (ctx2 == NULL) goto err;
+	r0= &(ctx->bn[0]);
+	r1= &(ctx->bn[1]);
+	r2= &(ctx->bn[2]);
+	r3= &(ctx->bn[3]);
+	ctx->tos+=4;
 
-	/* Body of this routine removed for OpenBSD - will return
-	 * when the RSA patent expires
-	 */
+	bitsp=(bits+1)/2;
+	bitsq=bits-bitsp;
+	rsa=RSA_new();
+	if (rsa == NULL) goto err;
 
+	/* set e */ 
+	rsa->e=BN_new();
+	if (rsa->e == NULL) goto err;
+
+#if 1
+	/* The problem is when building with 8, 16, or 32 BN_ULONG,
+	 * unsigned long can be larger */
+	for (i=0; i<sizeof(unsigned long)*8; i++)
+		{
+		if (e_value & (1<<i))
+			BN_set_bit(rsa->e,i);
+		}
+#else
+	if (!BN_set_word(rsa->e,e_value)) goto err;
+#endif
+
+	/* generate p and q */
+	for (;;)
+		{
+		rsa->p=BN_generate_prime(NULL,bitsp,0,NULL,NULL,callback,cb_arg);
+		if (rsa->p == NULL) goto err;
+		if (!BN_sub(r2,rsa->p,BN_value_one())) goto err;
+		if (!BN_gcd(r1,r2,rsa->e,ctx)) goto err;
+		if (BN_is_one(r1)) break;
+		if (callback != NULL) callback(2,n++,cb_arg);
+		BN_free(rsa->p);
+		}
+	if (callback != NULL) callback(3,0,cb_arg);
+	for (;;)
+		{
+		rsa->q=BN_generate_prime(NULL,bitsq,0,NULL,NULL,callback,cb_arg);
+		if (rsa->q == NULL) goto err;
+		if (!BN_sub(r2,rsa->q,BN_value_one())) goto err;
+		if (!BN_gcd(r1,r2,rsa->e,ctx)) goto err;
+		if (BN_is_one(r1) && (BN_cmp(rsa->p,rsa->q) != 0))
+			break;
+		if (callback != NULL) callback(2,n++,cb_arg);
+		BN_free(rsa->q);
+		}
+	if (callback != NULL) callback(3,1,cb_arg);
+	if (BN_cmp(rsa->p,rsa->q) < 0)
+		{
+		tmp=rsa->p;
+		rsa->p=rsa->q;
+		rsa->q=tmp;
+		}
+
+	/* calculate n */
+	rsa->n=BN_new();
+	if (rsa->n == NULL) goto err;
+	if (!BN_mul(rsa->n,rsa->p,rsa->q,ctx)) goto err;
+
+	/* calculate d */
+	if (!BN_sub(r1,rsa->p,BN_value_one())) goto err;	/* p-1 */
+	if (!BN_sub(r2,rsa->q,BN_value_one())) goto err;	/* q-1 */
+	if (!BN_mul(r0,r1,r2,ctx)) goto err;	/* (p-1)(q-1) */
+
+/* should not be needed, since gcd(p-1,e) == 1 and gcd(q-1,e) == 1 */
+/*	for (;;)
+		{
+		if (!BN_gcd(r3,r0,rsa->e,ctx)) goto err;
+		if (BN_is_one(r3)) break;
+
+		if (1)
+			{
+			if (!BN_add_word(rsa->e,2L)) goto err;
+			continue;
+			}
+		RSAerr(RSA_F_RSA_GENERATE_KEY,RSA_R_BAD_E_VALUE);
+		goto err;
+		}
+*/
+	rsa->d=BN_mod_inverse(NULL,rsa->e,r0,ctx2);	/* d */
+	if (rsa->d == NULL) goto err;
+
+	/* calculate d mod (p-1) */
+	rsa->dmp1=BN_new();
+	if (rsa->dmp1 == NULL) goto err;
+	if (!BN_mod(rsa->dmp1,rsa->d,r1,ctx)) goto err;
+
+	/* calculate d mod (q-1) */
+	rsa->dmq1=BN_new();
+	if (rsa->dmq1 == NULL) goto err;
+	if (!BN_mod(rsa->dmq1,rsa->d,r2,ctx)) goto err;
+
+	/* calculate inverse of q mod p */
+	rsa->iqmp=BN_mod_inverse(NULL,rsa->q,rsa->p,ctx2);
+	if (rsa->iqmp == NULL) goto err;
+
+	ok=1;
 err:
 	if (ok == -1)
 		{
