components/shim/patches/07-remove_elliptical.patch
author Ann Lai <ann.lai@oracle.com>
Tue, 01 Nov 2016 12:25:39 -0700
changeset 7222 37e367b978c0
permissions -rw-r--r--
23300489 Add shim to Userland PSARC 2015/563
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
7222
37e367b978c0 23300489 Add shim to Userland
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
     1
# Source: Internal
37e367b978c0 23300489 Add shim to Userland
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
     2
# Info: Written internally so this component can be built without elliptical 
37e367b978c0 23300489 Add shim to Userland
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
     3
# curve on Solaris.
37e367b978c0 23300489 Add shim to Userland
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
     4
# Status: This patch is offered internally.  This patch should no longer be
37e367b978c0 23300489 Add shim to Userland
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
     5
#        necessary when PSARC/2016/417 integrated.
37e367b978c0 23300489 Add shim to Userland
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
     6
37e367b978c0 23300489 Add shim to Userland
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
     7
--- ORIGINAL//Cryptlib/Include/openssl/ec.h	2016-06-24 03:08:38.274809074 +0000
37e367b978c0 23300489 Add shim to Userland
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
     8
+++ shim-0.9/Cryptlib/Include/openssl/ec.h	2016-06-29 01:53:09.700908601 +0000
37e367b978c0 23300489 Add shim to Userland
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
     9
@@ -75,7 +75,11 @@
37e367b978c0 23300489 Add shim to Userland
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    10
 # include <openssl/opensslconf.h>
37e367b978c0 23300489 Add shim to Userland
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    11
 
37e367b978c0 23300489 Add shim to Userland
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    12
 # ifdef OPENSSL_NO_EC
37e367b978c0 23300489 Add shim to Userland
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    13
-#  error EC is disabled.
37e367b978c0 23300489 Add shim to Userland
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    14
+#  ifndef __sun
37e367b978c0 23300489 Add shim to Userland
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    15
+#   error EC is disabled.
37e367b978c0 23300489 Add shim to Userland
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    16
+#  else
37e367b978c0 23300489 Add shim to Userland
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    17
+#   warning EC is disabled.
37e367b978c0 23300489 Add shim to Userland
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    18
+#  endif
37e367b978c0 23300489 Add shim to Userland
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    19
 # endif
37e367b978c0 23300489 Add shim to Userland
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    20
 
37e367b978c0 23300489 Add shim to Userland
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    21
 # include <openssl/asn1.h>
37e367b978c0 23300489 Add shim to Userland
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    22
37e367b978c0 23300489 Add shim to Userland
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    23
--- ORIGINAL//Cryptlib/Include/openssl/ecdh.h   2016-06-24 03:08:35.818258914 +0000
37e367b978c0 23300489 Add shim to Userland
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    24
+++ shim-0.9/Cryptlib/Include/openssl/ecdh.h    2016-06-29 02:03:12.091858470 +0000
37e367b978c0 23300489 Add shim to Userland
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    25
@@ -72,7 +72,11 @@
37e367b978c0 23300489 Add shim to Userland
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    26
 # include <openssl/opensslconf.h>
37e367b978c0 23300489 Add shim to Userland
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    27
37e367b978c0 23300489 Add shim to Userland
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    28
 # ifdef OPENSSL_NO_ECDH
37e367b978c0 23300489 Add shim to Userland
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    29
-#  error ECDH is disabled.
37e367b978c0 23300489 Add shim to Userland
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    30
+#  ifndef __sun
37e367b978c0 23300489 Add shim to Userland
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    31
+#   error ECDH is disabled.
37e367b978c0 23300489 Add shim to Userland
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    32
+#  else
37e367b978c0 23300489 Add shim to Userland
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    33
+#   warning ECDH is disabled.
37e367b978c0 23300489 Add shim to Userland
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    34
+#  endif
37e367b978c0 23300489 Add shim to Userland
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    35
 # endif
37e367b978c0 23300489 Add shim to Userland
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    36
37e367b978c0 23300489 Add shim to Userland
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    37
 # include <openssl/ec.h>
37e367b978c0 23300489 Add shim to Userland
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    38
37e367b978c0 23300489 Add shim to Userland
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    39
--- ORIGINAL//Cryptlib/Include/openssl/ecdsa.h  2016-06-24 03:08:37.043840450 +0000
37e367b978c0 23300489 Add shim to Userland
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    40
+++ shim-0.9/Cryptlib/Include/openssl/ecdsa.h   2016-06-29 02:05:18.658775097 +0000
37e367b978c0 23300489 Add shim to Userland
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    41
@@ -62,7 +62,11 @@
37e367b978c0 23300489 Add shim to Userland
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    42
 # include <openssl/opensslconf.h>
37e367b978c0 23300489 Add shim to Userland
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    43
37e367b978c0 23300489 Add shim to Userland
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    44
 # ifdef OPENSSL_NO_ECDSA
37e367b978c0 23300489 Add shim to Userland
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    45
-#  error ECDSA is disabled.
37e367b978c0 23300489 Add shim to Userland
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    46
+#  ifndef __sun
37e367b978c0 23300489 Add shim to Userland
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    47
+#   error ECDSA is disabled.
37e367b978c0 23300489 Add shim to Userland
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    48
+#  else
37e367b978c0 23300489 Add shim to Userland
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    49
+#   warning ECDSA is disabled.
37e367b978c0 23300489 Add shim to Userland
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    50
+#  endif
37e367b978c0 23300489 Add shim to Userland
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    51
 # endif
37e367b978c0 23300489 Add shim to Userland
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    52
37e367b978c0 23300489 Add shim to Userland
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    53
 # include <openssl/ec.h>