diff options
author | Daiki Ueno <ueno@gnu.org> | 2021-11-14 07:12:38 +0000 |
---|---|---|
committer | Daiki Ueno <ueno@gnu.org> | 2021-11-14 07:12:38 +0000 |
commit | a957c6c0b4abf6cb1c9756ef10e8b884cf7ae8aa (patch) | |
tree | 4c1891e3295b8250118feb113ad6f47b6205f822 /lib/gnutls_asn1_tab.c | |
parent | ce730c61808c38f318297835d7a3f159a202b820 (diff) | |
parent | 42bff24a6423f45bcfc2d03ed075916bfd6077be (diff) | |
download | gnutls-a957c6c0b4abf6cb1c9756ef10e8b884cf7ae8aa.tar.gz |
Merge branch 'wip/dueno/tpm2' into 'master'
Port openconnect TPM2 code
Closes #594
See merge request gnutls/gnutls!1460
Diffstat (limited to 'lib/gnutls_asn1_tab.c')
-rw-r--r-- | lib/gnutls_asn1_tab.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/gnutls_asn1_tab.c b/lib/gnutls_asn1_tab.c index 0f56619559..90bbf0bd42 100644 --- a/lib/gnutls_asn1_tab.c +++ b/lib/gnutls_asn1_tab.c @@ -25,7 +25,6 @@ const asn1_static_node gnutls_asn1_tab[] = { { "algorithm", 1073741836, NULL }, { "seed", 7, NULL }, { "OtherPrimeInfos", 1612709899, NULL }, - { "MAX", 1074266122, "1"}, { NULL, 2, "OtherPrimeInfo"}, { "OtherPrimeInfo", 1610612741, NULL }, { "prime", 1073741827, NULL }, @@ -119,9 +118,16 @@ const asn1_static_node gnutls_asn1_tab[] = { { "ephemeralPublicKey", 1610637314, "SubjectPublicKeyInfo"}, { NULL, 4104, "0"}, { "ukm", 7, NULL }, - { "GostR3410-KeyTransport", 536870917, NULL }, + { "GostR3410-KeyTransport", 1610612741, NULL }, { "sessionEncryptedKey", 1073741826, "Gost28147-89-EncryptedKey"}, { "transportParameters", 536895490, "GostR3410-TransportParameters"}, { NULL, 4104, "0"}, + { "TPMKey", 536870917, NULL }, + { "type", 1073741836, NULL }, + { "emptyAuth", 1610637316, NULL }, + { NULL, 2056, "0"}, + { "parent", 1073741827, NULL }, + { "pubkey", 1073741831, NULL }, + { "privkey", 7, NULL }, { NULL, 0, NULL } }; |