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 35c715730191b6cc6ef8e1eb1934f92519a554c5..753d53eb437bc3422c1ece6ffd8e6dcfde77544c 100644 (file)
--- a/crypto/x509/x509_d2.c
+++ b/crypto/x509/x509_d2.c
@@ -57,11 +57,9 @@
  */
 
 #include <stdio.h>
  */
 
 #include <stdio.h>

-#include <sys/types.h>
-#include <sys/stat.h>

 #include "cryptlib.h"
 #include "cryptlib.h"

-#include "crypto.h"
-#include "x509.h"
+#include <openssl/crypto.h>
+#include <openssl/x509.h>

 
 #ifndef NO_STDIO
 int X509_STORE_set_default_paths(X509_STORE *ctx)
 
 #ifndef NO_STDIO
 int X509_STORE_set_default_paths(X509_STORE *ctx)


@@ -82,7 +80,8 @@ int X509_STORE_set_default_paths(X509_STORE *ctx)
        return(1);
        }
 
        return(1);
        }
 

-int X509_STORE_load_locations(X509_STORE *ctx, char *file, char *path)
+int X509_STORE_load_locations(X509_STORE *ctx, const char *file,
+               const char *path)

        {
        X509_LOOKUP *lookup;
 
        {
        X509_LOOKUP *lookup;
 


@@ -90,13 +89,15 @@ int X509_STORE_load_locations(X509_STORE *ctx, char *file, char *path)
                {
                lookup=X509_STORE_add_lookup(ctx,X509_LOOKUP_file());
                if (lookup == NULL) return(0);
                {
                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);
                }
        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);
                }
        if ((path == NULL) && (file == NULL))
                return(0);