test_mod_mul is useful, let's run it more often.

[openssl.git] / crypto / x509 / x509_d2.c

diff --git a/crypto/x509/x509_d2.c b/crypto/x509/x509_d2.c
index 235d70f8d73ee68cf48d3f3c5c833ef88a083ffe..753d53eb437bc3422c1ece6ffd8e6dcfde77544c 100644 (file)
--- a/crypto/x509/x509_d2.c
+++ b/crypto/x509/x509_d2.c
@@ -1,5 +1,5 @@
 /* crypto/x509/x509_d2.c */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * This package is an SSL implementation written
@@ -57,14 +57,12 @@
  */
 
 #include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include "cryptlib.h"
-#include "crypto.h"
-#include "x509.h"
+#include <openssl/crypto.h>
+#include <openssl/x509.h>
 
-int X509_STORE_set_default_paths(ctx)
-X509_STORE *ctx;
+#ifndef NO_STDIO
+int X509_STORE_set_default_paths(X509_STORE *ctx)
        {
        X509_LOOKUP *lookup;
 
@@ -82,10 +80,8 @@ X509_STORE *ctx;
        return(1);
        }
 
-int X509_STORE_load_locations(ctx,file,path)
-X509_STORE *ctx;
-char *file;
-char *path;
+int X509_STORE_load_locations(X509_STORE *ctx, const char *file,
+               const char *path)
        {
        X509_LOOKUP *lookup;
 
@@ -93,14 +89,19 @@ char *path;
                {
                lookup=X509_STORE_add_lookup(ctx,X509_LOOKUP_file());
                if (lookup == NULL) return(0);
-               X509_LOOKUP_load_file(lookup,file,X509_FILETYPE_PEM);
+               if (X509_LOOKUP_load_file(lookup,file,X509_FILETYPE_PEM) != 1)
+                   return(0);
                }
        if (path != NULL)
                {
                lookup=X509_STORE_add_lookup(ctx,X509_LOOKUP_hash_dir());
                if (lookup == NULL) return(0);
-               X509_LOOKUP_add_dir(lookup,path,X509_FILETYPE_PEM);
+               if (X509_LOOKUP_add_dir(lookup,path,X509_FILETYPE_PEM) != 1)
+                   return(0);
                }
+       if ((path == NULL) && (file == NULL))
+               return(0);
        return(1);
        }
 
+#endif