diff options
| author |   markus <markus@openbsd.org> | 2002-09-14 11:18:01 +0000 |
|---|---|---|
| committer | markus <markus@openbsd.org> | 2002-09-14 11:18:01 +0000 |
| commit | cf5de1f602bfe31a1de0d5bcba280f0bf0a50ae2 (patch) | |
| tree | 2658bb71397039b6e8ea6265a0bfe5a109de2a64 /lib/libssl/src/apps/apps.h | |
| parent | spaces (diff) | |
| download | wireguard-openbsd-cf5de1f602bfe31a1de0d5bcba280f0bf0a50ae2.tar.xz wireguard-openbsd-cf5de1f602bfe31a1de0d5bcba280f0bf0a50ae2.zip | |
merge with openssl-0.9.7-stable-SNAP-20020911,
new minor for libcrypto (_X509_REQ_print_ex)
tested by miod@, pb@
Diffstat (limited to 'lib/libssl/src/apps/apps.h')
| -rw-r--r-- | lib/libssl/src/apps/apps.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libssl/src/apps/apps.h b/lib/libssl/src/apps/apps.h index a88902ac133..32a79605ee8 100644 --- a/lib/libssl/src/apps/apps.h +++ b/lib/libssl/src/apps/apps.h @@ -233,9 +233,9 @@ int app_passwd(BIO *err, char *arg1, char *arg2, char **pass1, char **pass2); int add_oid_section(BIO *err, CONF *conf); X509 *load_cert(BIO *err, const char *file, int format, const char *pass, ENGINE *e, const char *cert_descrip); -EVP_PKEY *load_key(BIO *err, const char *file, int format, +EVP_PKEY *load_key(BIO *err, const char *file, int format, int maybe_stdin, const char *pass, ENGINE *e, const char *key_descrip); -EVP_PKEY *load_pubkey(BIO *err, const char *file, int format, +EVP_PKEY *load_pubkey(BIO *err, const char *file, int format, int maybe_stdin, const char *pass, ENGINE *e, const char *key_descrip); STACK_OF(X509) *load_certs(BIO *err, const char *file, int format, const char *pass, ENGINE *e, const char *cert_descrip); |