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

Return to authfile.c CVS log

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

Diff for /src/usr.bin/ssh/authfile.c between version 1.39.2.3 and 1.40

version 1.39.2.3, 2002/06/26 18:22:34

version 1.40, 2001/12/05 10:06:12

Line 50

#include "ssh.h"

#include "log.h"

#include "authfile.h"

#include "rsa.h"

/* Version identification string for SSH v1 identity files. */

static const char authfile_id_string[] =

Line 68

Line 67

const char *comment)

{

Buffer buffer, encrypted;

u_char buf[100], *cp;

char buf[100], *cp;

int fd, i, cipher_num;

int fd, i;

CipherContext ciphercontext;

Cipher *cipher;

u_int32_t rand;

Line 78

Line 77

* If the passphrase is empty, use SSH_CIPHER_NONE to ease converting

* to another cipher; otherwise use SSH_AUTHFILE_CIPHER.

cipher_num = (strcmp(passphrase, "") == 0) ?

if (strcmp(passphrase, "") == 0)

SSH_CIPHER_NONE : SSH_AUTHFILE_CIPHER;

cipher = cipher_by_number(SSH_CIPHER_NONE);

if ((cipher = cipher_by_number(cipher_num)) == NULL)

else

cipher = cipher_by_number(SSH_AUTHFILE_CIPHER);

if (cipher == NULL)

fatal("save_private_key_rsa: bad cipher");

/* This buffer is used to built the secret part of the private key. */

Line 117

Line 118

buffer_put_char(&encrypted, 0);

/* Store cipher type. */

buffer_put_char(&encrypted, cipher_num);

buffer_put_char(&encrypted, cipher->number);

buffer_put_int(&encrypted, 0); /* For future extension */

/* Store public key. This will be in plain text. */

Line 127

Line 128

buffer_put_cstring(&encrypted, comment);

/* Allocate space for the private part of the key in the buffer. */

cp = buffer_append_space(&encrypted, buffer_len(&buffer));

buffer_append_space(&encrypted, &cp, buffer_len(&buffer));

cipher_set_key_string(&ciphercontext, cipher, passphrase,

cipher_set_key_string(&ciphercontext, cipher, passphrase);

CIPHER_ENCRYPT);

cipher_encrypt(&ciphercontext, (u_char *) cp,

cipher_crypt(&ciphercontext, cp,

(u_char *) buffer_ptr(&buffer), buffer_len(&buffer));

buffer_ptr(&buffer), buffer_len(&buffer));

cipher_cleanup(&ciphercontext);

memset(&ciphercontext, 0, sizeof(ciphercontext));

/* Destroy temporary data. */

Line 148

Line 147

if (write(fd, buffer_ptr(&encrypted), buffer_len(&encrypted)) !=

buffer_len(&encrypted)) {

error("write to key file %s failed: %s", filename,

strerror(errno));

buffer_free(&encrypted);

close(fd);

unlink(filename);

Line 168

Line 167

int fd;

int success = 0;

int len = strlen(_passphrase);

u_char *passphrase = (len > 0) ? (u_char *)_passphrase : NULL;

char *passphrase = (len > 0) ? (char *)_passphrase : NULL;

const EVP_CIPHER *cipher = (len > 0) ? EVP_des_ede3_cbc() : NULL;

EVP_CIPHER *cipher = (len > 0) ? EVP_des_ede3_cbc() : NULL;

if (len > 0 && len <= 4) {

error("passphrase too short: have %d bytes, need > 4", len);

Line 240

Line 239

lseek(fd, (off_t) 0, SEEK_SET);

buffer_init(&buffer);

cp = buffer_append_space(&buffer, len);

buffer_append_space(&buffer, &cp, len);

if (read(fd, cp, (size_t) len) != (size_t) len) {

debug("Read from key file %.200s failed: %.100s", filename,

Line 270

Line 269

(void) buffer_get_int(&buffer); /* reserved */

/* Read the public key from the buffer. */

(void) buffer_get_int(&buffer);

buffer_get_int(&buffer);

pub = key_new(KEY_RSA1);

buffer_get_bignum(&buffer, pub->rsa->n);

buffer_get_bignum(&buffer, pub->rsa->e);

Line 314

Line 313

int i, check1, check2, cipher_type;

off_t len;

Buffer buffer, decrypted;

u_char *cp;

char *cp;

CipherContext ciphercontext;

Cipher *cipher;

BN_CTX *ctx;

BIGNUM *aux;

Key *prv = NULL;

len = lseek(fd, (off_t) 0, SEEK_END);

lseek(fd, (off_t) 0, SEEK_SET);

buffer_init(&buffer);

cp = buffer_append_space(&buffer, len);

buffer_append_space(&buffer, &cp, len);

if (read(fd, cp, (size_t) len) != (size_t) len) {

debug("Read from key file %.200s failed: %.100s", filename,

Line 357

Line 358

(void) buffer_get_int(&buffer); /* Reserved data. */

/* Read the public key from the buffer. */

(void) buffer_get_int(&buffer);

buffer_get_int(&buffer);

prv = key_new_private(KEY_RSA1);

buffer_get_bignum(&buffer, prv->rsa->n);

Line 377

Line 378

}

/* Initialize space for decrypted data. */

buffer_init(&decrypted);

cp = buffer_append_space(&decrypted, buffer_len(&buffer));

buffer_append_space(&decrypted, &cp, buffer_len(&buffer));

/* Rest of the buffer is encrypted. Decrypt it using the passphrase. */

cipher_set_key_string(&ciphercontext, cipher, passphrase,

cipher_set_key_string(&ciphercontext, cipher, passphrase);

CIPHER_DECRYPT);

cipher_decrypt(&ciphercontext, (u_char *) cp,

cipher_crypt(&ciphercontext, cp,

(u_char *) buffer_ptr(&buffer), buffer_len(&buffer));

buffer_ptr(&buffer), buffer_len(&buffer));

cipher_cleanup(&ciphercontext);

memset(&ciphercontext, 0, sizeof(ciphercontext));

buffer_free(&buffer);

Line 407

Line 406

buffer_get_bignum(&decrypted, prv->rsa->p); /* q */

/* calculate p-1 and q-1 */

rsa_generate_additional_parameters(prv->rsa);

ctx = BN_CTX_new();

aux = BN_new();

BN_sub(aux, prv->rsa->q, BN_value_one());

BN_mod(prv->rsa->dmq1, prv->rsa->d, aux, ctx);

BN_sub(aux, prv->rsa->p, BN_value_one());

BN_mod(prv->rsa->dmp1, prv->rsa->d, aux, ctx);

BN_clear_free(aux);

BN_CTX_free(ctx);

buffer_free(&decrypted);

close(fd);

return prv;

Line 421

Line 430

return NULL;

}

Key *

static Key *

key_load_private_pem(int fd, int type, const char *passphrase,

char **commentp)

{

Line 441

Line 450

debug("PEM_read_PrivateKey failed");

(void)ERR_get_error();

} else if (pk->type == EVP_PKEY_RSA &&

(type == KEY_UNSPEC||type==KEY_RSA)) {

prv = key_new(KEY_UNSPEC);

prv->rsa = EVP_PKEY_get1_RSA(pk);

prv->type = KEY_RSA;

Line 450

Line 459

RSA_print_fp(stderr, prv->rsa, 8);

#endif

} else if (pk->type == EVP_PKEY_DSA &&

(type == KEY_UNSPEC||type==KEY_DSA)) {

prv = key_new(KEY_UNSPEC);

prv->dsa = EVP_PKEY_get1_DSA(pk);

prv->type = KEY_DSA;