# see INSTALL for instructions.

 # Options:

 #

 # --prefix      prefix for the OpenSSL include, lib and bin directories

 #               (Default: the OPENSSLDIR directory)

 #

+# --pk11-libname  PKCS#11 library name.

+#               (Default: none)

+#

 # --install_prefix  Additional prefix for package builders (empty by

 #               default).  This needn't be set in advance, you can

 #               just as well use "make INSTALL_PREFIX=/whatever install".

 my $idx_arflags = $idx++;

+# PKCS#11 engine patch

+my $pk11_libname="";

+

 my $prefix="";

 my $libdir="";

 my $openssldir="";

 	exit 0;

 }

+if (! $pk11_libname)

+        {

+        print STDERR "You must set --pk11-libname for PKCS#11 library.\n";

+        print STDERR "See README.pkcs11 for more information.\n";

+        exit 1;

+        }

+

 if ($target =~ m/^CygWin32(-.*)$/) {

 	$target = "Cygwin".$1;

 }

 if ($flags ne "")	{ $cflags="$flags$cflags"; }

 else			{ $no_user_cflags=1;       }

+$cflags="-DPK11_LIB_LOCATION=\"$pk11_libname\" $cflags";

+

 # Kerberos settings.  The flavor must be provided from outside, either through

 # the script "config" or manually.

 if (!$no_krb5)

 	s/^VERSION=.*/VERSION=$version/;

 	s/^MAJOR=.*/MAJOR=$major/;

 	s/^MINOR=.*/MINOR=$minor/;

+	s/^PK11_LIB_LOCATION=.*/PK11_LIB_LOCATION=$pk11_libname/;

 	s/^SHLIB_VERSION_HISTORY=.*/SHLIB_VERSION_HISTORY=$shlib_version_history/;

@@ -26,6 +26,9 @@

 INSTALL_PREFIX=

 INSTALLTOP=/usr/local/ssl

+# You must set this through --pk11-libname configure option.

+PK11_LIB_LOCATION=

+

 # Do not edit this manually. Use Configure --openssldir=DIR do change this!

 OPENSSLDIR=/usr/local/ssl

 APPS=

 LIB=$(TOP)/libcrypto.a

+	pk11

 LIBSRC=	e_4758cca.c \

	e_sureware.c \

	e_ubsec.c \

-	e_capi.c

+	e_capi.c \

+	e_pk11.c

 LIBOBJ= e_4758cca.o \

	e_aep.o \

	e_atalla.o \

	e_sureware.o \

	e_ubsec.o \

-	e_capi.o

+	e_capi.o \

+	e_pk11.o

 SRC= $(LIBSRC)

	e_nuron_err.c e_nuron_err.h \

	e_sureware_err.c e_sureware_err.h \

	e_ubsec_err.c e_ubsec_err.h \

-	e_capi_err.c e_capi_err.h

+	e_capi_err.c e_capi_err.h \

+	e_pk11.h e_pk11_uri.h e_pk11_err.h e_pk11_pub.c e_pk11_uri.c e_pk11_err.c

 ALL=    $(GENERAL) $(SRC) $(HEADER)

		for l in $(LIBNAMES); do \

			$(MAKE) -f ../Makefile.shared -e \

				LIBNAME=$$l LIBEXTRAS=e_$$l.o \

-				LIBDEPS='-L.. -lcrypto $(EX_LIBS)' \

+				LIBDEPS='-L.. -lcrypto -lcryptoutil $(EX_LIBS)' \

				link_o.$(SHLIB_TARGET); \

		done; \

	else \

@@ -59,6 +59,16 @@

 #include "cryptlib.h"

 #include "eng_int.h"

+/*

+ * defined in libcrypto.so for ssh. Instead of load pkcs11 engine, it loads dynamic

+ * engines.

+ */

+void ENGINE_load_pk11(void)

+	{

+	ENGINE_load_dynamic();

+	}

+

 void ENGINE_load_builtin_engines(void)

	{

 #endif

	ENGINE_load_dynamic();

+#ifndef OPENSSL_NO_HW_PKCS11

+	ENGINE_load_pk11();

+#endif

 #ifndef OPENSSL_NO_STATIC_ENGINE

 #ifndef OPENSSL_NO_HW

 #ifndef OPENSSL_NO_HW_4758_CCA

		DSOerr(DSO_F_DSO_CONVERT_FILENAME,DSO_R_NO_FILENAME);

		return(NULL);

		}

+	if (strcmp(filename, "pkcs11") == 0)

+		{

+#ifdef _LP64

+		static const char fullpath[] = "/lib/openssl/engines/64/libpk11.so";

+#else

+		static const char fullpath[] = "/lib/openssl/engines/libpk11.so";

+#endif

+		result = OPENSSL_malloc(strlen(fullpath) + 1);

+			{

+			DSOerr(DSO_F_DSO_CONVERT_FILENAME, ERR_R_MALLOC_FAILURE);

+			return(NULL);

+			}

+		BUF_strlcpy(result, fullpath, sizeof(fullpath));

+		return(result);

+		}

	if((dso->flags & DSO_FLAG_NO_NAME_TRANSLATION) == 0)

		{

		if(dso->name_converter != NULL)

 #endif

 void ENGINE_load_cryptodev(void);

+void ENGINE_load_pk11(void);

 void ENGINE_load_builtin_engines(void);