From b08916f5bb539a348d1d77971c0995bf93570249 Mon Sep 17 00:00:00 2001 From: Matt Oliver Date: Sun, 6 Nov 2022 21:03:14 +1100 Subject: [PATCH] project: Update for 3.7.8 merge. --- SMP/gnutls/gnutls.h | 8 +-- SMP/lib/accelerated/x86/coff/aesni-x86.asm | 6 +-- SMP/lib/accelerated/x86/coff/aesni-x86_64.asm | 8 +-- SMP/lib/accelerated/x86/coff/ghash-x86_64.asm | 4 +- .../x86/coff/sha1-ssse3-x86_64.asm | 8 +-- .../x86/coff/sha256-avx-x86_64.asm | 4 +- .../accelerated/x86/coff/sha256-ssse3-x86.asm | 4 +- .../x86/coff/sha256-ssse3-x86_64.asm | 4 +- .../x86/coff/sha512-ssse3-x86_64.asm | 4 +- SMP/lib/gnutls_asn1_tab.c | 1 + SMP/lib/pkix_asn1_tab.c | 53 ++++++++++++++----- SMP/libgnutls.vcxproj.filters | 6 +++ SMP/libgnutls_winrt.vcxproj.filters | 6 +++ SMP/version.h | 4 +- 14 files changed, 79 insertions(+), 41 deletions(-) diff --git a/SMP/gnutls/gnutls.h b/SMP/gnutls/gnutls.h index 6921b725f7..3f9ecc9115 100644 --- a/SMP/gnutls/gnutls.h +++ b/SMP/gnutls/gnutls.h @@ -57,13 +57,13 @@ extern "C" { #endif /* *INDENT-ON* */ -#define GNUTLS_VERSION "3.7.7" +#define GNUTLS_VERSION "3.7.8" #define GNUTLS_VERSION_MAJOR 3 #define GNUTLS_VERSION_MINOR 7 -#define GNUTLS_VERSION_PATCH 7 +#define GNUTLS_VERSION_PATCH 8 -#define GNUTLS_VERSION_NUMBER 0x030707 +#define GNUTLS_VERSION_NUMBER 0x030708 #define GNUTLS_CIPHER_RIJNDAEL_128_CBC GNUTLS_CIPHER_AES_128_CBC #define GNUTLS_CIPHER_RIJNDAEL_256_CBC GNUTLS_CIPHER_AES_256_CBC @@ -1175,7 +1175,7 @@ typedef enum { * gnutls_channel_binding_t: * @GNUTLS_CB_TLS_UNIQUE: "tls-unique" (RFC 5929) channel binding * @GNUTLS_CB_TLS_SERVER_END_POINT: "tls-server-end-point" (RFC 5929) channel binding - * @GNUTLS_CB_TLS_EXPORTER: "tls-exporter" (draft-ietf-kitten-tls-channel-bindings-for-tls13-03) + * @GNUTLS_CB_TLS_EXPORTER: "tls-exporter" (RFC 9266) channel binding * * Enumeration of supported channel binding types. */ diff --git a/SMP/lib/accelerated/x86/coff/aesni-x86.asm b/SMP/lib/accelerated/x86/coff/aesni-x86.asm index 1b64723adb..b687e93578 100644 --- a/SMP/lib/accelerated/x86/coff/aesni-x86.asm +++ b/SMP/lib/accelerated/x86/coff/aesni-x86.asm @@ -8,7 +8,7 @@ section .text code align=64 %else section .text code %endif -;extern __gnutls_x86_cpuid_s +;extern _GNUTLS_x86_cpuid_s global _aesni_encrypt align 16 _aesni_encrypt: @@ -2824,7 +2824,7 @@ __aesni_set_encrypt_key: L$112pic: pop ebx lea ebx,[(L$key_const-L$112pic)+ebx] - lea ebp,[__gnutls_x86_cpuid_s] + lea ebp,[_GNUTLS_x86_cpuid_s] movups xmm0,[eax] xorps xmm4,xmm4 mov ebp,DWORD [4+ebp] @@ -3201,4 +3201,4 @@ db 83,45,78,73,44,32,67,82,89,80,84,79,71,65,77,83 db 32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115 db 115,108,46,111,114,103,62,0 segment .bss -common __gnutls_x86_cpuid_s 16 +common _GNUTLS_x86_cpuid_s 16 diff --git a/SMP/lib/accelerated/x86/coff/aesni-x86_64.asm b/SMP/lib/accelerated/x86/coff/aesni-x86_64.asm index a7339e0062..a88a837e11 100644 --- a/SMP/lib/accelerated/x86/coff/aesni-x86_64.asm +++ b/SMP/lib/accelerated/x86/coff/aesni-x86_64.asm @@ -4,7 +4,7 @@ default rel %define ZMMWORD section .text code align=64 -EXTERN _gnutls_x86_cpuid_s +EXTERN GNUTLS_x86_cpuid_s global aesni_encrypt ALIGN 16 @@ -1228,7 +1228,7 @@ DB 102,15,58,34,232,3 lea r9,[7+r8] mov DWORD[((96+12))+rsp],r10d bswap r9d - mov r10d,DWORD[((_gnutls_x86_cpuid_s+4))] + mov r10d,DWORD[((GNUTLS_x86_cpuid_s+4))] xor r9d,ebp and r10d,71303168 mov DWORD[((112+12))+rsp],r9d @@ -3844,7 +3844,7 @@ $L$cbc_decrypt_body: movdqa xmm14,xmm5 movdqu xmm7,XMMWORD[80+rdi] movdqa xmm15,xmm6 - mov r9d,DWORD[((_gnutls_x86_cpuid_s+4))] + mov r9d,DWORD[((GNUTLS_x86_cpuid_s+4))] cmp rdx,0x70 jbe NEAR $L$cbc_dec_six_or_seven @@ -4393,7 +4393,7 @@ DB 0x48,0x83,0xEC,0x08 mov r10d,268437504 movups xmm0,XMMWORD[rcx] xorps xmm4,xmm4 - and r10d,DWORD[((_gnutls_x86_cpuid_s+4))] + and r10d,DWORD[((GNUTLS_x86_cpuid_s+4))] lea rax,[16+r8] cmp edx,256 je NEAR $L$14rounds diff --git a/SMP/lib/accelerated/x86/coff/ghash-x86_64.asm b/SMP/lib/accelerated/x86/coff/ghash-x86_64.asm index 79f3fd5ba8..7f06c837f5 100644 --- a/SMP/lib/accelerated/x86/coff/ghash-x86_64.asm +++ b/SMP/lib/accelerated/x86/coff/ghash-x86_64.asm @@ -4,7 +4,7 @@ default rel %define ZMMWORD section .text code align=64 -EXTERN _gnutls_x86_cpuid_s +EXTERN GNUTLS_x86_cpuid_s global gcm_gmult_4bit @@ -965,7 +965,7 @@ DB 102,65,15,56,0,194 jz NEAR $L$odd_tail movdqu xmm6,XMMWORD[16+rdx] - mov eax,DWORD[((_gnutls_x86_cpuid_s+4))] + mov eax,DWORD[((GNUTLS_x86_cpuid_s+4))] cmp r9,0x30 jb NEAR $L$skip4x diff --git a/SMP/lib/accelerated/x86/coff/sha1-ssse3-x86_64.asm b/SMP/lib/accelerated/x86/coff/sha1-ssse3-x86_64.asm index c0d81fa70d..8e8b6429cc 100644 --- a/SMP/lib/accelerated/x86/coff/sha1-ssse3-x86_64.asm +++ b/SMP/lib/accelerated/x86/coff/sha1-ssse3-x86_64.asm @@ -4,7 +4,7 @@ default rel %define ZMMWORD section .text code align=64 -EXTERN _gnutls_x86_cpuid_s +EXTERN GNUTLS_x86_cpuid_s global sha1_block_data_order @@ -20,9 +20,9 @@ $L$SEH_begin_sha1_block_data_order: - mov r9d,DWORD[((_gnutls_x86_cpuid_s+0))] - mov r8d,DWORD[((_gnutls_x86_cpuid_s+4))] - mov r10d,DWORD[((_gnutls_x86_cpuid_s+8))] + mov r9d,DWORD[((GNUTLS_x86_cpuid_s+0))] + mov r8d,DWORD[((GNUTLS_x86_cpuid_s+4))] + mov r10d,DWORD[((GNUTLS_x86_cpuid_s+8))] test r8d,512 jz NEAR $L$ialu test r10d,536870912 diff --git a/SMP/lib/accelerated/x86/coff/sha256-avx-x86_64.asm b/SMP/lib/accelerated/x86/coff/sha256-avx-x86_64.asm index 7d3a228179..2ba82f85d9 100644 --- a/SMP/lib/accelerated/x86/coff/sha256-avx-x86_64.asm +++ b/SMP/lib/accelerated/x86/coff/sha256-avx-x86_64.asm @@ -5,7 +5,7 @@ default rel section .text code align=64 -EXTERN _gnutls_x86_cpuid_s +EXTERN GNUTLS_x86_cpuid_s global sha256_multi_block @@ -21,7 +21,7 @@ $L$SEH_begin_sha256_multi_block: - mov rcx,QWORD[((_gnutls_x86_cpuid_s+4))] + mov rcx,QWORD[((GNUTLS_x86_cpuid_s+4))] bt rcx,61 jc NEAR _shaext_shortcut test ecx,268435456 diff --git a/SMP/lib/accelerated/x86/coff/sha256-ssse3-x86.asm b/SMP/lib/accelerated/x86/coff/sha256-ssse3-x86.asm index 0db7ba89d3..3920d41cd0 100644 --- a/SMP/lib/accelerated/x86/coff/sha256-ssse3-x86.asm +++ b/SMP/lib/accelerated/x86/coff/sha256-ssse3-x86.asm @@ -8,7 +8,7 @@ section .text code align=64 %else section .text code %endif -;extern __gnutls_x86_cpuid_s +;extern _GNUTLS_x86_cpuid_s global _sha256_block_data_order align 16 _sha256_block_data_order: @@ -3353,4 +3353,4 @@ L$009grand_loop: pop ebp ret segment .bss -common __gnutls_x86_cpuid_s 16 +common _GNUTLS_x86_cpuid_s 16 diff --git a/SMP/lib/accelerated/x86/coff/sha256-ssse3-x86_64.asm b/SMP/lib/accelerated/x86/coff/sha256-ssse3-x86_64.asm index 2d0a485a07..ebe227b4ad 100644 --- a/SMP/lib/accelerated/x86/coff/sha256-ssse3-x86_64.asm +++ b/SMP/lib/accelerated/x86/coff/sha256-ssse3-x86_64.asm @@ -5,7 +5,7 @@ default rel section .text code align=64 -EXTERN _gnutls_x86_cpuid_s +EXTERN GNUTLS_x86_cpuid_s global sha256_block_data_order ALIGN 16 @@ -20,7 +20,7 @@ $L$SEH_begin_sha256_block_data_order: - lea r11,[_gnutls_x86_cpuid_s] + lea r11,[GNUTLS_x86_cpuid_s] mov r9d,DWORD[r11] mov r10d,DWORD[4+r11] mov r11d,DWORD[8+r11] diff --git a/SMP/lib/accelerated/x86/coff/sha512-ssse3-x86_64.asm b/SMP/lib/accelerated/x86/coff/sha512-ssse3-x86_64.asm index d8b07fa94c..9b566efc67 100644 --- a/SMP/lib/accelerated/x86/coff/sha512-ssse3-x86_64.asm +++ b/SMP/lib/accelerated/x86/coff/sha512-ssse3-x86_64.asm @@ -5,7 +5,7 @@ default rel section .text code align=64 -EXTERN _gnutls_x86_cpuid_s +EXTERN GNUTLS_x86_cpuid_s global sha512_block_data_order ALIGN 16 @@ -20,7 +20,7 @@ $L$SEH_begin_sha512_block_data_order: - lea r11,[_gnutls_x86_cpuid_s] + lea r11,[GNUTLS_x86_cpuid_s] mov r9d,DWORD[r11] mov r10d,DWORD[4+r11] mov r11d,DWORD[8+r11] diff --git a/SMP/lib/gnutls_asn1_tab.c b/SMP/lib/gnutls_asn1_tab.c index 90bbf0bd42..fdf847222d 100644 --- a/SMP/lib/gnutls_asn1_tab.c +++ b/SMP/lib/gnutls_asn1_tab.c @@ -25,6 +25,7 @@ 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 }, diff --git a/SMP/lib/pkix_asn1_tab.c b/SMP/lib/pkix_asn1_tab.c index df17b430d6..e6ca2a8622 100644 --- a/SMP/lib/pkix_asn1_tab.c +++ b/SMP/lib/pkix_asn1_tab.c @@ -22,13 +22,19 @@ const asn1_static_node pkix_asn1_tab[] = { { "SubjectKeyIdentifier", 1073741831, NULL }, { "KeyUsage", 1073741830, NULL }, { "DirectoryString", 1610612754, NULL }, - { "teletexString", 1075839006, NULL }, - { "printableString", 1075839007, NULL }, - { "universalString", 1075839008, NULL }, - { "utf8String", 1075839010, NULL }, - { "bmpString", 2097185, NULL }, + { "teletexString", 1612709918, NULL }, + { "MAX", 524298, "1"}, + { "printableString", 1612709919, NULL }, + { "MAX", 524298, "1"}, + { "universalString", 1612709920, NULL }, + { "MAX", 524298, "1"}, + { "utf8String", 1612709922, NULL }, + { "MAX", 524298, "1"}, + { "bmpString", 538968097, NULL }, + { "MAX", 524298, "1"}, { "SubjectAltName", 1073741826, "GeneralNames"}, { "GeneralNames", 1612709899, NULL }, + { "MAX", 1074266122, "1"}, { NULL, 2, "GeneralName"}, { "GeneralName", 1610612754, NULL }, { "otherName", 1610620930, "AnotherName"}, @@ -61,6 +67,7 @@ const asn1_static_node pkix_asn1_tab[] = { { NULL, 131081, NULL }, { "pathLenConstraint", 16387, NULL }, { "CRLDistributionPoints", 1612709899, NULL }, + { "MAX", 1074266122, "1"}, { NULL, 2, "DistributionPoint"}, { "DistributionPoint", 1610612741, NULL }, { "distributionPoint", 1610637314, "DistributionPointName"}, @@ -76,8 +83,10 @@ const asn1_static_node pkix_asn1_tab[] = { { NULL, 4104, "1"}, { "ReasonFlags", 1073741830, NULL }, { "ExtKeyUsageSyntax", 1612709899, NULL }, + { "MAX", 1074266122, "1"}, { NULL, 12, NULL }, { "AuthorityInfoAccessSyntax", 1612709899, NULL }, + { "MAX", 1074266122, "1"}, { NULL, 2, "AccessDescription"}, { "AccessDescription", 1610612741, NULL }, { "accessMethod", 1073741836, NULL }, @@ -95,6 +104,7 @@ const asn1_static_node pkix_asn1_tab[] = { { "DistinguishedName", 1610612747, NULL }, { NULL, 2, "RelativeDistinguishedName"}, { "RelativeDistinguishedName", 1612709903, NULL }, + { "MAX", 1074266122, "1"}, { NULL, 2, "AttributeTypeAndValue"}, { "Certificate", 1610612741, NULL }, { "tbsCertificate", 1073741826, "TBSCertificate"}, @@ -128,6 +138,7 @@ const asn1_static_node pkix_asn1_tab[] = { { "algorithm", 1073741826, "AlgorithmIdentifier"}, { "subjectPublicKey", 6, NULL }, { "Extensions", 1612709899, NULL }, + { "MAX", 1074266122, "1"}, { NULL, 2, "Extension"}, { "Extension", 1610612741, NULL }, { "extnID", 1073741836, NULL }, @@ -205,6 +216,7 @@ const asn1_static_node pkix_asn1_tab[] = { { "unsignedAttrs", 536895490, "SignedAttributes"}, { NULL, 4104, "1"}, { "SignedAttributes", 1612709903, NULL }, + { "MAX", 1074266122, "1"}, { NULL, 2, "Attribute"}, { "SignerIdentifier", 1610612754, NULL }, { "issuerAndSerialNumber", 1073741826, "IssuerAndSerialNumber"}, @@ -246,11 +258,16 @@ const asn1_static_node pkix_asn1_tab[] = { { "encryptionAlgorithm", 1073741826, "AlgorithmIdentifier"}, { "encryptedData", 2, "pkcs-8-EncryptedData"}, { "pkcs-8-EncryptedData", 1073741831, NULL }, - { "pkcs-5-des-CBC-params", 1075838983, NULL }, - { "pkcs-5-des-EDE3-CBC-params", 1075838983, NULL }, - { "pkcs-5-aes128-CBC-params", 1075838983, NULL }, - { "pkcs-5-aes192-CBC-params", 1075838983, NULL }, - { "pkcs-5-aes256-CBC-params", 1075838983, NULL }, + { "pkcs-5-des-CBC-params", 1612709895, NULL }, + { NULL, 1048586, "8"}, + { "pkcs-5-des-EDE3-CBC-params", 1612709895, NULL }, + { NULL, 1048586, "8"}, + { "pkcs-5-aes128-CBC-params", 1612709895, NULL }, + { NULL, 1048586, "16"}, + { "pkcs-5-aes192-CBC-params", 1612709895, NULL }, + { NULL, 1048586, "16"}, + { "pkcs-5-aes256-CBC-params", 1612709895, NULL }, + { NULL, 1048586, "16"}, { "Gost28147-89-Parameters", 1610612741, NULL }, { "iv", 1073741831, NULL }, { "encryptionParamSet", 12, NULL }, @@ -319,6 +336,7 @@ const asn1_static_node pkix_asn1_tab[] = { { NULL, 4104, "0"}, { "pkcs-7-ContentEncryptionAlgorithmIdentifier", 1073741826, "AlgorithmIdentifier"}, { "pkcs-7-UnprotectedAttributes", 1612709903, NULL }, + { "MAX", 1074266122, "1"}, { NULL, 2, "Attribute"}, { "ProxyCertInfo", 1610612741, NULL }, { "pCPathLenConstraint", 1073758211, NULL }, @@ -327,10 +345,12 @@ const asn1_static_node pkix_asn1_tab[] = { { "policyLanguage", 1073741836, NULL }, { "policy", 16391, NULL }, { "certificatePolicies", 1612709899, NULL }, + { "MAX", 1074266122, "1"}, { NULL, 2, "PolicyInformation"}, { "PolicyInformation", 1610612741, NULL }, { "policyIdentifier", 1073741836, NULL }, { "policyQualifiers", 538984459, NULL }, + { "MAX", 1074266122, "1"}, { NULL, 2, "PolicyQualifierInfo"}, { "PolicyQualifierInfo", 1610612741, NULL }, { "policyQualifierId", 1073741836, NULL }, @@ -345,10 +365,14 @@ const asn1_static_node pkix_asn1_tab[] = { { "noticeNumbers", 536870923, NULL }, { NULL, 3, NULL }, { "DisplayText", 1610612754, NULL }, - { "ia5String", 1075839005, NULL }, - { "visibleString", 1075839011, NULL }, - { "bmpString", 1075839009, NULL }, - { "utf8String", 2097186, NULL }, + { "ia5String", 1612709917, NULL }, + { "200", 524298, "1"}, + { "visibleString", 1612709923, NULL }, + { "200", 524298, "1"}, + { "bmpString", 1612709921, NULL }, + { "200", 524298, "1"}, + { "utf8String", 538968098, NULL }, + { "200", 524298, "1"}, { "OCSPRequest", 1610612741, NULL }, { "tbsRequest", 1073741826, "TBSRequest"}, { "optionalSignature", 536895490, "Signature"}, @@ -442,6 +466,7 @@ const asn1_static_node pkix_asn1_tab[] = { { "excludedSubtrees", 536895490, "GeneralSubtrees"}, { NULL, 4104, "1"}, { "GeneralSubtrees", 1612709899, NULL }, + { "MAX", 1074266122, "1"}, { NULL, 2, "GeneralSubtree"}, { "GeneralSubtree", 1610612741, NULL }, { "base", 1073741826, "GeneralName"}, diff --git a/SMP/libgnutls.vcxproj.filters b/SMP/libgnutls.vcxproj.filters index 5c4d1070d3..d592130c8c 100644 --- a/SMP/libgnutls.vcxproj.filters +++ b/SMP/libgnutls.vcxproj.filters @@ -1577,6 +1577,12 @@ Source Files\lib\ext + + Source Files\lib + + + Source Files\lib + diff --git a/SMP/libgnutls_winrt.vcxproj.filters b/SMP/libgnutls_winrt.vcxproj.filters index 49778942d1..8df27dadab 100644 --- a/SMP/libgnutls_winrt.vcxproj.filters +++ b/SMP/libgnutls_winrt.vcxproj.filters @@ -1577,6 +1577,12 @@ Source Files\lib\ext + + Source Files\lib + + + Source Files\lib + diff --git a/SMP/version.h b/SMP/version.h index 6b9bbb4166..0c3e50e755 100644 --- a/SMP/version.h +++ b/SMP/version.h @@ -1,5 +1,5 @@ /* Define to the version of this package. */ -#define PACKAGE_VERSION "3.7.7" +#define PACKAGE_VERSION "3.7.8" /* Version number of package */ -#define VERSION "3.7.7" +#define VERSION "3.7.8"