aboutsummaryrefslogtreecommitdiffstats
path: root/crypto/pem
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>1999-11-11 13:58:41 +0000
committerDr. Stephen Henson <steve@openssl.org>1999-11-11 13:58:41 +0000
commit53b1899e3cc0ef640643d52599ed94e6d89b20e1 (patch)
tree8bad2e0ab03916b0f9e8839794826ae56698d2a6 /crypto/pem
parent174a4a8c899fcb7f553e56c095613f47fde5dc43 (diff)
downloadopenssl-53b1899e3cc0ef640643d52599ed94e6d89b20e1.tar.gz
Fix a couple of outstanding issues: update STATUS file, fix NO_FP_API problems.
Update docs, change 'ca' to use the new callback parameter. Now moved key_callback into app.c because some other utilities will use it soon.
Diffstat (limited to 'crypto/pem')
-rw-r--r--crypto/pem/pem_lib.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/pem/pem_lib.c b/crypto/pem/pem_lib.c
index a4ea21205c..0bc1752482 100644
--- a/crypto/pem/pem_lib.c
+++ b/crypto/pem/pem_lib.c
@@ -816,7 +816,7 @@ int PEM_write_bio_PKCS8PrivateKey(BIO *bp, EVP_PKEY *x, const EVP_CIPHER *enc,
return ret;
}
}
-
+#ifndef NO_FP_API
int PEM_write_PKCS8PrivateKey(FILE *fp, EVP_PKEY *x, const EVP_CIPHER *enc,
char *kstr, int klen, pem_password_cb *cb, void *u)
{
@@ -830,3 +830,4 @@ int PEM_write_PKCS8PrivateKey(FILE *fp, EVP_PKEY *x, const EVP_CIPHER *enc,
BIO_free(bp);
return ret;
}
+#endif