| Message ID | 20210714130152.25751-1-tianjia.zhang@linux.alibaba.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [ima-evm-utils,v4] ima-evm-utils: Support SM2 algorithm for sign and verify | expand |
Hi Tianjia, On Wed, 2021-07-14 at 21:01 +0800, Tianjia Zhang wrote: > > index 5b07711..a0001b0 100644 > --- a/.travis.yml > +++ b/.travis.yml > @@ -93,4 +93,4 @@ before_install: > script: > - INSTALL="${DISTRO%%:*}" > - INSTALL="${INSTALL%%/*}" > - - $CONTAINER run $CONTAINER_ARGS -t ima-evm-utils /bin/sh -c "if > [ \"$VARIANT\" ]; then ARCH=\"$ARCH\" ./ci/$INSTALL.$VARIANT.sh; fi > && ARCH=\"$ARCH\" CC=\"$CC\" TSS=\"$TSS\" ./ci/$INSTALL.sh && if [ ! > \"$VARIANT\" ]; then which tpm_server || which swtpm || > ./tests/install-swtpm.sh; fi && CC=\"$CC\" VARIANT=\"$VARIANT\" > ./build.sh" > + - $CONTAINER run $CONTAINER_ARGS -t ima-evm-utils /bin/sh -c "if > [ \"$VARIANT\" ]; then ARCH=\"$ARCH\" ./ci/$INSTALL.$VARIANT.sh; fi > && ARCH=\"$ARCH\" CC=\"$CC\" TSS=\"$TSS\" ./ci/$INSTALL.sh && if [ ! > \"$VARIANT\" ]; then which tpm_server || which swtpm || > ./tests/install-swtpm.sh; fi && ./tests/install-openssl3.sh && > CC=\"$CC\" VARIANT=\"$VARIANT\" ./build.sh" With "install-openssl3.sh", installing openssl 3.0 is being done for every distro matrix rule. This needs to be limited to a specific instance. Petr, please correct if I'm wrong, I assume a new variable needs to be defined, similar to "TSS". A similar change would need to be made in ci.yml. > new file mode 100755 > index 0000000..21adb6f > --- /dev/null > +++ b/tests/install-openssl3.sh > @@ -0,0 +1,15 @@ > +#!/bin/sh > + > +set -ex > + > +# The latest version in July 2021 > +wget --no-check-certificate https://github.com/openssl/openssl/archive/refs/tags/openssl-3.0.0-beta1.tar.gz > +tar --no-same-owner -xvzf openssl-3.0.0-beta1.tar.gz Petr said, "Although it appears there is no distro which would have openssl 3.0 [1], Debian actually have 3.0.0~~beta1-1 in experimental [2]. openSUSE has slightly older version openssl-3.0.0-alpha16 [3]. I suppose we update soon to beta1 as well. Using distro packages would be probably faster to run in CI than install from git." I guess, whether the openssl 3.0 source code is from the distro or from openssl, it needs to be compiled from source. Perhaps limiting compiling openssl 3.0 to those distros with the source package is simpler than defining a new travis.yml variable, as suggested above. Petr? thanks, Mimi > +cd openssl-openssl-3.0.0-beta1 > + > +./Configure --prefix=/opt/openssl --openssldir=/opt/openssl/ssl > +make -j$(nproc) && sudo make install > + > +cd .. > +rm -rf openssl-3.0.0-beta1.tar.gz > +rm -rf openssl-openssl-3.0.0-beta1
Hi Mimi, Tianjia, > Hi Tianjia, > On Wed, 2021-07-14 at 21:01 +0800, Tianjia Zhang wrote: > > index 5b07711..a0001b0 100644 > > --- a/.travis.yml > > +++ b/.travis.yml > > @@ -93,4 +93,4 @@ before_install: > > script: > > - INSTALL="${DISTRO%%:*}" > > - INSTALL="${INSTALL%%/*}" > > - - $CONTAINER run $CONTAINER_ARGS -t ima-evm-utils /bin/sh -c "if > > [ \"$VARIANT\" ]; then ARCH=\"$ARCH\" ./ci/$INSTALL.$VARIANT.sh; fi > > && ARCH=\"$ARCH\" CC=\"$CC\" TSS=\"$TSS\" ./ci/$INSTALL.sh && if [ ! > > \"$VARIANT\" ]; then which tpm_server || which swtpm || > > ./tests/install-swtpm.sh; fi && CC=\"$CC\" VARIANT=\"$VARIANT\" > > ./build.sh" > > + - $CONTAINER run $CONTAINER_ARGS -t ima-evm-utils /bin/sh -c "if > > [ \"$VARIANT\" ]; then ARCH=\"$ARCH\" ./ci/$INSTALL.$VARIANT.sh; fi > > && ARCH=\"$ARCH\" CC=\"$CC\" TSS=\"$TSS\" ./ci/$INSTALL.sh && if [ ! > > \"$VARIANT\" ]; then which tpm_server || which swtpm || > > ./tests/install-swtpm.sh; fi && ./tests/install-openssl3.sh && > > CC=\"$CC\" VARIANT=\"$VARIANT\" ./build.sh" > With "install-openssl3.sh", installing openssl 3.0 is being done for > every distro matrix rule. This needs to be limited to a specific > instance. Petr, please correct if I'm wrong, I assume a new variable > needs to be defined, similar to "TSS". +1 > A similar change would need to be made in ci.yml. +1 > > new file mode 100755 > > index 0000000..21adb6f > > --- /dev/null > > +++ b/tests/install-openssl3.sh > > @@ -0,0 +1,15 @@ > > +#!/bin/sh > > + > > +set -ex > > + > > +# The latest version in July 2021 > > +wget --no-check-certificate https://github.com/openssl/openssl/archive/refs/tags/openssl-3.0.0-beta1.tar.gz > > +tar --no-same-owner -xvzf openssl-3.0.0-beta1.tar.gz > Petr said, "Although it appears there is no distro which would have > openssl 3.0 [1], > Debian actually have 3.0.0~~beta1-1 in experimental [2]. openSUSE has slightly > older version openssl-3.0.0-alpha16 [3]. I suppose we update soon to beta1 as > well. > Using distro packages would be probably faster to run in CI than install from git." > I guess, whether the openssl 3.0 source code is from the distro or from > openssl, it needs to be compiled from source. > Perhaps limiting compiling openssl 3.0 to those distros with the source > package is simpler than defining a new travis.yml variable, as > suggested above. Petr? It'll be slower, but why not. It might be better not cover only Debian. But IMHO there should be at least some distros tested with regular openssl 1.1.x (or which particular version it have) which means some runs will be added to the matrix. But there should be a balance between test coverity and time required for tests to be run (we don't want to end up like u-boot [1] :)). Kind regards, Petr [1] https://github.com/u-boot/u-boot/runs/3073277277 > thanks, > Mimi
Hi all, There are several failures https://github.com/pevik/ima-evm-utils/actions/runs/1032906509 Alpine, Ubuntu Xenial, Centos7, Centos:latest: ./boot_aggregate.test: line 34: ./tsstpmcmd: No such file or directory and Fedora: dgst: Unrecognized flag md_gost12_256 Kind regards, Petr
On 7/15/21 2:39 PM, Petr Vorel wrote: > Hi Mimi, Tianjia, > >> Hi Tianjia, > >> On Wed, 2021-07-14 at 21:01 +0800, Tianjia Zhang wrote: > >>> index 5b07711..a0001b0 100644 >>> --- a/.travis.yml >>> +++ b/.travis.yml >>> @@ -93,4 +93,4 @@ before_install: >>> script: >>> - INSTALL="${DISTRO%%:*}" >>> - INSTALL="${INSTALL%%/*}" >>> - - $CONTAINER run $CONTAINER_ARGS -t ima-evm-utils /bin/sh -c "if >>> [ \"$VARIANT\" ]; then ARCH=\"$ARCH\" ./ci/$INSTALL.$VARIANT.sh; fi >>> && ARCH=\"$ARCH\" CC=\"$CC\" TSS=\"$TSS\" ./ci/$INSTALL.sh && if [ ! >>> \"$VARIANT\" ]; then which tpm_server || which swtpm || >>> ./tests/install-swtpm.sh; fi && CC=\"$CC\" VARIANT=\"$VARIANT\" >>> ./build.sh" >>> + - $CONTAINER run $CONTAINER_ARGS -t ima-evm-utils /bin/sh -c "if >>> [ \"$VARIANT\" ]; then ARCH=\"$ARCH\" ./ci/$INSTALL.$VARIANT.sh; fi >>> && ARCH=\"$ARCH\" CC=\"$CC\" TSS=\"$TSS\" ./ci/$INSTALL.sh && if [ ! >>> \"$VARIANT\" ]; then which tpm_server || which swtpm || >>> ./tests/install-swtpm.sh; fi && ./tests/install-openssl3.sh && >>> CC=\"$CC\" VARIANT=\"$VARIANT\" ./build.sh" > >> With "install-openssl3.sh", installing openssl 3.0 is being done for >> every distro matrix rule. This needs to be limited to a specific >> instance. Petr, please correct if I'm wrong, I assume a new variable >> needs to be defined, similar to "TSS". > +1 > >> A similar change would need to be made in ci.yml. > +1 > >>> new file mode 100755 >>> index 0000000..21adb6f >>> --- /dev/null >>> +++ b/tests/install-openssl3.sh >>> @@ -0,0 +1,15 @@ >>> +#!/bin/sh >>> + >>> +set -ex >>> + >>> +# The latest version in July 2021 >>> +wget --no-check-certificate https://github.com/openssl/openssl/archive/refs/tags/openssl-3.0.0-beta1.tar.gz >>> +tar --no-same-owner -xvzf openssl-3.0.0-beta1.tar.gz > >> Petr said, "Although it appears there is no distro which would have >> openssl 3.0 [1], >> Debian actually have 3.0.0~~beta1-1 in experimental [2]. openSUSE has slightly >> older version openssl-3.0.0-alpha16 [3]. I suppose we update soon to beta1 as >> well. >> Using distro packages would be probably faster to run in CI than install from git." >> I guess, whether the openssl 3.0 source code is from the distro or from >> openssl, it needs to be compiled from source. > >> Perhaps limiting compiling openssl 3.0 to those distros with the source >> package is simpler than defining a new travis.yml variable, as >> suggested above. Petr? > It'll be slower, but why not. It might be better not cover only Debian. > But IMHO there should be at least some distros tested with regular openssl 1.1.x > (or which particular version it have) which means some runs will be added to the > matrix. But there should be a balance between test coverity and time required > for tests to be run (we don't want to end up like u-boot [1] :)). > > Kind regards, > Petr > > [1] https://github.com/u-boot/u-boot/runs/3073277277 > evmctl itself relies on openssl version 1.1.1 or lower. I guess, openssl 3.0 needs to be compiled and install to a non-standard path, such as /opt/openssl, otherwise it will affect the subsequent compilation of evmctl in build.sh. Of course, compile openssl 3.0 from source code. must to limit the number of instances to avoid excessively increasing the time-consuming in CI. Is that right? Best regards, Tianjia
On Thu, 2021-07-15 at 20:24 +0800, Tianjia Zhang wrote: > > On 7/15/21 2:39 PM, Petr Vorel wrote: > > Hi Mimi, Tianjia, > > > >> Hi Tianjia, > > > >> On Wed, 2021-07-14 at 21:01 +0800, Tianjia Zhang wrote: > > > >>> index 5b07711..a0001b0 100644 > >>> --- a/.travis.yml > >>> +++ b/.travis.yml > >>> @@ -93,4 +93,4 @@ before_install: > >>> script: > >>> - INSTALL="${DISTRO%%:*}" > >>> - INSTALL="${INSTALL%%/*}" > >>> - - $CONTAINER run $CONTAINER_ARGS -t ima-evm-utils /bin/sh -c "if > >>> [ \"$VARIANT\" ]; then ARCH=\"$ARCH\" ./ci/$INSTALL.$VARIANT.sh; fi > >>> && ARCH=\"$ARCH\" CC=\"$CC\" TSS=\"$TSS\" ./ci/$INSTALL.sh && if [ ! > >>> \"$VARIANT\" ]; then which tpm_server || which swtpm || > >>> ./tests/install-swtpm.sh; fi && CC=\"$CC\" VARIANT=\"$VARIANT\" > >>> ./build.sh" > >>> + - $CONTAINER run $CONTAINER_ARGS -t ima-evm-utils /bin/sh -c "if > >>> [ \"$VARIANT\" ]; then ARCH=\"$ARCH\" ./ci/$INSTALL.$VARIANT.sh; fi > >>> && ARCH=\"$ARCH\" CC=\"$CC\" TSS=\"$TSS\" ./ci/$INSTALL.sh && if [ ! > >>> \"$VARIANT\" ]; then which tpm_server || which swtpm || > >>> ./tests/install-swtpm.sh; fi && ./tests/install-openssl3.sh && > >>> CC=\"$CC\" VARIANT=\"$VARIANT\" ./build.sh" > > > >> With "install-openssl3.sh", installing openssl 3.0 is being done for > >> every distro matrix rule. This needs to be limited to a specific > >> instance. Petr, please correct if I'm wrong, I assume a new variable > >> needs to be defined, similar to "TSS". > > +1 > > > >> A similar change would need to be made in ci.yml. > > +1 > > > >>> new file mode 100755 > >>> index 0000000..21adb6f > >>> --- /dev/null > >>> +++ b/tests/install-openssl3.sh > >>> @@ -0,0 +1,15 @@ > >>> +#!/bin/sh > >>> + > >>> +set -ex > >>> + > >>> +# The latest version in July 2021 > >>> +wget --no-check-certificate https://github.com/openssl/openssl/archive/refs/tags/openssl-3.0.0-beta1.tar.gz > >>> +tar --no-same-owner -xvzf openssl-3.0.0-beta1.tar.gz > > > >> Petr said, "Although it appears there is no distro which would have > >> openssl 3.0 [1], > >> Debian actually have 3.0.0~~beta1-1 in experimental [2]. openSUSE has slightly > >> older version openssl-3.0.0-alpha16 [3]. I suppose we update soon to beta1 as > >> well. > >> Using distro packages would be probably faster to run in CI than install from git." > >> I guess, whether the openssl 3.0 source code is from the distro or from > >> openssl, it needs to be compiled from source. > > > >> Perhaps limiting compiling openssl 3.0 to those distros with the source > >> package is simpler than defining a new travis.yml variable, as > >> suggested above. Petr? > > It'll be slower, but why not. It might be better not cover only Debian. > > But IMHO there should be at least some distros tested with regular openssl 1.1.x > > (or which particular version it have) which means some runs will be added to the > > matrix. But there should be a balance between test coverity and time required > > for tests to be run (we don't want to end up like u-boot [1] :)). > > > [1] https://github.com/u-boot/u-boot/runs/3073277277 > > > > evmctl itself relies on openssl version 1.1.1 or lower. I guess, openssl > 3.0 needs to be compiled and install to a non-standard path, such as > /opt/openssl, otherwise it will affect the subsequent compilation of > evmctl in build.sh. Compiling evmctl with the new version of openssl will eventually need to be done. but that isn't required for your patch. > Of course, compile openssl 3.0 from source code. > must to limit the number of instances to avoid excessively increasing > the time-consuming in CI. Is that right? It's more than just "time consuming". There needs to be a balance between testing with the distro openssl version and testing with the new openssl version, without going overboard with the number of tests. thanks, Mimi
Hi Tianjia, all, > evmctl itself relies on openssl version 1.1.1 or lower. I guess, openssl 3.0 > needs to be compiled and install to a non-standard path, such as > /opt/openssl, otherwise it will affect the subsequent compilation of evmctl > in build.sh. OK, IMHO Debian does not allow to install both version together. I suppose openSUSE does, but understand if it's just easier to compile it to /opt/openssl. > Of course, compile openssl 3.0 from source code. must to limit > the number of instances to avoid excessively increasing the time-consuming > in CI. Is that right? +1 Kind regards, Petr > Best regards, > Tianjia
On 7/15/21 9:01 PM, Mimi Zohar wrote: > On Thu, 2021-07-15 at 20:24 +0800, Tianjia Zhang wrote: >> >> On 7/15/21 2:39 PM, Petr Vorel wrote: >>> Hi Mimi, Tianjia, >>> >>>> Hi Tianjia, >>> >>>> On Wed, 2021-07-14 at 21:01 +0800, Tianjia Zhang wrote: >>> >>>>> index 5b07711..a0001b0 100644 >>>>> --- a/.travis.yml >>>>> +++ b/.travis.yml >>>>> @@ -93,4 +93,4 @@ before_install: >>>>> script: >>>>> - INSTALL="${DISTRO%%:*}" >>>>> - INSTALL="${INSTALL%%/*}" >>>>> - - $CONTAINER run $CONTAINER_ARGS -t ima-evm-utils /bin/sh -c "if >>>>> [ \"$VARIANT\" ]; then ARCH=\"$ARCH\" ./ci/$INSTALL.$VARIANT.sh; fi >>>>> && ARCH=\"$ARCH\" CC=\"$CC\" TSS=\"$TSS\" ./ci/$INSTALL.sh && if [ ! >>>>> \"$VARIANT\" ]; then which tpm_server || which swtpm || >>>>> ./tests/install-swtpm.sh; fi && CC=\"$CC\" VARIANT=\"$VARIANT\" >>>>> ./build.sh" >>>>> + - $CONTAINER run $CONTAINER_ARGS -t ima-evm-utils /bin/sh -c "if >>>>> [ \"$VARIANT\" ]; then ARCH=\"$ARCH\" ./ci/$INSTALL.$VARIANT.sh; fi >>>>> && ARCH=\"$ARCH\" CC=\"$CC\" TSS=\"$TSS\" ./ci/$INSTALL.sh && if [ ! >>>>> \"$VARIANT\" ]; then which tpm_server || which swtpm || >>>>> ./tests/install-swtpm.sh; fi && ./tests/install-openssl3.sh && >>>>> CC=\"$CC\" VARIANT=\"$VARIANT\" ./build.sh" >>> >>>> With "install-openssl3.sh", installing openssl 3.0 is being done for >>>> every distro matrix rule. This needs to be limited to a specific >>>> instance. Petr, please correct if I'm wrong, I assume a new variable >>>> needs to be defined, similar to "TSS". >>> +1 >>> >>>> A similar change would need to be made in ci.yml. >>> +1 >>> >>>>> new file mode 100755 >>>>> index 0000000..21adb6f >>>>> --- /dev/null >>>>> +++ b/tests/install-openssl3.sh >>>>> @@ -0,0 +1,15 @@ >>>>> +#!/bin/sh >>>>> + >>>>> +set -ex >>>>> + >>>>> +# The latest version in July 2021 >>>>> +wget --no-check-certificate https://github.com/openssl/openssl/archive/refs/tags/openssl-3.0.0-beta1.tar.gz >>>>> +tar --no-same-owner -xvzf openssl-3.0.0-beta1.tar.gz >>> >>>> Petr said, "Although it appears there is no distro which would have >>>> openssl 3.0 [1], >>>> Debian actually have 3.0.0~~beta1-1 in experimental [2]. openSUSE has slightly >>>> older version openssl-3.0.0-alpha16 [3]. I suppose we update soon to beta1 as >>>> well. >>>> Using distro packages would be probably faster to run in CI than install from git." >>>> I guess, whether the openssl 3.0 source code is from the distro or from >>>> openssl, it needs to be compiled from source. >>> >>>> Perhaps limiting compiling openssl 3.0 to those distros with the source >>>> package is simpler than defining a new travis.yml variable, as >>>> suggested above. Petr? >>> It'll be slower, but why not. It might be better not cover only Debian. >>> But IMHO there should be at least some distros tested with regular openssl 1.1.x >>> (or which particular version it have) which means some runs will be added to the >>> matrix. But there should be a balance between test coverity and time required >>> for tests to be run (we don't want to end up like u-boot [1] :)). >> >>> [1] https://github.com/u-boot/u-boot/runs/3073277277 >>> >> >> evmctl itself relies on openssl version 1.1.1 or lower. I guess, openssl >> 3.0 needs to be compiled and install to a non-standard path, such as >> /opt/openssl, otherwise it will affect the subsequent compilation of >> evmctl in build.sh. > > Compiling evmctl with the new version of openssl will eventually need > to be done. but that isn't required for your patch. > >> Of course, compile openssl 3.0 from source code. >> must to limit the number of instances to avoid excessively increasing >> the time-consuming in CI. Is that right? > > It's more than just "time consuming". There needs to be a balance > between testing with the distro openssl version and testing with the > new openssl version, without going overboard with the number of tests. > Got it. Thanks. Cheers, Tianjia
On 7/15/21 9:06 PM, Petr Vorel wrote: > Hi Tianjia, all, > >> evmctl itself relies on openssl version 1.1.1 or lower. I guess, openssl 3.0 >> needs to be compiled and install to a non-standard path, such as >> /opt/openssl, otherwise it will affect the subsequent compilation of evmctl >> in build.sh. > > OK, IMHO Debian does not allow to install both version together. I suppose > openSUSE does, but understand if it's just easier to compile it to /opt/openssl. > >> Of course, compile openssl 3.0 from source code. must to limit >> the number of instances to avoid excessively increasing the time-consuming >> in CI. Is that right? > +1 > Yes, will do in next version patch. Best regards, Tianjia
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f08733a..c117cf2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -110,6 +110,7 @@ jobs: INSTALL="${INSTALL%%/*}" if [ "$VARIANT" ]; then ARCH="$ARCH" ./ci/$INSTALL.$VARIANT.sh; fi ARCH="$ARCH" CC="$CC" TSS="$TSS" ./ci/$INSTALL.sh + ./tests/install-openssl3.sh - name: Build swtpm run: if [ ! "$VARIANT" ]; then which tpm_server || which swtpm || ./tests/install-swtpm.sh; fi diff --git a/.travis.yml b/.travis.yml index 5b07711..a0001b0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -93,4 +93,4 @@ before_install: script: - INSTALL="${DISTRO%%:*}" - INSTALL="${INSTALL%%/*}" - - $CONTAINER run $CONTAINER_ARGS -t ima-evm-utils /bin/sh -c "if [ \"$VARIANT\" ]; then ARCH=\"$ARCH\" ./ci/$INSTALL.$VARIANT.sh; fi && ARCH=\"$ARCH\" CC=\"$CC\" TSS=\"$TSS\" ./ci/$INSTALL.sh && if [ ! \"$VARIANT\" ]; then which tpm_server || which swtpm || ./tests/install-swtpm.sh; fi && CC=\"$CC\" VARIANT=\"$VARIANT\" ./build.sh" + - $CONTAINER run $CONTAINER_ARGS -t ima-evm-utils /bin/sh -c "if [ \"$VARIANT\" ]; then ARCH=\"$ARCH\" ./ci/$INSTALL.$VARIANT.sh; fi && ARCH=\"$ARCH\" CC=\"$CC\" TSS=\"$TSS\" ./ci/$INSTALL.sh && if [ ! \"$VARIANT\" ]; then which tpm_server || which swtpm || ./tests/install-swtpm.sh; fi && ./tests/install-openssl3.sh && CC=\"$CC\" VARIANT=\"$VARIANT\" ./build.sh" diff --git a/ci/fedora.sh b/ci/fedora.sh index 2d80915..898d614 100755 --- a/ci/fedora.sh +++ b/ci/fedora.sh @@ -38,7 +38,9 @@ yum -y install \ sudo \ vim-common \ wget \ - which + which \ + perl \ + perl-IPC-Cmd yum -y install docbook5-style-xsl || true yum -y install swtpm || true diff --git a/src/libimaevm.c b/src/libimaevm.c index 6591d20..f18c016 100644 --- a/src/libimaevm.c +++ b/src/libimaevm.c @@ -447,6 +447,16 @@ static int verify_hash_v2(const char *file, const unsigned char *hash, int size, return -1; } +#if defined(EVP_PKEY_SM2) && OPENSSL_VERSION_NUMBER < 0x30000000 + /* If EC key are used, check whether it is SM2 key */ + if (EVP_PKEY_id(pkey) == EVP_PKEY_EC) { + EC_KEY *ec = EVP_PKEY_get0_EC_KEY(pkey); + int curve = EC_GROUP_get_curve_name(EC_KEY_get0_group(ec)); + if (curve == NID_sm2) + EVP_PKEY_set_alias_type(pkey, EVP_PKEY_SM2); + } +#endif + st = "EVP_PKEY_CTX_new"; if (!(ctx = EVP_PKEY_CTX_new(pkey, NULL))) goto err; @@ -861,6 +871,16 @@ static int sign_hash_v2(const char *algo, const unsigned char *hash, return -1; } +#if defined(EVP_PKEY_SM2) && OPENSSL_VERSION_NUMBER < 0x30000000 + /* If EC key are used, check whether it is SM2 key */ + if (EVP_PKEY_id(pkey) == EVP_PKEY_EC) { + EC_KEY *ec = EVP_PKEY_get0_EC_KEY(pkey); + int curve = EC_GROUP_get_curve_name(EC_KEY_get0_group(ec)); + if (curve == NID_sm2) + EVP_PKEY_set_alias_type(pkey, EVP_PKEY_SM2); + } +#endif + calc_keyid_v2(&keyid, name, pkey); hdr->keyid = keyid; diff --git a/tests/gen-keys.sh b/tests/gen-keys.sh index 46130cf..389e979 100755 --- a/tests/gen-keys.sh +++ b/tests/gen-keys.sh @@ -112,6 +112,30 @@ for m in \ fi done +# SM2 +for curve in sm2; do + if [ "$1" = clean ] || [ "$1" = force ]; then + rm -f test-$curve.cer test-$curve.key test-$curve.pub + fi + if [ "$1" = clean ]; then + continue + fi + if [ ! -e test-$curve.key ]; then + PATH=/opt/openssl/bin:$PATH LD_LIBRARY_PATH=/opt/openssl/lib \ + log openssl req -verbose -new -nodes -utf8 -days 10000 -batch -x509 \ + -sm3 -sigopt "distid:1234567812345678" \ + -config test-ca.conf \ + -copy_extensions copyall \ + -newkey $curve \ + -out test-$curve.cer -outform DER \ + -keyout test-$curve.key + if [ -s test-$curve.key ]; then + PATH=/opt/openssl/bin:$PATH LD_LIBRARY_PATH=/opt/openssl/lib \ + log openssl pkey -in test-$curve.key -out test-$curve.pub -pubout + fi + fi +done + # This script leaves test-ca.conf, *.cer, *.pub, *.key files for sing/verify tests. # They are never deleted except by `make distclean'. diff --git a/tests/ima_hash.test b/tests/ima_hash.test index 8d66e59..6e0e463 100755 --- a/tests/ima_hash.test +++ b/tests/ima_hash.test @@ -70,8 +70,7 @@ expect_pass check sha256 0x0404 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649 expect_pass check sha384 0x0405 38b060a751ac96384cd9327eb1b1e36a21fdb71114be07434c0cc7bf63f6e1da274edebfe76f65fbd51ad2f14898b95b expect_pass check sha512 0x0406 cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e expect_pass check rmd160 0x0403 9c1185a5c5e9fc54612808977ee8f548b2258d31 -expect_fail check sm3 0x01 -expect_fail check sm3-256 0x01 +expect_pass check sm3 0x0411 1ab21d8355cfa17f8e61194831e81a8f22bec8c728fefb747ed035eb5082aa2b _enable_gost_engine expect_pass check md_gost12_256 0x0412 3f539a213e97c802cc229d474c6aa32a825a360b2a933a949fd925208d9ce1bb expect_pass check streebog256 0x0412 3f539a213e97c802cc229d474c6aa32a825a360b2a933a949fd925208d9ce1bb diff --git a/tests/install-openssl3.sh b/tests/install-openssl3.sh new file mode 100755 index 0000000..21adb6f --- /dev/null +++ b/tests/install-openssl3.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +set -ex + +# The latest version in July 2021 +wget --no-check-certificate https://github.com/openssl/openssl/archive/refs/tags/openssl-3.0.0-beta1.tar.gz +tar --no-same-owner -xvzf openssl-3.0.0-beta1.tar.gz +cd openssl-openssl-3.0.0-beta1 + +./Configure --prefix=/opt/openssl --openssldir=/opt/openssl/ssl +make -j$(nproc) && sudo make install + +cd .. +rm -rf openssl-3.0.0-beta1.tar.gz +rm -rf openssl-openssl-3.0.0-beta1 diff --git a/tests/sign_verify.test b/tests/sign_verify.test index 3d7aa51..5c35afc 100755 --- a/tests/sign_verify.test +++ b/tests/sign_verify.test @@ -199,6 +199,10 @@ check_sign() { # This is all we can do for evm. [[ "$TYPE" =~ evm ]] && return "$OK" + # When using the SM2/3 algorithm, the openssl tool uses USERID for + # verify, so skip it. + [[ "$ALG" == sm3 ]] && return "$OK" + # Extract signature to a file _extract_xattr "$FILE" "$(_xattr "$TYPE")" "$FILE.sig2" "$PREFIX" @@ -387,6 +391,9 @@ sign_verify prime256v1 sha256 0x030204:K:004[345678] sign_verify prime256v1 sha384 0x030205:K:004[345678] sign_verify prime256v1 sha512 0x030206:K:004[345678] +PATH=/opt/openssl/bin:$PATH LD_LIBRARY_PATH=/opt/openssl/lib \ + sign_verify sm2 sm3 0x030211:K:004[345678] + # Test v2 signatures with EC-RDSA _enable_gost_engine sign_verify gost2012_256-A md_gost12_256 0x030212:K:0040
Keep in sync with the kernel IMA, IMA signature tool supports SM2/3 algorithm combination. Because in the current version of OpenSSL 1.1.1, the SM2 algorithm and the public key using the EC algorithm share the same ID 'EVP_PKEY_EC', and the specific algorithm can only be distinguished by the curve name used. This patch supports this feature. Secondly, the openssl 1.1.1 tool does not fully support the signature of SM2/3 algorithm combination, so the openssl3 tool is used in the test case, and there is no this problem with directly calling the openssl 1.1.1 API in evmctl. Signed-off-by: Tianjia Zhang <tianjia.zhang@linux.alibaba.com> --- .github/workflows/ci.yml | 1 + .travis.yml | 2 +- ci/fedora.sh | 4 +++- src/libimaevm.c | 20 ++++++++++++++++++++ tests/gen-keys.sh | 24 ++++++++++++++++++++++++ tests/ima_hash.test | 3 +-- tests/install-openssl3.sh | 15 +++++++++++++++ tests/sign_verify.test | 7 +++++++ 8 files changed, 72 insertions(+), 4 deletions(-) create mode 100755 tests/install-openssl3.sh