kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix EVP_get_digestbyobj for NID-less ASN1_OBJECTs.

Browse Source 
The recent rewrite didn't account for the OID being missing but the NID
present.

Change-Id: I335e52324c62ee3ba849c0c385aaf86123a8ffbb
Reviewed-on: https://boringssl-review.googlesource.com/13660
Commit-Queue: David Benjamin <davidben@google.com>
Commit-Queue: Adam Langley <agl@google.com>
Reviewed-by: Adam Langley <agl@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
This commit is contained in:
David Benjamin 2017-02-06 15:12:59 -05:00 committed by CQ bot account: commit-bot@chromium.org
parent 3f2611a98f
commit e0ca4879ec
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
crypto/digest/digest_test.cc
View File

@ -18,12 +18,14 @@
#include <memory> #include <memory>
#include <openssl/asn1.h>
#include <openssl/crypto.h> #include <openssl/crypto.h>
#include <openssl/digest.h> #include <openssl/digest.h>
#include <openssl/err.h> #include <openssl/err.h>
#include <openssl/md4.h> #include <openssl/md4.h>
#include <openssl/md5.h> #include <openssl/md5.h>
#include <openssl/nid.h> #include <openssl/nid.h>
#include <openssl/obj.h>
#include <openssl/sha.h> #include <openssl/sha.h>
#include "../internal.h" #include "../internal.h"
@ -250,6 +252,14 @@ static int TestGetters() {
return false; return false;
} }
bssl::UniquePtr<ASN1_OBJECT> obj(OBJ_txt2obj("1.3.14.3.2.26", 0));
if (!obj ||
EVP_get_digestbyobj(obj.get()) != EVP_sha1() ||
EVP_get_digestbyobj(OBJ_nid2obj(NID_md5_sha1)) != EVP_md5_sha1() ||
EVP_get_digestbyobj(OBJ_nid2obj(NID_sha1)) != EVP_sha1()) {
return false;
}
return true; return true;
} }

5
crypto/digest/digests.c
View File

@ -329,6 +329,11 @@ static const struct {
}; };
const EVP_MD *EVP_get_digestbyobj(const ASN1_OBJECT *obj) { 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++) { for (size_t i = 0; i < OPENSSL_ARRAY_SIZE(kMDOIDs); i++) {
if (obj->length == kMDOIDs[i].oid_len && if (obj->length == kMDOIDs[i].oid_len &&
memcmp(obj->data, kMDOIDs[i].oid, obj->length) == 0) { memcmp(obj->data, kMDOIDs[i].oid, obj->length) == 0) {