svn commit: r1932380 - spamassassin/trunk/lib/Mail/SpamAssassin/Plugin

Author: fkento
Date: Thu Mar 19 06:28:44 2026
New Revision: 1932380

Log:
Fix "uninitialized value in die" warning when using AuthRes+DKIM

Modified:
   spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DKIM.pm

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DKIM.pm
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DKIM.pm	Thu Mar 19 04:20:03 2026	(r1932379)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DKIM.pm	Thu Mar 19 06:28:44 2026	(r1932380)
@@ -1003,13 +1003,15 @@ sub _check_valid_signature {
       }
       my $key_size;
       if ($valid && !$expired && $minimum_key_bits) {
-        $key_size = eval { my $pk = $signature->get_public_key;
-                           $pk && $pk->cork && $pk->cork->size * 8 };
-        if ($key_size) {
-          $signature->{_spamassassin_key_size} = $key_size; # stash it for later
-          $info .= " WEAK($key_size)"  if $key_size < $minimum_key_bits;
-        } elsif ($signature->{_spamassassin_key_size}) {
+        if ($signature->{_spamassassin_key_size}) {
           $key_size = $signature->{_spamassassin_key_size}; # e.g. from AuthRes
+        } else {
+          $key_size = eval { my $pk = $signature->get_public_key;
+                             $pk && $pk->cork && $pk->cork->size * 8 };
+          if ($key_size) {
+            $signature->{_spamassassin_key_size} = $key_size; # stash it for later
+            $info .= " WEAK($key_size)"  if $key_size < $minimum_key_bits;
+          }
         }
       }
       push(@valid_signatures, $signature)  if $valid && !$expired;