Engines patch that applies cleanly against 4.7

openssh-4.7_p1-engines.patch (text/plain), 4.10 KB, created by Asfand Yar Qazi on 2007-10-09 20:57:23 UTC

diff -urN openssh-4.7p1.orig/ssh-add.c openssh-4.7p1/ssh-add.c
--- openssh-4.7p1.orig/ssh-add.c	2006-09-01 07:38:37.000000000 +0200
+++ openssh-4.7p1/ssh-add.c	2007-05-19 02:52:09.000000000 +0200
@@ -42,6 +42,7 @@
 #include <sys/param.h>
 
 #include <openssl/evp.h>
+#include <openssl/engine.h>
 
 #include <fcntl.h>
 #include <pwd.h>
@@ -343,6 +344,11 @@
 
 	SSLeay_add_all_algorithms();
 
+	/* Init available hardware crypto engines. */
+	ENGINE_load_builtin_engines();
+	ENGINE_register_all_complete();
+	ENGINE_set_default_ciphers(ENGINE_by_id("padlock"));
+
 	/* At first, get a connection to the authentication agent. */
 	ac = ssh_get_authentication_connection();
 	if (ac == NULL) {
diff -urN openssh-4.7p1.orig/ssh-agent.c openssh-4.7p1/ssh-agent.c
--- openssh-4.7p1.orig/ssh-agent.c	2007-02-28 11:19:58.000000000 +0100
+++ openssh-4.7p1/ssh-agent.c	2007-05-19 02:52:09.000000000 +0200
@@ -51,6 +51,7 @@
 
 #include <openssl/evp.h>
 #include <openssl/md5.h>
+#include <openssl/engine.h>
 
 #include <errno.h>
 #include <fcntl.h>
@@ -1043,6 +1044,11 @@
 
 	SSLeay_add_all_algorithms();
 
+	/* Init available hardware crypto engines. */
+	ENGINE_load_builtin_engines();
+	ENGINE_register_all_complete();
+	ENGINE_set_default_ciphers(ENGINE_by_id("padlock"));
+
 	__progname = ssh_get_progname(av[0]);
 	init_rng();
 	seed_rng();
diff -urN openssh-4.7p1.orig/ssh-keygen.c openssh-4.7p1/ssh-keygen.c
--- openssh-4.7p1.orig/ssh-keygen.c	2007-02-19 12:10:25.000000000 +0100
+++ openssh-4.7p1/ssh-keygen.c	2007-05-19 02:52:09.000000000 +0200
@@ -21,6 +21,7 @@
 
 #include <openssl/evp.h>
 #include <openssl/pem.h>
+#include <openssl/engine.h>
 
 #include <errno.h>
 #include <fcntl.h>
@@ -1073,6 +1074,12 @@
 	__progname = ssh_get_progname(argv[0]);
 
 	SSLeay_add_all_algorithms();
+
+  	/* Init available hardware crypto engines. */
+  	ENGINE_load_builtin_engines();
+  	ENGINE_register_all_complete();
+  	ENGINE_set_default_ciphers(ENGINE_by_id("padlock"));
+
 	log_init(argv[0], SYSLOG_LEVEL_INFO, SYSLOG_FACILITY_USER, 1);
 
 	init_rng();
diff -urN openssh-4.7p1.orig/ssh-keysign.c openssh-4.7p1/ssh-keysign.c
--- openssh-4.7p1.orig/ssh-keysign.c	2006-09-01 07:38:37.000000000 +0200
+++ openssh-4.7p1/ssh-keysign.c	2007-05-19 02:52:09.000000000 +0200
@@ -38,6 +38,7 @@
 #include <openssl/evp.h>
 #include <openssl/rand.h>
 #include <openssl/rsa.h>
+#include <openssl/engine.h>
 
 #include "xmalloc.h"
 #include "log.h"
@@ -195,6 +196,12 @@
 		fatal("could not open any host key");
 
 	SSLeay_add_all_algorithms();
+
+	/* Init available hardware crypto engines. */
+	ENGINE_load_builtin_engines();
+	ENGINE_register_all_complete();
+	ENGINE_set_default_ciphers(ENGINE_by_id("padlock"));
+
 	for (i = 0; i < 256; i++)
 		rnd[i] = arc4random();
 	RAND_seed(rnd, sizeof(rnd));
diff -urN openssh-4.7p1.orig/ssh.c openssh-4.7p1/ssh.c
--- openssh-4.7p1.orig/ssh.c	2007-01-05 06:30:17.000000000 +0100
+++ openssh-4.7p1/ssh.c	2007-05-19 02:52:09.000000000 +0200
@@ -72,6 +72,7 @@
 
 #include <openssl/evp.h>
 #include <openssl/err.h>
+#include <openssl/engine.h>
 
 #include "xmalloc.h"
 #include "ssh.h"
@@ -556,6 +557,11 @@
 	SSLeay_add_all_algorithms();
 	ERR_load_crypto_strings();
 
+	/* Init available hardware crypto engines. */
+	ENGINE_load_builtin_engines();
+	ENGINE_register_all_complete();
+	ENGINE_set_default_ciphers(ENGINE_by_id("padlock"));
+
 	/* Initialize the command to execute on remote host. */
 	buffer_init(&command);
 
diff -urN openssh-4.7p1.orig/sshd.c openssh-4.7p1/sshd.c
--- openssh-4.7p1.orig/sshd.c	2007-02-25 10:37:22.000000000 +0100
+++ openssh-4.7p1/sshd.c	2007-05-19 02:52:09.000000000 +0200
@@ -75,6 +75,7 @@
 #include <openssl/bn.h>
 #include <openssl/md5.h>
 #include <openssl/rand.h>
+#include <openssl/engine.h>
 #ifdef HAVE_SECUREWARE
 #include <sys/security.h>
 #include <prot.h>
@@ -1027,6 +1028,11 @@
 	for (i = 0; i < options.max_startups; i++)
 		startup_pipes[i] = -1;
 
+	/* Init available hardware crypto engines. */
+	ENGINE_load_builtin_engines();
+	ENGINE_register_all_complete();
+	ENGINE_set_default_ciphers(ENGINE_by_id("padlock"));
+
 	/*
 	 * Stay listening for connections until the system crashes or
 	 * the daemon is killed with a signal.