public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/openssl] rebase_40beta: - replace the revert for the s390x bignum asm routines with
@ 2026-06-09 12:42 Tomas Mraz
0 siblings, 0 replies; 2+ messages in thread
From: Tomas Mraz @ 2026-06-09 12:42 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/openssl
Branch : rebase_40beta
Commit : 6e7d6d4dfd3a3b3d86f00f0b47e169265bee11ce
Author : Tomas Mraz <tmraz@fedoraproject.org>
Date : 2010-11-23T09:51:17+01:00
Stats : +16/-175 in 2 file(s)
URL : https://src.fedoraproject.org/rpms/openssl/c/6e7d6d4dfd3a3b3d86f00f0b47e169265bee11ce?branch=rebase_40beta
Log:
- replace the revert for the s390x bignum asm routines with
fix from upstream
---
diff --git a/openssl-1.0.0b-s390bn.patch b/openssl-1.0.0b-s390bn.patch
index a360815..25e9dfd 100644
--- a/openssl-1.0.0b-s390bn.patch
+++ b/openssl-1.0.0b-s390bn.patch
@@ -1,177 +1,14 @@
-diff -up openssl-1.0.0b/crypto/bn/asm/s390x.S.s390bn openssl-1.0.0b/crypto/bn/asm/s390x.S
---- openssl-1.0.0b/crypto/bn/asm/s390x.S.s390bn 2010-09-10 16:55:24.000000000 +0200
-+++ openssl-1.0.0b/crypto/bn/asm/s390x.S 2007-06-20 16:10:16.000000000 +0200
-@@ -1,4 +1,4 @@
--.ident "s390x.S, version 1.1"
-+.ident "s390x.S, version 1.0"
- // ====================================================================
- // Written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL
- // project.
-@@ -24,67 +24,67 @@ bn_mul_add_words:
- bler %r14 // if (len<=0) return 0;
-
- stmg %r6,%r10,48(%r15)
-- lghi %r10,3
- lghi %r8,0 // carry = 0
-- nr %r10,%r4 // len%4
-- sra %r4,2 // cnt=len/4
-- jz .Loop1_madd // carry is incidentally cleared if branch taken
-- algr zero,zero // clear carry
-+ srag %r10,%r4,2 // cnt=len/4
-+ jz .Loop1_madd
-
- .Loop4_madd:
- lg %r7,0(%r2,%r3) // ap[i]
- mlgr %r6,%r5 // *=w
-- alcgr %r7,%r8 // +=carry
-+ algr %r7,%r8 // +=carry
- alcgr %r6,zero
- alg %r7,0(%r2,%r1) // +=rp[i]
-+ alcgr %r6,zero
- stg %r7,0(%r2,%r1) // rp[i]=
-
- lg %r9,8(%r2,%r3)
- mlgr %r8,%r5
-- alcgr %r9,%r6
-+ algr %r9,%r6
- alcgr %r8,zero
- alg %r9,8(%r2,%r1)
-+ alcgr %r8,zero
- stg %r9,8(%r2,%r1)
-
- lg %r7,16(%r2,%r3)
- mlgr %r6,%r5
-- alcgr %r7,%r8
-+ algr %r7,%r8
- alcgr %r6,zero
- alg %r7,16(%r2,%r1)
-+ alcgr %r6,zero
- stg %r7,16(%r2,%r1)
-
- lg %r9,24(%r2,%r3)
- mlgr %r8,%r5
-- alcgr %r9,%r6
-+ algr %r9,%r6
- alcgr %r8,zero
- alg %r9,24(%r2,%r1)
-+ alcgr %r8,zero
- stg %r9,24(%r2,%r1)
-
- la %r2,32(%r2) // i+=4
-- brct %r4,.Loop4_madd
--
-- la %r10,1(%r10) // see if len%4 is zero ...
-- brct %r10,.Loop1_madd // without touching condition code:-)
-+ brct %r10,.Loop4_madd
-
--.Lend_madd:
-- alcgr %r8,zero // collect carry bit
-- lgr %r2,%r8
-- lmg %r6,%r10,48(%r15)
-- br %r14
-+ lghi %r10,3
-+ nr %r4,%r10 // cnt=len%4
-+ jz .Lend_madd
-
- .Loop1_madd:
- lg %r7,0(%r2,%r3) // ap[i]
- mlgr %r6,%r5 // *=w
-- alcgr %r7,%r8 // +=carry
-+ algr %r7,%r8 // +=carry
- alcgr %r6,zero
- alg %r7,0(%r2,%r1) // +=rp[i]
-+ alcgr %r6,zero
- stg %r7,0(%r2,%r1) // rp[i]=
-
- lgr %r8,%r6
- la %r2,8(%r2) // i++
-- brct %r10,.Loop1_madd
-+ brct %r4,.Loop1_madd
-
-- j .Lend_madd
-+.Lend_madd:
-+ lgr %r2,%r8
-+ lmg %r6,%r10,48(%r15)
-+ br %r14
- .size bn_mul_add_words,.-bn_mul_add_words
-
- // BN_ULONG bn_mul_words(BN_ULONG *r2,BN_ULONG *r3,int r4,BN_ULONG r5);
-@@ -99,57 +99,57 @@ bn_mul_words:
- bler %r14 // if (len<=0) return 0;
-
- stmg %r6,%r10,48(%r15)
-- lghi %r10,3
- lghi %r8,0 // carry = 0
-- nr %r10,%r4 // len%4
-- sra %r4,2 // cnt=len/4
-- jz .Loop1_mul // carry is incidentally cleared if branch taken
-- algr zero,zero // clear carry
-+ srag %r10,%r4,2 // cnt=len/4
-+ jz .Loop1_mul
-
- .Loop4_mul:
- lg %r7,0(%r2,%r3) // ap[i]
- mlgr %r6,%r5 // *=w
-- alcgr %r7,%r8 // +=carry
-+ algr %r7,%r8 // +=carry
-+ alcgr %r6,zero
- stg %r7,0(%r2,%r1) // rp[i]=
-
- lg %r9,8(%r2,%r3)
- mlgr %r8,%r5
-- alcgr %r9,%r6
-+ algr %r9,%r6
-+ alcgr %r8,zero
- stg %r9,8(%r2,%r1)
-
- lg %r7,16(%r2,%r3)
- mlgr %r6,%r5
-- alcgr %r7,%r8
-+ algr %r7,%r8
-+ alcgr %r6,zero
- stg %r7,16(%r2,%r1)
-
- lg %r9,24(%r2,%r3)
- mlgr %r8,%r5
-- alcgr %r9,%r6
-+ algr %r9,%r6
-+ alcgr %r8,zero
- stg %r9,24(%r2,%r1)
-
- la %r2,32(%r2) // i+=4
-- brct %r4,.Loop4_mul
--
-- la %r10,1(%r10) // see if len%4 is zero ...
+Index: openssl/crypto/bn/asm/s390x.S
+RCS File: /v/openssl/cvs/openssl/crypto/bn/asm/s390x.S,v
+rcsdiff -q -kk '-r1.1.4.1' '-r1.1.4.2' -u '/v/openssl/cvs/openssl/crypto/bn/asm/s390x.S,v' 2>/dev/null
+--- openssl/crypto/bn/asm/s390x.S 2010/09/10 14:55:24 1.1.4.1
++++ openssl/crypto/bn/asm/s390x.S 2010/11/22 21:57:07 1.1.4.2
+@@ -131,7 +131,7 @@
+ brct %r4,.Loop4_mul
+
+ la %r10,1(%r10) // see if len%4 is zero ...
- brct %r10,.Loop1_madd // without touching condition code:-)
-+ brct %r10,.Loop4_mul
-
--.Lend_mul:
-- alcgr %r8,zero // collect carry bit
-- lgr %r2,%r8
-- lmg %r6,%r10,48(%r15)
-- br %r14
-+ lghi %r10,3
-+ nr %r4,%r10 // cnt=len%4
-+ jz .Lend_mul
-
- .Loop1_mul:
- lg %r7,0(%r2,%r3) // ap[i]
- mlgr %r6,%r5 // *=w
-- alcgr %r7,%r8 // +=carry
-+ algr %r7,%r8 // +=carry
-+ alcgr %r6,zero
- stg %r7,0(%r2,%r1) // rp[i]=
-
- lgr %r8,%r6
- la %r2,8(%r2) // i++
-- brct %r10,.Loop1_mul
-+ brct %r4,.Loop1_mul
-
-- j .Lend_mul
-+.Lend_mul:
-+ lgr %r2,%r8
-+ lmg %r6,%r10,48(%r15)
-+ br %r14
- .size bn_mul_words,.-bn_mul_words
++ brct %r10,.Loop1_mul // without touching condition code:-)
- // void bn_sqr_words(BN_ULONG *r2,BN_ULONG *r2,int r4)
+ .Lend_mul:
+ alcgr %r8,zero // collect carry bit
diff --git a/openssl.spec b/openssl.spec
index 2295a61..d97d0eb 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -395,6 +395,10 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/fipscanister.*
%postun -p /sbin/ldconfig
%changelog
+* Tue Nov 23 2010 Tomas Mraz <tmraz@redhat.com> 1.0.0b-3
+- replace the revert for the s390x bignum asm routines with
+ fix from upstream
+
* Mon Nov 22 2010 Tomas Mraz <tmraz@redhat.com> 1.0.0b-2
- revert upstream change in s390x bignum asm routines
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [rpms/openssl] rebase_40beta: - replace the revert for the s390x bignum asm routines with
@ 2026-06-09 12:42 Tomas Mraz
0 siblings, 0 replies; 2+ messages in thread
From: Tomas Mraz @ 2026-06-09 12:42 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/openssl
Branch : rebase_40beta
Commit : 0a5657ab94678cce3a2c9dde59d98c2a47123cc3
Author : Tomas Mraz <tmraz@fedoraproject.org>
Date : 2010-12-03T14:19:39+01:00
Stats : +27/-42 in 6 file(s)
URL : https://src.fedoraproject.org/rpms/openssl/c/0a5657ab94678cce3a2c9dde59d98c2a47123cc3?branch=rebase_40beta
Log:
- replace the revert for the s390x bignum asm routines with
fix from upstream
---
diff --git a/.gitignore b/.gitignore
index 7e9e24e..3c6b80c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
openssl-1.0.0a-usa.tar.bz2
/openssl-1.0.0b-usa.tar.bz2
+/openssl-1.0.0c-usa.tar.bz2
diff --git a/openssl-1.0.0b-s390bn.patch b/openssl-1.0.0b-s390bn.patch
deleted file mode 100644
index 25e9dfd..0000000
--- a/openssl-1.0.0b-s390bn.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: openssl/crypto/bn/asm/s390x.S
-RCS File: /v/openssl/cvs/openssl/crypto/bn/asm/s390x.S,v
-rcsdiff -q -kk '-r1.1.4.1' '-r1.1.4.2' -u '/v/openssl/cvs/openssl/crypto/bn/asm/s390x.S,v' 2>/dev/null
---- openssl/crypto/bn/asm/s390x.S 2010/09/10 14:55:24 1.1.4.1
-+++ openssl/crypto/bn/asm/s390x.S 2010/11/22 21:57:07 1.1.4.2
-@@ -131,7 +131,7 @@
- brct %r4,.Loop4_mul
-
- la %r10,1(%r10) // see if len%4 is zero ...
-- brct %r10,.Loop1_madd // without touching condition code:-)
-+ brct %r10,.Loop1_mul // without touching condition code:-)
-
- .Lend_mul:
- alcgr %r8,zero // collect carry bit
diff --git a/openssl-1.0.0b-version.patch b/openssl-1.0.0b-version.patch
deleted file mode 100644
index bdb6ab6..0000000
--- a/openssl-1.0.0b-version.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -up openssl-1.0.0b/crypto/opensslv.h.version openssl-1.0.0b/crypto/opensslv.h
---- openssl-1.0.0b/crypto/opensslv.h.version 2010-11-16 17:31:23.000000000 +0100
-+++ openssl-1.0.0b/crypto/opensslv.h 2010-11-16 17:32:59.000000000 +0100
-@@ -25,7 +25,8 @@
- * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
- * major minor fix final patch/beta)
- */
--#define OPENSSL_VERSION_NUMBER 0x1000002f
-+/* we have to keep the version number to not break the abi */
-+#define OPENSSL_VERSION_NUMBER 0x10000003
- #ifdef OPENSSL_FIPS
- #define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0b-fips 16 Nov 2010"
- #else
-@@ -83,7 +84,7 @@
- * should only keep the versions that are binary compatible with the current.
- */
- #define SHLIB_VERSION_HISTORY ""
--#define SHLIB_VERSION_NUMBER "1.0.0"
-+#define SHLIB_VERSION_NUMBER "1.0.0b"
-
-
- #endif /* HEADER_OPENSSLV_H */
diff --git a/openssl-1.0.0c-version.patch b/openssl-1.0.0c-version.patch
new file mode 100644
index 0000000..4ac8277
--- /dev/null
+++ b/openssl-1.0.0c-version.patch
@@ -0,0 +1,22 @@
+diff -up openssl-1.0.0c/crypto/opensslv.h.version openssl-1.0.0c/crypto/opensslv.h
+--- openssl-1.0.0c/crypto/opensslv.h.version 2010-12-03 11:55:54.000000000 +0100
++++ openssl-1.0.0c/crypto/opensslv.h 2010-12-03 11:57:25.000000000 +0100
+@@ -25,7 +25,8 @@
+ * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
+ * major minor fix final patch/beta)
+ */
+-#define OPENSSL_VERSION_NUMBER 0x1000003f
++/* we have to keep the version number to not break the abi */
++#define OPENSSL_VERSION_NUMBER 0x10000003
+ #ifdef OPENSSL_FIPS
+ #define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0c-fips 2 Dec 2010"
+ #else
+@@ -83,7 +84,7 @@
+ * should only keep the versions that are binary compatible with the current.
+ */
+ #define SHLIB_VERSION_HISTORY ""
+-#define SHLIB_VERSION_NUMBER "1.0.0"
++#define SHLIB_VERSION_NUMBER "1.0.0c"
+
+
+ #endif /* HEADER_OPENSSLV_H */
diff --git a/openssl.spec b/openssl.spec
index badb2a9..cf5a9fb 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -20,8 +20,8 @@
Summary: A general purpose cryptography library with TLS implementation
Name: openssl
-Version: 1.0.0b
-Release: 3%{?dist}
+Version: 1.0.0c
+Release: 1%{?dist}
# We remove certain patented algorithms from the openssl source tarball
# with the hobble-openssl script which is included below.
Source: openssl-%{version}-usa.tar.bz2
@@ -44,7 +44,6 @@ Patch7: openssl-1.0.0-timezone.patch
Patch23: openssl-1.0.0-beta4-default-paths.patch
Patch24: openssl-0.9.8j-bad-mime.patch
Patch25: openssl-1.0.0a-manfix.patch
-Patch26: openssl-1.0.0b-s390bn.patch
# Functionality changes
Patch32: openssl-0.9.8g-ia64.patch
Patch33: openssl-1.0.0-beta4-ca-dir.patch
@@ -60,7 +59,7 @@ Patch45: openssl-0.9.8j-env-nozlib.patch
Patch47: openssl-1.0.0-beta5-readme-warning.patch
Patch49: openssl-1.0.0-beta4-algo-doc.patch
Patch50: openssl-1.0.0-beta4-dtls1-abi.patch
-Patch51: openssl-1.0.0b-version.patch
+Patch51: openssl-1.0.0c-version.patch
Patch52: openssl-1.0.0b-aesni.patch
Patch53: openssl-1.0.0-name-hash.patch
# Backported fixes including security fixes
@@ -127,7 +126,6 @@ from other formats to the formats used by the OpenSSL toolkit.
%patch23 -p1 -b .default-paths
%patch24 -p1 -b .bad-mime
%patch25 -p1 -b .manfix
-%patch26 -p1 -b .s390bn
%patch32 -p1 -b .ia64
%patch33 -p1 -b .ca-dir
diff --git a/sources b/sources
index e31429d..16f9c6a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0efec5b9c8fc10356f4d52732f91f8ea openssl-1.0.0b-usa.tar.bz2
+4f47a00408abc9904788ba596992085f openssl-1.0.0c-usa.tar.bz2
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-06-09 12:42 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-09 12:42 [rpms/openssl] rebase_40beta: - replace the revert for the s390x bignum asm routines with Tomas Mraz
-- strict thread matches above, loose matches on Subject: below --
2026-06-09 12:42 Tomas Mraz
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox