Adding --repack and --headeronly options to vbutil_kernel

host/lib/host_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.
  *
  * Host functions for keys.
  */
 
 /* TODO: change all 'return 0', 'return 1' into meaningful return codes */
 
 #define OPENSSL_NO_SHA
 #include <openssl/engine.h>
 #include <openssl/pem.h>
 #include <openssl/rsa.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 
 #include "host_key.h"
 
 #include "cryptolib.h"
 #include "host_misc.h"
 #include "utility.h"
 #include "vboot_common.h"
 
 
-VbPrivateKey* PrivateKeyRead(const char* filename, uint64_t algorithm) {
+VbPrivateKey* PrivateKeyReadPem(const char* filename, uint64_t algorithm) {
 
   VbPrivateKey* key;
   RSA* rsa_key;
   FILE* f;
 
   if (algorithm >= kNumAlgorithms) {
-    debug("PrivateKeyRead() called with invalid algorithm!\n");
+    debug("%s() called with invalid algorithm!\n", __FUNCTION__);
     return NULL;
   }
 
   /* Read private key */
   f = fopen(filename, "r");
   if (!f) {
-    debug("PrivateKeyRead(): Couldn't open key file: %s\n", filename);
+    debug("%s(): Couldn't open key file: %s\n", __FUNCTION__, filename);
     return NULL;
   }
   rsa_key = PEM_read_RSAPrivateKey(f, NULL, NULL, NULL);
   fclose(f);
   if (!rsa_key) {
-    debug("PrivateKeyRead(): Couldn't read private key from file: %s\n",
+    debug("%s(): Couldn't read private key from file: %s\n", __FUNCTION__,
           filename);
     return NULL;
   }
 
   /* Store key and algorithm in our struct */
   key = (VbPrivateKey*)Malloc(sizeof(VbPrivateKey));
   if (!key) {
     RSA_free(rsa_key);
     return NULL;
   }
@@ skipping 116 matching lines @@
   if (0 != PublicKeyCopy(kcopy, key)) {
     Free(kcopy);
     return 1;
   }
 
   /* Write the copy, then free it */
   rv = WriteFile(filename, kcopy, kcopy->key_offset + kcopy->key_size);
   Free(kcopy);
   return rv;
 }