author | Ron Jordan <ron.jordan@oracle.com> |
Tue, 24 Mar 2015 20:05:38 -0700 | |
branch | s11u2-sru8-backport |
changeset 4020 | 8e3f49e23eaa |
parent 2930 | 4177d9c0b142 |
permissions | -rw-r--r-- |
4020
8e3f49e23eaa
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
2930
diff
changeset
|
1 |
# |
8e3f49e23eaa
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
2930
diff
changeset
|
2 |
# This patch file adds the Solaris's pkcs11 engine. |
8e3f49e23eaa
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
2930
diff
changeset
|
3 |
# This is Solaris-specific (developed in house): not suitable for upstream. |
8e3f49e23eaa
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
2930
diff
changeset
|
4 |
# |
363
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
5 |
--- /tmp/Configure Fri Feb 11 14:40:39 2011 |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
6 |
+++ openssl-1.0.0d/Configure Fri Feb 11 14:41:36 2011 |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
7 |
@@ -10,7 +10,7 @@ |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
8 |
|
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
9 |
# see INSTALL for instructions. |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
10 |
|
2593
b92e6df5eaf0
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
363
diff
changeset
|
11 |
-my $usage="Usage: Configure [no-<cipher> ...] [enable-<cipher> ...] [experimental-<cipher> ...] [-Dxxx] [-lxxx] [-Lxxx] [-fxxx] [-Kxxx] [no-hw-xxx|no-hw] [[no-]threads] [[no-]shared] [[no-]zlib|zlib-dynamic] [no-asm] [no-dso] [no-krb5] [sctp] [386] [--prefix=DIR] [--openssldir=OPENSSLDIR] [--with-xxx[=vvv]] [--test-sanity] os/compiler[:flags]\n"; |
b92e6df5eaf0
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
363
diff
changeset
|
12 |
+my $usage="Usage: Configure --pk11-libname=PK11_LIB_LOCATION [no-<cipher> ...] [enable-<cipher> ...] [experimental-<cipher> ...] [-Dxxx] [-lxxx] [-Lxxx] [-fxxx] [-Kxxx] [no-hw-xxx|no-hw] [[no-]threads] [[no-]shared] [[no-]zlib|zlib-dynamic] [no-asm] [no-dso] [no-krb5] [sctp] [386] [--prefix=DIR] [--openssldir=OPENSSLDIR] [--with-xxx[=vvv]] [--test-sanity] os/compiler[:flags]\n"; |
363
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
13 |
|
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
14 |
# Options: |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
15 |
# |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
16 |
@@ -19,6 +19,9 @@ |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
17 |
# --prefix prefix for the OpenSSL include, lib and bin directories |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
18 |
# (Default: the OPENSSLDIR directory) |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
19 |
# |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
20 |
+# --pk11-libname PKCS#11 library name. |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
21 |
+# (Default: none) |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
22 |
+# |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
23 |
# --install_prefix Additional prefix for package builders (empty by |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
24 |
# default). This needn't be set in advance, you can |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
25 |
# just as well use "make INSTALL_PREFIX=/whatever install". |
2593
b92e6df5eaf0
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
363
diff
changeset
|
26 |
@@ -657,6 +661,9 @@ |
363
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
27 |
my $idx_arflags = $idx++; |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
28 |
my $idx_multilib = $idx++; |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
29 |
|
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
30 |
+# PKCS#11 engine patch |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
31 |
+my $pk11_libname=""; |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
32 |
+ |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
33 |
my $prefix=""; |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
34 |
my $libdir=""; |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
35 |
my $openssldir=""; |
4020
8e3f49e23eaa
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
2930
diff
changeset
|
36 |
@@ -882,6 +888,10 @@ |
2593
b92e6df5eaf0
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
363
diff
changeset
|
37 |
$_ =~ s/%([0-9a-f]{1,2})/chr(hex($1))/gei; |
b92e6df5eaf0
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
363
diff
changeset
|
38 |
$flags.=$_." "; |
b92e6df5eaf0
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
363
diff
changeset
|
39 |
} |
b92e6df5eaf0
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
363
diff
changeset
|
40 |
+ elsif (/^--pk11-libname=(.*)$/) |
b92e6df5eaf0
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
363
diff
changeset
|
41 |
+ { |
b92e6df5eaf0
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
363
diff
changeset
|
42 |
+ $pk11_libname=$1; |
b92e6df5eaf0
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
363
diff
changeset
|
43 |
+ } |
b92e6df5eaf0
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
363
diff
changeset
|
44 |
elsif (/^--prefix=(.*)$/) |
b92e6df5eaf0
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
363
diff
changeset
|
45 |
{ |
b92e6df5eaf0
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
363
diff
changeset
|
46 |
$prefix=$1; |
4020
8e3f49e23eaa
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
2930
diff
changeset
|
47 |
@@ -1049,6 +1059,13 @@ |
363
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
48 |
exit 0; |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
49 |
} |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
50 |
|
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
51 |
+if (! $pk11_libname) |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
52 |
+ { |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
53 |
+ print STDERR "You must set --pk11-libname for PKCS#11 library.\n"; |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
54 |
+ print STDERR "See README.pkcs11 for more information.\n"; |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
55 |
+ exit 1; |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
56 |
+ } |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
57 |
+ |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
58 |
if ($target =~ m/^CygWin32(-.*)$/) { |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
59 |
$target = "Cygwin".$1; |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
60 |
} |
4020
8e3f49e23eaa
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
2930
diff
changeset
|
61 |
@@ -1215,6 +1232,8 @@ |
363
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
62 |
if ($flags ne "") { $cflags="$flags$cflags"; } |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
63 |
else { $no_user_cflags=1; } |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
64 |
|
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
65 |
+$cflags="-DPK11_LIB_LOCATION=\"$pk11_libname\" $cflags"; |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
66 |
+ |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
67 |
# Kerberos settings. The flavor must be provided from outside, either through |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
68 |
# the script "config" or manually. |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
69 |
if (!$no_krb5) |
4020
8e3f49e23eaa
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
2930
diff
changeset
|
70 |
@@ -1604,6 +1623,7 @@ |
363
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
71 |
s/^VERSION=.*/VERSION=$version/; |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
72 |
s/^MAJOR=.*/MAJOR=$major/; |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
73 |
s/^MINOR=.*/MINOR=$minor/; |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
74 |
+ s/^PK11_LIB_LOCATION=.*/PK11_LIB_LOCATION=$pk11_libname/; |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
75 |
s/^SHLIB_VERSION_NUMBER=.*/SHLIB_VERSION_NUMBER=$shlib_version_number/; |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
76 |
s/^SHLIB_VERSION_HISTORY=.*/SHLIB_VERSION_HISTORY=$shlib_version_history/; |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
77 |
s/^SHLIB_MAJOR=.*/SHLIB_MAJOR=$shlib_major/; |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
78 |
--- /tmp/Makefile.org Fri Feb 11 14:41:54 2011 |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
79 |
+++ openssl-1.0.0d/Makefile.org Fri Feb 11 14:38:01 2011 |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
80 |
@@ -26,6 +26,9 @@ |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
81 |
INSTALL_PREFIX= |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
82 |
INSTALLTOP=/usr/local/ssl |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
83 |
|
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
84 |
+# You must set this through --pk11-libname configure option. |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
85 |
+PK11_LIB_LOCATION= |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
86 |
+ |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
87 |
# Do not edit this manually. Use Configure --openssldir=DIR do change this! |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
88 |
OPENSSLDIR=/usr/local/ssl |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
89 |
|
4020
8e3f49e23eaa
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
2930
diff
changeset
|
90 |
--- /tmp/Makefile Mon Feb 14 14:59:22 2011 |
8e3f49e23eaa
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
2930
diff
changeset
|
91 |
+++ openssl-1.0.0d/engines/Makefile Mon Feb 14 15:00:35 2011 |
2930
4177d9c0b142
17361355 Remove devcrypto engine
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
2593
diff
changeset
|
92 |
@@ -26,7 +26,8 @@ |
4177d9c0b142
17361355 Remove devcrypto engine
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
2593
diff
changeset
|
93 |
APPS= |
4177d9c0b142
17361355 Remove devcrypto engine
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
2593
diff
changeset
|
94 |
|
4177d9c0b142
17361355 Remove devcrypto engine
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
2593
diff
changeset
|
95 |
LIB=$(TOP)/libcrypto.a |
4177d9c0b142
17361355 Remove devcrypto engine
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
2593
diff
changeset
|
96 |
-LIBNAMES= 4758cca aep atalla cswift gmp chil nuron sureware ubsec padlock capi |
4177d9c0b142
17361355 Remove devcrypto engine
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
2593
diff
changeset
|
97 |
+LIBNAMES= 4758cca aep atalla cswift gmp chil nuron sureware ubsec padlock capi \ |
4177d9c0b142
17361355 Remove devcrypto engine
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
2593
diff
changeset
|
98 |
+ pk11 |
4177d9c0b142
17361355 Remove devcrypto engine
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
2593
diff
changeset
|
99 |
|
4177d9c0b142
17361355 Remove devcrypto engine
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
2593
diff
changeset
|
100 |
LIBSRC= e_4758cca.c \ |
4177d9c0b142
17361355 Remove devcrypto engine
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
2593
diff
changeset
|
101 |
e_aep.c \ |
4177d9c0b142
17361355 Remove devcrypto engine
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
2593
diff
changeset
|
102 |
@@ -38,7 +39,8 @@ |
4177d9c0b142
17361355 Remove devcrypto engine
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
2593
diff
changeset
|
103 |
e_sureware.c \ |
4177d9c0b142
17361355 Remove devcrypto engine
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
2593
diff
changeset
|
104 |
e_ubsec.c \ |
4177d9c0b142
17361355 Remove devcrypto engine
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
2593
diff
changeset
|
105 |
e_padlock.c \ |
4177d9c0b142
17361355 Remove devcrypto engine
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
2593
diff
changeset
|
106 |
- e_capi.c |
4177d9c0b142
17361355 Remove devcrypto engine
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
2593
diff
changeset
|
107 |
+ e_capi.c \ |
4177d9c0b142
17361355 Remove devcrypto engine
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
2593
diff
changeset
|
108 |
+ e_pk11.c |
4177d9c0b142
17361355 Remove devcrypto engine
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
2593
diff
changeset
|
109 |
LIBOBJ= e_4758cca.o \ |
4177d9c0b142
17361355 Remove devcrypto engine
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
2593
diff
changeset
|
110 |
e_aep.o \ |
4177d9c0b142
17361355 Remove devcrypto engine
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
2593
diff
changeset
|
111 |
e_atalla.o \ |
4177d9c0b142
17361355 Remove devcrypto engine
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
2593
diff
changeset
|
112 |
@@ -49,7 +51,8 @@ |
4177d9c0b142
17361355 Remove devcrypto engine
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
2593
diff
changeset
|
113 |
e_sureware.o \ |
4177d9c0b142
17361355 Remove devcrypto engine
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
2593
diff
changeset
|
114 |
e_ubsec.o \ |
4177d9c0b142
17361355 Remove devcrypto engine
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
2593
diff
changeset
|
115 |
e_padlock.o \ |
4177d9c0b142
17361355 Remove devcrypto engine
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
2593
diff
changeset
|
116 |
- e_capi.o |
4177d9c0b142
17361355 Remove devcrypto engine
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
2593
diff
changeset
|
117 |
+ e_capi.o \ |
4177d9c0b142
17361355 Remove devcrypto engine
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
2593
diff
changeset
|
118 |
+ e_pk11.o |
4177d9c0b142
17361355 Remove devcrypto engine
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
2593
diff
changeset
|
119 |
|
363
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
120 |
SRC= $(LIBSRC) |
2930
4177d9c0b142
17361355 Remove devcrypto engine
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
2593
diff
changeset
|
121 |
|
4177d9c0b142
17361355 Remove devcrypto engine
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
2593
diff
changeset
|
122 |
@@ -63,7 +66,8 @@ |
4177d9c0b142
17361355 Remove devcrypto engine
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
2593
diff
changeset
|
123 |
e_nuron_err.c e_nuron_err.h \ |
4177d9c0b142
17361355 Remove devcrypto engine
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
2593
diff
changeset
|
124 |
e_sureware_err.c e_sureware_err.h \ |
4177d9c0b142
17361355 Remove devcrypto engine
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
2593
diff
changeset
|
125 |
e_ubsec_err.c e_ubsec_err.h \ |
4177d9c0b142
17361355 Remove devcrypto engine
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
2593
diff
changeset
|
126 |
- e_capi_err.c e_capi_err.h |
4177d9c0b142
17361355 Remove devcrypto engine
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
2593
diff
changeset
|
127 |
+ e_capi_err.c e_capi_err.h \ |
4177d9c0b142
17361355 Remove devcrypto engine
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
2593
diff
changeset
|
128 |
+ e_pk11.h e_pk11_uri.h e_pk11_err.h e_pk11_pub.c e_pk11_uri.c e_pk11_err.c |
4177d9c0b142
17361355 Remove devcrypto engine
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
2593
diff
changeset
|
129 |
|
4177d9c0b142
17361355 Remove devcrypto engine
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
2593
diff
changeset
|
130 |
ALL= $(GENERAL) $(SRC) $(HEADER) |
4177d9c0b142
17361355 Remove devcrypto engine
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
2593
diff
changeset
|
131 |
|
4177d9c0b142
17361355 Remove devcrypto engine
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
2593
diff
changeset
|
132 |
@@ -78,7 +82,7 @@ |
4177d9c0b142
17361355 Remove devcrypto engine
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
2593
diff
changeset
|
133 |
for l in $(LIBNAMES); do \ |
4177d9c0b142
17361355 Remove devcrypto engine
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
2593
diff
changeset
|
134 |
$(MAKE) -f ../Makefile.shared -e \ |
4177d9c0b142
17361355 Remove devcrypto engine
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
2593
diff
changeset
|
135 |
LIBNAME=$$l LIBEXTRAS=e_$$l.o \ |
4177d9c0b142
17361355 Remove devcrypto engine
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
2593
diff
changeset
|
136 |
- LIBDEPS='-L.. -lcrypto $(EX_LIBS)' \ |
4177d9c0b142
17361355 Remove devcrypto engine
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
2593
diff
changeset
|
137 |
+ LIBDEPS='-L.. -lcrypto -lcryptoutil $(EX_LIBS)' \ |
4177d9c0b142
17361355 Remove devcrypto engine
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
2593
diff
changeset
|
138 |
link_o.$(SHLIB_TARGET); \ |
4177d9c0b142
17361355 Remove devcrypto engine
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
2593
diff
changeset
|
139 |
done; \ |
4177d9c0b142
17361355 Remove devcrypto engine
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
2593
diff
changeset
|
140 |
else \ |
4020
8e3f49e23eaa
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
2930
diff
changeset
|
141 |
--- crypto/engine/eng_all.c Thu Sep 5 12:59:50 2013 |
8e3f49e23eaa
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
2930
diff
changeset
|
142 |
+++ openssl-1.0.1e/crypto/engine/eng_all.c Thu Sep 5 12:59:50 2013 |
8e3f49e23eaa
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
2930
diff
changeset
|
143 |
@@ -60,6 +60,16 @@ |
2930
4177d9c0b142
17361355 Remove devcrypto engine
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
2593
diff
changeset
|
144 |
#include "cryptlib.h" |
4177d9c0b142
17361355 Remove devcrypto engine
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
2593
diff
changeset
|
145 |
#include "eng_int.h" |
4020
8e3f49e23eaa
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
2930
diff
changeset
|
146 |
|
2930
4177d9c0b142
17361355 Remove devcrypto engine
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
2593
diff
changeset
|
147 |
+/* |
4177d9c0b142
17361355 Remove devcrypto engine
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
2593
diff
changeset
|
148 |
+ * pkcs11 engine no longer is a built-in engine, and ENGINE_load_pk11() needs to be |
4020
8e3f49e23eaa
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
2930
diff
changeset
|
149 |
+ * defined in libcrypto.so for ssh. Instead of load pkcs11 engine, it load dynamic |
2930
4177d9c0b142
17361355 Remove devcrypto engine
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
2593
diff
changeset
|
150 |
+ * engines. |
4177d9c0b142
17361355 Remove devcrypto engine
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
2593
diff
changeset
|
151 |
+ */ |
4177d9c0b142
17361355 Remove devcrypto engine
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
2593
diff
changeset
|
152 |
+void ENGINE_load_pk11(void) |
4177d9c0b142
17361355 Remove devcrypto engine
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
2593
diff
changeset
|
153 |
+ { |
4177d9c0b142
17361355 Remove devcrypto engine
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
2593
diff
changeset
|
154 |
+ ENGINE_load_dynamic(); |
4177d9c0b142
17361355 Remove devcrypto engine
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
2593
diff
changeset
|
155 |
+ } |
4177d9c0b142
17361355 Remove devcrypto engine
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
2593
diff
changeset
|
156 |
+ |
4177d9c0b142
17361355 Remove devcrypto engine
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
2593
diff
changeset
|
157 |
void ENGINE_load_builtin_engines(void) |
4020
8e3f49e23eaa
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
2930
diff
changeset
|
158 |
{ |
8e3f49e23eaa
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
2930
diff
changeset
|
159 |
/* Some ENGINEs need this */ |
8e3f49e23eaa
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
2930
diff
changeset
|
160 |
--- crypto/dso/dso_lib.c Thu Sep 5 12:59:50 2013 |
8e3f49e23eaa
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
2930
diff
changeset
|
161 |
+++ openssl-1.0.1e/crypto/dso/dso_lib.c Thu Sep 5 12:59:50 2013 |
8e3f49e23eaa
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
2930
diff
changeset
|
162 |
@@ -396,6 +396,24 @@ |
8e3f49e23eaa
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
2930
diff
changeset
|
163 |
DSOerr(DSO_F_DSO_CONVERT_FILENAME, DSO_R_NO_FILENAME); |
8e3f49e23eaa
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
2930
diff
changeset
|
164 |
return (NULL); |
8e3f49e23eaa
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
2930
diff
changeset
|
165 |
} |
8e3f49e23eaa
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
2930
diff
changeset
|
166 |
+ /* |
8e3f49e23eaa
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
2930
diff
changeset
|
167 |
+ * For pkcs11 engine, use libpk11.so (instead of libpkcs11.so) to |
8e3f49e23eaa
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
2930
diff
changeset
|
168 |
+ * avoid the name collision with PKCS#11 library. |
8e3f49e23eaa
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
2930
diff
changeset
|
169 |
+ */ |
8e3f49e23eaa
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
2930
diff
changeset
|
170 |
+ if (strcmp(filename, "pkcs11") == 0) { |
8e3f49e23eaa
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
2930
diff
changeset
|
171 |
+#ifdef _LP64 |
8e3f49e23eaa
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
2930
diff
changeset
|
172 |
+ static const char fullpath[] = "/lib/openssl/engines/64/libpk11.so"; |
2930
4177d9c0b142
17361355 Remove devcrypto engine
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
2593
diff
changeset
|
173 |
+#else |
4020
8e3f49e23eaa
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
2930
diff
changeset
|
174 |
+ static const char fullpath[] = "/lib/openssl/engines/libpk11.so"; |
363
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
175 |
+#endif |
4020
8e3f49e23eaa
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
2930
diff
changeset
|
176 |
+ result = OPENSSL_malloc(strlen(fullpath) + 1); |
8e3f49e23eaa
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
2930
diff
changeset
|
177 |
+ if(result == NULL) { |
8e3f49e23eaa
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
2930
diff
changeset
|
178 |
+ DSOerr(DSO_F_DSO_CONVERT_FILENAME, ERR_R_MALLOC_FAILURE); |
8e3f49e23eaa
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
2930
diff
changeset
|
179 |
+ return(NULL); |
8e3f49e23eaa
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
2930
diff
changeset
|
180 |
+ } |
8e3f49e23eaa
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
2930
diff
changeset
|
181 |
+ BUF_strlcpy(result, fullpath, strlen(fullpath) + 1); |
8e3f49e23eaa
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
2930
diff
changeset
|
182 |
+ return (result); |
8e3f49e23eaa
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
2930
diff
changeset
|
183 |
+ } |
8e3f49e23eaa
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
2930
diff
changeset
|
184 |
if ((dso->flags & DSO_FLAG_NO_NAME_TRANSLATION) == 0) { |
8e3f49e23eaa
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
2930
diff
changeset
|
185 |
if (dso->name_converter != NULL) |
8e3f49e23eaa
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
2930
diff
changeset
|
186 |
result = dso->name_converter(dso, filename); |
2930
4177d9c0b142
17361355 Remove devcrypto engine
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
2593
diff
changeset
|
187 |
--- /tmp/engine.h Fri Feb 11 14:46:24 2011 |
4177d9c0b142
17361355 Remove devcrypto engine
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
2593
diff
changeset
|
188 |
+++ openssl-1.0.0d/crypto/engine/engine.h Fri Feb 11 14:47:32 2011 |
4020
8e3f49e23eaa
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
2930
diff
changeset
|
189 |
@@ -413,6 +413,7 @@ |
8e3f49e23eaa
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
2930
diff
changeset
|
190 |
# endif |
8e3f49e23eaa
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
2930
diff
changeset
|
191 |
# endif |
363
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
192 |
void ENGINE_load_cryptodev(void); |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
193 |
+void ENGINE_load_pk11(void); |
2593
b92e6df5eaf0
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
363
diff
changeset
|
194 |
void ENGINE_load_rsax(void); |
b92e6df5eaf0
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
363
diff
changeset
|
195 |
void ENGINE_load_rdrand(void); |
363
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
196 |
void ENGINE_load_builtin_engines(void); |