diff options
| author | Ralf S. Engelschall <rse@openssl.org> | 1998-12-22 15:59:57 +0000 |
|---|---|---|
| committer | Ralf S. Engelschall <rse@openssl.org> | 1998-12-22 15:59:57 +0000 |
| commit | 13e91dd365887c7ff26dc3ff18d42266e5393f2d (patch) | |
| tree | cec94d3f90051b9b1fff763af1889d5588a5ef67 /crypto | |
| parent | 8c6c8d80b757106e0fc6e9a65dcdbdb7e31ad5e7 (diff) | |
Incorporation of RSEs assembled patches
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/Makefile.ssl | 10 | ||||
| -rw-r--r-- | crypto/bf/blowfish.h | 10 | ||||
| -rw-r--r-- | crypto/date.h | 2 | ||||
| -rw-r--r-- | crypto/evp/p_dec.c | 6 | ||||
| -rw-r--r-- | crypto/evp/p_enc.c | 6 |
5 files changed, 27 insertions, 7 deletions
diff --git a/crypto/Makefile.ssl b/crypto/Makefile.ssl index f55d3594ec..679576d0fb 100644 --- a/crypto/Makefile.ssl +++ b/crypto/Makefile.ssl @@ -74,11 +74,11 @@ files: links: /bin/rm -f Makefile - $(TOP)/util/point.sh Makefile.ssl Makefile ; - $(TOP)/util/mklink.sh ../include $(HEADER) ; - $(TOP)/util/mklink.sh ../test $(TEST) ; - $(TOP)/util/mklink.sh ../apps $(APPS) ; - $(TOP)/util/point.sh Makefile.ssl Makefile; + $(TOP)/util/point.sh Makefile.ssl Makefile + $(TOP)/util/mklink.sh ../include $(HEADER) + $(TOP)/util/mklink.sh ../test $(TEST) + $(TOP)/util/mklink.sh ../apps $(APPS) + $(TOP)/util/point.sh Makefile.ssl Makefile @for i in $(SDIRS) ;\ do \ (cd $$i; echo "making links in $$i..."; \ diff --git a/crypto/bf/blowfish.h b/crypto/bf/blowfish.h index c4a8085a29..23a2bd7d1e 100644 --- a/crypto/bf/blowfish.h +++ b/crypto/bf/blowfish.h @@ -70,7 +70,15 @@ extern "C" { * the Alpha, otherwise they will not. Strangly using the '8 byte' * BF_LONG and the default 'non-pointer' inner loop is the best configuration * for the Alpha */ -#define BF_LONG unsigned long +#if defined(__sgi) +# if (_MIPS_SZLONG==64) +# define BF_LONG unsigned int +# else +# define BF_LONG unsigned long +# endif +#else +# define BF_LONG unsigned long +#endif #define BF_ROUNDS 16 #define BF_BLOCK 8 diff --git a/crypto/date.h b/crypto/date.h index ed7a02988c..b4b9bd96dd 100644 --- a/crypto/date.h +++ b/crypto/date.h @@ -1 +1 @@ -#define DATE "Tue Dec 22 15:40:03 CET 1998" +#define DATE "Tue Dec 8 17:40:20 CET 1998" diff --git a/crypto/evp/p_dec.c b/crypto/evp/p_dec.c index e845ce70c7..fca333d78a 100644 --- a/crypto/evp/p_dec.c +++ b/crypto/evp/p_dec.c @@ -59,7 +59,9 @@ #include <stdio.h> #include "cryptlib.h" #include "rand.h" +#ifndef NO_RSA #include "rsa.h" +#endif #include "evp.h" #include "objects.h" #include "x509.h" @@ -72,13 +74,17 @@ EVP_PKEY *priv; { int ret= -1; +#ifndef NO_RSA if (priv->type != EVP_PKEY_RSA) { +#endif EVPerr(EVP_F_EVP_PKEY_DECRYPT,EVP_R_PUBLIC_KEY_NOT_RSA); +#ifndef NO_RSA goto err; } ret=RSA_private_decrypt(ekl,ek,key,priv->pkey.rsa,RSA_PKCS1_PADDING); err: +#endif return(ret); } diff --git a/crypto/evp/p_enc.c b/crypto/evp/p_enc.c index a26bfad02a..a902b5ebdf 100644 --- a/crypto/evp/p_enc.c +++ b/crypto/evp/p_enc.c @@ -59,7 +59,9 @@ #include <stdio.h> #include "cryptlib.h" #include "rand.h" +#ifndef NO_RSA #include "rsa.h" +#endif #include "evp.h" #include "objects.h" #include "x509.h" @@ -72,12 +74,16 @@ EVP_PKEY *pubk; { int ret=0; +#ifndef NO_RSA if (pubk->type != EVP_PKEY_RSA) { +#endif EVPerr(EVP_F_EVP_PKEY_ENCRYPT,EVP_R_PUBLIC_KEY_NOT_RSA); +#ifndef NO_RSA goto err; } ret=RSA_public_encrypt(key_len,key,ek,pubk->pkey.rsa,RSA_PKCS1_PADDING); err: +#endif return(ret); } |