diff options
| author | simon <simon@FreeBSD.org> | 2006-07-29 19:10:21 +0000 |
|---|---|---|
| committer | simon <simon@FreeBSD.org> | 2006-07-29 19:10:21 +0000 |
| commit | 9159ca2b0ed030ab3c19210cd933875c52c9ed3d (patch) | |
| tree | 540130ae2c7e1fe4219bbd47c0c8e30f8b396c81 /crypto/openssl/crypto/pem/pem_oth.c | |
| parent | 7067faff1677051a8f1f2ec6ce9e1950a5efd8e2 (diff) | |
| parent | fb3c70eda88d3175627edc6a3316b4508b3d29c5 (diff) | |
| download | FreeBSD-src-9159ca2b0ed030ab3c19210cd933875c52c9ed3d.zip FreeBSD-src-9159ca2b0ed030ab3c19210cd933875c52c9ed3d.tar.gz | |
This commit was generated by cvs2svn to compensate for changes in r160814,
which included commits to RCS files with non-trunk default branches.
Diffstat (limited to 'crypto/openssl/crypto/pem/pem_oth.c')
| -rw-r--r-- | crypto/openssl/crypto/pem/pem_oth.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/crypto/openssl/crypto/pem/pem_oth.c b/crypto/openssl/crypto/pem/pem_oth.c index 8d9064e..b33868d 100644 --- a/crypto/openssl/crypto/pem/pem_oth.c +++ b/crypto/openssl/crypto/pem/pem_oth.c @@ -67,10 +67,11 @@ /* Handle 'other' PEMs: not private keys */ -char *PEM_ASN1_read_bio(char *(*d2i)(), const char *name, BIO *bp, char **x, - pem_password_cb *cb, void *u) +void *PEM_ASN1_read_bio(d2i_of_void *d2i, const char *name, BIO *bp, void **x, + pem_password_cb *cb, void *u) { - unsigned char *p=NULL,*data=NULL; + const unsigned char *p=NULL; + unsigned char *data=NULL; long len; char *ret=NULL; |
