Embed X509_CINF

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

diff --git a/crypto/x509/by_dir.c b/crypto/x509/by_dir.c
index 31b3c3c9dc4b8ae6d25b07e8e06a0da407fdc2a2..5241cad6391b1500775ca03e1379a74272b55def 100644 (file)
--- a/crypto/x509/by_dir.c
+++ b/crypto/x509/by_dir.c
@@ -60,7 +60,7 @@
 #include <time.h>
 #include <errno.h>
 
 #include <time.h>
 #include <errno.h>
 

-#include "cryptlib.h"
+#include "internal/cryptlib.h"

 
 #ifndef NO_SYS_TYPES_H
 # include <sys/types.h>
 
 #ifndef NO_SYS_TYPES_H
 # include <sys/types.h>


@@ -71,6 +71,7 @@
 
 #include <openssl/lhash.h>
 #include <openssl/x509.h>
 
 #include <openssl/lhash.h>
 #include <openssl/x509.h>

+#include "internal/x509_int.h"

 
 typedef struct lookup_dir_hashes_st {
     unsigned long hash;
 
 typedef struct lookup_dir_hashes_st {
     unsigned long hash;


@@ -98,7 +99,7 @@ static void free_dir(X509_LOOKUP *lu);
 static int add_cert_dir(BY_DIR *ctx, const char *dir, int type);
 static int get_cert_by_subject(X509_LOOKUP *xl, int type, X509_NAME *name,
                                X509_OBJECT *ret);
 static int add_cert_dir(BY_DIR *ctx, const char *dir, int type);
 static int get_cert_by_subject(X509_LOOKUP *xl, int type, X509_NAME *name,
                                X509_OBJECT *ret);

-X509_LOOKUP_METHOD x509_dir_lookup = {
+static X509_LOOKUP_METHOD x509_dir_lookup = {

     "Load certs from files in a directory",
     new_dir,                    /* new */
     free_dir,                   /* free */
     "Load certs from files in a directory",
     new_dir,                    /* new */
     free_dir,                   /* free */


@@ -148,7 +149,7 @@ static int new_dir(X509_LOOKUP *lu)
 {
     BY_DIR *a;
 
 {
     BY_DIR *a;
 

-    if ((a = OPENSSL_malloc(sizeof(BY_DIR))) == NULL)
+    if ((a = OPENSSL_malloc(sizeof(*a))) == NULL)

         return (0);
     if ((a->buffer = BUF_MEM_new()) == NULL) {
         OPENSSL_free(a);
         return (0);
     if ((a->buffer = BUF_MEM_new()) == NULL) {
         OPENSSL_free(a);


@@ -177,8 +178,7 @@ static int by_dir_hash_cmp(const BY_DIR_HASH *const *a,
 static void by_dir_entry_free(BY_DIR_ENTRY *ent)
 {
     OPENSSL_free(ent->dir);
 static void by_dir_entry_free(BY_DIR_ENTRY *ent)
 {
     OPENSSL_free(ent->dir);

-    if (ent->hashes)
-        sk_BY_DIR_HASH_pop_free(ent->hashes, by_dir_hash_free);
+    sk_BY_DIR_HASH_pop_free(ent->hashes, by_dir_hash_free);

     OPENSSL_free(ent);
 }
 
     OPENSSL_free(ent);
 }
 


@@ -187,10 +187,8 @@ static void free_dir(X509_LOOKUP *lu)
     BY_DIR *a;
 
     a = (BY_DIR *)lu->method_data;
     BY_DIR *a;
 
     a = (BY_DIR *)lu->method_data;

-    if (a->dirs != NULL)
-        sk_BY_DIR_ENTRY_pop_free(a->dirs, by_dir_entry_free);
-    if (a->buffer != NULL)
-        BUF_MEM_free(a->buffer);
+    sk_BY_DIR_ENTRY_pop_free(a->dirs, by_dir_entry_free);
+    BUF_MEM_free(a->buffer);

     OPENSSL_free(a);
 }
 
     OPENSSL_free(a);
 }
 


@@ -229,7 +227,7 @@ static int add_cert_dir(BY_DIR *ctx, const char *dir, int type)
                     return 0;
                 }
             }
                     return 0;
                 }
             }

-            ent = OPENSSL_malloc(sizeof(BY_DIR_ENTRY));
+            ent = OPENSSL_malloc(sizeof(*ent));

             if (!ent)
                 return 0;
             ent->dir_type = type;
             if (!ent)
                 return 0;
             ent->dir_type = type;


@@ -250,19 +248,13 @@ static int add_cert_dir(BY_DIR *ctx, const char *dir, int type)
     return 1;
 }
 
     return 1;
 }
 

-static int get_cert_by_subject(X509_LOOKUP *xl, int type, X509_NAME *name,
-                               X509_OBJECT *ret)
+static int get_cert_by_subject(X509_LOOKUP *xl, X509_LOOKUP_TYPE type,
+                               X509_NAME *name, X509_OBJECT *ret)

 {
     BY_DIR *ctx;
     union {
 {
     BY_DIR *ctx;
     union {

-        struct {
-            X509 st_x509;
-            X509_CINF st_x509_cinf;
-        } x509;
-        struct {
-            X509_CRL st_crl;
-            X509_CRL_INFO st_crl_info;
-        } crl;
+        X509 st_x509;
+        X509_CRL crl;

     } data;
     int ok = 0;
     int i, j, k;
     } data;
     int ok = 0;
     int i, j, k;


@@ -276,14 +268,12 @@ static int get_cert_by_subject(X509_LOOKUP *xl, int type, X509_NAME *name,
 
     stmp.type = type;
     if (type == X509_LU_X509) {
 
     stmp.type = type;
     if (type == X509_LU_X509) {

-        data.x509.st_x509.cert_info = &data.x509.st_x509_cinf;
-        data.x509.st_x509_cinf.subject = name;
-        stmp.data.x509 = &data.x509.st_x509;
+        data.st_x509.cert_info.subject = name;
+        stmp.data.x509 = &data.st_x509;

         postfix = "";
     } else if (type == X509_LU_CRL) {
         postfix = "";
     } else if (type == X509_LU_CRL) {

-        data.crl.st_crl.crl = &data.crl.st_crl_info;
-        data.crl.st_crl_info.issuer = name;
-        stmp.data.crl = &data.crl.st_crl;
+        data.crl.crl.issuer = name;
+        stmp.data.crl = &data.crl;

         postfix = "r";
     } else {
         X509err(X509_F_GET_CERT_BY_SUBJECT, X509_R_WRONG_LOOKUP_TYPE);
         postfix = "r";
     } else {
         X509err(X509_F_GET_CERT_BY_SUBJECT, X509_R_WRONG_LOOKUP_TYPE);


@@ -399,7 +389,7 @@ static int get_cert_by_subject(X509_LOOKUP *xl, int type, X509_NAME *name,
                     hent = sk_BY_DIR_HASH_value(ent->hashes, idx);
             }
             if (!hent) {
                     hent = sk_BY_DIR_HASH_value(ent->hashes, idx);
             }
             if (!hent) {

-                hent = OPENSSL_malloc(sizeof(BY_DIR_HASH));
+                hent = OPENSSL_malloc(sizeof(*hent));

                 if (hent == NULL) {
                     CRYPTO_w_unlock(CRYPTO_LOCK_X509_STORE);
                     X509err(X509_F_GET_CERT_BY_SUBJECT, ERR_R_MALLOC_FAILURE);
                 if (hent == NULL) {
                     CRYPTO_w_unlock(CRYPTO_LOCK_X509_STORE);
                     X509err(X509_F_GET_CERT_BY_SUBJECT, ERR_R_MALLOC_FAILURE);


@@ -435,7 +425,6 @@ static int get_cert_by_subject(X509_LOOKUP *xl, int type, X509_NAME *name,
         }
     }
  finish:
         }
     }
  finish:

-    if (b != NULL)
-        BUF_MEM_free(b);
+    BUF_MEM_free(b);

     return (ok);
 }
     return (ok);
 }