Deleted Added
sdiff udiff text old ( 1.1.1.2 ) new ( 1.1.1.3 )
full compact
by_file.c (1.1.1.2) by_file.c (1.1.1.3)
1/* crypto/x509/by_file.c */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved.
1/*
2 * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
4 *
3 *
5 * This package is an SSL implementation written
6 * by Eric Young (eay@cryptsoft.com).
7 * The implementation was written so as to conform with Netscapes SSL.
8 *
9 * This library is free for commercial and non-commercial use as long as
10 * the following conditions are aheared to. The following conditions
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
13 * included with this distribution is covered by the same copyright terms
14 * except that the holder is Tim Hudson (tjh@cryptsoft.com).
15 *
16 * Copyright remains Eric Young's, and as such any Copyright notices in
17 * the code are not to be removed.
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.
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.
22 *
23 * Redistribution and use in source and binary forms, with or without
24 * modification, are permitted provided that the following conditions
25 * are met:
26 * 1. Redistributions of source code must retain the copyright
27 * notice, this list of conditions and the following disclaimer.
28 * 2. Redistributions in binary form must reproduce the above copyright
29 * notice, this list of conditions and the following disclaimer in the
30 * documentation and/or other materials provided with the distribution.
31 * 3. All advertising materials mentioning features or use of this software
32 * must display the following acknowledgement:
33 * "This product includes cryptographic software written by
34 * Eric Young (eay@cryptsoft.com)"
35 * The word 'cryptographic' can be left out if the rouines from the library
36 * being used are not cryptographic related :-).
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:
39 * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
40 *
41 * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
42 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
43 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
44 * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
45 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
46 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
47 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
48 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
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
51 * SUCH DAMAGE.
52 *
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
55 * copied and put under another distribution licence
56 * [including the GNU Public Licence.]
4 * Licensed under the OpenSSL license (the "License"). You may not use
5 * this file except in compliance with the License. You can obtain a copy
6 * in the file LICENSE in the source distribution or at
7 * https://www.openssl.org/source/license.html
57 */
58
59#include <stdio.h>
60#include <time.h>
61#include <errno.h>
62
8 */
9
10#include <stdio.h>
11#include <time.h>
12#include <errno.h>
13
63#include "cryptlib.h"
14#include "internal/cryptlib.h"
64#include <openssl/lhash.h>
65#include <openssl/buffer.h>
66#include <openssl/x509.h>
67#include <openssl/pem.h>
15#include <openssl/lhash.h>
16#include <openssl/buffer.h>
17#include <openssl/x509.h>
18#include <openssl/pem.h>
19#include "x509_lcl.h"
68
20
69#ifndef OPENSSL_NO_STDIO
70
71static int by_file_ctrl(X509_LOOKUP *ctx, int cmd, const char *argc,
72 long argl, char **ret);
21static int by_file_ctrl(X509_LOOKUP *ctx, int cmd, const char *argc,
22 long argl, char **ret);
73X509_LOOKUP_METHOD x509_file_lookup = {
23static X509_LOOKUP_METHOD x509_file_lookup = {
74 "Load file into cache",
75 NULL, /* new */
76 NULL, /* free */
77 NULL, /* init */
78 NULL, /* shutdown */
79 by_file_ctrl, /* ctrl */
80 NULL, /* get_by_subject */
81 NULL, /* get_by_issuer_serial */

--- 5 unchanged lines hidden (view full) ---

87{
88 return (&x509_file_lookup);
89}
90
91static int by_file_ctrl(X509_LOOKUP *ctx, int cmd, const char *argp,
92 long argl, char **ret)
93{
94 int ok = 0;
24 "Load file into cache",
25 NULL, /* new */
26 NULL, /* free */
27 NULL, /* init */
28 NULL, /* shutdown */
29 by_file_ctrl, /* ctrl */
30 NULL, /* get_by_subject */
31 NULL, /* get_by_issuer_serial */

--- 5 unchanged lines hidden (view full) ---

37{
38 return (&x509_file_lookup);
39}
40
41static int by_file_ctrl(X509_LOOKUP *ctx, int cmd, const char *argp,
42 long argl, char **ret)
43{
44 int ok = 0;
95 char *file;
45 const char *file;
96
97 switch (cmd) {
98 case X509_L_FILE_LOAD:
99 if (argl == X509_FILETYPE_DEFAULT) {
46
47 switch (cmd) {
48 case X509_L_FILE_LOAD:
49 if (argl == X509_FILETYPE_DEFAULT) {
100 file = (char *)getenv(X509_get_default_cert_file_env());
50 file = getenv(X509_get_default_cert_file_env());
101 if (file)
102 ok = (X509_load_cert_crl_file(ctx, file,
103 X509_FILETYPE_PEM) != 0);
104
105 else
106 ok = (X509_load_cert_crl_file
107 (ctx, X509_get_default_cert_file(),
108 X509_FILETYPE_PEM) != 0);

--- 17 unchanged lines hidden (view full) ---

126{
127 int ret = 0;
128 BIO *in = NULL;
129 int i, count = 0;
130 X509 *x = NULL;
131
132 if (file == NULL)
133 return (1);
51 if (file)
52 ok = (X509_load_cert_crl_file(ctx, file,
53 X509_FILETYPE_PEM) != 0);
54
55 else
56 ok = (X509_load_cert_crl_file
57 (ctx, X509_get_default_cert_file(),
58 X509_FILETYPE_PEM) != 0);

--- 17 unchanged lines hidden (view full) ---

76{
77 int ret = 0;
78 BIO *in = NULL;
79 int i, count = 0;
80 X509 *x = NULL;
81
82 if (file == NULL)
83 return (1);
134 in = BIO_new(BIO_s_file_internal());
84 in = BIO_new(BIO_s_file());
135
136 if ((in == NULL) || (BIO_read_filename(in, file) <= 0)) {
137 X509err(X509_F_X509_LOAD_CERT_FILE, ERR_R_SYS_LIB);
138 goto err;
139 }
140
141 if (type == X509_FILETYPE_PEM) {
142 for (;;) {
85
86 if ((in == NULL) || (BIO_read_filename(in, file) <= 0)) {
87 X509err(X509_F_X509_LOAD_CERT_FILE, ERR_R_SYS_LIB);
88 goto err;
89 }
90
91 if (type == X509_FILETYPE_PEM) {
92 for (;;) {
143 x = PEM_read_bio_X509_AUX(in, NULL, NULL, NULL);
93 x = PEM_read_bio_X509_AUX(in, NULL, NULL, "");
144 if (x == NULL) {
145 if ((ERR_GET_REASON(ERR_peek_last_error()) ==
146 PEM_R_NO_START_LINE) && (count > 0)) {
147 ERR_clear_error();
148 break;
149 } else {
150 X509err(X509_F_X509_LOAD_CERT_FILE, ERR_R_PEM_LIB);
151 goto err;

--- 17 unchanged lines hidden (view full) ---

169 if (!i)
170 goto err;
171 ret = i;
172 } else {
173 X509err(X509_F_X509_LOAD_CERT_FILE, X509_R_BAD_X509_FILETYPE);
174 goto err;
175 }
176 err:
94 if (x == NULL) {
95 if ((ERR_GET_REASON(ERR_peek_last_error()) ==
96 PEM_R_NO_START_LINE) && (count > 0)) {
97 ERR_clear_error();
98 break;
99 } else {
100 X509err(X509_F_X509_LOAD_CERT_FILE, ERR_R_PEM_LIB);
101 goto err;

--- 17 unchanged lines hidden (view full) ---

119 if (!i)
120 goto err;
121 ret = i;
122 } else {
123 X509err(X509_F_X509_LOAD_CERT_FILE, X509_R_BAD_X509_FILETYPE);
124 goto err;
125 }
126 err:
177 if (x != NULL)
178 X509_free(x);
179 if (in != NULL)
180 BIO_free(in);
127 X509_free(x);
128 BIO_free(in);
181 return (ret);
182}
183
184int X509_load_crl_file(X509_LOOKUP *ctx, const char *file, int type)
185{
186 int ret = 0;
187 BIO *in = NULL;
188 int i, count = 0;
189 X509_CRL *x = NULL;
190
191 if (file == NULL)
192 return (1);
129 return (ret);
130}
131
132int X509_load_crl_file(X509_LOOKUP *ctx, const char *file, int type)
133{
134 int ret = 0;
135 BIO *in = NULL;
136 int i, count = 0;
137 X509_CRL *x = NULL;
138
139 if (file == NULL)
140 return (1);
193 in = BIO_new(BIO_s_file_internal());
141 in = BIO_new(BIO_s_file());
194
195 if ((in == NULL) || (BIO_read_filename(in, file) <= 0)) {
196 X509err(X509_F_X509_LOAD_CRL_FILE, ERR_R_SYS_LIB);
197 goto err;
198 }
199
200 if (type == X509_FILETYPE_PEM) {
201 for (;;) {
142
143 if ((in == NULL) || (BIO_read_filename(in, file) <= 0)) {
144 X509err(X509_F_X509_LOAD_CRL_FILE, ERR_R_SYS_LIB);
145 goto err;
146 }
147
148 if (type == X509_FILETYPE_PEM) {
149 for (;;) {
202 x = PEM_read_bio_X509_CRL(in, NULL, NULL, NULL);
150 x = PEM_read_bio_X509_CRL(in, NULL, NULL, "");
203 if (x == NULL) {
204 if ((ERR_GET_REASON(ERR_peek_last_error()) ==
205 PEM_R_NO_START_LINE) && (count > 0)) {
206 ERR_clear_error();
207 break;
208 } else {
209 X509err(X509_F_X509_LOAD_CRL_FILE, ERR_R_PEM_LIB);
210 goto err;

--- 17 unchanged lines hidden (view full) ---

228 if (!i)
229 goto err;
230 ret = i;
231 } else {
232 X509err(X509_F_X509_LOAD_CRL_FILE, X509_R_BAD_X509_FILETYPE);
233 goto err;
234 }
235 err:
151 if (x == NULL) {
152 if ((ERR_GET_REASON(ERR_peek_last_error()) ==
153 PEM_R_NO_START_LINE) && (count > 0)) {
154 ERR_clear_error();
155 break;
156 } else {
157 X509err(X509_F_X509_LOAD_CRL_FILE, ERR_R_PEM_LIB);
158 goto err;

--- 17 unchanged lines hidden (view full) ---

176 if (!i)
177 goto err;
178 ret = i;
179 } else {
180 X509err(X509_F_X509_LOAD_CRL_FILE, X509_R_BAD_X509_FILETYPE);
181 goto err;
182 }
183 err:
236 if (x != NULL)
237 X509_CRL_free(x);
238 if (in != NULL)
239 BIO_free(in);
184 X509_CRL_free(x);
185 BIO_free(in);
240 return (ret);
241}
242
243int X509_load_cert_crl_file(X509_LOOKUP *ctx, const char *file, int type)
244{
245 STACK_OF(X509_INFO) *inf;
246 X509_INFO *itmp;
247 BIO *in;
248 int i, count = 0;
249 if (type != X509_FILETYPE_PEM)
250 return X509_load_cert_file(ctx, file, type);
251 in = BIO_new_file(file, "r");
252 if (!in) {
253 X509err(X509_F_X509_LOAD_CERT_CRL_FILE, ERR_R_SYS_LIB);
254 return 0;
255 }
186 return (ret);
187}
188
189int X509_load_cert_crl_file(X509_LOOKUP *ctx, const char *file, int type)
190{
191 STACK_OF(X509_INFO) *inf;
192 X509_INFO *itmp;
193 BIO *in;
194 int i, count = 0;
195 if (type != X509_FILETYPE_PEM)
196 return X509_load_cert_file(ctx, file, type);
197 in = BIO_new_file(file, "r");
198 if (!in) {
199 X509err(X509_F_X509_LOAD_CERT_CRL_FILE, ERR_R_SYS_LIB);
200 return 0;
201 }
256 inf = PEM_X509_INFO_read_bio(in, NULL, NULL, NULL);
202 inf = PEM_X509_INFO_read_bio(in, NULL, NULL, "");
257 BIO_free(in);
258 if (!inf) {
259 X509err(X509_F_X509_LOAD_CERT_CRL_FILE, ERR_R_PEM_LIB);
260 return 0;
261 }
262 for (i = 0; i < sk_X509_INFO_num(inf); i++) {
263 itmp = sk_X509_INFO_value(inf, i);
264 if (itmp->x509) {
265 X509_STORE_add_cert(ctx->store_ctx, itmp->x509);
266 count++;
267 }
268 if (itmp->crl) {
269 X509_STORE_add_crl(ctx->store_ctx, itmp->crl);
270 count++;
271 }
272 }
273 sk_X509_INFO_pop_free(inf, X509_INFO_free);
274 return count;
275}
203 BIO_free(in);
204 if (!inf) {
205 X509err(X509_F_X509_LOAD_CERT_CRL_FILE, ERR_R_PEM_LIB);
206 return 0;
207 }
208 for (i = 0; i < sk_X509_INFO_num(inf); i++) {
209 itmp = sk_X509_INFO_value(inf, i);
210 if (itmp->x509) {
211 X509_STORE_add_cert(ctx->store_ctx, itmp->x509);
212 count++;
213 }
214 if (itmp->crl) {
215 X509_STORE_add_crl(ctx->store_ctx, itmp->crl);
216 count++;
217 }
218 }
219 sk_X509_INFO_pop_free(inf, X509_INFO_free);
220 return count;
221}
276
277#endif /* OPENSSL_NO_STDIO */