-/* $OpenBSD: authfile.c,v 1.76 2006/08/03 03:34:41 deraadt Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
*/
#include "includes.h"
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/param.h>
-#include <sys/uio.h>
+RCSID("$OpenBSD: authfile.c,v 1.39 2001/10/07 10:29:52 markus Exp $");
#include <openssl/err.h>
#include <openssl/evp.h>
#include <openssl/pem.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "xmalloc.h"
#include "cipher.h"
+#include "xmalloc.h"
#include "buffer.h"
+#include "bufaux.h"
#include "key.h"
#include "ssh.h"
#include "log.h"
#include "authfile.h"
-#include "rsa.h"
-#include "misc.h"
-#include "atomicio.h"
/* Version identification string for SSH v1 identity files. */
static const char authfile_id_string[] =
const char *comment)
{
Buffer buffer, encrypted;
- u_char buf[100], *cp;
- int fd, i, cipher_num;
+ char buf[100], *cp;
+ int fd, i;
CipherContext ciphercontext;
Cipher *cipher;
- u_int32_t rnd;
+ u_int32_t rand;
/*
* 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) ?
- SSH_CIPHER_NONE : SSH_AUTHFILE_CIPHER;
- if ((cipher = cipher_by_number(cipher_num)) == NULL)
+ if (strcmp(passphrase, "") == 0)
+ cipher = cipher_by_number(SSH_CIPHER_NONE);
+ 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. */
buffer_init(&buffer);
/* Put checkbytes for checking passphrase validity. */
- rnd = arc4random();
- buf[0] = rnd & 0xff;
- buf[1] = (rnd >> 8) & 0xff;
+ rand = arc4random();
+ buf[0] = rand & 0xff;
+ buf[1] = (rand >> 8) & 0xff;
buf[2] = buf[0];
buf[3] = buf[1];
buffer_append(&buffer, buf, 4);
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. */
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_ENCRYPT);
- cipher_crypt(&ciphercontext, cp,
- buffer_ptr(&buffer), buffer_len(&buffer));
- cipher_cleanup(&ciphercontext);
+ cipher_set_key_string(&ciphercontext, cipher, passphrase);
+ cipher_encrypt(&ciphercontext, (u_char *) cp,
+ (u_char *) buffer_ptr(&buffer), buffer_len(&buffer));
memset(&ciphercontext, 0, sizeof(ciphercontext));
/* Destroy temporary data. */
fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC, 0600);
if (fd < 0) {
error("open %s failed: %s.", filename, strerror(errno));
- buffer_free(&encrypted);
return 0;
}
- if (atomicio(vwrite, fd, buffer_ptr(&encrypted),
- buffer_len(&encrypted)) != buffer_len(&encrypted)) {
+ if (write(fd, buffer_ptr(&encrypted), buffer_len(&encrypted)) !=
+ buffer_len(&encrypted)) {
error("write to key file %s failed: %s", filename,
- strerror(errno));
+ strerror(errno));
buffer_free(&encrypted);
close(fd);
unlink(filename);
int fd;
int success = 0;
int len = strlen(_passphrase);
- u_char *passphrase = (len > 0) ? (u_char *)_passphrase : NULL;
- const EVP_CIPHER *cipher = (len > 0) ? EVP_des_ede3_cbc() : NULL;
+ char *passphrase = (len > 0) ? (char *)_passphrase : 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);
return 0;
}
fp = fdopen(fd, "w");
- if (fp == NULL) {
+ if (fp == NULL ) {
error("fdopen %s failed: %s.", filename, strerror(errno));
close(fd);
return 0;
case KEY_RSA1:
return key_save_private_rsa1(key, filename, passphrase,
comment);
+ break;
case KEY_DSA:
case KEY_RSA:
return key_save_private_pem(key, filename, passphrase,
comment);
+ break;
default:
break;
}
{
Buffer buffer;
Key *pub;
- struct stat st;
char *cp;
- u_int i;
- size_t len;
+ int i;
+ off_t len;
- if (fstat(fd, &st) < 0) {
- error("fstat for key file %.200s failed: %.100s",
- filename, strerror(errno));
- return NULL;
- }
- if (st.st_size > 1*1024*1024) {
- error("key file %.200s too large", filename);
- return NULL;
- }
- len = (size_t)st.st_size; /* truncated */
+ 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 (atomicio(read, fd, cp, len) != len) {
+ if (read(fd, cp, (size_t) len) != (size_t) len) {
debug("Read from key file %.200s failed: %.100s", filename,
strerror(errno));
buffer_free(&buffer);
(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);
key_load_private_rsa1(int fd, const char *filename, const char *passphrase,
char **commentp)
{
- u_int i;
- int check1, check2, cipher_type;
- size_t len;
+ 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;
- struct stat st;
- if (fstat(fd, &st) < 0) {
- error("fstat for key file %.200s failed: %.100s",
- filename, strerror(errno));
- close(fd);
- return NULL;
- }
- if (st.st_size > 1*1024*1024) {
- error("key file %.200s too large", filename);
- close(fd);
- return (NULL);
- }
- len = (size_t)st.st_size; /* truncated */
+ 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 (atomicio(read, fd, cp, len) != len) {
+ if (read(fd, cp, (size_t) len) != (size_t) len) {
debug("Read from key file %.200s failed: %.100s", filename,
strerror(errno));
buffer_free(&buffer);
(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);
}
/* 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_DECRYPT);
- cipher_crypt(&ciphercontext, cp,
- buffer_ptr(&buffer), buffer_len(&buffer));
- cipher_cleanup(&ciphercontext);
+ cipher_set_key_string(&ciphercontext, cipher, passphrase);
+ cipher_decrypt(&ciphercontext, (u_char *) cp,
+ (u_char *) buffer_ptr(&buffer), buffer_len(&buffer));
memset(&ciphercontext, 0, sizeof(ciphercontext));
buffer_free(&buffer);
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();
- buffer_free(&decrypted);
+ BN_sub(aux, prv->rsa->q, BN_value_one());
+ BN_mod(prv->rsa->dmq1, prv->rsa->d, aux, ctx);
- /* enable blinding */
- if (RSA_blinding_on(prv->rsa, NULL) != 1) {
- error("key_load_private_rsa1: RSA_blinding_on failed");
- goto fail;
- }
+ 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;
return NULL;
}
-Key *
+static Key *
key_load_private_pem(int fd, int type, const char *passphrase,
char **commentp)
{
debug("PEM_read_PrivateKey failed");
(void)ERR_get_error();
} else if (pk->type == EVP_PKEY_RSA &&
- (type == KEY_UNSPEC||type==KEY_RSA)) {
+ (type == KEY_UNSPEC||type==KEY_RSA)) {
prv = key_new(KEY_UNSPEC);
prv->rsa = EVP_PKEY_get1_RSA(pk);
prv->type = KEY_RSA;
#ifdef DEBUG_PK
RSA_print_fp(stderr, prv->rsa, 8);
#endif
- if (RSA_blinding_on(prv->rsa, NULL) != 1) {
- error("key_load_private_pem: RSA_blinding_on failed");
- key_free(prv);
- prv = NULL;
- }
} else if (pk->type == EVP_PKEY_DSA &&
- (type == KEY_UNSPEC||type==KEY_DSA)) {
+ (type == KEY_UNSPEC||type==KEY_DSA)) {
prv = key_new(KEY_UNSPEC);
prv->dsa = EVP_PKEY_get1_DSA(pk);
prv->type = KEY_DSA;
return prv;
}
-int
+static int
key_perm_ok(int fd, const char *filename)
{
struct stat st;
error("@ WARNING: UNPROTECTED PRIVATE KEY FILE! @");
error("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@");
error("Permissions 0%3.3o for '%s' are too open.",
- (u_int)st.st_mode & 0777, filename);
+ st.st_mode & 0777, filename);
error("It is recommended that your private key files are NOT accessible by others.");
error("This private key will be ignored.");
return 0;
Key *
key_load_private_type(int type, const char *filename, const char *passphrase,
- char **commentp, int *perm_ok)
+ char **commentp)
{
int fd;
if (fd < 0)
return NULL;
if (!key_perm_ok(fd, filename)) {
- if (perm_ok != NULL)
- *perm_ok = 0;
error("bad permissions: ignore key: %s", filename);
close(fd);
return NULL;
}
- if (perm_ok != NULL)
- *perm_ok = 1;
switch (type) {
case KEY_RSA1:
return key_load_private_rsa1(fd, filename, passphrase,
commentp);
/* closes fd */
+ break;
case KEY_DSA:
case KEY_RSA:
case KEY_UNSPEC:
return key_load_private_pem(fd, type, passphrase, commentp);
/* closes fd */
+ break;
default:
close(fd);
break;
key_try_load_public(Key *k, const char *filename, char **commentp)
{
FILE *f;
- char line[SSH_MAX_PUBKEY_BYTES];
+ char line[4096];
char *cp;
- u_long linenum = 0;
f = fopen(filename, "r");
if (f != NULL) {
- while (read_keyfile_line(f, filename, line, sizeof(line),
- &linenum) != -1) {
+ while (fgets(line, sizeof(line), f)) {
+ line[sizeof(line)-1] = '\0';
cp = line;
- switch (*cp) {
+ switch(*cp){
case '#':
case '\n':
case '\0':
Key *pub;
char file[MAXPATHLEN];
- /* try rsa1 private key */
pub = key_load_public_type(KEY_RSA1, filename, commentp);
if (pub != NULL)
return pub;
-
- /* try rsa1 public key */
- pub = key_new(KEY_RSA1);
- if (key_try_load_public(pub, filename, commentp) == 1)
- return pub;
- key_free(pub);
-
- /* try ssh2 public key */
pub = key_new(KEY_UNSPEC);
if (key_try_load_public(pub, filename, commentp) == 1)
return pub;
andersk / gssapi-openssh.git / blobdiff