From 854a409ae6a88bbbe78a5adb492e8051319097c7 Mon Sep 17 00:00:00 2001 From: Fred Gylys-Colwell Date: Wed, 17 Jun 2015 15:58:58 -0700 Subject: [PATCH] Accept Other Error Codes in TestSignatureBoth Merge from widevine of http://go/wvgerrit/14744 The OEMCrypto unit test TestSignatureBoth verifies that a cast certificate cannot be used to derive session keys. This CL relaxes the requirement that DeriveKeysFromSessionKey returns a specific error code instead of just failing. bug: 21708882 Change-Id: I4163a9616122ad709bab76f488d030239029861c --- libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp b/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp index 00397692..2c9e3f56 100644 --- a/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp +++ b/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp @@ -1383,7 +1383,7 @@ class Session { vector mac_context; vector enc_context; FillDefaultContext(&mac_context, &enc_context); - ASSERT_EQ(OEMCrypto_ERROR_INVALID_RSA_KEY, + ASSERT_NE(OEMCrypto_SUCCESS, OEMCrypto_DeriveKeysFromSessionKey( session_id(), &enc_session_key[0], enc_session_key.size(), &mac_context[0], mac_context.size(), &enc_context[0],