Muehlenhoff has uploaded a new change for review.
https://gerrit.wikimedia.org/r/312234
Change subject: Update ca.patch and cloudflare-c20p1305.patch for changes in
1.0.2i
......................................................................
Update ca.patch and cloudflare-c20p1305.patch for changes in 1.0.2i
Change-Id: Ie4840b816352e46bf106394d8dc41ab6a237db4b
---
M debian/patches/ca.patch
M debian/patches/cloudflare-c20p1305.patch
2 files changed, 5 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/debs/openssl
refs/changes/34/312234/1
diff --git a/debian/patches/ca.patch b/debian/patches/ca.patch
index 761eebe..38ad9c5 100644
--- a/debian/patches/ca.patch
+++ b/debian/patches/ca.patch
@@ -5,7 +5,7 @@
@@ -65,6 +65,7 @@
foreach (@ARGV) {
if ( /^(-\?|-h|-help)$/ ) {
- print STDERR "usage: CA
-newcert|-newreq|-newreq-nodes|-newca|-sign|-verify\n";
+ print STDERR "usage: CA
-newcert|-newreq|-newreq-nodes|-newca|-sign|-signcert|-verify\n";
+ print STDERR "usage: CA -signcert certfile
keyfile|-newcert|-newreq|-newca|-sign|-verify\n";
exit 0;
} elsif (/^-newcert$/) {
diff --git a/debian/patches/cloudflare-c20p1305.patch
b/debian/patches/cloudflare-c20p1305.patch
index 181567b..580e88c 100644
--- a/debian/patches/cloudflare-c20p1305.patch
+++ b/debian/patches/cloudflare-c20p1305.patch
@@ -131,9 +131,8 @@
}
if (!$no_shared)
-@@ -1558,6 +1561,14 @@ $bf_obj=$bf_enc unless ($bf_obj =~ /\.o$/);
+@@ -1558,3 +1561,11 @@ $bf_obj=$bf_enc unless ($bf_obj =~ /\.o$/);
$cast_obj=$cast_enc unless ($cast_obj =~ /\.o$/);
- $rc4_obj=$rc4_enc unless ($rc4_obj =~ /\.o$/);
$rc5_obj=$rc5_enc unless ($rc5_obj =~ /\.o$/);
+if ($chapoly_obj =~ /\.o$/)
+ {
@@ -143,9 +142,9 @@
+ {
+ $chapoly_obj=$chapoly_enc;
+ }
- if ($sha1_obj =~ /\.o$/)
- {
- # $sha1_obj=$sha1_enc;
+ if ($rc4_obj =~ /\.o$/)
+ {
+ $cflags.=" -DRC4_ASM";
@@ -1740,6 +1751,7 @@ while (<IN>)
s/^WP_ASM_OBJ=.*$/WP_ASM_OBJ= $wp_obj/;
s/^CMLL_ENC=.*$/CMLL_ENC= $cmll_obj/;
--
To view, visit https://gerrit.wikimedia.org/r/312234
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie4840b816352e46bf106394d8dc41ab6a237db4b
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/openssl
Gerrit-Branch: master
Gerrit-Owner: Muehlenhoff <mmuhlenh...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
