SF.net SVN: gar:[22972] csw/mgar/pkg/openssl1/trunk
chninkel at users.sourceforge.net
chninkel at users.sourceforge.net
Sat Feb 8 12:25:33 CET 2014
Revision: 22972
http://sourceforge.net/p/gar/code/22972
Author: chninkel
Date: 2014-02-08 11:25:31 +0000 (Sat, 08 Feb 2014)
Log Message:
-----------
openssl1/trunk: Fixed order of patch and updated t4 engine patch
Modified Paths:
--------------
csw/mgar/pkg/openssl1/trunk/Makefile
csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1f-t4-engine.sparc.5.11.patch
Modified: csw/mgar/pkg/openssl1/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssl1/trunk/Makefile 2014-02-08 10:32:26 UTC (rev 22971)
+++ csw/mgar/pkg/openssl1/trunk/Makefile 2014-02-08 11:25:31 UTC (rev 22972)
@@ -129,9 +129,6 @@
# support for pkcs11 engine http://blogs.sun.com/chichang1/entry/how_to_integrate_pkcs11_engine
ifneq ($(shell /usr/bin/uname -r),5.9)
- # The upstream pkcs11 engine patch depends on the wanboot one
- # so we will apply the wanboot patch even if we will not enable wanboot
- PATCHFILES += openssl-1.0.1f-wanboot.patch
PATCHFILES += openssl-1.0.1f-pkcs11-engine.patch
ENGINES += pk11
endif
@@ -142,13 +139,16 @@
# patch taken from https://hg.openindiana.org/upstream/oracle/userland-gate/
# To update the patch, do:
# cd files && ./update-t4-patch.sh OPENSSL_VERSION
-#
+
+# The upstream t4 engine patch depends on the wanboot one
+# so we will apply the wanboot patch even if we will not enable wanboot
+PATCHFILES.sparc.5.11 += openssl-1.0.1f-wanboot.patch
PATCHFILES.sparc.5.11 += openssl-1.0.1f-t4-engine.sparc.5.11.patch
PATCHFILES.sparc.5.11 += openssl-1.0.1e-t4-engine-sparcv9+vis.sparc.5.11.patch
-
PATCHFILES += $(PATCHFILES.$(GARCH).$(GAROSREL))
+
LICENSE = LICENSE
##### Build and installation information #####
Modified: csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1f-t4-engine.sparc.5.11.patch
===================================================================
--- csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1f-t4-engine.sparc.5.11.patch 2014-02-08 10:32:26 UTC (rev 22971)
+++ csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1f-t4-engine.sparc.5.11.patch 2014-02-08 11:25:31 UTC (rev 22972)
@@ -103,9 +103,10 @@
.global OPENSSL_cleanse
.align 32
OPENSSL_cleanse:
-@@ -398,5 +433,101 @@
+@@ -398,6 +433,102 @@
.size OPENSSL_cleanse,.-OPENSSL_cleanse
+ #ifndef _BOOT
+.global _sparcv9_vis1_instrument_bus
+.align 8
+_sparcv9_vis1_instrument_bus:
@@ -210,7 +211,7 @@
diff -ru openssl-1.0.1e/crypto/sparcv9cap.c openssl-1.0.1e/crypto/sparcv9cap.c
--- openssl-1.0.1e/crypto/sparcv9cap.c 2011-05-24 17:02:24.000000000 -0700
+++ openssl-1.0.1e/crypto/sparcv9cap.c 2011-07-27 10:48:17.817470000 -0700
-@@ -4,27 +4,52 @@
+@@ -4,31 +4,55 @@
#include <setjmp.h>
#include <signal.h>
#include <sys/time.h>
@@ -227,9 +228,13 @@
+#if defined(__GNUC__) && defined(__linux)
+__attribute__((visibility("hidden")))
+#endif
-+
+ #ifndef _BOOT
-static int OPENSSL_sparcv9cap_P=SPARCV9_TICK_PRIVILEGED;
+unsigned int OPENSSL_sparcv9cap_P[2]={SPARCV9_TICK_PRIVILEGED,0};
+ #else
+-static int OPENSSL_sparcv9cap_P = SPARCV9_VIS1;
++unsigned int OPENSSL_sparcv9cap_P[2]={SPARCV9_VIS1,0};
+ #endif
int bn_mul_mont(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp, const BN_ULONG *np,const BN_ULONG *n0, int num)
{
@@ -275,7 +280,7 @@
}
unsigned long _sparcv9_rdtick(void);
-@@ -36,10 +60,17 @@
+@@ -36,11 +60,18 @@
unsigned long _sparcv9_vis1_instrument(void);
void _sparcv9_vis2_probe(void);
void _sparcv9_fmadd_probe(void);
@@ -287,6 +292,7 @@
+size_t _sparcv9_vis1_instrument_bus2(unsigned int *,size_t,size_t);
+#endif
+ #ifndef _BOOT
unsigned long OPENSSL_rdtsc(void)
{
- if (OPENSSL_sparcv9cap_P&SPARCV9_TICK_PRIVILEGED)
@@ -316,9 +322,18 @@
+ else
+ return 0;
+ }
+ #endif
+
+ #if defined(_BOOT)
+@@ -58,7 +107,7 @@
+ */
+ void OPENSSL_cpuid_setup(void)
+ {
+- OPENSSL_sparcv9cap_P = SPARCV9_VIS1;
++ OPENSSL_sparcv9cap_P[0] = SPARCV9_VIS1;
+ }
- #if 0 && defined(__sun) && defined(__SVR4)
- /* This code path is disabled, because of incompatibility of
+ #elif 0 && defined(__sun) && defined(__SVR4)
@@ -85,11 +116,11 @@
if (!strcmp (name,"SUNW,UltraSPARC") ||
!strncmp(name,"SUNW,UltraSPARC-I",17)) /* covers II,III,IV */
@@ -2309,7 +2324,7 @@
===================================================================
diff -uNr openssl-1.0.1f/crypto/sparc_arch.h openssl-1.0.1f/crypto/sparc_arch.h
--- openssl-1.0.1f/crypto/sparc_arch.h 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1f/crypto/sparc_arch.h 2014-01-19 13:44:18.%N +0100
++++ openssl-1.0.1f/crypto/sparc_arch.h 2014-02-08 12:13:32.030166649 +0100
@@ -0,0 +1,101 @@
+#ifndef __SPARC_ARCH_H__
+#define __SPARC_ARCH_H__
@@ -2416,7 +2431,7 @@
===================================================================
diff -uNr openssl-1.0.1f/crypto/md5/asm/md5-sparcv9.pl openssl-1.0.1f/crypto/md5/asm/md5-sparcv9.pl
--- openssl-1.0.1f/crypto/md5/asm/md5-sparcv9.pl 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1f/crypto/md5/asm/md5-sparcv9.pl 2014-01-19 13:44:18.%N +0100
++++ openssl-1.0.1f/crypto/md5/asm/md5-sparcv9.pl 2014-02-08 12:13:32.030166649 +0100
@@ -0,0 +1,434 @@
+#!/usr/bin/env perl
+
@@ -2856,7 +2871,7 @@
===================================================================
diff -uNr openssl-1.0.1f/crypto/aes/asm/aest4-sparcv9.pl openssl-1.0.1f/crypto/aes/asm/aest4-sparcv9.pl
--- openssl-1.0.1f/crypto/aes/asm/aest4-sparcv9.pl 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1f/crypto/aes/asm/aest4-sparcv9.pl 2014-01-19 13:44:18.%N +0100
++++ openssl-1.0.1f/crypto/aes/asm/aest4-sparcv9.pl 2014-02-08 12:13:32.030166649 +0100
@@ -0,0 +1,902 @@
+#!/usr/bin/env perl
+
@@ -3764,7 +3779,7 @@
===================================================================
diff -uNr openssl-1.0.1f/crypto/des/asm/dest4-sparcv9.pl openssl-1.0.1f/crypto/des/asm/dest4-sparcv9.pl
--- openssl-1.0.1f/crypto/des/asm/dest4-sparcv9.pl 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1f/crypto/des/asm/dest4-sparcv9.pl 2014-01-19 13:44:18.%N +0100
++++ openssl-1.0.1f/crypto/des/asm/dest4-sparcv9.pl 2014-02-08 12:13:32.030166649 +0100
@@ -0,0 +1,602 @@
+#!/usr/bin/env perl
+
@@ -4372,7 +4387,7 @@
===================================================================
diff -uNr openssl-1.0.1f/crypto/perlasm/sparcv9_modes.pl openssl-1.0.1f/crypto/perlasm/sparcv9_modes.pl
--- openssl-1.0.1f/crypto/perlasm/sparcv9_modes.pl 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1f/crypto/perlasm/sparcv9_modes.pl 2014-01-19 13:44:18.%N +0100
++++ openssl-1.0.1f/crypto/perlasm/sparcv9_modes.pl 2014-02-08 12:13:32.030166649 +0100
@@ -0,0 +1,1680 @@
+#!/usr/bin/env perl
+
@@ -6058,7 +6073,7 @@
===================================================================
diff -uNr openssl-1.0.1f/crypto/bn/asm/vis3-mont.pl openssl-1.0.1f/crypto/bn/asm/vis3-mont.pl
--- openssl-1.0.1f/crypto/bn/asm/vis3-mont.pl 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1f/crypto/bn/asm/vis3-mont.pl 2014-01-19 13:44:18.%N +0100
++++ openssl-1.0.1f/crypto/bn/asm/vis3-mont.pl 2014-02-08 12:13:32.030166649 +0100
@@ -0,0 +1,373 @@
+#!/usr/bin/env perl
+
@@ -6437,7 +6452,7 @@
===================================================================
diff -uNr openssl-1.0.1f/crypto/bn/asm/sparcv9-gf2m.pl openssl-1.0.1f/crypto/bn/asm/sparcv9-gf2m.pl
--- openssl-1.0.1f/crypto/bn/asm/sparcv9-gf2m.pl 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1f/crypto/bn/asm/sparcv9-gf2m.pl 2014-01-19 13:44:18.%N +0100
++++ openssl-1.0.1f/crypto/bn/asm/sparcv9-gf2m.pl 2014-02-08 12:13:32.030166649 +0100
@@ -0,0 +1,198 @@
+#!/usr/bin/env perl
+#
@@ -6641,7 +6656,7 @@
===================================================================
diff -uNr openssl-1.0.1f/crypto/bn/asm/sparct4-mont.pl openssl-1.0.1f/crypto/bn/asm/sparct4-mont.pl
--- openssl-1.0.1f/crypto/bn/asm/sparct4-mont.pl 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1f/crypto/bn/asm/sparct4-mont.pl 2014-01-19 13:44:18.%N +0100
++++ openssl-1.0.1f/crypto/bn/asm/sparct4-mont.pl 2014-02-08 12:13:32.030166649 +0100
@@ -0,0 +1,1222 @@
+#!/usr/bin/env perl
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list