summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/x509/x509_d2.c
diff options
context:
space:
mode:
authortedu <>2014-04-18 01:59:00 +0000
committertedu <>2014-04-18 01:59:00 +0000
commit513bec93d6747369737d3a618ef58a44410059f6 (patch)
tree88ee4831e2437f9075e786ffb662bb05fe0e3df6 /src/lib/libcrypto/x509/x509_d2.c
parent1fca82b89342502ff32bda59bd067e303ff9d5ab (diff)
downloadopenbsd-513bec93d6747369737d3a618ef58a44410059f6.tar.gz
openbsd-513bec93d6747369737d3a618ef58a44410059f6.tar.bz2
openbsd-513bec93d6747369737d3a618ef58a44410059f6.zip
blunt force knf
Diffstat (limited to 'src/lib/libcrypto/x509/x509_d2.c')
-rw-r--r--src/lib/libcrypto/x509/x509_d2.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/src/lib/libcrypto/x509/x509_d2.c b/src/lib/libcrypto/x509/x509_d2.c
index 51410cfd1a..ed051093ac 100644
--- a/src/lib/libcrypto/x509/x509_d2.c
+++ b/src/lib/libcrypto/x509/x509_d2.c
@@ -63,7 +63,7 @@
63 63
64#ifndef OPENSSL_NO_STDIO 64#ifndef OPENSSL_NO_STDIO
65int X509_STORE_set_default_paths(X509_STORE *ctx) 65int X509_STORE_set_default_paths(X509_STORE *ctx)
66 { 66{
67 X509_LOOKUP *lookup; 67 X509_LOOKUP *lookup;
68 68
69 lookup=X509_STORE_add_lookup(ctx,X509_LOOKUP_file()); 69 lookup=X509_STORE_add_lookup(ctx,X509_LOOKUP_file());
@@ -78,30 +78,28 @@ int X509_STORE_set_default_paths(X509_STORE *ctx)
78 ERR_clear_error(); 78 ERR_clear_error();
79 79
80 return(1); 80 return(1);
81 } 81}
82 82
83int X509_STORE_load_locations(X509_STORE *ctx, const char *file, 83int X509_STORE_load_locations(X509_STORE *ctx, const char *file,
84 const char *path) 84 const char *path)
85 { 85{
86 X509_LOOKUP *lookup; 86 X509_LOOKUP *lookup;
87 87
88 if (file != NULL) 88 if (file != NULL) {
89 {
90 lookup=X509_STORE_add_lookup(ctx,X509_LOOKUP_file()); 89 lookup=X509_STORE_add_lookup(ctx,X509_LOOKUP_file());
91 if (lookup == NULL) return(0); 90 if (lookup == NULL) return(0);
92 if (X509_LOOKUP_load_file(lookup,file,X509_FILETYPE_PEM) != 1) 91 if (X509_LOOKUP_load_file(lookup,file,X509_FILETYPE_PEM) != 1)
93 return(0); 92 return(0);
94 } 93 }
95 if (path != NULL) 94 if (path != NULL) {
96 {
97 lookup=X509_STORE_add_lookup(ctx,X509_LOOKUP_hash_dir()); 95 lookup=X509_STORE_add_lookup(ctx,X509_LOOKUP_hash_dir());
98 if (lookup == NULL) return(0); 96 if (lookup == NULL) return(0);
99 if (X509_LOOKUP_add_dir(lookup,path,X509_FILETYPE_PEM) != 1) 97 if (X509_LOOKUP_add_dir(lookup,path,X509_FILETYPE_PEM) != 1)
100 return(0); 98 return(0);
101 } 99 }
102 if ((path == NULL) && (file == NULL)) 100 if ((path == NULL) && (file == NULL))
103 return(0); 101 return(0);
104 return(1); 102 return(1);
105 } 103}
106 104
107#endif 105#endif