- deraadt@cvs.openbsd.org 2001/03/11 16:39:03

     [ssh-keygen.c]
     KNF, and SHA1 binary output is just creeping featurism

diff --git a/ChangeLog b/ChangeLog
index 7cba1852f1afcb6dad1477b00ab2005c626653be..d8f2c402d003a32fa3837c468612b9a424ce683f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,9 @@
    - jakob@cvs.openbsd.org 2001/03/11 15:13:09
      [key.c]
      cleanup & shorten some var names key_fingerprint_bubblebabble.
+   - deraadt@cvs.openbsd.org 2001/03/11 16:39:03
+     [ssh-keygen.c]
+     KNF, and SHA1 binary output is just creeping featurism
 
 20010311
  - OpenBSD CVS Sync

diff --git a/ssh-keygen.c b/ssh-keygen.c
index af59bcf6e8ada06bf3f8ed9e6ed7e078fb5601c5..f4f700f79d737164f720e2aabdc8f3711727c27c 100644 (file)
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh-keygen.c,v 1.47 2001/03/11 15:04:16 jakob Exp $");
+RCSID("$OpenBSD: ssh-keygen.c,v 1.48 2001/03/11 16:39:03 deraadt Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/pem.h>
@@ -351,17 +351,16 @@ do_fingerprint(struct passwd *pw)
                        debug("try_load_public_key KEY_UNSPEC failed");
        }
        if (success) {
-               char *digest_md5, *digest_sha1, *digest_bubblebabble;
+               char *digest_md5, *digest_bubblebabble;
 
                digest_md5 = key_fingerprint_ex(public, SSH_FP_MD5, SSH_FP_HEX);
-               digest_sha1 = key_fingerprint_ex(public, SSH_FP_SHA1, SSH_FP_HEX);
-               digest_bubblebabble = key_fingerprint_ex(public, SSH_FP_SHA1, SSH_FP_BUBBLEBABBLE);
+               digest_bubblebabble = key_fingerprint_ex(public, SSH_FP_SHA1,
+                   SSH_FP_BUBBLEBABBLE);
 
-               if(print_verbose) {
+               if (print_verbose) {
                        printf("comment:      %s\n", comment);
                        printf("size:         %d\n", key_size(public));
                        printf("md5:          %s\n", digest_md5);
-                       printf("sha1:         %s\n", digest_sha1);
                        printf("bubblebabble: %s\n", digest_bubblebabble);
                } else {
                        printf("%d %s %s\n", key_size(public), digest_md5, comment);
@@ -370,7 +369,6 @@ do_fingerprint(struct passwd *pw)
                key_free(public);
                xfree(comment);
                xfree(digest_md5);
-               xfree(digest_sha1);
                xfree(digest_bubblebabble);
 
                exit(0);