diff options
| author | Reinhard Tartler <siretart@tauware.de> | 2017-06-17 17:40:15 -0400 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2017-06-17 17:55:25 -0400 |
| commit | 2afb9130955257a8af5ad8c414c5fba681d4d0f8 (patch) | |
| tree | df33832198d368a179539b3d421a31ef5bb0b780 /debian | |
| parent | 9a0c29065a421e803c5e1e75d1edb47d1db331bf (diff) | |
Fixup bbstored for newer openssl
It appears that modern openssl versions slightly changed the formatting
for printing the common name of a certificate.
I've also dropped the check against filename because I cound't get the+
filename to match against my local files - the check didn't appear too
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/patches/06-fixup-bbstored-certs.diff | 35 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 36 insertions, 0 deletions
diff --git a/debian/patches/06-fixup-bbstored-certs.diff b/debian/patches/06-fixup-bbstored-certs.diff new file mode 100644 index 00000000..f752bd2c --- /dev/null +++ b/debian/patches/06-fixup-bbstored-certs.diff @@ -0,0 +1,35 @@ +From: Reinhard Tartler <siretart@tauware.de> +Subject: Fixup bbstored for newer openssl + +It appears that modern openssl versions slightly changed the formatting +for printing the common name of a certificate. + +I've also dropped the check against filename because I cound't get the +filename to match against my local files - the check didn't appear too +useful to me. + + +--- a/bin/bbstored/bbstored-certs.in ++++ b/bin/bbstored/bbstored-certs.in +@@ -171,12 +171,6 @@ sub cmd_sign + + my $acc = $1; + +- # check against filename +- if(!($csr =~ m/(\A|\/)([A-Fa-f0-9]+)-/) || $2 ne $acc) +- { +- die "Certificate request filename does not match name in certificate ($common_name)" +- } +- + print <<__E; + + This certificate is for backup account +@@ -288,7 +282,7 @@ sub get_csr_common_name + my $subject; + while(<CSRTEXT>) + { +- $subject = $1 if m/Subject:.+?CN=([-\.\w]+)/ ++ $subject = $1 if m/Subject:.+?CN\s?=\s?([-\.\w]+)/ + } + close CSRTEXT; + diff --git a/debian/patches/series b/debian/patches/series index f52e7b08..56474132 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ 03-adjust-syslog-facility.diff 05-dont_use_net_for_docs.diff +06-fixup-bbstored-certs.diff |