diff options
Diffstat (limited to 'key.c')
-rw-r--r-- | key.c | 19 |
1 files changed, 9 insertions, 10 deletions
@@ -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" |
35 | RCSID("$OpenBSD: key.c,v 1.39 2002/01/25 22:07:40 markus Exp $"); | 35 | RCSID("$OpenBSD: key.c,v 1.40 2002/02/24 19:14:59 markus Exp $"); |
36 | 36 | ||
37 | #include <openssl/evp.h> | 37 | #include <openssl/evp.h> |
38 | 38 | ||
@@ -176,7 +176,7 @@ key_fingerprint_raw(Key *k, enum fp_type dgst_type, u_int *dgst_raw_length) | |||
176 | EVP_MD_CTX ctx; | 176 | EVP_MD_CTX ctx; |
177 | u_char *blob = NULL; | 177 | u_char *blob = NULL; |
178 | u_char *retval = NULL; | 178 | u_char *retval = NULL; |
179 | int len = 0; | 179 | u_int len = 0; |
180 | int nlen, elen; | 180 | int nlen, elen; |
181 | 181 | ||
182 | *dgst_raw_length = 0; | 182 | *dgst_raw_length = 0; |
@@ -488,8 +488,9 @@ key_read(Key *ret, char **cpp) | |||
488 | int | 488 | int |
489 | key_write(Key *key, FILE *f) | 489 | key_write(Key *key, FILE *f) |
490 | { | 490 | { |
491 | int success = 0; | 491 | int n, success = 0; |
492 | u_int bits = 0; | 492 | u_int len, bits = 0; |
493 | u_char *blob, *uu; | ||
493 | 494 | ||
494 | if (key->type == KEY_RSA1 && key->rsa != NULL) { | 495 | if (key->type == KEY_RSA1 && key->rsa != NULL) { |
495 | /* size of modulus 'n' */ | 496 | /* size of modulus 'n' */ |
@@ -503,8 +504,6 @@ key_write(Key *key, FILE *f) | |||
503 | } | 504 | } |
504 | } else if ((key->type == KEY_DSA && key->dsa != NULL) || | 505 | } else if ((key->type == KEY_DSA && key->dsa != NULL) || |
505 | (key->type == KEY_RSA && key->rsa != NULL)) { | 506 | (key->type == KEY_RSA && key->rsa != NULL)) { |
506 | int len, n; | ||
507 | u_char *blob, *uu; | ||
508 | key_to_blob(key, &blob, &len); | 507 | key_to_blob(key, &blob, &len); |
509 | uu = xmalloc(2*len); | 508 | uu = xmalloc(2*len); |
510 | n = uuencode(blob, len, uu, 2*len); | 509 | n = uuencode(blob, len, uu, 2*len); |
@@ -763,8 +762,8 @@ key_to_blob(Key *key, u_char **blobp, u_int *lenp) | |||
763 | int | 762 | int |
764 | key_sign( | 763 | key_sign( |
765 | Key *key, | 764 | Key *key, |
766 | u_char **sigp, int *lenp, | 765 | u_char **sigp, u_int *lenp, |
767 | u_char *data, int datalen) | 766 | u_char *data, u_int datalen) |
768 | { | 767 | { |
769 | switch (key->type) { | 768 | switch (key->type) { |
770 | case KEY_DSA: | 769 | case KEY_DSA: |
@@ -783,8 +782,8 @@ key_sign( | |||
783 | int | 782 | int |
784 | key_verify( | 783 | key_verify( |
785 | Key *key, | 784 | Key *key, |
786 | u_char *signature, int signaturelen, | 785 | u_char *signature, u_int signaturelen, |
787 | u_char *data, int datalen) | 786 | u_char *data, u_int datalen) |
788 | { | 787 | { |
789 | if (signaturelen == 0) | 788 | if (signaturelen == 0) |
790 | return -1; | 789 | return -1; |