Ignore dups in X509_STORE_add_*
[openssl.git] / crypto / x509 / by_file.c
index 57b08ee09458755db75bbc9c52459e79f11a9a21..fa944e81e5c474661bc40ae38c59cbf3272d6bb0 100644 (file)
-/* crypto/x509/by_file.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
+/*
+ * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
  *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
+ * Licensed under the OpenSSL license (the "License").  You may not use
+ * this file except in compliance with the License.  You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
  */
 
 #include <stdio.h>
 #include <time.h>
 #include <errno.h>
 
-#include "cryptlib.h"
+#include "internal/cryptlib.h"
 #include <openssl/lhash.h>
 #include <openssl/buffer.h>
 #include <openssl/x509.h>
 #include <openssl/pem.h>
-
-#ifndef OPENSSL_NO_STDIO
+#include "x509_lcl.h"
 
 static int by_file_ctrl(X509_LOOKUP *ctx, int cmd, const char *argc,
-       long argl, char **ret);
-X509_LOOKUP_METHOD x509_file_lookup=
-       {
-       "Load file into cache",
-       NULL,           /* new */
-       NULL,           /* free */
-       NULL,           /* init */
-       NULL,           /* shutdown */
-       by_file_ctrl,   /* ctrl */
-       NULL,           /* get_by_subject */
-       NULL,           /* get_by_issuer_serial */
-       NULL,           /* get_by_fingerprint */
-       NULL,           /* get_by_alias */
-       };
+                        long argl, char **ret);
+static X509_LOOKUP_METHOD x509_file_lookup = {
+    "Load file into cache",
+    NULL,                       /* new */
+    NULL,                       /* free */
+    NULL,                       /* init */
+    NULL,                       /* shutdown */
+    by_file_ctrl,               /* ctrl */
+    NULL,                       /* get_by_subject */
+    NULL,                       /* get_by_issuer_serial */
+    NULL,                       /* get_by_fingerprint */
+    NULL,                       /* get_by_alias */
+};
 
 X509_LOOKUP_METHOD *X509_LOOKUP_file(void)
-       {
-       return(&x509_file_lookup);
-       }
-
-static int by_file_ctrl(X509_LOOKUP *ctx, int cmd, const char *argp, long argl,
-            char **ret)
-       {
-       int ok=0;
-       char *file;
-
-       switch (cmd)
-               {
-       case X509_L_FILE_LOAD:
-               if (argl == X509_FILETYPE_DEFAULT)
-                       {
-                       file = (char *)getenv(X509_get_default_cert_file_env());
-                       if (file)
-                               ok = (X509_load_cert_crl_file(ctx,file,
-                                             X509_FILETYPE_PEM) != 0);
-
-                       else
-                               ok = (X509_load_cert_crl_file(ctx,X509_get_default_cert_file(),
-                                             X509_FILETYPE_PEM) != 0);
+{
+    return (&x509_file_lookup);
+}
 
-                       if (!ok)
-                               {
-                               X509err(X509_F_BY_FILE_CTRL,X509_R_LOADING_DEFAULTS);
-                               }
-                       }
-               else
-                       {
-                       if(argl == X509_FILETYPE_PEM)
-                               ok = (X509_load_cert_crl_file(ctx,argp,
-                                       X509_FILETYPE_PEM) != 0);
-                       else
-                               ok = (X509_load_cert_file(ctx,argp,(int)argl) != 0);
-                       }
-               break;
-               }
-       return(ok);
-       }
+static int by_file_ctrl(X509_LOOKUP *ctx, int cmd, const char *argp,
+                        long argl, char **ret)
+{
+    int ok = 0;
+    char *file;
+
+    switch (cmd) {
+    case X509_L_FILE_LOAD:
+        if (argl == X509_FILETYPE_DEFAULT) {
+            file = (char *)getenv(X509_get_default_cert_file_env());
+            if (file)
+                ok = (X509_load_cert_crl_file(ctx, file,
+                                              X509_FILETYPE_PEM) != 0);
+
+            else
+                ok = (X509_load_cert_crl_file
+                      (ctx, X509_get_default_cert_file(),
+                       X509_FILETYPE_PEM) != 0);
+
+            if (!ok) {
+                X509err(X509_F_BY_FILE_CTRL, X509_R_LOADING_DEFAULTS);
+            }
+        } else {
+            if (argl == X509_FILETYPE_PEM)
+                ok = (X509_load_cert_crl_file(ctx, argp,
+                                              X509_FILETYPE_PEM) != 0);
+            else
+                ok = (X509_load_cert_file(ctx, argp, (int)argl) != 0);
+        }
+        break;
+    }
+    return (ok);
+}
 
 int X509_load_cert_file(X509_LOOKUP *ctx, const char *file, int type)
-       {
-       int ret=0;
-       BIO *in=NULL;
-       int i,count=0;
-       X509 *x=NULL;
-
-       if (file == NULL) return(1);
-       in=BIO_new(BIO_s_file_internal());
-
-       if ((in == NULL) || (BIO_read_filename(in,file) <= 0))
-               {
-               X509err(X509_F_X509_LOAD_CERT_FILE,ERR_R_SYS_LIB);
-               goto err;
-               }
-
-       if (type == X509_FILETYPE_PEM)
-               {
-               for (;;)
-                       {
-                       x=PEM_read_bio_X509_AUX(in,NULL,NULL,NULL);
-                       if (x == NULL)
-                               {
-                               if ((ERR_GET_REASON(ERR_peek_last_error()) ==
-                                       PEM_R_NO_START_LINE) && (count > 0))
-                                       {
-                                       ERR_clear_error();
-                                       break;
-                                       }
-                               else
-                                       {
-                                       X509err(X509_F_X509_LOAD_CERT_FILE,
-                                               ERR_R_PEM_LIB);
-                                       goto err;
-                                       }
-                               }
-                       i=X509_STORE_add_cert(ctx->store_ctx,x);
-                       if (!i) goto err;
-                       count++;
-                       X509_free(x);
-                       x=NULL;
-                       }
-               ret=count;
-               }
-       else if (type == X509_FILETYPE_ASN1)
-               {
-               x=d2i_X509_bio(in,NULL);
-               if (x == NULL)
-                       {
-                       X509err(X509_F_X509_LOAD_CERT_FILE,ERR_R_ASN1_LIB);
-                       goto err;
-                       }
-               i=X509_STORE_add_cert(ctx->store_ctx,x);
-               if (!i) goto err;
-               ret=i;
-               }
-       else
-               {
-               X509err(X509_F_X509_LOAD_CERT_FILE,X509_R_BAD_X509_FILETYPE);
-               goto err;
-               }
-err:
-       if (x != NULL) X509_free(x);
-       if (in != NULL) BIO_free(in);
-       return(ret);
-       }
+{
+    int ret = 0;
+    BIO *in = NULL;
+    int i, count = 0;
+    X509 *x = NULL;
+
+    in = BIO_new(BIO_s_file());
+
+    if ((in == NULL) || (BIO_read_filename(in, file) <= 0)) {
+        X509err(X509_F_X509_LOAD_CERT_FILE, ERR_R_SYS_LIB);
+        goto err;
+    }
+
+    if (type == X509_FILETYPE_PEM) {
+        for (;;) {
+            x = PEM_read_bio_X509_AUX(in, NULL, NULL, NULL);
+            if (x == NULL) {
+                if ((ERR_GET_REASON(ERR_peek_last_error()) ==
+                     PEM_R_NO_START_LINE) && (count > 0)) {
+                    ERR_clear_error();
+                    break;
+                } else {
+                    X509err(X509_F_X509_LOAD_CERT_FILE, ERR_R_PEM_LIB);
+                    goto err;
+                }
+            }
+            i = X509_STORE_add_cert(ctx->store_ctx, x);
+            if (!i)
+                goto err;
+            count++;
+            X509_free(x);
+            x = NULL;
+        }
+        ret = count;
+    } else if (type == X509_FILETYPE_ASN1) {
+        x = d2i_X509_bio(in, NULL);
+        if (x == NULL) {
+            X509err(X509_F_X509_LOAD_CERT_FILE, ERR_R_ASN1_LIB);
+            goto err;
+        }
+        i = X509_STORE_add_cert(ctx->store_ctx, x);
+        if (!i)
+            goto err;
+        ret = i;
+    } else {
+        X509err(X509_F_X509_LOAD_CERT_FILE, X509_R_BAD_X509_FILETYPE);
+        goto err;
+    }
+    if (ret == 0)
+        X509err(X509_F_X509_LOAD_CERT_FILE, X509_R_NO_CERTIFICATE_FOUND);
+ err:
+    X509_free(x);
+    BIO_free(in);
+    return (ret);
+}
 
 int X509_load_crl_file(X509_LOOKUP *ctx, const char *file, int type)
-       {
-       int ret=0;
-       BIO *in=NULL;
-       int i,count=0;
-       X509_CRL *x=NULL;
-
-       if (file == NULL) return(1);
-       in=BIO_new(BIO_s_file_internal());
-
-       if ((in == NULL) || (BIO_read_filename(in,file) <= 0))
-               {
-               X509err(X509_F_X509_LOAD_CRL_FILE,ERR_R_SYS_LIB);
-               goto err;
-               }
-
-       if (type == X509_FILETYPE_PEM)
-               {
-               for (;;)
-                       {
-                       x=PEM_read_bio_X509_CRL(in,NULL,NULL,NULL);
-                       if (x == NULL)
-                               {
-                               if ((ERR_GET_REASON(ERR_peek_last_error()) ==
-                                       PEM_R_NO_START_LINE) && (count > 0))
-                                       {
-                                       ERR_clear_error();
-                                       break;
-                                       }
-                               else
-                                       {
-                                       X509err(X509_F_X509_LOAD_CRL_FILE,
-                                               ERR_R_PEM_LIB);
-                                       goto err;
-                                       }
-                               }
-                       i=X509_STORE_add_crl(ctx->store_ctx,x);
-                       if (!i) goto err;
-                       count++;
-                       X509_CRL_free(x);
-                       x=NULL;
-                       }
-               ret=count;
-               }
-       else if (type == X509_FILETYPE_ASN1)
-               {
-               x=d2i_X509_CRL_bio(in,NULL);
-               if (x == NULL)
-                       {
-                       X509err(X509_F_X509_LOAD_CRL_FILE,ERR_R_ASN1_LIB);
-                       goto err;
-                       }
-               i=X509_STORE_add_crl(ctx->store_ctx,x);
-               if (!i) goto err;
-               ret=i;
-               }
-       else
-               {
-               X509err(X509_F_X509_LOAD_CRL_FILE,X509_R_BAD_X509_FILETYPE);
-               goto err;
-               }
-err:
-       if (x != NULL) X509_CRL_free(x);
-       if (in != NULL) BIO_free(in);
-       return(ret);
-       }
+{
+    int ret = 0;
+    BIO *in = NULL;
+    int i, count = 0;
+    X509_CRL *x = NULL;
+
+    in = BIO_new(BIO_s_file());
+
+    if ((in == NULL) || (BIO_read_filename(in, file) <= 0)) {
+        X509err(X509_F_X509_LOAD_CRL_FILE, ERR_R_SYS_LIB);
+        goto err;
+    }
+
+    if (type == X509_FILETYPE_PEM) {
+        for (;;) {
+            x = PEM_read_bio_X509_CRL(in, NULL, NULL, NULL);
+            if (x == NULL) {
+                if ((ERR_GET_REASON(ERR_peek_last_error()) ==
+                     PEM_R_NO_START_LINE) && (count > 0)) {
+                    ERR_clear_error();
+                    break;
+                } else {
+                    X509err(X509_F_X509_LOAD_CRL_FILE, ERR_R_PEM_LIB);
+                    goto err;
+                }
+            }
+            i = X509_STORE_add_crl(ctx->store_ctx, x);
+            if (!i)
+                goto err;
+            count++;
+            X509_CRL_free(x);
+            x = NULL;
+        }
+        ret = count;
+    } else if (type == X509_FILETYPE_ASN1) {
+        x = d2i_X509_CRL_bio(in, NULL);
+        if (x == NULL) {
+            X509err(X509_F_X509_LOAD_CRL_FILE, ERR_R_ASN1_LIB);
+            goto err;
+        }
+        i = X509_STORE_add_crl(ctx->store_ctx, x);
+        if (!i)
+            goto err;
+        ret = i;
+    } else {
+        X509err(X509_F_X509_LOAD_CRL_FILE, X509_R_BAD_X509_FILETYPE);
+        goto err;
+    }
+    if (ret == 0)
+        X509err(X509_F_X509_LOAD_CRL_FILE, X509_R_NO_CRL_FOUND);
+ err:
+    X509_CRL_free(x);
+    BIO_free(in);
+    return (ret);
+}
 
 int X509_load_cert_crl_file(X509_LOOKUP *ctx, const char *file, int type)
 {
-       STACK_OF(X509_INFO) *inf;
-       X509_INFO *itmp;
-       BIO *in;
-       int i, count = 0;
-       if(type != X509_FILETYPE_PEM)
-               return X509_load_cert_file(ctx, file, type);
-       in = BIO_new_file(file, "r");
-       if(!in) {
-               X509err(X509_F_X509_LOAD_CERT_CRL_FILE,ERR_R_SYS_LIB);
-               return 0;
-       }
-       inf = PEM_X509_INFO_read_bio(in, NULL, NULL, NULL);
-       BIO_free(in);
-       if(!inf) {
-               X509err(X509_F_X509_LOAD_CERT_CRL_FILE,ERR_R_PEM_LIB);
-               return 0;
-       }
-       for(i = 0; i < sk_X509_INFO_num(inf); i++) {
-               itmp = sk_X509_INFO_value(inf, i);
-               if(itmp->x509) {
-                       X509_STORE_add_cert(ctx->store_ctx, itmp->x509);
-                       count++;
-               }
-               if(itmp->crl) {
-                       X509_STORE_add_crl(ctx->store_ctx, itmp->crl);
-                       count++;
-               }
-       }
-       sk_X509_INFO_pop_free(inf, X509_INFO_free);
-       return count;
+    STACK_OF(X509_INFO) *inf;
+    X509_INFO *itmp;
+    BIO *in;
+    int i, count = 0;
+
+    if (type != X509_FILETYPE_PEM)
+        return X509_load_cert_file(ctx, file, type);
+    in = BIO_new_file(file, "r");
+    if (!in) {
+        X509err(X509_F_X509_LOAD_CERT_CRL_FILE, ERR_R_SYS_LIB);
+        return 0;
+    }
+    inf = PEM_X509_INFO_read_bio(in, NULL, NULL, NULL);
+    BIO_free(in);
+    if (!inf) {
+        X509err(X509_F_X509_LOAD_CERT_CRL_FILE, ERR_R_PEM_LIB);
+        return 0;
+    }
+    for (i = 0; i < sk_X509_INFO_num(inf); i++) {
+        itmp = sk_X509_INFO_value(inf, i);
+        if (itmp->x509) {
+            if (!X509_STORE_add_cert(ctx->store_ctx, itmp->x509))
+                goto err;
+            count++;
+        }
+        if (itmp->crl) {
+            if (!X509_STORE_add_crl(ctx->store_ctx, itmp->crl))
+                goto err;
+            count++;
+        }
+    }
+    if (count == 0)
+        X509err(X509_F_X509_LOAD_CERT_CRL_FILE,
+                X509_R_NO_CERTIFICATE_OR_CRL_FOUND);
+ err:
+    sk_X509_INFO_pop_free(inf, X509_INFO_free);
+    return count;
 }
-
-
-#endif /* OPENSSL_NO_STDIO */
-