summaryrefslogtreecommitdiff
path: root/crypto/pem
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>1999-05-15 20:33:15 +0000
committerDr. Stephen Henson <steve@openssl.org>1999-05-15 20:33:15 +0000
commita74c55cd8f73b4ff4480a1ab425ac2d6d8df5039 (patch)
tree5c73bd663ff480d1a796bcdd6cbb467257309205 /crypto/pem
parentac7d07851c1dbbf42496ab1177a5c19a0e6693d8 (diff)
Various Win32 fixes. Change args in do_ms.bat to put platform last. Fix
unsigned/signed cmp error in asn1parse. Change various pem_all.c args to use pem_password_cb.
Diffstat (limited to 'crypto/pem')
-rw-r--r--crypto/pem/pem_lib.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/pem/pem_lib.c b/crypto/pem/pem_lib.c
index 916e9a8132..24464308cd 100644
--- a/crypto/pem/pem_lib.c
+++ b/crypto/pem/pem_lib.c
@@ -217,7 +217,7 @@ err:
#ifndef NO_FP_API
int PEM_ASN1_write(int (*i2d)(), const char *name, FILE *fp, char *x,
const EVP_CIPHER *enc, unsigned char *kstr, int klen,
- int (*callback)())
+ pem_password_cb *callback)
{
BIO *b;
int ret;
@@ -325,7 +325,7 @@ err:
}
int PEM_do_header(EVP_CIPHER_INFO *cipher, unsigned char *data, long *plen,
- int (*callback)())
+ pem_password_cb *callback)
{
int i,j,o,klen;
long len;