commit | 47f43ed484d06f87d14d264f16a90ca18ed49b8d | [log] [tgz] |
---|---|---|
author | Robert Sloan <varomodt@google.com> | Mon Feb 06 14:55:15 2017 -0800 |
committer | Robert Sloan <varomodt@google.com> | Mon Feb 06 14:55:36 2017 -0800 |
tree | 79f7529231ed977eb1b9d3e11334994b53afdf22 | |
parent | 4d1ac508237e73d6596202e4fa36d93ecf2321d8 [diff] [blame] |
external/boringssl: Sync to ab20cec1c1de815de8da6cc74c2503460efd6e1c. This includes the following changes: https://boringssl.googlesource.com/boringssl/+log/b2ff2623a88a65fd4db42d3820f3d8c64e8ab180..ab20cec1c1de815de8da6cc74c2503460efd6e1c Change-Id: I68612cda7addda1a39f13abcee78c39ebb0ee361 Test: Libcore CTS presubmit
diff --git a/src/crypto/digest/digests.c b/src/crypto/digest/digests.c index 9656027..fd2a939 100644 --- a/src/crypto/digest/digests.c +++ b/src/crypto/digest/digests.c
@@ -329,6 +329,11 @@ }; const EVP_MD *EVP_get_digestbyobj(const ASN1_OBJECT *obj) { + /* Handle objects with no corresponding OID. */ + if (obj->nid != NID_undef) { + return EVP_get_digestbynid(obj->nid); + } + for (size_t i = 0; i < OPENSSL_ARRAY_SIZE(kMDOIDs); i++) { if (obj->length == kMDOIDs[i].oid_len && memcmp(obj->data, kMDOIDs[i].oid, obj->length) == 0) {