src/usr.bin/ssh/ssh-keysign.c - diff

Return to ssh-keysign.c CVS log

Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/ssh-keysign.c between version 1.4.4.3 and 1.5

version 1.4.4.3, 2003/04/03 22:35:18

version 1.5, 2002/06/26 22:27:32

Line 25

RCSID("$OpenBSD$");

#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"

Line 40

Line 37

#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)

Line 134

Line 128

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);

Line 153

Line 145

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");

Line 170

Line 153

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++) {

Line 189

Line 169

fatal("no hostkey found");

buffer_init(&b);

if (ssh_msg_recv(STDIN_FILENO, &b) < 0)

if (msg_recv(STDIN_FILENO, &b) < 0)

fatal("ssh_msg_recv failed");

fatal("msg_recv failed");

if (buffer_get_char(&b) != version)

fatal("bad version");

fd = buffer_get_int(&b);

Line 222

Line 202

/* 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);

}