summaryrefslogtreecommitdiffstats
path: root/crypto/pem
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2009-04-26 22:18:22 +0000
committerDr. Stephen Henson <steve@openssl.org>2009-04-26 22:18:22 +0000
commitd4f0339c66eace1b7f90f07f43b6d8595342cce3 (patch)
tree9d747a5557303d6ac558c0f5a3c96e553a13e9c0 /crypto/pem
parent127186bf574430546ef48bf3a82d5b3697c522c1 (diff)
Update from 1.0.0-stable.
Diffstat (limited to 'crypto/pem')
-rw-r--r--crypto/pem/pvkfmt.c2
1 files changed, 2 insertions, 0 deletions
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