diff options
| author | levitte <levitte> | 2001-02-19 16:01:52 +0000 |
|---|---|---|
| committer | levitte <levitte> | 2001-02-19 16:01:52 +0000 |
| commit | b27f02d7f2080104350b45fd295bbbbea18c0125 (patch) | |
| tree | cdaae5f46cb592a237efa2565a21242e10fc12ce /crypto/evp/p_enc.c | |
| parent | e86dea9f859b4c48da110ed94cbfec794ac7f910 (diff) | |
| download | openssl-b27f02d7f2080104350b45fd295bbbbea18c0125.tar.gz | |
Make all configuration macros available for application by making
sure they are available in opensslconf.h, by giving them names starting
with "OPENSSL_" to avoid conflicts with other packages and by making
sure e_os2.h will cover all platform-specific cases together with
opensslconf.h.
I've checked fairly well that nothing breaks with this (apart from
external software that will adapt if they have used something like
NO_KRB5), but I can't guarantee it completely, so a review of this
change would be a good thing.
Diffstat (limited to 'crypto/evp/p_enc.c')
| -rw-r--r-- | crypto/evp/p_enc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/evp/p_enc.c b/crypto/evp/p_enc.c index 4cf6acaf5..656883b99 100644 --- a/crypto/evp/p_enc.c +++ b/crypto/evp/p_enc.c @@ -59,7 +59,7 @@ #include <stdio.h> #include "cryptlib.h" #include <openssl/rand.h> -#ifndef NO_RSA +#ifndef OPENSSL_NO_RSA #include <openssl/rsa.h> #endif #include <openssl/evp.h> @@ -71,12 +71,12 @@ int EVP_PKEY_encrypt(unsigned char *ek, unsigned char *key, int key_len, { int ret=0; -#ifndef NO_RSA +#ifndef OPENSSL_NO_RSA if (pubk->type != EVP_PKEY_RSA) { #endif EVPerr(EVP_F_EVP_PKEY_ENCRYPT,EVP_R_PUBLIC_KEY_NOT_RSA); -#ifndef NO_RSA +#ifndef OPENSSL_NO_RSA goto err; } ret=RSA_public_encrypt(key_len,key,ek,pubk->pkey.rsa,RSA_PKCS1_PADDING); |