35 lines
1.1 KiB
Diff
35 lines
1.1 KiB
Diff
|
# HG changeset patch
|
||
|
|
# User Rob Lemley <rob@thunderbird.net>
|
||
|
|
# Date 1663866531 14400
|
||
|
|
# Thu Sep 22 13:08:51 2022 -0400
|
||
|
|
# Node ID 0798506e89ab0ad98d5826effe2087c2e2560d0b
|
||
|
|
# Parent a863c22903a3fa4c71360920ed77ac31f1fa5d01
|
||
|
|
Bug 1790116 - Do not compile SM2 crypto with librnp. r=kaie
|
||
|
|
|
||
|
|
|
||
|
|
|
||
|
|
The CMake configuration in rnp/src/lib/CMakeLists.txt does not include
|
||
|
|
src/lib/crypto/sm2.cpp unless ENABLE_SM2 is defined.
|
||
|
|
Thunderbird builds do not set ENABLE_SM2, so there's no need to build this
|
||
|
|
file.
|
||
|
|
|
||
|
|
Depends on D157053
|
||
|
|
|
||
|
|
Differential Revision: https://phabricator.services.mozilla.com/D157154
|
||
|
|
|
||
|
|
diff --git a/comm/third_party/rnp/moz.build b/third_party/rnp/moz.b/commuild
|
||
|
|
--- a/comm/third_party/rnp/moz.build
|
||
|
|
+++ b/comm/third_party/rnp/moz.build
|
||
|
|
@@ -128,11 +128,10 @@ SOURCES += [
|
||
|
|
"src/lib/crypto/s2k.cpp",
|
||
|
|
"src/lib/crypto/sha1cd/hash_sha1cd.cpp",
|
||
|
|
"src/lib/crypto/sha1cd/sha1.c",
|
||
|
|
"src/lib/crypto/sha1cd/ubc_check.c",
|
||
|
|
"src/lib/crypto/signatures.cpp",
|
||
|
|
- "src/lib/crypto/sm2.cpp",
|
||
|
|
"src/lib/crypto/symmetric.cpp",
|
||
|
|
"src/lib/fingerprint.cpp",
|
||
|
|
"src/lib/generate-key.cpp",
|
||
|
|
"src/lib/json-utils.cpp",
|
||
|
|
"src/lib/key-provider.cpp",
|