diff options
| author | Elliott Hughes <enh@google.com> | 2022-10-04 01:58:24 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-10-04 01:58:24 +0000 |
| commit | 3eb265e5e7fb4ad4bbefeb0b4507545a89b421c4 (patch) | |
| tree | 3f7f12667a3d263d8abcfd93248790afa16cf241 /libkmod/libkmod-signature.c | |
| parent | b748b53013964743132f5296d7f21377af939383 (diff) | |
| parent | d9c006ff3cd9bd3b7e17713f4f49852060cb9cdc (diff) | |
| download | kmod-3eb265e5e7fb4ad4bbefeb0b4507545a89b421c4.tar.gz | |
Upgrade kmod to v30 am: 65d4b95025 am: d9c006ff3c
Original change: https://android-review.googlesource.com/c/platform/external/kmod/+/2240916
Change-Id: Icd537d6b48a74448c824d314af512465a0657658
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libkmod/libkmod-signature.c')
| -rw-r--r-- | libkmod/libkmod-signature.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libkmod/libkmod-signature.c b/libkmod/libkmod-signature.c index 9877cf3..47aedd0 100644 --- a/libkmod/libkmod-signature.c +++ b/libkmod/libkmod-signature.c @@ -55,6 +55,7 @@ enum pkey_hash_algo { PKEY_HASH_SHA384, PKEY_HASH_SHA512, PKEY_HASH_SHA224, + PKEY_HASH_SM3, PKEY_HASH__LAST }; @@ -67,6 +68,7 @@ const char *const pkey_hash_algo[PKEY_HASH__LAST] = { [PKEY_HASH_SHA384] = "sha384", [PKEY_HASH_SHA512] = "sha512", [PKEY_HASH_SHA224] = "sha224", + [PKEY_HASH_SM3] = "sm3", }; enum pkey_id_type { @@ -160,6 +162,10 @@ static int obj_to_hash_algo(const ASN1_OBJECT *o) return PKEY_HASH_SHA512; case NID_sha224: return PKEY_HASH_SHA224; +# ifndef OPENSSL_NO_SM3 + case NID_sm3: + return PKEY_HASH_SM3; +# endif default: return -1; } |