diff options
Diffstat (limited to 'src/lib/libcrypto/x509/by_dir.c')
-rw-r--r-- | src/lib/libcrypto/x509/by_dir.c | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/src/lib/libcrypto/x509/by_dir.c b/src/lib/libcrypto/x509/by_dir.c index ee1838a583..295389bcb3 100644 --- a/src/lib/libcrypto/x509/by_dir.c +++ b/src/lib/libcrypto/x509/by_dir.c | |||
@@ -5,21 +5,21 @@ | |||
5 | * This package is an SSL implementation written | 5 | * This package is an SSL implementation written |
6 | * by Eric Young (eay@cryptsoft.com). | 6 | * by Eric Young (eay@cryptsoft.com). |
7 | * The implementation was written so as to conform with Netscapes SSL. | 7 | * The implementation was written so as to conform with Netscapes SSL. |
8 | * | 8 | * |
9 | * This library is free for commercial and non-commercial use as long as | 9 | * This library is free for commercial and non-commercial use as long as |
10 | * the following conditions are aheared to. The following conditions | 10 | * the following conditions are aheared to. The following conditions |
11 | * apply to all code found in this distribution, be it the RC4, RSA, | 11 | * apply to all code found in this distribution, be it the RC4, RSA, |
12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | 12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation |
13 | * included with this distribution is covered by the same copyright terms | 13 | * included with this distribution is covered by the same copyright terms |
14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | 14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). |
15 | * | 15 | * |
16 | * Copyright remains Eric Young's, and as such any Copyright notices in | 16 | * Copyright remains Eric Young's, and as such any Copyright notices in |
17 | * the code are not to be removed. | 17 | * the code are not to be removed. |
18 | * If this package is used in a product, Eric Young should be given attribution | 18 | * If this package is used in a product, Eric Young should be given attribution |
19 | * as the author of the parts of the library used. | 19 | * as the author of the parts of the library used. |
20 | * This can be in the form of a textual message at program startup or | 20 | * This can be in the form of a textual message at program startup or |
21 | * in documentation (online or textual) provided with the package. | 21 | * in documentation (online or textual) provided with the package. |
22 | * | 22 | * |
23 | * Redistribution and use in source and binary forms, with or without | 23 | * Redistribution and use in source and binary forms, with or without |
24 | * modification, are permitted provided that the following conditions | 24 | * modification, are permitted provided that the following conditions |
25 | * are met: | 25 | * are met: |
@@ -34,10 +34,10 @@ | |||
34 | * Eric Young (eay@cryptsoft.com)" | 34 | * Eric Young (eay@cryptsoft.com)" |
35 | * The word 'cryptographic' can be left out if the rouines from the library | 35 | * The word 'cryptographic' can be left out if the rouines from the library |
36 | * being used are not cryptographic related :-). | 36 | * being used are not cryptographic related :-). |
37 | * 4. If you include any Windows specific code (or a derivative thereof) from | 37 | * 4. If you include any Windows specific code (or a derivative thereof) from |
38 | * the apps directory (application code) you must include an acknowledgement: | 38 | * the apps directory (application code) you must include an acknowledgement: |
39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | 39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" |
40 | * | 40 | * |
41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | 41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND |
42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | 43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
@@ -49,7 +49,7 @@ | |||
49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | 49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY |
50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | 50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF |
51 | * SUCH DAMAGE. | 51 | * SUCH DAMAGE. |
52 | * | 52 | * |
53 | * The licence and distribution terms for any publically available version or | 53 | * The licence and distribution terms for any publically available version or |
54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | 54 | * derivative of this code cannot be changed. i.e. this code cannot simply be |
55 | * copied and put under another distribution licence | 55 | * copied and put under another distribution licence |
@@ -137,12 +137,12 @@ dir_ctrl(X509_LOOKUP *ctx, int cmd, const char *argp, long argl, | |||
137 | ret = add_cert_dir(ld, dir, X509_FILETYPE_PEM); | 137 | ret = add_cert_dir(ld, dir, X509_FILETYPE_PEM); |
138 | else | 138 | else |
139 | ret = add_cert_dir(ld, X509_get_default_cert_dir(), | 139 | ret = add_cert_dir(ld, X509_get_default_cert_dir(), |
140 | X509_FILETYPE_PEM); | 140 | X509_FILETYPE_PEM); |
141 | if (!ret) { | 141 | if (!ret) { |
142 | X509err(X509_F_DIR_CTRL, X509_R_LOADING_CERT_DIR); | 142 | X509err(X509_F_DIR_CTRL, X509_R_LOADING_CERT_DIR); |
143 | } | 143 | } |
144 | } else | 144 | } else |
145 | ret = add_cert_dir(ld, argp,(int)argl); | 145 | ret = add_cert_dir(ld, argp, (int)argl); |
146 | break; | 146 | break; |
147 | } | 147 | } |
148 | return (ret); | 148 | return (ret); |
@@ -349,12 +349,12 @@ get_cert_by_subject(X509_LOOKUP *xl, int type, X509_NAME *name, | |||
349 | /* found one. */ | 349 | /* found one. */ |
350 | if (type == X509_LU_X509) { | 350 | if (type == X509_LU_X509) { |
351 | if ((X509_load_cert_file(xl, b->data, | 351 | if ((X509_load_cert_file(xl, b->data, |
352 | ent->dir_type)) == 0) | 352 | ent->dir_type)) == 0) |
353 | break; | 353 | break; |
354 | } else if (type == X509_LU_CRL) { | 354 | } else if (type == X509_LU_CRL) { |
355 | if ((X509_load_crl_file(xl, b->data, | 355 | if ((X509_load_crl_file(xl, b->data, |
356 | ent->dir_type)) == 0) | 356 | ent->dir_type)) == 0) |
357 | break; | 357 | break; |
358 | } | 358 | } |
359 | /* else case will caught higher up */ | 359 | /* else case will caught higher up */ |
360 | k++; | 360 | k++; |
@@ -365,7 +365,8 @@ get_cert_by_subject(X509_LOOKUP *xl, int type, X509_NAME *name, | |||
365 | j = sk_X509_OBJECT_find(xl->store_ctx->objs, &stmp); | 365 | j = sk_X509_OBJECT_find(xl->store_ctx->objs, &stmp); |
366 | if (j != -1) | 366 | if (j != -1) |
367 | tmp = sk_X509_OBJECT_value(xl->store_ctx->objs, j); | 367 | tmp = sk_X509_OBJECT_value(xl->store_ctx->objs, j); |
368 | else tmp = NULL; | 368 | else |
369 | tmp = NULL; | ||
369 | CRYPTO_w_unlock(CRYPTO_LOCK_X509_STORE); | 370 | CRYPTO_w_unlock(CRYPTO_LOCK_X509_STORE); |
370 | 371 | ||
371 | /* If a CRL, update the last file suffix added for this */ | 372 | /* If a CRL, update the last file suffix added for this */ |