1 files changed, 32 insertions, 5 deletions

diff --git a/ssh-keysign.c b/ssh-keysign.c
index 7f1d25d8c..79aee17c0 100644
--- a/ssh-keysign.c
+++ b/ssh-keysign.c
@@ -22,12 +22,15 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "includes.h"
-RCSID("$OpenBSD: ssh-keysign.c,v 1.4 2002/06/19 00:27:55 deraadt Exp $");
+RCSID("$OpenBSD: ssh-keysign.c,v 1.7 2002/07/03 14:21:05 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"
@@ -37,6 +40,9 @@ RCSID("$OpenBSD: ssh-keysign.c,v 1.4 2002/06/19 00:27:55 deraadt Exp $");
 #include "msg.h"
 #include "canohost.h"
 #include "pathnames.h"
+#include "readconf.h"
+
+uid_t original_real_uid;        /* XXX readconf.c needs this */
 
 #ifdef HAVE___PROGNAME
 extern char *__progname;
@@ -134,12 +140,14 @@ int
 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);
@@ -155,6 +163,15 @@ main(int argc, char **argv)
         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.hostbased_authentication != 1)
+                fatal("Hostbased authentication not enabled in %s",
+                    _PATH_HOST_CONFIG_FILE);
+
         if (key_fd[0] == -1 && key_fd[1] == -1)
                 fatal("could not open any host key");
 
@@ -163,6 +180,9 @@ main(int argc, char **argv)
         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++) {
@@ -172,6 +192,13 @@ main(int argc, char **argv)
                 keys[i] = key_load_private_pem(key_fd[i], KEY_UNSPEC,
                     NULL, NULL);
                 close(key_fd[i]);
+                if (keys[i] != NULL && keys[i]->type == KEY_RSA) {
+                        if (RSA_blinding_on(keys[i]->rsa, NULL) != 1) {
+                                error("RSA_blinding_on failed");
+                                key_free(keys[i]);
+                                keys[i] = NULL;
+                        }
+                }
                 if (keys[i] != NULL)
                         found = 1;
         }
@@ -179,8 +206,8 @@ main(int argc, char **argv)
                 fatal("no hostkey found");
 
         buffer_init(&b);
-        if (msg_recv(STDIN_FILENO, &b) < 0)
-                fatal("msg_recv failed");
+        if (ssh_msg_recv(STDIN_FILENO, &b) < 0)
+                fatal("ssh_msg_recv failed");
         if (buffer_get_char(&b) != version)
                 fatal("bad version");
         fd = buffer_get_int(&b);
@@ -192,7 +219,6 @@ main(int argc, char **argv)
         data = buffer_get_string(&b, &dlen);
         if (valid_request(pw, host, &key, data, dlen) < 0)
                 fatal("not a valid request");
-        xfree(data);
         xfree(host);
 
         found = 0;
@@ -208,11 +234,12 @@ main(int argc, char **argv)
 
         if (key_sign(keys[i], &signature, &slen, data, dlen) != 0)
                 fatal("key_sign failed");
+        xfree(data);
 
         /* send reply */
         buffer_clear(&b);
         buffer_put_string(&b, signature, slen);
-        msg_send(STDOUT_FILENO, version, &b);
+        ssh_msg_send(STDOUT_FILENO, version, &b);
 
         return (0);
 }