diff options
Diffstat (limited to 'crypto/x509/x509_d2.c')
| -rw-r--r-- | crypto/x509/x509_d2.c | 41 |
1 files changed, 19 insertions, 22 deletions
diff --git a/crypto/x509/x509_d2.c b/crypto/x509/x509_d2.c index 512c7ae13e..40f751cde6 100644 --- a/crypto/x509/x509_d2.c +++ b/crypto/x509/x509_d2.c @@ -12,17 +12,15 @@ #include <openssl/crypto.h> #include <openssl/x509.h> -int X509_STORE_set_default_paths_with_libctx(X509_STORE *ctx, - OPENSSL_CTX *libctx, - const char *propq) +int X509_STORE_set_default_paths_ex(X509_STORE *ctx, OPENSSL_CTX *libctx, + const char *propq) { X509_LOOKUP *lookup; lookup = X509_STORE_add_lookup(ctx, X509_LOOKUP_file()); if (lookup == NULL) return 0; - X509_LOOKUP_load_file_with_libctx(lookup, NULL, X509_FILETYPE_DEFAULT, - libctx, propq); + X509_LOOKUP_load_file_ex(lookup, NULL, X509_FILETYPE_DEFAULT, libctx, propq); lookup = X509_STORE_add_lookup(ctx, X509_LOOKUP_hash_dir()); if (lookup == NULL) @@ -32,7 +30,7 @@ int X509_STORE_set_default_paths_with_libctx(X509_STORE *ctx, lookup = X509_STORE_add_lookup(ctx, X509_LOOKUP_store()); if (lookup == NULL) return 0; - X509_LOOKUP_add_store_with_libctx(lookup, NULL, libctx, propq); + X509_LOOKUP_add_store_ex(lookup, NULL, libctx, propq); /* clear any errors */ ERR_clear_error(); @@ -41,18 +39,18 @@ int X509_STORE_set_default_paths_with_libctx(X509_STORE *ctx, } int X509_STORE_set_default_paths(X509_STORE *ctx) { - return X509_STORE_set_default_paths_with_libctx(ctx, NULL, NULL); + return X509_STORE_set_default_paths_ex(ctx, NULL, NULL); } -int X509_STORE_load_file_with_libctx(X509_STORE *ctx, const char *file, - OPENSSL_CTX *libctx, const char *propq) +int X509_STORE_load_file_ex(X509_STORE *ctx, const char *file, + OPENSSL_CTX *libctx, const char *propq) { X509_LOOKUP *lookup; if (file == NULL || (lookup = X509_STORE_add_lookup(ctx, X509_LOOKUP_file())) == NULL - || X509_LOOKUP_load_file_with_libctx(lookup, file, X509_FILETYPE_PEM, - libctx, propq) == 0) + || X509_LOOKUP_load_file_ex(lookup, file, X509_FILETYPE_PEM, libctx, + propq) == 0) return 0; return 1; @@ -60,7 +58,7 @@ int X509_STORE_load_file_with_libctx(X509_STORE *ctx, const char *file, int X509_STORE_load_file(X509_STORE *ctx, const char *file) { - return X509_STORE_load_file_with_libctx(ctx, file, NULL, NULL); + return X509_STORE_load_file_ex(ctx, file, NULL, NULL); } int X509_STORE_load_path(X509_STORE *ctx, const char *path) @@ -75,14 +73,14 @@ int X509_STORE_load_path(X509_STORE *ctx, const char *path) return 1; } -int X509_STORE_load_store_with_libctx(X509_STORE *ctx, const char *uri, - OPENSSL_CTX *libctx, const char *propq) +int X509_STORE_load_store_ex(X509_STORE *ctx, const char *uri, + OPENSSL_CTX *libctx, const char *propq) { X509_LOOKUP *lookup; if (uri == NULL || (lookup = X509_STORE_add_lookup(ctx, X509_LOOKUP_store())) == NULL - || X509_LOOKUP_add_store_with_libctx(lookup, uri, libctx, propq) == 0) + || X509_LOOKUP_add_store_ex(lookup, uri, libctx, propq) == 0) return 0; return 1; @@ -90,17 +88,16 @@ int X509_STORE_load_store_with_libctx(X509_STORE *ctx, const char *uri, int X509_STORE_load_store(X509_STORE *ctx, const char *uri) { - return X509_STORE_load_store_with_libctx(ctx, uri, NULL, NULL); + return X509_STORE_load_store_ex(ctx, uri, NULL, NULL); } -int X509_STORE_load_locations_with_libctx(X509_STORE *ctx, const char *file, - const char *path, - OPENSSL_CTX *libctx, const char *propq) +int X509_STORE_load_locations_ex(X509_STORE *ctx, const char *file, + const char *path, OPENSSL_CTX *libctx, + const char *propq) { if (file == NULL && path == NULL) return 0; - if (file != NULL && !X509_STORE_load_file_with_libctx(ctx, file, - libctx, propq)) + if (file != NULL && !X509_STORE_load_file_ex(ctx, file, libctx, propq)) return 0; if (path != NULL && !X509_STORE_load_path(ctx, path)) return 0; @@ -110,5 +107,5 @@ int X509_STORE_load_locations_with_libctx(X509_STORE *ctx, const char *file, int X509_STORE_load_locations(X509_STORE *ctx, const char *file, const char *path) { - return X509_STORE_load_locations_with_libctx(ctx, file, path, NULL, NULL); + return X509_STORE_load_locations_ex(ctx, file, path, NULL, NULL); } |