From 89928c0167684c2733741748a4025492bec865d2 Mon Sep 17 00:00:00 2001 From: "JianFeng,Zhou" Date: Wed, 18 Mar 2020 17:34:13 +0800 Subject: [PATCH] [revert me] use host openssl command instead of macro this patch is for merge conflict, should be reverted. Tracked-On: OAM-90360 Signed-off-by: JianFeng,Zhou --- Android.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Android.mk b/Android.mk index b797424b..8abdbb46 100644 --- a/Android.mk +++ b/Android.mk @@ -583,7 +583,11 @@ CIC_PADDED_VERITY_CERT := $(keys4cic_intermediates)/verity.padded.cer CIC_OEMCERT_OBJ := $(keys4cic_intermediates)/oemcert.o $(CIC_VERITY_CERT): $(INTEL_PATH_BUILD)/testkeys/xbl_default.x509.pem - $(transform-pem-cert-to-der-cert) + #$(transform-pem-cert-to-der-cert) + @echo "PEM key: $(notdir $@) <= $(notdir $<)" + $(hide) mkdir -p $(dir $@) + @echo "openssl pkcs8 -inform DER -outform PEM -nocrypt -in $< -out $@" + $(hide) openssl pkcs8 -inform DER -outform PEM -nocrypt -in $< -out $@ $(CIC_PADDED_VERITY_CERT): $(CIC_VERITY_CERT) $(call pad-binary, 4096)