author | jenny.yung@oracle.com <jenny.yung@oracle.com> |
Wed, 15 Jan 2014 11:24:11 -0800 | |
branch | s11-update |
changeset 2901 | 5096530f204e |
parent 363 | 9c0cad004039 |
permissions | -rw-r--r-- |
363
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
1 |
diff -ruN ../a/openssl-0.9.8o/Configure openssl-0.9.8o/Configure |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
2 |
--- ../a/openssl-0.9.8o/Configure 2010-05-20 10:36:23.000000000 -0700 |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
3 |
+++ openssl-0.9.8o/Configure 2010-09-22 18:32:18.922795700 -0700 |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
4 |
@@ -12,7 +12,7 @@ |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
5 |
|
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
6 |
# see INSTALL for instructions. |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
7 |
|
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
8 |
-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] [enable-montasm] [no-asm] [no-dso] [no-krb5] [386] [--prefix=DIR] [--openssldir=OPENSSLDIR] [--with-xxx[=vvv]] [--test-sanity] os/compiler[:flags]\n"; |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
9 |
+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] [enable-montasm] [no-asm] [no-dso] [no-krb5] [386] [--prefix=DIR] [--openssldir=OPENSSLDIR] [--with-xxx[=vvv]] [--test-sanity] os/compiler[:flags]\n"; |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
10 |
|
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
11 |
# Options: |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
12 |
# |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
13 |
@@ -21,6 +21,9 @@ |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
14 |
# --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
|
15 |
# (Default: the OPENSSLDIR directory) |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
16 |
# |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
17 |
+# --pk11-libname PKCS#11 library name. |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
18 |
+# (Default: none) |
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 |
# --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
|
21 |
# 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
|
22 |
# just as well use "make INSTALL_PREFIX=/whatever install". |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
23 |
@@ -587,6 +590,9 @@ |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
24 |
my $idx_ranlib = $idx++; |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
25 |
my $idx_arflags = $idx++; |
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 |
+# PKCS#11 engine patch |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
28 |
+my $pk11_libname=""; |
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 |
my $prefix=""; |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
31 |
my $libdir=""; |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
32 |
my $openssldir=""; |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
33 |
@@ -825,6 +831,10 @@ |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
34 |
{ |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
35 |
$flags.=$_." "; |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
36 |
} |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
37 |
+ elsif (/^--pk11-libname=(.*)$/) |
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 |
+ $pk11_libname=$1; |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
40 |
+ } |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
41 |
elsif (/^--prefix=(.*)$/) |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
42 |
{ |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
43 |
$prefix=$1; |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
44 |
@@ -960,6 +970,13 @@ |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
45 |
exit 0; |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
46 |
} |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
47 |
|
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
48 |
+if (! $pk11_libname) |
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 |
+ 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
|
51 |
+ 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
|
52 |
+ exit 1; |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
53 |
+ } |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
54 |
+ |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
55 |
if ($target =~ m/^CygWin32(-.*)$/) { |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
56 |
$target = "Cygwin".$1; |
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 |
@@ -1126,6 +1143,8 @@ |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
59 |
if ($flags ne "") { $cflags="$flags$cflags"; } |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
60 |
else { $no_user_cflags=1; } |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
61 |
|
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
62 |
+$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
|
63 |
+ |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
64 |
# 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
|
65 |
# the script "config" or manually. |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
66 |
if (!$no_krb5) |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
67 |
@@ -1489,6 +1508,7 @@ |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
68 |
s/^VERSION=.*/VERSION=$version/; |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
69 |
s/^MAJOR=.*/MAJOR=$major/; |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
70 |
s/^MINOR=.*/MINOR=$minor/; |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
71 |
+ 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
|
72 |
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
|
73 |
s/^SHLIB_VERSION_HISTORY=.*/SHLIB_VERSION_HISTORY=$shlib_version_history/; |
2901
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
74 |
s/^SHLIB_MAJOR=.*/SHLIB_MAJOR=$shlib_major/; |
363
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
75 |
diff -ruN ../a/openssl-0.9.8o/Makefile.org openssl-0.9.8o/Makefile.org |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
76 |
--- ../a/openssl-0.9.8o/Makefile.org 2010-01-27 08:06:36.000000000 -0800 |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
77 |
+++ openssl-0.9.8o/Makefile.org 2010-09-22 18:32:19.152576100 -0700 |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
78 |
@@ -26,6 +26,9 @@ |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
79 |
INSTALL_PREFIX= |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
80 |
INSTALLTOP=/usr/local/ssl |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
81 |
|
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
82 |
+# 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
|
83 |
+PK11_LIB_LOCATION= |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
84 |
+ |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
85 |
# 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
|
86 |
OPENSSLDIR=/usr/local/ssl |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
87 |
|
2901
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
88 |
--- openssl-0.9.8y/engines/Makefile.~1~ Wed Jan 8 14:07:33 2014 |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
89 |
+++ openssl-0.9.8y/engines/Makefile Wed Jan 8 13:51:03 2014 |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
90 |
@@ -20,7 +20,8 @@ |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
91 |
APPS= |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
92 |
|
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
93 |
LIB=$(TOP)/libcrypto.a |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
94 |
-LIBNAMES= 4758cca aep atalla cswift gmp chil nuron sureware ubsec capi |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
95 |
+LIBNAMES= 4758cca aep atalla cswift gmp chil nuron sureware ubsec capi \ |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
96 |
+ pk11 |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
97 |
|
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
98 |
LIBSRC= e_4758cca.c \ |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
99 |
e_aep.c \ |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
100 |
@@ -31,7 +32,8 @@ |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
101 |
e_nuron.c \ |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
102 |
e_sureware.c \ |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
103 |
e_ubsec.c \ |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
104 |
- e_capi.c |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
105 |
+ e_capi.c \ |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
106 |
+ e_pk11.c |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
107 |
LIBOBJ= e_4758cca.o \ |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
108 |
e_aep.o \ |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
109 |
e_atalla.o \ |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
110 |
@@ -41,7 +43,8 @@ |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
111 |
e_nuron.o \ |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
112 |
e_sureware.o \ |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
113 |
e_ubsec.o \ |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
114 |
- e_capi.o |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
115 |
+ e_capi.o \ |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
116 |
+ e_pk11.o |
363
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
117 |
|
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
118 |
SRC= $(LIBSRC) |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
119 |
|
2901
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
120 |
@@ -55,7 +58,8 @@ |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
121 |
e_nuron_err.c e_nuron_err.h \ |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
122 |
e_sureware_err.c e_sureware_err.h \ |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
123 |
e_ubsec_err.c e_ubsec_err.h \ |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
124 |
- e_capi_err.c e_capi_err.h |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
125 |
+ e_capi_err.c e_capi_err.h \ |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
126 |
+ e_pk11.h e_pk11_uri.h e_pk11_err.h e_pk11_pub.c e_pk11_uri.c e_pk11_err.c |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
127 |
|
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
128 |
ALL= $(GENERAL) $(SRC) $(HEADER) |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
129 |
|
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
130 |
@@ -70,7 +74,7 @@ |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
131 |
for l in $(LIBNAMES); do \ |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
132 |
$(MAKE) -f ../Makefile.shared -e \ |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
133 |
LIBNAME=$$l LIBEXTRAS=e_$$l.o \ |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
134 |
- LIBDEPS='-L.. -lcrypto $(EX_LIBS)' \ |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
135 |
+ LIBDEPS='-L.. -lcrypto -lcryptoutil $(EX_LIBS)' \ |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
136 |
link_o.$(SHLIB_TARGET); \ |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
137 |
done; \ |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
138 |
else \ |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
139 |
--- openssl-0.9.8y/crypto/engine/eng_all.c.~1~ Tue Feb 5 03:58:59 2013 |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
140 |
+++ openssl-0.9.8y/crypto/engine/eng_all.c Wed Jan 8 14:24:35 2014 |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
141 |
@@ -59,6 +59,16 @@ |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
142 |
#include "cryptlib.h" |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
143 |
#include "eng_int.h" |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
144 |
|
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
145 |
+/* |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
146 |
+ * pkcs11 engine is no longer a build-in engine, and ENGINE_load_pk11() needs to be |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
147 |
+ * defined in libcrypto.so for ssh. Instead of load pkcs11 engine, it loads dynamic |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
148 |
+ * engines. |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
149 |
+ */ |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
150 |
+void ENGINE_load_pk11(void) |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
151 |
+ { |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
152 |
+ ENGINE_load_dynamic(); |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
153 |
+ } |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
154 |
+ |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
155 |
void ENGINE_load_builtin_engines(void) |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
156 |
{ |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
157 |
/* There's no longer any need for an "openssl" ENGINE unless, one day, |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
158 |
@@ -72,6 +82,9 @@ |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
159 |
ENGINE_load_padlock(); |
363
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
160 |
#endif |
2901
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
161 |
ENGINE_load_dynamic(); |
363
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
162 |
+#ifndef OPENSSL_NO_HW_PKCS11 |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
163 |
+ ENGINE_load_pk11(); |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
164 |
+#endif |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
165 |
#ifndef OPENSSL_NO_STATIC_ENGINE |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
166 |
#ifndef OPENSSL_NO_HW |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
167 |
#ifndef OPENSSL_NO_HW_4758_CCA |
2901
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
168 |
|
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
169 |
--- openssl-0.9.8y/crypto/dso/dso_lib.c.~1~ Wed Jan 8 15:16:36 2014 |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
170 |
+++ openssl-0.9.8y/crypto/dso/dso_lib.c Wed Jan 8 15:22:18 2014 |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
171 |
@@ -433,6 +433,26 @@ |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
172 |
DSOerr(DSO_F_DSO_CONVERT_FILENAME,DSO_R_NO_FILENAME); |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
173 |
return(NULL); |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
174 |
} |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
175 |
+/* |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
176 |
+ * For pkcs11 engine, use libpk11.so (instead of libpkcs11.so) to |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
177 |
+ * avoid the name collision with PKCS#11 library. |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
178 |
+ */ |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
179 |
+ if (strcmp(filename, "pkcs11") == 0) |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
180 |
+ { |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
181 |
+#ifdef _LP64 |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
182 |
+ static const char fullpath[] = "/lib/openssl/engines/64/libpk11.so"; |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
183 |
+#else |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
184 |
+ static const char fullpath[] = "/lib/openssl/engines/libpk11.so"; |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
185 |
+#endif |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
186 |
+ result = OPENSSL_malloc(strlen(fullpath) + 1); |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
187 |
+ if (result == NULL) |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
188 |
+ { |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
189 |
+ DSOerr(DSO_F_DSO_CONVERT_FILENAME, ERR_R_MALLOC_FAILURE); |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
190 |
+ return(NULL); |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
191 |
+ } |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
192 |
+ BUF_strlcpy(result, fullpath, sizeof(fullpath)); |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
193 |
+ return(result); |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
194 |
+ } |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
195 |
if((dso->flags & DSO_FLAG_NO_NAME_TRANSLATION) == 0) |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
196 |
{ |
5096530f204e
17777796 to 11.2 Change the pkcs11 engine into dynamic for FIPS
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
363
diff
changeset
|
197 |
if(dso->name_converter != NULL) |
363
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
198 |
diff -ruN ../a/openssl-0.9.8o/crypto/engine/engine.h openssl-0.9.8o/crypto/engine/engine.h |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
199 |
--- ../a/openssl-0.9.8o/crypto/engine/engine.h 2010-02-09 06:18:15.000000000 -0800 |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
200 |
+++ openssl-0.9.8o/crypto/engine/engine.h 2010-09-22 18:32:19.063758100 -0700 |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
201 |
@@ -337,6 +337,7 @@ |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
202 |
void ENGINE_load_ubsec(void); |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
203 |
#endif |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
204 |
void ENGINE_load_cryptodev(void); |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
205 |
+void ENGINE_load_pk11(void); |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
206 |
void ENGINE_load_padlock(void); |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
207 |
void ENGINE_load_builtin_engines(void); |
9c0cad004039
7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff
changeset
|
208 |
#ifdef OPENSSL_SYS_WIN32 |