diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2001-03-13 04:57:58 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-03-13 04:57:58 +0000 |
commit | cfccef96a35cb954023a31f9bc10cf3b8f9f8ed3 (patch) | |
tree | 4b4137478ea523bc49c8b53aace863e9a80e0031 /key.c | |
parent | 9ae2bb6790ab8d00b5cd29309889b2db50a9bef9 (diff) |
- OpenBSD CVS Sync
- markus@cvs.openbsd.org 2001/03/12 22:02:02
[key.c key.h ssh-add.c ssh-keygen.c sshconnect.c sshconnect2.c]
remove old key_fingerprint interface, s/_ex//
Diffstat (limited to 'key.c')
-rw-r--r-- | key.c | 18 |
1 files changed, 3 insertions, 15 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.21 2001/03/11 18:29:51 markus Exp $"); | 35 | RCSID("$OpenBSD: key.c,v 1.22 2001/03/12 22:02:01 markus Exp $"); |
36 | 36 | ||
37 | #include <openssl/evp.h> | 37 | #include <openssl/evp.h> |
38 | 38 | ||
@@ -275,7 +275,7 @@ key_fingerprint_bubblebabble(u_char* dgst_raw, size_t dgst_raw_len) | |||
275 | } | 275 | } |
276 | 276 | ||
277 | char* | 277 | char* |
278 | key_fingerprint_ex(Key *k, enum fp_type dgst_type, enum fp_rep dgst_rep) | 278 | key_fingerprint(Key *k, enum fp_type dgst_type, enum fp_rep dgst_rep) |
279 | { | 279 | { |
280 | char *retval = NULL; | 280 | char *retval = NULL; |
281 | u_char *dgst_raw; | 281 | u_char *dgst_raw; |
@@ -283,7 +283,7 @@ key_fingerprint_ex(Key *k, enum fp_type dgst_type, enum fp_rep dgst_rep) | |||
283 | 283 | ||
284 | dgst_raw = key_fingerprint_raw(k, dgst_type, &dgst_raw_len); | 284 | dgst_raw = key_fingerprint_raw(k, dgst_type, &dgst_raw_len); |
285 | if (!dgst_raw) | 285 | if (!dgst_raw) |
286 | fatal("key_fingerprint_ex: null value returned from key_fingerprint_raw()"); | 286 | fatal("key_fingerprint: null from key_fingerprint_raw()"); |
287 | switch(dgst_rep) { | 287 | switch(dgst_rep) { |
288 | case SSH_FP_HEX: | 288 | case SSH_FP_HEX: |
289 | retval = key_fingerprint_hex(dgst_raw, dgst_raw_len); | 289 | retval = key_fingerprint_hex(dgst_raw, dgst_raw_len); |
@@ -301,18 +301,6 @@ key_fingerprint_ex(Key *k, enum fp_type dgst_type, enum fp_rep dgst_rep) | |||
301 | return retval; | 301 | return retval; |
302 | } | 302 | } |
303 | 303 | ||
304 | char * | ||
305 | key_fingerprint(Key *k) | ||
306 | { | ||
307 | static char retval[(EVP_MAX_MD_SIZE + 1) * 3]; | ||
308 | char *digest; | ||
309 | |||
310 | digest = key_fingerprint_ex(k, SSH_FP_MD5, SSH_FP_HEX); | ||
311 | strlcpy(retval, digest, sizeof(retval)); | ||
312 | xfree(digest); | ||
313 | return retval; | ||
314 | } | ||
315 | |||
316 | /* | 304 | /* |
317 | * Reads a multiple-precision integer in decimal from the buffer, and advances | 305 | * Reads a multiple-precision integer in decimal from the buffer, and advances |
318 | * the pointer. The integer must already be initialized. This function is | 306 | * the pointer. The integer must already be initialized. This function is |