diff options
| -rw-r--r-- | lib/avb/fsl/fsl_avbkey.c | 6 | ||||
| -rw-r--r-- | lib/trusty/ql-tipc/libtipc.c | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/lib/avb/fsl/fsl_avbkey.c b/lib/avb/fsl/fsl_avbkey.c index d6031452ab..097e00dd82 100644 --- a/lib/avb/fsl/fsl_avbkey.c +++ b/lib/avb/fsl/fsl_avbkey.c @@ -1533,7 +1533,7 @@ int fastboot_set_rpmb_key(uint8_t *staged_buf, uint32_t key_size) ret = -1; goto fail; } else - printf("RPMB key programed successfully!"); + printf("RPMB key programed successfully!\n"); /* Generate keyblob with CAAM. */ kp.rpmb_keyblob_len = RPMBKEY_LENGTH + CAAM_PAD; @@ -1543,7 +1543,9 @@ int fastboot_set_rpmb_key(uint8_t *staged_buf, uint32_t key_size) printf("ERROR - generate rpmb key blob error!\n"); ret = -1; goto fail; - } + } else + printf("RPMB key blob generated!\n"); + memcpy(kp.rpmb_keyblob, blob, kp.rpmb_keyblob_len); /* Store the rpmb key blob to last block of boot1 partition. */ diff --git a/lib/trusty/ql-tipc/libtipc.c b/lib/trusty/ql-tipc/libtipc.c index b2814b6dca..2f3a663aa6 100644 --- a/lib/trusty/ql-tipc/libtipc.c +++ b/lib/trusty/ql-tipc/libtipc.c @@ -95,11 +95,10 @@ int trusty_ipc_init(void) trusty_error("RPMB key was destroyed!\n"); hang(); } else { - /* rpmb key hasn't been set, use software - * keymaster and return earily. - */ + /* rpmb key hasn't been set, use software keymaster. + * Don't return here because we want to initalize the + * hardware crypto service to set rpmb key. */ env_set("keystore", "software"); - return rc; } #else return rc; |