summaryrefslogtreecommitdiff
path: root/src/lib/libc
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/lib/libcrypto/pem/pem.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/lib/libcrypto/pem/pem.h b/src/lib/libcrypto/pem/pem.h
index 38469f02df..6eae9345a1 100644
--- a/src/lib/libcrypto/pem/pem.h
+++ b/src/lib/libcrypto/pem/pem.h
@@ -392,13 +392,7 @@ int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \
392 DECLARE_PEM_read(name, type) \ 392 DECLARE_PEM_read(name, type) \
393 DECLARE_PEM_write_cb(name, type) 393 DECLARE_PEM_write_cb(name, type)
394 394
395#if 1
396/* "userdata": new with OpenSSL 0.9.4 */
397typedef int pem_password_cb(char *buf, int size, int rwflag, void *userdata); 395typedef int pem_password_cb(char *buf, int size, int rwflag, void *userdata);
398#else
399/* OpenSSL 0.9.3, 0.9.3a */
400typedef int pem_password_cb(char *buf, int size, int rwflag);
401#endif
402 396
403int PEM_get_EVP_CIPHER_INFO(char *header, EVP_CIPHER_INFO *cipher); 397int PEM_get_EVP_CIPHER_INFO(char *header, EVP_CIPHER_INFO *cipher);
404int PEM_do_header (EVP_CIPHER_INFO *cipher, unsigned char *data, long *len, 398int PEM_do_header (EVP_CIPHER_INFO *cipher, unsigned char *data, long *len,