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/common/patches/045-openssl-usage.patch
author Ronald Jordan <ron.jordan@oracle.com>
Wed, 26 Oct 2016 13:19:33 -0700
branchs11u3-sru
changeset 7163 ee09edbd5876
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:
7163
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
     1
 
#
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
     2
 
# This patch fixes the usage bug: It shows '-ssl2' option even though it's not
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
     3
 
# available. The bug has been reported to the upstream: #3580.
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
     4
 
#
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
     5
 
--- openssl/apps/s_client.c.orig	Tue Sep 15 13:33:45 2015
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
     6
 
+++ openssl/apps/s_client.c	Tue Sep 15 13:34:26 2015
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
     7
 
@@ -376,7 +376,9 @@
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
     8
 
                " -srp_strength int - minimal length in bits for N (default %d).\n",
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
     9
 
                SRP_MINIMAL_N);
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
    10
 
 #endif
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
    11
 
+#ifndef OPENSSL_NO_SSL2
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
    12
 
     BIO_printf(bio_err, " -ssl2         - just use SSLv2\n");
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
    13
 
+#endif
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
    14
 
 #ifndef OPENSSL_NO_SSL3_METHOD
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
    15
 
     BIO_printf(bio_err, " -ssl3         - just use SSLv3\n");
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
    16
 
 #endif
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
    17
 
--- openssl/apps/s_server.c.orig	Tue Sep 15 13:33:58 2015
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
    18
 
+++ openssl/apps/s_server.c	Tue Sep 15 13:35:15 2015
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
    19
 
@@ -592,7 +592,9 @@
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
    20
 
     BIO_printf(bio_err,
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
    21
 
                " -srpuserseed string - A seed string for a default user salt.\n");
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
    22
 
 #endif
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
    23
 
+#ifndef OPENSSL_NO_SSL2
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
    24
 
     BIO_printf(bio_err, " -ssl2         - Just talk SSLv2\n");
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
    25
 
+#endif
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
    26
 
 #ifndef OPENSSL_NO_SSL3_METHOD
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
    27
 
     BIO_printf(bio_err, " -ssl3         - Just talk SSLv3\n");
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
    28
 
 #endif
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
    29
 
No differences encountered
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
    30
 
--- openssl/apps/s_time.c.orig	Tue Sep 15 13:33:53 2015
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
    31
 
+++ openssl/apps/s_time.c	Tue Sep 15 13:35:01 2015
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
    32
 
@@ -190,8 +190,12 @@
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
    33
 
            SSL_CONNECT_NAME);
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
    34
 
 #ifdef FIONBIO
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
    35
 
     printf("-nbio         - Run with non-blocking IO\n");
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
    36
 
+#ifndef OPENSSL_NO_SSL2
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
    37
 
     printf("-ssl2         - Just use SSLv2\n");
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
    38
 
+#endif
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
    39
 
+#ifndef OPENSSL_NO_SSL3_METHOD
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
    40
 
     printf("-ssl3         - Just use SSLv3\n");
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
    41
 
+#endif
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
    42
 
     printf("-bugs         - Turn on SSL bug compatibility\n");
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
    43
 
     printf("-new          - Just time new connections\n");
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
    44
 
     printf("-reuse        - Just time connection reuse\n");
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
    45
 
--- openssl/apps/ciphers.c.orig	Tue Sep 15 13:34:02 2015
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
    46
 
+++ openssl/apps/ciphers.c	Tue Sep 15 13:51:03 2015
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
    47
 
@@ -73,8 +73,12 @@
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
    48
 
     "usage: ciphers args\n",
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
    49
 
     " -v          - verbose mode, a textual listing of the SSL/TLS ciphers in OpenSSL\n",
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
    50
 
     " -V          - even more verbose\n",
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
    51
 
+#ifndef OPENSSL_NO_SSL2
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
    52
 
     " -ssl2       - SSL2 mode\n",
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
    53
 
+#endif
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
    54
 
+#ifndef OPENSSL_NO_SSL3_METHOD
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
    55
 
     " -ssl3       - SSL3 mode\n",
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
    56
 
+#endif
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
    57
 
     " -tls1       - TLS1 mode\n",
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
    58
 
     NULL
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
    59
 
 };
upstream/oracle/userland-gate