Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/openssl/openssl-1.0.1-fips-140/patches-post-config/opensslconf.patch
author Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
Fri, 14 Nov 2014 07:56:14 -0800
changeset 2207 64e8c961a4a2
parent 1692 dce38b815f7d
permissions -rw-r--r--
20018650 openssl-1.0.1-fips-140 x86 build tries to apply sparc patch to x86 file 19230646 "openssl speed -multi" fails with pkcs11 engine
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2207
64e8c961a4a2 20018650 openssl-1.0.1-fips-140 x86 build tries to apply sparc patch to x86 file
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents: 1692
diff changeset 
     1
 
--- /tmp/opensslconf.h	Fri Feb 11 15:36:12 2011
64e8c961a4a2 20018650 openssl-1.0.1-fips-140 x86 build tries to apply sparc patch to x86 file
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents: 1692
diff changeset 
     2
 
+++ openssl-1.0.0d/crypto/opensslconf.h	Fri Feb 11 16:58:36 2011
64e8c961a4a2 20018650 openssl-1.0.1-fips-140 x86 build tries to apply sparc patch to x86 file
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents: 1692
diff changeset 
     3
 
@@ -181,7 +181,11 @@
363
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
     4
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
     5
 
 #if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
     6
 
 #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
     7
 
+#if defined(__sparcv9) || defined(__x86_64)
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
     8
 
+#define ENGINESDIR "/lib/openssl/engines/64"
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
     9
 
+#else
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    10
 
 #define ENGINESDIR "/lib/openssl/engines"
2207
64e8c961a4a2 20018650 openssl-1.0.1-fips-140 x86 build tries to apply sparc patch to x86 file
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents: 1692
diff changeset 
    11
 
+#endif
1692
dce38b815f7d PSARC/2013/383 OpenSSL FIPS 140-2 version update
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents: 1586
diff changeset 
    12
 
 #define OPENSSLDIR "/etc/openssl"
363
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    13
 
 #endif
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    14
 
 #endif
2207
64e8c961a4a2 20018650 openssl-1.0.1-fips-140 x86 build tries to apply sparc patch to x86 file
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents: 1692
diff changeset 
    15
 
@@ -228,21 +232,39 @@
363
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    16
 
 /* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    17
 
  * %20 speed up (longs are 8 bytes, int's are 4). */
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    18
 
 #ifndef DES_LONG
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    19
 
+#if defined(__sparcv9) || defined(__x86_64)
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    20
 
+#define DES_LONG unsigned int
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    21
 
+#else
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    22
 
 #define DES_LONG unsigned long
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    23
 
 #endif
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    24
 
 #endif
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    25
 
+#endif
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    26
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    27
 
 #if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H)
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    28
 
 #define CONFIG_HEADER_BN_H
2207
64e8c961a4a2 20018650 openssl-1.0.1-fips-140 x86 build tries to apply sparc patch to x86 file
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents: 1692
diff changeset 
    29
 
+/*
64e8c961a4a2 20018650 openssl-1.0.1-fips-140 x86 build tries to apply sparc patch to x86 file
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents: 1692
diff changeset 
    30
 
+ * OpenSSL revision 1.521 from 2005-12-15 in OpenSSL_1_0_0-stable branch changed
64e8c961a4a2 20018650 openssl-1.0.1-fips-140 x86 build tries to apply sparc patch to x86 file
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents: 1692
diff changeset 
    31
 
+ * 64 bit sparcv9 configuration from SIXTY_FOUR_BIT_LONG to BN_LLONG.
64e8c961a4a2 20018650 openssl-1.0.1-fips-140 x86 build tries to apply sparc patch to x86 file
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents: 1692
diff changeset 
    32
 
+ */
64e8c961a4a2 20018650 openssl-1.0.1-fips-140 x86 build tries to apply sparc patch to x86 file
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents: 1692
diff changeset 
    33
 
+#if defined(__x86_64)
363
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    34
 
+#undef BN_LLONG
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    35
 
+#else
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    36
 
 #define BN_LLONG
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    37
 
+#endif
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    38
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    39
 
 /* Should we define BN_DIV2W here? */
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    40
1586
2d3ec080d6a3 PSARC/2013/383 OpenSSL FIPS 140-2 version update
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents: 363
diff changeset 
    41
 
 /* Only one for the following should be defined */
2207
64e8c961a4a2 20018650 openssl-1.0.1-fips-140 x86 build tries to apply sparc patch to x86 file
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents: 1692
diff changeset 
    42
 
+#if defined(__x86_64)
363
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    43
 
+#define SIXTY_FOUR_BIT_LONG
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    44
 
+#undef THIRTY_TWO_BIT
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    45
 
+#else
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    46
 
 #undef SIXTY_FOUR_BIT_LONG
2207
64e8c961a4a2 20018650 openssl-1.0.1-fips-140 x86 build tries to apply sparc patch to x86 file
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents: 1692
diff changeset 
    47
 
 #undef SIXTY_FOUR_BIT
363
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    48
 
 #define THIRTY_TWO_BIT
1586
2d3ec080d6a3 PSARC/2013/383 OpenSSL FIPS 140-2 version update
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents: 363
diff changeset 
    49
 
 #endif
363
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    50
 
+#undef SIXTY_FOUR_BIT
2207
64e8c961a4a2 20018650 openssl-1.0.1-fips-140 x86 build tries to apply sparc patch to x86 file
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents: 1692
diff changeset 
    51
 
+#endif
1586
2d3ec080d6a3 PSARC/2013/383 OpenSSL FIPS 140-2 version update
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents: 363
diff changeset 
    52
2d3ec080d6a3 PSARC/2013/383 OpenSSL FIPS 140-2 version update
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents: 363
diff changeset 
    53
 
 #if defined(HEADER_RC4_LOCL_H) && !defined(CONFIG_HEADER_RC4_LOCL_H)
2d3ec080d6a3 PSARC/2013/383 OpenSSL FIPS 140-2 version update
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents: 363
diff changeset 
    54
 
 #define CONFIG_HEADER_RC4_LOCL_H
upstream/oracle/userland-gate