summaryrefslogtreecommitdiff
path: root/key.c
diff options
context:
space:
mode:
Diffstat (limited to 'key.c')
-rw-r--r--key.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/key.c b/key.c
index 5288e2b6e..8b1057e8e 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.38 2001/12/27 18:22:16 markus Exp $"); 35RCSID("$OpenBSD: key.c,v 1.39 2002/01/25 22:07:40 markus Exp $");
36 36
37#include <openssl/evp.h> 37#include <openssl/evp.h>
38 38
@@ -170,7 +170,7 @@ key_equal(Key *a, Key *b)
170} 170}
171 171
172static u_char* 172static u_char*
173key_fingerprint_raw(Key *k, enum fp_type dgst_type, size_t *dgst_raw_length) 173key_fingerprint_raw(Key *k, enum fp_type dgst_type, u_int *dgst_raw_length)
174{ 174{
175 EVP_MD *md = NULL; 175 EVP_MD *md = NULL;
176 EVP_MD_CTX ctx; 176 EVP_MD_CTX ctx;
@@ -216,8 +216,7 @@ key_fingerprint_raw(Key *k, enum fp_type dgst_type, size_t *dgst_raw_length)
216 retval = xmalloc(EVP_MAX_MD_SIZE); 216 retval = xmalloc(EVP_MAX_MD_SIZE);
217 EVP_DigestInit(&ctx, md); 217 EVP_DigestInit(&ctx, md);
218 EVP_DigestUpdate(&ctx, blob, len); 218 EVP_DigestUpdate(&ctx, blob, len);
219 EVP_DigestFinal(&ctx, retval, NULL); 219 EVP_DigestFinal(&ctx, retval, dgst_raw_length);
220 *dgst_raw_length = md->md_size;
221 memset(blob, 0, len); 220 memset(blob, 0, len);
222 xfree(blob); 221 xfree(blob);
223 } else { 222 } else {
@@ -227,7 +226,7 @@ key_fingerprint_raw(Key *k, enum fp_type dgst_type, size_t *dgst_raw_length)
227} 226}
228 227
229static char* 228static char*
230key_fingerprint_hex(u_char* dgst_raw, size_t dgst_raw_len) 229key_fingerprint_hex(u_char* dgst_raw, u_int dgst_raw_len)
231{ 230{
232 char *retval; 231 char *retval;
233 int i; 232 int i;
@@ -244,7 +243,7 @@ key_fingerprint_hex(u_char* dgst_raw, size_t dgst_raw_len)
244} 243}
245 244
246static char* 245static char*
247key_fingerprint_bubblebabble(u_char* dgst_raw, size_t dgst_raw_len) 246key_fingerprint_bubblebabble(u_char* dgst_raw, u_int dgst_raw_len)
248{ 247{
249 char vowels[] = { 'a', 'e', 'i', 'o', 'u', 'y' }; 248 char vowels[] = { 'a', 'e', 'i', 'o', 'u', 'y' };
250 char consonants[] = { 'b', 'c', 'd', 'f', 'g', 'h', 'k', 'l', 'm', 249 char consonants[] = { 'b', 'c', 'd', 'f', 'g', 'h', 'k', 'l', 'm',
@@ -295,7 +294,7 @@ key_fingerprint(Key *k, enum fp_type dgst_type, enum fp_rep dgst_rep)
295{ 294{
296 char *retval = NULL; 295 char *retval = NULL;
297 u_char *dgst_raw; 296 u_char *dgst_raw;
298 size_t dgst_raw_len; 297 u_int dgst_raw_len;
299 298
300 dgst_raw = key_fingerprint_raw(k, dgst_type, &dgst_raw_len); 299 dgst_raw = key_fingerprint_raw(k, dgst_type, &dgst_raw_len);
301 if (!dgst_raw) 300 if (!dgst_raw)