Merge pull request #10 from perl-net-saml2/issue7

Fixes #7 - No need to init look up if its not being used

Author: timlegge

Verify.pm

@@ -165,14 +165,6 @@ Constructor. Returns an OpenSSL Verify instance, set up with the given CA.
     # Using the defaults of your OS:
     my $ca = Crypt::OpenSSL::Verify->new();
 
-=head2 new_from_x509($catext)
-
-Constructor. Returns an OpenSSL Verify instance, set up with the given CA.
-
-Arguments:
-
- * $ca - Crypt::OpenSSL::X509->new_from_string(base64 certificate string)
-
 =head2 verify($cert)
 
 Verify the certificate is signed by the CA. Returns true if so, and

Verify.xs

@@ -276,6 +276,8 @@ SV * new(class, ...)
             if (ST(1) != NULL)
                 // TODO: ensure_string_sv
                 CAfile = ST(1);
+                if (strlen(SvPV_nolen(CAfile)) == 0)
+                    CAfile = NULL;
 
             if (items > 2)
                 options = ensure_hv(ST(2), "options");
@@ -318,46 +320,39 @@ SV * new(class, ...)
         if (!strict_certs)
             X509_STORE_set_verify_cb_func(x509_store, cb1);
 
-        if (noCAfile) {
-            X509_LOOKUP_init(cafile_lookup);
-        }
-        else {
+        if (CAfile != NULL || !noCAfile) {
             cafile_lookup = X509_STORE_add_lookup(x509_store, X509_LOOKUP_file());
-        }
-
-        if (cafile_lookup == NULL) {
-            X509_STORE_free(x509_store);
-            croak("failure to add lookup to store: %s", ssl_error());
-        }
-
-        if (CAfile != NULL) {
-            if (!X509_STORE_load_locations(x509_store, SvPV_nolen(CAfile), NULL)) {
+            if (cafile_lookup == NULL) {
                 X509_STORE_free(x509_store);
-                croak("Error loading file %s: %s\n", SvPV_nolen(CAfile),
-                    ssl_error());
+                croak("failure to add lookup to store: %s", ssl_error());
+            }
+            if (CAfile != NULL) {
+                if (!X509_LOOKUP_load_file(cafile_lookup, SvPV_nolen(CAfile), X509_FILETYPE_PEM)) {
+                    X509_STORE_free(x509_store);
+                    croak("Error loading file %s: %s\n", SvPV_nolen(CAfile),
+                        ssl_error());
+                }
+            } else {
+                X509_LOOKUP_load_file(cafile_lookup, NULL, X509_FILETYPE_DEFAULT);
             }
         }
 
-        if (noCApath) {
-            X509_LOOKUP_init(cadir_lookup);
-        }
-        else {
+        if (CApath != NULL || !noCApath) {
             cadir_lookup = X509_STORE_add_lookup(x509_store, X509_LOOKUP_hash_dir());
-        }
-
-        if (cadir_lookup == NULL) {
-            X509_STORE_free(x509_store);
-            croak("failure to add lookup to store: %s", ssl_error());
-        }
-
-        if (CApath != NULL) {
-            if (!X509_LOOKUP_add_dir(cadir_lookup, SvPV_nolen(CApath), X509_FILETYPE_PEM)) {
+            if (cadir_lookup == NULL) {
                 X509_STORE_free(x509_store);
-                croak("Error loading directory %s\n", SvPV_nolen(CApath));
+                croak("failure to add lookup to store: %s", ssl_error());
+            }
+            if (CApath != NULL) {
+                if (!X509_LOOKUP_add_dir(cadir_lookup, SvPV_nolen(CApath), X509_FILETYPE_PEM)) {
+                    X509_STORE_free(x509_store);
+                    croak("Error loading directory %s\n", SvPV_nolen(CApath));
+                }
+            } else {
+                X509_LOOKUP_add_dir(cadir_lookup, NULL, X509_FILETYPE_DEFAULT);
             }
         }
 
-
         HV * attributes = newHV();
 
         SV *const self = newRV_noinc( (SV *)attributes );