Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ISC Open Source Projects
BIND
Commits
0193e63d
Commit
0193e63d
authored
May 30, 2013
by
Mark Andrews
Browse files
3579. [maint] Updates to PKCS#11 openssl patches, supporting
versions 0.9.8y, 1.0.0k, 1.0.1e [RT #33463]
parent
17a00ff5
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
CHANGES
View file @
0193e63d
3579. [maint] Updates to PKCS#11 openssl patches, supporting
versions 0.9.8y, 1.0.0k, 1.0.1e [RT #33463]
3578. [bug] 'rndc -c file' now fails if 'file' does not exist.
[RT #33571]
...
...
bin/pkcs11/openssl-0.9.8
x
-patch
→
bin/pkcs11/openssl-0.9.8
y
-patch
View file @
0193e63d
Index: openssl/Configure
diff -u openssl/Configure:1.8.6.1 openssl/Configure:1.8
--- openssl/Configure:1.8.6.1
Sun Jan
1
5
1
5
:4
5:33
201
2
+++ openssl/Configure
Mon Jun
1
3
14:
2
5:15 201
1
diff -u openssl/Configure:1.8.6.1
.4.1
openssl/Configure:1.8
.2.1
--- openssl/Configure:1.8.6.1
.4.1 Tue May
1
4
1
4
:4
1:19
201
3
+++ openssl/Configure
Tue May
1
4
14:5
6
:15 201
3
@@ -12,7 +12,7 @@
# see INSTALL for instructions.
...
...
@@ -24,7 +24,7 @@ diff -u openssl/Configure:1.8.6.1 openssl/Configure:1.8
# --with-krb5-dir Declare where Kerberos 5 lives. The libraries are expected
# to live in the subdirectory lib/ and the header files in
# include/. A value is required.
@@ -33
5
,7 +34
1
,7 @@
@@ -33
6
,7 +34
2
,7 @@
"linux-ppc", "gcc:-DB_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL::linux_ppc32.o::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
#### IA-32 targets...
"linux-ia32-icc", "icc:-DL_ENDIAN -DTERMIO -O2 -no_cpprt::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-KPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
...
...
@@ -33,7 +33,7 @@ diff -u openssl/Configure:1.8.6.1 openssl/Configure:1.8
"linux-aout", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -march=i486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}",
####
"linux-generic64","gcc:-DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
@@ -34
3
,7 +3
49
,7 @@
@@ -34
4
,7 +3
50
,7 @@
"linux-ia64", "gcc:-DL_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
"linux-ia64-ecc","ecc:-DL_ENDIAN -DTERMIO -O2 -Wall -no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
"linux-ia64-icc","icc:-DL_ENDIAN -DTERMIO -O2 -Wall -no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
...
...
@@ -42,7 +42,7 @@ diff -u openssl/Configure:1.8.6.1 openssl/Configure:1.8
#### SPARC Linux setups
# Ray Miller <ray.miller@computing-services.oxford.ac.uk> has patiently
# assisted with debugging of following two configs.
@@ -59
0
,6 +59
6
,10 @@
@@ -59
1
,6 +59
7
,10 @@
my $idx_ranlib = $idx++;
my $idx_arflags = $idx++;
...
...
@@ -53,7 +53,7 @@ diff -u openssl/Configure:1.8.6.1 openssl/Configure:1.8
my $prefix="";
my $libdir="";
my $openssldir="";
@@ -82
8
,6 +83
8
,14 @@
@@ -82
9
,6 +83
9
,14 @@
{
$flags.=$_." ";
}
...
...
@@ -68,7 +68,7 @@ diff -u openssl/Configure:1.8.6.1 openssl/Configure:1.8
elsif (/^--prefix=(.*)$/)
{
$prefix=$1;
@@ -96
3
,6 +98
1
,22 @@
@@ -96
4
,6 +98
2
,22 @@
exit 0;
}
...
...
@@ -91,7 +91,7 @@ diff -u openssl/Configure:1.8.6.1 openssl/Configure:1.8
if ($target =~ m/^CygWin32(-.*)$/) {
$target = "Cygwin".$1;
}
@@ -107
8
,6 +111
2
,25 @@
@@ -107
9
,6 +111
3
,25 @@
print "\n";
}
...
...
@@ -117,7 +117,7 @@ diff -u openssl/Configure:1.8.6.1 openssl/Configure:1.8
my $IsMK1MF=scalar grep /^$target$/,@MK1MF_Builds;
$IsMK1MF=1 if ($target eq "mingw" && $^O ne "cygwin" && !is_msys());
@@ -11
29
,6 +118
2
,8 @@
@@ -11
30
,6 +118
3
,8 @@
if ($flags ne "") { $cflags="$flags$cflags"; }
else { $no_user_cflags=1; }
...
...
@@ -126,7 +126,7 @@ diff -u openssl/Configure:1.8.6.1 openssl/Configure:1.8
# Kerberos settings. The flavor must be provided from outside, either through
# the script "config" or manually.
if (!$no_krb5)
@@ -149
2
,6 +154
7
,7 @@
@@ -149
3
,6 +154
8
,7 @@
s/^VERSION=.*/VERSION=$version/;
s/^MAJOR=.*/MAJOR=$major/;
s/^MINOR=.*/MINOR=$minor/;
...
...
@@ -150,7 +150,7 @@ diff -u openssl/Makefile.org:1.4.6.1 openssl/Makefile.org:1.4
Index: openssl/README.pkcs11
diff -u /dev/null openssl/README.pkcs11:1.6.4.1
--- /dev/null T
ue Jun 19 16:24:3
0 201
2
--- /dev/null T
hu May 16 07:41:5
0 201
3
+++ openssl/README.pkcs11 Mon Jun 13 18:27:39 2011
@@ -0,0 +1,261 @@
+ISC modified
...
...
@@ -624,7 +624,7 @@ diff -u openssl/crypto/engine/Makefile:1.6.6.1 openssl/crypto/engine/Makefile:1.
tb_cipher.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
Index: openssl/crypto/engine/cryptoki.h
diff -u /dev/null openssl/crypto/engine/cryptoki.h:1.4
--- /dev/null T
ue Jun 19 16:24:3
0 201
2
--- /dev/null T
hu May 16 07:41:5
0 201
3
+++ openssl/crypto/engine/cryptoki.h Thu Dec 18 00:14:12 2008
@@ -0,0 +1,103 @@
+/*
...
...
@@ -767,9 +767,9 @@ diff -u openssl/crypto/engine/engine.h:1.4.6.1 openssl/crypto/engine/engine.h:1.
/* Get and set global flags (ENGINE_TABLE_FLAG_***) for the implementation
* "registry" handling. */
Index: openssl/crypto/engine/hw_pk11.c
diff -u /dev/null openssl/crypto/engine/hw_pk11.c:1.26.4.
2
--- /dev/null T
ue Jun 19 16:24:30
201
2
+++ openssl/crypto/engine/hw_pk11.c Thu
Jun
16
12:31:35
201
1
diff -u /dev/null openssl/crypto/engine/hw_pk11.c:1.26.4.
3
--- /dev/null T
hu May 16 07:41:51
201
3
+++ openssl/crypto/engine/hw_pk11.c Thu
May
16
07:20:00
201
3
@@ -0,0 +1,4057 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
...
...
@@ -1630,8 +1630,8 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11.c:1.26.4.2
+ */
+static const char def_PK11_LIBNAME[] = PK11_LIB_LOCATION;
+
+static CK_BBOOL true = TRUE;
+static CK_BBOOL false = FALSE;
+static CK_BBOOL
my
true = TRUE;
+static CK_BBOOL
my
false = FALSE;
+/* Needed in hw_pk11_pub.c as well so that's why it is not static. */
+CK_SLOT_ID pubkey_SLOTID = 0;
+static CK_SLOT_ID rand_SLOTID = 0;
...
...
@@ -3707,9 +3707,9 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11.c:1.26.4.2
+ {
+ {CKA_CLASS, (void*) NULL, sizeof (CK_OBJECT_CLASS)},
+ {CKA_KEY_TYPE, (void*) NULL, sizeof (CK_KEY_TYPE)},
+ {CKA_TOKEN, &false, sizeof (false)},
+ {CKA_ENCRYPT, &true, sizeof (true)},
+ {CKA_DECRYPT, &true, sizeof (true)},
+ {CKA_TOKEN, &
my
false, sizeof (
my
false)},
+ {CKA_ENCRYPT, &
my
true, sizeof (
my
true)},
+ {CKA_DECRYPT, &
my
true, sizeof (
my
true)},
+ {CKA_VALUE, (void*) NULL, 0},
+ };
+
...
...
@@ -4830,7 +4830,7 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11.c:1.26.4.2
+#endif /* OPENSSL_NO_HW */
Index: openssl/crypto/engine/hw_pk11_err.c
diff -u /dev/null openssl/crypto/engine/hw_pk11_err.c:1.4.10.1
--- /dev/null T
ue Jun 19 16:24:30
201
2
--- /dev/null T
hu May 16 07:41:51
201
3
+++ openssl/crypto/engine/hw_pk11_err.c Tue Jun 14 21:52:40 2011
@@ -0,0 +1,288 @@
+/*
...
...
@@ -5123,7 +5123,7 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11_err.c:1.4.10.1
+}
Index: openssl/crypto/engine/hw_pk11_err.h
diff -u /dev/null openssl/crypto/engine/hw_pk11_err.h:1.9.10.1
--- /dev/null T
ue Jun 19 16:24:30
201
2
--- /dev/null T
hu May 16 07:41:51
201
3
+++ openssl/crypto/engine/hw_pk11_err.h Tue Jun 14 21:52:40 2011
@@ -0,0 +1,440 @@
+/*
...
...
@@ -5568,7 +5568,7 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11_err.h:1.9.10.1
+#endif /* HW_PK11_ERR_H */
Index: openssl/crypto/engine/hw_pk11_pub.c
diff -u /dev/null openssl/crypto/engine/hw_pk11_pub.c:1.32.4.4
--- /dev/null T
ue Jun 19 16:24:30
201
2
--- /dev/null T
hu May 16 07:41:51
201
3
+++ openssl/crypto/engine/hw_pk11_pub.c Sun Jun 17 21:12:10 2012
@@ -0,0 +1,3530 @@
+/*
...
...
@@ -9103,7 +9103,7 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11_pub.c:1.32.4.4
+#endif /* OPENSSL_NO_HW */
Index: openssl/crypto/engine/hw_pk11ca.h
diff -u /dev/null openssl/crypto/engine/hw_pk11ca.h:1.2.4.2
--- /dev/null T
ue Jun 19 16:24:30
201
2
--- /dev/null T
hu May 16 07:41:51
201
3
+++ openssl/crypto/engine/hw_pk11ca.h Wed Jun 15 21:12:32 2011
@@ -0,0 +1,32 @@
+/* Redefine all pk11/PK11 external symbols to pk11ca/PK11CA */
...
...
@@ -9140,7 +9140,7 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11ca.h:1.2.4.2
+#define ENGINE_load_pk11 ENGINE_load_pk11ca
Index: openssl/crypto/engine/hw_pk11so.c
diff -u /dev/null openssl/crypto/engine/hw_pk11so.c:1.3.4.2
--- /dev/null T
ue Jun 19 16:24:30
201
2
--- /dev/null T
hu May 16 07:41:51
201
3
+++ openssl/crypto/engine/hw_pk11so.c Thu Jun 16 12:31:35 2011
@@ -0,0 +1,1745 @@
+/*
...
...
@@ -10890,7 +10890,7 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11so.c:1.3.4.2
+#endif /* OPENSSL_NO_HW */
Index: openssl/crypto/engine/hw_pk11so.h
diff -u /dev/null openssl/crypto/engine/hw_pk11so.h:1.2.4.2
--- /dev/null T
ue Jun 19 16:24:30
201
2
--- /dev/null T
hu May 16 07:41:51
201
3
+++ openssl/crypto/engine/hw_pk11so.h Wed Jun 15 21:12:32 2011
@@ -0,0 +1,32 @@
+/* Redefine all pk11/PK11 external symbols to pk11so/PK11SO */
...
...
@@ -10927,7 +10927,7 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11so.h:1.2.4.2
+#define ENGINE_load_pk11 ENGINE_load_pk11so
Index: openssl/crypto/engine/hw_pk11so_pub.c
diff -u /dev/null openssl/crypto/engine/hw_pk11so_pub.c:1.2.4.4
--- /dev/null T
ue Jun 19 16:24:30
201
2
--- /dev/null T
hu May 16 07:41:51
201
3
+++ openssl/crypto/engine/hw_pk11so_pub.c Sun Jun 17 21:12:11 2012
@@ -0,0 +1,1622 @@
+/*
...
...
@@ -12554,11 +12554,11 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11so_pub.c:1.2.4.4
+#endif /* OPENSSL_NO_HW */
Index: openssl/crypto/engine/pkcs11.h
diff -u /dev/null openssl/crypto/engine/pkcs11.h:1.1.1.1
--- /dev/null T
ue Jun 19 16:24:30
201
2
--- /dev/null T
hu May 16 07:41:51
201
3
+++ openssl/crypto/engine/pkcs11.h Wed Oct 24 23:27:09 2007
@@ -0,0 +1,299 @@
+/* pkcs11.h include file for PKCS #11. */
+/* $Revision
: 1.1.1.1
$ */
+/* $Revision$ */
+
+/* License to copy and use this software is granted provided that it is
+ * identified as "RSA Security Inc. PKCS #11 Cryptographic Token Interface
...
...
@@ -12858,11 +12858,11 @@ diff -u /dev/null openssl/crypto/engine/pkcs11.h:1.1.1.1
+#endif
Index: openssl/crypto/engine/pkcs11f.h
diff -u /dev/null openssl/crypto/engine/pkcs11f.h:1.1.1.1
--- /dev/null T
ue Jun 19 16:24:30
201
2
--- /dev/null T
hu May 16 07:41:51
201
3
+++ openssl/crypto/engine/pkcs11f.h Wed Oct 24 23:27:09 2007
@@ -0,0 +1,912 @@
+/* pkcs11f.h include file for PKCS #11. */
+/* $Revision
: 1.1.1.1
$ */
+/* $Revision$ */
+
+/* License to copy and use this software is granted provided that it is
+ * identified as "RSA Security Inc. PKCS #11 Cryptographic Token Interface
...
...
@@ -13775,11 +13775,11 @@ diff -u /dev/null openssl/crypto/engine/pkcs11f.h:1.1.1.1
+#endif
Index: openssl/crypto/engine/pkcs11t.h
diff -u /dev/null openssl/crypto/engine/pkcs11t.h:1.2
--- /dev/null T
ue Jun 19 16:24:30
201
2
--- /dev/null T
hu May 16 07:41:51
201
3
+++ openssl/crypto/engine/pkcs11t.h Sat Aug 30 11:58:07 2008
@@ -0,0 +1,1885 @@
+/* pkcs11t.h include file for PKCS #11. */
+/* $Revision
: 1.2
$ */
+/* $Revision$ */
+
+/* License to copy and use this software is granted provided that it is
+ * identified as "RSA Security Inc. PKCS #11 Cryptographic Token Interface
...
...
@@ -15664,10 +15664,10 @@ diff -u /dev/null openssl/crypto/engine/pkcs11t.h:1.2
+
+#endif
Index: openssl/util/libeay.num
diff -u openssl/util/libeay.num:1.7.6.1 openssl/util/libeay.num:1.7
--- openssl/util/libeay.num:1.7.6.1
Sun Jan
1
5
1
5:45:40
201
2
+++ openssl/util/libeay.num
Mon Jun
1
3
14:
25:25
201
1
@@ -372
8
,3 +372
8
,5 @@
diff -u openssl/util/libeay.num:1.7.6.1
.4.1
openssl/util/libeay.num:1.7
.2.1
--- openssl/util/libeay.num:1.7.6.1
.4.1 Tue May
1
4
1
4:41:22
201
3
+++ openssl/util/libeay.num
Tue May
1
4
14:
56:18
201
3
@@ -372
9
,3 +372
9
,5 @@
pqueue_size 4114 EXIST::FUNCTION:
OPENSSL_uni2asc 4115 EXIST:NETWARE:FUNCTION:
OPENSSL_asc2uni 4116 EXIST:NETWARE:FUNCTION:
...
...
bin/pkcs11/openssl-1.0.0
j
-patch
→
bin/pkcs11/openssl-1.0.0
k
-patch
View file @
0193e63d
Index: openssl/Configure
diff -u openssl/Configure:1.9.2.1.2.1 openssl/Configure:1.11
--- openssl/Configure:1.9.2.1.2.1 Tue
Jun
1
9
1
4:46:03
201
2
+++ openssl/Configure Tue
Jun
1
9
1
4
:49:
2
1 201
2
diff -u openssl/Configure:1.9.2.1.2.1
.4.1
openssl/Configure:1.11
.2.1
--- openssl/Configure:1.9.2.1.2.1
.4.1
Tue
May
1
4
1
5:37:45
201
3
+++ openssl/Configure Tue
May
1
4
1
5
:49:
0
1 201
3
@@ -10,7 +10,7 @@
# see INSTALL for instructions.
...
...
@@ -24,7 +24,7 @@ diff -u openssl/Configure:1.9.2.1.2.1 openssl/Configure:1.11
# --with-krb5-dir Declare where Kerberos 5 lives. The libraries are expected
# to live in the subdirectory lib/ and the header files in
# include/. A value is required.
@@ -34
3
,7 +3
49
,7 @@
@@ -34
4
,7 +3
50
,7 @@
"linux-armv4", "gcc:-DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
#### IA-32 targets...
"linux-ia32-icc", "icc:-DL_ENDIAN -DTERMIO -O2 -no_cpprt::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-KPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
...
...
@@ -33,7 +33,7 @@ diff -u openssl/Configure:1.9.2.1.2.1 openssl/Configure:1.11
"linux-aout", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -march=i486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_asm}:a.out",
####
"linux-generic64","gcc:-DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
@@ -35
1
,7 +35
7
,7 @@
@@ -35
2
,7 +35
8
,7 @@
"linux-ia64", "gcc:-DL_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
"linux-ia64-ecc","ecc:-DL_ENDIAN -DTERMIO -O2 -Wall -no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
"linux-ia64-icc","icc:-DL_ENDIAN -DTERMIO -O2 -Wall -no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
...
...
@@ -42,7 +42,7 @@ diff -u openssl/Configure:1.9.2.1.2.1 openssl/Configure:1.11
"linux-s390x", "gcc:-m64 -DB_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${s390x_asm}:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
#### SPARC Linux setups
# Ray Miller <ray.miller@computing-services.oxford.ac.uk> has patiently
@@ -62
2
,6 +62
8
,10 @@
@@ -62
3
,6 +62
9
,10 @@
my $idx_arflags = $idx++;
my $idx_multilib = $idx++;
...
...
@@ -53,7 +53,7 @@ diff -u openssl/Configure:1.9.2.1.2.1 openssl/Configure:1.11
my $prefix="";
my $libdir="";
my $openssldir="";
@@ -82
4
,6 +83
4
,14 @@
@@ -82
5
,6 +83
5
,14 @@
{
$flags.=$_." ";
}
...
...
@@ -68,7 +68,7 @@ diff -u openssl/Configure:1.9.2.1.2.1 openssl/Configure:1.11
elsif (/^--prefix=(.*)$/)
{
$prefix=$1;
@@ -96
1
,6 +9
79
,22 @@
@@ -96
2
,6 +9
80
,22 @@
exit 0;
}
...
...
@@ -91,7 +91,7 @@ diff -u openssl/Configure:1.9.2.1.2.1 openssl/Configure:1.11
if ($target =~ m/^CygWin32(-.*)$/) {
$target = "Cygwin".$1;
}
@@ -103
8
,6 +107
2
,25 @@
@@ -103
9
,6 +107
3
,25 @@
$exp_cflags .= " -DOPENSSL_EXPERIMENTAL_$ALGO";
}
...
...
@@ -117,7 +117,7 @@ diff -u openssl/Configure:1.9.2.1.2.1 openssl/Configure:1.11
my $IsMK1MF=scalar grep /^$target$/,@MK1MF_Builds;
$exe_ext=".exe" if ($target eq "Cygwin" || $target eq "DJGPP" || $target =~ /^mingw/);
@@ -112
5
,6 +117
8
,8 @@
@@ -112
6
,6 +117
9
,8 @@
if ($flags ne "") { $cflags="$flags$cflags"; }
else { $no_user_cflags=1; }
...
...
@@ -126,7 +126,7 @@ diff -u openssl/Configure:1.9.2.1.2.1 openssl/Configure:1.11
# Kerberos settings. The flavor must be provided from outside, either through
# the script "config" or manually.
if (!$no_krb5)
@@ -149
4
,6 +15
49
,7 @@
@@ -149
5
,6 +15
50
,7 @@
s/^VERSION=.*/VERSION=$version/;
s/^MAJOR=.*/MAJOR=$major/;
s/^MINOR=.*/MINOR=$minor/;
...
...
@@ -150,7 +150,7 @@ diff -u openssl/Makefile.org:1.5.2.1.2.1 openssl/Makefile.org:1.6
Index: openssl/README.pkcs11
diff -u /dev/null openssl/README.pkcs11:1.7
--- /dev/null T
ue Jun 19 16:23
:5
6
201
2
--- /dev/null T
hu May 16 07:42
:5
4
201
3
+++ openssl/README.pkcs11 Mon Jun 13 18:27:17 2011
@@ -0,0 +1,261 @@
+ISC modified
...
...
@@ -605,7 +605,7 @@ diff -u openssl/crypto/engine/Makefile:1.8.2.1 openssl/crypto/engine/Makefile:1.
tb_asnmth.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
Index: openssl/crypto/engine/cryptoki.h
diff -u /dev/null openssl/crypto/engine/cryptoki.h:1.4
--- /dev/null T
ue Jun 19 16:23
:5
6
201
2
--- /dev/null T
hu May 16 07:42
:5
4
201
3
+++ openssl/crypto/engine/cryptoki.h Thu Dec 18 00:14:12 2008
@@ -0,0 +1,103 @@
+/*
...
...
@@ -748,9 +748,9 @@ diff -u openssl/crypto/engine/engine.h:1.5.2.1 openssl/crypto/engine/engine.h:1.
void ENGINE_load_gmp(void);
#endif
Index: openssl/crypto/engine/hw_pk11.c
diff -u /dev/null openssl/crypto/engine/hw_pk11.c:1.30
--- /dev/null T
ue Jun 19 16:23
:5
6
201
2
+++ openssl/crypto/engine/hw_pk11.c Thu
Jun
16
12:31
:5
3
201
1
diff -u /dev/null openssl/crypto/engine/hw_pk11.c:1.30
.4.1
--- /dev/null T
hu May 16 07:42
:5
4
201
3
+++ openssl/crypto/engine/hw_pk11.c Thu
May
16
06:53
:5
0
201
3
@@ -0,0 +1,4057 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
...
...
@@ -1611,8 +1611,8 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11.c:1.30
+ */
+static const char def_PK11_LIBNAME[] = PK11_LIB_LOCATION;
+
+static CK_BBOOL true = TRUE;
+static CK_BBOOL false = FALSE;
+static CK_BBOOL
my
true = TRUE;
+static CK_BBOOL
my
false = FALSE;
+/* Needed in hw_pk11_pub.c as well so that's why it is not static. */
+CK_SLOT_ID pubkey_SLOTID = 0;
+static CK_SLOT_ID rand_SLOTID = 0;
...
...
@@ -3688,9 +3688,9 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11.c:1.30
+ {
+ {CKA_CLASS, (void*) NULL, sizeof (CK_OBJECT_CLASS)},
+ {CKA_KEY_TYPE, (void*) NULL, sizeof (CK_KEY_TYPE)},
+ {CKA_TOKEN, &false, sizeof (false)},
+ {CKA_ENCRYPT, &true, sizeof (true)},
+ {CKA_DECRYPT, &true, sizeof (true)},
+ {CKA_TOKEN, &
my
false, sizeof (
my
false)},
+ {CKA_ENCRYPT, &
my
true, sizeof (
my
true)},
+ {CKA_DECRYPT, &
my
true, sizeof (
my
true)},
+ {CKA_VALUE, (void*) NULL, 0},
+ };
+
...
...
@@ -4811,7 +4811,7 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11.c:1.30
+#endif /* OPENSSL_NO_HW */
Index: openssl/crypto/engine/hw_pk11_err.c
diff -u /dev/null openssl/crypto/engine/hw_pk11_err.c:1.5
--- /dev/null T
ue Jun 19 16:23
:5
6
201
2
--- /dev/null T
hu May 16 07:42
:5
4
201
3
+++ openssl/crypto/engine/hw_pk11_err.c Tue Jun 14 00:43:26 2011
@@ -0,0 +1,288 @@
+/*
...
...
@@ -5104,7 +5104,7 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11_err.c:1.5
+}
Index: openssl/crypto/engine/hw_pk11_err.h
diff -u /dev/null openssl/crypto/engine/hw_pk11_err.h:1.12
--- /dev/null T
ue Jun 19 16:23
:5
7
201
2
--- /dev/null T
hu May 16 07:42
:5
4
201
3
+++ openssl/crypto/engine/hw_pk11_err.h Tue Jun 14 21:51:32 2011
@@ -0,0 +1,440 @@
+/*
...
...
@@ -5549,7 +5549,7 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11_err.h:1.12
+#endif /* HW_PK11_ERR_H */
Index: openssl/crypto/engine/hw_pk11_pub.c
diff -u /dev/null openssl/crypto/engine/hw_pk11_pub.c:1.38
--- /dev/null T
ue Jun 19 16:23
:5
7
201
2
--- /dev/null T
hu May 16 07:42
:5
4
201
3
+++ openssl/crypto/engine/hw_pk11_pub.c Sun Jun 17 21:12:24 2012
@@ -0,0 +1,3530 @@
+/*
...
...
@@ -9084,7 +9084,7 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11_pub.c:1.38
+#endif /* OPENSSL_NO_HW */
Index: openssl/crypto/engine/hw_pk11ca.h
diff -u /dev/null openssl/crypto/engine/hw_pk11ca.h:1.4
--- /dev/null T
ue Jun 19 16:23
:5
7
201
2
--- /dev/null T
hu May 16 07:42
:5
4
201
3
+++ openssl/crypto/engine/hw_pk11ca.h Wed Jun 15 21:12:20 2011
@@ -0,0 +1,32 @@
+/* Redefine all pk11/PK11 external symbols to pk11ca/PK11CA */
...
...
@@ -9121,7 +9121,7 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11ca.h:1.4
+#define ENGINE_load_pk11 ENGINE_load_pk11ca
Index: openssl/crypto/engine/hw_pk11so.c
diff -u /dev/null openssl/crypto/engine/hw_pk11so.c:1.7
--- /dev/null T
ue Jun 19 16:23
:5
7
201
2
--- /dev/null T
hu May 16 07:42
:5
4
201
3
+++ openssl/crypto/engine/hw_pk11so.c Thu Jun 16 12:31:53 2011
@@ -0,0 +1,1745 @@
+/*
...
...
@@ -10871,7 +10871,7 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11so.c:1.7
+#endif /* OPENSSL_NO_HW */
Index: openssl/crypto/engine/hw_pk11so.h
diff -u /dev/null openssl/crypto/engine/hw_pk11so.h:1.4
--- /dev/null T
ue Jun 19 16:23
:5
7
201
2
--- /dev/null T
hu May 16 07:42
:5
4
201
3
+++ openssl/crypto/engine/hw_pk11so.h Wed Jun 15 21:12:20 2011
@@ -0,0 +1,32 @@
+/* Redefine all pk11/PK11 external symbols to pk11so/PK11SO */
...
...
@@ -10908,7 +10908,7 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11so.h:1.4
+#define ENGINE_load_pk11 ENGINE_load_pk11so
Index: openssl/crypto/engine/hw_pk11so_pub.c
diff -u /dev/null openssl/crypto/engine/hw_pk11so_pub.c:1.8
--- /dev/null T
ue Jun 19 16:23
:5
7
201
2
--- /dev/null T
hu May 16 07:42
:5
4
201
3
+++ openssl/crypto/engine/hw_pk11so_pub.c Sun Jun 17 21:12:24 2012
@@ -0,0 +1,1622 @@
+/*
...
...
@@ -12535,11 +12535,11 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11so_pub.c:1.8
+#endif /* OPENSSL_NO_HW */
Index: openssl/crypto/engine/pkcs11.h
diff -u /dev/null openssl/crypto/engine/pkcs11.h:1.1.1.1
--- /dev/null T
ue Jun 19 16:23
:5
7
201
2
--- /dev/null T
hu May 16 07:42
:5
4
201
3
+++ openssl/crypto/engine/pkcs11.h Wed Oct 24 23:27:09 2007
@@ -0,0 +1,299 @@
+/* pkcs11.h include file for PKCS #11. */
+/* $Revision
: 1.1.1.1
$ */
+/* $Revision$ */
+
+/* License to copy and use this software is granted provided that it is
+ * identified as "RSA Security Inc. PKCS #11 Cryptographic Token Interface
...
...
@@ -12839,11 +12839,11 @@ diff -u /dev/null openssl/crypto/engine/pkcs11.h:1.1.1.1
+#endif
Index: openssl/crypto/engine/pkcs11f.h
diff -u /dev/null openssl/crypto/engine/pkcs11f.h:1.1.1.1
--- /dev/null T
ue Jun 19 16:23
:5
7
201
2
--- /dev/null T
hu May 16 07:42
:5
4
201
3
+++ openssl/crypto/engine/pkcs11f.h Wed Oct 24 23:27:09 2007
@@ -0,0 +1,912 @@
+/* pkcs11f.h include file for PKCS #11. */
+/* $Revision
: 1.1.1.1
$ */
+/* $Revision$ */
+
+/* License to copy and use this software is granted provided that it is
+ * identified as "RSA Security Inc. PKCS #11 Cryptographic Token Interface
...
...
@@ -13756,11 +13756,11 @@ diff -u /dev/null openssl/crypto/engine/pkcs11f.h:1.1.1.1
+#endif
Index: openssl/crypto/engine/pkcs11t.h
diff -u /dev/null openssl/crypto/engine/pkcs11t.h:1.2
--- /dev/null T
ue Jun 19 16:23
:5
7
201
2
--- /dev/null T
hu May 16 07:42
:5
4
201
3
+++ openssl/crypto/engine/pkcs11t.h Sat Aug 30 11:58:07 2008
@@ -0,0 +1,1885 @@
+/* pkcs11t.h include file for PKCS #11. */
+/* $Revision
: 1.2
$ */
+/* $Revision$ */
+
+/* License to copy and use this software is granted provided that it is
+ * identified as "RSA Security Inc. PKCS #11 Cryptographic Token Interface
...
...
@@ -15645,10 +15645,10 @@ diff -u /dev/null openssl/crypto/engine/pkcs11t.h:1.2
+
+#endif
Index: openssl/util/libeay.num
diff -u openssl/util/libeay.num:1.8.2.1 openssl/util/libeay.num:1.9
--- openssl/util/libeay.num:1.8.2.1
Sun Jan
1
5
1
6:09
:52 201
2
+++ openssl/util/libeay.num
Sun Jan
1
5
1
6:30:10
201
2
@@ -419
4
,3 +419
4
,5 @@
diff -u openssl/util/libeay.num:1.8.2.1
.6.1
openssl/util/libeay.num:1.9
.2.1
--- openssl/util/libeay.num:1.8.2.1
.6.1 Tue May
1
4
1
5:37
:52 201
3
+++ openssl/util/libeay.num
Tue May
1
4
1
5:49:08
201
3
@@ -419
5
,3 +419
5
,5 @@
OPENSSL_strncasecmp 4566 EXIST::FUNCTION:
OPENSSL_gmtime 4567 EXIST::FUNCTION:
OPENSSL_gmtime_adj 4568 EXIST::FUNCTION:
...
...
bin/pkcs11/openssl-1.0.1
c
-patch
→
bin/pkcs11/openssl-1.0.1
e
-patch
View file @
0193e63d
This diff is collapsed.
Click to expand it.
doc/arm/pkcs11.xml
View file @
0193e63d
...
...
@@ -70,13 +70,14 @@
</itemizedlist>
<para>
The modified OpenSSL code is included in the BIND 9 release,
in the form of a context diff against the latest verions of
OpenSSL. OpenSSL 0.9.8 and 1.0.
0
are
both
supported; there are
OpenSSL. OpenSSL 0.9.8
, 1.0.0
and 1.0.
1
are supported; there are
separate diffs for each version. In the examples to follow,
we use OpenSSL 0.9.8, but the same methods work with OpenSSL 1.0.0.
we use OpenSSL 0.9.8, but the same methods work with OpenSSL 1.0.0
and 1.0.1.
</para>
<note>
The latest OpenSSL versions at the time of the BIND release
are 0.9.8
s
and 1.0.
0f
.
are 0.9.8
y, 1.0.0k
and 1.0.
1e
.
ISC will provide an updated patch as new versions of OpenSSL
are released. The version number in the following examples
is expected to change.
</note>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment