diff options
| author | Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com> | 2015-05-10 10:03:20 -0400 |
|---|---|---|
| committer | Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com> | 2015-05-10 10:03:20 -0400 |
| commit | 86a08c30b489047d29cd84188c30fe2bc13ff1e9 (patch) | |
| tree | ecfef5f1808b45a6e28b6524d70a3b24d40170fd /Cryptlib/OpenSSL/crypto/x509/by_dir.c | |
| parent | 37358ddb1cdda9a677d34f0635113bf2d542e025 (diff) | |
| download | efi-boot-shim-86a08c30b489047d29cd84188c30fe2bc13ff1e9.tar.gz efi-boot-shim-86a08c30b489047d29cd84188c30fe2bc13ff1e9.zip | |
Reapplying all patches
Diffstat (limited to 'Cryptlib/OpenSSL/crypto/x509/by_dir.c')
| -rw-r--r-- | 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 100644 --- 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 |