diff options
| author | Steve Langasek <steve.langasek@canonical.com> | 2014-10-07 16:20:02 -0700 |
|---|---|---|
| committer | Steve Langasek <steve.langasek@canonical.com> | 2014-10-07 16:20:02 -0700 |
| commit | 4960f3580e74352a37437801c2e633ff36b84943 (patch) | |
| tree | bfb522568f5adab579eea3e47a25b1c4e23af9b6 /Cryptlib/OpenSSL/crypto/x509/by_dir.c | |
| parent | 172647da18bb3017f2a532b86d8083559081e017 (diff) | |
| download | efi-boot-shim-4960f3580e74352a37437801c2e633ff36b84943.tar.gz efi-boot-shim-4960f3580e74352a37437801c2e633ff36b84943.zip | |
Update debian/patches/prototypes with some new declarations needed for
openssl 0.9.8za update.
Diffstat (limited to 'Cryptlib/OpenSSL/crypto/x509/by_dir.c')
| -rwxr-xr-x | Cryptlib/OpenSSL/crypto/x509/by_dir.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Cryptlib/OpenSSL/crypto/x509/by_dir.c b/Cryptlib/OpenSSL/crypto/x509/by_dir.c index b3acd80f..dc2e7df8 100755 --- a/Cryptlib/OpenSSL/crypto/x509/by_dir.c +++ b/Cryptlib/OpenSSL/crypto/x509/by_dir.c @@ -92,8 +92,10 @@ static int dir_ctrl(X509_LOOKUP *ctx, int cmd, const char *argp, long argl, static int new_dir(X509_LOOKUP *lu); static void free_dir(X509_LOOKUP *lu); static int add_cert_dir(BY_DIR *ctx,const char *dir,int type); +#ifndef OPENSSL_NO_STDIO static int get_cert_by_subject(X509_LOOKUP *xl,int type,X509_NAME *name, X509_OBJECT *ret); +#endif X509_LOOKUP_METHOD x509_dir_lookup= { "Load certs from files in a directory", @@ -102,7 +104,11 @@ X509_LOOKUP_METHOD x509_dir_lookup= NULL, /* init */ NULL, /* shutdown */ dir_ctrl, /* ctrl */ +#ifdef OPENSSL_NO_STDIO + NULL, /* get_by_subject */ +#else get_cert_by_subject, /* get_by_subject */ +#endif NULL, /* get_by_issuer_serial */ NULL, /* get_by_fingerprint */ NULL, /* get_by_alias */ @@ -242,6 +248,7 @@ static int add_cert_dir(BY_DIR *ctx, const char *dir, int type) return(1); } +#ifndef OPENSSL_NO_STDIO static int get_cert_by_subject(X509_LOOKUP *xl, int type, X509_NAME *name, X509_OBJECT *ret) { @@ -383,3 +390,4 @@ finish: if (b != NULL) BUF_MEM_free(b); return(ok); } +#endif |