diff options
Diffstat (limited to 'usr.bin/ssh/key.c')
| -rw-r--r-- | usr.bin/ssh/key.c | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/usr.bin/ssh/key.c b/usr.bin/ssh/key.c index d05c86ae7f2..e01f2cc4e38 100644 --- a/usr.bin/ssh/key.c +++ b/usr.bin/ssh/key.c @@ -32,7 +32,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "includes.h" -RCSID("$OpenBSD: key.c,v 1.21 2001/03/11 18:29:51 markus Exp $"); +RCSID("$OpenBSD: key.c,v 1.22 2001/03/12 22:02:01 markus Exp $"); #include <openssl/evp.h> @@ -275,7 +275,7 @@ key_fingerprint_bubblebabble(u_char* dgst_raw, size_t dgst_raw_len) } char* -key_fingerprint_ex(Key *k, enum fp_type dgst_type, enum fp_rep dgst_rep) +key_fingerprint(Key *k, enum fp_type dgst_type, enum fp_rep dgst_rep) { char *retval = NULL; u_char *dgst_raw; @@ -283,7 +283,7 @@ key_fingerprint_ex(Key *k, enum fp_type dgst_type, enum fp_rep dgst_rep) dgst_raw = key_fingerprint_raw(k, dgst_type, &dgst_raw_len); if (!dgst_raw) - fatal("key_fingerprint_ex: null value returned from key_fingerprint_raw()"); + fatal("key_fingerprint: null from key_fingerprint_raw()"); switch(dgst_rep) { case SSH_FP_HEX: 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) return retval; } -char * -key_fingerprint(Key *k) -{ - static char retval[(EVP_MAX_MD_SIZE + 1) * 3]; - char *digest; - - digest = key_fingerprint_ex(k, SSH_FP_MD5, SSH_FP_HEX); - strlcpy(retval, digest, sizeof(retval)); - xfree(digest); - return retval; -} - /* * Reads a multiple-precision integer in decimal from the buffer, and advances * the pointer. The integer must already be initialized. This function is |