开源软件构建与测试

_service:tar_scm:tpm2-tools.spec Changed

_service:tar_scm:tpm2-tools-5.4.tar.gz/Makefile.in -> _service:tar_scm:tpm2-tools-5.5.tar.gz/Makefile.in Changed

_service:tar_scm:tpm2-tools-5.4.tar.gz/VERSION -> _service:tar_scm:tpm2-tools-5.5.tar.gz/VERSION Changed

_service:tar_scm:tpm2-tools-5.4.tar.gz/aminclude_static.am -> _service:tar_scm:tpm2-tools-5.5.tar.gz/aminclude_static.am Changed

_service:tar_scm:tpm2-tools-5.4.tar.gz/configure -> _service:tar_scm:tpm2-tools-5.5.tar.gz/configure Changed

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for tpm2-tools 5.4.
+# Generated by GNU Autoconf 2.69 for tpm2-tools 5.5.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@
 # Identity of this package.
 PACKAGE_NAME='tpm2-tools'
 PACKAGE_TARNAME='tpm2-tools'
-PACKAGE_VERSION='5.4'
-PACKAGE_STRING='tpm2-tools 5.4'
+PACKAGE_VERSION='5.5'
+PACKAGE_STRING='tpm2-tools 5.5'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1450,7 +1450,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures tpm2-tools 5.4 to adapt to many kinds of systems.
+\`configure' configures tpm2-tools 5.5 to adapt to many kinds of systems.
 
 Usage: $0 OPTION... VAR=VALUE...
 
@@ -1521,7 +1521,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of tpm2-tools 5.4:";;
+     short | recursive ) echo "Configuration of tpm2-tools 5.5:";;
    esac
   cat <<\_ACEOF
 
@@ -1702,7 +1702,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-tpm2-tools configure 5.4
+tpm2-tools configure 5.5
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1980,7 +1980,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by tpm2-tools $as_me 5.4, which was
+It was created by tpm2-tools $as_me 5.5, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -11953,7 +11953,7 @@
 
 # Define the identity of the package.
  PACKAGE='tpm2-tools'
- VERSION='5.4'
+ VERSION='5.5'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -16986,7 +16986,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by tpm2-tools $as_me 5.4, which was
+This file was extended by tpm2-tools $as_me 5.5, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -17052,7 +17052,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/\\""\`\$/\\\\&/g'`"
 ac_cs_version="\\
-tpm2-tools config.status 5.4
+tpm2-tools config.status 5.5
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"

_service:tar_scm:tpm2-tools-5.4.tar.gz/docs/CHANGELOG.md -> _service:tar_scm:tpm2-tools-5.5.tar.gz/docs/CHANGELOG.md Changed

_service:tar_scm:tpm2-tools-5.4.tar.gz/docs/CONTRIBUTING.md -> _service:tar_scm:tpm2-tools-5.5.tar.gz/docs/CONTRIBUTING.md Changed

_service:tar_scm:tpm2-tools-5.4.tar.gz/docs/MAINTAINERS.md -> _service:tar_scm:tpm2-tools-5.5.tar.gz/docs/MAINTAINERS.md Changed

_service:tar_scm:tpm2-tools-5.4.tar.gz/lib/tpm2_attr_util.c -> _service:tar_scm:tpm2-tools-5.5.tar.gz/lib/tpm2_attr_util.c Changed

_service:tar_scm:tpm2-tools-5.4.tar.gz/lib/tpm2_convert.c -> _service:tar_scm:tpm2-tools-5.5.tar.gz/lib/tpm2_convert.c Changed

_service:tar_scm:tpm2-tools-5.4.tar.gz/test/scripts/echo_tcti.py -> _service:tar_scm:tpm2-tools-5.5.tar.gz/test/scripts/echo_tcti.py Changed

_service:tar_scm:tpm2-tools-5.4.tar.gz/tools/tpm2_createek.c -> _service:tar_scm:tpm2-tools-5.5.tar.gz/tools/tpm2_createek.c Changed

@@ -18,6 +18,7 @@
 #define RSA_EK_TEMPLATE_NV_INDEX 0x01c00004
 #define ECC_EK_NONCE_NV_INDEX 0x01c0000b
 #define ECC_EK_TEMPLATE_NV_INDEX 0x01c0000c
+#define ECC_SM2_EK_TEMPLATE_NV_INDEX 0x01c0001b
 
 #define DEFAULT_KEY_ALG "rsa2048"
 
@@ -175,7 +176,8 @@
     public->publicArea.authPolicy = *m->policy;
 
     if (public->publicArea.type == TPM2_ALG_ECC &&
-        public->publicArea.parameters.eccDetail.curveID == TPM2_ECC_NIST_P256) {
+        (public->publicArea.parameters.eccDetail.curveID == TPM2_ECC_NIST_P256 ||
+         public->publicArea.parameters.eccDetail.curveID == TPM2_ECC_SM2_P256)) {
         public->publicArea.unique.ecc.x.size = 32;
         public->publicArea.unique.ecc.y.size = 32;
     } else  if (public->publicArea.type == TPM2_ALG_RSA &&
@@ -195,8 +197,17 @@
         nonce_nv_index = RSA_EK_NONCE_NV_INDEX;
         break;
     case TPM2_ALG_ECC:
-        template_nv_index = ECC_EK_TEMPLATE_NV_INDEX;
-        nonce_nv_index = ECC_EK_NONCE_NV_INDEX;
+        if (input_public->publicArea.parameters.eccDetail.curveID == TPM2_ECC_NIST_P256) {
+            template_nv_index = ECC_EK_TEMPLATE_NV_INDEX;
+            nonce_nv_index = ECC_EK_NONCE_NV_INDEX;
+        } else if (input_public->publicArea.parameters.eccDetail.curveID == TPM2_ECC_SM2_P256) {
+            template_nv_index = ECC_SM2_EK_TEMPLATE_NV_INDEX;
+            // EK Nonces SHALL NOT be Populated in any NV Index in the High Range.
+            nonce_nv_index = 0;
+        } else {
+            template_nv_index = ECC_EK_TEMPLATE_NV_INDEX;
+            nonce_nv_index = ECC_EK_NONCE_NV_INDEX;
+        }
         break;
     default:
         LOG_ERR("EK template and EK nonce for algorithm type input(%4.4x)"
@@ -228,11 +239,13 @@
 
     // Read EK nonce
     UINT16 nonce_size = 0;
-    rc = tpm2_util_nv_read(ectx, nonce_nv_index, 0, 0,
-        &ctx.auth_owner_hierarchy.object, &nonce, &nonce_size, &cp_hash,
-        &rp_hash, TPM2_ALG_SHA256, 0, ESYS_TR_NONE, ESYS_TR_NONE, NULL);
-    if (rc != tool_rc_success) {
-        goto out;
+    if (nonce_nv_index) {
+        rc = tpm2_util_nv_read(ectx, nonce_nv_index, 0, 0,
+                &ctx.auth_owner_hierarchy.object, &nonce, &nonce_size, &cp_hash,
+                &rp_hash, TPM2_ALG_SHA256, 0, ESYS_TR_NONE, ESYS_TR_NONE, NULL);
+        if (rc != tool_rc_success) {
+            goto out;
+        }
     }
 
     if (input_public->publicArea.type == TPM2_ALG_RSA) {
@@ -240,9 +253,11 @@
         input_public->publicArea.unique.rsa.size = 256;
     } else {
         // ECC is only other supported algorithm
-        memcpy(&input_public->publicArea.unique.ecc.x.buffer, &nonce, nonce_size);
-        input_public->publicArea.unique.ecc.x.size = 32;
-        input_public->publicArea.unique.ecc.y.size = 32;
+        if (nonce_size) {
+            memcpy(&input_public->publicArea.unique.ecc.x.buffer, &nonce, nonce_size);
+            input_public->publicArea.unique.ecc.x.size = 32;
+            input_public->publicArea.unique.ecc.y.size = 32;
+        }
     }
 
     out: if (template) {

_service:tar_scm:tpm2-tools-5.4.tar.gz/tools/tpm2_sessionconfig.c -> _service:tar_scm:tpm2-tools-5.5.tar.gz/tools/tpm2_sessionconfig.c Changed

Changes of Revision 8