summaryrefslogtreecommitdiff
path: root/key.c
diff options
context:
space:
mode:
Diffstat (limited to 'key.c')
-rw-r--r--key.c27
1 files changed, 14 insertions, 13 deletions
diff --git a/key.c b/key.c
index 220c476cd..87aeefa6b 100644
--- a/key.c
+++ b/key.c
@@ -32,7 +32,7 @@
32 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 32 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
33 */ 33 */
34#include "includes.h" 34#include "includes.h"
35RCSID("$OpenBSD: key.c,v 1.34 2001/11/21 15:51:24 markus Exp $"); 35RCSID("$OpenBSD: key.c,v 1.35 2001/12/05 10:06:12 deraadt Exp $");
36 36
37#include <openssl/evp.h> 37#include <openssl/evp.h>
38 38
@@ -285,7 +285,7 @@ key_fingerprint(Key *k, enum fp_type dgst_type, enum fp_rep dgst_rep)
285 dgst_raw = key_fingerprint_raw(k, dgst_type, &dgst_raw_len); 285 dgst_raw = key_fingerprint_raw(k, dgst_type, &dgst_raw_len);
286 if (!dgst_raw) 286 if (!dgst_raw)
287 fatal("key_fingerprint: null from key_fingerprint_raw()"); 287 fatal("key_fingerprint: null from key_fingerprint_raw()");
288 switch(dgst_rep) { 288 switch (dgst_rep) {
289 case SSH_FP_HEX: 289 case SSH_FP_HEX:
290 retval = key_fingerprint_hex(dgst_raw, dgst_raw_len); 290 retval = key_fingerprint_hex(dgst_raw, dgst_raw_len);
291 break; 291 break;
@@ -371,7 +371,7 @@ key_read(Key *ret, char **cpp)
371 371
372 cp = *cpp; 372 cp = *cpp;
373 373
374 switch(ret->type) { 374 switch (ret->type) {
375 case KEY_RSA1: 375 case KEY_RSA1:
376 /* Get number of bits. */ 376 /* Get number of bits. */
377 if (*cp < '0' || *cp > '9') 377 if (*cp < '0' || *cp > '9')
@@ -533,7 +533,8 @@ key_ssh_name(Key *k)
533 return "ssh-unknown"; 533 return "ssh-unknown";
534} 534}
535u_int 535u_int
536key_size(Key *k){ 536key_size(Key *k)
537{
537 switch (k->type) { 538 switch (k->type) {
538 case KEY_RSA1: 539 case KEY_RSA1:
539 case KEY_RSA: 540 case KEY_RSA:
@@ -616,15 +617,15 @@ key_from_private(Key *k)
616int 617int
617key_type_from_name(char *name) 618key_type_from_name(char *name)
618{ 619{
619 if (strcmp(name, "rsa1") == 0){ 620 if (strcmp(name, "rsa1") == 0) {
620 return KEY_RSA1; 621 return KEY_RSA1;
621 } else if (strcmp(name, "rsa") == 0){ 622 } else if (strcmp(name, "rsa") == 0) {
622 return KEY_RSA; 623 return KEY_RSA;
623 } else if (strcmp(name, "dsa") == 0){ 624 } else if (strcmp(name, "dsa") == 0) {
624 return KEY_DSA; 625 return KEY_DSA;
625 } else if (strcmp(name, "ssh-rsa") == 0){ 626 } else if (strcmp(name, "ssh-rsa") == 0) {
626 return KEY_RSA; 627 return KEY_RSA;
627 } else if (strcmp(name, "ssh-dss") == 0){ 628 } else if (strcmp(name, "ssh-dss") == 0) {
628 return KEY_DSA; 629 return KEY_DSA;
629 } 630 }
630 debug2("key_type_from_name: unknown key type '%s'", name); 631 debug2("key_type_from_name: unknown key type '%s'", name);
@@ -669,7 +670,7 @@ key_from_blob(u_char *blob, int blen)
669 ktype = buffer_get_string(&b, NULL); 670 ktype = buffer_get_string(&b, NULL);
670 type = key_type_from_name(ktype); 671 type = key_type_from_name(ktype);
671 672
672 switch(type){ 673 switch (type) {
673 case KEY_RSA: 674 case KEY_RSA:
674 key = key_new(type); 675 key = key_new(type);
675 buffer_get_bignum2(&b, key->rsa->e); 676 buffer_get_bignum2(&b, key->rsa->e);
@@ -715,7 +716,7 @@ key_to_blob(Key *key, u_char **blobp, u_int *lenp)
715 return 0; 716 return 0;
716 } 717 }
717 buffer_init(&b); 718 buffer_init(&b);
718 switch(key->type){ 719 switch (key->type) {
719 case KEY_DSA: 720 case KEY_DSA:
720 buffer_put_cstring(&b, key_ssh_name(key)); 721 buffer_put_cstring(&b, key_ssh_name(key));
721 buffer_put_bignum2(&b, key->dsa->p); 722 buffer_put_bignum2(&b, key->dsa->p);
@@ -751,7 +752,7 @@ key_sign(
751 u_char **sigp, int *lenp, 752 u_char **sigp, int *lenp,
752 u_char *data, int datalen) 753 u_char *data, int datalen)
753{ 754{
754 switch(key->type){ 755 switch (key->type) {
755 case KEY_DSA: 756 case KEY_DSA:
756 return ssh_dss_sign(key, sigp, lenp, data, datalen); 757 return ssh_dss_sign(key, sigp, lenp, data, datalen);
757 break; 758 break;
@@ -774,7 +775,7 @@ key_verify(
774 if (signaturelen == 0) 775 if (signaturelen == 0)
775 return -1; 776 return -1;
776 777
777 switch(key->type){ 778 switch (key->type) {
778 case KEY_DSA: 779 case KEY_DSA:
779 return ssh_dss_verify(key, signature, signaturelen, data, datalen); 780 return ssh_dss_verify(key, signature, signaturelen, data, datalen);
780 break; 781 break;