=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/Attic/key.c,v retrieving revision 1.11.2.7 retrieving revision 1.12 diff -u -r1.11.2.7 -r1.12 --- src/usr.bin/ssh/Attic/key.c 2002/03/08 17:04:42 1.11.2.7 +++ src/usr.bin/ssh/Attic/key.c 2000/11/12 19:50:37 1.12 @@ -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 @@ -31,11 +31,12 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "includes.h" -RCSID("$OpenBSD: key.c,v 1.11.2.7 2002/03/08 17:04:42 brad Exp $"); +#include "includes.h" +#include "ssh.h" +#include +#include #include - #include "xmalloc.h" #include "key.h" #include "rsa.h" @@ -44,8 +45,9 @@ #include "uuencode.h" #include "buffer.h" #include "bufaux.h" -#include "log.h" +RCSID("$OpenBSD: key.c,v 1.12 2000/11/12 19:50:37 markus Exp $"); + Key * key_new(int type) { @@ -54,31 +56,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 +89,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,29 +155,19 @@ return 0; } -static u_char* -key_fingerprint_raw(Key *k, enum fp_type dgst_type, u_int *dgst_raw_length) +/* + * Generate key fingerprint in ascii format. + * Based on ideas and code from Bjoern Groenvall + */ +char * +key_fingerprint(Key *k) { - const EVP_MD *md = NULL; - EVP_MD_CTX ctx; - u_char *blob = NULL; - u_char *retval = NULL; - u_int len = 0; + static char retval[(EVP_MAX_MD_SIZE+1)*3]; + unsigned char *blob = NULL; + int len = 0; int nlen, elen; - *dgst_raw_length = 0; - - switch (dgst_type) { - case SSH_FP_MD5: - md = EVP_md5(); - break; - case SSH_FP_SHA1: - md = EVP_sha1(); - break; - default: - fatal("key_fingerprint_raw: bad digest type %d", - dgst_type); - } + retval[0] = '\0'; switch (k->type) { case KEY_RSA1: nlen = BN_num_bytes(k->rsa->n); @@ -209,113 +185,29 @@ return retval; break; default: - fatal("key_fingerprint_raw: bad key type %d", k->type); + fatal("key_fingerprint: bad key type %d", k->type); break; } if (blob != NULL) { - retval = xmalloc(EVP_MAX_MD_SIZE); + int i; + unsigned char digest[EVP_MAX_MD_SIZE]; + EVP_MD *md = EVP_md5(); + EVP_MD_CTX ctx; EVP_DigestInit(&ctx, md); EVP_DigestUpdate(&ctx, blob, len); - EVP_DigestFinal(&ctx, retval, dgst_raw_length); + EVP_DigestFinal(&ctx, digest, NULL); + for(i = 0; i < md->md_size; i++) { + char hex[4]; + snprintf(hex, sizeof(hex), "%02x:", digest[i]); + strlcat(retval, hex, sizeof(retval)); + } + retval[strlen(retval) - 1] = '\0'; memset(blob, 0, len); xfree(blob); - } else { - fatal("key_fingerprint_raw: blob is null"); } return retval; } -static char* -key_fingerprint_hex(u_char* dgst_raw, u_int 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++) { - char hex[4]; - snprintf(hex, sizeof(hex), "%02x:", dgst_raw[i]); - strlcat(retval, hex, dgst_raw_len * 3); - } - retval[(dgst_raw_len * 3) - 1] = '\0'; - return retval; -} - -static char* -key_fingerprint_bubblebabble(u_char* dgst_raw, u_int dgst_raw_len) -{ - char vowels[] = { 'a', 'e', 'i', 'o', 'u', 'y' }; - char consonants[] = { 'b', 'c', 'd', 'f', 'g', 'h', 'k', 'l', 'm', - 'n', 'p', 'r', 's', 't', 'v', 'z', 'x' }; - u_int i, j = 0, rounds, seed = 1; - char *retval; - - rounds = (dgst_raw_len / 2) + 1; - retval = xmalloc(sizeof(char) * (rounds*6)); - retval[j++] = 'x'; - for (i = 0; i < rounds; i++) { - u_int idx0, idx1, idx2, idx3, idx4; - if ((i + 1 < rounds) || (dgst_raw_len % 2 != 0)) { - idx0 = (((((u_int)(dgst_raw[2 * i])) >> 6) & 3) + - seed) % 6; - idx1 = (((u_int)(dgst_raw[2 * i])) >> 2) & 15; - idx2 = ((((u_int)(dgst_raw[2 * i])) & 3) + - (seed / 6)) % 6; - retval[j++] = vowels[idx0]; - retval[j++] = consonants[idx1]; - retval[j++] = vowels[idx2]; - if ((i + 1) < rounds) { - idx3 = (((u_int)(dgst_raw[(2 * i) + 1])) >> 4) & 15; - idx4 = (((u_int)(dgst_raw[(2 * i) + 1]))) & 15; - retval[j++] = consonants[idx3]; - retval[j++] = '-'; - retval[j++] = consonants[idx4]; - seed = ((seed * 5) + - ((((u_int)(dgst_raw[2 * i])) * 7) + - ((u_int)(dgst_raw[(2 * i) + 1])))) % 36; - } - } else { - idx0 = seed % 6; - idx1 = 16; - idx2 = seed / 6; - retval[j++] = vowels[idx0]; - retval[j++] = consonants[idx1]; - retval[j++] = vowels[idx2]; - } - } - retval[j++] = 'x'; - retval[j++] = '\0'; - return retval; -} - -char* -key_fingerprint(Key *k, enum fp_type dgst_type, enum fp_rep dgst_rep) -{ - char *retval = NULL; - u_char *dgst_raw; - u_int 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) { - case SSH_FP_HEX: - retval = key_fingerprint_hex(dgst_raw, dgst_raw_len); - break; - case SSH_FP_BUBBLEBABBLE: - retval = key_fingerprint_bubblebabble(dgst_raw, dgst_raw_len); - break; - default: - fatal("key_fingerprint_ex: bad digest representation %d", - dgst_rep); - break; - } - memset(dgst_raw, 0, dgst_raw_len); - xfree(dgst_raw); - return retval; -} - /* * Reads a multiple-precision integer in decimal from the buffer, and advances * the pointer. The integer must already be initialized. This function is @@ -323,7 +215,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 +251,7 @@ *cpp = cp; return 1; } -static int +int write_bignum(FILE *f, BIGNUM *num) { char *buf = BN_bn2dec(num); @@ -372,7 +264,7 @@ return 1; } -/* returns 1 ok, -1 error */ +/* returns 1 ok, -1 error, 0 type mismatch */ int key_read(Key *ret, char **cpp) { @@ -381,11 +273,11 @@ char *cp, *space; int len, n, type; u_int bits; - u_char *blob; + unsigned char *blob; cp = *cpp; - switch (ret->type) { + switch(ret->type) { case KEY_RSA1: /* Get number of bits. */ if (*cp < '0' || *cp > '9') @@ -427,22 +319,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 +360,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 +379,8 @@ int key_write(Key *key, FILE *f) { - int n, success = 0; - u_int len, bits = 0; - u_char *blob, *uu; + int success = 0; + unsigned int bits = 0; if (key->type == KEY_RSA1 && key->rsa != NULL) { /* size of modulus 'n' */ @@ -504,6 +394,8 @@ } } else if ((key->type == KEY_DSA && key->dsa != NULL) || (key->type == KEY_RSA && key->rsa != NULL)) { + int len, n; + unsigned char *blob, *uu; key_to_blob(key, &blob, &len); uu = xmalloc(2*len); n = uuencode(blob, len, uu, 2*len); @@ -546,8 +438,7 @@ return "ssh-unknown"; } u_int -key_size(Key *k) -{ +key_size(Key *k){ switch (k->type) { case KEY_RSA1: case KEY_RSA: @@ -560,35 +451,35 @@ return 0; } -static RSA * -rsa_generate_private_key(u_int bits) +RSA * +rsa_generate_private_key(unsigned int bits) { - RSA *private; - private = RSA_generate_key(bits, 35, NULL, NULL); - if (private == NULL) - fatal("rsa_generate_private_key: key generation failed."); - return private; + RSA *private; + private = RSA_generate_key(bits, 35, NULL, NULL); + if (private == NULL) + fatal("rsa_generate_private_key: key generation failed."); + return private; } -static DSA* -dsa_generate_private_key(u_int bits) +DSA* +dsa_generate_private_key(unsigned int bits) { DSA *private = DSA_generate_parameters(bits, NULL, 0, NULL, NULL, NULL, NULL); if (private == NULL) fatal("dsa_generate_private_key: DSA_generate_parameters failed"); if (!DSA_generate_key(private)) - fatal("dsa_generate_private_key: DSA_generate_key failed."); - if (private == NULL) - fatal("dsa_generate_private_key: NULL."); + fatal("dsa_generate_private_key: DSA_generate_key failed."); + if (private == NULL) + fatal("dsa_generate_private_key: NULL."); return private; } Key * -key_generate(int type, u_int bits) +key_generate(int type, unsigned int bits) { Key *k = key_new(KEY_UNSPEC); switch (type) { - case KEY_DSA: + case KEY_DSA: k->dsa = dsa_generate_private_key(bits); break; case KEY_RSA: @@ -596,9 +487,9 @@ k->rsa = rsa_generate_private_key(bits); break; default: - fatal("key_generate: unknown type %d", type); + fatal("key_generate: unknown type %d", type); } - k->type = type; + k->type = type; return k; } @@ -607,7 +498,7 @@ { Key *n = NULL; switch (k->type) { - case KEY_DSA: + case KEY_DSA: n = key_new(k->type); BN_copy(n->dsa->p, k->dsa->p); BN_copy(n->dsa->q, k->dsa->q); @@ -621,7 +512,7 @@ BN_copy(n->rsa->e, k->rsa->e); break; default: - fatal("key_from_private: unknown type %d", k->type); + fatal("key_from_private: unknown type %d", k->type); break; } return n; @@ -630,45 +521,23 @@ 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); + debug("key_type_from_name: unknown key type '%s'", name); return KEY_UNSPEC; } -int -key_names_valid2(const char *names) -{ - char *s, *cp, *p; - - if (names == NULL || strcmp(names, "") == 0) - return 0; - s = cp = xstrdup(names); - for ((p = strsep(&cp, ",")); p && *p != '\0'; - (p = strsep(&cp, ","))) { - switch (key_type_from_name(p)) { - case KEY_RSA1: - case KEY_UNSPEC: - xfree(s); - return 0; - } - } - debug3("key names ok: [%s]", names); - xfree(s); - return 1; -} - Key * -key_from_blob(u_char *blob, int blen) +key_from_blob(char *blob, int blen) { Buffer b; char *ktype; @@ -683,11 +552,11 @@ 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); buffer_get_bignum2(&b, key->rsa->n); + buffer_get_bignum2(&b, key->rsa->e); #ifdef DEBUG_PK RSA_print_fp(stderr, key->rsa, 8); #endif @@ -718,18 +587,18 @@ } int -key_to_blob(Key *key, u_char **blobp, u_int *lenp) +key_to_blob(Key *key, unsigned char **blobp, unsigned int *lenp) { Buffer b; int len; - u_char *buf; + unsigned char *buf; if (key == NULL) { error("key_to_blob: key == NULL"); 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); @@ -739,13 +608,12 @@ break; case KEY_RSA: buffer_put_cstring(&b, key_ssh_name(key)); - buffer_put_bignum2(&b, key->rsa->e); buffer_put_bignum2(&b, key->rsa->n); + buffer_put_bignum2(&b, key->rsa->e); 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 +630,10 @@ int key_sign( Key *key, - u_char **sigp, u_int *lenp, - u_char *data, u_int datalen) + unsigned char **sigp, int *lenp, + unsigned 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 +650,10 @@ int key_verify( Key *key, - u_char *signature, u_int signaturelen, - u_char *data, u_int datalen) + unsigned char *signature, int signaturelen, + unsigned 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;