diff options
| author | Tom Rini <[email protected]> | 2022-04-11 15:59:45 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2022-04-11 15:59:45 -0400 |
| commit | 7486c2ef9d296ad34be1567b8d26f978e683bece (patch) | |
| tree | ea1d936131f54e322db5e52f1299fc0e9db29852 /lib/crypto | |
| parent | 1583c87b1b813a04c95732ae8075d79b14a26eea (diff) | |
| parent | c3322a53f34f986ad9818df72707ebb59c9c8725 (diff) | |
Merge branch '2022-04-11-assorted-updates'
- Assorted fixes/updates including K3-J721s2 timer dts fix, assorted
crypto improvements, led-pwm driver, improve handling of mtd
partitions, align mkimage hash output buffers and backport a UBIFS
bugfix from Linux.
Diffstat (limited to 'lib/crypto')
| -rw-r--r-- | lib/crypto/pkcs7_verify.c | 4 | ||||
| -rw-r--r-- | lib/crypto/x509_public_key.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/lib/crypto/pkcs7_verify.c b/lib/crypto/pkcs7_verify.c index 82c5c745d49..b832f013566 100644 --- a/lib/crypto/pkcs7_verify.c +++ b/lib/crypto/pkcs7_verify.c @@ -65,6 +65,10 @@ static int pkcs7_digest(struct pkcs7_message *pkcs7, return -ENOPKG; if (!strcmp(sinfo->sig->hash_algo, "sha256")) sig->digest_size = SHA256_SUM_LEN; + else if (!strcmp(sinfo->sig->hash_algo, "sha384")) + sig->digest_size = SHA384_SUM_LEN; + else if (!strcmp(sinfo->sig->hash_algo, "sha512")) + sig->digest_size = SHA512_SUM_LEN; else if (!strcmp(sinfo->sig->hash_algo, "sha1")) sig->digest_size = SHA1_SUM_LEN; else diff --git a/lib/crypto/x509_public_key.c b/lib/crypto/x509_public_key.c index d557ab27ae3..5c0e2b622db 100644 --- a/lib/crypto/x509_public_key.c +++ b/lib/crypto/x509_public_key.c @@ -71,6 +71,10 @@ int x509_get_sig_params(struct x509_certificate *cert) return -ENOPKG; if (!strcmp(sig->hash_algo, "sha256")) sig->digest_size = SHA256_SUM_LEN; + else if (!strcmp(sig->hash_algo, "sha384")) + sig->digest_size = SHA384_SUM_LEN; + else if (!strcmp(sig->hash_algo, "sha512")) + sig->digest_size = SHA512_SUM_LEN; else if (!strcmp(sig->hash_algo, "sha1")) sig->digest_size = SHA1_SUM_LEN; else |