diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2009-04-26 22:18:22 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2009-04-26 22:18:22 +0000 |
| commit | d4f0339c66eace1b7f90f07f43b6d8595342cce3 (patch) | |
| tree | 9d747a5557303d6ac558c0f5a3c96e553a13e9c0 /crypto | |
| parent | 127186bf574430546ef48bf3a82d5b3697c522c1 (diff) | |
Update from 1.0.0-stable.
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/bio/bss_dgram.c | 2 | ||||
| -rw-r--r-- | crypto/evp/pmeth_lib.c | 6 | ||||
| -rw-r--r-- | crypto/pem/pvkfmt.c | 2 |
3 files changed, 10 insertions, 0 deletions
diff --git a/crypto/bio/bss_dgram.c b/crypto/bio/bss_dgram.c index 9d2b78d3a2..e3967041b3 100644 --- a/crypto/bio/bss_dgram.c +++ b/crypto/bio/bss_dgram.c @@ -61,7 +61,9 @@ #include <stdio.h> #include <errno.h> +#ifdef OPENSSL_SYS_VMS #include <sys/time.h> +#endif #define USE_SOCKETS #include "cryptlib.h" diff --git a/crypto/evp/pmeth_lib.c b/crypto/evp/pmeth_lib.c index 51f0b6ad63..4a05f0b135 100644 --- a/crypto/evp/pmeth_lib.c +++ b/crypto/evp/pmeth_lib.c @@ -77,9 +77,15 @@ extern const EVP_PKEY_METHOD ec_pkey_meth, hmac_pkey_meth; static const EVP_PKEY_METHOD *standard_methods[] = { +#ifndef OPENSSL_NO_RSA &rsa_pkey_meth, +#endif +#ifndef OPENSSL_NO_DH &dh_pkey_meth, +#endif +#ifndef OPENSSL_NO_DSA &dsa_pkey_meth, +#endif #ifndef OPENSSL_NO_EC &ec_pkey_meth, #endif diff --git a/crypto/pem/pvkfmt.c b/crypto/pem/pvkfmt.c index 5d391cfd8e..11e1f10f57 100644 --- a/crypto/pem/pvkfmt.c +++ b/crypto/pem/pvkfmt.c @@ -63,6 +63,7 @@ #include <openssl/pem.h> #include <openssl/rand.h> #include <openssl/bn.h> +#if !defined(OPENSSL_NO_RSA) && !defined(OPENSSL_NO_DSA) #include <openssl/dsa.h> #include <openssl/rsa.h> @@ -933,3 +934,4 @@ int i2b_PVK_bio(BIO *out, EVP_PKEY *pk, int enclevel, } return -1; } +#endif |