From: Jan Palus Date: Tue, 9 Apr 2024 22:40:11 +0000 (+0200) Subject: up to 3.3.0 (fixes CVE-2024-2511) X-Git-Tag: auto/th/openssl-3.3.0-1 X-Git-Url: http://git.pld-linux.org/?p=packages%2Fopenssl.git;a=commitdiff_plain;h=HEAD;hp=76c896a063f65fe6ca164b522206af58a74071c1 up to 3.3.0 (fixes CVE-2024-2511) --- diff --git a/engines-dir.patch b/engines-dir.patch index 20f5d1a..29d83ee 100644 --- a/engines-dir.patch +++ b/engines-dir.patch @@ -1,11 +1,13 @@ ---- openssl-1.1.1/Configurations/unix-Makefile.tmpl~ 2018-09-13 13:40:10.000000000 +0200 -+++ openssl-1.1.1/Configurations/unix-Makefile.tmpl 2018-09-13 13:40:42.065819616 +0200 -@@ -170,7 +170,7 @@ LIBDIR={- our $libdir = $config{libdir}; +--- openssl-3.0.5/Configurations/unix-Makefile.tmpl.orig 2022-07-10 17:18:36.338376691 +0200 ++++ openssl-3.0.5/Configurations/unix-Makefile.tmpl 2022-07-10 17:29:34.034813643 +0200 +@@ -304,8 +304,8 @@ LIBDIR={- our $libdir = $config{libdir}; # $(libdir) is chosen to be compatible with the GNU coding standards libdir={- file_name_is_absolute($libdir) ? $libdir : '$(INSTALLTOP)/$(LIBDIR)' -} -ENGINESDIR=$(libdir)/engines-{- $sover_dirname -} +-MODULESDIR=$(libdir)/ossl-modules +ENGINESDIR=/$(LIBDIR)/engines-{- $sover_dirname -} ++MODULESDIR=/$(LIBDIR)/ossl-modules # Convenience variable for those who want to set the rpath in shared # libraries and applications diff --git a/openssl-ca-certificates.patch b/openssl-ca-certificates.patch index 1afdbfb..67bad3f 100644 --- a/openssl-ca-certificates.patch +++ b/openssl-ca-certificates.patch @@ -1,5 +1,5 @@ ---- openssl-1.1.1/include/internal/cryptlib.h~ 2018-09-11 14:48:23.000000000 +0200 -+++ openssl-1.1.1/include/internal/cryptlib.h 2018-09-11 22:14:32.008012409 +0200 +--- openssl-1.1.1/include/internal/common.h~ 2018-09-11 14:48:23.000000000 +0200 ++++ openssl-1.1.1/include/internal/common.h 2018-09-11 22:14:32.008012409 +0200 @@ -56,7 +56,7 @@ DEFINE_LHASH_OF(MEM); # ifndef OPENSSL_SYS_VMS # define X509_CERT_AREA OPENSSLDIR diff --git a/openssl-man-namespace.patch b/openssl-man-namespace.patch deleted file mode 100644 index 2865a2c..0000000 --- a/openssl-man-namespace.patch +++ /dev/null @@ -1,816 +0,0 @@ -diff -urN openssl-1.1.1/doc.org/man1/asn1parse.pod openssl-1.1.1/doc/man1/asn1parse.pod ---- openssl-1.1.1/doc.org/man1/asn1parse.pod 2018-09-11 14:48:22.000000000 +0200 -+++ openssl-1.1.1/doc/man1/asn1parse.pod 2018-09-11 22:09:16.148714293 +0200 -@@ -2,8 +2,7 @@ - - =head1 NAME - --openssl-asn1parse, --asn1parse - ASN.1 parsing tool -+openssl-asn1parse - ASN.1 parsing tool - - =head1 SYNOPSIS - -diff -urN openssl-1.1.1/doc.org/man1/ca.pod openssl-1.1.1/doc/man1/ca.pod ---- openssl-1.1.1/doc.org/man1/ca.pod 2018-09-11 14:48:22.000000000 +0200 -+++ openssl-1.1.1/doc/man1/ca.pod 2018-09-11 22:08:39.447633905 +0200 -@@ -2,8 +2,7 @@ - - =head1 NAME - --openssl-ca, --ca - sample minimal CA application -+openssl-ca - sample minimal CA application - - =head1 SYNOPSIS - -diff -urN openssl-1.1.1/doc.org/man1/ciphers.pod openssl-1.1.1/doc/man1/ciphers.pod ---- openssl-1.1.1/doc.org/man1/ciphers.pod 2018-09-11 14:48:22.000000000 +0200 -+++ openssl-1.1.1/doc/man1/ciphers.pod 2018-09-11 22:09:10.135203937 +0200 -@@ -2,8 +2,7 @@ - - =head1 NAME - --openssl-ciphers, --ciphers - SSL cipher display and cipher list tool -+openssl-ciphers - SSL cipher display and cipher list tool - - =head1 SYNOPSIS - -diff -urN openssl-1.1.1/doc.org/man1/cms.pod openssl-1.1.1/doc/man1/cms.pod ---- openssl-1.1.1/doc.org/man1/cms.pod 2018-09-11 14:48:22.000000000 +0200 -+++ openssl-1.1.1/doc/man1/cms.pod 2018-09-11 22:08:34.790830156 +0200 -@@ -2,8 +2,7 @@ - - =head1 NAME - --openssl-cms, --cms - CMS utility -+openssl-cms - CMS utility - - =head1 SYNOPSIS - -diff -urN openssl-1.1.1/doc.org/man1/crl2pkcs7.pod openssl-1.1.1/doc/man1/crl2pkcs7.pod ---- openssl-1.1.1/doc.org/man1/crl2pkcs7.pod 2018-09-11 14:48:22.000000000 +0200 -+++ openssl-1.1.1/doc/man1/crl2pkcs7.pod 2018-09-11 22:11:06.401959876 +0200 -@@ -2,8 +2,7 @@ - - =head1 NAME - --openssl-crl2pkcs7, --crl2pkcs7 - Create a PKCS#7 structure from a CRL and certificates -+openssl-crl2pkcs7 - Create a PKCS#7 structure from a CRL and certificates - - =head1 SYNOPSIS - -diff -urN openssl-1.1.1/doc.org/man1/crl.pod openssl-1.1.1/doc/man1/crl.pod ---- openssl-1.1.1/doc.org/man1/crl.pod 2018-09-11 14:48:22.000000000 +0200 -+++ openssl-1.1.1/doc/man1/crl.pod 2018-09-11 22:10:43.631289563 +0200 -@@ -2,8 +2,7 @@ - - =head1 NAME - --openssl-crl, --crl - CRL utility -+openssl-crl - CRL utility - - =head1 SYNOPSIS - -diff -urN openssl-1.1.1/doc.org/man1/dgst.pod openssl-1.1.1/doc/man1/dgst.pod ---- openssl-1.1.1/doc.org/man1/dgst.pod 2018-09-11 14:48:22.000000000 +0200 -+++ openssl-1.1.1/doc/man1/dgst.pod 2018-09-11 22:12:41.804768298 +0200 -@@ -2,8 +2,7 @@ - - =head1 NAME - --openssl-dgst, --dgst - perform digest operations -+openssl-dgst - perform digest operations - - =head1 SYNOPSIS - -diff -urN openssl-1.1.1/doc.org/man1/dhparam.pod openssl-1.1.1/doc/man1/dhparam.pod ---- openssl-1.1.1/doc.org/man1/dhparam.pod 2018-09-11 14:48:22.000000000 +0200 -+++ openssl-1.1.1/doc/man1/dhparam.pod 2018-09-11 22:08:08.440054452 +0200 -@@ -2,8 +2,7 @@ - - =head1 NAME - --openssl-dhparam, --dhparam - DH parameter manipulation and generation -+openssl-dhparam - DH parameter manipulation and generation - - =head1 SYNOPSIS - -diff -urN openssl-1.1.1/doc.org/man1/dsaparam.pod openssl-1.1.1/doc/man1/dsaparam.pod ---- openssl-1.1.1/doc.org/man1/dsaparam.pod 2018-09-11 14:48:22.000000000 +0200 -+++ openssl-1.1.1/doc/man1/dsaparam.pod 2018-09-11 22:09:26.799027812 +0200 -@@ -2,8 +2,7 @@ - - =head1 NAME - --openssl-dsaparam, --dsaparam - DSA parameter manipulation and generation -+openssl-dsaparam - DSA parameter manipulation and generation - - =head1 SYNOPSIS - -diff -urN openssl-1.1.1/doc.org/man1/dsa.pod openssl-1.1.1/doc/man1/dsa.pod ---- openssl-1.1.1/doc.org/man1/dsa.pod 2018-09-11 14:48:22.000000000 +0200 -+++ openssl-1.1.1/doc/man1/dsa.pod 2018-09-11 22:09:37.069330144 +0200 -@@ -2,8 +2,7 @@ - - =head1 NAME - --openssl-dsa, --dsa - DSA key processing -+openssl-dsa - DSA key processing - - =head1 SYNOPSIS - -diff -urN openssl-1.1.1/doc.org/man1/ecparam.pod openssl-1.1.1/doc/man1/ecparam.pod ---- openssl-1.1.1/doc.org/man1/ecparam.pod 2018-09-11 14:48:22.000000000 +0200 -+++ openssl-1.1.1/doc/man1/ecparam.pod 2018-09-11 22:09:50.416389716 +0200 -@@ -2,8 +2,7 @@ - - =head1 NAME - --openssl-ecparam, --ecparam - EC parameter manipulation and generation -+openssl-ecparam - EC parameter manipulation and generation - - =head1 SYNOPSIS - -diff -urN openssl-1.1.1/doc.org/man1/ec.pod openssl-1.1.1/doc/man1/ec.pod ---- openssl-1.1.1/doc.org/man1/ec.pod 2018-09-11 14:48:22.000000000 +0200 -+++ openssl-1.1.1/doc/man1/ec.pod 2018-09-11 22:10:38.384468443 +0200 -@@ -2,8 +2,7 @@ - - =head1 NAME - --openssl-ec, --ec - EC key processing -+openssl-ec - EC key processing - - =head1 SYNOPSIS - -diff -urN openssl-1.1.1/doc.org/man1/enc.pod openssl-1.1.1/doc/man1/enc.pod ---- openssl-1.1.1/doc.org/man1/enc.pod 2018-09-11 14:48:22.000000000 +0200 -+++ openssl-1.1.1/doc/man1/enc.pod 2018-09-11 22:07:38.422504142 +0200 -@@ -2,8 +2,7 @@ - - =head1 NAME - --openssl-enc, --enc - symmetric cipher routines -+openssl-enc - symmetric cipher routines - - =head1 SYNOPSIS - -diff -urN openssl-1.1.1/doc.org/man1/engine.pod openssl-1.1.1/doc/man1/engine.pod ---- openssl-1.1.1/doc.org/man1/engine.pod 2018-09-11 14:48:22.000000000 +0200 -+++ openssl-1.1.1/doc/man1/engine.pod 2018-09-11 22:11:28.725950372 +0200 -@@ -2,8 +2,7 @@ - - =head1 NAME - --openssl-engine, --engine - load and query engines -+openssl-engine - load and query engines - - =head1 SYNOPSIS - -diff -urN openssl-1.1.1/doc.org/man1/errstr.pod openssl-1.1.1/doc/man1/errstr.pod ---- openssl-1.1.1/doc.org/man1/errstr.pod 2018-09-11 14:48:22.000000000 +0200 -+++ openssl-1.1.1/doc/man1/errstr.pod 2018-09-11 22:07:46.686080735 +0200 -@@ -2,8 +2,7 @@ - - =head1 NAME - --openssl-errstr, --errstr - lookup error codes -+openssl-errstr - lookup error codes - - =head1 SYNOPSIS - -diff -urN openssl-1.1.1/doc.org/man1/gendsa.pod openssl-1.1.1/doc/man1/gendsa.pod ---- openssl-1.1.1/doc.org/man1/gendsa.pod 2018-09-11 14:48:22.000000000 +0200 -+++ openssl-1.1.1/doc/man1/gendsa.pod 2018-09-11 22:12:17.117374895 +0200 -@@ -2,8 +2,7 @@ - - =head1 NAME - --openssl-gendsa, --gendsa - generate a DSA private key from a set of parameters -+openssl-gendsa - generate a DSA private key from a set of parameters - - =head1 SYNOPSIS - -diff -urN openssl-1.1.1/doc.org/man1/genpkey.pod openssl-1.1.1/doc/man1/genpkey.pod ---- openssl-1.1.1/doc.org/man1/genpkey.pod 2018-09-11 14:48:22.000000000 +0200 -+++ openssl-1.1.1/doc/man1/genpkey.pod 2018-09-11 22:10:07.880237141 +0200 -@@ -2,8 +2,7 @@ - - =head1 NAME - --openssl-genpkey, --genpkey - generate a private key -+openssl-genpkey - generate a private key - - =head1 SYNOPSIS - -diff -urN openssl-1.1.1/doc.org/man1/genrsa.pod openssl-1.1.1/doc/man1/genrsa.pod ---- openssl-1.1.1/doc.org/man1/genrsa.pod 2018-09-11 14:48:22.000000000 +0200 -+++ openssl-1.1.1/doc/man1/genrsa.pod 2018-09-11 22:11:11.535444327 +0200 -@@ -2,8 +2,7 @@ - - =head1 NAME - --openssl-genrsa, --genrsa - generate an RSA private key -+openssl-genrsa - generate an RSA private key - - =head1 SYNOPSIS - -diff -urN openssl-1.1.1/doc.org/man1/list.pod openssl-1.1.1/doc/man1/list.pod ---- openssl-1.1.1/doc.org/man1/list.pod 2018-09-11 14:48:22.000000000 +0200 -+++ openssl-1.1.1/doc/man1/list.pod 2018-09-11 22:08:58.891539618 +0200 -@@ -2,8 +2,7 @@ - - =head1 NAME - --openssl-list, --list - list algorithms and features -+openssl-list - list algorithms and features - - =head1 SYNOPSIS - -diff -urN openssl-1.1.1/doc.org/man1/nseq.pod openssl-1.1.1/doc/man1/nseq.pod ---- openssl-1.1.1/doc.org/man1/nseq.pod 2018-09-11 14:48:22.000000000 +0200 -+++ openssl-1.1.1/doc/man1/nseq.pod 2018-09-11 22:10:48.351428513 +0200 -@@ -2,8 +2,7 @@ - - =head1 NAME - --openssl-nseq, --nseq - create or examine a Netscape certificate sequence -+openssl-nseq - create or examine a Netscape certificate sequence - - =head1 SYNOPSIS - -diff -urN openssl-1.1.1/doc.org/man1/ocsp.pod openssl-1.1.1/doc/man1/ocsp.pod ---- openssl-1.1.1/doc.org/man1/ocsp.pod 2018-09-11 14:48:22.000000000 +0200 -+++ openssl-1.1.1/doc/man1/ocsp.pod 2018-09-11 22:08:49.024582492 +0200 -@@ -2,8 +2,7 @@ - - =head1 NAME - --openssl-ocsp, --ocsp - Online Certificate Status Protocol utility -+openssl-ocsp - Online Certificate Status Protocol utility - - =head1 SYNOPSIS - -diff -urN openssl-1.1.1/doc.org/man1/passwd.pod openssl-1.1.1/doc/man1/passwd.pod ---- openssl-1.1.1/doc.org/man1/passwd.pod 2018-09-11 14:48:22.000000000 +0200 -+++ openssl-1.1.1/doc/man1/passwd.pod 2018-09-11 22:12:23.680901443 +0200 -@@ -2,8 +2,7 @@ - - =head1 NAME - --openssl-passwd, --passwd - compute password hashes -+openssl-passwd - compute password hashes - - =head1 SYNOPSIS - -diff -urN openssl-1.1.1/doc.org/man1/pkcs12.pod openssl-1.1.1/doc/man1/pkcs12.pod ---- openssl-1.1.1/doc.org/man1/pkcs12.pod 2018-09-11 14:48:22.000000000 +0200 -+++ openssl-1.1.1/doc/man1/pkcs12.pod 2018-09-11 22:12:08.627124963 +0200 -@@ -2,8 +2,7 @@ - - =head1 NAME - --openssl-pkcs12, --pkcs12 - PKCS#12 file utility -+openssl-pkcs12 - PKCS#12 file utility - - =head1 SYNOPSIS - -diff -urN openssl-1.1.1/doc.org/man1/pkcs7.pod openssl-1.1.1/doc/man1/pkcs7.pod ---- openssl-1.1.1/doc.org/man1/pkcs7.pod 2018-09-11 14:48:22.000000000 +0200 -+++ openssl-1.1.1/doc/man1/pkcs7.pod 2018-09-11 22:08:44.624452964 +0200 -@@ -2,8 +2,7 @@ - - =head1 NAME - --openssl-pkcs7, --pkcs7 - PKCS#7 utility -+openssl-pkcs7 - PKCS#7 utility - - =head1 SYNOPSIS - -diff -urN openssl-1.1.1/doc.org/man1/pkcs8.pod openssl-1.1.1/doc/man1/pkcs8.pod ---- openssl-1.1.1/doc.org/man1/pkcs8.pod 2018-09-11 14:48:22.000000000 +0200 -+++ openssl-1.1.1/doc/man1/pkcs8.pod 2018-09-11 22:10:34.057674407 +0200 -@@ -2,8 +2,7 @@ - - =head1 NAME - --openssl-pkcs8, --pkcs8 - PKCS#8 format private key conversion tool -+openssl-pkcs8 - PKCS#8 format private key conversion tool - - =head1 SYNOPSIS - -diff -urN openssl-1.1.1/doc.org/man1/pkeyparam.pod openssl-1.1.1/doc/man1/pkeyparam.pod ---- openssl-1.1.1/doc.org/man1/pkeyparam.pod 2018-09-11 14:48:22.000000000 +0200 -+++ openssl-1.1.1/doc/man1/pkeyparam.pod 2018-09-11 22:09:32.382525509 +0200 -@@ -2,8 +2,7 @@ - - =head1 NAME - --openssl-pkeyparam, --pkeyparam - public key algorithm parameter processing tool -+openssl-pkeyparam - public key algorithm parameter processing tool - - =head1 SYNOPSIS - -diff -urN openssl-1.1.1/doc.org/man1/pkey.pod openssl-1.1.1/doc/man1/pkey.pod ---- openssl-1.1.1/doc.org/man1/pkey.pod 2018-09-11 14:48:22.000000000 +0200 -+++ openssl-1.1.1/doc/man1/pkey.pod 2018-09-11 22:09:57.529932454 +0200 -@@ -2,8 +2,7 @@ - - =head1 NAME - --openssl-pkey, --pkey - public or private key processing tool -+openssl-pkey - public or private key processing tool - - =head1 SYNOPSIS - -diff -urN openssl-1.1.1/doc.org/man1/pkeyutl.pod openssl-1.1.1/doc/man1/pkeyutl.pod ---- openssl-1.1.1/doc.org/man1/pkeyutl.pod 2018-09-11 14:48:22.000000000 +0200 -+++ openssl-1.1.1/doc/man1/pkeyutl.pod 2018-09-11 22:11:00.448451286 +0200 -@@ -2,8 +2,7 @@ - - =head1 NAME - --openssl-pkeyutl, --pkeyutl - public key algorithm utility -+openssl-pkeyutl - public key algorithm utility - - =head1 SYNOPSIS - -diff -urN openssl-1.1.1/doc.org/man1/prime.pod openssl-1.1.1/doc/man1/prime.pod ---- openssl-1.1.1/doc.org/man1/prime.pod 2018-09-11 14:48:22.000000000 +0200 -+++ openssl-1.1.1/doc/man1/prime.pod 2018-09-11 22:10:55.561640764 +0200 -@@ -2,8 +2,7 @@ - - =head1 NAME - --openssl-prime, --prime - compute prime numbers -+openssl-prime - compute prime numbers - - =head1 SYNOPSIS - -diff -urN openssl-1.1.1/doc.org/man1/rand.pod openssl-1.1.1/doc/man1/rand.pod ---- openssl-1.1.1/doc.org/man1/rand.pod 2018-09-11 14:48:22.000000000 +0200 -+++ openssl-1.1.1/doc/man1/rand.pod 2018-09-11 22:11:39.589603508 +0200 -@@ -2,8 +2,7 @@ - - =head1 NAME - --openssl-rand, --rand - generate pseudo-random bytes -+openssl-rand - generate pseudo-random bytes - - =head1 SYNOPSIS - -diff -urN openssl-1.1.1/doc.org/man1/rehash.pod openssl-1.1.1/doc/man1/rehash.pod ---- openssl-1.1.1/doc.org/man1/rehash.pod 2018-09-11 14:48:22.000000000 +0200 -+++ openssl-1.1.1/doc/man1/rehash.pod 2018-09-11 22:08:28.943991372 +0200 -@@ -5,8 +5,7 @@ - - =head1 NAME - --openssl-c_rehash, openssl-rehash, --c_rehash, rehash - Create symbolic links to files named by the hash values -+openssl-rehash, c_rehash - Create symbolic links to files named by the hash values - - =head1 SYNOPSIS - -diff -urN openssl-1.1.1/doc.org/man1/req.pod openssl-1.1.1/doc/man1/req.pod ---- openssl-1.1.1/doc.org/man1/req.pod 2018-09-11 14:48:22.000000000 +0200 -+++ openssl-1.1.1/doc/man1/req.pod 2018-09-11 22:08:54.174734102 +0200 -@@ -2,8 +2,7 @@ - - =head1 NAME - --openssl-req, --req - PKCS#10 certificate request and certificate generating utility -+openssl-req - PKCS#10 certificate request and certificate generating utility - - =head1 SYNOPSIS - -diff -urN openssl-1.1.1/doc.org/man1/rsa.pod openssl-1.1.1/doc/man1/rsa.pod ---- openssl-1.1.1/doc.org/man1/rsa.pod 2018-09-11 14:48:22.000000000 +0200 -+++ openssl-1.1.1/doc/man1/rsa.pod 2018-09-11 22:12:34.427884475 +0200 -@@ -2,8 +2,7 @@ - - =head1 NAME - --openssl-rsa, --rsa - RSA key processing tool -+openssl-rsa - RSA key processing tool - - =head1 SYNOPSIS - -diff -urN openssl-1.1.1/doc.org/man1/rsautl.pod openssl-1.1.1/doc/man1/rsautl.pod ---- openssl-1.1.1/doc.org/man1/rsautl.pod 2018-09-11 14:48:22.000000000 +0200 -+++ openssl-1.1.1/doc/man1/rsautl.pod 2018-09-11 22:11:19.782353762 +0200 -@@ -2,8 +2,7 @@ - - =head1 NAME - --openssl-rsautl, --rsautl - RSA utility -+openssl-rsautl - RSA utility - - =head1 SYNOPSIS - -diff -urN openssl-1.1.1/doc.org/man1/s_client.pod openssl-1.1.1/doc/man1/s_client.pod ---- openssl-1.1.1/doc.org/man1/s_client.pod 2018-09-11 14:48:22.000000000 +0200 -+++ openssl-1.1.1/doc/man1/s_client.pod 2018-09-11 22:12:02.190268812 +0200 -@@ -2,8 +2,7 @@ - - =head1 NAME - --openssl-s_client, --s_client - SSL/TLS client program -+openssl-s_client - SSL/TLS client program - - =head1 SYNOPSIS - -diff -urN openssl-1.1.1/doc.org/man1/sess_id.pod openssl-1.1.1/doc/man1/sess_id.pod ---- openssl-1.1.1/doc.org/man1/sess_id.pod 2018-09-11 14:48:22.000000000 +0200 -+++ openssl-1.1.1/doc/man1/sess_id.pod 2018-09-11 22:11:56.426765815 +0200 -@@ -2,8 +2,7 @@ - - =head1 NAME - --openssl-sess_id, --sess_id - SSL/TLS session handling utility -+openssl-sess_id - SSL/TLS session handling utility - - =head1 SYNOPSIS - -diff -urN openssl-1.1.1/doc.org/man1/smime.pod openssl-1.1.1/doc/man1/smime.pod ---- openssl-1.1.1/doc.org/man1/smime.pod 2018-09-11 14:48:22.000000000 +0200 -+++ openssl-1.1.1/doc/man1/smime.pod 2018-09-11 22:10:19.807254909 +0200 -@@ -2,8 +2,7 @@ - - =head1 NAME - --openssl-smime, --smime - S/MIME utility -+openssl-smime - S/MIME utility - - =head1 SYNOPSIS - -diff -urN openssl-1.1.1/doc.org/man1/speed.pod openssl-1.1.1/doc/man1/speed.pod ---- openssl-1.1.1/doc.org/man1/speed.pod 2018-09-11 14:48:22.000000000 +0200 -+++ openssl-1.1.1/doc/man1/speed.pod 2018-09-11 22:09:21.542206398 +0200 -@@ -2,8 +2,7 @@ - - =head1 NAME - --openssl-speed, --speed - test library performance -+openssl-speed - test library performance - - =head1 SYNOPSIS - -diff -urN openssl-1.1.1/doc.org/man1/spkac.pod openssl-1.1.1/doc/man1/spkac.pod ---- openssl-1.1.1/doc.org/man1/spkac.pod 2018-09-11 14:48:22.000000000 +0200 -+++ openssl-1.1.1/doc/man1/spkac.pod 2018-09-11 22:10:29.570875660 +0200 -@@ -2,8 +2,7 @@ - - =head1 NAME - --openssl-spkac, --spkac - SPKAC printing and generating utility -+openssl-spkac - SPKAC printing and generating utility - - =head1 SYNOPSIS - -diff -urN openssl-1.1.1/doc.org/man1/srp.pod openssl-1.1.1/doc/man1/srp.pod ---- openssl-1.1.1/doc.org/man1/srp.pod 2018-09-11 14:48:22.000000000 +0200 -+++ openssl-1.1.1/doc/man1/srp.pod 2018-09-11 22:10:02.696751220 +0200 -@@ -2,8 +2,7 @@ - - =head1 NAME - --openssl-srp, --srp - maintain SRP password file -+openssl-srp - maintain SRP password file - - =head1 SYNOPSIS - -diff -urN openssl-1.1.1/doc.org/man1/s_server.pod openssl-1.1.1/doc/man1/s_server.pod ---- openssl-1.1.1/doc.org/man1/s_server.pod 2018-09-11 14:48:22.000000000 +0200 -+++ openssl-1.1.1/doc/man1/s_server.pod 2018-09-11 22:09:04.541705946 +0200 -@@ -2,8 +2,7 @@ - - =head1 NAME - --openssl-s_server, --s_server - SSL/TLS server program -+openssl-s_server - SSL/TLS server program - - =head1 SYNOPSIS - -diff -urN openssl-1.1.1/doc.org/man1/s_time.pod openssl-1.1.1/doc/man1/s_time.pod ---- openssl-1.1.1/doc.org/man1/s_time.pod 2018-09-11 14:48:22.000000000 +0200 -+++ openssl-1.1.1/doc/man1/s_time.pod 2018-09-11 22:09:44.646219856 +0200 -@@ -2,8 +2,7 @@ - - =head1 NAME - --openssl-s_time, --s_time - SSL/TLS performance timing program -+openssl-s_time - SSL/TLS performance timing program - - =head1 SYNOPSIS - -diff -urN openssl-1.1.1/doc.org/man1/storeutl.pod openssl-1.1.1/doc/man1/storeutl.pod ---- openssl-1.1.1/doc.org/man1/storeutl.pod 2018-09-11 14:48:22.000000000 +0200 -+++ openssl-1.1.1/doc/man1/storeutl.pod 2018-09-11 22:07:55.473006066 +0200 -@@ -2,8 +2,7 @@ - - =head1 NAME - --openssl-storeutl, --storeutl - STORE utility -+openssl-storeutl - STORE utility - - =head1 SYNOPSIS - -diff -urN openssl-1.1.1/doc.org/man1/tsget.pod openssl-1.1.1/doc/man1/tsget.pod ---- openssl-1.1.1/doc.org/man1/tsget.pod 2018-09-11 14:48:22.000000000 +0200 -+++ openssl-1.1.1/doc/man1/tsget.pod 2018-09-11 22:10:15.233786945 +0200 -@@ -2,8 +2,7 @@ - - =head1 NAME - --openssl-tsget, --tsget - Time Stamping HTTP/HTTPS client -+openssl-tsget - Time Stamping HTTP/HTTPS client - - =head1 SYNOPSIS - -diff -urN openssl-1.1.1/doc.org/man1/ts.pod openssl-1.1.1/doc/man1/ts.pod ---- openssl-1.1.1/doc.org/man1/ts.pod 2018-09-11 14:48:22.000000000 +0200 -+++ openssl-1.1.1/doc/man1/ts.pod 2018-09-11 22:10:24.110714927 +0200 -@@ -2,8 +2,7 @@ - - =head1 NAME - --openssl-ts, --ts - Time Stamping Authority tool (client/server) -+openssl-ts - Time Stamping Authority tool (client/server) - - =head1 SYNOPSIS - -diff -urN openssl-1.1.1/doc.org/man1/verify.pod openssl-1.1.1/doc/man1/verify.pod ---- openssl-1.1.1/doc.org/man1/verify.pod 2018-09-11 14:48:22.000000000 +0200 -+++ openssl-1.1.1/doc/man1/verify.pod 2018-09-11 22:11:51.053274300 +0200 -@@ -2,8 +2,7 @@ - - =head1 NAME - --openssl-verify, --verify - Utility to verify certificates -+openssl-verify - Utility to verify certificates - - =head1 SYNOPSIS - -diff -urN openssl-1.1.1/doc.org/man1/version.pod openssl-1.1.1/doc/man1/version.pod ---- openssl-1.1.1/doc.org/man1/version.pod 2018-09-11 14:48:22.000000000 +0200 -+++ openssl-1.1.1/doc/man1/version.pod 2018-09-11 22:11:45.803119749 +0200 -@@ -2,8 +2,7 @@ - - =head1 NAME - --openssl-version, --version - print OpenSSL version information -+openssl-version - print OpenSSL version information - - =head1 SYNOPSIS - -diff -urN openssl-1.1.1/doc.org/man1/x509.pod openssl-1.1.1/doc/man1/x509.pod ---- openssl-1.1.1/doc.org/man1/x509.pod 2018-09-11 14:48:22.000000000 +0200 -+++ openssl-1.1.1/doc/man1/x509.pod 2018-09-11 22:08:15.893607199 +0200 -@@ -2,8 +2,7 @@ - - =head1 NAME - --openssl-x509, --x509 - Certificate display and signing utility -+openssl-x509 - Certificate display and signing utility - - =head1 SYNOPSIS - ---- openssl-1.1.1/doc/man5/config.pod~ 2018-09-11 14:48:23.000000000 +0200 -+++ openssl-1.1.1/doc/man5/config.pod 2018-09-13 18:55:53.379314240 +0200 -@@ -2,7 +2,7 @@ - - =head1 NAME - --config - OpenSSL CONF library configuration files -+openssl-config - OpenSSL CONF library configuration files - - =head1 DESCRIPTION - ---- openssl-1.1.1/doc/man5/x509v3_config.pod~ 2018-09-11 14:48:23.000000000 +0200 -+++ openssl-1.1.1/doc/man5/x509v3_config.pod 2018-09-13 18:56:06.236359843 +0200 -@@ -2,7 +2,7 @@ - - =head1 NAME - --x509v3_config - X509 V3 certificate extension configuration format -+openssl-x509v3_config - X509 V3 certificate extension configuration format - - =head1 DESCRIPTION - ---- openssl-1.1.1/doc/man7/bio.pod~ 2018-09-11 14:48:23.000000000 +0200 -+++ openssl-1.1.1/doc/man7/bio.pod 2018-09-13 19:13:57.454822064 +0200 -@@ -2,7 +2,7 @@ - - =head1 NAME - --bio - Basic I/O abstraction -+openssl-bio - Basic I/O abstraction - - =head1 SYNOPSIS - ---- openssl-1.1.1/doc/man7/crypto.pod~ 2018-09-11 14:48:23.000000000 +0200 -+++ openssl-1.1.1/doc/man7/crypto.pod 2018-09-13 19:14:03.525002575 +0200 -@@ -2,7 +2,7 @@ - - =head1 NAME - --crypto - OpenSSL cryptographic library -+openssl-crypto - OpenSSL cryptographic library - - =head1 SYNOPSIS - ---- openssl-1.1.1/doc/man7/ct.pod~ 2018-09-11 14:48:23.000000000 +0200 -+++ openssl-1.1.1/doc/man7/ct.pod 2018-09-13 19:14:07.405117959 +0200 -@@ -2,7 +2,7 @@ - - =head1 NAME - --ct - Certificate Transparency -+openssl-ct - Certificate Transparency - - =head1 SYNOPSIS - ---- openssl-1.1.1/doc/man7/des_modes.pod~ 2018-09-11 14:48:23.000000000 +0200 -+++ openssl-1.1.1/doc/man7/des_modes.pod 2018-09-13 19:14:10.988557855 +0200 -@@ -2,7 +2,7 @@ - - =head1 NAME - --des_modes - the variants of DES and other crypto algorithms of OpenSSL -+openssl-des_modes - the variants of DES and other crypto algorithms of OpenSSL - - =head1 DESCRIPTION - ---- openssl-1.1.1/doc/man7/evp.pod~ 2018-09-11 14:48:23.000000000 +0200 -+++ openssl-1.1.1/doc/man7/evp.pod 2018-09-13 19:14:15.148681567 +0200 -@@ -2,7 +2,7 @@ - - =head1 NAME - --evp - high-level cryptographic functions -+openssl-evp - high-level cryptographic functions - - =head1 SYNOPSIS - ---- openssl-1.1.1/doc/man7/ssl.pod~ 2018-09-11 14:48:23.000000000 +0200 -+++ openssl-1.1.1/doc/man7/ssl.pod 2018-09-13 19:14:35.495953306 +0200 -@@ -2,7 +2,7 @@ - - =head1 NAME - --ssl - OpenSSL SSL/TLS library -+openssl-ssl - OpenSSL SSL/TLS library - - =head1 SYNOPSIS - ---- openssl-1.1.1/doc/man7/x509.pod~ 2018-09-11 14:48:23.000000000 +0200 -+++ openssl-1.1.1/doc/man7/x509.pod 2018-09-13 19:14:40.996116867 +0200 -@@ -2,7 +2,7 @@ - - =head1 NAME - --x509 - X.509 certificate handling -+openssl-x509 - X.509 certificate handling - - =head1 SYNOPSIS - ---- openssl-1.1.1/doc/man7/Ed25519.pod~ 2018-09-11 14:48:23.000000000 +0200 -+++ openssl-1.1.1/doc/man7/Ed25519.pod 2018-09-13 19:27:15.788862330 +0200 -@@ -2,9 +2,7 @@ - - =head1 NAME - --Ed25519, --Ed448 --- EVP_PKEY Ed25519 and Ed448 support -+openssl-Ed25519, openssl-Ed448 - EVP_PKEY Ed25519 and Ed448 support - - =head1 DESCRIPTION - ---- openssl-1.1.1/doc/man7/passphrase-encoding.pod~ 2018-09-11 14:48:23.000000000 +0200 -+++ openssl-1.1.1/doc/man7/passphrase-encoding.pod 2018-09-13 19:27:38.656220157 +0200 -@@ -4,7 +4,7 @@ - - =head1 NAME - --passphrase-encoding -+openssl-passphrase-encoding - - How diverse parts of OpenSSL treat pass phrases character encoding - - =head1 DESCRIPTION ---- openssl-1.1.1/doc/man7/RAND_DRBG.pod~ 2018-09-11 14:48:23.000000000 +0200 -+++ openssl-1.1.1/doc/man7/RAND_DRBG.pod 2018-09-13 19:27:45.693099512 +0200 -@@ -2,7 +2,7 @@ - - =head1 NAME - --RAND_DRBG - the deterministic random bit generator -+openssl-RAND_DRBG - the deterministic random bit generator - - =head1 SYNOPSIS - ---- openssl-1.1.1/doc/man7/RAND.pod~ 2018-09-11 14:48:23.000000000 +0200 -+++ openssl-1.1.1/doc/man7/RAND.pod 2018-09-13 19:27:53.023321066 +0200 -@@ -2,8 +2,7 @@ - - =head1 NAME - --RAND --- the OpenSSL random generator -+openssl-RAND - the OpenSSL random generator - - =head1 DESCRIPTION - ---- openssl-1.1.1/doc/man7/RSA-PSS.pod~ 2018-09-11 14:48:23.000000000 +0200 -+++ openssl-1.1.1/doc/man7/RSA-PSS.pod 2018-09-13 19:27:58.186810465 +0200 -@@ -2,7 +2,7 @@ - - =head1 NAME - --RSA-PSS - EVP_PKEY RSA-PSS algorithm support -+openssl - RSA-PSS - EVP_PKEY RSA-PSS algorithm support - - =head1 DESCRIPTION - ---- openssl-1.1.1/doc/man7/scrypt.pod~ 2018-09-11 14:48:23.000000000 +0200 -+++ openssl-1.1.1/doc/man7/scrypt.pod 2018-09-13 19:28:04.880346108 +0200 -@@ -2,7 +2,7 @@ - - =head1 NAME - --scrypt - EVP_PKEY scrypt KDF support -+openssl-scrypt - EVP_PKEY scrypt KDF support - - =head1 DESCRIPTION - ---- openssl-1.1.1/doc/man7/SM2.pod~ 2018-09-11 14:48:23.000000000 +0200 -+++ openssl-1.1.1/doc/man7/SM2.pod 2018-09-13 19:28:09.697158362 +0200 -@@ -2,7 +2,7 @@ - - =head1 NAME - --SM2 - Chinese SM2 signature and encryption algorithm support -+openssl-SM2 - Chinese SM2 signature and encryption algorithm support - - =head1 DESCRIPTION - ---- openssl-1.1.1/doc/man7/X25519.pod~ 2018-09-11 14:48:23.000000000 +0200 -+++ openssl-1.1.1/doc/man7/X25519.pod 2018-09-13 19:28:23.594245064 +0200 -@@ -2,9 +2,7 @@ - - =head1 NAME - --X25519, --X448 --- EVP_PKEY X25519 and X448 support -+openssl-X25519, openssl-X448 - EVP_PKEY X25519 and X448 support - - =head1 DESCRIPTION - diff --git a/openssl-no-win32.patch b/openssl-no-win32.patch deleted file mode 100644 index a54af8b..0000000 --- a/openssl-no-win32.patch +++ /dev/null @@ -1,80 +0,0 @@ ---- openssl-1.1.1d/Configurations/unix-Makefile.tmpl.orig 2019-09-27 15:57:40.580222104 +0200 -+++ openssl-1.1.1d/Configurations/unix-Makefile.tmpl 2019-09-27 16:03:43.774921176 +0200 -@@ -201,77 +201,6 @@ - "" -} - # Do not edit these manually. Use Configure with --prefix or --openssldir - # to change this! Short explanation in the top comment in Configure --INSTALLTOP_dev={- # $prefix is used in the OPENSSLDIR perl snippet -- # -- use File::Spec::Win32; -- my $prefix_default = "$mingw_installroot/OpenSSL"; -- our $prefix = -- File::Spec::Win32->canonpath($config{prefix} -- || $prefix_default); -- our ($prefix_dev, $prefix_dir, $prefix_file) = -- File::Spec::Win32->splitpath($prefix, 1); -- $prefix =~ s|\\|/|g; -- $prefix_dir =~ s|\\|/|g; -- $prefix_dev -} --INSTALLTOP_dir={- my $x = File::Spec::Win32->canonpath($prefix_dir); -- $x =~ s|\\|/|g; -- $x -} --OPENSSLDIR_dev={- # -- # The logic here is that if no --openssldir was given, -- # OPENSSLDIR will get the value "$mingw_commonroot/SSL". -- # If --openssldir was given and the value is an absolute -- # path, OPENSSLDIR will get its value without change. -- # If the value from --openssldir is a relative path, -- # OPENSSLDIR will get $prefix with the --openssldir -- # value appended as a subdirectory. -- # -- use File::Spec::Win32; -- our $openssldir = -- $config{openssldir} ? -- (File::Spec::Win32->file_name_is_absolute($config{openssldir}) ? -- File::Spec::Win32->canonpath($config{openssldir}) -- : File::Spec::Win32->catdir($prefix, $config{openssldir})) -- : File::Spec::Win32->canonpath("$mingw_commonroot/SSL"); -- our ($openssldir_dev, $openssldir_dir, $openssldir_file) = -- File::Spec::Win32->splitpath($openssldir, 1); -- $openssldir =~ s|\\|/|g; -- $openssldir_dir =~ s|\\|/|g; -- $openssldir_dev -} --OPENSSLDIR_dir={- my $x = File::Spec::Win32->canonpath($openssldir_dir); -- $x =~ s|\\|/|g; -- $x -} --LIBDIR={- our $libdir = $config{libdir} || "lib"; -- File::Spec::Win32->file_name_is_absolute($libdir) ? "" : $libdir -} --ENGINESDIR_dev={- use File::Spec::Win32; -- our $enginesdir = -- File::Spec::Win32->catdir($prefix,$libdir, -- "engines-$sover_dirname"); -- our ($enginesdir_dev, $enginesdir_dir, $enginesdir_file) = -- File::Spec::Win32->splitpath($enginesdir, 1); -- $enginesdir =~ s|\\|/|g; -- $enginesdir_dir =~ s|\\|/|g; -- $enginesdir_dev -} --ENGINESDIR_dir={- my $x = File::Spec::Win32->canonpath($enginesdir_dir); -- $x =~ s|\\|/|g; -- $x -} --# In a Windows environment, $(DESTDIR) is harder to contatenate with other --# directory variables, because both may contain devices. What we do here is --# to adapt INSTALLTOP, OPENSSLDIR and ENGINESDIR depending on if $(DESTDIR) --# has a value or not, to ensure that concatenation will always work further --# down. --ifneq "$(DESTDIR)" "" --INSTALLTOP=$(INSTALLTOP_dir) --OPENSSLDIR=$(OPENSSLDIR_dir) --ENGINESDIR=$(ENGINESDIR_dir) --else --INSTALLTOP=$(INSTALLTOP_dev)$(INSTALLTOP_dir) --OPENSSLDIR=$(OPENSSLDIR_dev)$(OPENSSLDIR_dir) --ENGINESDIR=$(ENGINESDIR_dev)$(ENGINESDIR_dir) --endif -- --# $(libdir) is chosen to be compatible with the GNU coding standards --libdir={- File::Spec::Win32->file_name_is_absolute($libdir) -- ? $libdir : '$(INSTALLTOP)/$(LIBDIR)' -} - {- output_on() if $config{target} !~ /^mingw/; "" -} - - MANDIR=$(INSTALLTOP)/share/man diff --git a/openssl.spec b/openssl.spec index dcf970b..424e865 100644 --- a/openssl.spec +++ b/openssl.spec @@ -2,9 +2,7 @@ # Conditional build: %bcond_without tests # don't perform "make tests" %bcond_without zlib # zlib: note - enables CVE-2012-4929 vulnerability -%bcond_with sslv2 # SSLv2: note - many flaws http://en.wikipedia.org/wiki/Transport_Layer_Security#SSL_2.0 %bcond_with sslv3 # SSLv3: note - enables CVE-2014-3566 vulnerability -%bcond_with snap # use GitHub snapshot to build branch release Summary: OpenSSL Toolkit libraries for the "Secure Sockets Layer" (SSL v2/v3) Summary(de.UTF-8): Secure Sockets Layer (SSL)-Kommunikationslibrary @@ -15,44 +13,41 @@ Summary(pt_BR.UTF-8): Uma biblioteca C que fornece vários algoritmos e protocol Summary(ru.UTF-8): Библиотеки и утилиты для соединений через Secure Sockets Layer Summary(uk.UTF-8): Бібліотеки та утиліти для з'єднань через Secure Sockets Layer Name: openssl -# Version 1.1.1 is LTS, supported until 2023-09-11. -# https://www.openssl.org/about/releasestrat.html -Version: 1.1.1i +Version: 3.3.0 Release: 1 -License: Apache-like +License: Apache v2.0 Group: Libraries -%if %{without snap} Source0: https://www.openssl.org/source/%{name}-%{version}.tar.gz -# Source0-md5: 53840c70434793127a3574433494e8d3 -%else -Source1: https://github.com/openssl/openssl/archive/OpenSSL_1_1_1-stable/%{name}-%{version}-dev.tar.gz -%endif +# Source0-md5: c8b063afbea85d867e161ecb8816cfa9 Source2: %{name}.1.pl Source3: %{name}-ssl-certificate.sh Source4: %{name}-c_rehash.sh -Patch1: %{name}-optflags.patch - -Patch3: %{name}-man-namespace.patch -Patch5: %{name}-ca-certificates.patch -Patch6: %{name}-no-win32.patch -Patch7: %{name}-find.patch -Patch8: pic.patch - -Patch11: engines-dir.patch +Patch0: %{name}-optflags.patch +Patch1: %{name}-ca-certificates.patch +Patch2: %{name}-find.patch +Patch3: pic.patch +Patch4: engines-dir.patch URL: http://www.openssl.org/ +%ifarch %{arm} ppc mips sparc sparcv9 +BuildRequires: libatomic-devel +%endif +BuildRequires: libbrotli-devel BuildRequires: libsctp-devel +BuildRequires: linux-libc-headers >= 7:4.13 BuildRequires: perl-devel >= 1:5.10.0 BuildRequires: pkgconfig BuildRequires: rpm-perlprov >= 4.1-13 -BuildRequires: rpmbuild(macros) >= 1.213 +BuildRequires: rpmbuild(macros) >= 1.745 BuildRequires: sed >= 4.0 BuildRequires: zlib-devel +BuildRequires: zstd-devel Requires: ca-certificates >= 20141019-3 Requires: rpm-whiteout >= 1.7 -Obsoletes: SSLeay -Obsoletes: SSLeay-devel -Obsoletes: SSLeay-perl -Obsoletes: libopenssl0 +Obsoletes: SSLeay < 0.9.3 +Obsoletes: SSLeay-devel < 0.9.3 +Obsoletes: SSLeay-perl < 0.9.3 +Obsoletes: libopenssl0 < 1 +Obsoletes: openssl-engines < 3.0.0-2 %if "%{pld_release}" == "ac" Conflicts: neon < 0.26.3-3 Conflicts: ntpd < 4.2.4p8-10 @@ -116,53 +111,11 @@ RC4, RSA и SSL. користування, що реалізують велику кількість криптографічних алгоритмів, включаючи DES, RC4, RSA та SSL. -%package engines -Summary: OpenSSL optional crypto engines -Summary(pl.UTF-8): Opcjonalne silniki kryptograficzne dla OpenSSL-a -Group: Libraries -Requires: %{name} = %{version}-%{release} - -%description engines -With OpenSSL 0.9.6, a new component was added to support alternative -cryptography implementations, most commonly for interfacing with -external crypto devices (eg. accelerator cards). This component is -called ENGINE. - -There are currently built-in ENGINE implementations for the following -crypto devices: - -- CryptoSwift -- Compaq Atalla -- nCipher CHIL -- Nuron -- Broadcom uBSec - -In addition, dynamic binding to external ENGINE implementations is now -provided by a special ENGINE called "dynamic". - -%description engines -l pl.UTF-8 -Począwszy od OpenSSL-a 0.9.6 został dodany nowy komponent, mający -wspierać alternatywne implementacje kryptografii, przeważnie -współpracujące z zewnętrznymi urządzeniami kryptograficznymi (np. -kartami akceleratorów). Komponent ten jest nazywany SILNIKIEM (ang. -ENGINE). - -Obecnie istnieją wbudowane implementacje silników dla następujących -urządzeń kryptograficznych: -- CryptoSwift -- Compaq Atalla -- nCipher CHIL -- Nuron -- Broadcom uBSec - -Ponadto zapewnione jest dynamiczne wiązanie dla zewnętrznych -implementacji silników poprzez specjalny silnik o nazwie "dynamic". - %package tools Summary: OpenSSL command line tool and utilities Summary(pl.UTF-8): Zestaw narzędzi i skryptów Group: Applications/Communications -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} Requires: which %description tools @@ -193,8 +146,8 @@ Summary(pt_BR.UTF-8): Bibliotecas e arquivos de inclusão para desenvolvimento O Summary(ru.UTF-8): Библиотеки, хедеры и утилиты для Secure Sockets Layer Summary(uk.UTF-8): Бібліотеки, хедери та утиліти для Secure Sockets Layer Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Obsoletes: libopenssl0-devel +Requires: %{name}%{?_isa} = %{version}-%{release} +Obsoletes: libopenssl0-devel < 1 %description devel Development part of OpenSSL library. @@ -253,21 +206,15 @@ RC4, RSA и SSL. Включает статические библиотеки д бібліотеки для розробки програм з використанням SSL. %prep -%if %{with snap} -%setup -qcT -a1 -%{__mv} %{name}-OpenSSL_1_1_1-stable/* . -%else -%setup -q %{?subver:-n %{name}-%{version}-%{subver}} -%endif +%setup -q +%patch0 -p1 %patch1 -p1 - +%patch2 -p1 %patch3 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 +%patch4 -p1 -%patch11 -p1 +# fails with enable-sctp as of 1.1.1 +%{__rm} test/recipes/80-test_ssl_new.t %build touch Makefile.* @@ -280,9 +227,9 @@ PERL="%{__perl}" \ -Wa,--noexecstack \ shared \ threads \ - %{?with_sslv2:enable-ssl2}%{!?with_sslv2:no-ssl2} \ %{?with_sslv3:enable-ssl3}%{!?with_sslv3:no-ssl3} \ %{!?with_zlib:no-}zlib \ + enable-brotli \ enable-cms \ enable-idea \ enable-md2 \ @@ -291,6 +238,10 @@ PERL="%{__perl}" \ enable-rfc3779 \ enable-sctp \ enable-seed \ + enable-camellia \ + enable-ktls \ + enable-fips \ + enable-zstd \ %ifarch %{x8664} enable-ec_nistp_64_gcc_128 \ %endif @@ -336,26 +287,20 @@ PERL="%{__perl}" \ linux-aarch64 %endif -v=$(awk -F= '/^VERSION/{print $2}' Makefile) -test "$v" = %{version}%{?subver:-%{subver}}%{?with_snap:-dev} - -# fails with enable-sctp as of 1.1.1 -%{__rm} test/recipes/80-test_ssl_new.t +v=$(awk -F= '/^VERSION=/{print $2}' Makefile) +test "$v" = %{version} -%{__make} -j1 all %{?with_tests:tests} \ +%{__make} all \ CC="%{__cc}" \ OPTFLAGS="%{rpmcflags} %{rpmcppflags}" \ INSTALLTOP=%{_prefix} -# Rename POD sources of man pages. "openssl-" prefix is added to each -# manpage to avoid potential conflicts with other packages. -# openssl-man-namespace.patch mostly marks these pages with "openssl-" prefix. - -for podfile in $(grep -rl '^openssl-' doc/man*); do - dir=$(dirname "$podfile") - base=$(basename "$podfile") - %{__mv} "$podfile" "$dir/openssl-$base" -done +%if %{with tests} +%{__make} -j1 tests \ + CC="%{__cc}" \ + OPTFLAGS="%{rpmcflags} %{rpmcppflags}" \ + INSTALLTOP=%{_prefix} +%endif %install rm -rf $RPM_BUILD_ROOT @@ -363,13 +308,13 @@ install -d $RPM_BUILD_ROOT{%{_sysconfdir}/%{name},%{_libdir}/%{name}} \ $RPM_BUILD_ROOT{%{_mandir}/{pl/man1,man{1,3,5,7}},%{_datadir}/ssl} \ $RPM_BUILD_ROOT%{_pkgconfigdir} -%{__make} -j1 install \ +%{__make} install \ CC="%{__cc}" \ DESTDIR=$RPM_BUILD_ROOT -%{__mv} $RPM_BUILD_ROOT%{_libdir}/lib*.so.*.* $RPM_BUILD_ROOT/%{_lib} -ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libcrypto.*.*) $RPM_BUILD_ROOT%{_libdir}/libcrypto.so -ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libssl.*.*) $RPM_BUILD_ROOT%{_libdir}/libssl.so +%{__mv} $RPM_BUILD_ROOT%{_libdir}/lib*.so.* $RPM_BUILD_ROOT/%{_lib} +ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libcrypto.*) $RPM_BUILD_ROOT%{_libdir}/libcrypto.so +ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libssl.*) $RPM_BUILD_ROOT%{_libdir}/libssl.so %{__mv} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/misc/* $RPM_BUILD_ROOT%{_libdir}/%{name} %{__rm} -r $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/misc @@ -412,77 +357,82 @@ fi %files %defattr(644,root,root,755) -%doc CHANGES LICENSE NEWS README doc/*.txt -%attr(755,root,root) /%{_lib}/libcrypto.so.*.* -%attr(755,root,root) /%{_lib}/libssl.so.*.* +%doc CHANGES.md NEWS.md README.md doc/*.txt +%attr(755,root,root) /%{_lib}/libcrypto.so.* +%attr(755,root,root) /%{_lib}/libssl.so.* +%dir /%{_lib}/engines-3 +%attr(755,root,root) /%{_lib}/engines-3/*.so +%dir /%{_lib}/ossl-modules +%attr(755,root,root) /%{_lib}/ossl-modules/fips.so +%attr(755,root,root) /%{_lib}/ossl-modules/legacy.so %dir %{_sysconfdir}/%{name} +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/ct_log_list.cnf +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/fipsmodule.cnf +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/openssl.cnf %dir %{_sysconfdir}/%{name}/certs %dir %attr(700,root,root) %{_sysconfdir}/%{name}/private %dir %{_datadir}/ssl - -%files engines -%defattr(644,root,root,755) -%dir /%{_lib}/engines-1.1 -%attr(755,root,root) /%{_lib}/engines-1.1/*.so +%{_mandir}/man5/config.5ossl* %files tools %defattr(644,root,root,755) -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/ct_log_list.cnf -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/openssl.cnf %attr(755,root,root) %{_bindir}/c_rehash.sh %attr(755,root,root) %{_bindir}/openssl %attr(754,root,root) %{_bindir}/ssl-certificate +%{_mandir}/man1/asn1parse.1ossl* +%{_mandir}/man1/ca.1ossl* +%{_mandir}/man1/ciphers.1ossl* +%{_mandir}/man1/cmp.1ossl* +%{_mandir}/man1/cms.1ossl* +%{_mandir}/man1/crl.1ossl* +%{_mandir}/man1/crl2pkcs7.1ossl* +%{_mandir}/man1/dgst.1ossl* +%{_mandir}/man1/dhparam.1ossl* +%{_mandir}/man1/dsa.1ossl* +%{_mandir}/man1/dsaparam.1ossl* +%{_mandir}/man1/ec.1ossl* +%{_mandir}/man1/ecparam.1ossl* +%{_mandir}/man1/enc.1ossl* +%{_mandir}/man1/engine.1ossl* +%{_mandir}/man1/errstr.1ossl* +%{_mandir}/man1/gendsa.1ossl* +%{_mandir}/man1/genpkey.1ossl* +%{_mandir}/man1/genrsa.1ossl* +%{_mandir}/man1/info.1ossl* +%{_mandir}/man1/kdf.1ossl* +%{_mandir}/man1/mac.1ossl* +%{_mandir}/man1/nseq.1ossl* +%{_mandir}/man1/ocsp.1ossl* %{_mandir}/man1/openssl.1* -%{_mandir}/man1/openssl-asn1parse.1* -%{_mandir}/man1/openssl-ca.1* -%{_mandir}/man1/openssl-ciphers.1* -%{_mandir}/man1/openssl-cms.1* -%{_mandir}/man1/openssl-crl.1* -%{_mandir}/man1/openssl-crl2pkcs7.1* -%{_mandir}/man1/openssl-dgst.1* -%{_mandir}/man1/openssl-dhparam.1* -%{_mandir}/man1/openssl-dsa.1* -%{_mandir}/man1/openssl-dsaparam.1* -%{_mandir}/man1/openssl-ec.1* -%{_mandir}/man1/openssl-ecparam.1* -%{_mandir}/man1/openssl-enc.1* -%{_mandir}/man1/openssl-engine.1* -%{_mandir}/man1/openssl-errstr.1* -%{_mandir}/man1/openssl-gendsa.1* -%{_mandir}/man1/openssl-genpkey.1* -%{_mandir}/man1/openssl-genrsa.1* -%{_mandir}/man1/openssl-list.1* -%{_mandir}/man1/openssl-nseq.1* -%{_mandir}/man1/openssl-ocsp.1* -%{_mandir}/man1/openssl-passwd.1* -%{_mandir}/man1/openssl-pkcs12.1* -%{_mandir}/man1/openssl-pkcs7.1* -%{_mandir}/man1/openssl-pkcs8.1* -%{_mandir}/man1/openssl-pkey.1* -%{_mandir}/man1/openssl-pkeyparam.1* -%{_mandir}/man1/openssl-pkeyutl.1* -%{_mandir}/man1/openssl-prime.1* -%{_mandir}/man1/openssl-rand.1* -%{_mandir}/man1/openssl-rehash.1* -%{_mandir}/man1/openssl-req.1* -%{_mandir}/man1/openssl-rsa.1* -%{_mandir}/man1/openssl-rsautl.1* -%{_mandir}/man1/openssl-s_client.1* -%{_mandir}/man1/openssl-s_server.1* -%{_mandir}/man1/openssl-s_time.1* -%{_mandir}/man1/openssl-sess_id.1* -%{_mandir}/man1/openssl-smime.1* -%{_mandir}/man1/openssl-speed.1* -%{_mandir}/man1/openssl-spkac.1* -%{_mandir}/man1/openssl-srp.1* -%{_mandir}/man1/openssl-storeutl.1* -%{_mandir}/man1/openssl-ts.1* -%{_mandir}/man1/openssl-tsget.1* -%{_mandir}/man1/openssl-verify.1* -%{_mandir}/man1/openssl-version.1* -%{_mandir}/man1/openssl-x509.1* -%{_mandir}/man5/openssl-config.5* -%{_mandir}/man5/openssl-x509v3_config.5* +%{_mandir}/man1/openssl-*.1* +%{_mandir}/man1/passwd.1ossl* +%{_mandir}/man1/pkcs12.1ossl* +%{_mandir}/man1/pkcs7.1ossl* +%{_mandir}/man1/pkcs8.1ossl* +%{_mandir}/man1/pkey.1ossl* +%{_mandir}/man1/pkeyparam.1ossl* +%{_mandir}/man1/pkeyutl.1ossl* +%{_mandir}/man1/prime.1ossl* +%{_mandir}/man1/rand.1ossl* +%{_mandir}/man1/rehash.1ossl* +%{_mandir}/man1/req.1ossl* +%{_mandir}/man1/rsa.1ossl* +%{_mandir}/man1/rsautl.1ossl* +%{_mandir}/man1/s_client.1ossl* +%{_mandir}/man1/sess_id.1ossl* +%{_mandir}/man1/smime.1ossl* +%{_mandir}/man1/speed.1ossl* +%{_mandir}/man1/spkac.1ossl* +%{_mandir}/man1/srp.1ossl* +%{_mandir}/man1/s_server.1ossl* +%{_mandir}/man1/s_time.1ossl* +%{_mandir}/man1/storeutl.1ossl* +%{_mandir}/man1/ts.1ossl* +%{_mandir}/man1/verify.1ossl* +%{_mandir}/man1/version.1ossl* +%{_mandir}/man1/x509.1ossl* +%{_mandir}/man5/fips_config.5ossl* +%{_mandir}/man5/x509v3_config.5ossl* %lang(pl) %{_mandir}/pl/man1/openssl.1* %files tools-perl @@ -492,153 +442,21 @@ fi %attr(755,root,root) %{_libdir}/%{name}/CA.pl %attr(755,root,root) %{_libdir}/%{name}/tsget %attr(755,root,root) %{_libdir}/%{name}/tsget.pl -%{_mandir}/man1/CA.pl.1* -%{_mandir}/man1/c_rehash.1* +%{_mandir}/man1/CA.pl.1ossl* +%{_mandir}/man1/c_rehash.1ossl* +%{_mandir}/man1/tsget.1ossl* %files devel %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libcrypto.so %attr(755,root,root) %{_libdir}/libssl.so %{_includedir}/%{name} +%{_libdir}/cmake/OpenSSL %{_pkgconfigdir}/libcrypto.pc %{_pkgconfigdir}/libssl.pc %{_pkgconfigdir}/openssl.pc -%{_mandir}/man3/ACCESS_DESCRIPTION_*.3* -%{_mandir}/man3/ADMISSION*.3* -%{_mandir}/man3/ASId*.3* -%{_mandir}/man3/ASRange_*.3* -%{_mandir}/man3/ASN1_*.3* -%{_mandir}/man3/ASYNC_*.3* -%{_mandir}/man3/AUTHORITY_*.3* -%{_mandir}/man3/BASIC_CONSTRAINTS_*.3* -%{_mandir}/man3/BF_*.3* -%{_mandir}/man3/BIO_*.3* -%{_mandir}/man3/BN_*.3* -%{_mandir}/man3/BUF_*.3* -%{_mandir}/man3/CERTIFICATEPOLICIES_*.3* -%{_mandir}/man3/CMS_*.3* -%{_mandir}/man3/CONF_*.3* -%{_mandir}/man3/CRL_DIST_POINTS_*.3* -%{_mandir}/man3/CRYPTO_*.3* -%{_mandir}/man3/CTLOG_*.3* -%{_mandir}/man3/CT_POLICY_*.3* -%{_mandir}/man3/DECLARE_*.3* -%{_mandir}/man3/DEFINE_*.3* -%{_mandir}/man3/DES_*.3* -%{_mandir}/man3/DH_*.3* -%{_mandir}/man3/DHparams_*.3* -%{_mandir}/man3/DIRECTORYSTRING_*.3* -%{_mandir}/man3/DISPLAYTEXT_*.3* -%{_mandir}/man3/DIST_POINT_*.3* -%{_mandir}/man3/DSA_*.3* -%{_mandir}/man3/DSAparams_*.3* -%{_mandir}/man3/DTLS_*.3* -%{_mandir}/man3/DTLSv1_*.3* -%{_mandir}/man3/ECDH_*.3* -%{_mandir}/man3/ECDSA_*.3* -%{_mandir}/man3/ECPARAMETERS_*.3* -%{_mandir}/man3/ECPKPARAMETERS_*.3* -%{_mandir}/man3/ECPKParameters_*.3* -%{_mandir}/man3/EC_*.3* -%{_mandir}/man3/EDIPARTYNAME_*.3* -%{_mandir}/man3/ENGINE_*.3* -%{_mandir}/man3/ERR_*.3* -%{_mandir}/man3/ESS_*.3* -%{_mandir}/man3/EVP_*.3* -%{_mandir}/man3/EXTENDED_KEY_USAGE_*.3* -%{_mandir}/man3/GENERAL_*.3* -%{_mandir}/man3/GEN_SESSION_CB.3* -%{_mandir}/man3/HMAC*.3* -%{_mandir}/man3/IMPLEMENT_*.3* -%{_mandir}/man3/IPAddress*.3* -%{_mandir}/man3/ISSUING_DIST_POINT_*.3* -%{_mandir}/man3/LHASH*.3* -%{_mandir}/man3/MD2*.3* -%{_mandir}/man3/MD4*.3* -%{_mandir}/man3/MD5*.3* -%{_mandir}/man3/MDC2*.3* -%{_mandir}/man3/NAME_CONSTRAINTS_*.3* -%{_mandir}/man3/NAMING_AUTHORITY*.3* -%{_mandir}/man3/NETSCAPE_*.3* -%{_mandir}/man3/NOTICEREF_*.3* -%{_mandir}/man3/OBJ_*.3* -%{_mandir}/man3/OCSP_*.3* -%{_mandir}/man3/OPENSSL_*.3* -%{_mandir}/man3/OSSL*.3* -%{_mandir}/man3/OTHERNAME_*.3* -%{_mandir}/man3/OpenSSL_*.3* -%{_mandir}/man3/PBE2PARAM_*.3* -%{_mandir}/man3/PBEPARAM_*.3* -%{_mandir}/man3/PBKDF2PARAM_*.3* -%{_mandir}/man3/PEM_*.3* -%{_mandir}/man3/PKCS12_*.3* -%{_mandir}/man3/PKCS5_*.3* -%{_mandir}/man3/PKCS7_*.3* -%{_mandir}/man3/PKCS8_*.3* -%{_mandir}/man3/PKEY_*.3* -%{_mandir}/man3/POLICYINFO_*.3* -%{_mandir}/man3/POLICYQUALINFO_*.3* -%{_mandir}/man3/POLICY_*.3* -%{_mandir}/man3/PROFESSION_INFO*.3* -%{_mandir}/man3/PROXY_*.3* -%{_mandir}/man3/RAND_*.3* -%{_mandir}/man3/RC4*.3* -%{_mandir}/man3/RIPEMD160*.3* -%{_mandir}/man3/RSAPrivateKey_*.3* -%{_mandir}/man3/RSAPublicKey_*.3* -%{_mandir}/man3/RSA_*.3* -%{_mandir}/man3/SCRYPT_PARAMS*.3* -%{_mandir}/man3/SCT_*.3* -%{_mandir}/man3/SHA1*.3* -%{_mandir}/man3/SHA224*.3* -%{_mandir}/man3/SHA256*.3* -%{_mandir}/man3/SHA384*.3* -%{_mandir}/man3/SHA512*.3* -%{_mandir}/man3/SMIME_*.3* -%{_mandir}/man3/SSL_*.3* -%{_mandir}/man3/SSLv23_*.3* -%{_mandir}/man3/SSLv3_*.3* -%{_mandir}/man3/SXNET_*.3* -%{_mandir}/man3/SXNETID_*.3* -%{_mandir}/man3/TLS_*.3* -%{_mandir}/man3/TLSv1_*.3* -%{_mandir}/man3/TS_*.3* -%{_mandir}/man3/UI*.3* -%{_mandir}/man3/USERNOTICE_*.3* -%{_mandir}/man3/X509_*.3* -%{_mandir}/man3/X509V3_*.3* -%{_mandir}/man3/X509v3_*.3* -%{_mandir}/man3/custom_ext_*.3* -%{_mandir}/man3/d2i_*.3* -%{_mandir}/man3/i2d_*.3* -%{_mandir}/man3/i2o_*.3* -%{_mandir}/man3/i2t_*.3* -%{_mandir}/man3/lh_TYPE_*.3* -%{_mandir}/man3/o2i_*.3* -%{_mandir}/man3/pem_password_cb.3* -%{_mandir}/man3/sk_TYPE_*.3* -%{_mandir}/man3/ssl_ct_validation_cb.3* -%{_mandir}/man7/openssl.7* -%{_mandir}/man7/openssl-bio.7* -%{_mandir}/man7/openssl-crypto.7* -%{_mandir}/man7/openssl-ct.7* -%{_mandir}/man7/openssl-des_modes.7* -%{_mandir}/man7/openssl-Ed25519.7* -%{_mandir}/man7/openssl-Ed448.7* -%{_mandir}/man7/openssl-evp.7* -%{_mandir}/man7/openssl-passphrase-encoding.7* -%{_mandir}/man7/openssl-RAND.7* -%{_mandir}/man7/openssl-RAND_DRBG.7* -%{_mandir}/man7/openssl-scrypt.7* -%{_mandir}/man7/openssl-SM2.7* -%{_mandir}/man7/openssl-ssl.7* -%{_mandir}/man7/openssl-X25519.7* -%{_mandir}/man7/openssl-X448.7* -%{_mandir}/man7/openssl-x509.7* -%{_mandir}/man7/ossl_store.7* -%{_mandir}/man7/ossl_store-file.7* -%{_mandir}/man7/proxy-certificates.7* -%{_mandir}/man7/RSA-PSS.7.gz +%{_mandir}/man3/*.3ossl* +%{_mandir}/man7/*.7ossl* %files static %defattr(644,root,root,755) diff --git a/pic.patch b/pic.patch index 2f13e57..d0db4f3 100644 --- a/pic.patch +++ b/pic.patch @@ -1,8 +1,19 @@ -Index: openssl-1.0.1c/crypto/des/asm/desboth.pl -=================================================================== ---- openssl-1.0.1c.orig/crypto/des/asm/desboth.pl 2001-10-24 23:20:56.000000000 +0200 -+++ openssl-1.0.1c/crypto/des/asm/desboth.pl 2012-07-29 14:15:26.000000000 +0200 -@@ -16,6 +16,11 @@ +From: Debian OpenSSL Team +Date: Sun, 5 Nov 2017 15:09:09 +0100 +Subject: pic + +--- + crypto/des/asm/desboth.pl | 17 ++++++++++++++--- + crypto/perlasm/cbc.pl | 24 ++++++++++++++++++++---- + crypto/perlasm/x86gas.pl | 16 ++++++++++++++++ + crypto/x86cpuid.pl | 10 +++++----- + 4 files changed, 55 insertions(+), 12 deletions(-) + +diff --git a/crypto/des/asm/desboth.pl b/crypto/des/asm/desboth.pl +index afffd20d84cd..b50e85ce24f8 100644 +--- a/crypto/des/asm/desboth.pl ++++ b/crypto/des/asm/desboth.pl +@@ -23,6 +23,11 @@ sub DES_encrypt3 &push("edi"); @@ -14,7 +25,7 @@ Index: openssl-1.0.1c/crypto/des/asm/desboth.pl &comment(""); &comment("Load the data words"); &mov($L,&DWP(0,"ebx","",0)); -@@ -47,15 +52,21 @@ +@@ -54,15 +59,21 @@ sub DES_encrypt3 &mov(&swtmp(2), (DWC(($enc)?"1":"0"))); &mov(&swtmp(1), "eax"); &mov(&swtmp(0), "ebx"); @@ -39,11 +50,11 @@ Index: openssl-1.0.1c/crypto/des/asm/desboth.pl &stack_pop(3); &mov($L,&DWP(0,"ebx","",0)); -Index: openssl-1.0.1c/crypto/perlasm/cbc.pl -=================================================================== ---- openssl-1.0.1c.orig/crypto/perlasm/cbc.pl 2011-07-13 08:22:46.000000000 +0200 -+++ openssl-1.0.1c/crypto/perlasm/cbc.pl 2012-07-29 14:15:26.000000000 +0200 -@@ -122,7 +122,11 @@ +diff --git a/crypto/perlasm/cbc.pl b/crypto/perlasm/cbc.pl +index ef09e0fd297a..fe6ff45d1804 100644 +--- a/crypto/perlasm/cbc.pl ++++ b/crypto/perlasm/cbc.pl +@@ -129,7 +129,11 @@ sub cbc &mov(&DWP($data_off,"esp","",0), "eax"); # put in array for call &mov(&DWP($data_off+4,"esp","",0), "ebx"); # @@ -56,7 +67,7 @@ Index: openssl-1.0.1c/crypto/perlasm/cbc.pl &mov("eax", &DWP($data_off,"esp","",0)); &mov("ebx", &DWP($data_off+4,"esp","",0)); -@@ -185,7 +189,11 @@ +@@ -199,7 +203,11 @@ sub cbc &mov(&DWP($data_off,"esp","",0), "eax"); # put in array for call &mov(&DWP($data_off+4,"esp","",0), "ebx"); # @@ -69,7 +80,7 @@ Index: openssl-1.0.1c/crypto/perlasm/cbc.pl &mov("eax", &DWP($data_off,"esp","",0)); &mov("ebx", &DWP($data_off+4,"esp","",0)); -@@ -218,7 +226,11 @@ +@@ -232,7 +240,11 @@ sub cbc &mov(&DWP($data_off,"esp","",0), "eax"); # put back &mov(&DWP($data_off+4,"esp","",0), "ebx"); # @@ -82,7 +93,7 @@ Index: openssl-1.0.1c/crypto/perlasm/cbc.pl &mov("eax", &DWP($data_off,"esp","",0)); # get return &mov("ebx", &DWP($data_off+4,"esp","",0)); # -@@ -261,7 +273,11 @@ +@@ -275,7 +287,11 @@ sub cbc &mov(&DWP($data_off,"esp","",0), "eax"); # put back &mov(&DWP($data_off+4,"esp","",0), "ebx"); # @@ -95,19 +106,19 @@ Index: openssl-1.0.1c/crypto/perlasm/cbc.pl &mov("eax", &DWP($data_off,"esp","",0)); # get return &mov("ebx", &DWP($data_off+4,"esp","",0)); # -Index: openssl-1.0.1c/crypto/perlasm/x86gas.pl -=================================================================== ---- openssl-1.0.1c.orig/crypto/perlasm/x86gas.pl 2011-12-09 20:16:35.000000000 +0100 -+++ openssl-1.0.1c/crypto/perlasm/x86gas.pl 2012-07-29 14:15:26.000000000 +0200 -@@ -161,6 +161,7 @@ +diff --git a/crypto/perlasm/x86gas.pl b/crypto/perlasm/x86gas.pl +index 1b2b27c02286..a62c01b175a2 100644 +--- a/crypto/perlasm/x86gas.pl ++++ b/crypto/perlasm/x86gas.pl +@@ -171,6 +171,7 @@ sub ::file_end if ($::macosx) { push (@out,"$tmp,2\n"); } elsif ($::elf) { push (@out,"$tmp,4\n"); } else { push (@out,"$tmp\n"); } -+ if ($::elf) { push (@out,".hidden\tOPENSSL_ia32cap_P\n"); } ++ if ($::elf) { push (@out,".hidden\tOPENSSL_ia32cap_P\n"); } } push(@out,$initseg) if ($initseg); - } -@@ -218,8 +219,23 @@ + if ($::elf) { +@@ -249,8 +250,23 @@ ___ elsif ($::elf) { $initseg.=<<___; .section .init @@ -131,11 +142,11 @@ Index: openssl-1.0.1c/crypto/perlasm/x86gas.pl } elsif ($::coff) { $initseg.=<<___; # applies to both Cygwin and Mingw -Index: openssl-1.0.1c/crypto/x86cpuid.pl -=================================================================== ---- openssl-1.0.1c.orig/crypto/x86cpuid.pl 2012-02-28 15:20:34.000000000 +0100 -+++ openssl-1.0.1c/crypto/x86cpuid.pl 2012-07-29 14:15:26.000000000 +0200 -@@ -8,6 +8,8 @@ +diff --git a/crypto/x86cpuid.pl b/crypto/x86cpuid.pl +index a7bcb27e262d..6688a1fc4464 100644 +--- a/crypto/x86cpuid.pl ++++ b/crypto/x86cpuid.pl +@@ -16,6 +16,8 @@ $output = pop and open STDOUT,">$output"; for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); } @@ -144,7 +155,7 @@ Index: openssl-1.0.1c/crypto/x86cpuid.pl &function_begin("OPENSSL_ia32_cpuid"); &xor ("edx","edx"); &pushf (); -@@ -139,9 +141,7 @@ +@@ -161,9 +163,7 @@ for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); } &set_label("nocpuid"); &function_end("OPENSSL_ia32_cpuid"); @@ -155,7 +166,7 @@ Index: openssl-1.0.1c/crypto/x86cpuid.pl &xor ("eax","eax"); &xor ("edx","edx"); &picmeup("ecx","OPENSSL_ia32cap_P"); -@@ -155,7 +155,7 @@ +@@ -177,7 +177,7 @@ for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); } # This works in Ring 0 only [read DJGPP+MS-DOS+privileged DPMI host], # but it's safe to call it on any [supported] 32-bit platform... # Just check for [non-]zero return value... @@ -164,7 +175,7 @@ Index: openssl-1.0.1c/crypto/x86cpuid.pl &picmeup("ecx","OPENSSL_ia32cap_P"); &bt (&DWP(0,"ecx"),4); &jnc (&label("nohalt")); # no TSC -@@ -222,7 +222,7 @@ +@@ -244,7 +244,7 @@ for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); } &ret (); &function_end_B("OPENSSL_far_spin");