PSARC/2008/520 SunSSH with the OpenSSL PKCS#11 engine support

6445288 ssh needs to be OpenSSL engine aware
6709963 SunSSH server leaks memory during initialization
6687401 ssh monitor shouldn't try to log remote IP when child closed the pipe
6696629 sshd should remove alarm signal handler after authentication
6674088 userland threshold for hw offloading makes it difficult for SSL and SSH protocols
6728450 6708125 prevents parent to use the Crypto Framework after the fork(2)
6742247 ssh debug output with PACKET_DEBUG code could be more readable

1 files changed, 10 insertions, 4 deletions

diff --git a/usr/src/cmd/ssh/libssh/common/readconf.c b/usr/src/cmd/ssh/libssh/common/readconf.c
index e08ff1e0b0..fe0b7a3ee8 100644
--- a/usr/src/cmd/ssh/libssh/common/readconf.c
+++ b/usr/src/cmd/ssh/libssh/common/readconf.c
@@ -11,15 +11,13 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 /*
- * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
 #include "includes.h"
 RCSID("$OpenBSD: readconf.c,v 1.100 2002/06/19 00:27:55 deraadt Exp $");
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include "ssh.h"
 #include "xmalloc.h"
 #include "compat.h"
@@ -129,7 +127,7 @@ typedef enum {
 	oClearAllForwardings, oNoHostAuthenticationForLocalhost,
 	oFallBackToRsh, oUseRsh, oConnectTimeout, oHashKnownHosts,
 	oServerAliveInterval, oServerAliveCountMax, oDisableBanner,
-	oIgnoreIfUnknown, oRekeyLimit,
+	oIgnoreIfUnknown, oRekeyLimit, oUseOpenSSLEngine,
 	oDeprecated
 } OpCodes;
 
@@ -223,6 +221,7 @@ static struct {
 	{ "disablebanner", oDisableBanner },
 	{ "hashknownhosts", oHashKnownHosts },
 	{ "ignoreifunknown", oIgnoreIfUnknown },
+	{ "useopensslengine", oUseOpenSSLEngine },
 	{ NULL, oBadOption }
 };
 
@@ -850,6 +849,10 @@ parse_int:
 		charptr = &options->ignore_if_unknown;
 		goto parse_string;
 
+	case oUseOpenSSLEngine:
+		intptr = &options->use_openssl_engine;
+		goto parse_flag;
+
 	case oDeprecated:
 		debug("%s line %d: Deprecated option \"%s\"",
 		    filename, linenum, keyword);
@@ -989,6 +992,7 @@ initialize_options(Options * options)
 	options->ignore_if_unknown = NULL;
 	options->unknown_opts_num = 0;
 	options->disable_banner = -1;
+	options->use_openssl_engine = -1;
 }
 
 /*
@@ -1135,6 +1139,8 @@ fill_default_options(Options * options)
 		options->hash_known_hosts = 0;
 	if (options->disable_banner == -1)
 		options->disable_banner = 0;
+	if (options->use_openssl_engine == -1)
+		options->use_openssl_engine = 1;
 	/* options->proxy_command should not be set by default */
 	/* options->user will be set in the main program if appropriate */
 	/* options->hostname will be set in the main program if appropriate */