smeserver/smeserver-base
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Tue Mar 26 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-4.sme

Browse Source 
- fix networking [SME: 12541]
- require rsyslog [SME: 12544]
- remove unsupported rsyslog option -c [SME: 12545]
- remove duplicate entry logrotate for btmp and wtmp [SME: 12547]
- rework systemd-default script (error and smartmatches) [SME: 12543]
- fix self signed cert templates [SME: 12551]
This commit is contained in:
Jean-Philippe Pialasse
2024-03-26 21:07:09 -04:00
parent 081e7b8655
commit 0777b5a082
6 changed files with 26 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
root/usr/share/perl5/vendor_perl/esmith/ssl.pm
View File

@@ -53,7 +53,7 @@ sub key_exists_good_size {
# check key size openssl rsa -in /home/e-smith/ssl.key/$host.$domain.key -text -noout | sed -rn "s/Private-Key: \((.*) bit\)/\1/p"
my $signatureKeySize = `openssl rsa -in $key -text -noout | grep "Private-Key" | head -1`;
chomp $signatureKeySize;
$signatureKeySize =~ s/^ *Private-Key: \((.*) bit\)/$1/p;
$signatureKeySize =~ s/^.*Private-Key: \((.*) bit.*\)/$1/p;
if ( $signatureKeySize == $KeySize ) {
#print "key size is correct ($KeySize)\n";
# key exists and key size is correct, we can proceed
@@ -86,7 +86,7 @@ sub cert_exists_good_size {
#openssl x509 -text -noout -in /home/e-smith/ssl.crt/$host.$domain.crt| sed -rn "s/Public-Key: \((.*) bit\)/\1/p"
my $signatureKeySize = `openssl x509 -text -noout -in $crt | grep "Public-Key" | head -1`;
chomp $signatureKeySize;
$signatureKeySize =~ s/^ *Public-Key: \((.*) bit\)/$1/p;
$signatureKeySize =~ s/^.*Public-Key: \((.*) bit\)/$1/p;
if ( $signatureKeySize == $KeySize ) {
#print "$signatureKeySize\n";
# cert is correct size and exists, we can proceed.