=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/Attic/key.c,v retrieving revision 1.25.2.4 retrieving revision 1.26 diff -u -r1.25.2.4 -r1.26 --- src/usr.bin/ssh/Attic/key.c 2002/06/02 22:56:10 1.25.2.4 +++ src/usr.bin/ssh/Attic/key.c 2001/06/23 05:26:02 1.26 @@ -9,7 +9,7 @@ * called by a name other than "ssh" or "Secure Shell". * * - * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. + * Copyright (c) 2000 Markus Friedl. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -32,7 +32,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "includes.h" -RCSID("$OpenBSD: key.c,v 1.25.2.4 2002/06/02 22:56:10 miod Exp $"); +RCSID("$OpenBSD: key.c,v 1.26 2001/06/23 05:26:02 markus Exp $"); #include @@ -54,31 +54,22 @@ DSA *dsa; k = xmalloc(sizeof(*k)); k->type = type; - k->flags = 0; k->dsa = NULL; k->rsa = NULL; switch (k->type) { case KEY_RSA1: case KEY_RSA: - if ((rsa = RSA_new()) == NULL) - fatal("key_new: RSA_new failed"); - if ((rsa->n = BN_new()) == NULL) - fatal("key_new: BN_new failed"); - if ((rsa->e = BN_new()) == NULL) - fatal("key_new: BN_new failed"); + rsa = RSA_new(); + rsa->n = BN_new(); + rsa->e = BN_new(); k->rsa = rsa; break; case KEY_DSA: - if ((dsa = DSA_new()) == NULL) - fatal("key_new: DSA_new failed"); - if ((dsa->p = BN_new()) == NULL) - fatal("key_new: BN_new failed"); - if ((dsa->q = BN_new()) == NULL) - fatal("key_new: BN_new failed"); - if ((dsa->g = BN_new()) == NULL) - fatal("key_new: BN_new failed"); - if ((dsa->pub_key = BN_new()) == NULL) - fatal("key_new: BN_new failed"); + dsa = DSA_new(); + dsa->p = BN_new(); + dsa->q = BN_new(); + dsa->g = BN_new(); + dsa->pub_key = BN_new(); k->dsa = dsa; break; case KEY_UNSPEC: @@ -96,22 +87,15 @@ switch (k->type) { case KEY_RSA1: case KEY_RSA: - if ((k->rsa->d = BN_new()) == NULL) - fatal("key_new_private: BN_new failed"); - if ((k->rsa->iqmp = BN_new()) == NULL) - fatal("key_new_private: BN_new failed"); - if ((k->rsa->q = BN_new()) == NULL) - fatal("key_new_private: BN_new failed"); - if ((k->rsa->p = BN_new()) == NULL) - fatal("key_new_private: BN_new failed"); - if ((k->rsa->dmq1 = BN_new()) == NULL) - fatal("key_new_private: BN_new failed"); - if ((k->rsa->dmp1 = BN_new()) == NULL) - fatal("key_new_private: BN_new failed"); + k->rsa->d = BN_new(); + k->rsa->iqmp = BN_new(); + k->rsa->q = BN_new(); + k->rsa->p = BN_new(); + k->rsa->dmq1 = BN_new(); + k->rsa->dmp1 = BN_new(); break; case KEY_DSA: - if ((k->dsa->priv_key = BN_new()) == NULL) - fatal("key_new_private: BN_new failed"); + k->dsa->priv_key = BN_new(); break; case KEY_UNSPEC: break; @@ -169,14 +153,14 @@ return 0; } -static u_char* -key_fingerprint_raw(Key *k, enum fp_type dgst_type, u_int *dgst_raw_length) +u_char* +key_fingerprint_raw(Key *k, enum fp_type dgst_type, size_t *dgst_raw_length) { - const EVP_MD *md = NULL; + EVP_MD *md = NULL; EVP_MD_CTX ctx; u_char *blob = NULL; u_char *retval = NULL; - u_int len = 0; + int len = 0; int nlen, elen; *dgst_raw_length = 0; @@ -216,7 +200,8 @@ retval = xmalloc(EVP_MAX_MD_SIZE); EVP_DigestInit(&ctx, md); EVP_DigestUpdate(&ctx, blob, len); - EVP_DigestFinal(&ctx, retval, dgst_raw_length); + EVP_DigestFinal(&ctx, retval, NULL); + *dgst_raw_length = md->md_size; memset(blob, 0, len); xfree(blob); } else { @@ -225,15 +210,15 @@ return retval; } -static char* -key_fingerprint_hex(u_char* dgst_raw, u_int dgst_raw_len) +char* +key_fingerprint_hex(u_char* dgst_raw, size_t dgst_raw_len) { char *retval; int i; retval = xmalloc(dgst_raw_len * 3 + 1); retval[0] = '\0'; - for (i = 0; i < dgst_raw_len; i++) { + for(i = 0; i < dgst_raw_len; i++) { char hex[4]; snprintf(hex, sizeof(hex), "%02x:", dgst_raw[i]); strlcat(retval, hex, dgst_raw_len * 3); @@ -242,8 +227,8 @@ return retval; } -static char* -key_fingerprint_bubblebabble(u_char* dgst_raw, u_int dgst_raw_len) +char* +key_fingerprint_bubblebabble(u_char* dgst_raw, size_t dgst_raw_len) { char vowels[] = { 'a', 'e', 'i', 'o', 'u', 'y' }; char consonants[] = { 'b', 'c', 'd', 'f', 'g', 'h', 'k', 'l', 'm', @@ -294,12 +279,12 @@ { char *retval = NULL; u_char *dgst_raw; - u_int dgst_raw_len; - + size_t dgst_raw_len; + dgst_raw = key_fingerprint_raw(k, dgst_type, &dgst_raw_len); if (!dgst_raw) fatal("key_fingerprint: null from key_fingerprint_raw()"); - switch (dgst_rep) { + switch(dgst_rep) { case SSH_FP_HEX: retval = key_fingerprint_hex(dgst_raw, dgst_raw_len); break; @@ -323,7 +308,7 @@ * last processed (and maybe modified) character. Note that this may modify * the buffer containing the number. */ -static int +int read_bignum(char **cpp, BIGNUM * value) { char *cp = *cpp; @@ -359,7 +344,7 @@ *cpp = cp; return 1; } -static int +int write_bignum(FILE *f, BIGNUM *num) { char *buf = BN_bn2dec(num); @@ -368,11 +353,11 @@ return 0; } fprintf(f, " %s", buf); - OPENSSL_free(buf); + xfree(buf); return 1; } -/* returns 1 ok, -1 error */ +/* returns 1 ok, -1 error, 0 type mismatch */ int key_read(Key *ret, char **cpp) { @@ -385,7 +370,7 @@ cp = *cpp; - switch (ret->type) { + switch(ret->type) { case KEY_RSA1: /* Get number of bits. */ if (*cp < '0' || *cp > '9') @@ -427,22 +412,21 @@ } else if (ret->type != type) { /* is a key, but different type */ debug3("key_read: type mismatch"); - return -1; + return 0; } len = 2*strlen(cp); blob = xmalloc(len); n = uudecode(cp, blob, len); if (n < 0) { error("key_read: uudecode %s failed", cp); - xfree(blob); return -1; } k = key_from_blob(blob, n); - xfree(blob); if (k == NULL) { error("key_read: key_from_blob %s failed", cp); return -1; } + xfree(blob); if (k->type != type) { error("key_read: type mismatch: encoding error"); key_free(k); @@ -469,9 +453,9 @@ #endif } /*XXXX*/ - key_free(k); if (success != 1) break; + key_free(k); /* advance cp: skip whitespace and data */ while (*cp == ' ' || *cp == '\t') cp++; @@ -488,9 +472,8 @@ int key_write(Key *key, FILE *f) { - int n, success = 0; - u_int len, bits = 0; - u_char *blob, *uu; + int success = 0; + u_int bits = 0; if (key->type == KEY_RSA1 && key->rsa != NULL) { /* size of modulus 'n' */ @@ -504,6 +487,8 @@ } } else if ((key->type == KEY_DSA && key->dsa != NULL) || (key->type == KEY_RSA && key->rsa != NULL)) { + int len, n; + u_char *blob, *uu; key_to_blob(key, &blob, &len); uu = xmalloc(2*len); n = uuencode(blob, len, uu, 2*len); @@ -546,8 +531,7 @@ return "ssh-unknown"; } u_int -key_size(Key *k) -{ +key_size(Key *k){ switch (k->type) { case KEY_RSA1: case KEY_RSA: @@ -560,7 +544,7 @@ return 0; } -static RSA * +RSA * rsa_generate_private_key(u_int bits) { RSA *private; @@ -570,7 +554,7 @@ return private; } -static DSA* +DSA* dsa_generate_private_key(u_int bits) { DSA *private = DSA_generate_parameters(bits, NULL, 0, NULL, NULL, NULL, NULL); @@ -630,15 +614,15 @@ int key_type_from_name(char *name) { - if (strcmp(name, "rsa1") == 0) { + if (strcmp(name, "rsa1") == 0){ return KEY_RSA1; - } else if (strcmp(name, "rsa") == 0) { + } else if (strcmp(name, "rsa") == 0){ return KEY_RSA; - } else if (strcmp(name, "dsa") == 0) { + } else if (strcmp(name, "dsa") == 0){ return KEY_DSA; - } else if (strcmp(name, "ssh-rsa") == 0) { + } else if (strcmp(name, "ssh-rsa") == 0){ return KEY_RSA; - } else if (strcmp(name, "ssh-dss") == 0) { + } else if (strcmp(name, "ssh-dss") == 0){ return KEY_DSA; } debug2("key_type_from_name: unknown key type '%s'", name); @@ -654,7 +638,7 @@ return 0; s = cp = xstrdup(names); for ((p = strsep(&cp, ",")); p && *p != '\0'; - (p = strsep(&cp, ","))) { + (p = strsep(&cp, ","))) { switch (key_type_from_name(p)) { case KEY_RSA1: case KEY_UNSPEC: @@ -668,7 +652,7 @@ } Key * -key_from_blob(u_char *blob, int blen) +key_from_blob(char *blob, int blen) { Buffer b; char *ktype; @@ -683,7 +667,7 @@ ktype = buffer_get_string(&b, NULL); type = key_type_from_name(ktype); - switch (type) { + switch(type){ case KEY_RSA: key = key_new(type); buffer_get_bignum2(&b, key->rsa->e); @@ -729,7 +713,7 @@ return 0; } buffer_init(&b); - switch (key->type) { + switch(key->type){ case KEY_DSA: buffer_put_cstring(&b, key_ssh_name(key)); buffer_put_bignum2(&b, key->dsa->p); @@ -743,9 +727,8 @@ buffer_put_bignum2(&b, key->rsa->n); break; default: - error("key_to_blob: unsupported key type %d", key->type); - buffer_free(&b); - return 0; + error("key_to_blob: illegal key type %d", key->type); + break; } len = buffer_len(&b); buf = xmalloc(len); @@ -762,10 +745,10 @@ int key_sign( Key *key, - u_char **sigp, u_int *lenp, - u_char *data, u_int datalen) + u_char **sigp, int *lenp, + u_char *data, int datalen) { - switch (key->type) { + switch(key->type){ case KEY_DSA: return ssh_dss_sign(key, sigp, lenp, data, datalen); break; @@ -782,13 +765,13 @@ int key_verify( Key *key, - u_char *signature, u_int signaturelen, - u_char *data, u_int datalen) + u_char *signature, int signaturelen, + u_char *data, int datalen) { if (signaturelen == 0) return -1; - switch (key->type) { + switch(key->type){ case KEY_DSA: return ssh_dss_verify(key, signature, signaturelen, data, datalen); break; @@ -800,47 +783,4 @@ return -1; break; } -} - -/* Converts a private to a public key */ - -Key * -key_demote(Key *k) -{ - Key *pk; - - pk = xmalloc(sizeof(*pk)); - pk->type = k->type; - pk->flags = k->flags; - pk->dsa = NULL; - pk->rsa = NULL; - - switch (k->type) { - case KEY_RSA1: - case KEY_RSA: - if ((pk->rsa = RSA_new()) == NULL) - fatal("key_demote: RSA_new failed"); - if ((pk->rsa->e = BN_dup(k->rsa->e)) == NULL) - fatal("key_demote: BN_dup failed"); - if ((pk->rsa->n = BN_dup(k->rsa->n)) == NULL) - fatal("key_demote: BN_dup failed"); - break; - case KEY_DSA: - if ((pk->dsa = DSA_new()) == NULL) - fatal("key_demote: DSA_new failed"); - if ((pk->dsa->p = BN_dup(k->dsa->p)) == NULL) - fatal("key_demote: BN_dup failed"); - if ((pk->dsa->q = BN_dup(k->dsa->q)) == NULL) - fatal("key_demote: BN_dup failed"); - if ((pk->dsa->g = BN_dup(k->dsa->g)) == NULL) - fatal("key_demote: BN_dup failed"); - if ((pk->dsa->pub_key = BN_dup(k->dsa->pub_key)) == NULL) - fatal("key_demote: BN_dup failed"); - break; - default: - fatal("key_free: bad key type %d", k->type); - break; - } - - return (pk); }