Changes to allow user-signed kernels to be generated.

tests/run_vbutil_tests.sh

 #!/bin/bash
 
 # 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.
 
 # Run verified boot firmware and kernel verification tests.
 
 # Load common constants and variables.
 . "$(dirname "$0")/common.sh"
@@ skipping 50 matching lines @@
           echo -e "For ${COL_YELLOW}signing algorithm \
 RSA-${signing_keylen}/${signing_hashalgo}${COL_STOP} \
 and ${COL_YELLOW}data key algorithm RSA-${datakeylen}/\
 ${datahashalgo}${COL_STOP}"
           # Remove old file
           keyblockfile="${TESTKEY_SCRATCH_DIR}/"
           keyblockfile+="sign${signing_algorithmcounter}_data"
           keyblockfile+="${data_algorithmcounter}.keyblock"
           rm -f ${keyblockfile}
 
-          # Wrap
+          # Wrap private key
           ${UTIL_DIR}/vbutil_key \
             --pack ${TESTKEY_SCRATCH_DIR}/key_alg${algorithmcounter}.vbprivk \
             --key ${TESTKEY_DIR}/key_rsa${signing_keylen}.pem \
             --algorithm $signing_algorithmcounter
           if [ $? -ne 0 ]
           then
+            echo -e "${COL_RED}Wrap vbprivk${COL_STOP}"
             return_code=255
           fi
 
+          # Wrap public key
+          ${UTIL_DIR}/vbutil_key \
+            --pack ${TESTKEY_SCRATCH_DIR}/key_alg${algorithmcounter}.vbpubk \
+            --key ${TESTKEY_DIR}/key_rsa${signing_keylen}.keyb \
+            --algorithm $signing_algorithmcounter
+          if [ $? -ne 0 ]
+          then
+            echo -e "${COL_RED}Wrap vbpubk${COL_STOP}"
+            return_code=255
+          fi
+
           # Pack
           ${UTIL_DIR}/vbutil_keyblock --pack ${keyblockfile} \
             --datapubkey \
               ${TESTKEY_SCRATCH_DIR}/key_alg${data_algorithmcounter}.vbpubk \
             --signprivate \
               ${TESTKEY_SCRATCH_DIR}/key_alg${algorithmcounter}.vbprivk
           if [ $? -ne 0 ]
           then
+            echo -e "${COL_RED}Pack${COL_STOP}"
             return_code=255
           fi
 
           # Unpack
           ${UTIL_DIR}/vbutil_keyblock --unpack ${keyblockfile} \
+            --datapubkey \
+            ${TESTKEY_SCRATCH_DIR}/key_alg${data_algorithmcounter}.vbpubk2 \
             --signpubkey \
-            ${TESTKEY_SCRATCH_DIR}/key_alg${signing_algorithmcounter}.vbpubk
-          # TODO: check data key against the packed one?
+            ${TESTKEY_SCRATCH_DIR}/key_alg${algorithmcounter}.vbpubk
           if [ $? -ne 0 ]
           then
+            echo -e "${COL_RED}Unpack${COL_STOP}"
             return_code=255
           fi
 
+          # Check
+          if ! cmp -s \
+            ${TESTKEY_SCRATCH_DIR}/key_alg${data_algorithmcounter}.vbpubk \
+            ${TESTKEY_SCRATCH_DIR}/key_alg${data_algorithmcounter}.vbpubk2
+          then
+            echo -e "${COL_RED}Check${COL_STOP}"
+            return_code=255
+            exit 1
+          fi
+
           let data_algorithmcounter=data_algorithmcounter+1
         done
       done
       let signing_algorithmcounter=signing_algorithmcounter+1
     done
   done
 }
 
 
 check_test_keys
 
 echo
 echo "Testing vbutil_key..."
 test_vbutil_key
 
 echo
 echo "Testing vbutil_keyblock..."
 test_vbutil_keyblock
 
 
 exit $return_code