===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/ssh-keysign.c,v
retrieving revision 1.4.4.3
retrieving revision 1.5
diff -u -r1.4.4.3 -r1.5
--- src/usr.bin/ssh/ssh-keysign.c	2003/04/03 22:35:18	1.4.4.3
+++ src/usr.bin/ssh/ssh-keysign.c	2002/06/26 22:27:32	1.5
@@ -22,15 +22,12 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "includes.h"
-RCSID("$OpenBSD: ssh-keysign.c,v 1.4.4.3 2003/04/03 22:35:18 miod Exp $");
+RCSID("$OpenBSD: ssh-keysign.c,v 1.5 2002/06/26 22:27:32 markus Exp $");
 
 #include <openssl/evp.h>
-#include <openssl/rand.h>
-#include <openssl/rsa.h>
 
 #include "log.h"
 #include "key.h"
-#include "ssh.h"
 #include "ssh2.h"
 #include "misc.h"
 #include "xmalloc.h"
@@ -40,10 +37,7 @@
 #include "msg.h"
 #include "canohost.h"
 #include "pathnames.h"
-#include "readconf.h"
 
-uid_t original_real_uid;	/* XXX readconf.c needs this */
-
 static int
 valid_request(struct passwd *pw, char *host, Key **ret, u_char *data,
     u_int datalen)
@@ -134,14 +128,12 @@
 main(int argc, char **argv)
 {
 	Buffer b;
-	Options options;
 	Key *keys[2], *key;
 	struct passwd *pw;
 	int key_fd[2], i, found, version = 2, fd;
 	u_char *signature, *data;
 	char *host;
 	u_int slen, dlen;
-	u_int32_t rnd[256];
 
 	key_fd[0] = open(_PATH_HOST_RSA_KEY_FILE, O_RDONLY);
 	key_fd[1] = open(_PATH_HOST_DSA_KEY_FILE, O_RDONLY);
@@ -153,15 +145,6 @@
 	log_init("ssh-keysign", SYSLOG_LEVEL_DEBUG3, SYSLOG_FACILITY_AUTH, 0);
 #endif
 
-	/* verify that ssh-keysign is enabled by the admin */
-	original_real_uid = getuid();	/* XXX readconf.c needs this */
-	initialize_options(&options);
-	(void)read_config_file(_PATH_HOST_CONFIG_FILE, "", &options);
-	fill_default_options(&options);
-	if (options.enable_ssh_keysign != 1)
-		fatal("ssh-keysign not enabled in %s",
-		    _PATH_HOST_CONFIG_FILE);
-
 	if (key_fd[0] == -1 && key_fd[1] == -1)
 		fatal("could not open any host key");
 
@@ -170,9 +153,6 @@
 	pw = pwcopy(pw);
 
 	SSLeay_add_all_algorithms();
-	for (i = 0; i < 256; i++)
-		rnd[i] = arc4random();
-	RAND_seed(rnd, sizeof(rnd));
 
 	found = 0;
 	for (i = 0; i < 2; i++) {
@@ -189,8 +169,8 @@
 		fatal("no hostkey found");
 
 	buffer_init(&b);
-	if (ssh_msg_recv(STDIN_FILENO, &b) < 0)
-		fatal("ssh_msg_recv failed");
+	if (msg_recv(STDIN_FILENO, &b) < 0)
+		fatal("msg_recv failed");
 	if (buffer_get_char(&b) != version)
 		fatal("bad version");
 	fd = buffer_get_int(&b);
@@ -222,7 +202,7 @@
 	/* send reply */
 	buffer_clear(&b);
 	buffer_put_string(&b, signature, slen);
-	ssh_msg_send(STDOUT_FILENO, version, &b);
+	msg_send(STDOUT_FILENO, version, &b);
 
 	return (0);
 }