Merge latest oemcrypto-v17 change
No-Typo-Check: Not related to this change. Bug: 161477208 Change-Id: I99e4780f6855b7045aa0cd5a49c13d2d0d51ed64
This commit is contained in:
committed by
Fred Gylys-Colwell
parent
c924960962
commit
642965c678
@@ -24,11 +24,10 @@ int crypto_memcmp(const void* in_a, const void* in_b, size_t len) {
|
||||
return x;
|
||||
}
|
||||
|
||||
bool ODK_NonceValuesEqual(const ODK_NonceValues* a, const ODK_NonceValues* b) {
|
||||
bool ODK_NonceValuesEqualExcludingVersion(const ODK_NonceValues* a,
|
||||
const ODK_NonceValues* b) {
|
||||
if (a == NULL || b == NULL) {
|
||||
return (a == b);
|
||||
}
|
||||
return (a->api_major_version == b->api_major_version &&
|
||||
a->api_minor_version == b->api_minor_version &&
|
||||
a->nonce == b->nonce && a->session_id == b->session_id);
|
||||
return (a->nonce == b->nonce && a->session_id == b->session_id);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user