Merge pull request #8 from timlegge/configuredapi

use Crypt::OpenSSL::ConfiguredAPI to determin the API level supported

Author: timlegge

.github/workflows/linux.yml

@@ -1,8 +1,14 @@
 name: linux
 
 on:
-  - push
-
+  push:
+    branches:
+      - '*'
+    tags-ignore:
+      - '*'
+  pull_request:
+    branches:
+      - '*'
 jobs:
   perl:
     runs-on: ubuntu-latest

Makefile.PL

@@ -11,15 +11,24 @@ use ExtUtils::MakeMaker;
 use Config;
 use File::Spec;
 use Crypt::OpenSSL::Guess;
+use Crypt::OpenSSL::ConfiguredAPI;
+
 my %args;
 
 my ($major, $minor, $patch) = openssl_version();
 print "Installed OpenSSL: $major.$minor.$patch\n";
 
+my $version = ($major * 10000) + ($minor * 100);
+my $api = Crypt::OpenSSL::ConfiguredAPI::get_configured_api();
+print "API version read $api\n";
+
+my $compat = $api ne 0 ? $api : $version;
+print "OPENSSL_COMPAT_API set to: $compat\n";
+
 $args{INC} =  openssl_inc_paths();
 $args{LIBS} = [openssl_lib_paths() . ' -lssl -lcrypto'];
 
-my $cc_option_flags = $major ge 3 ? ' -DOPENSSL_API_COMPAT=30000' : ' -DOPENSSL_API_COMPAT=10100';
+my $cc_option_flags = " -DOPENSSL_API_COMPAT=$compat";
 
 if ($Config::Config{cc} =~ /gcc/i) {
   $cc_option_flags .= $ENV{AUTHOR_TESTING} ? ' -Wall -Werror' : ' -Wall';
@@ -55,22 +64,33 @@ if ($Config{myuname} =~ /sunos|solaris/i) {
 my %WriteMakefileArgs = (
   "ABSTRACT" => "Sign a Certificate Signing Request in XS.",
   "AUTHOR" => "Timothy Legge <timlegge\@cpan.org>",
+  "BUILD_REQUIRES" => {
+    "Crypt::OpenSSL::ConfiguredAPI" => 0,
+    "Crypt::OpenSSL::Guess" => 0
+  },
   "CONFIGURE_REQUIRES" => {
+    "Crypt::OpenSSL::ConfiguredAPI" => 0,
     "Crypt::OpenSSL::Guess" => 0,
     "ExtUtils::MakeMaker" => 0
   },
   "DISTNAME" => "Crypt-OpenSSL-SignCSR",
   "LICENSE" => "apache",
   "MIN_PERL_VERSION" => "5.014",
   "NAME" => "Crypt::OpenSSL::SignCSR",
-  "PREREQ_PM" => {},
+  "PREREQ_PM" => {
+    "Exporter" => 0,
+    "XSLoader" => 0
+  },
   "TEST_REQUIRES" => {
+    "Crypt::OpenSSL::Guess" => 0,
     "Crypt::OpenSSL::PKCS10" => "0.19",
     "Crypt::OpenSSL::RSA" => 0,
     "File::Slurper" => "0.012",
-    "File::Which" => 0
+    "File::Temp" => 0,
+    "File::Which" => 0,
+    "Test::More" => "0.88"
   },
-  "VERSION" => "0.12",
+  "VERSION" => "0.13",
   "test" => {
     "TESTS" => "t/*.t"
   }
@@ -82,10 +102,16 @@ my %WriteMakefileArgs = (
 );
 
 my %FallbackPrereqs = (
+  "Crypt::OpenSSL::ConfiguredAPI" => 0,
+  "Crypt::OpenSSL::Guess" => 0,
   "Crypt::OpenSSL::PKCS10" => "0.19",
   "Crypt::OpenSSL::RSA" => 0,
+  "Exporter" => 0,
   "File::Slurper" => "0.012",
-  "File::Which" => 0
+  "File::Temp" => 0,
+  "File::Which" => 0,
+  "Test::More" => "0.88",
+  "XSLoader" => 0
 );
 
 unless ( eval { ExtUtils::MakeMaker->VERSION('6.63_03') } ) {

README.md

@@ -103,7 +103,7 @@ Arguments:
 
 Get the number of days that is currently set.
 
-Returns a number
+Returns the number of days or -1 for a failure.
 
 # EXPORT
 

SignCSR.xs

@@ -85,7 +85,7 @@ int set_cert_times(X509 *x, const char *startdate, const char *enddate,
 #endif
             return 0;
     } else {
-#if OPENSSL_API_COMPAT <= 10101
+#if OPENSSL_API_COMPAT <= 11000
         if (!ASN1_TIME_set_string(X509_get_notBefore(x), startdate))
 #else
         if (!ASN1_TIME_set_string_X509(X509_getm_notBefore(x), startdate))
@@ -100,7 +100,7 @@ int set_cert_times(X509 *x, const char *startdate, const char *enddate,
 #endif
             == NULL)
             return 0;
-#if OPENSSL_API_COMPAT < 10101
+#if OPENSSL_API_COMPAT <= 11000
     } else if (!ASN1_TIME_set_string(X509_get_notAfter(x), enddate)) {
 #else
     } else if (!ASN1_TIME_set_string_X509(X509_getm_notAfter(x), enddate)) {
@@ -437,18 +437,15 @@ char * get_digest(self)
     CODE:
         SV **svp;
 
+        RETVAL = SvPV_nolen(newSVpv("",0));
+
         // Get the output format - default is pem format
         if (hv_exists(self, "digest", strlen("digest"))) {
             svp = hv_fetch(self, "digest", strlen("digest"), 0);
             if (SvROK(*svp)) {
                 RETVAL = SvPV_nolen(SvRV(*svp));
             }
         }
-        else {
-            //FIXME this should probably get the default for openssl
-            //but since nothing was set this is likely most accurate
-            RETVAL = SvPV_nolen(newSVpv("",0));
-        }
 
     OUTPUT:
 
@@ -493,16 +490,15 @@ char * get_format(self)
     CODE:
         SV **svp;
 
+        RETVAL = SvPV_nolen(newSVpv("",0));
+
         // Get the output format - default is pem format
         if (hv_exists(self, "format", strlen("format"))) {
             svp = hv_fetch(self, "format", strlen("format"), 0);
             if (SvROK(*svp)) {
                 RETVAL = SvPV_nolen(SvRV(*svp));
             }
         }
-        else {
-            RETVAL = SvPV_nolen(newSVpv("",0));
-        }
 
     OUTPUT:
 
@@ -512,7 +508,7 @@ IV set_format(self, SV* format)
     HV * self;
 
     CODE:
-        IV ret = 0;
+        RETVAL = 0;
 
         if (sv_cmp(format, newSVpv("pem", 0)) == 0 ||
                 sv_cmp(format, newSVpv("text", 0)) == 0 )
@@ -522,7 +518,7 @@ IV set_format(self, SV* format)
             else
                 RETVAL = 1;
         } else {
-            RETVAL = ret;
+            RETVAL = 0;
         }
 
     OUTPUT:
@@ -535,6 +531,7 @@ IV get_days(self)
     CODE:
         SV **svp;
 
+        RETVAL = -1;
         // Get the number of days for specified - default 365
         if (hv_exists(self, "days", strlen("days"))) {
             svp = hv_fetch(self, "days", strlen("days"), 0);
@@ -551,6 +548,7 @@ IV set_days(self, IV days)
     HV * self;
 
     CODE:
+        RETVAL = 0;
 
         if((hv_store(self, "days", 4, newSViv(days), 0)) == NULL)
             RETVAL = 0;
@@ -582,7 +580,7 @@ SV * sign(self, request_SV)
         STRLEN digestname_length;
         IV days;
         SV * digest = NULL;
-        SV * format;
+        SV * format = NULL;
 
         if (!hv_exists(self, "privkey", strlen("privkey")))
             croak("privkey not found in self!\n");
@@ -802,7 +800,9 @@ void signcsr_DESTROY(void)
 
         CRYPTO_cleanup_all_ex_data();
         ERR_free_strings();
+#if OPENSSL_API_COMPAT < 10000
         ERR_remove_state(0);
+#endif
         EVP_cleanup();
 
 #endif

cpanfile

@@ -1,16 +1,27 @@
 # This file is generated by Dist::Zilla::Plugin::CPANFile v6.030
 # Do not edit this file directly. To change prereqs, edit the `dist.ini` file.
 
+requires "Exporter" => "0";
+requires "XSLoader" => "0";
 requires "perl" => "5.014";
 
+on 'build' => sub {
+  requires "Crypt::OpenSSL::ConfiguredAPI" => "0";
+  requires "Crypt::OpenSSL::Guess" => "0";
+};
+
 on 'test' => sub {
+  requires "Crypt::OpenSSL::Guess" => "0";
   requires "Crypt::OpenSSL::PKCS10" => "0.19";
   requires "Crypt::OpenSSL::RSA" => "0";
   requires "File::Slurper" => "0.012";
+  requires "File::Temp" => "0";
   requires "File::Which" => "0";
+  requires "Test::More" => "0.88";
 };
 
 on 'configure' => sub {
+  requires "Crypt::OpenSSL::ConfiguredAPI" => "0";
   requires "Crypt::OpenSSL::Guess" => "0";
   requires "ExtUtils::MakeMaker" => "0";
 };

dist.ini

@@ -14,8 +14,21 @@ maintainer = Timothy Legge <[email protected]>
 -remove = MakeMaker
 -remove = Readme
 
+[AutoPrereqs]
+skip = ^vars$
+skip = utf8
+skip = warnings
+skip = strict
+skip = overload
+skip = base
+
+[Prereqs / BuildRequires]
+Crypt::OpenSSL::Guess = 0
+Crypt::OpenSSL::ConfiguredAPI  = 0
+
 [Prereqs / ConfigureRequires]
 Crypt::OpenSSL::Guess = 0
+Crypt::OpenSSL::ConfiguredAPI  = 0
 
 [Prereqs / RuntimeRequires]
 perl = 5.014
@@ -71,7 +84,7 @@ header_file = maint/Makefile_header.PL
 WriteMakefile_arg = %args
 
 [Repository]
-git_remote = origin
+git_remote = upstream
 
 [Bugtracker]
 web = https://github.com/perl-net-saml2/perl-Crypt-OpenSSL-SignCSR/issues

lib/Crypt/OpenSSL/SignCSR.pm

@@ -7,7 +7,7 @@ use warnings;
 
 require Exporter;
 
-our $VERSION  = "0.12";
+our $VERSION  = "0.13";
 
 our @ISA = qw(Exporter);
 
@@ -122,7 +122,7 @@ Arguments:
 
 Get the number of days that is currently set.
 
-Returns a number
+Returns the number of days or -1 for a failure.
 
 =head1 EXPORT
 

maint/Makefile_header.PL

@@ -1,15 +1,24 @@
 use Config;
 use File::Spec;
 use Crypt::OpenSSL::Guess;
+use Crypt::OpenSSL::ConfiguredAPI;
+
 my %args;
 
 my ($major, $minor, $patch) = openssl_version();
 print "Installed OpenSSL: $major.$minor.$patch\n";
 
+my $version = ($major * 10000) + ($minor * 100);
+my $api = Crypt::OpenSSL::ConfiguredAPI::get_configured_api();
+print "API version read $api\n";
+
+my $compat = $api ne 0 ? $api : $version;
+print "OPENSSL_COMPAT_API set to: $compat\n";
+
 $args{INC} =  openssl_inc_paths();
 $args{LIBS} = [openssl_lib_paths() . ' -lssl -lcrypto'];
 
-my $cc_option_flags = $major ge 3 ? ' -DOPENSSL_API_COMPAT=30000' : ' -DOPENSSL_API_COMPAT=10100';
+my $cc_option_flags = " -DOPENSSL_API_COMPAT=$compat";
 
 if ($Config::Config{cc} =~ /gcc/i) {
   $cc_option_flags .= $ENV{AUTHOR_TESTING} ? ' -Wall -Werror' : ' -Wall';