New tools to help debug vboot failures.

utility/vbutil_key.c

 /* Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
  * Verified boot key utility
  */
 
 #include <getopt.h>
 #include <inttypes.h>  /* For PRIu64 */
 #include <stdarg.h>
@@ skipping 90 matching lines @@
     }
     Free(privkey);
     return 0;
   }
 
   error("Unable to parse either .keyb or .pem from %s\n", infile);
   return 1;
 }
 
 
-static void PrintDigest(const uint8_t* buf, uint64_t buflen) {
-  uint8_t *digest = DigestBuf(buf, buflen, SHA1_DIGEST_ALGORITHM);
-  int i;
-  for (i=0; i<SHA1_DIGEST_SIZE; i++)
-    printf("%02x", digest[i]);
-  printf("\n");
-  Free(digest);
-}
-
 /* Unpack a .vbpubk or .vbprivk */
 static int Unpack(const char *infile, const char *outfile) {
   VbPublicKey* pubkey;
   VbPrivateKey* privkey;
 
   if (!infile) {
     fprintf(stderr, "Need file to unpack\n");
     return 1;
   }
 
   if ((pubkey = PublicKeyRead(infile))) {
     printf("Public Key file:   %s\n", infile);
     printf("Algorithm:         %" PRIu64 " %s\n", pubkey->algorithm,
            (pubkey->algorithm < kNumAlgorithms ?
             algo_strings[pubkey->algorithm] : "(invalid)"));
     printf("Key Version:       %" PRIu64 "\n", pubkey->key_version);
     printf("Key sha1sum:       ");
-    PrintDigest(((uint8_t *)pubkey) + pubkey->key_offset, pubkey->key_size);
+    PrintPubKeySha1Sum(pubkey);
+    printf("\n");
     if (outfile) {
       if (0 != PublicKeyWrite(outfile, pubkey)) {
         fprintf(stderr, "vbutil_key: Error writing key copy.\n");
         Free(pubkey);
         return 1;
       }
     }
     Free(pubkey);
     return 0;
   }
 
-
   if ((privkey = PrivateKeyRead(infile))) {
     printf("Private Key file:  %s\n", infile);
     printf("Algorithm:         %" PRIu64 " %s\n", privkey->algorithm,
            (privkey->algorithm < kNumAlgorithms ?
             algo_strings[privkey->algorithm] : "(invalid)"));
     if (outfile) {
       if (0 != PrivateKeyWrite(outfile, privkey)) {
         fprintf(stderr, "vbutil_key: Error writing key copy.\n");
         Free(privkey);
         return 1;
@@ skipping 75 matching lines @@
   switch(mode) {
     case OPT_MODE_PACK:
       return Pack(infile, outfile, algorithm, version);
     case OPT_MODE_UNPACK:
       return Unpack(infile, outfile);
     default:
       printf("Must specify a mode.\n");
       return PrintHelp(progname);
   }
 }