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-fips-140/patches-post-config/opensslconf.patch
author Ronald Jordan <ron.jordan@oracle.com>
Wed, 26 Oct 2016 13:19:33 -0700
branchs11u3-sru
changeset 7163 ee09edbd5876
parent 3483 components/openssl/openssl-1.0.1-fips-140/patches-post-config/opensslconf.patch@a09a43e54a30
permissions -rw-r--r--
24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2 20358335 memory leak in libcrypto 21297601 32-bit FIPS openssl(1) should link to the mediator link 21791492 Workaround to suppress the link check error should be removed 22021385 openssl ts sub-command dumps core 22021787 openssl s_client sub-command dumps core 22445522 openssl makefile contains undeclared dependency on rsync 22859741 Update OpenSSL FIPS module to 2.0.12 23230454 Use DES3 for pkcs12 certificate encryption 23285559 ssh libcrypto`solaris_locking_setup() atfork handler calls malloc() 24377801 solaris_dynlock_create() should check for a ret val of 0 from pthread_mutex_init 24943813 problem in LIBRARY/OPENSSL
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3483
a09a43e54a30 20018650 openssl-1.0.1-fips-140 x86 build tries to apply sparc patch to x86 file
Ivo Raisr <ivo.raisr@oracle.com>
parents: 2972
diff changeset 
     1
 
--- /tmp/opensslconf.h	Fri Feb 11 15:36:12 2011
a09a43e54a30 20018650 openssl-1.0.1-fips-140 x86 build tries to apply sparc patch to x86 file
Ivo Raisr <ivo.raisr@oracle.com>
parents: 2972
diff changeset 
     2
 
+++ openssl-1.0.0d/crypto/opensslconf.h	Fri Feb 11 16:58:36 2011
a09a43e54a30 20018650 openssl-1.0.1-fips-140 x86 build tries to apply sparc patch to x86 file
Ivo Raisr <ivo.raisr@oracle.com>
parents: 2972
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"
3483
a09a43e54a30 20018650 openssl-1.0.1-fips-140 x86 build tries to apply sparc patch to x86 file
Ivo Raisr <ivo.raisr@oracle.com>
parents: 2972
diff changeset 
    11
 
+#endif
2972
60456e7be821 PSARC/2013/383 OpenSSL FIPS 140-2 version update
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents: 2921
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
3483
a09a43e54a30 20018650 openssl-1.0.1-fips-140 x86 build tries to apply sparc patch to x86 file
Ivo Raisr <ivo.raisr@oracle.com>
parents: 2972
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
3483
a09a43e54a30 20018650 openssl-1.0.1-fips-140 x86 build tries to apply sparc patch to x86 file
Ivo Raisr <ivo.raisr@oracle.com>
parents: 2972
diff changeset 
    29
 
+/*
a09a43e54a30 20018650 openssl-1.0.1-fips-140 x86 build tries to apply sparc patch to x86 file
Ivo Raisr <ivo.raisr@oracle.com>
parents: 2972
diff changeset 
    30
 
+ * OpenSSL revision 1.521 from 2005-12-15 in OpenSSL_1_0_0-stable branch changed
a09a43e54a30 20018650 openssl-1.0.1-fips-140 x86 build tries to apply sparc patch to x86 file
Ivo Raisr <ivo.raisr@oracle.com>
parents: 2972
diff changeset 
    31
 
+ * 64 bit sparcv9 configuration from SIXTY_FOUR_BIT_LONG to BN_LLONG.
a09a43e54a30 20018650 openssl-1.0.1-fips-140 x86 build tries to apply sparc patch to x86 file
Ivo Raisr <ivo.raisr@oracle.com>
parents: 2972
diff changeset 
    32
 
+ */
a09a43e54a30 20018650 openssl-1.0.1-fips-140 x86 build tries to apply sparc patch to x86 file
Ivo Raisr <ivo.raisr@oracle.com>
parents: 2972
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
2921
8da1e7689d13 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 */
3483
a09a43e54a30 20018650 openssl-1.0.1-fips-140 x86 build tries to apply sparc patch to x86 file
Ivo Raisr <ivo.raisr@oracle.com>
parents: 2972
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
3483
a09a43e54a30 20018650 openssl-1.0.1-fips-140 x86 build tries to apply sparc patch to x86 file
Ivo Raisr <ivo.raisr@oracle.com>
parents: 2972
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
2921
8da1e7689d13 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
3483
a09a43e54a30 20018650 openssl-1.0.1-fips-140 x86 build tries to apply sparc patch to x86 file
Ivo Raisr <ivo.raisr@oracle.com>
parents: 2972
diff changeset 
    51
 
+#endif
2921
8da1e7689d13 PSARC/2013/383 OpenSSL FIPS 140-2 version update
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents: 363
diff changeset 
    52
8da1e7689d13 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)
8da1e7689d13 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