diff options
| author |   djm <djm@openbsd.org> | 2010-10-01 22:54:00 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2010-10-01 22:54:00 +0000 |
| commit | f1535dc82c407426dcbc37ddee0ceff3f0c94865 (patch) | |
| tree | f73777171acb436d21ef5cb0f2cd241a939ab7f8 /lib/libssl/src/demos/pkcs12 | |
| parent | - document new MODCPAN_MODULES (diff) | |
| download | wireguard-openbsd-f1535dc82c407426dcbc37ddee0ceff3f0c94865.tar.xz wireguard-openbsd-f1535dc82c407426dcbc37ddee0ceff3f0c94865.zip | |
import OpenSSL-1.0.0a
Diffstat (limited to 'lib/libssl/src/demos/pkcs12')
| -rw-r--r-- | lib/libssl/src/demos/pkcs12/pkread.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libssl/src/demos/pkcs12/pkread.c b/lib/libssl/src/demos/pkcs12/pkread.c index 8e1b6863121..fa8f5092378 100644 --- a/lib/libssl/src/demos/pkcs12/pkread.c +++ b/lib/libssl/src/demos/pkcs12/pkread.c @@ -20,7 +20,7 @@ int main(int argc, char **argv) fprintf(stderr, "Usage: pkread p12file password opfile\n"); exit (1); } - SSLeay_add_all_algorithms(); + OpenSSL_add_all_algorithms(); ERR_load_crypto_strings(); if (!(fp = fopen(argv[1], "rb"))) { fprintf(stderr, "Error opening file %s\n", argv[1]); @@ -51,7 +51,7 @@ int main(int argc, char **argv) fprintf(fp, "***User Certificate***\n"); PEM_write_X509_AUX(fp, cert); } - if (ca && sk_num(ca)) { + if (ca && sk_X509_num(ca)) { fprintf(fp, "***Other Certificates***\n"); for (i = 0; i < sk_X509_num(ca); i++) PEM_write_X509_AUX(fp, sk_X509_value(ca, i)); |