More changes to fix warnings and errors for mac and windows

timlegge · timlegge · commit 9b57abd8d29e · 2023-07-01T20:57:52.000-03:00
diff --git a/.github/workflows/windows-strawberry.yml b/.github/workflows/windows-strawberry.yml
@@ -24,6 +24,8 @@ jobs:
       with:
         perl-version: ${{ matrix.perl }}
         distribution: strawberry
+    - name: perl -V
+      run: perl -V
     - name: Install Dependencies
       run: cpanm --installdeps .
     - name: Build Module
diff --git a/Makefile.PL b/Makefile.PL
@@ -15,24 +15,9 @@ my %args;
 
 my ($major, $minor, $patch) = openssl_version();
 print "Installed OpenSSL: $major.$minor.$patch\n";
-if ($^O ne 'MSWin32' and my $prefix = `brew --prefix --installed openssl\@1.1 2>@{[File::Spec->devnull]}`) {
-  chomp $prefix;
-  $args{INC} = "-I$prefix/include";
-  $args{LIBS} = ["-L$prefix/lib -lcrypto -lssl"];
-} else {
-  $args{INC} = '-I/usr/local/opt/openssl/include -I/usr/local/include/openssl -I/usr/include/openssl -I/usr/local/include/ssl -I/usr/local/ssl/include';
-  $args{LIBS} = ['-L/usr/local/opt/openssl/lib -L/usr/local/lib -L/usr/lib -L/usr/local/ssl/lib -lcrypto -lssl'];
-}
 
-if ($^O eq 'MSWin32') {
-  if (my $libs = `pkg-config --libs libcrypto 2>nul`) {
-    # strawberry perl has pkg-config
-    $args{LIBS} = [ $libs ];
-  } else {
-    $args{LIBS} = ['-llibeay32'] if $Config{cc} =~ /cl/; # msvc with ActivePerl
-    $args{LIBS} = ['-leay32']    if $Config{gccversion}; # gcc
-  }
-}
+$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';
 
@@ -43,7 +28,10 @@ if ($Config::Config{cc} =~ /gcc/i) {
 }
 
 if ($Config{gccversion} =~ /llvm/i) {
-  if ( $^O eq 'darwin' && $Config{gccversion} =~ /LLVM 12.0.5/) {
+  if ( $^O eq 'darwin' && (
+    $Config{gccversion} =~ /LLVM 1[2-9].\d.[5-9]/ ||
+    $Config{gccversion} =~ /LLVM 1[3-9]/ ))
+  {
     $cc_option_flags .= ' -Wno-deprecated-declarations -Wno-compound-token-split-by-macro';
   } else {
     $cc_option_flags .= ' -Wno-deprecated-declarations';
diff --git a/SignCSR.xs b/SignCSR.xs
@@ -88,7 +88,7 @@ int set_cert_times(X509 *x, const char *startdate, const char *enddate,
         if (X509_time_adj_ex(X509_getm_notAfter(x), days, 0, NULL)
             == NULL)
             return 0;
-#if OPENSSL_API_COMPAT >= 10100
+#if OPENSSL_API_COMPAT >= 10101
     } else if (!ASN1_TIME_set_string_X509(X509_getm_notAfter(x), enddate)) {
 #else
     } else if (!ASN1_TIME_set_string(X509_getm_notAfter(x), enddate)) {
@@ -437,9 +437,8 @@ IV set_digest(self, SV* digest)
     HV * self;
 
     CODE:
-        IV ret = 0;
-        char * digestname = NULL;
-        IV digestname_length;
+        const char * digestname = NULL;
+        STRLEN digestname_length;
 
         RETVAL = 0;
         // Get digestname parameter - verify that it is valid
@@ -449,16 +448,17 @@ IV set_digest(self, SV* digest)
         EVP_MD * md = NULL;
 #endif
         if (digest != NULL) {
-            digestname = (char*) SvPV(digest, digestname_length);
+            digestname = (const char*) SvPV(digest, digestname_length);
             //printf("Digest Name: %s\n", digestname);
             md = (EVP_MD *)EVP_get_digestbyname(digestname);
         }
 
-        if (md != NULL)
+        if (md != NULL) {
             if((hv_store(self, "digest", 6, newRV_inc(digest), 0)) == NULL)
                 RETVAL = 0;
             else
                 RETVAL = 1;
+        }
 
     OUTPUT:
 
@@ -528,7 +528,6 @@ IV set_days(self, IV days)
     HV * self;
 
     CODE:
-        IV ret = 0;
 
         if((hv_store(self, "days", 4, newSViv(days), 0)) == NULL)
             RETVAL = 0;
@@ -557,7 +556,7 @@ SV * sign(self, request_SV, sigopts)
         STRLEN request_length;
         unsigned char* request;
         BIO *csrbio;
-        char * digestname;
+        const char * digestname;
         STRLEN digestname_length;
         IV days;
         SV * digest = NULL;
@@ -578,6 +577,9 @@ SV * sign(self, request_SV, sigopts)
         if (SvIOKp(*svp)) {
             days = SvIV(*svp);
         }
+        else {
+            days = 365;
+        }
 
         if (hv_exists(self, "digest", strlen("digest"))) {
             svp = hv_fetch(self, "digest", strlen("digest"), 0);
@@ -705,12 +707,11 @@ SV * sign(self, request_SV, sigopts)
         EVP_MD * md = NULL;
 #endif
         if (digest != NULL) {
-            digestname = (unsigned char*) SvPV(digest, digestname_length);
-            //printf("Digest Name: %s\n", digestname);
+            digestname = (const char*) SvPV(digest, digestname_length);
             md = (EVP_MD *)EVP_get_digestbyname(digestname);
         }
         if (md != NULL)
-            digestname = (char *) digestname;
+            digestname = (const char *) digestname;
         else
             digestname = NULL;
 
diff --git a/maint/Makefile_header.PL b/maint/Makefile_header.PL
@@ -5,24 +5,9 @@ my %args;
 
 my ($major, $minor, $patch) = openssl_version();
 print "Installed OpenSSL: $major.$minor.$patch\n";
-if ($^O ne 'MSWin32' and my $prefix = `brew --prefix --installed openssl\@1.1 2>@{[File::Spec->devnull]}`) {
-  chomp $prefix;
-  $args{INC} = "-I$prefix/include";
-  $args{LIBS} = ["-L$prefix/lib -lcrypto -lssl"];
-} else {
-  $args{INC} = '-I/usr/local/opt/openssl/include -I/usr/local/include/openssl -I/usr/include/openssl -I/usr/local/include/ssl -I/usr/local/ssl/include';
-  $args{LIBS} = ['-L/usr/local/opt/openssl/lib -L/usr/local/lib -L/usr/lib -L/usr/local/ssl/lib -lcrypto -lssl'];
-}
 
-if ($^O eq 'MSWin32') {
-  if (my $libs = `pkg-config --libs libcrypto 2>nul`) {
-    # strawberry perl has pkg-config
-    $args{LIBS} = [ $libs ];
-  } else {
-    $args{LIBS} = ['-llibeay32'] if $Config{cc} =~ /cl/; # msvc with ActivePerl
-    $args{LIBS} = ['-leay32']    if $Config{gccversion}; # gcc
-  }
-}
+$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';
 
@@ -33,7 +18,10 @@ if ($Config::Config{cc} =~ /gcc/i) {
 }
 
 if ($Config{gccversion} =~ /llvm/i) {
-  if ( $^O eq 'darwin' && $Config{gccversion} =~ /LLVM 12.0.5/) {
+  if ( $^O eq 'darwin' && (
+    $Config{gccversion} =~ /LLVM 1[2-9].\d.[5-9]/ ||
+    $Config{gccversion} =~ /LLVM 1[3-9]/ ))
+  {
     $cc_option_flags .= ' -Wno-deprecated-declarations -Wno-compound-token-split-by-macro';
   } else {
     $cc_option_flags .= ' -Wno-deprecated-declarations';
