summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>2000-02-26 13:06:55 +0000
committerpeter <peter@FreeBSD.org>2000-02-26 13:06:55 +0000
commit527ba28c8fdf2e7a104fa19c1b56892d2612156b (patch)
treee64adef5838f0c6cf369143e4c9570315b70967a
parent4eac54ad20766adeff291d5df19636e88eac48f8 (diff)
downloadFreeBSD-src-527ba28c8fdf2e7a104fa19c1b56892d2612156b.zip
FreeBSD-src-527ba28c8fdf2e7a104fa19c1b56892d2612156b.tar.gz
At great personal risk (to my already fragile sanity), reorganize
the rsa stubs for libcrypto. libcrypto.so now uses dlopen() to implement the backends for either the native or rsaref implemented RSA code. This involves: - unifying the libcrypto and openssl(1) source so there is no #ifdef RSAref variations. - using weak symbols and dlopen()/dlsym() routines to access the rsa method vectors. Releases will enable the user to choose International, US (rsaref) or no RSA code at install time. 'make world' will DTRT depending on whether you have the international or US source. For US users, you must either install rsaref (the port or package) or (if you don't fear RSA Inc) use the (superior) International rsa_eay.c code. This has been discussed at great length by the affected folks and even we have a great deal of confusion. This is a checkpoint so we can tune the results. This works for me in all permutations I can think of and should result in a CD/ftp 'release' just about doing the right thing now.
-rw-r--r--crypto/openssl/crypto/rsa/rsa_eay.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/openssl/crypto/rsa/rsa_eay.c b/crypto/openssl/crypto/rsa/rsa_eay.c
index 7f51c42..f73d7b2 100644
--- a/crypto/openssl/crypto/rsa/rsa_eay.c
+++ b/crypto/openssl/crypto/rsa/rsa_eay.c
@@ -1,4 +1,5 @@
/* crypto/rsa/rsa_eay.c */
+/* $FreeBSD$ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -87,7 +88,7 @@ static RSA_METHOD rsa_pkcs1_eay_meth={
NULL,
};
-RSA_METHOD *RSA_PKCS1_SSLeay(void)
+RSA_METHOD *RSA_PKCS1(void)
{
return(&rsa_pkcs1_eay_meth);
}
OpenPOWER on IntegriCloud