From e9d097511e748ac8bfcec771e3103093869cbd1d Mon Sep 17 00:00:00 2001
From: Francis Dupont <fdupont@isc.org>
Date: Mon, 13 Jun 2016 15:43:57 +0200
Subject: [PATCH] AEP keyper PKCS#11 provider is available in 64 bits

---
 doc/arm/pkcs11.xml | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/doc/arm/pkcs11.xml b/doc/arm/pkcs11.xml
index bd0f6f1b27..31e9ed2ff7 100644
--- a/doc/arm/pkcs11.xml
+++ b/doc/arm/pkcs11.xml
@@ -236,18 +236,12 @@ $ <userinput>patch -p1 -d openssl-0.9.8zc \
 $ <userinput>cp pkcs11.GCC4.0.2.so.4.05 /opt/pkcs11/usr/lib/libpkcs11.so</userinput>
 </screen>
       <para>
-	This library is only available for Linux as a 32-bit
-	binary. If we are compiling on a 64-bit Linux system, it is
-	necessary to force a 32-bit build, by specifying -m32 in the
-	build options.
-      </para>
-      <para>
-	Finally, the Keyper library requires threads, so we
+	The Keyper library requires threads, so we
 	must specify -pthread.
       </para>
       <screen>
 $ <userinput>cd openssl-0.9.8zc</userinput>
-$ <userinput>./Configure linux-generic32 -m32 -pthread \
+$ <userinput>./Configure linux-x86_64 -pthread \
 	    --pk11-libname=/opt/pkcs11/usr/lib/libpkcs11.so \
 	    --pk11-flavor=sign-only \
 	    --prefix=/opt/pkcs11/usr</userinput>
@@ -370,15 +364,9 @@ $ <userinput>./Configure linux-x86_64 -pthread \
 	To link with the PKCS#11 provider, threads must be
 	enabled in the BIND 9 build.
       </para>
-      <para>
-	The PKCS#11 library for the AEP Keyper is currently
-	only available as a 32-bit binary. If we are building on a
-	64-bit host, we must force a 32-bit build by adding "-m32" to
-	the CC options on the "configure" command line.
-      </para>
       <screen>
 $ <userinput>cd ../bind9</userinput>
-$ <userinput>./configure CC="gcc -m32" --enable-threads \
+$ <userinput>./configure --enable-threads \
 	   --with-openssl=/opt/pkcs11/usr \
 	   --with-pkcs11=/opt/pkcs11/usr/lib/libpkcs11.so</userinput>
 </screen>