X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=lib%2Fsilcapputil%2Fsilcapputil.c;h=833f40e29b4d230eeb1d1b24120b43d2fb746b13;hb=52e57c880aba9c5e89f59d962eb9af75670b76e0;hp=39fce81cacab76f343281ed4122d1bef8c3f7a8d;hpb=6e78c1f7fc6b1b87f70561d447c1520d2b09bbf2;p=silc.git diff --git a/lib/silcapputil/silcapputil.c b/lib/silcapputil/silcapputil.c index 39fce81c..833f40e2 100644 --- a/lib/silcapputil/silcapputil.c +++ b/lib/silcapputil/silcapputil.c @@ -4,7 +4,7 @@ Author: Pekka Riikonen - Copyright (C) 2002 - 2006 Pekka Riikonen + Copyright (C) 2002 - 2007 Pekka Riikonen This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -40,10 +40,10 @@ static char *silc_create_pk_identifier(void) return NULL; /* Create default email address, whether it is right or not */ - snprintf(email, sizeof(email), "%s@%s", username, hostname); + silc_snprintf(email, sizeof(email), "%s@%s", username, hostname); ident = silc_pkcs_silc_encode_identifier(username, hostname, realname, - email, NULL, NULL); + email, NULL, NULL, NULL); if (realname) silc_free(realname); silc_free(hostname); @@ -71,6 +71,8 @@ SilcBool silc_create_key_pair(const char *pkcs_name, char *alg = pkcs_name ? strdup(pkcs_name) : NULL; char *identifier = pub_identifier ? strdup(pub_identifier) : NULL; char *pass = passphrase ? strdup(passphrase) : NULL; + SilcPublicKey public_key; + SilcPrivateKey private_key; if (interactive && (!alg || !pub_filename || !prv_filename)) printf("\ @@ -121,9 +123,9 @@ New pair of keys will be created. Please, answer to following questions.\n\ if (interactive) { memset(line, 0, sizeof(line)); if (def) - snprintf(line, sizeof(line), "Identifier [%s]: ", def); + silc_snprintf(line, sizeof(line), "Identifier [%s]: ", def); else - snprintf(line, sizeof(line), + silc_snprintf(line, sizeof(line), "Identifier (eg. UN=jon, HN=jon.dummy.com, " "RN=Jon Johnson, E=jon@dummy.com): "); @@ -144,6 +146,12 @@ New pair of keys will be created. Please, answer to following questions.\n\ silc_free(def); } + if (!strstr(identifier, "UN=") || !strstr(identifier, "HN=")) { + fprintf(stderr, "Invalid public key identifier. You must specify both " + "UN and HN\n"); + return FALSE; + } + rng = silc_rng_alloc(); silc_rng_init(rng); silc_rng_global_init(rng); @@ -151,7 +159,7 @@ New pair of keys will be created. Please, answer to following questions.\n\ if (!pkfile) { if (interactive) { memset(line, 0, sizeof(line)); - snprintf(line, sizeof(line), "Public key filename [public_key.pub]: "); + silc_snprintf(line, sizeof(line), "Public key filename [public_key.pub]: "); pkfile = silc_get_input(line, FALSE); } if (!pkfile) @@ -161,7 +169,7 @@ New pair of keys will be created. Please, answer to following questions.\n\ if (!prvfile) { if (interactive) { memset(line, 0, sizeof(line)); - snprintf(line, sizeof(line), "Private key filename [private_key.prv]: "); + silc_snprintf(line, sizeof(line), "Private key filename [private_key.prv]: "); prvfile = silc_get_input(line, FALSE); } if (!prvfile) @@ -190,19 +198,34 @@ New pair of keys will be created. Please, answer to following questions.\n\ } } + if (interactive) + printf("\nGenerating the key pair...\n"); + /* Generate keys */ - if (!silc_pkcs_silc_generate_key(alg, "pkcs1-no-oid", key_len_bits, - identifier, rng, return_public_key, - return_private_key)) + if (!silc_pkcs_silc_generate_key(alg, key_len_bits, + identifier, rng, &public_key, + &private_key)) return FALSE; /* Save public key into file */ - silc_pkcs_save_public_key(pkfile, *return_public_key, SILC_PKCS_FILE_BASE64); + if (!silc_pkcs_save_public_key(pkfile, public_key, SILC_PKCS_FILE_BASE64)) + return FALSE; /* Save private key into file */ - silc_pkcs_save_private_key(prvfile, *return_private_key, - (const unsigned char *)pass, strlen(pass), - SILC_PKCS_FILE_BIN, rng); + if (!silc_pkcs_save_private_key(prvfile, private_key, + (const unsigned char *)pass, strlen(pass), + SILC_PKCS_FILE_BIN, rng)) + return FALSE; + + if (return_public_key) + *return_public_key = public_key; + else + silc_pkcs_public_key_free(public_key); + + if (return_private_key) + *return_private_key = private_key; + else + silc_pkcs_private_key_free(private_key); printf("Public key has been saved into `%s'.\n", pkfile); printf("Private key has been saved into `%s'.\n", prvfile); @@ -250,6 +273,8 @@ SilcBool silc_load_key_pair(const char *pub_filename, if (!silc_pkcs_load_private_key(prv_filename, (const unsigned char *)pass, strlen(pass), return_private_key)) { + silc_pkcs_public_key_free(*return_public_key); + *return_public_key = NULL; memset(pass, 0, strlen(pass)); silc_free(pass); return FALSE; @@ -262,9 +287,8 @@ SilcBool silc_load_key_pair(const char *pub_filename, /* Dump public key into stdout */ -SilcBool silc_show_public_key(const char *pub_filename) +SilcBool silc_show_public_key(SilcPublicKey public_key) { - SilcPublicKey public_key; SilcSILCPublicKey silc_pubkey; SilcPublicKeyIdentifier ident; char *fingerprint, *babbleprint; @@ -272,31 +296,23 @@ SilcBool silc_show_public_key(const char *pub_filename) SilcUInt32 pk_len; SilcUInt32 key_len = 0; - if (!silc_pkcs_load_public_key((char *)pub_filename, &public_key)) { - fprintf(stderr, "Could not load public key file `%s'\n", pub_filename); - return FALSE; - } - silc_pubkey = silc_pkcs_get_context(SILC_PKCS_SILC, public_key); - if (!silc_pubkey) { - silc_pkcs_public_key_free(public_key); + if (!silc_pubkey) return FALSE; - } ident = &silc_pubkey->identifier; key_len = silc_pkcs_public_key_get_len(public_key); pk = silc_pkcs_public_key_encode(public_key, &pk_len); - if (!pk) { - silc_pkcs_public_key_free(public_key); + if (!pk) return FALSE; - } fingerprint = silc_hash_fingerprint(NULL, pk, pk_len); babbleprint = silc_hash_babbleprint(NULL, pk, pk_len); - printf("Public key file : %s\n", pub_filename); printf("Algorithm : %s\n", silc_pkcs_get_name(public_key)); if (key_len) printf("Key length (bits) : %d\n", (unsigned int)key_len); + if (ident->version) + printf("Version : %s\n", ident->version); if (ident->realname) printf("Real name : %s\n", ident->realname); if (ident->username) @@ -317,11 +333,29 @@ SilcBool silc_show_public_key(const char *pub_filename) silc_free(fingerprint); silc_free(babbleprint); silc_free(pk); - silc_pkcs_public_key_free(public_key); return TRUE; } +/* Dump public key into stdout */ + +SilcBool silc_show_public_key_file(const char *pub_filename) +{ + SilcPublicKey public_key; + SilcBool ret; + + if (!silc_pkcs_load_public_key((char *)pub_filename, &public_key)) { + fprintf(stderr, "Could not load public key file `%s'\n", pub_filename); + return FALSE; + } + + printf("Public key file : %s\n", pub_filename); + ret = silc_show_public_key(public_key); + silc_pkcs_public_key_free(public_key); + + return ret; +} + /* Change private key passphrase */ SilcBool silc_change_private_key_passphrase(const char *prv_filename, @@ -590,6 +624,7 @@ static const SilcStatusMessage silc_status_messages[] = { { STAT(OPERATION_ALLOWED), "Operation is not allowed" }, { STAT(BAD_SERVER), "Bad server name" }, { STAT(BAD_USERNAME), "Bad user name" }, + { STAT(NO_SUCH_PUBLIC_KEY), "Unknown public key" }, { 0, NULL } }; @@ -716,7 +751,7 @@ SilcBool silc_parse_version_string(const char *version, return FALSE; cp = (char *)version + 5; - if (!cp) + if (!cp || !(*cp)) return FALSE; /* Take protocol version */ @@ -730,11 +765,11 @@ SilcBool silc_parse_version_string(const char *version, min = atoi(cp); memset(buf, 0, sizeof(buf)); - snprintf(buf, sizeof(buf) - 1, "%d%d", maj, min); + silc_snprintf(buf, sizeof(buf) - 1, "%d%d", maj, min); if (protocol_version) *protocol_version = atoi(buf); memset(buf, 0, sizeof(buf)); - snprintf(buf, sizeof(buf) - 1, "%d.%d", maj, min); + silc_snprintf(buf, sizeof(buf) - 1, "%d.%d", maj, min); if (protocol_version_string) *protocol_version_string = strdup(buf); @@ -756,11 +791,11 @@ SilcBool silc_parse_version_string(const char *version, } memset(buf, 0, sizeof(buf)); - snprintf(buf, sizeof(buf) - 1, "%d%d", maj, min); + silc_snprintf(buf, sizeof(buf) - 1, "%d%d", maj, min); if (software_version) *software_version = atoi(buf); memset(buf, 0, sizeof(buf)); - snprintf(buf, sizeof(buf) - 1, "%d.%d", maj, min); + silc_snprintf(buf, sizeof(buf) - 1, "%d.%d", maj, min); if (software_version_string) *software_version_string = strdup(buf); @@ -770,6 +805,10 @@ SilcBool silc_parse_version_string(const char *version, cp = strchr(cp, '.') + 1; if (cp && *cp && vendor_version) *vendor_version = strdup(cp); + } else if (strchr(cp, ' ')) { + cp = strchr(cp, ' ') + 1; + if (cp && *cp && vendor_version) + *vendor_version = strdup(cp); } return TRUE; @@ -792,7 +831,7 @@ SilcUInt32 silc_version_to_num(const char *version) min = atoi(cp + 1); memset(buf, 0, sizeof(buf)); - snprintf(buf, sizeof(buf) - 1, "%d%d", maj, min); + silc_snprintf(buf, sizeof(buf) - 1, "%d%d", maj, min); return (SilcUInt32)atoi(buf); } @@ -964,11 +1003,11 @@ char *silc_id_render(void *id, SilcIdType id_type) } memset(tmp, 0, sizeof(tmp)); - snprintf(tmp, sizeof(tmp) - 1, ",%d,", ntohs(server_id->port)); + silc_snprintf(tmp, sizeof(tmp) - 1, ",%d,", ntohs(server_id->port)); _PUT_STRING(rid, tmp); SILC_PUT16_MSB(server_id->rnd, tmps); memset(tmp, 0, sizeof(tmp)); - snprintf(tmp, sizeof(tmp) - 1, "[%02x %02x]", tmps[0], tmps[1]); + silc_snprintf(tmp, sizeof(tmp) - 1, "[%02x %02x]", tmps[0], tmps[1]); _PUT_STRING(rid, tmp); } break; @@ -994,10 +1033,10 @@ char *silc_id_render(void *id, SilcIdType id_type) } memset(tmp, 0, sizeof(tmp)); - snprintf(tmp, sizeof(tmp) - 1, ",%02x,", client_id->rnd); + silc_snprintf(tmp, sizeof(tmp) - 1, ",%02x,", client_id->rnd); _PUT_STRING(rid, tmp); memset(tmp, 0, sizeof(tmp)); - snprintf(tmp, sizeof(tmp) - 1, "[%02x %02x %02x %02x...]", + silc_snprintf(tmp, sizeof(tmp) - 1, "[%02x %02x %02x %02x...]", client_id->hash[0], client_id->hash[1], client_id->hash[2], client_id->hash[3]); _PUT_STRING(rid, tmp); @@ -1025,11 +1064,11 @@ char *silc_id_render(void *id, SilcIdType id_type) } memset(tmp, 0, sizeof(tmp)); - snprintf(tmp, sizeof(tmp) - 1, ",%d,", ntohs(channel_id->port)); + silc_snprintf(tmp, sizeof(tmp) - 1, ",%d,", ntohs(channel_id->port)); _PUT_STRING(rid, tmp); SILC_PUT16_MSB(channel_id->rnd, tmps); memset(tmp, 0, sizeof(tmp)); - snprintf(tmp, sizeof(tmp) - 1, "[%02x %02x]", tmps[0], tmps[1]); + silc_snprintf(tmp, sizeof(tmp) - 1, "[%02x %02x]", tmps[0], tmps[1]); _PUT_STRING(rid, tmp); } break;