diff options
| -rw-r--r-- | crypto/openssl/crypto/rsa/rsa_stubs.c | 31 | ||||
| -rw-r--r-- | crypto/openssl/rsaref/rsaref_stubs.c | 37 |
2 files changed, 26 insertions, 42 deletions
diff --git a/crypto/openssl/crypto/rsa/rsa_stubs.c b/crypto/openssl/crypto/rsa/rsa_stubs.c index f0715b9..5a34030 100644 --- a/crypto/openssl/crypto/rsa/rsa_stubs.c +++ b/crypto/openssl/crypto/rsa/rsa_stubs.c @@ -87,36 +87,7 @@ __weak_reference(ERR_load_RSA_strings_stub, ERR_load_RSA_strings); #else /* !PIC */ -RSA_METHOD * -RSA_PKCS1_stub(void) -{ -#ifdef VERBOSE_STUBS - static int whined; - - if (!whined) { - fprintf(stderr, "** This program was statically linked without any RSA implemenation!\n\n"); - whined = 1; - } -#endif - return NULL; -} -__weak_reference(RSA_PKCS1_stub, RSA_PKCS1); -__warn_references(RSA_PKCS1_stub, "Using stub RSA glue"); - -void -ERR_load_RSA_strings_stub(void) -{ -#ifdef VERBOSE_STUBS - static int whined; - - if (!whined) { - fprintf(stderr, "** This program was statically linked without any RSA implemenation!\n\n"); - whined = 1; - } -#endif -} -__weak_reference(ERR_load_RSA_strings_stub, ERR_load_RSA_strings); -__warn_references(ERR_load_RSA_strings_stub, "Using stub RSA glue"); +/* Sigh, just get your own libs, ld(1) doesn't deal with weaks here */ #endif /* !PIC */ #endif /* NO_RSA */ diff --git a/crypto/openssl/rsaref/rsaref_stubs.c b/crypto/openssl/rsaref/rsaref_stubs.c index 67aa1c2..d763dbd 100644 --- a/crypto/openssl/rsaref/rsaref_stubs.c +++ b/crypto/openssl/rsaref/rsaref_stubs.c @@ -37,13 +37,17 @@ * */ -#if !defined(NO_RSA) && defined(PIC) -#include <dlfcn.h> +#ifndef NO_RSA + #include <stdio.h> -#define RSA_SHLIB "librsaref.so" /* be more exact if you need to */ #define VERBOSE_STUBS /* undef if you don't want missing rsaref reported */ +#ifdef PIC +#include <dlfcn.h> + +#define RSA_SHLIB "librsaref.so" /* be more exact if you need to */ + static void * getsym(const char *sym) { @@ -65,7 +69,6 @@ getsym(const char *sym) return ret; } -#pragma weak RSAPrivateDecrypt=RSAPrivateDecrypt_stub int RSAPrivateDecrypt_stub(unsigned char *output, unsigned int *outlen, unsigned char *input, int inputlen, void *RSAkey) @@ -76,8 +79,9 @@ RSAPrivateDecrypt_stub(unsigned char *output, unsigned int *outlen, return sym(output, outlen, input, inputlen, RSAkey); return 0; } +__weak_reference(RSAPrivateDecrypt_stub, RSAPrivateDecrypt); + -#pragma weak RSAPrivateEncrypt=RSAPrivateEncrypt_stub int RSAPrivateEncrypt_stub(unsigned char *output, unsigned int *outlen, unsigned char *input, int inputlen, void *RSAkey) @@ -88,8 +92,8 @@ RSAPrivateEncrypt_stub(unsigned char *output, unsigned int *outlen, return sym(output, outlen, input, inputlen, RSAkey); return 0; } +__weak_reference(RSAPrivateEncrypt_stub, RSAPrivateEncrypt); -#pragma weak RSAPublicDecrypt=RSAPublicDecrypt_stub int RSAPublicDecrypt_stub(unsigned char *output, unsigned int *outlen, unsigned char *input, int inputlen, void *RSAkey) @@ -100,8 +104,8 @@ RSAPublicDecrypt_stub(unsigned char *output, unsigned int *outlen, return sym(output, outlen, input, inputlen, RSAkey); return 0; } +__weak_reference(RSAPublicDecrypt_stub, RSAPublicDecrypt); -#pragma weak RSAPublicEncrypt=RSAPublicEncrypt_stub int RSAPublicEncrypt_stub(unsigned char *output, unsigned int *outlen, unsigned char *input, int inputlen, void *RSAkey, void *randomStruct) @@ -113,8 +117,8 @@ RSAPublicEncrypt_stub(unsigned char *output, unsigned int *outlen, return sym(output, outlen, input, inputlen, RSAkey, randomStruct); return 0; } +__weak_reference(RSAPublicEncrypt_stub, RSAPublicEncrypt); -#pragma weak R_GetRandomBytesNeeded=R_GetRandomBytesNeeded_stub int R_GetRandomBytesNeeded_stub(unsigned int *bytesNeeded, void *randomStruct) { @@ -124,8 +128,8 @@ R_GetRandomBytesNeeded_stub(unsigned int *bytesNeeded, void *randomStruct) return sym(bytesNeeded, randomStruct); return 0; } +__weak_reference(R_GetRandomBytesNeeded_stub, R_GetRandomBytesNeeded); -#pragma weak R_RandomFinal=R_RandomFinal_stub void R_RandomFinal_stub(void *randomStruct) { @@ -134,8 +138,8 @@ R_RandomFinal_stub(void *randomStruct) if (sym || (sym = getsym("R_RandomFinal"))) sym(randomStruct); } +__weak_reference(R_RandomFinal_stub, R_RandomFinal); -#pragma weak R_RandomInit=R_RandomInit_stub int R_RandomInit_stub(void *randomStruct) { @@ -145,8 +149,8 @@ R_RandomInit_stub(void *randomStruct) sym(randomStruct); return 0; } +__weak_reference(R_RandomInit_stub, R_RandomInit); -#pragma weak R_RandomUpdate=R_RandomUpdate_stub int R_RandomUpdate_stub(void *randomStruct, unsigned char *block, unsigned int blockLen) @@ -157,5 +161,14 @@ R_RandomUpdate_stub(void *randomStruct, sym(randomStruct, block, blockLen); return 0; } +__weak_reference(R_RandomUpdate_stub, R_RandomUpdate); + +#else /* !PIC */ + +/* Failsafe glue for static linking. Link but complain like hell. */ + +/* actually, this creates all sorts of ld(1) problems, forget it for now */ + +#endif /* !PIC */ -#endif /* !NO_RSA && PIC */ +#endif /* !NO_RSA */ |
