From 4acaef8db49ca7cd08d4d7e42b855113ef6b3baf Mon Sep 17 00:00:00 2001 From: chen Date: Tue, 6 Aug 2024 20:39:31 +0800 Subject: [PATCH] substitute openssl with third_party_openssl Signed-off-by: chen Change-Id: I99b0e7dcca2477db19880738d1c45afb7f1f78c5 --- .../config/archs/BSD-x86/asm/configdata.pm | 195 +- .../archs/BSD-x86/asm/crypto/aes/aes-586.S | 48 +- .../archs/BSD-x86/asm/crypto/aes/aesni-x86.S | 88 +- .../archs/BSD-x86/asm/crypto/aes/vpaes-x86.S | 52 +- .../archs/BSD-x86/asm/crypto/bf/bf-586.S | 40 +- .../archs/BSD-x86/asm/crypto/bn/bn-586.S | 28 +- .../archs/BSD-x86/asm/crypto/bn/co-586.S | 16 +- .../archs/BSD-x86/asm/crypto/bn/x86-gf2m.S | 12 +- .../archs/BSD-x86/asm/crypto/bn/x86-mont.S | 4 +- .../archs/BSD-x86/asm/crypto/buildinf.h | 2 +- .../BSD-x86/asm/crypto/camellia/cmll-x86.S | 44 +- .../BSD-x86/asm/crypto/chacha/chacha-x86.S | 12 +- .../archs/BSD-x86/asm/crypto/des/crypt586.S | 4 +- .../archs/BSD-x86/asm/crypto/des/des-586.S | 88 +- .../BSD-x86/asm/crypto/ec/ecp_nistz256-x86.S | 88 +- .../archs/BSD-x86/asm/crypto/md5/md5-586.S | 4 +- .../BSD-x86/asm/crypto/modes/ghash-x86.S | 28 +- .../asm/crypto/poly1305/poly1305-x86.S | 32 +- .../archs/BSD-x86/asm/crypto/rc4/rc4-586.S | 12 +- .../archs/BSD-x86/asm/crypto/ripemd/rmd-586.S | 4 +- .../archs/BSD-x86/asm/crypto/sha/sha1-586.S | 16 +- .../archs/BSD-x86/asm/crypto/sha/sha256-586.S | 4 +- .../archs/BSD-x86/asm/crypto/sha/sha512-586.S | 4 +- .../BSD-x86/asm/crypto/whrlpool/wp-mmx.S | 4 +- .../archs/BSD-x86/asm/crypto/x86cpuid.S | 48 +- .../archs/BSD-x86/asm/engines/e_padlock-x86.S | 72 +- .../archs/BSD-x86/asm/include/openssl/bio.h | 2 +- .../BSD-x86/asm/include/openssl/opensslv.h | 14 +- .../archs/BSD-x86/asm/include/openssl/pkcs7.h | 6 +- .../archs/BSD-x86/asm/include/openssl/ssl.h | 69 - .../config/archs/BSD-x86/asm/openssl-cl.gypi | 1 - .../config/archs/BSD-x86/asm/openssl.gypi | 3 - .../archs/BSD-x86/asm_avx2/configdata.pm | 195 +- .../BSD-x86/asm_avx2/crypto/aes/aes-586.S | 48 +- .../BSD-x86/asm_avx2/crypto/aes/aesni-x86.S | 88 +- .../BSD-x86/asm_avx2/crypto/aes/vpaes-x86.S | 52 +- .../archs/BSD-x86/asm_avx2/crypto/bf/bf-586.S | 40 +- .../archs/BSD-x86/asm_avx2/crypto/bn/bn-586.S | 28 +- .../archs/BSD-x86/asm_avx2/crypto/bn/co-586.S | 16 +- .../BSD-x86/asm_avx2/crypto/bn/x86-gf2m.S | 12 +- .../BSD-x86/asm_avx2/crypto/bn/x86-mont.S | 4 +- .../archs/BSD-x86/asm_avx2/crypto/buildinf.h | 2 +- .../asm_avx2/crypto/camellia/cmll-x86.S | 44 +- .../asm_avx2/crypto/chacha/chacha-x86.S | 12 +- .../BSD-x86/asm_avx2/crypto/des/crypt586.S | 4 +- .../BSD-x86/asm_avx2/crypto/des/des-586.S | 88 +- .../asm_avx2/crypto/ec/ecp_nistz256-x86.S | 88 +- .../BSD-x86/asm_avx2/crypto/md5/md5-586.S | 4 +- .../BSD-x86/asm_avx2/crypto/modes/ghash-x86.S | 28 +- .../asm_avx2/crypto/poly1305/poly1305-x86.S | 32 +- .../BSD-x86/asm_avx2/crypto/rc4/rc4-586.S | 12 +- .../BSD-x86/asm_avx2/crypto/ripemd/rmd-586.S | 4 +- .../BSD-x86/asm_avx2/crypto/sha/sha1-586.S | 16 +- .../BSD-x86/asm_avx2/crypto/sha/sha256-586.S | 4 +- .../BSD-x86/asm_avx2/crypto/sha/sha512-586.S | 4 +- .../BSD-x86/asm_avx2/crypto/whrlpool/wp-mmx.S | 4 +- .../archs/BSD-x86/asm_avx2/crypto/x86cpuid.S | 48 +- .../BSD-x86/asm_avx2/engines/e_padlock-x86.S | 72 +- .../BSD-x86/asm_avx2/include/openssl/bio.h | 2 +- .../asm_avx2/include/openssl/opensslv.h | 14 +- .../BSD-x86/asm_avx2/include/openssl/pkcs7.h | 6 +- .../BSD-x86/asm_avx2/include/openssl/ssl.h | 69 - .../archs/BSD-x86/asm_avx2/openssl-cl.gypi | 1 - .../archs/BSD-x86/asm_avx2/openssl.gypi | 3 - .../config/archs/BSD-x86/no-asm/configdata.pm | 191 +- .../archs/BSD-x86/no-asm/crypto/buildinf.h | 2 +- .../BSD-x86/no-asm/include/openssl/bio.h | 2 +- .../BSD-x86/no-asm/include/openssl/opensslv.h | 14 +- .../BSD-x86/no-asm/include/openssl/pkcs7.h | 6 +- .../BSD-x86/no-asm/include/openssl/ssl.h | 69 - .../config/archs/BSD-x86/no-asm/openssl.gypi | 2 - .../config/archs/BSD-x86_64/asm/configdata.pm | 195 +- .../archs/BSD-x86_64/asm/crypto/buildinf.h | 2 +- .../BSD-x86_64/asm/include/openssl/bio.h | 2 +- .../BSD-x86_64/asm/include/openssl/opensslv.h | 14 +- .../BSD-x86_64/asm/include/openssl/pkcs7.h | 6 +- .../BSD-x86_64/asm/include/openssl/ssl.h | 69 - .../archs/BSD-x86_64/asm/openssl-cl.gypi | 1 - .../config/archs/BSD-x86_64/asm/openssl.gypi | 3 - .../archs/BSD-x86_64/asm_avx2/configdata.pm | 195 +- .../BSD-x86_64/asm_avx2/crypto/buildinf.h | 2 +- .../BSD-x86_64/asm_avx2/include/openssl/bio.h | 2 +- .../asm_avx2/include/openssl/opensslv.h | 14 +- .../asm_avx2/include/openssl/pkcs7.h | 6 +- .../BSD-x86_64/asm_avx2/include/openssl/ssl.h | 69 - .../archs/BSD-x86_64/asm_avx2/openssl-cl.gypi | 1 - .../archs/BSD-x86_64/asm_avx2/openssl.gypi | 3 - .../archs/BSD-x86_64/no-asm/configdata.pm | 191 +- .../archs/BSD-x86_64/no-asm/crypto/buildinf.h | 2 +- .../BSD-x86_64/no-asm/include/openssl/bio.h | 2 +- .../no-asm/include/openssl/opensslv.h | 14 +- .../BSD-x86_64/no-asm/include/openssl/pkcs7.h | 6 +- .../BSD-x86_64/no-asm/include/openssl/ssl.h | 69 - .../archs/BSD-x86_64/no-asm/openssl.gypi | 2 - .../config/archs/VC-WIN32/asm/configdata.pm | 197 +- .../archs/VC-WIN32/asm/crypto/bf/bf-586.asm | 2 +- .../archs/VC-WIN32/asm/crypto/buildinf.h | 2 +- .../archs/VC-WIN32/asm/crypto/des/des-586.asm | 2 +- .../archs/VC-WIN32/asm/include/openssl/bio.h | 2 +- .../VC-WIN32/asm/include/openssl/opensslv.h | 14 +- .../VC-WIN32/asm/include/openssl/pkcs7.h | 6 +- .../archs/VC-WIN32/asm/include/openssl/ssl.h | 69 - .../config/archs/VC-WIN32/asm/openssl-cl.gypi | 1 - .../config/archs/VC-WIN32/asm/openssl.gypi | 3 - .../archs/VC-WIN32/asm_avx2/configdata.pm | 197 +- .../VC-WIN32/asm_avx2/crypto/bf/bf-586.asm | 2 +- .../archs/VC-WIN32/asm_avx2/crypto/buildinf.h | 2 +- .../VC-WIN32/asm_avx2/crypto/des/des-586.asm | 2 +- .../VC-WIN32/asm_avx2/include/openssl/bio.h | 2 +- .../asm_avx2/include/openssl/opensslv.h | 14 +- .../VC-WIN32/asm_avx2/include/openssl/pkcs7.h | 6 +- .../VC-WIN32/asm_avx2/include/openssl/ssl.h | 69 - .../archs/VC-WIN32/asm_avx2/openssl-cl.gypi | 1 - .../archs/VC-WIN32/asm_avx2/openssl.gypi | 3 - .../archs/VC-WIN32/no-asm/configdata.pm | 193 +- .../archs/VC-WIN32/no-asm/crypto/buildinf.h | 2 +- .../VC-WIN32/no-asm/include/openssl/bio.h | 2 +- .../no-asm/include/openssl/opensslv.h | 14 +- .../VC-WIN32/no-asm/include/openssl/pkcs7.h | 6 +- .../VC-WIN32/no-asm/include/openssl/ssl.h | 69 - .../config/archs/VC-WIN32/no-asm/openssl.gypi | 2 - .../archs/VC-WIN64-ARM/no-asm/configdata.pm | 193 +- .../VC-WIN64-ARM/no-asm/crypto/buildinf.h | 2 +- .../VC-WIN64-ARM/no-asm/include/openssl/bio.h | 2 +- .../no-asm/include/openssl/opensslv.h | 14 +- .../no-asm/include/openssl/pkcs7.h | 6 +- .../VC-WIN64-ARM/no-asm/include/openssl/ssl.h | 69 - .../archs/VC-WIN64-ARM/no-asm/openssl.gypi | 2 - .../config/archs/VC-WIN64A/asm/configdata.pm | 199 +- .../archs/VC-WIN64A/asm/crypto/buildinf.h | 2 +- .../archs/VC-WIN64A/asm/include/openssl/bio.h | 2 +- .../VC-WIN64A/asm/include/openssl/opensslv.h | 14 +- .../VC-WIN64A/asm/include/openssl/pkcs7.h | 6 +- .../archs/VC-WIN64A/asm/include/openssl/ssl.h | 69 - .../archs/VC-WIN64A/asm/openssl-cl.gypi | 1 - .../config/archs/VC-WIN64A/asm/openssl.gypi | 3 - .../archs/VC-WIN64A/asm_avx2/configdata.pm | 199 +- .../VC-WIN64A/asm_avx2/crypto/buildinf.h | 2 +- .../VC-WIN64A/asm_avx2/include/openssl/bio.h | 2 +- .../asm_avx2/include/openssl/opensslv.h | 14 +- .../asm_avx2/include/openssl/pkcs7.h | 6 +- .../VC-WIN64A/asm_avx2/include/openssl/ssl.h | 69 - .../archs/VC-WIN64A/asm_avx2/openssl-cl.gypi | 1 - .../archs/VC-WIN64A/asm_avx2/openssl.gypi | 3 - .../archs/VC-WIN64A/no-asm/configdata.pm | 195 +- .../archs/VC-WIN64A/no-asm/crypto/buildinf.h | 2 +- .../VC-WIN64A/no-asm/include/openssl/bio.h | 2 +- .../no-asm/include/openssl/opensslv.h | 14 +- .../VC-WIN64A/no-asm/include/openssl/pkcs7.h | 6 +- .../VC-WIN64A/no-asm/include/openssl/ssl.h | 69 - .../archs/VC-WIN64A/no-asm/openssl.gypi | 2 - .../archs/aix64-gcc-as/asm/configdata.pm | 191 +- .../archs/aix64-gcc-as/asm/crypto/buildinf.h | 2 +- .../aix64-gcc-as/asm/include/openssl/bio.h | 2 +- .../asm/include/openssl/opensslv.h | 14 +- .../aix64-gcc-as/asm/include/openssl/pkcs7.h | 6 +- .../aix64-gcc-as/asm/include/openssl/ssl.h | 69 - .../archs/aix64-gcc-as/asm/openssl.gypi | 2 - .../archs/aix64-gcc-as/asm_avx2/configdata.pm | 191 +- .../aix64-gcc-as/asm_avx2/crypto/buildinf.h | 2 +- .../asm_avx2/include/openssl/bio.h | 2 +- .../asm_avx2/include/openssl/opensslv.h | 14 +- .../asm_avx2/include/openssl/pkcs7.h | 6 +- .../asm_avx2/include/openssl/ssl.h | 69 - .../archs/aix64-gcc-as/asm_avx2/openssl.gypi | 2 - .../archs/aix64-gcc-as/no-asm/configdata.pm | 191 +- .../aix64-gcc-as/no-asm/crypto/buildinf.h | 2 +- .../aix64-gcc-as/no-asm/include/openssl/bio.h | 2 +- .../no-asm/include/openssl/opensslv.h | 14 +- .../no-asm/include/openssl/pkcs7.h | 6 +- .../aix64-gcc-as/no-asm/include/openssl/ssl.h | 69 - .../archs/aix64-gcc-as/no-asm/openssl.gypi | 2 - .../archs/darwin-i386-cc/asm/configdata.pm | 191 +- .../darwin-i386-cc/asm/crypto/aes/aes-586.S | 48 +- .../darwin-i386-cc/asm/crypto/aes/aesni-x86.S | 88 +- .../darwin-i386-cc/asm/crypto/aes/vpaes-x86.S | 52 +- .../darwin-i386-cc/asm/crypto/bf/bf-586.S | 40 +- .../darwin-i386-cc/asm/crypto/bn/bn-586.S | 28 +- .../darwin-i386-cc/asm/crypto/bn/co-586.S | 16 +- .../darwin-i386-cc/asm/crypto/bn/x86-gf2m.S | 12 +- .../darwin-i386-cc/asm/crypto/bn/x86-mont.S | 4 +- .../darwin-i386-cc/asm/crypto/buildinf.h | 2 +- .../asm/crypto/camellia/cmll-x86.S | 44 +- .../asm/crypto/chacha/chacha-x86.S | 12 +- .../darwin-i386-cc/asm/crypto/des/crypt586.S | 4 +- .../darwin-i386-cc/asm/crypto/des/des-586.S | 88 +- .../asm/crypto/ec/ecp_nistz256-x86.S | 88 +- .../darwin-i386-cc/asm/crypto/md5/md5-586.S | 4 +- .../asm/crypto/modes/ghash-x86.S | 28 +- .../asm/crypto/poly1305/poly1305-x86.S | 32 +- .../darwin-i386-cc/asm/crypto/rc4/rc4-586.S | 12 +- .../asm/crypto/ripemd/rmd-586.S | 4 +- .../darwin-i386-cc/asm/crypto/sha/sha1-586.S | 16 +- .../asm/crypto/sha/sha256-586.S | 4 +- .../asm/crypto/sha/sha512-586.S | 4 +- .../asm/crypto/whrlpool/wp-mmx.S | 4 +- .../darwin-i386-cc/asm/crypto/x86cpuid.S | 48 +- .../asm/engines/e_padlock-x86.S | 72 +- .../darwin-i386-cc/asm/include/openssl/bio.h | 2 +- .../asm/include/openssl/opensslv.h | 14 +- .../asm/include/openssl/pkcs7.h | 6 +- .../darwin-i386-cc/asm/include/openssl/ssl.h | 69 - .../archs/darwin-i386-cc/asm/openssl-cl.gypi | 1 - .../archs/darwin-i386-cc/asm/openssl.gypi | 3 - .../darwin-i386-cc/asm_avx2/configdata.pm | 191 +- .../asm_avx2/crypto/aes/aes-586.S | 48 +- .../asm_avx2/crypto/aes/aesni-x86.S | 88 +- .../asm_avx2/crypto/aes/vpaes-x86.S | 52 +- .../asm_avx2/crypto/bf/bf-586.S | 40 +- .../asm_avx2/crypto/bn/bn-586.S | 28 +- .../asm_avx2/crypto/bn/co-586.S | 16 +- .../asm_avx2/crypto/bn/x86-gf2m.S | 12 +- .../asm_avx2/crypto/bn/x86-mont.S | 4 +- .../darwin-i386-cc/asm_avx2/crypto/buildinf.h | 2 +- .../asm_avx2/crypto/camellia/cmll-x86.S | 44 +- .../asm_avx2/crypto/chacha/chacha-x86.S | 12 +- .../asm_avx2/crypto/des/crypt586.S | 4 +- .../asm_avx2/crypto/des/des-586.S | 88 +- .../asm_avx2/crypto/ec/ecp_nistz256-x86.S | 88 +- .../asm_avx2/crypto/md5/md5-586.S | 4 +- .../asm_avx2/crypto/modes/ghash-x86.S | 28 +- .../asm_avx2/crypto/poly1305/poly1305-x86.S | 32 +- .../asm_avx2/crypto/rc4/rc4-586.S | 12 +- .../asm_avx2/crypto/ripemd/rmd-586.S | 4 +- .../asm_avx2/crypto/sha/sha1-586.S | 16 +- .../asm_avx2/crypto/sha/sha256-586.S | 4 +- .../asm_avx2/crypto/sha/sha512-586.S | 4 +- .../asm_avx2/crypto/whrlpool/wp-mmx.S | 4 +- .../darwin-i386-cc/asm_avx2/crypto/x86cpuid.S | 48 +- .../asm_avx2/engines/e_padlock-x86.S | 72 +- .../asm_avx2/include/openssl/bio.h | 2 +- .../asm_avx2/include/openssl/opensslv.h | 14 +- .../asm_avx2/include/openssl/pkcs7.h | 6 +- .../asm_avx2/include/openssl/ssl.h | 69 - .../darwin-i386-cc/asm_avx2/openssl-cl.gypi | 1 - .../darwin-i386-cc/asm_avx2/openssl.gypi | 3 - .../archs/darwin-i386-cc/no-asm/configdata.pm | 187 +- .../darwin-i386-cc/no-asm/crypto/buildinf.h | 2 +- .../no-asm/include/openssl/bio.h | 2 +- .../no-asm/include/openssl/opensslv.h | 14 +- .../no-asm/include/openssl/pkcs7.h | 6 +- .../no-asm/include/openssl/ssl.h | 69 - .../archs/darwin-i386-cc/no-asm/openssl.gypi | 2 - .../archs/darwin64-arm64-cc/asm/configdata.pm | 187 +- .../asm/crypto/aes/aesv8-armx.S | 6 +- .../darwin64-arm64-cc/asm/crypto/buildinf.h | 2 +- .../asm/crypto/modes/ghashv8-armx.S | 26 +- .../asm/crypto/poly1305/poly1305-armv8.S | 24 +- .../asm/include/openssl/bio.h | 2 +- .../asm/include/openssl/opensslv.h | 14 +- .../asm/include/openssl/pkcs7.h | 6 +- .../asm/include/openssl/ssl.h | 69 - .../archs/darwin64-arm64-cc/asm/openssl.gypi | 2 - .../darwin64-arm64-cc/asm_avx2/configdata.pm | 187 +- .../asm_avx2/crypto/aes/aesv8-armx.S | 6 +- .../asm_avx2/crypto/buildinf.h | 2 +- .../asm_avx2/crypto/modes/ghashv8-armx.S | 26 +- .../asm_avx2/crypto/poly1305/poly1305-armv8.S | 24 +- .../asm_avx2/include/openssl/bio.h | 2 +- .../asm_avx2/include/openssl/opensslv.h | 14 +- .../asm_avx2/include/openssl/pkcs7.h | 6 +- .../asm_avx2/include/openssl/ssl.h | 69 - .../darwin64-arm64-cc/asm_avx2/openssl.gypi | 2 - .../darwin64-arm64-cc/no-asm/configdata.pm | 187 +- .../no-asm/crypto/buildinf.h | 2 +- .../no-asm/include/openssl/bio.h | 2 +- .../no-asm/include/openssl/opensslv.h | 14 +- .../no-asm/include/openssl/pkcs7.h | 6 +- .../no-asm/include/openssl/ssl.h | 69 - .../darwin64-arm64-cc/no-asm/openssl.gypi | 2 - .../darwin64-x86_64-cc/asm/configdata.pm | 191 +- .../darwin64-x86_64-cc/asm/crypto/buildinf.h | 2 +- .../asm/include/openssl/bio.h | 2 +- .../asm/include/openssl/opensslv.h | 14 +- .../asm/include/openssl/pkcs7.h | 6 +- .../asm/include/openssl/ssl.h | 69 - .../darwin64-x86_64-cc/asm/openssl-cl.gypi | 1 - .../archs/darwin64-x86_64-cc/asm/openssl.gypi | 3 - .../darwin64-x86_64-cc/asm_avx2/configdata.pm | 191 +- .../asm_avx2/crypto/buildinf.h | 2 +- .../asm_avx2/include/openssl/bio.h | 2 +- .../asm_avx2/include/openssl/opensslv.h | 14 +- .../asm_avx2/include/openssl/pkcs7.h | 6 +- .../asm_avx2/include/openssl/ssl.h | 69 - .../asm_avx2/openssl-cl.gypi | 1 - .../darwin64-x86_64-cc/asm_avx2/openssl.gypi | 3 - .../darwin64-x86_64-cc/no-asm/configdata.pm | 187 +- .../no-asm/crypto/buildinf.h | 2 +- .../no-asm/include/openssl/bio.h | 2 +- .../no-asm/include/openssl/opensslv.h | 14 +- .../no-asm/include/openssl/pkcs7.h | 6 +- .../no-asm/include/openssl/ssl.h | 69 - .../darwin64-x86_64-cc/no-asm/openssl.gypi | 2 - .../archs/linux-aarch64/asm/configdata.pm | 191 +- .../linux-aarch64/asm/crypto/aes/aesv8-armx.S | 6 +- .../archs/linux-aarch64/asm/crypto/buildinf.h | 2 +- .../asm/crypto/modes/ghashv8-armx.S | 26 +- .../asm/crypto/poly1305/poly1305-armv8.S | 24 +- .../linux-aarch64/asm/include/openssl/bio.h | 2 +- .../asm/include/openssl/opensslv.h | 14 +- .../linux-aarch64/asm/include/openssl/pkcs7.h | 6 +- .../linux-aarch64/asm/include/openssl/ssl.h | 69 - .../archs/linux-aarch64/asm/openssl.gypi | 2 - .../linux-aarch64/asm_avx2/configdata.pm | 191 +- .../asm_avx2/crypto/aes/aesv8-armx.S | 6 +- .../linux-aarch64/asm_avx2/crypto/buildinf.h | 2 +- .../asm_avx2/crypto/modes/ghashv8-armx.S | 26 +- .../asm_avx2/crypto/poly1305/poly1305-armv8.S | 24 +- .../asm_avx2/include/openssl/bio.h | 2 +- .../asm_avx2/include/openssl/opensslv.h | 14 +- .../asm_avx2/include/openssl/pkcs7.h | 6 +- .../asm_avx2/include/openssl/ssl.h | 69 - .../archs/linux-aarch64/asm_avx2/openssl.gypi | 2 - .../archs/linux-aarch64/no-asm/configdata.pm | 191 +- .../linux-aarch64/no-asm/crypto/buildinf.h | 2 +- .../no-asm/include/openssl/bio.h | 2 +- .../no-asm/include/openssl/opensslv.h | 14 +- .../no-asm/include/openssl/pkcs7.h | 6 +- .../no-asm/include/openssl/ssl.h | 69 - .../archs/linux-aarch64/no-asm/openssl.gypi | 2 - .../archs/linux-armv4/asm/configdata.pm | 191 +- .../linux-armv4/asm/crypto/aes/bsaes-armv7.S | 8 +- .../archs/linux-armv4/asm/crypto/buildinf.h | 2 +- .../linux-armv4/asm/include/openssl/bio.h | 2 +- .../asm/include/openssl/opensslv.h | 14 +- .../linux-armv4/asm/include/openssl/pkcs7.h | 6 +- .../linux-armv4/asm/include/openssl/ssl.h | 69 - .../config/archs/linux-armv4/asm/openssl.gypi | 2 - .../archs/linux-armv4/asm_avx2/configdata.pm | 191 +- .../asm_avx2/crypto/aes/bsaes-armv7.S | 8 +- .../linux-armv4/asm_avx2/crypto/buildinf.h | 2 +- .../asm_avx2/include/openssl/bio.h | 2 +- .../asm_avx2/include/openssl/opensslv.h | 14 +- .../asm_avx2/include/openssl/pkcs7.h | 6 +- .../asm_avx2/include/openssl/ssl.h | 69 - .../archs/linux-armv4/asm_avx2/openssl.gypi | 2 - .../archs/linux-armv4/no-asm/configdata.pm | 191 +- .../linux-armv4/no-asm/crypto/buildinf.h | 2 +- .../linux-armv4/no-asm/include/openssl/bio.h | 2 +- .../no-asm/include/openssl/opensslv.h | 14 +- .../no-asm/include/openssl/pkcs7.h | 6 +- .../linux-armv4/no-asm/include/openssl/ssl.h | 69 - .../archs/linux-armv4/no-asm/openssl.gypi | 2 - .../config/archs/linux-elf/asm/configdata.pm | 195 +- .../archs/linux-elf/asm/crypto/aes/aes-586.S | 48 +- .../linux-elf/asm/crypto/aes/aesni-x86.S | 88 +- .../linux-elf/asm/crypto/aes/vpaes-x86.S | 52 +- .../archs/linux-elf/asm/crypto/bf/bf-586.S | 40 +- .../archs/linux-elf/asm/crypto/bn/bn-586.S | 28 +- .../archs/linux-elf/asm/crypto/bn/co-586.S | 16 +- .../archs/linux-elf/asm/crypto/bn/x86-gf2m.S | 12 +- .../archs/linux-elf/asm/crypto/bn/x86-mont.S | 4 +- .../archs/linux-elf/asm/crypto/buildinf.h | 2 +- .../linux-elf/asm/crypto/camellia/cmll-x86.S | 44 +- .../linux-elf/asm/crypto/chacha/chacha-x86.S | 12 +- .../archs/linux-elf/asm/crypto/des/crypt586.S | 4 +- .../archs/linux-elf/asm/crypto/des/des-586.S | 88 +- .../asm/crypto/ec/ecp_nistz256-x86.S | 88 +- .../archs/linux-elf/asm/crypto/md5/md5-586.S | 4 +- .../linux-elf/asm/crypto/modes/ghash-x86.S | 28 +- .../asm/crypto/poly1305/poly1305-x86.S | 32 +- .../archs/linux-elf/asm/crypto/rc4/rc4-586.S | 12 +- .../linux-elf/asm/crypto/ripemd/rmd-586.S | 4 +- .../archs/linux-elf/asm/crypto/sha/sha1-586.S | 16 +- .../linux-elf/asm/crypto/sha/sha256-586.S | 4 +- .../linux-elf/asm/crypto/sha/sha512-586.S | 4 +- .../linux-elf/asm/crypto/whrlpool/wp-mmx.S | 4 +- .../archs/linux-elf/asm/crypto/x86cpuid.S | 48 +- .../linux-elf/asm/engines/e_padlock-x86.S | 72 +- .../archs/linux-elf/asm/include/openssl/bio.h | 2 +- .../linux-elf/asm/include/openssl/opensslv.h | 14 +- .../linux-elf/asm/include/openssl/pkcs7.h | 6 +- .../archs/linux-elf/asm/include/openssl/ssl.h | 69 - .../archs/linux-elf/asm/openssl-cl.gypi | 1 - .../config/archs/linux-elf/asm/openssl.gypi | 3 - .../archs/linux-elf/asm_avx2/configdata.pm | 195 +- .../linux-elf/asm_avx2/crypto/aes/aes-586.S | 48 +- .../linux-elf/asm_avx2/crypto/aes/aesni-x86.S | 88 +- .../linux-elf/asm_avx2/crypto/aes/vpaes-x86.S | 52 +- .../linux-elf/asm_avx2/crypto/bf/bf-586.S | 40 +- .../linux-elf/asm_avx2/crypto/bn/bn-586.S | 28 +- .../linux-elf/asm_avx2/crypto/bn/co-586.S | 16 +- .../linux-elf/asm_avx2/crypto/bn/x86-gf2m.S | 12 +- .../linux-elf/asm_avx2/crypto/bn/x86-mont.S | 4 +- .../linux-elf/asm_avx2/crypto/buildinf.h | 2 +- .../asm_avx2/crypto/camellia/cmll-x86.S | 44 +- .../asm_avx2/crypto/chacha/chacha-x86.S | 12 +- .../linux-elf/asm_avx2/crypto/des/crypt586.S | 4 +- .../linux-elf/asm_avx2/crypto/des/des-586.S | 88 +- .../asm_avx2/crypto/ec/ecp_nistz256-x86.S | 88 +- .../linux-elf/asm_avx2/crypto/md5/md5-586.S | 4 +- .../asm_avx2/crypto/modes/ghash-x86.S | 28 +- .../asm_avx2/crypto/poly1305/poly1305-x86.S | 32 +- .../linux-elf/asm_avx2/crypto/rc4/rc4-586.S | 12 +- .../asm_avx2/crypto/ripemd/rmd-586.S | 4 +- .../linux-elf/asm_avx2/crypto/sha/sha1-586.S | 16 +- .../asm_avx2/crypto/sha/sha256-586.S | 4 +- .../asm_avx2/crypto/sha/sha512-586.S | 4 +- .../asm_avx2/crypto/whrlpool/wp-mmx.S | 4 +- .../linux-elf/asm_avx2/crypto/x86cpuid.S | 48 +- .../asm_avx2/engines/e_padlock-x86.S | 72 +- .../linux-elf/asm_avx2/include/openssl/bio.h | 2 +- .../asm_avx2/include/openssl/opensslv.h | 14 +- .../asm_avx2/include/openssl/pkcs7.h | 6 +- .../linux-elf/asm_avx2/include/openssl/ssl.h | 69 - .../archs/linux-elf/asm_avx2/openssl-cl.gypi | 1 - .../archs/linux-elf/asm_avx2/openssl.gypi | 3 - .../archs/linux-elf/no-asm/configdata.pm | 191 +- .../archs/linux-elf/no-asm/crypto/buildinf.h | 2 +- .../linux-elf/no-asm/include/openssl/bio.h | 2 +- .../no-asm/include/openssl/opensslv.h | 14 +- .../linux-elf/no-asm/include/openssl/pkcs7.h | 6 +- .../linux-elf/no-asm/include/openssl/ssl.h | 69 - .../archs/linux-elf/no-asm/openssl.gypi | 2 - .../archs/linux-ppc64le/asm/configdata.pm | 191 +- .../archs/linux-ppc64le/asm/crypto/buildinf.h | 2 +- .../linux-ppc64le/asm/include/openssl/bio.h | 2 +- .../asm/include/openssl/opensslv.h | 14 +- .../linux-ppc64le/asm/include/openssl/pkcs7.h | 6 +- .../linux-ppc64le/asm/include/openssl/ssl.h | 69 - .../archs/linux-ppc64le/asm/openssl.gypi | 2 - .../linux-ppc64le/asm_avx2/configdata.pm | 191 +- .../linux-ppc64le/asm_avx2/crypto/buildinf.h | 2 +- .../asm_avx2/include/openssl/bio.h | 2 +- .../asm_avx2/include/openssl/opensslv.h | 14 +- .../asm_avx2/include/openssl/pkcs7.h | 6 +- .../asm_avx2/include/openssl/ssl.h | 69 - .../archs/linux-ppc64le/asm_avx2/openssl.gypi | 2 - .../archs/linux-ppc64le/no-asm/configdata.pm | 191 +- .../linux-ppc64le/no-asm/crypto/buildinf.h | 2 +- .../no-asm/include/openssl/bio.h | 2 +- .../no-asm/include/openssl/opensslv.h | 14 +- .../no-asm/include/openssl/pkcs7.h | 6 +- .../no-asm/include/openssl/ssl.h | 69 - .../archs/linux-ppc64le/no-asm/openssl.gypi | 2 - .../archs/linux-x86_64/asm/configdata.pm | 195 +- .../archs/linux-x86_64/asm/crypto/buildinf.h | 2 +- .../linux-x86_64/asm/include/openssl/bio.h | 2 +- .../asm/include/openssl/opensslv.h | 14 +- .../linux-x86_64/asm/include/openssl/pkcs7.h | 6 +- .../linux-x86_64/asm/include/openssl/ssl.h | 69 - .../archs/linux-x86_64/asm/openssl-cl.gypi | 1 - .../archs/linux-x86_64/asm/openssl.gypi | 3 - .../archs/linux-x86_64/asm_avx2/configdata.pm | 195 +- .../linux-x86_64/asm_avx2/crypto/buildinf.h | 2 +- .../asm_avx2/include/openssl/bio.h | 2 +- .../asm_avx2/include/openssl/opensslv.h | 14 +- .../asm_avx2/include/openssl/pkcs7.h | 6 +- .../asm_avx2/include/openssl/ssl.h | 69 - .../linux-x86_64/asm_avx2/openssl-cl.gypi | 1 - .../archs/linux-x86_64/asm_avx2/openssl.gypi | 3 - .../archs/linux-x86_64/no-asm/configdata.pm | 191 +- .../linux-x86_64/no-asm/crypto/buildinf.h | 2 +- .../linux-x86_64/no-asm/include/openssl/bio.h | 2 +- .../no-asm/include/openssl/opensslv.h | 14 +- .../no-asm/include/openssl/pkcs7.h | 6 +- .../linux-x86_64/no-asm/include/openssl/ssl.h | 69 - .../archs/linux-x86_64/no-asm/openssl.gypi | 2 - .../archs/linux32-s390x/asm/configdata.pm | 195 +- .../archs/linux32-s390x/asm/crypto/buildinf.h | 2 +- .../linux32-s390x/asm/include/openssl/bio.h | 2 +- .../asm/include/openssl/opensslv.h | 14 +- .../linux32-s390x/asm/include/openssl/pkcs7.h | 6 +- .../linux32-s390x/asm/include/openssl/ssl.h | 69 - .../archs/linux32-s390x/asm/openssl-cl.gypi | 1 - .../archs/linux32-s390x/asm/openssl.gypi | 3 - .../linux32-s390x/asm_avx2/configdata.pm | 195 +- .../linux32-s390x/asm_avx2/crypto/buildinf.h | 2 +- .../asm_avx2/include/openssl/bio.h | 2 +- .../asm_avx2/include/openssl/opensslv.h | 14 +- .../asm_avx2/include/openssl/pkcs7.h | 6 +- .../asm_avx2/include/openssl/ssl.h | 69 - .../linux32-s390x/asm_avx2/openssl-cl.gypi | 1 - .../archs/linux32-s390x/asm_avx2/openssl.gypi | 3 - .../archs/linux32-s390x/no-asm/configdata.pm | 191 +- .../linux32-s390x/no-asm/crypto/buildinf.h | 2 +- .../no-asm/include/openssl/bio.h | 2 +- .../no-asm/include/openssl/opensslv.h | 14 +- .../no-asm/include/openssl/pkcs7.h | 6 +- .../no-asm/include/openssl/ssl.h | 69 - .../archs/linux32-s390x/no-asm/openssl.gypi | 2 - .../linux64-loongarch64/no-asm/configdata.pm | 191 +- .../no-asm/crypto/buildinf.h | 2 +- .../no-asm/include/openssl/bio.h | 2 +- .../no-asm/include/openssl/opensslv.h | 14 +- .../no-asm/include/openssl/pkcs7.h | 6 +- .../no-asm/include/openssl/ssl.h | 69 - .../linux64-loongarch64/no-asm/openssl.gypi | 2 - .../archs/linux64-mips64/asm/configdata.pm | 191 +- .../linux64-mips64/asm/crypto/buildinf.h | 2 +- .../linux64-mips64/asm/include/openssl/bio.h | 2 +- .../asm/include/openssl/opensslv.h | 14 +- .../asm/include/openssl/pkcs7.h | 6 +- .../linux64-mips64/asm/include/openssl/ssl.h | 69 - .../archs/linux64-mips64/asm/openssl.gypi | 2 - .../linux64-mips64/asm_avx2/configdata.pm | 191 +- .../linux64-mips64/asm_avx2/crypto/buildinf.h | 2 +- .../asm_avx2/include/openssl/bio.h | 2 +- .../asm_avx2/include/openssl/opensslv.h | 14 +- .../asm_avx2/include/openssl/pkcs7.h | 6 +- .../asm_avx2/include/openssl/ssl.h | 69 - .../linux64-mips64/asm_avx2/openssl.gypi | 2 - .../archs/linux64-mips64/no-asm/configdata.pm | 191 +- .../linux64-mips64/no-asm/crypto/buildinf.h | 2 +- .../no-asm/include/openssl/bio.h | 2 +- .../no-asm/include/openssl/opensslv.h | 14 +- .../no-asm/include/openssl/pkcs7.h | 6 +- .../no-asm/include/openssl/ssl.h | 69 - .../archs/linux64-mips64/no-asm/openssl.gypi | 2 - .../linux64-riscv64/no-asm/configdata.pm | 191 +- .../linux64-riscv64/no-asm/crypto/buildinf.h | 2 +- .../no-asm/include/openssl/bio.h | 2 +- .../no-asm/include/openssl/opensslv.h | 14 +- .../no-asm/include/openssl/pkcs7.h | 6 +- .../no-asm/include/openssl/ssl.h | 69 - .../archs/linux64-riscv64/no-asm/openssl.gypi | 2 - .../archs/linux64-s390x/asm/configdata.pm | 195 +- .../archs/linux64-s390x/asm/crypto/buildinf.h | 2 +- .../linux64-s390x/asm/include/openssl/bio.h | 2 +- .../asm/include/openssl/opensslv.h | 14 +- .../linux64-s390x/asm/include/openssl/pkcs7.h | 6 +- .../linux64-s390x/asm/include/openssl/ssl.h | 69 - .../archs/linux64-s390x/asm/openssl-cl.gypi | 1 - .../archs/linux64-s390x/asm/openssl.gypi | 3 - .../linux64-s390x/asm_avx2/configdata.pm | 195 +- .../linux64-s390x/asm_avx2/crypto/buildinf.h | 2 +- .../asm_avx2/include/openssl/bio.h | 2 +- .../asm_avx2/include/openssl/opensslv.h | 14 +- .../asm_avx2/include/openssl/pkcs7.h | 6 +- .../asm_avx2/include/openssl/ssl.h | 69 - .../linux64-s390x/asm_avx2/openssl-cl.gypi | 1 - .../archs/linux64-s390x/asm_avx2/openssl.gypi | 3 - .../archs/linux64-s390x/no-asm/configdata.pm | 191 +- .../linux64-s390x/no-asm/crypto/buildinf.h | 2 +- .../no-asm/include/openssl/bio.h | 2 +- .../no-asm/include/openssl/opensslv.h | 14 +- .../no-asm/include/openssl/pkcs7.h | 6 +- .../no-asm/include/openssl/ssl.h | 69 - .../archs/linux64-s390x/no-asm/openssl.gypi | 2 - .../archs/solaris-x86-gcc/asm/configdata.pm | 195 +- .../solaris-x86-gcc/asm/crypto/aes/aes-586.S | 48 +- .../asm/crypto/aes/aesni-x86.S | 88 +- .../asm/crypto/aes/vpaes-x86.S | 52 +- .../solaris-x86-gcc/asm/crypto/bf/bf-586.S | 40 +- .../solaris-x86-gcc/asm/crypto/bn/bn-586.S | 28 +- .../solaris-x86-gcc/asm/crypto/bn/co-586.S | 16 +- .../solaris-x86-gcc/asm/crypto/bn/x86-gf2m.S | 12 +- .../solaris-x86-gcc/asm/crypto/bn/x86-mont.S | 4 +- .../solaris-x86-gcc/asm/crypto/buildinf.h | 2 +- .../asm/crypto/camellia/cmll-x86.S | 44 +- .../asm/crypto/chacha/chacha-x86.S | 12 +- .../solaris-x86-gcc/asm/crypto/des/crypt586.S | 4 +- .../solaris-x86-gcc/asm/crypto/des/des-586.S | 88 +- .../asm/crypto/ec/ecp_nistz256-x86.S | 88 +- .../solaris-x86-gcc/asm/crypto/md5/md5-586.S | 4 +- .../asm/crypto/modes/ghash-x86.S | 28 +- .../asm/crypto/poly1305/poly1305-x86.S | 32 +- .../solaris-x86-gcc/asm/crypto/rc4/rc4-586.S | 12 +- .../asm/crypto/ripemd/rmd-586.S | 4 +- .../solaris-x86-gcc/asm/crypto/sha/sha1-586.S | 16 +- .../asm/crypto/sha/sha256-586.S | 4 +- .../asm/crypto/sha/sha512-586.S | 4 +- .../asm/crypto/whrlpool/wp-mmx.S | 4 +- .../solaris-x86-gcc/asm/crypto/x86cpuid.S | 48 +- .../asm/engines/e_padlock-x86.S | 72 +- .../solaris-x86-gcc/asm/include/openssl/bio.h | 2 +- .../asm/include/openssl/opensslv.h | 14 +- .../asm/include/openssl/pkcs7.h | 6 +- .../solaris-x86-gcc/asm/include/openssl/ssl.h | 69 - .../archs/solaris-x86-gcc/asm/openssl-cl.gypi | 1 - .../archs/solaris-x86-gcc/asm/openssl.gypi | 3 - .../solaris-x86-gcc/asm_avx2/configdata.pm | 195 +- .../asm_avx2/crypto/aes/aes-586.S | 48 +- .../asm_avx2/crypto/aes/aesni-x86.S | 88 +- .../asm_avx2/crypto/aes/vpaes-x86.S | 52 +- .../asm_avx2/crypto/bf/bf-586.S | 40 +- .../asm_avx2/crypto/bn/bn-586.S | 28 +- .../asm_avx2/crypto/bn/co-586.S | 16 +- .../asm_avx2/crypto/bn/x86-gf2m.S | 12 +- .../asm_avx2/crypto/bn/x86-mont.S | 4 +- .../asm_avx2/crypto/buildinf.h | 2 +- .../asm_avx2/crypto/camellia/cmll-x86.S | 44 +- .../asm_avx2/crypto/chacha/chacha-x86.S | 12 +- .../asm_avx2/crypto/des/crypt586.S | 4 +- .../asm_avx2/crypto/des/des-586.S | 88 +- .../asm_avx2/crypto/ec/ecp_nistz256-x86.S | 88 +- .../asm_avx2/crypto/md5/md5-586.S | 4 +- .../asm_avx2/crypto/modes/ghash-x86.S | 28 +- .../asm_avx2/crypto/poly1305/poly1305-x86.S | 32 +- .../asm_avx2/crypto/rc4/rc4-586.S | 12 +- .../asm_avx2/crypto/ripemd/rmd-586.S | 4 +- .../asm_avx2/crypto/sha/sha1-586.S | 16 +- .../asm_avx2/crypto/sha/sha256-586.S | 4 +- .../asm_avx2/crypto/sha/sha512-586.S | 4 +- .../asm_avx2/crypto/whrlpool/wp-mmx.S | 4 +- .../asm_avx2/crypto/x86cpuid.S | 48 +- .../asm_avx2/engines/e_padlock-x86.S | 72 +- .../asm_avx2/include/openssl/bio.h | 2 +- .../asm_avx2/include/openssl/opensslv.h | 14 +- .../asm_avx2/include/openssl/pkcs7.h | 6 +- .../asm_avx2/include/openssl/ssl.h | 69 - .../solaris-x86-gcc/asm_avx2/openssl-cl.gypi | 1 - .../solaris-x86-gcc/asm_avx2/openssl.gypi | 3 - .../solaris-x86-gcc/no-asm/configdata.pm | 191 +- .../solaris-x86-gcc/no-asm/crypto/buildinf.h | 2 +- .../no-asm/include/openssl/bio.h | 2 +- .../no-asm/include/openssl/opensslv.h | 14 +- .../no-asm/include/openssl/pkcs7.h | 6 +- .../no-asm/include/openssl/ssl.h | 69 - .../archs/solaris-x86-gcc/no-asm/openssl.gypi | 2 - .../solaris64-x86_64-gcc/asm/configdata.pm | 195 +- .../asm/crypto/buildinf.h | 2 +- .../asm/include/openssl/bio.h | 2 +- .../asm/include/openssl/opensslv.h | 14 +- .../asm/include/openssl/pkcs7.h | 6 +- .../asm/include/openssl/ssl.h | 69 - .../solaris64-x86_64-gcc/asm/openssl-cl.gypi | 1 - .../solaris64-x86_64-gcc/asm/openssl.gypi | 3 - .../asm_avx2/configdata.pm | 195 +- .../asm_avx2/crypto/buildinf.h | 2 +- .../asm_avx2/include/openssl/bio.h | 2 +- .../asm_avx2/include/openssl/opensslv.h | 14 +- .../asm_avx2/include/openssl/pkcs7.h | 6 +- .../asm_avx2/include/openssl/ssl.h | 69 - .../asm_avx2/openssl-cl.gypi | 1 - .../asm_avx2/openssl.gypi | 3 - .../solaris64-x86_64-gcc/no-asm/configdata.pm | 191 +- .../no-asm/crypto/buildinf.h | 2 +- .../no-asm/include/openssl/bio.h | 2 +- .../no-asm/include/openssl/opensslv.h | 14 +- .../no-asm/include/openssl/pkcs7.h | 6 +- .../no-asm/include/openssl/ssl.h | 69 - .../solaris64-x86_64-gcc/no-asm/openssl.gypi | 2 - deps/openssl/config/generate_gypi.pl | 2 +- deps/openssl/openssl/BUILD.gn | 1910 + deps/openssl/openssl/CHANGES.md | 194 +- deps/openssl/openssl/CONTRIBUTING.md | 56 +- deps/openssl/openssl/COPYRIGHT.OpenSource | 186 + .../openssl/Configurations/10-main.conf | 21 +- deps/openssl/openssl/Configurations/README.md | 6 - .../openssl/Configurations/descrip.mms.tmpl | 11 +- .../openssl/Configurations/unix-Makefile.tmpl | 299 +- .../Configurations/windows-makefile.tmpl | 4 +- deps/openssl/openssl/Configure | 47 +- deps/openssl/openssl/INSTALL.md | 26 +- deps/openssl/openssl/NEWS.md | 37 - deps/openssl/openssl/OAT.xml | 41 + deps/openssl/openssl/README-FIPS.md | 96 +- deps/openssl/openssl/README-OpenSSL.md | 224 - deps/openssl/openssl/README.OpenSource | 11 + deps/openssl/openssl/README.md | 289 +- deps/openssl/openssl/VERSION.dat | 8 +- deps/openssl/openssl/VMS/openssl_ivp.com.in | 4 +- .../openssl/VMS/openssl_shutdown.com.in | 8 +- .../openssl/VMS/openssl_startup.com.in | 8 +- deps/openssl/openssl/apps/ca.c | 52 +- deps/openssl/openssl/apps/cmp.c | 7 +- deps/openssl/openssl/apps/cms.c | 38 +- deps/openssl/openssl/apps/dgst.c | 2 - deps/openssl/openssl/apps/dhparam.c | 4 +- deps/openssl/openssl/apps/dsaparam.c | 4 +- deps/openssl/openssl/apps/enc.c | 5 +- deps/openssl/openssl/apps/errstr.c | 2 +- deps/openssl/openssl/apps/gendsa.c | 4 +- deps/openssl/openssl/apps/genpkey.c | 4 +- deps/openssl/openssl/apps/genrsa.c | 4 +- deps/openssl/openssl/apps/info.c | 13 - deps/openssl/openssl/apps/lib/apps.c | 31 +- deps/openssl/openssl/apps/lib/opt.c | 7 +- deps/openssl/openssl/apps/list.c | 52 +- deps/openssl/openssl/apps/pkeyutl.c | 4 +- deps/openssl/openssl/apps/rehash.c | 40 +- deps/openssl/openssl/apps/req.c | 22 +- deps/openssl/openssl/apps/s_client.c | 4 +- deps/openssl/openssl/apps/s_server.c | 9 +- deps/openssl/openssl/apps/smime.c | 3 +- deps/openssl/openssl/apps/speed.c | 33 +- deps/openssl/openssl/appveyor.yml | 82 + deps/openssl/openssl/bundle.json | 37 + deps/openssl/openssl/crypto/LPdir_unix.c | 4 +- .../openssl/crypto/aes/asm/aesv8-armx.pl | 3 - deps/openssl/openssl/crypto/arm_arch.h | 7 +- deps/openssl/openssl/crypto/asn1/a_strnid.c | 4 +- deps/openssl/openssl/crypto/asn1/asn1_gen.c | 11 +- deps/openssl/openssl/crypto/asn1/asn_mime.c | 8 +- deps/openssl/openssl/crypto/asn1/asn_moid.c | 4 - deps/openssl/openssl/crypto/asn1/asn_mstbl.c | 8 +- deps/openssl/openssl/crypto/asn1/x_algor.c | 6 +- deps/openssl/openssl/crypto/bn/bn_exp.c | 21 - deps/openssl/openssl/crypto/bn/bn_gcd.c | 8 +- deps/openssl/openssl/crypto/bn/bn_gf2m.c | 8 +- deps/openssl/openssl/crypto/bn/bn_mod.c | 10 - deps/openssl/openssl/crypto/bn/bn_nist.c | 126 +- deps/openssl/openssl/crypto/bn/bn_recp.c | 4 +- deps/openssl/openssl/crypto/build.info | 6 +- .../openssl/crypto/chacha/asm/chacha-ia64.pl | 2 - deps/openssl/openssl/crypto/cmp/cmp_asn.c | 10 +- deps/openssl/openssl/crypto/cmp/cmp_client.c | 2 +- deps/openssl/openssl/crypto/cmp/cmp_status.c | 7 +- deps/openssl/openssl/crypto/cms/cms_att.c | 24 +- deps/openssl/openssl/crypto/cms/cms_dh.c | 8 +- deps/openssl/openssl/crypto/cms/cms_enc.c | 5 +- deps/openssl/openssl/crypto/cms/cms_env.c | 27 +- deps/openssl/openssl/crypto/cms/cms_err.c | 4 +- deps/openssl/openssl/crypto/cms/cms_lib.c | 1 - deps/openssl/openssl/crypto/cms/cms_local.h | 3 +- deps/openssl/openssl/crypto/cms/cms_rsa.c | 48 +- deps/openssl/openssl/crypto/cms/cms_sd.c | 51 +- deps/openssl/openssl/crypto/cms/cms_smime.c | 3 +- deps/openssl/openssl/crypto/conf/conf_err.c | 2 - deps/openssl/openssl/crypto/conf/conf_mod.c | 10 +- deps/openssl/openssl/crypto/conf/conf_sap.c | 7 +- deps/openssl/openssl/crypto/core_namemap.c | 5 +- deps/openssl/openssl/crypto/dh/dh_check.c | 6 +- deps/openssl/openssl/crypto/dh/dh_key.c | 3 +- deps/openssl/openssl/crypto/dh/dh_lib.c | 4 +- deps/openssl/openssl/crypto/dsa/dsa_check.c | 52 +- deps/openssl/openssl/crypto/dsa/dsa_lib.c | 4 +- deps/openssl/openssl/crypto/dsa/dsa_ossl.c | 1 + deps/openssl/openssl/crypto/ec/ecx_backend.c | 9 +- .../crypto/encode_decode/decoder_lib.c | 7 +- .../crypto/encode_decode/decoder_pkey.c | 8 +- deps/openssl/openssl/crypto/engine/eng_lib.c | 24 +- deps/openssl/openssl/crypto/engine/eng_list.c | 11 +- .../openssl/openssl/crypto/engine/eng_local.h | 6 +- deps/openssl/openssl/crypto/engine/eng_pkey.c | 44 +- .../openssl/openssl/crypto/engine/eng_table.c | 13 +- deps/openssl/openssl/crypto/err/openssl.txt | 6 - .../crypto/evp/ctrl_params_translate.c | 33 +- deps/openssl/openssl/crypto/evp/e_aes.c | 16 +- deps/openssl/openssl/crypto/evp/evp_enc.c | 9 +- deps/openssl/openssl/crypto/evp/evp_fetch.c | 23 +- deps/openssl/openssl/crypto/evp/legacy_sha.c | 8 +- deps/openssl/openssl/crypto/evp/p5_crpt2.c | 3 - deps/openssl/openssl/crypto/evp/p_lib.c | 5 +- deps/openssl/openssl/crypto/evp/pmeth_lib.c | 5 +- deps/openssl/openssl/crypto/ex_data.c | 4 +- .../openssl/crypto/ffc/ffc_key_validate.c | 16 +- .../openssl/openssl/crypto/http/http_client.c | 23 +- deps/openssl/openssl/crypto/http/http_lib.c | 10 +- deps/openssl/openssl/crypto/info.c | 5 - deps/openssl/openssl/crypto/lhash/lhash.c | 6 +- deps/openssl/openssl/crypto/mem.c | 17 +- deps/openssl/openssl/crypto/mem_sec.c | 12 +- .../openssl/crypto/modes/asm/ghashv8-armx.pl | 5 +- deps/openssl/openssl/crypto/objects/obj_dat.c | 11 +- deps/openssl/openssl/crypto/param_build.c | 8 +- deps/openssl/openssl/crypto/param_build_set.c | 13 +- deps/openssl/openssl/crypto/params.c | 40 +- .../openssl/openssl/crypto/params_from_text.c | 10 +- deps/openssl/openssl/crypto/pem/pem_pkey.c | 13 +- .../openssl/crypto/perlasm/arm-xlate.pl | 7 +- .../openssl/crypto/perlasm/x86_64-xlate.pl | 7 +- deps/openssl/openssl/crypto/perlasm/x86asm.pl | 4 +- deps/openssl/openssl/crypto/pkcs12/p12_add.c | 2 +- deps/openssl/openssl/crypto/pkcs12/p12_crt.c | 64 +- deps/openssl/openssl/crypto/pkcs12/p12_mutl.c | 7 +- deps/openssl/openssl/crypto/pkcs12/p12_npas.c | 2 +- deps/openssl/openssl/crypto/pkcs7/pk7_attr.c | 20 +- deps/openssl/openssl/crypto/pkcs7/pk7_mime.c | 2 +- .../crypto/poly1305/asm/poly1305-armv8.pl | 26 +- .../crypto/poly1305/asm/poly1305-ppc.pl | 2 +- .../crypto/poly1305/asm/poly1305-x86_64.pl | 2 +- .../openssl/crypto/property/property.c | 6 +- .../openssl/crypto/property/property_parse.c | 84 +- deps/openssl/openssl/crypto/provider_conf.c | 104 +- deps/openssl/openssl/crypto/provider_core.c | 78 +- deps/openssl/openssl/crypto/rand/rand_lib.c | 8 +- deps/openssl/openssl/crypto/rc4/build.info | 7 +- deps/openssl/openssl/crypto/rsa/rsa_ameth.c | 39 +- deps/openssl/openssl/crypto/rsa/rsa_backend.c | 14 +- deps/openssl/openssl/crypto/rsa/rsa_lib.c | 40 +- deps/openssl/openssl/crypto/rsa/rsa_pmeth.c | 6 +- .../openssl/crypto/rsa/rsa_sp800_56b_check.c | 2 +- .../openssl/crypto/sha/asm/keccak1600-avx2.pl | 3 +- .../crypto/sha/asm/keccak1600-avx512.pl | 3 +- .../crypto/sha/asm/keccak1600-avx512vl.pl | 3 +- deps/openssl/openssl/crypto/srp/srp_vfy.c | 3 +- deps/openssl/openssl/crypto/store/store_lib.c | 6 +- .../openssl/crypto/store/store_result.c | 6 +- deps/openssl/openssl/crypto/threads_pthread.c | 4 +- deps/openssl/openssl/crypto/x509/by_dir.c | 3 +- deps/openssl/openssl/crypto/x509/t_req.c | 8 +- deps/openssl/openssl/crypto/x509/t_x509.c | 4 +- deps/openssl/openssl/crypto/x509/v3_addr.c | 6 +- deps/openssl/openssl/crypto/x509/v3_asid.c | 24 +- deps/openssl/openssl/crypto/x509/v3_crld.c | 7 +- deps/openssl/openssl/crypto/x509/v3_ist.c | 41 +- deps/openssl/openssl/crypto/x509/v3_purp.c | 8 +- deps/openssl/openssl/crypto/x509/v3_san.c | 13 +- deps/openssl/openssl/crypto/x509/v3_sxnet.c | 20 +- deps/openssl/openssl/crypto/x509/x509_att.c | 87 +- deps/openssl/openssl/crypto/x509/x509_cmp.c | 19 +- deps/openssl/openssl/crypto/x509/x509_err.c | 4 +- deps/openssl/openssl/crypto/x509/x509_req.c | 4 +- deps/openssl/openssl/crypto/x509/x509_vpm.c | 12 +- deps/openssl/openssl/demos/README.txt | 50 + deps/openssl/openssl/demos/bio/Makefile | 33 + deps/openssl/openssl/demos/bio/README.txt | 6 + deps/openssl/openssl/demos/bio/accept.cnf | 23 + deps/openssl/openssl/demos/bio/client-arg.c | 108 + deps/openssl/openssl/demos/bio/client-conf.c | 117 + deps/openssl/openssl/demos/bio/cmod.cnf | 27 + deps/openssl/openssl/demos/bio/connect.cnf | 15 + deps/openssl/openssl/demos/bio/descrip.mms | 47 + deps/openssl/openssl/demos/bio/intca.pem | 25 + deps/openssl/openssl/demos/bio/root.pem | 28 + deps/openssl/openssl/demos/bio/saccept.c | 121 + deps/openssl/openssl/demos/bio/sconnect.c | 128 + deps/openssl/openssl/demos/bio/server-arg.c | 144 + deps/openssl/openssl/demos/bio/server-cmod.c | 94 + deps/openssl/openssl/demos/bio/server-conf.c | 139 + deps/openssl/openssl/demos/bio/server-ec.pem | 17 + deps/openssl/openssl/demos/bio/server.pem | 79 + deps/openssl/openssl/demos/bio/shared.opt | 2 + deps/openssl/openssl/demos/bio/static.opt | 2 + deps/openssl/openssl/demos/certs/README.txt | 18 + .../openssl/openssl/demos/certs/apps/apps.cnf | 66 + .../openssl/openssl/demos/certs/apps/ckey.pem | 27 + .../openssl/demos/certs/apps/intkey.pem | 27 + .../openssl/demos/certs/apps/mkacerts.sh | 45 + .../openssl/demos/certs/apps/mkxcerts.sh | 29 + .../openssl/demos/certs/apps/rootkey.pem | 27 + .../openssl/openssl/demos/certs/apps/skey.pem | 27 + .../openssl/demos/certs/apps/skey2.pem | 27 + deps/openssl/openssl/demos/certs/ca.cnf | 82 + deps/openssl/openssl/demos/certs/mkcerts.sh | 96 + deps/openssl/openssl/demos/certs/ocspquery.sh | 21 + deps/openssl/openssl/demos/certs/ocsprun.sh | 14 + deps/openssl/openssl/demos/cipher/Makefile | 27 + deps/openssl/openssl/demos/cipher/aesccm.c | 238 + deps/openssl/openssl/demos/cipher/aesgcm.c | 228 + .../openssl/openssl/demos/cipher/aeskeywrap.c | 181 + deps/openssl/openssl/demos/cipher/ariacbc.c | 178 + deps/openssl/openssl/demos/cms/cacert.pem | 29 + deps/openssl/openssl/demos/cms/cakey.pem | 39 + deps/openssl/openssl/demos/cms/cms_comp.c | 64 + deps/openssl/openssl/demos/cms/cms_ddec.c | 88 + deps/openssl/openssl/demos/cms/cms_dec.c | 78 + deps/openssl/openssl/demos/cms/cms_denc.c | 97 + deps/openssl/openssl/demos/cms/cms_enc.c | 92 + deps/openssl/openssl/demos/cms/cms_sign.c | 88 + deps/openssl/openssl/demos/cms/cms_sign2.c | 98 + deps/openssl/openssl/demos/cms/cms_uncomp.c | 58 + deps/openssl/openssl/demos/cms/cms_ver.c | 88 + deps/openssl/openssl/demos/cms/comp.txt | 22 + deps/openssl/openssl/demos/cms/encr.txt | 3 + deps/openssl/openssl/demos/cms/sign.txt | 3 + deps/openssl/openssl/demos/cms/signer.pem | 52 + deps/openssl/openssl/demos/cms/signer2.pem | 52 + deps/openssl/openssl/demos/digest/BIO_f_md.c | 122 + .../openssl/demos/digest/EVP_MD_demo.c | 183 + .../openssl/demos/digest/EVP_MD_stdin.c | 134 + .../openssl/openssl/demos/digest/EVP_MD_xof.c | 132 + deps/openssl/openssl/demos/digest/Makefile | 23 + deps/openssl/openssl/demos/encode/Makefile | 20 + deps/openssl/openssl/demos/encode/ec_encode.c | 205 + .../openssl/openssl/demos/encode/rsa_encode.c | 202 + deps/openssl/openssl/demos/kdf/Makefile | 22 + deps/openssl/openssl/demos/kdf/hkdf.c | 104 + deps/openssl/openssl/demos/kdf/pbkdf2.c | 117 + deps/openssl/openssl/demos/kdf/scrypt.c | 120 + deps/openssl/openssl/demos/keyexch/x25519.c | 278 + deps/openssl/openssl/demos/mac/Makefile | 25 + deps/openssl/openssl/demos/mac/cmac-aes256.c | 154 + deps/openssl/openssl/demos/mac/gmac.c | 145 + deps/openssl/openssl/demos/mac/hmac-sha512.c | 166 + deps/openssl/openssl/demos/mac/poly1305.c | 209 + deps/openssl/openssl/demos/mac/siphash.c | 129 + deps/openssl/openssl/demos/pkcs12/pkread.c | 111 + deps/openssl/openssl/demos/pkcs12/pkwrite.c | 53 + .../openssl/demos/pkey/EVP_PKEY_DSA_keygen.c | 83 + .../demos/pkey/EVP_PKEY_DSA_paramfromdata.c | 75 + .../demos/pkey/EVP_PKEY_DSA_paramgen.c | 66 + .../demos/pkey/EVP_PKEY_DSA_paramvalidate.c | 202 + .../openssl/demos/pkey/EVP_PKEY_EC_keygen.c | 155 + .../openssl/demos/pkey/EVP_PKEY_RSA_keygen.c | 289 + deps/openssl/openssl/demos/pkey/Makefile | 37 + deps/openssl/openssl/demos/pkey/dsa.inc | 172 + .../demos/signature/EVP_Signature_demo.c | 235 + .../demos/signature/EVP_Signature_demo.h | 76 + deps/openssl/openssl/demos/signature/Makefile | 22 + .../openssl/openssl/demos/signature/rsa_pss.h | 256 + .../openssl/demos/signature/rsa_pss_direct.c | 204 + .../openssl/demos/signature/rsa_pss_hash.c | 189 + deps/openssl/openssl/demos/smime/cacert.pem | 29 + deps/openssl/openssl/demos/smime/cakey.pem | 39 + deps/openssl/openssl/demos/smime/encr.txt | 3 + deps/openssl/openssl/demos/smime/sign.txt | 3 + deps/openssl/openssl/demos/smime/signer.pem | 52 + deps/openssl/openssl/demos/smime/signer2.pem | 52 + deps/openssl/openssl/demos/smime/smdec.c | 78 + deps/openssl/openssl/demos/smime/smenc.c | 91 + deps/openssl/openssl/demos/smime/smsign.c | 88 + deps/openssl/openssl/demos/smime/smsign2.c | 96 + deps/openssl/openssl/demos/smime/smver.c | 87 + .../openssl/doc/HOWTO/certificates.txt | 110 + deps/openssl/openssl/doc/HOWTO/keys.txt | 105 + deps/openssl/openssl/doc/README.md | 30 + deps/openssl/openssl/doc/build.info | 4872 + deps/openssl/openssl/doc/build.info.in | 80 + .../openssl/openssl/doc/dir-locals.example.el | 15 + deps/openssl/openssl/doc/fingerprints.txt | 28 + deps/openssl/openssl/doc/images/openssl.svg | 41 + .../openssl/doc/internal/man3/OPENSSL_SA.pod | 131 + .../openssl/doc/internal/man3/OPTIONS.pod | 343 + .../doc/internal/man3/OSSL_DEPRECATED.pod | 54 + .../doc/internal/man3/OSSL_METHOD_STORE.pod | 144 + .../internal/man3/cms_add1_signing_cert.pod | 46 + .../doc/internal/man3/evp_generic_fetch.pod | 285 + .../doc/internal/man3/evp_keymgmt_newdata.pod | 88 + .../evp_keymgmt_util_export_to_provider.pod | 106 + .../doc/internal/man3/evp_md_get_number.pod | 112 + .../man3/evp_pkey_export_to_provider.pod | 80 + .../internal/man3/evp_pkey_get1_ED25519.pod | 43 + .../man3/ossl_DER_w_begin_sequence.pod | 48 + .../doc/internal/man3/ossl_DER_w_bn.pod | 66 + .../internal/man3/ossl_DER_w_precompiled.pod | 48 + .../internal/man3/ossl_algorithm_do_all.pod | 63 + .../man3/ossl_cmp_X509_STORE_add1_certs.pod | 44 + .../man3/ossl_cmp_asn1_octet_string_set1.pod | 45 + .../internal/man3/ossl_cmp_certreq_new.pod | 178 + .../man3/ossl_cmp_ctx_set1_caPubs.pod | 76 + .../doc/internal/man3/ossl_cmp_hdr_init.pod | 151 + .../internal/man3/ossl_cmp_mock_srv_new.pod | 89 + .../man3/ossl_cmp_msg_check_update.pod | 95 + .../doc/internal/man3/ossl_cmp_msg_create.pod | 134 + .../internal/man3/ossl_cmp_msg_protect.pod | 66 + .../man3/ossl_cmp_pkisi_get_status.pod | 99 + .../doc/internal/man3/ossl_cmp_print_log.pod | 108 + .../internal/man3/ossl_ends_with_dirsep.pod | 45 + .../ossl_global_properties_no_mirrored.pod | 56 + .../man3/ossl_init_thread_deregister.pod | 66 + .../internal/man3/ossl_lib_ctx_get_data.pod | 154 + .../internal/man3/ossl_method_construct.pod | 158 + .../doc/internal/man3/ossl_namemap_new.pod | 129 + .../man3/ossl_provider_add_conf_module.pod | 41 + .../doc/internal/man3/ossl_provider_new.pod | 400 + .../internal/man3/ossl_punycode_decode.pod | 60 + .../internal/man3/ossl_rand_get_entropy.pod | 66 + .../man3/ossl_random_add_conf_module.pod | 42 + .../man3/ossl_rsa_get0_all_params.pod | 75 + .../internal/man3/x509v3_cache_extensions.pod | 41 + .../openssl/doc/internal/man7/DERlib.pod | 149 + .../openssl/doc/internal/man7/EVP_PKEY.pod | 212 + .../openssl/doc/internal/man7/VERSION.pod | 149 + .../openssl/doc/internal/man7/build.info.pod | 644 + .../openssl/doc/internal/man7/deprecation.pod | 140 + deps/openssl/openssl/doc/life-cycles/Makefile | 26 + .../openssl/openssl/doc/life-cycles/README.md | 20 + .../openssl/doc/life-cycles/cipher.dot | 72 + .../openssl/doc/life-cycles/digest.dot | 33 + deps/openssl/openssl/doc/life-cycles/kdf.dot | 16 + .../openssl/doc/life-cycles/lifecycles.ods | Bin 0 -> 17042 bytes deps/openssl/openssl/doc/life-cycles/mac.dot | 28 + deps/openssl/openssl/doc/life-cycles/pkey.dot | 49 + deps/openssl/openssl/doc/life-cycles/rand.dot | 17 + deps/openssl/openssl/doc/man1/CA.pl.pod | 199 + deps/openssl/openssl/doc/man1/build.info | 57 + .../openssl/doc/man1/openssl-asn1parse.pod.in | 220 + .../openssl/doc/man1/openssl-ca.pod.in | 849 + .../openssl/doc/man1/openssl-ciphers.pod.in | 804 + .../openssl/doc/man1/openssl-cmds.pod.in | 162 + .../openssl/doc/man1/openssl-cmp.pod.in | 1298 + .../openssl/doc/man1/openssl-cms.pod.in | 912 + .../openssl/doc/man1/openssl-crl.pod.in | 172 + .../openssl/doc/man1/openssl-crl2pkcs7.pod.in | 108 + .../openssl/doc/man1/openssl-dgst.pod.in | 288 + .../openssl/doc/man1/openssl-dhparam.pod.in | 136 + .../openssl/doc/man1/openssl-dsa.pod.in | 195 + .../openssl/doc/man1/openssl-dsaparam.pod.in | 120 + .../openssl/doc/man1/openssl-ec.pod.in | 208 + .../openssl/doc/man1/openssl-ecparam.pod.in | 186 + .../openssl/doc/man1/openssl-enc.pod.in | 459 + .../openssl/doc/man1/openssl-engine.pod.in | 132 + .../openssl/doc/man1/openssl-errstr.pod.in | 54 + .../doc/man1/openssl-fipsinstall.pod.in | 251 + .../doc/man1/openssl-format-options.pod | 145 + .../openssl/doc/man1/openssl-gendsa.pod.in | 108 + .../openssl/doc/man1/openssl-genpkey.pod.in | 504 + .../openssl/doc/man1/openssl-genrsa.pod.in | 134 + .../openssl/doc/man1/openssl-info.pod.in | 91 + .../openssl/doc/man1/openssl-kdf.pod.in | 205 + .../openssl/doc/man1/openssl-list.pod.in | 247 + .../openssl/doc/man1/openssl-mac.pod.in | 175 + .../doc/man1/openssl-namedisplay-options.pod | 179 + .../openssl/doc/man1/openssl-nseq.pod.in | 76 + .../openssl/doc/man1/openssl-ocsp.pod.in | 517 + .../doc/man1/openssl-passphrase-options.pod | 75 + .../openssl/doc/man1/openssl-passwd.pod.in | 122 + .../openssl/doc/man1/openssl-pkcs12.pod.in | 470 + .../openssl/doc/man1/openssl-pkcs7.pod.in | 110 + .../openssl/doc/man1/openssl-pkcs8.pod.in | 288 + .../openssl/doc/man1/openssl-pkey.pod.in | 238 + .../openssl/doc/man1/openssl-pkeyparam.pod.in | 98 + .../openssl/doc/man1/openssl-pkeyutl.pod.in | 430 + .../openssl/doc/man1/openssl-prime.pod.in | 70 + .../openssl/doc/man1/openssl-rand.pod.in | 78 + .../openssl/doc/man1/openssl-rehash.pod.in | 157 + .../openssl/doc/man1/openssl-req.pod.in | 775 + .../openssl/doc/man1/openssl-rsa.pod.in | 216 + .../openssl/doc/man1/openssl-rsautl.pod.in | 242 + .../openssl/doc/man1/openssl-s_client.pod.in | 920 + .../openssl/doc/man1/openssl-s_server.pod.in | 940 + .../openssl/doc/man1/openssl-s_time.pod.in | 198 + .../openssl/doc/man1/openssl-sess_id.pod.in | 162 + .../openssl/doc/man1/openssl-smime.pod.in | 492 + .../openssl/doc/man1/openssl-speed.pod.in | 146 + .../openssl/doc/man1/openssl-spkac.pod.in | 169 + .../openssl/doc/man1/openssl-srp.pod.in | 118 + .../openssl/doc/man1/openssl-storeutl.pod.in | 147 + .../openssl/doc/man1/openssl-ts.pod.in | 662 + .../doc/man1/openssl-verification-options.pod | 696 + .../openssl/doc/man1/openssl-verify.pod.in | 150 + .../openssl/doc/man1/openssl-version.pod.in | 96 + .../openssl/doc/man1/openssl-x509.pod.in | 794 + deps/openssl/openssl/doc/man1/openssl.pod | 843 + deps/openssl/openssl/doc/man1/tsget.pod | 202 + deps/openssl/openssl/doc/man3/ADMISSIONS.pod | 179 + .../openssl/doc/man3/ASN1_EXTERN_FUNCS.pod | 181 + .../doc/man3/ASN1_INTEGER_get_int64.pod | 133 + .../openssl/doc/man3/ASN1_INTEGER_new.pod | 44 + .../openssl/doc/man3/ASN1_ITEM_lookup.pod | 39 + .../openssl/doc/man3/ASN1_OBJECT_new.pod | 51 + .../doc/man3/ASN1_STRING_TABLE_add.pod | 65 + .../openssl/doc/man3/ASN1_STRING_length.pod | 113 + .../openssl/doc/man3/ASN1_STRING_new.pod | 52 + .../openssl/doc/man3/ASN1_STRING_print_ex.pod | 115 + .../openssl/doc/man3/ASN1_TIME_set.pod | 282 + .../openssl/doc/man3/ASN1_TYPE_get.pod | 101 + deps/openssl/openssl/doc/man3/ASN1_aux_cb.pod | 284 + .../openssl/doc/man3/ASN1_generate_nconf.pod | 271 + .../openssl/doc/man3/ASN1_item_d2i_bio.pod | 88 + .../openssl/doc/man3/ASN1_item_new.pod | 45 + .../openssl/doc/man3/ASN1_item_sign.pod | 226 + .../openssl/doc/man3/ASYNC_WAIT_CTX_new.pod | 226 + .../openssl/doc/man3/ASYNC_start_job.pod | 335 + deps/openssl/openssl/doc/man3/BF_encrypt.pod | 131 + deps/openssl/openssl/doc/man3/BIO_ADDR.pod | 125 + .../openssl/openssl/doc/man3/BIO_ADDRINFO.pod | 113 + deps/openssl/openssl/doc/man3/BIO_connect.pod | 117 + deps/openssl/openssl/doc/man3/BIO_ctrl.pod | 161 + .../openssl/openssl/doc/man3/BIO_f_base64.pod | 103 + .../openssl/openssl/doc/man3/BIO_f_buffer.pod | 103 + .../openssl/openssl/doc/man3/BIO_f_cipher.pod | 81 + deps/openssl/openssl/doc/man3/BIO_f_md.pod | 162 + deps/openssl/openssl/doc/man3/BIO_f_null.pod | 39 + .../openssl/openssl/doc/man3/BIO_f_prefix.pod | 70 + .../openssl/doc/man3/BIO_f_readbuffer.pod | 61 + deps/openssl/openssl/doc/man3/BIO_f_ssl.pod | 308 + .../openssl/doc/man3/BIO_find_type.pod | 70 + .../openssl/openssl/doc/man3/BIO_get_data.pod | 65 + .../openssl/doc/man3/BIO_get_ex_new_index.pod | 135 + .../openssl/openssl/doc/man3/BIO_meth_new.pod | 167 + deps/openssl/openssl/doc/man3/BIO_new.pod | 79 + deps/openssl/openssl/doc/man3/BIO_new_CMS.pod | 75 + .../openssl/doc/man3/BIO_parse_hostserv.pod | 79 + deps/openssl/openssl/doc/man3/BIO_printf.pod | 57 + deps/openssl/openssl/doc/man3/BIO_push.pod | 98 + deps/openssl/openssl/doc/man3/BIO_read.pod | 129 + .../openssl/openssl/doc/man3/BIO_s_accept.pod | 242 + deps/openssl/openssl/doc/man3/BIO_s_bio.pod | 201 + .../openssl/doc/man3/BIO_s_connect.pod | 211 + deps/openssl/openssl/doc/man3/BIO_s_core.pod | 72 + .../openssl/doc/man3/BIO_s_datagram.pod | 234 + deps/openssl/openssl/doc/man3/BIO_s_fd.pod | 98 + deps/openssl/openssl/doc/man3/BIO_s_file.pod | 167 + deps/openssl/openssl/doc/man3/BIO_s_mem.pod | 164 + deps/openssl/openssl/doc/man3/BIO_s_null.pod | 44 + .../openssl/openssl/doc/man3/BIO_s_socket.pod | 54 + .../openssl/doc/man3/BIO_set_callback.pod | 256 + .../openssl/doc/man3/BIO_should_retry.pod | 147 + .../openssl/doc/man3/BIO_socket_wait.pod | 69 + .../openssl/doc/man3/BN_BLINDING_new.pod | 126 + deps/openssl/openssl/doc/man3/BN_CTX_new.pod | 89 + .../openssl/openssl/doc/man3/BN_CTX_start.pod | 58 + deps/openssl/openssl/doc/man3/BN_add.pod | 140 + deps/openssl/openssl/doc/man3/BN_add_word.pod | 61 + deps/openssl/openssl/doc/man3/BN_bn2bin.pod | 124 + deps/openssl/openssl/doc/man3/BN_cmp.pod | 52 + deps/openssl/openssl/doc/man3/BN_copy.pod | 69 + .../openssl/doc/man3/BN_generate_prime.pod | 255 + .../openssl/doc/man3/BN_mod_exp_mont.pod | 65 + .../openssl/doc/man3/BN_mod_inverse.pod | 41 + .../doc/man3/BN_mod_mul_montgomery.pod | 90 + .../doc/man3/BN_mod_mul_reciprocal.pod | 76 + deps/openssl/openssl/doc/man3/BN_new.pod | 64 + .../openssl/openssl/doc/man3/BN_num_bytes.pod | 61 + deps/openssl/openssl/doc/man3/BN_rand.pod | 129 + .../openssl/doc/man3/BN_security_bits.pod | 51 + deps/openssl/openssl/doc/man3/BN_set_bit.pod | 69 + deps/openssl/openssl/doc/man3/BN_swap.pod | 30 + deps/openssl/openssl/doc/man3/BN_zero.pod | 68 + deps/openssl/openssl/doc/man3/BUF_MEM_new.pod | 75 + .../doc/man3/CMS_EncryptedData_decrypt.pod | 49 + .../doc/man3/CMS_EncryptedData_encrypt.pod | 69 + .../doc/man3/CMS_EnvelopedData_create.pod | 80 + .../openssl/doc/man3/CMS_add0_cert.pod | 80 + .../doc/man3/CMS_add1_recipient_cert.pod | 86 + .../openssl/doc/man3/CMS_add1_signer.pod | 107 + .../openssl/openssl/doc/man3/CMS_compress.pod | 77 + .../openssl/doc/man3/CMS_data_create.pod | 54 + deps/openssl/openssl/doc/man3/CMS_decrypt.pod | 123 + .../openssl/doc/man3/CMS_digest_create.pod | 58 + deps/openssl/openssl/doc/man3/CMS_encrypt.pod | 114 + deps/openssl/openssl/doc/man3/CMS_final.pod | 46 + .../doc/man3/CMS_get0_RecipientInfos.pod | 155 + .../openssl/doc/man3/CMS_get0_SignerInfos.pod | 90 + .../openssl/doc/man3/CMS_get0_type.pod | 83 + .../doc/man3/CMS_get1_ReceiptRequest.pod | 92 + deps/openssl/openssl/doc/man3/CMS_sign.pod | 142 + .../openssl/doc/man3/CMS_sign_receipt.pod | 52 + .../openssl/doc/man3/CMS_uncompress.pod | 59 + deps/openssl/openssl/doc/man3/CMS_verify.pod | 145 + .../openssl/doc/man3/CMS_verify_receipt.pod | 54 + .../openssl/doc/man3/CONF_modules_free.pod | 58 + .../doc/man3/CONF_modules_load_file.pod | 164 + .../doc/man3/CRYPTO_THREAD_run_once.pod | 193 + .../doc/man3/CRYPTO_get_ex_new_index.pod | 180 + .../openssl/doc/man3/CRYPTO_memcmp.pod | 39 + .../doc/man3/CTLOG_STORE_get0_log_by_id.pod | 49 + .../openssl/doc/man3/CTLOG_STORE_new.pod | 88 + deps/openssl/openssl/doc/man3/CTLOG_new.pod | 90 + .../doc/man3/CT_POLICY_EVAL_CTX_new.pod | 140 + .../openssl/doc/man3/DEFINE_STACK_OF.pod | 307 + .../openssl/doc/man3/DES_random_key.pod | 333 + .../openssl/doc/man3/DH_generate_key.pod | 82 + .../doc/man3/DH_generate_parameters.pod | 170 + deps/openssl/openssl/doc/man3/DH_get0_pqg.pod | 151 + .../openssl/doc/man3/DH_get_1024_160.pod | 91 + deps/openssl/openssl/doc/man3/DH_meth_new.pod | 176 + deps/openssl/openssl/doc/man3/DH_new.pod | 57 + .../openssl/doc/man3/DH_new_by_nid.pod | 52 + .../openssl/doc/man3/DH_set_method.pod | 99 + deps/openssl/openssl/doc/man3/DH_size.pod | 69 + deps/openssl/openssl/doc/man3/DSA_SIG_new.pod | 58 + deps/openssl/openssl/doc/man3/DSA_do_sign.pod | 64 + deps/openssl/openssl/doc/man3/DSA_dup_DH.pod | 53 + .../openssl/doc/man3/DSA_generate_key.pod | 53 + .../doc/man3/DSA_generate_parameters.pod | 136 + .../openssl/openssl/doc/man3/DSA_get0_pqg.pod | 123 + .../openssl/openssl/doc/man3/DSA_meth_new.pod | 224 + deps/openssl/openssl/doc/man3/DSA_new.pod | 60 + .../openssl/doc/man3/DSA_set_method.pod | 99 + deps/openssl/openssl/doc/man3/DSA_sign.pod | 83 + deps/openssl/openssl/doc/man3/DSA_size.pod | 68 + .../openssl/doc/man3/DTLS_get_data_mtu.pod | 36 + .../openssl/doc/man3/DTLS_set_timer_cb.pod | 40 + .../openssl/doc/man3/DTLSv1_listen.pod | 153 + .../openssl/doc/man3/ECDSA_SIG_new.pod | 146 + deps/openssl/openssl/doc/man3/ECDSA_sign.pod | 186 + .../openssl/doc/man3/ECPKParameters_print.pod | 55 + .../openssl/doc/man3/EC_GFp_simple_method.pod | 83 + .../openssl/doc/man3/EC_GROUP_copy.pod | 262 + .../openssl/openssl/doc/man3/EC_GROUP_new.pod | 233 + .../openssl/doc/man3/EC_KEY_get_enc_flags.pod | 59 + deps/openssl/openssl/doc/man3/EC_KEY_new.pod | 245 + .../openssl/openssl/doc/man3/EC_POINT_add.pod | 100 + .../openssl/openssl/doc/man3/EC_POINT_new.pod | 279 + deps/openssl/openssl/doc/man3/ENGINE_add.pod | 675 + deps/openssl/openssl/doc/man3/ERR_GET_LIB.pod | 72 + .../openssl/doc/man3/ERR_clear_error.pod | 34 + .../openssl/doc/man3/ERR_error_string.pod | 81 + .../openssl/doc/man3/ERR_get_error.pod | 142 + .../doc/man3/ERR_load_crypto_strings.pod | 56 + .../openssl/doc/man3/ERR_load_strings.pod | 58 + deps/openssl/openssl/doc/man3/ERR_new.pod | 78 + .../openssl/doc/man3/ERR_print_errors.pod | 59 + .../openssl/doc/man3/ERR_put_error.pod | 189 + .../openssl/doc/man3/ERR_remove_state.pod | 51 + .../openssl/openssl/doc/man3/ERR_set_mark.pod | 42 + .../openssl/doc/man3/EVP_ASYM_CIPHER_free.pod | 112 + .../openssl/doc/man3/EVP_BytesToKey.pod | 78 + .../man3/EVP_CIPHER_CTX_get_cipher_data.pod | 51 + .../man3/EVP_CIPHER_CTX_get_original_iv.pod | 74 + .../openssl/doc/man3/EVP_CIPHER_meth_new.pod | 259 + .../openssl/doc/man3/EVP_DigestInit.pod | 794 + .../openssl/doc/man3/EVP_DigestSignInit.pod | 211 + .../openssl/doc/man3/EVP_DigestVerifyInit.pod | 196 + .../openssl/doc/man3/EVP_EncodeInit.pod | 161 + .../openssl/doc/man3/EVP_EncryptInit.pod | 1737 + deps/openssl/openssl/doc/man3/EVP_KDF.pod | 305 + .../openssl/openssl/doc/man3/EVP_KEM_free.pod | 105 + .../openssl/doc/man3/EVP_KEYEXCH_free.pod | 111 + deps/openssl/openssl/doc/man3/EVP_KEYMGMT.pod | 150 + deps/openssl/openssl/doc/man3/EVP_MAC.pod | 491 + .../openssl/doc/man3/EVP_MD_meth_new.pod | 204 + .../openssl/openssl/doc/man3/EVP_OpenInit.pod | 69 + .../openssl/doc/man3/EVP_PBE_CipherInit.pod | 111 + .../openssl/doc/man3/EVP_PKEY2PKCS8.pod | 47 + .../openssl/doc/man3/EVP_PKEY_ASN1_METHOD.pod | 449 + .../openssl/doc/man3/EVP_PKEY_CTX_ctrl.pod | 690 + .../doc/man3/EVP_PKEY_CTX_get0_libctx.pod | 54 + .../doc/man3/EVP_PKEY_CTX_get0_pkey.pod | 56 + .../openssl/doc/man3/EVP_PKEY_CTX_new.pod | 132 + .../doc/man3/EVP_PKEY_CTX_set1_pbe_pass.pod | 71 + .../doc/man3/EVP_PKEY_CTX_set_hkdf_md.pod | 169 + .../doc/man3/EVP_PKEY_CTX_set_params.pod | 94 + .../EVP_PKEY_CTX_set_rsa_pss_keygen_md.pod | 105 + .../doc/man3/EVP_PKEY_CTX_set_scrypt_N.pod | 92 + .../doc/man3/EVP_PKEY_CTX_set_tls1_prf_md.pod | 112 + .../doc/man3/EVP_PKEY_asn1_get_count.pod | 80 + .../openssl/doc/man3/EVP_PKEY_check.pod | 96 + .../doc/man3/EVP_PKEY_copy_parameters.pod | 120 + .../openssl/doc/man3/EVP_PKEY_decapsulate.pod | 99 + .../openssl/doc/man3/EVP_PKEY_decrypt.pod | 115 + .../openssl/doc/man3/EVP_PKEY_derive.pod | 124 + .../EVP_PKEY_digestsign_supports_digest.pod | 44 + .../openssl/doc/man3/EVP_PKEY_encapsulate.pod | 102 + .../openssl/doc/man3/EVP_PKEY_encrypt.pod | 118 + .../openssl/doc/man3/EVP_PKEY_fromdata.pod | 280 + .../man3/EVP_PKEY_get_default_digest_nid.pod | 67 + .../doc/man3/EVP_PKEY_get_field_type.pod | 55 + .../doc/man3/EVP_PKEY_get_group_name.pod | 46 + .../openssl/doc/man3/EVP_PKEY_get_size.pod | 91 + .../doc/man3/EVP_PKEY_gettable_params.pod | 136 + .../openssl/doc/man3/EVP_PKEY_is_a.pod | 113 + .../openssl/doc/man3/EVP_PKEY_keygen.pod | 236 + .../doc/man3/EVP_PKEY_meth_get_count.pod | 61 + .../openssl/doc/man3/EVP_PKEY_meth_new.pod | 466 + .../openssl/openssl/doc/man3/EVP_PKEY_new.pod | 220 + .../doc/man3/EVP_PKEY_print_private.pod | 77 + .../openssl/doc/man3/EVP_PKEY_set1_RSA.pod | 238 + .../man3/EVP_PKEY_set1_encoded_public_key.pod | 142 + .../openssl/doc/man3/EVP_PKEY_set_type.pod | 68 + .../doc/man3/EVP_PKEY_settable_params.pod | 83 + .../openssl/doc/man3/EVP_PKEY_sign.pod | 126 + .../openssl/doc/man3/EVP_PKEY_todata.pod | 64 + .../openssl/doc/man3/EVP_PKEY_verify.pod | 114 + .../doc/man3/EVP_PKEY_verify_recover.pod | 128 + deps/openssl/openssl/doc/man3/EVP_RAND.pod | 416 + .../openssl/doc/man3/EVP_SIGNATURE.pod | 116 + .../openssl/openssl/doc/man3/EVP_SealInit.pod | 92 + .../openssl/openssl/doc/man3/EVP_SignInit.pod | 112 + .../openssl/doc/man3/EVP_VerifyInit.pod | 107 + .../openssl/doc/man3/EVP_aes_128_gcm.pod | 201 + .../openssl/doc/man3/EVP_aria_128_gcm.pod | 124 + deps/openssl/openssl/doc/man3/EVP_bf_cbc.pod | 68 + .../openssl/doc/man3/EVP_blake2b512.pod | 70 + .../openssl/doc/man3/EVP_camellia_128_ecb.pod | 107 + .../openssl/doc/man3/EVP_cast5_cbc.pod | 68 + .../openssl/openssl/doc/man3/EVP_chacha20.pod | 72 + deps/openssl/openssl/doc/man3/EVP_des_cbc.pod | 117 + .../openssl/openssl/doc/man3/EVP_desx_cbc.pod | 59 + .../openssl/openssl/doc/man3/EVP_idea_cbc.pod | 66 + deps/openssl/openssl/doc/man3/EVP_md2.pod | 60 + deps/openssl/openssl/doc/man3/EVP_md4.pod | 61 + deps/openssl/openssl/doc/man3/EVP_md5.pod | 71 + deps/openssl/openssl/doc/man3/EVP_mdc2.pod | 62 + deps/openssl/openssl/doc/man3/EVP_rc2_cbc.pod | 83 + deps/openssl/openssl/doc/man3/EVP_rc4.pod | 74 + .../openssl/doc/man3/EVP_rc5_32_12_16_cbc.pod | 88 + .../openssl/doc/man3/EVP_ripemd160.pod | 61 + .../openssl/openssl/doc/man3/EVP_seed_cbc.pod | 68 + .../doc/man3/EVP_set_default_properties.pod | 71 + deps/openssl/openssl/doc/man3/EVP_sha1.pod | 60 + deps/openssl/openssl/doc/man3/EVP_sha224.pod | 80 + .../openssl/openssl/doc/man3/EVP_sha3_224.pod | 85 + deps/openssl/openssl/doc/man3/EVP_sm3.pod | 60 + deps/openssl/openssl/doc/man3/EVP_sm4_cbc.pod | 74 + .../openssl/doc/man3/EVP_whirlpool.pod | 62 + deps/openssl/openssl/doc/man3/HMAC.pod | 173 + deps/openssl/openssl/doc/man3/MD5.pod | 115 + deps/openssl/openssl/doc/man3/MDC2_Init.pod | 80 + .../openssl/openssl/doc/man3/NCONF_new_ex.pod | 84 + deps/openssl/openssl/doc/man3/OBJ_nid2obj.pod | 207 + .../openssl/doc/man3/OCSP_REQUEST_new.pod | 118 + .../openssl/doc/man3/OCSP_cert_to_id.pod | 89 + .../doc/man3/OCSP_request_add1_nonce.pod | 84 + .../doc/man3/OCSP_resp_find_status.pod | 220 + .../openssl/doc/man3/OCSP_response_status.pod | 133 + .../openssl/doc/man3/OCSP_sendreq_new.pod | 125 + .../openssl/doc/man3/OPENSSL_Applink.pod | 35 + .../openssl/openssl/doc/man3/OPENSSL_FILE.pod | 56 + .../openssl/doc/man3/OPENSSL_LH_COMPFUNC.pod | 280 + .../openssl/doc/man3/OPENSSL_LH_stats.pod | 69 + .../openssl/doc/man3/OPENSSL_config.pod | 87 + .../openssl/doc/man3/OPENSSL_fork_prepare.pod | 70 + .../openssl/doc/man3/OPENSSL_gmtime.pod | 62 + .../openssl/doc/man3/OPENSSL_hexchar2int.pod | 81 + .../openssl/doc/man3/OPENSSL_ia32cap.pod | 139 + .../openssl/doc/man3/OPENSSL_init_crypto.pod | 299 + .../openssl/doc/man3/OPENSSL_init_ssl.pod | 84 + .../doc/man3/OPENSSL_instrument_bus.pod | 53 + .../doc/man3/OPENSSL_load_builtin_modules.pod | 60 + .../openssl/doc/man3/OPENSSL_malloc.pod | 208 + .../openssl/doc/man3/OPENSSL_s390xcap.pod | 199 + .../doc/man3/OPENSSL_secure_malloc.pod | 143 + .../openssl/doc/man3/OPENSSL_strcasecmp.pod | 47 + .../openssl/doc/man3/OSSL_ALGORITHM.pod | 151 + .../openssl/doc/man3/OSSL_CALLBACK.pod | 77 + .../openssl/doc/man3/OSSL_CMP_CTX_new.pod | 806 + .../man3/OSSL_CMP_HDR_get0_transactionID.pod | 47 + .../openssl/doc/man3/OSSL_CMP_ITAV_set0.pod | 111 + .../doc/man3/OSSL_CMP_MSG_get0_header.pod | 158 + .../doc/man3/OSSL_CMP_MSG_http_perform.pod | 60 + .../openssl/doc/man3/OSSL_CMP_SRV_CTX_new.pod | 168 + .../doc/man3/OSSL_CMP_STATUSINFO_new.pod | 66 + .../doc/man3/OSSL_CMP_exec_certreq.pod | 173 + .../openssl/doc/man3/OSSL_CMP_log_open.pod | 124 + .../doc/man3/OSSL_CMP_validate_msg.pod | 84 + .../openssl/doc/man3/OSSL_CORE_MAKE_FUNC.pod | 43 + .../doc/man3/OSSL_CRMF_MSG_get0_tmpl.pod | 98 + .../doc/man3/OSSL_CRMF_MSG_set0_validity.pod | 120 + .../OSSL_CRMF_MSG_set1_regCtrl_regToken.pod | 131 + .../OSSL_CRMF_MSG_set1_regInfo_certReq.pod | 68 + .../openssl/doc/man3/OSSL_CRMF_pbmp_new.pod | 92 + .../openssl/openssl/doc/man3/OSSL_DECODER.pod | 190 + .../openssl/doc/man3/OSSL_DECODER_CTX.pod | 259 + .../man3/OSSL_DECODER_CTX_new_for_pkey.pod | 145 + .../doc/man3/OSSL_DECODER_from_bio.pod | 120 + .../openssl/doc/man3/OSSL_DISPATCH.pod | 81 + .../openssl/openssl/doc/man3/OSSL_ENCODER.pod | 144 + .../openssl/doc/man3/OSSL_ENCODER_CTX.pod | 221 + .../man3/OSSL_ENCODER_CTX_new_for_pkey.pod | 146 + .../openssl/doc/man3/OSSL_ENCODER_to_bio.pod | 133 + .../doc/man3/OSSL_ESS_check_signing_certs.pod | 88 + .../openssl/doc/man3/OSSL_HTTP_REQ_CTX.pod | 266 + .../openssl/doc/man3/OSSL_HTTP_parse_url.pod | 107 + .../openssl/doc/man3/OSSL_HTTP_transfer.pod | 284 + deps/openssl/openssl/doc/man3/OSSL_ITEM.pod | 56 + .../openssl/openssl/doc/man3/OSSL_LIB_CTX.pod | 136 + deps/openssl/openssl/doc/man3/OSSL_PARAM.pod | 374 + .../openssl/doc/man3/OSSL_PARAM_BLD.pod | 203 + .../man3/OSSL_PARAM_allocate_from_text.pod | 207 + .../openssl/doc/man3/OSSL_PARAM_dup.pod | 59 + .../openssl/doc/man3/OSSL_PARAM_int.pod | 413 + .../openssl/doc/man3/OSSL_PROVIDER.pod | 223 + .../openssl/doc/man3/OSSL_SELF_TEST_new.pod | 175 + .../doc/man3/OSSL_SELF_TEST_set_callback.pod | 52 + .../openssl/doc/man3/OSSL_STORE_INFO.pod | 231 + .../openssl/doc/man3/OSSL_STORE_LOADER.pod | 390 + .../openssl/doc/man3/OSSL_STORE_SEARCH.pod | 193 + .../openssl/doc/man3/OSSL_STORE_attach.pod | 47 + .../openssl/doc/man3/OSSL_STORE_expect.pod | 81 + .../openssl/doc/man3/OSSL_STORE_open.pod | 186 + .../openssl/doc/man3/OSSL_trace_enabled.pod | 292 + .../doc/man3/OSSL_trace_get_category_num.pod | 44 + .../doc/man3/OSSL_trace_set_channel.pod | 332 + .../doc/man3/OpenSSL_add_all_algorithms.pod | 63 + .../openssl/doc/man3/OpenSSL_version.pod | 250 + .../doc/man3/PEM_X509_INFO_read_bio_ex.pod | 83 + .../openssl/doc/man3/PEM_bytes_read_bio.pod | 86 + deps/openssl/openssl/doc/man3/PEM_read.pod | 132 + .../openssl/openssl/doc/man3/PEM_read_CMS.pod | 152 + .../doc/man3/PEM_read_bio_PrivateKey.pod | 584 + .../openssl/doc/man3/PEM_read_bio_ex.pod | 70 + .../doc/man3/PEM_write_bio_CMS_stream.pod | 50 + .../doc/man3/PEM_write_bio_PKCS7_stream.pod | 49 + .../openssl/doc/man3/PKCS12_PBE_keyivgen.pod | 108 + .../doc/man3/PKCS12_SAFEBAG_create_cert.pod | 100 + .../doc/man3/PKCS12_SAFEBAG_get0_attrs.pod | 50 + .../doc/man3/PKCS12_SAFEBAG_get1_cert.pod | 74 + .../doc/man3/PKCS12_add1_attr_by_NID.pod | 52 + .../doc/man3/PKCS12_add_CSPName_asc.pod | 36 + .../openssl/doc/man3/PKCS12_add_cert.pod | 81 + .../doc/man3/PKCS12_add_friendlyname_asc.pod | 52 + .../doc/man3/PKCS12_add_localkeyid.pod | 38 + .../openssl/doc/man3/PKCS12_add_safe.pod | 87 + .../openssl/doc/man3/PKCS12_create.pod | 106 + .../openssl/doc/man3/PKCS12_decrypt_skey.pod | 55 + .../openssl/doc/man3/PKCS12_gen_mac.pod | 72 + .../doc/man3/PKCS12_get_friendlyname.pod | 39 + deps/openssl/openssl/doc/man3/PKCS12_init.pod | 48 + .../doc/man3/PKCS12_item_decrypt_d2i.pod | 73 + .../doc/man3/PKCS12_key_gen_utf8_ex.pod | 138 + .../openssl/doc/man3/PKCS12_newpass.pod | 113 + .../doc/man3/PKCS12_pack_p7encdata.pod | 59 + .../openssl/openssl/doc/man3/PKCS12_parse.pod | 77 + .../openssl/doc/man3/PKCS5_PBE_keyivgen.pod | 177 + .../openssl/doc/man3/PKCS5_PBKDF2_HMAC.pod | 76 + .../openssl/doc/man3/PKCS7_decrypt.pod | 57 + .../openssl/doc/man3/PKCS7_encrypt.pod | 96 + .../doc/man3/PKCS7_get_octet_string.pod | 40 + deps/openssl/openssl/doc/man3/PKCS7_sign.pod | 132 + .../doc/man3/PKCS7_sign_add_signer.pod | 110 + .../openssl/doc/man3/PKCS7_type_is_other.pod | 42 + .../openssl/openssl/doc/man3/PKCS7_verify.pod | 141 + .../openssl/doc/man3/PKCS8_encrypt.pod | 78 + .../openssl/doc/man3/PKCS8_pkey_add1_attr.pod | 54 + deps/openssl/openssl/doc/man3/RAND_add.pod | 111 + deps/openssl/openssl/doc/man3/RAND_bytes.pod | 111 + .../openssl/openssl/doc/man3/RAND_cleanup.pod | 46 + deps/openssl/openssl/doc/man3/RAND_egd.pod | 61 + .../openssl/doc/man3/RAND_get0_primary.pod | 82 + .../openssl/doc/man3/RAND_load_file.pod | 87 + .../openssl/doc/man3/RAND_set_DRBG_type.pod | 64 + .../openssl/doc/man3/RAND_set_rand_method.pod | 86 + deps/openssl/openssl/doc/man3/RC4_set_key.pod | 78 + .../openssl/doc/man3/RIPEMD160_Init.pod | 83 + .../openssl/doc/man3/RSA_blinding_on.pod | 53 + .../openssl/doc/man3/RSA_check_key.pod | 94 + .../openssl/doc/man3/RSA_generate_key.pod | 125 + .../openssl/openssl/doc/man3/RSA_get0_key.pod | 194 + .../openssl/openssl/doc/man3/RSA_meth_new.pod | 270 + deps/openssl/openssl/doc/man3/RSA_new.pod | 56 + .../doc/man3/RSA_padding_add_PKCS1_type_1.pod | 160 + deps/openssl/openssl/doc/man3/RSA_print.pod | 77 + .../openssl/doc/man3/RSA_private_encrypt.pod | 88 + .../openssl/doc/man3/RSA_public_encrypt.pod | 117 + .../openssl/doc/man3/RSA_set_method.pod | 195 + deps/openssl/openssl/doc/man3/RSA_sign.pod | 77 + .../doc/man3/RSA_sign_ASN1_OCTET_STRING.pod | 78 + deps/openssl/openssl/doc/man3/RSA_size.pod | 65 + deps/openssl/openssl/doc/man3/SCT_new.pod | 220 + deps/openssl/openssl/doc/man3/SCT_print.pod | 57 + .../openssl/openssl/doc/man3/SCT_validate.pod | 104 + deps/openssl/openssl/doc/man3/SHA256_Init.pod | 115 + .../openssl/doc/man3/SMIME_read_ASN1.pod | 86 + .../openssl/doc/man3/SMIME_read_CMS.pod | 92 + .../openssl/doc/man3/SMIME_read_PKCS7.pod | 88 + .../openssl/doc/man3/SMIME_write_ASN1.pod | 82 + .../openssl/doc/man3/SMIME_write_CMS.pod | 69 + .../openssl/doc/man3/SMIME_write_PKCS7.pod | 70 + deps/openssl/openssl/doc/man3/SRP_Calc_B.pod | 100 + .../openssl/doc/man3/SRP_VBASE_new.pod | 108 + .../openssl/doc/man3/SRP_create_verifier.pod | 139 + .../openssl/doc/man3/SRP_user_pwd_new.pod | 77 + .../openssl/doc/man3/SSL_CIPHER_get_name.pod | 213 + .../man3/SSL_COMP_add_compression_method.pod | 106 + .../openssl/doc/man3/SSL_CONF_CTX_new.pod | 51 + .../doc/man3/SSL_CONF_CTX_set1_prefix.pod | 59 + .../doc/man3/SSL_CONF_CTX_set_flags.pod | 85 + .../doc/man3/SSL_CONF_CTX_set_ssl_ctx.pod | 57 + .../openssl/openssl/doc/man3/SSL_CONF_cmd.pod | 745 + .../openssl/doc/man3/SSL_CONF_cmd_argv.pod | 52 + .../doc/man3/SSL_CTX_add1_chain_cert.pod | 162 + .../doc/man3/SSL_CTX_add_extra_chain_cert.pod | 94 + .../openssl/doc/man3/SSL_CTX_add_session.pod | 77 + .../openssl/doc/man3/SSL_CTX_config.pod | 90 + .../openssl/openssl/doc/man3/SSL_CTX_ctrl.pod | 43 + .../openssl/doc/man3/SSL_CTX_dane_enable.pod | 383 + .../doc/man3/SSL_CTX_flush_sessions.pod | 57 + .../openssl/openssl/doc/man3/SSL_CTX_free.pod | 51 + .../openssl/doc/man3/SSL_CTX_get0_param.pod | 81 + .../doc/man3/SSL_CTX_get_verify_mode.pod | 59 + .../man3/SSL_CTX_has_client_custom_ext.pod | 37 + .../man3/SSL_CTX_load_verify_locations.pod | 181 + deps/openssl/openssl/doc/man3/SSL_CTX_new.pod | 259 + .../openssl/doc/man3/SSL_CTX_sess_number.pod | 85 + .../doc/man3/SSL_CTX_sess_set_cache_size.pod | 62 + .../doc/man3/SSL_CTX_sess_set_get_cb.pod | 123 + .../openssl/doc/man3/SSL_CTX_sessions.pod | 47 + .../openssl/doc/man3/SSL_CTX_set0_CA_list.pod | 188 + .../openssl/doc/man3/SSL_CTX_set1_curves.pod | 141 + .../openssl/doc/man3/SSL_CTX_set1_sigalgs.pod | 118 + .../man3/SSL_CTX_set1_verify_cert_store.pod | 115 + .../doc/man3/SSL_CTX_set_alpn_select_cb.pod | 197 + .../openssl/doc/man3/SSL_CTX_set_cert_cb.pod | 80 + .../doc/man3/SSL_CTX_set_cert_store.pod | 89 + .../man3/SSL_CTX_set_cert_verify_callback.pod | 106 + .../doc/man3/SSL_CTX_set_cipher_list.pod | 129 + .../doc/man3/SSL_CTX_set_client_cert_cb.pod | 110 + .../doc/man3/SSL_CTX_set_client_hello_cb.pod | 132 + .../SSL_CTX_set_ct_validation_callback.pod | 145 + .../doc/man3/SSL_CTX_set_ctlog_list_file.pod | 53 + .../man3/SSL_CTX_set_default_passwd_cb.pod | 113 + .../man3/SSL_CTX_set_generate_session_id.pod | 138 + .../doc/man3/SSL_CTX_set_info_callback.pod | 166 + .../doc/man3/SSL_CTX_set_keylog_callback.pod | 52 + .../doc/man3/SSL_CTX_set_max_cert_list.pod | 82 + .../man3/SSL_CTX_set_min_proto_version.pod | 74 + .../openssl/doc/man3/SSL_CTX_set_mode.pod | 147 + .../doc/man3/SSL_CTX_set_msg_callback.pod | 142 + .../doc/man3/SSL_CTX_set_num_tickets.pod | 96 + .../openssl/doc/man3/SSL_CTX_set_options.pod | 466 + .../man3/SSL_CTX_set_psk_client_callback.pod | 179 + .../doc/man3/SSL_CTX_set_quiet_shutdown.pod | 72 + .../doc/man3/SSL_CTX_set_read_ahead.pod | 74 + .../SSL_CTX_set_record_padding_callback.pod | 104 + .../doc/man3/SSL_CTX_set_security_level.pod | 191 + .../man3/SSL_CTX_set_session_cache_mode.pod | 146 + .../man3/SSL_CTX_set_session_id_context.pod | 92 + .../man3/SSL_CTX_set_session_ticket_cb.pod | 192 + .../man3/SSL_CTX_set_split_send_fragment.pod | 192 + .../doc/man3/SSL_CTX_set_srp_password.pod | 224 + .../doc/man3/SSL_CTX_set_ssl_version.pod | 89 + ...L_CTX_set_stateless_cookie_generate_cb.pod | 96 + .../openssl/doc/man3/SSL_CTX_set_timeout.pod | 78 + ...SSL_CTX_set_tlsext_servername_callback.pod | 179 + .../doc/man3/SSL_CTX_set_tlsext_status_cb.pod | 127 + .../man3/SSL_CTX_set_tlsext_ticket_key_cb.pod | 251 + .../doc/man3/SSL_CTX_set_tlsext_use_srtp.pod | 112 + .../doc/man3/SSL_CTX_set_tmp_dh_callback.pod | 122 + .../openssl/doc/man3/SSL_CTX_set_tmp_ecdh.pod | 50 + .../openssl/doc/man3/SSL_CTX_set_verify.pod | 373 + .../doc/man3/SSL_CTX_use_certificate.pod | 205 + .../man3/SSL_CTX_use_psk_identity_hint.pod | 156 + .../doc/man3/SSL_CTX_use_serverinfo.pod | 87 + .../openssl/doc/man3/SSL_SESSION_free.pod | 89 + .../doc/man3/SSL_SESSION_get0_cipher.pod | 58 + .../doc/man3/SSL_SESSION_get0_hostname.pod | 77 + .../doc/man3/SSL_SESSION_get0_id_context.pod | 56 + .../doc/man3/SSL_SESSION_get0_peer.pod | 38 + .../doc/man3/SSL_SESSION_get_compress_id.pod | 39 + .../man3/SSL_SESSION_get_protocol_version.pod | 56 + .../openssl/doc/man3/SSL_SESSION_get_time.pod | 76 + .../doc/man3/SSL_SESSION_has_ticket.pod | 59 + .../doc/man3/SSL_SESSION_is_resumable.pod | 44 + .../openssl/doc/man3/SSL_SESSION_print.pod | 47 + .../openssl/doc/man3/SSL_SESSION_set1_id.pod | 50 + deps/openssl/openssl/doc/man3/SSL_accept.pod | 82 + .../doc/man3/SSL_alert_type_string.pod | 242 + .../openssl/doc/man3/SSL_alloc_buffers.pod | 68 + .../openssl/doc/man3/SSL_check_chain.pod | 94 + deps/openssl/openssl/doc/man3/SSL_clear.pod | 84 + deps/openssl/openssl/doc/man3/SSL_connect.pod | 97 + .../openssl/doc/man3/SSL_do_handshake.pod | 81 + .../doc/man3/SSL_export_keying_material.pod | 91 + .../doc/man3/SSL_extension_supported.pod | 298 + deps/openssl/openssl/doc/man3/SSL_free.pod | 54 + .../openssl/doc/man3/SSL_get0_peer_scts.pod | 45 + .../openssl/doc/man3/SSL_get_SSL_CTX.pod | 35 + .../doc/man3/SSL_get_all_async_fds.pod | 89 + .../openssl/doc/man3/SSL_get_certificate.pod | 73 + .../openssl/doc/man3/SSL_get_ciphers.pod | 117 + .../doc/man3/SSL_get_client_random.pod | 104 + .../doc/man3/SSL_get_current_cipher.pod | 71 + .../doc/man3/SSL_get_default_timeout.pod | 50 + .../openssl/doc/man3/SSL_get_error.pod | 190 + .../doc/man3/SSL_get_extms_support.pod | 40 + deps/openssl/openssl/doc/man3/SSL_get_fd.pod | 53 + .../doc/man3/SSL_get_peer_cert_chain.pod | 77 + .../doc/man3/SSL_get_peer_certificate.pod | 79 + .../doc/man3/SSL_get_peer_signature_nid.pod | 53 + .../openssl/doc/man3/SSL_get_peer_tmp_key.pod | 53 + .../openssl/doc/man3/SSL_get_psk_identity.pod | 45 + .../openssl/openssl/doc/man3/SSL_get_rbio.pod | 49 + .../openssl/doc/man3/SSL_get_session.pod | 113 + .../doc/man3/SSL_get_shared_sigalgs.pod | 88 + .../doc/man3/SSL_get_verify_result.pod | 66 + .../openssl/doc/man3/SSL_get_version.pod | 111 + .../openssl/doc/man3/SSL_group_to_name.pod | 43 + deps/openssl/openssl/doc/man3/SSL_in_init.pod | 110 + .../openssl/doc/man3/SSL_key_update.pod | 111 + .../openssl/doc/man3/SSL_library_init.pod | 57 + .../doc/man3/SSL_load_client_CA_file.pod | 106 + deps/openssl/openssl/doc/man3/SSL_new.pod | 134 + deps/openssl/openssl/doc/man3/SSL_pending.pod | 69 + deps/openssl/openssl/doc/man3/SSL_read.pod | 152 + .../openssl/doc/man3/SSL_read_early_data.pod | 375 + .../openssl/doc/man3/SSL_rstate_string.pod | 68 + .../openssl/doc/man3/SSL_session_reused.pod | 54 + .../openssl/doc/man3/SSL_set1_host.pod | 119 + .../doc/man3/SSL_set_async_callback.pod | 131 + deps/openssl/openssl/doc/man3/SSL_set_bio.pod | 112 + .../doc/man3/SSL_set_connect_state.pod | 77 + deps/openssl/openssl/doc/man3/SSL_set_fd.pod | 74 + .../openssl/doc/man3/SSL_set_retry_verify.pod | 70 + .../openssl/doc/man3/SSL_set_session.pod | 71 + .../openssl/doc/man3/SSL_set_shutdown.pod | 81 + .../doc/man3/SSL_set_verify_result.pod | 47 + .../openssl/openssl/doc/man3/SSL_shutdown.pod | 177 + .../openssl/doc/man3/SSL_state_string.pod | 54 + deps/openssl/openssl/doc/man3/SSL_want.pod | 120 + deps/openssl/openssl/doc/man3/SSL_write.pod | 156 + .../openssl/doc/man3/TS_RESP_CTX_new.pod | 49 + .../doc/man3/TS_VERIFY_CTX_set_certs.pod | 61 + deps/openssl/openssl/doc/man3/UI_STRING.pod | 148 + .../openssl/doc/man3/UI_UTIL_read_pw.pod | 72 + .../openssl/doc/man3/UI_create_method.pod | 220 + deps/openssl/openssl/doc/man3/UI_new.pod | 255 + .../openssl/doc/man3/X509V3_get_d2i.pod | 246 + .../openssl/doc/man3/X509V3_set_ctx.pod | 67 + .../openssl/doc/man3/X509_ALGOR_dup.pod | 68 + .../doc/man3/X509_CRL_get0_by_serial.pod | 115 + .../doc/man3/X509_EXTENSION_set_object.pod | 96 + deps/openssl/openssl/doc/man3/X509_LOOKUP.pod | 238 + .../openssl/doc/man3/X509_LOOKUP_hash_dir.pod | 164 + .../openssl/doc/man3/X509_LOOKUP_meth_new.pod | 196 + .../doc/man3/X509_NAME_ENTRY_get_object.pod | 96 + .../doc/man3/X509_NAME_add_entry_by_txt.pod | 127 + .../openssl/doc/man3/X509_NAME_get0_der.pod | 40 + .../doc/man3/X509_NAME_get_index_by_NID.pod | 126 + .../openssl/doc/man3/X509_NAME_print_ex.pod | 132 + .../openssl/doc/man3/X509_PUBKEY_new.pod | 150 + .../openssl/doc/man3/X509_SIG_get0.pod | 40 + .../doc/man3/X509_STORE_CTX_get_error.pod | 500 + .../openssl/doc/man3/X509_STORE_CTX_new.pod | 283 + .../doc/man3/X509_STORE_CTX_set_verify_cb.pod | 222 + .../openssl/doc/man3/X509_STORE_add_cert.pod | 172 + .../doc/man3/X509_STORE_get0_param.pod | 65 + .../openssl/doc/man3/X509_STORE_new.pod | 59 + .../man3/X509_STORE_set_verify_cb_func.pod | 285 + .../doc/man3/X509_VERIFY_PARAM_set_flags.pod | 417 + .../openssl/doc/man3/X509_add_cert.pod | 76 + .../openssl/doc/man3/X509_check_ca.pod | 48 + .../openssl/doc/man3/X509_check_host.pod | 164 + .../openssl/doc/man3/X509_check_issued.pod | 46 + .../doc/man3/X509_check_private_key.pod | 54 + .../openssl/doc/man3/X509_check_purpose.pod | 78 + deps/openssl/openssl/doc/man3/X509_cmp.pod | 84 + .../openssl/doc/man3/X509_cmp_time.pod | 88 + deps/openssl/openssl/doc/man3/X509_digest.pod | 91 + deps/openssl/openssl/doc/man3/X509_dup.pod | 393 + .../doc/man3/X509_get0_distinguishing_id.pod | 73 + .../openssl/doc/man3/X509_get0_notBefore.pod | 103 + .../openssl/doc/man3/X509_get0_signature.pod | 142 + .../openssl/doc/man3/X509_get0_uids.pod | 57 + .../doc/man3/X509_get_extension_flags.pod | 209 + .../openssl/doc/man3/X509_get_pubkey.pod | 87 + .../doc/man3/X509_get_serialNumber.pod | 72 + .../doc/man3/X509_get_subject_name.pod | 126 + .../openssl/doc/man3/X509_get_version.pod | 85 + .../openssl/doc/man3/X509_load_http.pod | 68 + deps/openssl/openssl/doc/man3/X509_new.pod | 96 + deps/openssl/openssl/doc/man3/X509_sign.pod | 78 + deps/openssl/openssl/doc/man3/X509_verify.pod | 83 + .../openssl/doc/man3/X509_verify_cert.pod | 99 + .../doc/man3/X509v3_get_ext_by_NID.pod | 152 + .../openssl/doc/man3/b2i_PVK_bio_ex.pod | 69 + .../doc/man3/d2i_PKCS8PrivateKey_bio.pod | 74 + .../openssl/doc/man3/d2i_PrivateKey.pod | 135 + .../openssl/doc/man3/d2i_RSAPrivateKey.pod | 319 + .../openssl/doc/man3/d2i_SSL_SESSION.pod | 50 + deps/openssl/openssl/doc/man3/d2i_X509.pod | 605 + .../openssl/doc/man3/i2d_CMS_bio_stream.pod | 53 + .../openssl/doc/man3/i2d_PKCS7_bio_stream.pod | 53 + .../openssl/doc/man3/i2d_re_X509_tbs.pod | 88 + .../openssl/openssl/doc/man3/o2i_SCT_LIST.pod | 49 + .../openssl/doc/man3/s2i_ASN1_IA5STRING.pod | 99 + deps/openssl/openssl/doc/man5/config.pod | 585 + deps/openssl/openssl/doc/man5/fips_config.pod | 123 + .../openssl/doc/man5/x509v3_config.pod | 600 + .../openssl/doc/man7/EVP_ASYM_CIPHER-RSA.pod | 90 + .../openssl/doc/man7/EVP_ASYM_CIPHER-SM2.pod | 41 + .../openssl/doc/man7/EVP_CIPHER-AES.pod | 77 + .../openssl/doc/man7/EVP_CIPHER-ARIA.pod | 55 + .../openssl/doc/man7/EVP_CIPHER-BLOWFISH.pod | 46 + .../openssl/doc/man7/EVP_CIPHER-CAMELLIA.pod | 51 + .../openssl/doc/man7/EVP_CIPHER-CAST.pod | 45 + .../openssl/doc/man7/EVP_CIPHER-CHACHA.pod | 41 + .../openssl/doc/man7/EVP_CIPHER-DES.pod | 78 + .../openssl/doc/man7/EVP_CIPHER-IDEA.pod | 45 + .../openssl/doc/man7/EVP_CIPHER-NULL.pod | 72 + .../openssl/doc/man7/EVP_CIPHER-RC2.pod | 49 + .../openssl/doc/man7/EVP_CIPHER-RC4.pod | 43 + .../openssl/doc/man7/EVP_CIPHER-RC5.pod | 47 + .../openssl/doc/man7/EVP_CIPHER-SEED.pod | 45 + .../openssl/doc/man7/EVP_CIPHER-SM4.pod | 47 + .../openssl/openssl/doc/man7/EVP_KDF-HKDF.pod | 156 + deps/openssl/openssl/doc/man7/EVP_KDF-KB.pod | 172 + .../openssl/doc/man7/EVP_KDF-KRB5KDF.pod | 115 + .../openssl/doc/man7/EVP_KDF-PBKDF1.pod | 82 + .../openssl/doc/man7/EVP_KDF-PBKDF2.pod | 104 + .../openssl/doc/man7/EVP_KDF-PKCS12KDF.pod | 86 + .../openssl/doc/man7/EVP_KDF-SCRYPT.pod | 150 + deps/openssl/openssl/doc/man7/EVP_KDF-SS.pod | 188 + .../openssl/doc/man7/EVP_KDF-SSHKDF.pod | 161 + .../openssl/doc/man7/EVP_KDF-TLS13_KDF.pod | 132 + .../openssl/doc/man7/EVP_KDF-TLS1_PRF.pod | 114 + .../openssl/doc/man7/EVP_KDF-X942-ASN1.pod | 151 + .../openssl/doc/man7/EVP_KDF-X942-CONCAT.pod | 35 + .../openssl/openssl/doc/man7/EVP_KDF-X963.pod | 108 + deps/openssl/openssl/doc/man7/EVP_KEM-RSA.pod | 70 + .../openssl/doc/man7/EVP_KEYEXCH-DH.pod | 132 + .../openssl/doc/man7/EVP_KEYEXCH-ECDH.pod | 117 + .../openssl/doc/man7/EVP_KEYEXCH-X25519.pod | 50 + .../openssl/doc/man7/EVP_MAC-BLAKE2.pod | 90 + .../openssl/openssl/doc/man7/EVP_MAC-CMAC.pod | 86 + .../openssl/openssl/doc/man7/EVP_MAC-GMAC.pod | 83 + .../openssl/openssl/doc/man7/EVP_MAC-HMAC.pod | 100 + .../openssl/openssl/doc/man7/EVP_MAC-KMAC.pod | 152 + .../openssl/doc/man7/EVP_MAC-Poly1305.pod | 73 + .../openssl/doc/man7/EVP_MAC-Siphash.pod | 68 + .../openssl/doc/man7/EVP_MD-BLAKE2.pod | 46 + deps/openssl/openssl/doc/man7/EVP_MD-MD2.pod | 34 + deps/openssl/openssl/doc/man7/EVP_MD-MD4.pod | 34 + .../openssl/doc/man7/EVP_MD-MD5-SHA1.pod | 56 + deps/openssl/openssl/doc/man7/EVP_MD-MD5.pod | 34 + deps/openssl/openssl/doc/man7/EVP_MD-MDC2.pod | 50 + deps/openssl/openssl/doc/man7/EVP_MD-NULL.pod | 42 + .../openssl/doc/man7/EVP_MD-RIPEMD160.pod | 39 + deps/openssl/openssl/doc/man7/EVP_MD-SHA1.pod | 55 + deps/openssl/openssl/doc/man7/EVP_MD-SHA2.pod | 77 + deps/openssl/openssl/doc/man7/EVP_MD-SHA3.pod | 46 + .../openssl/openssl/doc/man7/EVP_MD-SHAKE.pod | 83 + deps/openssl/openssl/doc/man7/EVP_MD-SM3.pod | 34 + .../openssl/doc/man7/EVP_MD-WHIRLPOOL.pod | 34 + .../openssl/doc/man7/EVP_MD-common.pod | 62 + deps/openssl/openssl/doc/man7/EVP_PKEY-DH.pod | 337 + .../openssl/openssl/doc/man7/EVP_PKEY-DSA.pod | 123 + deps/openssl/openssl/doc/man7/EVP_PKEY-EC.pod | 282 + .../openssl/openssl/doc/man7/EVP_PKEY-FFC.pod | 232 + .../openssl/doc/man7/EVP_PKEY-HMAC.pod | 95 + .../openssl/openssl/doc/man7/EVP_PKEY-RSA.pod | 274 + .../openssl/openssl/doc/man7/EVP_PKEY-SM2.pod | 94 + .../openssl/doc/man7/EVP_PKEY-X25519.pod | 106 + .../openssl/doc/man7/EVP_RAND-CTR-DRBG.pod | 107 + .../openssl/doc/man7/EVP_RAND-HASH-DRBG.pod | 100 + .../openssl/doc/man7/EVP_RAND-HMAC-DRBG.pod | 103 + .../openssl/doc/man7/EVP_RAND-SEED-SRC.pod | 87 + .../openssl/doc/man7/EVP_RAND-TEST-RAND.pod | 116 + deps/openssl/openssl/doc/man7/EVP_RAND.pod | 306 + .../openssl/doc/man7/EVP_SIGNATURE-DSA.pod | 58 + .../openssl/doc/man7/EVP_SIGNATURE-ECDSA.pod | 57 + .../doc/man7/EVP_SIGNATURE-ED25519.pod | 102 + .../openssl/doc/man7/EVP_SIGNATURE-HMAC.pod | 49 + .../openssl/doc/man7/EVP_SIGNATURE-RSA.pod | 112 + .../openssl/doc/man7/OSSL_PROVIDER-FIPS.pod | 435 + .../openssl/doc/man7/OSSL_PROVIDER-base.pod | 100 + .../doc/man7/OSSL_PROVIDER-default.pod | 281 + .../openssl/doc/man7/OSSL_PROVIDER-legacy.pod | 131 + .../openssl/doc/man7/OSSL_PROVIDER-null.pod | 39 + deps/openssl/openssl/doc/man7/RAND.pod | 82 + deps/openssl/openssl/doc/man7/RSA-PSS.pod | 61 + deps/openssl/openssl/doc/man7/X25519.pod | 74 + deps/openssl/openssl/doc/man7/bio.pod | 88 + deps/openssl/openssl/doc/man7/crypto.pod | 580 + deps/openssl/openssl/doc/man7/ct.pod | 53 + deps/openssl/openssl/doc/man7/des_modes.pod | 258 + deps/openssl/openssl/doc/man7/evp.pod | 116 + deps/openssl/openssl/doc/man7/fips_module.pod | 477 + deps/openssl/openssl/doc/man7/img/cipher.png | Bin 0 -> 81349 bytes deps/openssl/openssl/doc/man7/img/digest.png | Bin 0 -> 56894 bytes deps/openssl/openssl/doc/man7/img/kdf.png | Bin 0 -> 22285 bytes deps/openssl/openssl/doc/man7/img/mac.png | Bin 0 -> 42741 bytes deps/openssl/openssl/doc/man7/img/pkey.png | Bin 0 -> 148963 bytes deps/openssl/openssl/doc/man7/img/rand.png | Bin 0 -> 30526 bytes .../openssl/doc/man7/life_cycle-cipher.pod | 370 + .../openssl/doc/man7/life_cycle-digest.pod | 221 + .../openssl/doc/man7/life_cycle-kdf.pod | 165 + .../openssl/doc/man7/life_cycle-mac.pod | 218 + .../openssl/doc/man7/life_cycle-pkey.pod | 713 + .../openssl/doc/man7/life_cycle-rand.pod | 193 + .../openssl/doc/man7/migration_guide.pod | 2463 + .../openssl/doc/man7/openssl-core.h.pod | 54 + .../doc/man7/openssl-core_dispatch.h.pod | 56 + .../openssl/doc/man7/openssl-core_names.h.pod | 49 + deps/openssl/openssl/doc/man7/openssl-env.pod | 101 + .../openssl/doc/man7/openssl-glossary.pod | 231 + .../openssl/doc/man7/openssl-threads.pod | 105 + .../doc/man7/openssl_user_macros.pod.in | 102 + .../openssl/doc/man7/ossl_store-file.pod | 71 + deps/openssl/openssl/doc/man7/ossl_store.pod | 87 + .../openssl/doc/man7/passphrase-encoding.pod | 180 + deps/openssl/openssl/doc/man7/property.pod | 177 + .../openssl/doc/man7/provider-asym_cipher.pod | 268 + .../openssl/doc/man7/provider-base.pod | 819 + .../openssl/doc/man7/provider-cipher.pod | 247 + .../openssl/doc/man7/provider-decoder.pod | 312 + .../openssl/doc/man7/provider-digest.pod | 287 + .../openssl/doc/man7/provider-encoder.pod | 331 + .../openssl/openssl/doc/man7/provider-kdf.pod | 359 + .../openssl/openssl/doc/man7/provider-kem.pod | 212 + .../openssl/doc/man7/provider-keyexch.pod | 238 + .../openssl/doc/man7/provider-keymgmt.pod | 452 + .../openssl/openssl/doc/man7/provider-mac.pod | 236 + .../openssl/doc/man7/provider-object.pod | 194 + .../openssl/doc/man7/provider-rand.pod | 302 + .../openssl/doc/man7/provider-signature.pod | 439 + .../openssl/doc/man7/provider-storemgmt.pod | 198 + deps/openssl/openssl/doc/man7/provider.pod | 264 + .../openssl/doc/man7/proxy-certificates.pod | 361 + deps/openssl/openssl/doc/man7/ssl.pod | 116 + deps/openssl/openssl/doc/man7/x509.pod | 73 + deps/openssl/openssl/doc/openssl-c-indent.el | 63 + deps/openssl/openssl/doc/perlvars.pm | 224 + deps/openssl/openssl/empty.py | 0 deps/openssl/openssl/engines/e_loader_attic.c | 6 +- deps/openssl/openssl/fuzz/build.info | 12 +- deps/openssl/openssl/fuzz/x509.c | 125 +- deps/openssl/openssl/include/crypto/x509.h | 19 +- deps/openssl/openssl/include/crypto/x509err.h | 2 +- deps/openssl/openssl/include/internal/ffc.h | 9 +- .../openssl/include/internal/refcount.h | 4 +- deps/openssl/openssl/include/openssl/bio.h.in | 2 +- deps/openssl/openssl/include/openssl/cmserr.h | 3 +- .../openssl/openssl/include/openssl/conferr.h | 1 - deps/openssl/openssl/include/openssl/dh.h | 2 +- deps/openssl/openssl/include/openssl/evp.h | 4 +- .../openssl/include/openssl/pkcs7.h.in | 6 +- deps/openssl/openssl/include/openssl/ssl.h.in | 69 - deps/openssl/openssl/include/openssl/sslerr.h | 2 - deps/openssl/openssl/include/openssl/tls1.h | 4 - .../openssl/openssl/include/openssl/x509err.h | 3 +- .../make_openssl_build_all_generated.sh | 48 + deps/openssl/openssl/ohos_lite/BUILD.gn | 45 + .../openssl/ohos_lite/crypto/cryptlib.c | 473 + .../openssl/ohos_lite/crypto/ec/curve25519.c | 5597 ++ .../openssl/ohos_lite/crypto/ec/ec_local.h | 741 + .../openssl/ohos_lite/crypto/mem_clr.c | 25 + .../openssl/ohos_lite/crypto/sha/sha512.c | 765 + deps/openssl/openssl/ohos_lite/e_os.h | 359 + .../include/crypto/__DECC_INCLUDE_EPILOGUE.H | 16 + .../include/crypto/__DECC_INCLUDE_PROLOGUE.H | 20 + .../openssl/ohos_lite/include/crypto/aria.h | 50 + .../openssl/ohos_lite/include/crypto/asn1.h | 113 + .../openssl/ohos_lite/include/crypto/async.h | 15 + .../openssl/ohos_lite/include/crypto/bn.h | 95 + .../ohos_lite/include/crypto/bn_conf.h | 90 + .../ohos_lite/include/crypto/bn_conf.h.in | 27 + .../openssl/ohos_lite/include/crypto/bn_dh.h | 24 + .../openssl/ohos_lite/include/crypto/bn_srp.h | 32 + .../openssl/ohos_lite/include/crypto/chacha.h | 42 + .../ohos_lite/include/crypto/cryptlib.h | 35 + .../openssl/ohos_lite/include/crypto/ctype.h | 82 + .../ohos_lite/include/crypto/dso_conf.h | 45 + .../ohos_lite/include/crypto/dso_conf.h.in | 31 + .../openssl/ohos_lite/include/crypto/ec.h | 53 + .../openssl/ohos_lite/include/crypto/engine.h | 20 + .../openssl/ohos_lite/include/crypto/err.h | 19 + .../openssl/ohos_lite/include/crypto/evp.h | 442 + .../openssl/ohos_lite/include/crypto/lhash.h | 15 + .../ohos_lite/include/crypto/md32_common.h | 256 + .../ohos_lite/include/crypto/objects.h | 12 + .../ohos_lite/include/crypto/poly1305.h | 21 + .../openssl/ohos_lite/include/crypto/rand.h | 144 + .../openssl/ohos_lite/include/crypto/sha.h | 19 + .../ohos_lite/include/crypto/siphash.h | 25 + .../openssl/ohos_lite/include/crypto/sm2.h | 77 + .../openssl/ohos_lite/include/crypto/sm2err.h | 65 + .../openssl/ohos_lite/include/crypto/sm3.h | 39 + .../openssl/ohos_lite/include/crypto/sm4.h | 37 + .../openssl/ohos_lite/include/crypto/store.h | 28 + .../openssl/ohos_lite/include/crypto/x509.h | 291 + .../internal/__DECC_INCLUDE_EPILOGUE.H | 16 + .../internal/__DECC_INCLUDE_PROLOGUE.H | 20 + .../openssl/ohos_lite/include/internal/bio.h | 33 + .../openssl/ohos_lite/include/internal/comp.h | 12 + .../openssl/ohos_lite/include/internal/conf.h | 30 + .../include/internal/constant_time.h | 387 + .../ohos_lite/include/internal/cryptlib.h | 99 + .../openssl/ohos_lite/include/internal/dane.h | 103 + .../openssl/ohos_lite/include/internal/dso.h | 165 + .../ohos_lite/include/internal/dsoerr.h | 82 + .../openssl/ohos_lite/include/internal/err.h | 15 + .../ohos_lite/include/internal/nelem.h | 14 + .../ohos_lite/include/internal/numbers.h | 68 + .../ohos_lite/include/internal/o_dir.h | 52 + .../ohos_lite/include/internal/o_str.h | 17 + .../ohos_lite/include/internal/refcount.h | 150 + .../ohos_lite/include/internal/sockets.h | 157 + .../ohos_lite/include/internal/sslconf.h | 20 + .../ohos_lite/include/internal/thread_once.h | 137 + .../ohos_lite/include/internal/tsan_assist.h | 144 + .../include/openssl/__DECC_INCLUDE_EPILOGUE.H | 22 + .../include/openssl/__DECC_INCLUDE_PROLOGUE.H | 26 + .../openssl/ohos_lite/include/openssl/aes.h | 92 + .../openssl/ohos_lite/include/openssl/asn1.h | 886 + .../ohos_lite/include/openssl/asn1_mac.h | 10 + .../ohos_lite/include/openssl/asn1err.h | 256 + .../openssl/ohos_lite/include/openssl/asn1t.h | 945 + .../openssl/ohos_lite/include/openssl/async.h | 76 + .../ohos_lite/include/openssl/asyncerr.h | 42 + .../openssl/ohos_lite/include/openssl/bio.h | 801 + .../ohos_lite/include/openssl/bioerr.h | 124 + .../ohos_lite/include/openssl/blowfish.h | 61 + .../openssl/ohos_lite/include/openssl/bn.h | 539 + .../openssl/ohos_lite/include/openssl/bnerr.h | 101 + .../ohos_lite/include/openssl/buffer.h | 58 + .../ohos_lite/include/openssl/buffererr.h | 34 + .../ohos_lite/include/openssl/camellia.h | 83 + .../openssl/ohos_lite/include/openssl/cast.h | 53 + .../openssl/ohos_lite/include/openssl/cmac.h | 41 + .../openssl/ohos_lite/include/openssl/cms.h | 339 + .../ohos_lite/include/openssl/cmserr.h | 202 + .../openssl/ohos_lite/include/openssl/comp.h | 53 + .../ohos_lite/include/openssl/comperr.h | 44 + .../openssl/ohos_lite/include/openssl/conf.h | 168 + .../ohos_lite/include/openssl/conf_api.h | 40 + .../ohos_lite/include/openssl/conferr.h | 76 + .../ohos_lite/include/openssl/crypto.h | 445 + .../ohos_lite/include/openssl/cryptoerr.h | 57 + .../openssl/ohos_lite/include/openssl/ct.h | 474 + .../openssl/ohos_lite/include/openssl/cterr.h | 80 + .../openssl/ohos_lite/include/openssl/des.h | 174 + .../openssl/ohos_lite/include/openssl/dh.h | 340 + .../openssl/ohos_lite/include/openssl/dherr.h | 88 + .../openssl/ohos_lite/include/openssl/dsa.h | 244 + .../ohos_lite/include/openssl/dsaerr.h | 72 + .../openssl/ohos_lite/include/openssl/dtls1.h | 55 + .../openssl/ohos_lite/include/openssl/e_os2.h | 301 + .../ohos_lite/include/openssl/ebcdic.h | 33 + .../openssl/ohos_lite/include/openssl/ec.h | 1484 + .../openssl/ohos_lite/include/openssl/ecdh.h | 10 + .../openssl/ohos_lite/include/openssl/ecdsa.h | 10 + .../openssl/ohos_lite/include/openssl/ecerr.h | 276 + .../ohos_lite/include/openssl/engine.h | 752 + .../ohos_lite/include/openssl/engineerr.h | 111 + .../openssl/ohos_lite/include/openssl/err.h | 274 + .../openssl/ohos_lite/include/openssl/evp.h | 1666 + .../ohos_lite/include/openssl/evperr.h | 204 + .../openssl/ohos_lite/include/openssl/hmac.h | 51 + .../openssl/ohos_lite/include/openssl/idea.h | 64 + .../openssl/ohos_lite/include/openssl/kdf.h | 97 + .../ohos_lite/include/openssl/kdferr.h | 55 + .../openssl/ohos_lite/include/openssl/lhash.h | 241 + .../openssl/ohos_lite/include/openssl/md2.h | 44 + .../openssl/ohos_lite/include/openssl/md4.h | 51 + .../openssl/ohos_lite/include/openssl/md5.h | 50 + .../openssl/ohos_lite/include/openssl/mdc2.h | 42 + .../openssl/ohos_lite/include/openssl/modes.h | 208 + .../ohos_lite/include/openssl/obj_mac.h | 5198 + .../ohos_lite/include/openssl/objects.h | 175 + .../ohos_lite/include/openssl/objectserr.h | 42 + .../openssl/ohos_lite/include/openssl/ocsp.h | 352 + .../ohos_lite/include/openssl/ocsperr.h | 78 + .../ohos_lite/include/openssl/opensslconf.h | 833 + .../include/openssl/opensslconf.h.in | 160 + .../ohos_lite/include/openssl/opensslv.h | 101 + .../ohos_lite/include/openssl/ossl_typ.h | 197 + .../openssl/ohos_lite/include/openssl/pem.h | 378 + .../openssl/ohos_lite/include/openssl/pem2.h | 13 + .../ohos_lite/include/openssl/pemerr.h | 105 + .../ohos_lite/include/openssl/pkcs12.h | 223 + .../ohos_lite/include/openssl/pkcs12err.h | 81 + .../openssl/ohos_lite/include/openssl/pkcs7.h | 319 + .../ohos_lite/include/openssl/pkcs7err.h | 103 + .../openssl/ohos_lite/include/openssl/rand.h | 77 + .../ohos_lite/include/openssl/rand_drbg.h | 130 + .../ohos_lite/include/openssl/randerr.h | 94 + .../openssl/ohos_lite/include/openssl/rc2.h | 51 + .../openssl/ohos_lite/include/openssl/rc4.h | 36 + .../openssl/ohos_lite/include/openssl/rc5.h | 63 + .../ohos_lite/include/openssl/ripemd.h | 47 + .../openssl/ohos_lite/include/openssl/rsa.h | 513 + .../ohos_lite/include/openssl/rsaerr.h | 167 + .../ohos_lite/include/openssl/safestack.h | 207 + .../openssl/ohos_lite/include/openssl/seed.h | 96 + .../openssl/ohos_lite/include/openssl/sha.h | 119 + .../openssl/ohos_lite/include/openssl/srp.h | 135 + .../openssl/ohos_lite/include/openssl/srtp.h | 50 + .../openssl/ohos_lite/include/openssl/ssl.h | 2438 + .../openssl/ohos_lite/include/openssl/ssl2.h | 24 + .../openssl/ohos_lite/include/openssl/ssl3.h | 342 + .../ohos_lite/include/openssl/sslerr.h | 776 + .../openssl/ohos_lite/include/openssl/stack.h | 83 + .../openssl/ohos_lite/include/openssl/store.h | 266 + .../ohos_lite/include/openssl/storeerr.h | 91 + .../ohos_lite/include/openssl/symhacks.h | 37 + .../openssl/ohos_lite/include/openssl/tls1.h | 1237 + .../openssl/ohos_lite/include/openssl/ts.h | 559 + .../openssl/ohos_lite/include/openssl/tserr.h | 132 + .../ohos_lite/include/openssl/txt_db.h | 57 + .../openssl/ohos_lite/include/openssl/ui.h | 368 + .../openssl/ohos_lite/include/openssl/uierr.h | 65 + .../ohos_lite/include/openssl/whrlpool.h | 48 + .../openssl/ohos_lite/include/openssl/x509.h | 1050 + .../ohos_lite/include/openssl/x509_vfy.h | 632 + .../ohos_lite/include/openssl/x509err.h | 129 + .../ohos_lite/include/openssl/x509v3.h | 938 + .../ohos_lite/include/openssl/x509v3err.h | 164 + .../open_harmony_openssl_config/openssl.cnf | 36 + .../openssl/providers/common/securitycheck.c | 24 +- .../openssl/providers/fips-sources.checksums | 128 +- deps/openssl/openssl/providers/fips.checksum | 2 +- .../openssl/providers/fips/self_test.c | 52 +- .../implementations/asymciphers/rsa_enc.c | 1 - .../implementations/ciphers/cipher_aes.h | 3 +- .../ciphers/cipher_aes_cbc_hmac_sha.c | 20 +- .../implementations/ciphers/cipher_aes_ccm.c | 22 +- .../implementations/ciphers/cipher_aes_gcm.c | 17 +- .../ciphers/cipher_aes_hw_s390x.inc | 12 +- .../implementations/ciphers/cipher_aes_ocb.c | 5 +- .../implementations/ciphers/cipher_aes_siv.c | 2 +- .../implementations/ciphers/cipher_aes_wrp.c | 23 +- .../implementations/ciphers/cipher_aria_ccm.c | 17 +- .../implementations/ciphers/cipher_aria_gcm.c | 17 +- .../implementations/ciphers/cipher_chacha20.c | 23 +- .../ciphers/cipher_chacha20_poly1305.c | 23 +- .../implementations/ciphers/cipher_des.c | 1 - .../ciphers/cipher_rc4_hmac_md5.c | 13 +- .../ciphers/cipher_rc4_hmac_md5.h | 5 +- .../ciphers/cipher_tdes_common.c | 1 - .../implementations/ciphers/ciphercommon.c | 33 +- .../ciphers/ciphercommon_ccm.c | 5 +- .../ciphers/ciphercommon_gcm.c | 7 +- .../implementations/digests/blake2b_prov.c | 6 +- .../implementations/digests/blake2s_prov.c | 6 +- .../encode_decode/decode_der2key.c | 6 +- .../encode_decode/decode_msblob2key.c | 22 +- .../encode_decode/decode_pvk2key.c | 21 +- .../encode_decode/encode_key2any.c | 17 +- .../encode_decode/encode_key2text.c | 65 +- .../include/prov/ciphercommon.h | 1 - .../include/prov/ciphercommon_aead.h | 7 +- .../providers/implementations/kdfs/pbkdf1.c | 8 +- .../implementations/keymgmt/dh_kmgmt.c | 5 +- .../implementations/keymgmt/dsa_kmgmt.c | 3 - .../implementations/keymgmt/ecx_kmgmt.c | 5 +- .../keymgmt/mac_legacy_kmgmt.c | 5 +- .../implementations/macs/cmac_prov.c | 6 +- .../implementations/macs/kmac_prov.c | 6 +- .../implementations/signature/rsa_sig.c | 1 - .../implementations/signature/sm2_sig.c | 9 - .../implementations/storemgmt/file_store.c | 8 +- deps/openssl/openssl/run_command.py | 33 + deps/openssl/openssl/ssl/build.info | 5 +- deps/openssl/openssl/ssl/d1_lib.c | 17 - .../openssl/openssl/ssl/record/rec_layer_s3.c | 21 +- deps/openssl/openssl/ssl/record/record.h | 1 + deps/openssl/openssl/ssl/record/ssl3_buffer.c | 2 + deps/openssl/openssl/ssl/s3_enc.c | 6 +- deps/openssl/openssl/ssl/s3_lib.c | 4 - deps/openssl/openssl/ssl/s3_msg.c | 10 - deps/openssl/openssl/ssl/ssl_ciph.c | 37 +- deps/openssl/openssl/ssl/ssl_conf.c | 24 +- deps/openssl/openssl/ssl/ssl_err.c | 4 - deps/openssl/openssl/ssl/ssl_lib.c | 153 +- deps/openssl/openssl/ssl/ssl_local.h | 61 - deps/openssl/openssl/ssl/ssl_mcnf.c | 18 +- deps/openssl/openssl/ssl/ssl_quic.c | 378 - deps/openssl/openssl/ssl/ssl_sess.c | 39 +- deps/openssl/openssl/ssl/statem/extensions.c | 77 +- .../openssl/ssl/statem/extensions_clnt.c | 112 +- .../openssl/ssl/statem/extensions_cust.c | 7 - .../openssl/ssl/statem/extensions_srvr.c | 98 +- deps/openssl/openssl/ssl/statem/statem.c | 26 +- deps/openssl/openssl/ssl/statem/statem_clnt.c | 8 - deps/openssl/openssl/ssl/statem/statem_dtls.c | 8 +- deps/openssl/openssl/ssl/statem/statem_lib.c | 43 +- .../openssl/openssl/ssl/statem/statem_local.h | 39 - deps/openssl/openssl/ssl/statem/statem_quic.c | 117 - deps/openssl/openssl/ssl/statem/statem_srvr.c | 27 +- deps/openssl/openssl/ssl/t1_enc.c | 7 +- deps/openssl/openssl/ssl/t1_lib.c | 25 +- deps/openssl/openssl/ssl/tls13_enc.c | 246 +- deps/openssl/openssl/test/CAtsa.cnf | 164 + deps/openssl/openssl/test/README-dev.md | 156 + deps/openssl/openssl/test/README-external.md | 116 + deps/openssl/openssl/test/README.md | 170 + deps/openssl/openssl/test/README.ssltest.md | 285 + deps/openssl/openssl/test/aborttest.c | 16 + deps/openssl/openssl/test/acvp_test.c | 1502 + deps/openssl/openssl/test/acvp_test.inc | 2035 + deps/openssl/openssl/test/aesgcmtest.c | 136 + deps/openssl/openssl/test/afalgtest.c | 160 + deps/openssl/openssl/test/algorithmid_test.c | 328 + deps/openssl/openssl/test/asn1_decode_test.c | 235 + .../openssl/test/asn1_dsa_internal_test.c | 184 + deps/openssl/openssl/test/asn1_encode_test.c | 908 + .../openssl/openssl/test/asn1_internal_test.c | 200 + .../openssl/test/asn1_string_table_test.c | 77 + deps/openssl/openssl/test/asn1_time_test.c | 418 + deps/openssl/openssl/test/asynciotest.c | 417 + deps/openssl/openssl/test/asynctest.c | 435 + deps/openssl/openssl/test/bad_dtls_test.c | 607 + deps/openssl/openssl/test/bftest.c | 487 + deps/openssl/openssl/test/bio_callback_test.c | 360 + deps/openssl/openssl/test/bio_core_test.c | 119 + deps/openssl/openssl/test/bio_enc_test.c | 266 + deps/openssl/openssl/test/bio_memleak_test.c | 291 + deps/openssl/openssl/test/bio_prefix_text.c | 267 + .../openssl/test/bio_readbuffer_test.c | 131 + deps/openssl/openssl/test/bioprinttest.c | 362 + deps/openssl/openssl/test/bn_internal_test.c | 105 + deps/openssl/openssl/test/bn_rand_range.h | 58 + deps/openssl/openssl/test/bntest.c | 3083 + deps/openssl/openssl/test/bntests.pl | 156 + deps/openssl/openssl/test/build.info | 959 + deps/openssl/openssl/test/ca-and-certs.cnf | 89 + deps/openssl/openssl/test/casttest.c | 118 + deps/openssl/openssl/test/certs/alt1-cert.pem | 21 + deps/openssl/openssl/test/certs/alt1-key.pem | 28 + deps/openssl/openssl/test/certs/alt2-cert.pem | 20 + deps/openssl/openssl/test/certs/alt2-key.pem | 28 + deps/openssl/openssl/test/certs/alt3-cert.pem | 21 + deps/openssl/openssl/test/certs/alt3-key.pem | 28 + .../openssl/test/certs/bad-othername-cert.pem | 20 + .../test/certs/bad-othername-namec-inter.pem | 17 + .../test/certs/bad-othername-namec-key.pem | 27 + .../test/certs/bad-othername-namec.pem | 18 + .../openssl/test/certs/bad-pc3-cert.pem | 21 + .../openssl/test/certs/bad-pc3-key.pem | 28 + .../openssl/test/certs/bad-pc4-cert.pem | 21 + .../openssl/test/certs/bad-pc4-key.pem | 28 + .../openssl/test/certs/bad-pc6-cert.pem | 21 + .../openssl/test/certs/bad-pc6-key.pem | 28 + deps/openssl/openssl/test/certs/bad.key | 27 + deps/openssl/openssl/test/certs/bad.pem | 21 + .../openssl/test/certs/badalt1-cert.pem | 20 + .../openssl/test/certs/badalt1-key.pem | 28 + .../openssl/test/certs/badalt10-cert.pem | 21 + .../openssl/test/certs/badalt10-key.pem | 28 + .../openssl/test/certs/badalt2-cert.pem | 20 + .../openssl/test/certs/badalt2-key.pem | 28 + .../openssl/test/certs/badalt3-cert.pem | 21 + .../openssl/test/certs/badalt3-key.pem | 28 + .../openssl/test/certs/badalt4-cert.pem | 21 + .../openssl/test/certs/badalt4-key.pem | 28 + .../openssl/test/certs/badalt5-cert.pem | 20 + .../openssl/test/certs/badalt5-key.pem | 28 + .../openssl/test/certs/badalt6-cert.pem | 21 + .../openssl/test/certs/badalt6-key.pem | 28 + .../openssl/test/certs/badalt7-cert.pem | 22 + .../openssl/test/certs/badalt7-key.pem | 28 + .../openssl/test/certs/badalt8-cert.pem | 21 + .../openssl/test/certs/badalt8-key.pem | 28 + .../openssl/test/certs/badalt9-cert.pem | 21 + .../openssl/test/certs/badalt9-key.pem | 28 + .../openssl/test/certs/badcn1-cert.pem | 20 + .../openssl/openssl/test/certs/badcn1-key.pem | 28 + deps/openssl/openssl/test/certs/ca+anyEKU.pem | 18 + .../openssl/test/certs/ca+clientAuth.pem | 18 + .../openssl/test/certs/ca+serverAuth.pem | 18 + deps/openssl/openssl/test/certs/ca-anyEKU.pem | 18 + .../openssl/test/certs/ca-cert-768.pem | 15 + .../openssl/test/certs/ca-cert-768i.pem | 15 + .../test/certs/ca-cert-ec-explicit.pem | 19 + .../openssl/test/certs/ca-cert-ec-named.pem | 14 + .../openssl/test/certs/ca-cert-md5-any.pem | 19 + .../openssl/test/certs/ca-cert-md5.pem | 18 + deps/openssl/openssl/test/certs/ca-cert.pem | 18 + deps/openssl/openssl/test/certs/ca-cert2.pem | 18 + .../openssl/test/certs/ca-clientAuth.pem | 18 + .../openssl/openssl/test/certs/ca-expired.pem | 18 + .../openssl/openssl/test/certs/ca-key-768.pem | 13 + .../openssl/test/certs/ca-key-ec-explicit.pem | 10 + .../openssl/test/certs/ca-key-ec-named.pem | 5 + deps/openssl/openssl/test/certs/ca-key.pem | 28 + deps/openssl/openssl/test/certs/ca-key2.pem | 28 + deps/openssl/openssl/test/certs/ca-name2.pem | 19 + deps/openssl/openssl/test/certs/ca-nonbc.pem | 18 + deps/openssl/openssl/test/certs/ca-nonca.pem | 19 + .../openssl/test/certs/ca-pol-cert.pem | 19 + .../openssl/test/certs/ca-pss-cert.pem | 21 + .../openssl/openssl/test/certs/ca-pss-key.pem | 28 + deps/openssl/openssl/test/certs/ca-root2.pem | 18 + .../openssl/test/certs/ca-serverAuth.pem | 18 + .../openssl/openssl/test/certs/cca+anyEKU.pem | 19 + .../openssl/test/certs/cca+clientAuth.pem | 19 + .../openssl/test/certs/cca+serverAuth.pem | 19 + .../openssl/openssl/test/certs/cca-anyEKU.pem | 19 + deps/openssl/openssl/test/certs/cca-cert.pem | 19 + .../openssl/test/certs/cca-clientAuth.pem | 19 + .../openssl/test/certs/cca-serverAuth.pem | 19 + .../openssl/test/certs/cert-key-cert.pem | 90 + .../test/certs/client-ed25519-cert.pem | 32 + .../openssl/test/certs/client-ed25519-key.pem | 3 + .../openssl/test/certs/client-ed448-cert.pem | 15 + .../openssl/test/certs/client-ed448-key.pem | 4 + .../openssl/test/certs/croot+anyEKU.pem | 19 + .../openssl/test/certs/croot+clientAuth.pem | 19 + .../openssl/test/certs/croot+serverAuth.pem | 19 + .../openssl/test/certs/croot-anyEKU.pem | 19 + .../openssl/openssl/test/certs/croot-cert.pem | 19 + .../openssl/test/certs/croot-clientAuth.pem | 19 + .../openssl/test/certs/croot-serverAuth.pem | 19 + deps/openssl/openssl/test/certs/cross-key.pem | 28 + .../openssl/openssl/test/certs/cross-root.pem | 18 + .../test/certs/ct-server-key-public.pem | 4 + .../openssl/test/certs/ct-server-key.pem | 5 + deps/openssl/openssl/test/certs/cyrillic.msb | 79 + deps/openssl/openssl/test/certs/cyrillic.pem | 22 + deps/openssl/openssl/test/certs/cyrillic.utf8 | 79 + .../openssl/test/certs/cyrillic_crl.pem | 13 + .../openssl/test/certs/cyrillic_crl.utf8 | 40 + deps/openssl/openssl/test/certs/dhk2048.pem | 14 + deps/openssl/openssl/test/certs/dhp2048.pem | 8 + .../test/certs/ec_privkey_with_chain.pem | 74 + .../openssl/test/certs/ee+clientAuth.pem | 20 + .../openssl/test/certs/ee+serverAuth.pem | 20 + .../openssl/test/certs/ee-cert-1024.pem | 16 + .../openssl/test/certs/ee-cert-3072.pem | 22 + .../openssl/test/certs/ee-cert-4096.pem | 25 + .../openssl/test/certs/ee-cert-768.pem | 16 + .../openssl/test/certs/ee-cert-768i.pem | 16 + .../openssl/test/certs/ee-cert-8192.pem | 35 + .../test/certs/ee-cert-crit-unknown-ext.pem | 20 + .../test/certs/ee-cert-ec-explicit.pem | 16 + .../test/certs/ee-cert-ec-named-explicit.pem | 11 + .../test/certs/ee-cert-ec-named-named.pem | 11 + .../openssl/test/certs/ee-cert-md5.pem | 19 + .../certs/ee-cert-noncrit-unknown-ext.pem | 20 + .../test/certs/ee-cert-ocsp-nocheck.pem | 20 + .../test/certs/ee-cert-policies-bad.pem | 20 + .../openssl/test/certs/ee-cert-policies.pem | 20 + deps/openssl/openssl/test/certs/ee-cert.pem | 19 + deps/openssl/openssl/test/certs/ee-cert2.pem | 19 + .../openssl/test/certs/ee-client-chain.pem | 37 + deps/openssl/openssl/test/certs/ee-client.pem | 19 + .../openssl/test/certs/ee-clientAuth.pem | 20 + .../test/certs/ee-ecdsa-client-chain.pem | 33 + .../openssl/test/certs/ee-ecdsa-key.pem | 5 + .../openssl/openssl/test/certs/ee-ed25519.pem | 38 + .../openssl/openssl/test/certs/ee-expired.pem | 19 + .../openssl/test/certs/ee-key-1024.pem | 16 + .../openssl/test/certs/ee-key-3072.pem | 40 + .../openssl/test/certs/ee-key-4096.pem | 52 + .../openssl/openssl/test/certs/ee-key-768.pem | 13 + .../openssl/test/certs/ee-key-8192.pem | 100 + .../openssl/test/certs/ee-key-ec-explicit.pem | 10 + .../test/certs/ee-key-ec-named-explicit.pem | 5 + .../test/certs/ee-key-ec-named-named.pem | 5 + deps/openssl/openssl/test/certs/ee-key.pem | 28 + deps/openssl/openssl/test/certs/ee-name2.pem | 19 + .../openssl/openssl/test/certs/ee-pathlen.pem | 18 + .../openssl/test/certs/ee-pss-cert.pem | 21 + .../openssl/test/certs/ee-pss-sha1-cert.pem | 19 + .../openssl/test/certs/ee-pss-sha256-cert.pem | 21 + .../test/certs/ee-pss-wrong1.5-cert.pem | 19 + .../openssl/test/certs/ee-self-signed.pem | 18 + .../openssl/test/certs/ee-serverAuth.pem | 20 + .../test/certs/ee-ss-with-keyCertSign.pem | 19 + .../openssl/test/certs/embeddedSCTs1-key.pem | 27 + .../openssl/test/certs/embeddedSCTs1.pem | 24 + .../openssl/test/certs/embeddedSCTs1.sct | 12 + .../openssl/test/certs/embeddedSCTs1.tlssct | Bin 0 -> 118 bytes .../test/certs/embeddedSCTs1_issuer-key.pem | 27 + .../test/certs/embeddedSCTs1_issuer.pem | 23 + .../openssl/test/certs/embeddedSCTs3.pem | 44 + .../openssl/test/certs/embeddedSCTs3.sct | 36 + .../test/certs/embeddedSCTs3_issuer.pem | 35 + deps/openssl/openssl/test/certs/ext-check.csr | 18 + deps/openssl/openssl/test/certs/fake-gp.pem | 36 + .../openssl/test/certs/goodcn1-cert.pem | 22 + .../openssl/test/certs/goodcn1-key.pem | 28 + .../openssl/test/certs/goodcn2-cert.pem | 19 + .../openssl/test/certs/goodcn2-chain.pem | 40 + .../openssl/test/certs/goodcn2-key.pem | 28 + deps/openssl/openssl/test/certs/grfc.pem | 30 + deps/openssl/openssl/test/certs/interCA.key | 27 + deps/openssl/openssl/test/certs/interCA.pem | 21 + .../openssl/test/certs/invalid-cert.pem | 19 + .../openssl/test/certs/key-pass-12345.pem | 30 + .../openssl/openssl/test/certs/leaf-chain.pem | 84 + .../openssl/test/certs/leaf-encrypted.key | 30 + deps/openssl/openssl/test/certs/leaf.key | 27 + deps/openssl/openssl/test/certs/leaf.pem | 21 + .../openssl/test/certs/many-constraints.pem | 292 + .../openssl/test/certs/many-names1.pem | 409 + .../openssl/test/certs/many-names2.pem | 251 + .../openssl/test/certs/many-names3.pem | 571 + deps/openssl/openssl/test/certs/mkcert.sh | 411 + .../openssl/openssl/test/certs/nca+anyEKU.pem | 19 + .../openssl/test/certs/nca+serverAuth.pem | 19 + deps/openssl/openssl/test/certs/ncca-cert.pem | 21 + deps/openssl/openssl/test/certs/ncca-key.pem | 28 + .../openssl/openssl/test/certs/ncca1-cert.pem | 21 + deps/openssl/openssl/test/certs/ncca1-key.pem | 28 + .../openssl/openssl/test/certs/ncca2-cert.pem | 20 + deps/openssl/openssl/test/certs/ncca2-key.pem | 28 + .../openssl/openssl/test/certs/ncca3-cert.pem | 20 + deps/openssl/openssl/test/certs/ncca3-key.pem | 28 + .../openssl/test/certs/nccaothername-cert.pem | 20 + .../openssl/test/certs/nccaothername-key.pem | 28 + .../openssl/test/certs/nroot+anyEKU.pem | 19 + .../openssl/test/certs/nroot+serverAuth.pem | 19 + .../openssl/test/certs/p256-server-cert.pem | 12 + .../openssl/test/certs/p256-server-key.pem | 5 + .../openssl/test/certs/p384-root-key.pem | 6 + deps/openssl/openssl/test/certs/p384-root.pem | 12 + .../openssl/test/certs/p384-server-cert.pem | 13 + .../openssl/test/certs/p384-server-key.pem | 6 + deps/openssl/openssl/test/certs/pathlen.pem | 22 + deps/openssl/openssl/test/certs/pc1-cert.pem | 20 + deps/openssl/openssl/test/certs/pc1-key.pem | 28 + deps/openssl/openssl/test/certs/pc2-cert.pem | 21 + deps/openssl/openssl/test/certs/pc2-key.pem | 28 + deps/openssl/openssl/test/certs/pc5-cert.pem | 21 + deps/openssl/openssl/test/certs/pc5-key.pem | 28 + deps/openssl/openssl/test/certs/pkitsta.pem | 20 + .../openssl/test/certs/root+anyEKU.pem | 18 + .../openssl/test/certs/root+clientAuth.pem | 19 + .../openssl/test/certs/root+serverAuth.pem | 19 + .../openssl/test/certs/root-anyEKU.pem | 18 + .../openssl/test/certs/root-cert-768.pem | 12 + .../openssl/test/certs/root-cert-md5.pem | 19 + .../openssl/test/certs/root-cert-rsa2.pem | 18 + deps/openssl/openssl/test/certs/root-cert.pem | 19 + .../openssl/openssl/test/certs/root-cert2.pem | 19 + .../openssl/test/certs/root-clientAuth.pem | 19 + .../openssl/test/certs/root-cross-cert.pem | 18 + .../openssl/test/certs/root-ed25519.pem | 40 + .../test/certs/root-ed25519.privkey.pem | 3 + .../test/certs/root-ed25519.pubkey.pem | 3 + .../openssl/test/certs/root-ed448-cert.pem | 11 + .../openssl/test/certs/root-ed448-key.pem | 4 + .../openssl/test/certs/root-expired.pem | 19 + .../openssl/test/certs/root-key-768.pem | 13 + deps/openssl/openssl/test/certs/root-key.pem | 28 + deps/openssl/openssl/test/certs/root-key2.pem | 28 + .../openssl/openssl/test/certs/root-name2.pem | 19 + .../openssl/openssl/test/certs/root-nonca.pem | 19 + .../openssl/test/certs/root-noserver.pem | 19 + .../openssl/test/certs/root-serverAuth.pem | 19 + .../openssl/test/certs/root2+clientAuth.pem | 19 + .../openssl/test/certs/root2+serverAuth.pem | 19 + .../openssl/test/certs/root2-serverAuth.pem | 19 + deps/openssl/openssl/test/certs/rootCA.key | 27 + deps/openssl/openssl/test/certs/rootCA.pem | 79 + deps/openssl/openssl/test/certs/rootcert.pem | 18 + deps/openssl/openssl/test/certs/rootkey.pem | 28 + deps/openssl/openssl/test/certs/roots.pem | 42 + .../openssl/openssl/test/certs/sca+anyEKU.pem | 19 + .../openssl/test/certs/sca+clientAuth.pem | 19 + .../openssl/test/certs/sca+serverAuth.pem | 19 + .../openssl/openssl/test/certs/sca-anyEKU.pem | 19 + deps/openssl/openssl/test/certs/sca-cert.pem | 19 + .../openssl/test/certs/sca-clientAuth.pem | 19 + .../openssl/test/certs/sca-serverAuth.pem | 19 + .../openssl/test/certs/server-cecdsa-cert.pem | 15 + .../openssl/test/certs/server-cecdsa-key.pem | 4 + .../openssl/test/certs/server-dsa-cert.pem | 31 + .../openssl/test/certs/server-dsa-key.pem | 15 + .../openssl/test/certs/server-dsa-pubkey.pem | 20 + .../server-ecdsa-brainpoolP256r1-cert.pem | 16 + .../server-ecdsa-brainpoolP256r1-key.pem | 5 + .../openssl/test/certs/server-ecdsa-cert.pem | 15 + .../openssl/test/certs/server-ecdsa-key.pem | 5 + .../test/certs/server-ed25519-cert.pem | 14 + .../openssl/test/certs/server-ed25519-key.pem | 3 + .../openssl/test/certs/server-ed448-cert.pem | 11 + .../openssl/test/certs/server-ed448-key.pem | 4 + .../openssl/test/certs/server-pss-cert.pem | 19 + .../openssl/test/certs/server-pss-key.pem | 28 + .../test/certs/server-pss-restrict-cert.pem | 21 + .../test/certs/server-pss-restrict-key.pem | 29 + .../openssl/test/certs/server-trusted.pem | 20 + .../openssl/openssl/test/certs/servercert.pem | 19 + deps/openssl/openssl/test/certs/serverkey.pem | 28 + deps/openssl/openssl/test/certs/setup.sh | 448 + .../openssl/test/certs/sm2-ca-cert.pem | 14 + deps/openssl/openssl/test/certs/sm2-csr.pem | 9 + deps/openssl/openssl/test/certs/sm2-root.crt | 14 + deps/openssl/openssl/test/certs/sm2-root.key | 5 + deps/openssl/openssl/test/certs/sm2.key | 5 + deps/openssl/openssl/test/certs/sm2.pem | 14 + .../openssl/test/certs/some-names1.pem | 211 + .../openssl/test/certs/some-names2.pem | 133 + .../openssl/test/certs/some-names3.pem | 293 + .../openssl/test/certs/sroot+anyEKU.pem | 19 + .../openssl/test/certs/sroot+clientAuth.pem | 19 + .../openssl/test/certs/sroot+serverAuth.pem | 19 + .../openssl/test/certs/sroot-anyEKU.pem | 19 + .../openssl/openssl/test/certs/sroot-cert.pem | 19 + .../openssl/test/certs/sroot-clientAuth.pem | 19 + .../openssl/test/certs/sroot-serverAuth.pem | 19 + .../openssl/test/certs/subinterCA-ss.pem | 21 + .../openssl/openssl/test/certs/subinterCA.key | 27 + .../openssl/openssl/test/certs/subinterCA.pem | 21 + deps/openssl/openssl/test/certs/untrusted.pem | 42 + .../openssl/test/certs/v3-certs-RC2.p12 | Bin 0 -> 1568 bytes .../openssl/test/certs/v3-certs-TDES.p12 | Bin 0 -> 1568 bytes deps/openssl/openssl/test/certs/wrongcert.pem | 19 + deps/openssl/openssl/test/certs/wrongkey.pem | 28 + .../openssl/test/certs/x509-check-key.pem | 28 + .../openssl/openssl/test/certs/x509-check.csr | 15 + .../openssl/test/chacha_internal_test.c | 190 + .../openssl/test/cipher_overhead_test.c | 62 + deps/openssl/openssl/test/cipherbytes_test.c | 149 + deps/openssl/openssl/test/cipherlist_test.c | 253 + deps/openssl/openssl/test/ciphername_test.c | 470 + deps/openssl/openssl/test/clienthellotest.c | 269 + deps/openssl/openssl/test/cmactest.c | 216 + deps/openssl/openssl/test/cmp_asn_test.c | 124 + deps/openssl/openssl/test/cmp_client_test.c | 555 + deps/openssl/openssl/test/cmp_ctx_test.c | 893 + deps/openssl/openssl/test/cmp_hdr_test.c | 494 + deps/openssl/openssl/test/cmp_msg_test.c | 598 + deps/openssl/openssl/test/cmp_protect_test.c | 619 + deps/openssl/openssl/test/cmp_server_test.c | 172 + deps/openssl/openssl/test/cmp_status_test.c | 112 + deps/openssl/openssl/test/cmp_vfy_test.c | 706 + deps/openssl/openssl/test/cms-examples.pl | 365 + deps/openssl/openssl/test/cmsapitest.c | 412 + deps/openssl/openssl/test/conf_include_test.c | 238 + deps/openssl/openssl/test/confdump.c | 51 + .../openssl/openssl/test/constant_time_test.c | 414 + .../openssl/test/context_internal_test.c | 137 + deps/openssl/openssl/test/crltest.c | 413 + deps/openssl/openssl/test/ct/log_list.cnf | 41 + deps/openssl/openssl/test/ct/tls1.sct | 12 + deps/openssl/openssl/test/ct_test.c | 527 + .../openssl/test/ctype_internal_test.c | 90 + .../openssl/test/curve448_internal_test.c | 737 + .../openssl/test/d2i-tests/bad-cms.der | 1 + .../openssl/test/d2i-tests/bad-int-pad0.der | Bin 0 -> 4 bytes .../test/d2i-tests/bad-int-padminus1.der | 1 + .../openssl/test/d2i-tests/bad_bio.der | Bin 0 -> 7 bytes .../openssl/test/d2i-tests/bad_cert.der | Bin 0 -> 1007 bytes .../test/d2i-tests/bad_generalname.der | 1 + .../openssl/test/d2i-tests/high_tag.der | Bin 0 -> 6 bytes deps/openssl/openssl/test/d2i-tests/int0.der | Bin 0 -> 3 bytes deps/openssl/openssl/test/d2i-tests/int1.der | 1 + .../openssl/test/d2i-tests/intminus1.der | 1 + deps/openssl/openssl/test/d2i_test.c | 169 + deps/openssl/openssl/test/dane-cross.in | 113 + deps/openssl/openssl/test/danetest.c | 430 + deps/openssl/openssl/test/danetest.in | 1878 + deps/openssl/openssl/test/danetest.pem | 14 + deps/openssl/openssl/test/data.bin | 3 + deps/openssl/openssl/test/data2.bin | 3 + .../openssl/openssl/test/default-and-fips.cnf | 16 + .../openssl/test/default-and-legacy.cnf | 17 + deps/openssl/openssl/test/default.cnf | 13 + deps/openssl/openssl/test/defltfips_test.c | 108 + deps/openssl/openssl/test/destest.c | 895 + deps/openssl/openssl/test/dhtest.c | 931 + deps/openssl/openssl/test/drbgtest.c | 906 + .../openssl/test/dsa_no_digest_size_test.c | 251 + deps/openssl/openssl/test/dsatest.c | 501 + deps/openssl/openssl/test/dtls_mtu_test.c | 242 + deps/openssl/openssl/test/dtlstest.c | 612 + deps/openssl/openssl/test/dtlsv1listentest.c | 357 + deps/openssl/openssl/test/ec_internal_test.c | 462 + deps/openssl/openssl/test/ecdsatest.c | 399 + deps/openssl/openssl/test/ecdsatest.h | 10214 ++ deps/openssl/openssl/test/ecstresstest.c | 156 + deps/openssl/openssl/test/ectest.c | 3044 + deps/openssl/openssl/test/endecode_test.c | 1490 + .../openssl/test/endecoder_legacy_test.c | 731 + deps/openssl/openssl/test/enginetest.c | 465 + deps/openssl/openssl/test/errtest.c | 348 + deps/openssl/openssl/test/evp_extra_test.c | 4890 + deps/openssl/openssl/test/evp_extra_test2.c | 1276 + .../openssl/test/evp_fetch_prov_test.c | 392 + deps/openssl/openssl/test/evp_kdf_test.c | 1688 + deps/openssl/openssl/test/evp_libctx_test.c | 766 + .../openssl/test/evp_pkey_ctx_new_from_name.c | 14 + .../openssl/test/evp_pkey_dparams_test.c | 324 + .../openssl/test/evp_pkey_provided_test.c | 1780 + deps/openssl/openssl/test/evp_test.c | 4138 + deps/openssl/openssl/test/exdatatest.c | 319 + deps/openssl/openssl/test/exptest.c | 337 + deps/openssl/openssl/test/ext_internal_test.c | 105 + deps/openssl/openssl/test/fake_rsaprov.c | 531 + deps/openssl/openssl/test/fake_rsaprov.h | 15 + deps/openssl/openssl/test/fatalerrtest.c | 101 + deps/openssl/openssl/test/ffc_internal_test.c | 713 + deps/openssl/openssl/test/filterprov.c | 238 + deps/openssl/openssl/test/filterprov.h | 14 + deps/openssl/openssl/test/fips-alt.cnf | 16 + deps/openssl/openssl/test/fips-and-base.cnf | 16 + deps/openssl/openssl/test/fips.cnf | 19 + deps/openssl/openssl/test/fips_version_test.c | 78 + .../openssl/test/generate_buildtest.pl | 34 + .../openssl/test/generate_ssl_tests.pl | 155 + deps/openssl/openssl/test/gmdifftest.c | 67 + .../openssl/test/helpers/cmp_testlib.c | 81 + .../openssl/test/helpers/cmp_testlib.h | 32 + deps/openssl/openssl/test/helpers/handshake.c | 1750 + deps/openssl/openssl/test/helpers/handshake.h | 98 + .../openssl/test/helpers/handshake_srp.c | 87 + deps/openssl/openssl/test/helpers/pkcs12.c | 789 + deps/openssl/openssl/test/helpers/pkcs12.h | 103 + .../test/helpers/predefined_dhparams.c | 194 + .../helpers/predefined_dhparams.h} | 19 +- .../openssl/test/helpers/ssl_test_ctx.c | 903 + .../openssl/test/helpers/ssl_test_ctx.h | 259 + .../openssl/openssl/test/helpers/ssltestlib.c | 1178 + .../openssl/openssl/test/helpers/ssltestlib.h | 61 + deps/openssl/openssl/test/hexstr_test.c | 134 + deps/openssl/openssl/test/hmactest.c | 302 + deps/openssl/openssl/test/http_test.c | 394 + deps/openssl/openssl/test/ideatest.c | 126 + deps/openssl/openssl/test/igetest.c | 462 + deps/openssl/openssl/test/insta.priv.pem | 27 + deps/openssl/openssl/test/insta_ca.cert.pem | 22 + .../openssl/test/keymgmt_internal_test.c | 358 + deps/openssl/openssl/test/legacy.cnf | 13 + deps/openssl/openssl/test/lhash_test.c | 249 + deps/openssl/openssl/test/localetest.c | 136 + .../openssl/openssl/test/mdc2_internal_test.c | 77 + deps/openssl/openssl/test/mdc2test.c | 95 + deps/openssl/openssl/test/memleaktest.c | 62 + .../openssl/test/modes_internal_test.c | 899 + deps/openssl/openssl/test/moduleloadtest.c | 53 + .../openssl/test/namemap_internal_test.c | 183 + deps/openssl/openssl/test/nodefltctxtest.c | 60 + deps/openssl/openssl/test/null.cnf | 13 + deps/openssl/openssl/test/ocsp-tests/D1.ors | 32 + .../openssl/test/ocsp-tests/D1_Cert_EE.pem | 38 + .../openssl/test/ocsp-tests/D1_Issuer_ICA.pem | 27 + deps/openssl/openssl/test/ocsp-tests/D2.ors | 32 + .../openssl/test/ocsp-tests/D2_Cert_ICA.pem | 26 + .../test/ocsp-tests/D2_Issuer_Root.pem | 21 + deps/openssl/openssl/test/ocsp-tests/D3.ors | 38 + .../openssl/test/ocsp-tests/D3_Cert_EE.pem | 31 + .../test/ocsp-tests/D3_Issuer_Root.pem | 83 + .../openssl/test/ocsp-tests/ISDOSC_D1.ors | 32 + .../openssl/test/ocsp-tests/ISDOSC_D2.ors | 32 + .../openssl/test/ocsp-tests/ISDOSC_D3.ors | 38 + .../test/ocsp-tests/ISIC_D1_Issuer_ICA.pem | 27 + .../test/ocsp-tests/ISIC_D2_Issuer_Root.pem | 21 + .../test/ocsp-tests/ISIC_D3_Issuer_Root.pem | 41 + .../test/ocsp-tests/ISIC_ND1_Issuer_ICA.pem | 29 + .../test/ocsp-tests/ISIC_ND2_Issuer_Root.pem | 23 + .../test/ocsp-tests/ISIC_ND3_Issuer_Root.pem | 25 + .../openssl/test/ocsp-tests/ISOP_D1.ors | 32 + .../openssl/test/ocsp-tests/ISOP_D2.ors | 32 + .../openssl/test/ocsp-tests/ISOP_D3.ors | 38 + .../openssl/test/ocsp-tests/ISOP_ND1.ors | 10 + .../openssl/test/ocsp-tests/ISOP_ND2.ors | 10 + .../openssl/test/ocsp-tests/ISOP_ND3.ors | 10 + deps/openssl/openssl/test/ocsp-tests/ND1.ors | 10 + .../openssl/test/ocsp-tests/ND1_Cert_EE.pem | 36 + .../test/ocsp-tests/ND1_Cross_Root.pem | 25 + .../test/ocsp-tests/ND1_Issuer_ICA-Cross.pem | 58 + .../test/ocsp-tests/ND1_Issuer_ICA.pem | 29 + deps/openssl/openssl/test/ocsp-tests/ND2.ors | 10 + .../openssl/test/ocsp-tests/ND2_Cert_ICA.pem | 29 + .../test/ocsp-tests/ND2_Issuer_Root.pem | 23 + deps/openssl/openssl/test/ocsp-tests/ND3.ors | 10 + .../openssl/test/ocsp-tests/ND3_Cert_EE.pem | 34 + .../test/ocsp-tests/ND3_Issuer_Root.pem | 25 + .../openssl/test/ocsp-tests/WIKH_D1.ors | 32 + .../openssl/test/ocsp-tests/WIKH_D2.ors | 32 + .../openssl/test/ocsp-tests/WIKH_D3.ors | 38 + .../openssl/test/ocsp-tests/WIKH_ND1.ors | 10 + .../openssl/test/ocsp-tests/WIKH_ND2.ors | 10 + .../openssl/test/ocsp-tests/WIKH_ND3.ors | 10 + .../openssl/test/ocsp-tests/WINH_D1.ors | 32 + .../openssl/test/ocsp-tests/WINH_D2.ors | 32 + .../openssl/test/ocsp-tests/WINH_D3.ors | 38 + .../openssl/test/ocsp-tests/WINH_ND1.ors | 10 + .../openssl/test/ocsp-tests/WINH_ND2.ors | 10 + .../openssl/test/ocsp-tests/WINH_ND3.ors | 10 + .../openssl/test/ocsp-tests/WKDOSC_D1.ors | 32 + .../openssl/test/ocsp-tests/WKDOSC_D2.ors | 32 + .../openssl/test/ocsp-tests/WKDOSC_D3.ors | 38 + .../test/ocsp-tests/WKIC_D1_Issuer_ICA.pem | 27 + .../test/ocsp-tests/WKIC_D2_Issuer_Root.pem | 21 + .../test/ocsp-tests/WKIC_D3_Issuer_Root.pem | 41 + .../test/ocsp-tests/WKIC_ND1_Issuer_ICA.pem | 29 + .../test/ocsp-tests/WKIC_ND2_Issuer_Root.pem | 23 + .../test/ocsp-tests/WKIC_ND3_Issuer_Root.pem | 25 + .../openssl/test/ocsp-tests/WRID_D1.ors | 32 + .../openssl/test/ocsp-tests/WRID_D2.ors | 32 + .../openssl/test/ocsp-tests/WRID_D3.ors | 38 + .../openssl/test/ocsp-tests/WRID_ND1.ors | 10 + .../openssl/test/ocsp-tests/WRID_ND2.ors | 10 + .../openssl/test/ocsp-tests/WRID_ND3.ors | 10 + .../test/ocsp-tests/WSNIC_D1_Issuer_ICA.pem | 27 + .../test/ocsp-tests/WSNIC_D2_Issuer_Root.pem | 21 + .../test/ocsp-tests/WSNIC_D3_Issuer_Root.pem | 41 + .../test/ocsp-tests/WSNIC_ND1_Issuer_ICA.pem | 29 + .../test/ocsp-tests/WSNIC_ND2_Issuer_Root.pem | 23 + .../test/ocsp-tests/WSNIC_ND3_Issuer_Root.pem | 25 + deps/openssl/openssl/test/ocspapitest.c | 236 + deps/openssl/openssl/test/ossl_store_test.c | 238 + deps/openssl/openssl/test/p_test.c | 320 + deps/openssl/openssl/test/packettest.c | 499 + deps/openssl/openssl/test/param_build_test.c | 535 + deps/openssl/openssl/test/params_api_test.c | 714 + .../openssl/test/params_conversion_test.c | 368 + deps/openssl/openssl/test/params_test.c | 668 + deps/openssl/openssl/test/pbelutest.c | 50 + deps/openssl/openssl/test/pbetest.c | 136 + .../openssl/openssl/test/pem_read_depr_test.c | 216 + deps/openssl/openssl/test/pemtest.c | 137 + .../openssl/openssl/test/pkcs12_format_test.c | 895 + deps/openssl/openssl/test/pkcs7-1.pem | 15 + deps/openssl/openssl/test/pkcs7.pem | 54 + deps/openssl/openssl/test/pkcs7_test.c | 103 + .../openssl/openssl/test/pkey_meth_kdf_test.c | 204 + deps/openssl/openssl/test/pkey_meth_test.c | 90 + deps/openssl/openssl/test/pkits-test.pl | 905 + .../openssl/test/poly1305_internal_test.c | 1575 + deps/openssl/openssl/test/property_test.c | 666 + deps/openssl/openssl/test/prov_config_test.c | 61 + deps/openssl/openssl/test/provfetchtest.c | 297 + .../openssl/test/provider_fallback_test.c | 57 + .../openssl/test/provider_internal_test.c | 147 + .../test/provider_internal_test.cnf.in | 16 + .../openssl/openssl/test/provider_pkey_test.c | 308 + .../openssl/test/provider_status_test.c | 245 + deps/openssl/openssl/test/provider_test.c | 270 + deps/openssl/openssl/test/proxy.cnf | 60 + deps/openssl/openssl/test/punycode_test.c | 220 + deps/openssl/openssl/test/rand_status_test.c | 27 + deps/openssl/openssl/test/rand_test.c | 53 + deps/openssl/openssl/test/rc2test.c | 74 + deps/openssl/openssl/test/rc4test.c | 134 + deps/openssl/openssl/test/rc5test.c | 243 + deps/openssl/openssl/test/rdrand_sanitytest.c | 122 + .../test/recipes/00-prep_fipsmodule_cnf.t | 36 + .../openssl/test/recipes/01-test_abort.t | 16 + .../test/recipes/01-test_fipsmodule_cnf.t | 37 + .../openssl/test/recipes/01-test_sanity.t | 12 + .../test/recipes/01-test_symbol_presence.t | 139 + .../openssl/test/recipes/01-test_test.t | 12 + .../openssl/test/recipes/02-test_errstr.t | 163 + .../test/recipes/02-test_internal_context.t | 16 + .../test/recipes/02-test_internal_ctype.t | 17 + .../test/recipes/02-test_internal_exts.t | 15 + .../test/recipes/02-test_internal_keymgmt.t | 21 + .../test/recipes/02-test_internal_provider.t | 19 + .../openssl/test/recipes/02-test_lhash.t | 12 + .../openssl/test/recipes/02-test_localetest.t | 26 + .../openssl/test/recipes/02-test_ordinals.t | 61 + .../test/recipes/02-test_sparse_array.t | 12 + .../openssl/test/recipes/02-test_stack.t | 12 + .../openssl/test/recipes/03-test_exdata.t | 12 + .../test/recipes/03-test_fipsinstall.t | 310 + .../test/recipes/03-test_internal_asn1.t | 16 + .../test/recipes/03-test_internal_asn1_dsa.t | 16 + .../test/recipes/03-test_internal_bn.t | 19 + .../test/recipes/03-test_internal_chacha.t | 16 + .../test/recipes/03-test_internal_curve448.t | 19 + .../test/recipes/03-test_internal_ec.t | 19 + .../test/recipes/03-test_internal_ffc.t | 11 + .../test/recipes/03-test_internal_mdc2.t | 12 + .../test/recipes/03-test_internal_modes.t | 16 + .../test/recipes/03-test_internal_namemap.t | 16 + .../test/recipes/03-test_internal_poly1305.t | 16 + .../recipes/03-test_internal_rsa_sp800_56b.t | 19 + .../test/recipes/03-test_internal_siphash.t | 16 + .../test/recipes/03-test_internal_sm2.t | 16 + .../test/recipes/03-test_internal_sm3.t | 15 + .../test/recipes/03-test_internal_sm4.t | 17 + .../recipes/03-test_internal_ssl_cert_table.t | 16 + .../test/recipes/03-test_internal_x509.t | 16 + .../openssl/test/recipes/03-test_params_api.t | 12 + .../openssl/test/recipes/03-test_property.t | 21 + .../openssl/openssl/test/recipes/03-test_ui.t | 13 + .../test/recipes/04-test_asn1_decode.t | 12 + .../test/recipes/04-test_asn1_encode.t | 12 + .../test/recipes/04-test_asn1_string_table.t | 12 + .../test/recipes/04-test_bio_callback.t | 12 + .../openssl/test/recipes/04-test_bio_core.t | 12 + .../openssl/test/recipes/04-test_bioprint.t | 12 + .../openssl/test/recipes/04-test_conf.t | 46 + .../04-test_conf_data/dollarid_off.cnf | 5 + .../04-test_conf_data/dollarid_off.txt | 4 + .../recipes/04-test_conf_data/dollarid_on.cnf | 5 + .../recipes/04-test_conf_data/dollarid_on.txt | 4 + .../test/recipes/04-test_encoder_decoder.t | 51 + .../recipes/04-test_encoder_decoder_legacy.t | 29 + .../openssl/test/recipes/04-test_err.t | 12 + .../openssl/test/recipes/04-test_hexstring.t | 15 + .../openssl/test/recipes/04-test_nodefltctx.t | 19 + .../test/recipes/04-test_param_build.t | 15 + .../openssl/test/recipes/04-test_params.t | 15 + .../test/recipes/04-test_params_conversion.t | 23 + .../native_types.txt | 343 + .../test/recipes/04-test_pem_read_depr.t | 20 + .../04-test_pem_read_depr_data/dhparams.pem | 8 + .../04-test_pem_read_depr_data/dsaparams.pem | 14 + .../dsaprivatekey.pem | 15 + .../dsapublickey.pem | 20 + .../rsaprivatekey.pem | 28 + .../rsapublickey.pem | 9 + .../04-test_pem_read_depr_data/x942params.pem | 14 + .../test/recipes/04-test_pem_reading.t | 118 + .../04-test_pem_reading_data/NOTES.txt | 3 + .../04-test_pem_reading_data/beermug.pem | 30 + .../cert-1023line.pem | 13 + .../cert-1024line.pem | 13 + .../cert-1025line.pem | 13 + .../cert-254-chars-at-the-end.pem | 6 + .../cert-254-chars-in-the-middle.pem | 5 + .../04-test_pem_reading_data/cert-255line.pem | 25 + .../04-test_pem_reading_data/cert-256line.pem | 25 + .../04-test_pem_reading_data/cert-257line.pem | 25 + .../cert-blankline.pem | 29 + .../04-test_pem_reading_data/cert-bom.pem | 28 + .../04-test_pem_reading_data/cert-comment.pem | 29 + .../cert-earlypad.pem | 28 + .../cert-extrapad.pem | 28 + .../cert-infixwhitespace.pem | 28 + .../04-test_pem_reading_data/cert-junk.pem | 29 + .../cert-leadingwhitespace.pem | 28 + .../cert-longline.pem | 28 + .../cert-misalignedpad.pem | 28 + .../cert-onecolumn.pem | 1646 + .../cert-oneline-multiple-of-254.pem | 3 + .../04-test_pem_reading_data/cert-oneline.pem | 3 + .../cert-shortandlongline.pem | 28 + .../cert-shortline.pem | 28 + .../cert-threecolumn.pem | 550 + .../cert-trailingwhitespace.pem | 28 + .../recipes/04-test_pem_reading_data/cert.pem | 28 + .../recipes/04-test_pem_reading_data/csr.pem | 21 + .../04-test_pem_reading_data/dsa-1023line.pem | 9 + .../04-test_pem_reading_data/dsa-1024line.pem | 8 + .../04-test_pem_reading_data/dsa-1025line.pem | 8 + .../04-test_pem_reading_data/dsa-255line.pem | 21 + .../04-test_pem_reading_data/dsa-256line.pem | 20 + .../04-test_pem_reading_data/dsa-257line.pem | 20 + .../dsa-blankline.pem | 24 + .../04-test_pem_reading_data/dsa-comment.pem | 24 + .../dsa-corruptedheader.pem | 23 + .../dsa-corruptiv.pem | 23 + .../04-test_pem_reading_data/dsa-earlypad.pem | 23 + .../04-test_pem_reading_data/dsa-extrapad.pem | 24 + .../dsa-infixwhitespace.pem | 23 + .../04-test_pem_reading_data/dsa-junk.pem | 24 + .../dsa-leadingwhitespace.pem | 23 + .../04-test_pem_reading_data/dsa-longline.pem | 23 + .../dsa-misalignedpad.pem | 24 + .../dsa-onecolumn.pem | 1157 + .../04-test_pem_reading_data/dsa-oneline.pem | 6 + .../dsa-onelineheader.pem | 22 + .../dsa-shortandlongline.pem | 23 + .../dsa-shortline.pem | 24 + .../dsa-threecolumn.pem | 389 + .../dsa-trailingwhitespace.pem | 23 + .../recipes/04-test_pem_reading_data/dsa.pem | 23 + .../04-test_pem_reading_data/dsaparam.pem | 14 + .../recipes/04-test_pem_reading_data/key.pem | 28 + .../04-test_pem_reading_data/wellknown | 1 + .../openssl/test/recipes/04-test_provfetch.t | 12 + .../openssl/test/recipes/04-test_provider.t | 21 + .../test/recipes/04-test_provider_fallback.t | 18 + .../test/recipes/04-test_provider_pkey.t | 18 + .../openssl/test/recipes/04-test_punycode.t | 11 + .../openssl/test/recipes/04-test_upcalls.t | 19 + .../openssl/openssl/test/recipes/05-test_bf.t | 21 + .../openssl/test/recipes/05-test_cast.t | 22 + .../openssl/test/recipes/05-test_cmac.t | 12 + .../openssl/test/recipes/05-test_des.t | 12 + .../openssl/test/recipes/05-test_hmac.t | 12 + .../openssl/test/recipes/05-test_idea.t | 12 + .../openssl/test/recipes/05-test_pbe.t | 28 + .../openssl/test/recipes/05-test_rand.t | 40 + .../openssl/test/recipes/05-test_rc2.t | 11 + .../openssl/test/recipes/05-test_rc4.t | 11 + .../openssl/test/recipes/05-test_rc5.t | 12 + .../test/recipes/06-test_algorithmid.t | 60 + .../test/recipes/06-test_rdrand_sanity.t | 22 + .../openssl/openssl/test/recipes/10-test_bn.t | 27 + .../test/recipes/10-test_bn_data/bnexp.txt | 30 + .../test/recipes/10-test_bn_data/bngcd.txt | 17179 ++++ .../test/recipes/10-test_bn_data/bnmod.txt | 2878 + .../test/recipes/10-test_bn_data/bnmul.txt | 2678 + .../test/recipes/10-test_bn_data/bnshift.txt | 2427 + .../test/recipes/10-test_bn_data/bnsum.txt | 2626 + .../openssl/test/recipes/10-test_exp.t | 12 + .../openssl/openssl/test/recipes/15-test_dh.t | 12 + .../openssl/test/recipes/15-test_dsa.t | 47 + .../openssl/test/recipes/15-test_dsaparam.t | 78 + .../invalid/p10240_q256_too_big.pem | 57 + .../invalid/p2048_q256_bad_q.pem | 14 + .../invalid/p768_q160_too_small.pem | 7 + .../valid/p1024_q160_t1862.pem | 9 + .../valid/p1024_q160_t1862_gind1.pem | 9 + .../valid/p1024_q160_t1864.pem | 9 + .../valid/p1024_q160_t1864_gind1.pem | 9 + .../valid/p1024_q224_t1862.pem | 9 + .../valid/p1024_q224_t1862_gind1.pem | 9 + .../valid/p1024_q256_t1862.pem | 9 + .../valid/p1024_q256_t1862_gind1.pem | 9 + .../valid/p2048_q160_t1862.pem | 14 + .../valid/p2048_q160_t1862_gind1.pem | 14 + .../valid/p2048_q224_t1862.pem | 14 + .../valid/p2048_q224_t1862_gind1.pem | 14 + .../valid/p2048_q224_t1864.pem | 14 + .../valid/p2048_q224_t1864_gind1.pem | 14 + .../valid/p2048_q256_t1862.pem | 14 + .../valid/p2048_q256_t1862_gind1.pem | 14 + .../valid/p2048_q256_t1864.pem | 14 + .../valid/p2048_q256_t1864_gind1.pem | 14 + .../valid/p3072_q160_t1862.pem | 19 + .../valid/p3072_q160_t1862_gind1.pem | 19 + .../valid/p3072_q224_t1862.pem | 19 + .../valid/p3072_q224_t1862_gind1.pem | 19 + .../valid/p3072_q256_t1862.pem | 19 + .../valid/p3072_q256_t1862_gind1.pem | 19 + .../valid/p3072_q256_t1864.pem | 19 + .../valid/p3072_q256_t1864_gind1.pem | 19 + .../openssl/openssl/test/recipes/15-test_ec.t | 111 + .../openssl/test/recipes/15-test_ecdsa.t | 12 + .../openssl/test/recipes/15-test_ecparam.t | 176 + .../invalid/c2pnb208w1-reducible.pem | 7 + .../invalid/nistp256-nonprime.pem | 8 + .../invalid/nistp256-offcurve.pem | 8 + .../invalid/nistp256-wrongorder.pem | 8 + .../noncanon/c2pnb163v1-explicit.pem | 6 + .../noncanon/c2pnb208w1-explicit.pem | 6 + .../noncanon/secp160k1-explicit.pem | 5 + .../noncanon/secp192k1-explicit.pem | 5 + .../noncanon/secp224k1-explicit.pem | 6 + .../noncanon/secp256k1-explicit.pem | 6 + .../noncanon/secp521r1-explicit.pem | 12 + .../noncanon/sect113r1-explicit.pem | 6 + .../noncanon/sect113r2-explicit.pem | 6 + .../noncanon/sect163k1-explicit.pem | 5 + .../noncanon/sect163r2-explicit.pem | 5 + .../noncanon/sect193r1-explicit.pem | 7 + .../noncanon/sect193r2-explicit.pem | 7 + .../noncanon/sect233k1-explicit.pem | 5 + .../noncanon/sect233r1-explicit.pem | 7 + .../noncanon/sect239k1-explicit.pem | 5 + .../noncanon/sect283k1-explicit.pem | 6 + .../noncanon/sect283r1-explicit.pem | 7 + .../noncanon/sect409k1-explicit.pem | 7 + .../noncanon/sect409r1-explicit.pem | 8 + .../noncanon/sect571k1-explicit.pem | 8 + .../noncanon/sect571r1-explicit.pem | 10 + .../wap-wsg-idm-ecid-wtls1-explicit.pem | 4 + .../wap-wsg-idm-ecid-wtls10-explicit.pem | 5 + .../wap-wsg-idm-ecid-wtls11-explicit.pem | 7 + .../wap-wsg-idm-ecid-wtls3-explicit.pem | 5 + .../wap-wsg-idm-ecid-wtls4-explicit.pem | 6 + .../wap-wsg-idm-ecid-wtls5-explicit.pem | 6 + .../wap-wsg-idm-ecid-wtls8-explicit.pem | 4 + .../wap-wsg-idm-ecid-wtls9-explicit.pem | 5 + .../valid/c2pnb163v1-named.pem | 3 + .../valid/c2pnb163v2-explicit.pem | 6 + .../valid/c2pnb163v2-named.pem | 3 + .../valid/c2pnb163v3-explicit.pem | 6 + .../valid/c2pnb163v3-named.pem | 3 + .../valid/c2pnb176v1-explicit.pem | 6 + .../valid/c2pnb176v1-named.pem | 3 + .../valid/c2pnb208w1-named.pem | 3 + .../valid/c2pnb272w1-explicit.pem | 7 + .../valid/c2pnb272w1-named.pem | 3 + .../valid/c2pnb304w1-explicit.pem | 8 + .../valid/c2pnb304w1-named.pem | 3 + .../valid/c2pnb368w1-explicit.pem | 9 + .../valid/c2pnb368w1-named.pem | 3 + .../valid/c2tnb191v1-explicit.pem | 7 + .../valid/c2tnb191v1-named.pem | 3 + .../valid/c2tnb191v2-explicit.pem | 7 + .../valid/c2tnb191v2-named.pem | 3 + .../valid/c2tnb191v3-explicit.pem | 7 + .../valid/c2tnb191v3-named.pem | 3 + .../valid/c2tnb239v1-explicit.pem | 7 + .../valid/c2tnb239v1-named.pem | 3 + .../valid/c2tnb239v2-explicit.pem | 7 + .../valid/c2tnb239v2-named.pem | 3 + .../valid/c2tnb239v3-explicit.pem | 7 + .../valid/c2tnb239v3-named.pem | 3 + .../valid/c2tnb359v1-explicit.pem | 9 + .../valid/c2tnb359v1-named.pem | 3 + .../valid/c2tnb431r1-explicit.pem | 9 + .../valid/c2tnb431r1-named.pem | 3 + .../valid/prime192v1-explicit.pem | 7 + .../valid/prime192v1-named.pem | 3 + .../valid/prime192v2-explicit.pem | 7 + .../valid/prime192v2-named.pem | 3 + .../valid/prime192v3-explicit.pem | 7 + .../valid/prime192v3-named.pem | 3 + .../valid/prime239v1-explicit.pem | 7 + .../valid/prime239v1-named.pem | 3 + .../valid/prime239v2-explicit.pem | 7 + .../valid/prime239v2-named.pem | 3 + .../valid/prime239v3-explicit.pem | 7 + .../valid/prime239v3-named.pem | 3 + .../valid/prime256v1-explicit.pem | 8 + .../valid/prime256v1-named.pem | 3 + .../valid/secp112r1-explicit.pem | 5 + .../valid/secp112r1-named.pem | 3 + .../valid/secp112r2-explicit.pem | 5 + .../valid/secp112r2-named.pem | 3 + .../valid/secp128r1-explicit.pem | 6 + .../valid/secp128r1-named.pem | 3 + .../valid/secp128r2-explicit.pem | 6 + .../valid/secp128r2-named.pem | 3 + .../valid/secp160k1-named.pem | 3 + .../valid/secp160r1-explicit.pem | 6 + .../valid/secp160r1-named.pem | 3 + .../valid/secp160r2-explicit.pem | 6 + .../valid/secp160r2-named.pem | 3 + .../valid/secp192k1-named.pem | 3 + .../valid/secp224k1-named.pem | 3 + .../valid/secp224r1-explicit.pem | 7 + .../valid/secp224r1-named.pem | 3 + .../valid/secp256k1-named.pem | 3 + .../valid/secp384r1-explicit.pem | 10 + .../valid/secp384r1-named.pem | 3 + .../valid/secp521r1-named.pem | 3 + .../valid/sect113r1-named.pem | 3 + .../valid/sect113r2-named.pem | 3 + .../valid/sect131r1-explicit.pem | 6 + .../valid/sect131r1-named.pem | 3 + .../valid/sect131r2-explicit.pem | 6 + .../valid/sect131r2-named.pem | 3 + .../valid/sect163k1-named.pem | 3 + .../valid/sect163r1-explicit.pem | 6 + .../valid/sect163r1-named.pem | 3 + .../valid/sect163r2-named.pem | 3 + .../valid/sect193r1-named.pem | 3 + .../valid/sect193r2-named.pem | 3 + .../valid/sect233k1-named.pem | 3 + .../valid/sect233r1-named.pem | 3 + .../valid/sect239k1-named.pem | 3 + .../valid/sect283k1-named.pem | 3 + .../valid/sect283r1-named.pem | 3 + .../valid/sect409k1-named.pem | 3 + .../valid/sect409r1-named.pem | 3 + .../valid/sect571k1-named.pem | 3 + .../valid/sect571r1-named.pem | 3 + .../valid/wap-wsg-idm-ecid-wtls1-named.pem | 3 + .../valid/wap-wsg-idm-ecid-wtls10-named.pem | 3 + .../valid/wap-wsg-idm-ecid-wtls11-named.pem | 3 + .../wap-wsg-idm-ecid-wtls12-explicit.pem | 7 + .../valid/wap-wsg-idm-ecid-wtls12-named.pem | 3 + .../valid/wap-wsg-idm-ecid-wtls3-named.pem | 3 + .../valid/wap-wsg-idm-ecid-wtls4-named.pem | 3 + .../valid/wap-wsg-idm-ecid-wtls5-named.pem | 3 + .../valid/wap-wsg-idm-ecid-wtls6-explicit.pem | 5 + .../valid/wap-wsg-idm-ecid-wtls6-named.pem | 3 + .../valid/wap-wsg-idm-ecid-wtls7-explicit.pem | 6 + .../valid/wap-wsg-idm-ecid-wtls7-named.pem | 3 + .../valid/wap-wsg-idm-ecid-wtls8-named.pem | 3 + .../valid/wap-wsg-idm-ecid-wtls9-named.pem | 3 + .../openssl/test/recipes/15-test_gendh.t | 69 + .../openssl/test/recipes/15-test_gendhparam.t | 178 + .../openssl/test/recipes/15-test_gendsa.t | 136 + .../openssl/test/recipes/15-test_genec.t | 306 + .../openssl/test/recipes/15-test_genrsa.t | 150 + .../openssl/test/recipes/15-test_mp_rsa.t | 126 + .../recipes/15-test_mp_rsa_data/plain_text | 4 + .../recipes/15-test_mp_rsa_data/rsamplcm.pem | 55 + .../openssl/test/recipes/15-test_out_option.t | 73 + .../openssl/test/recipes/15-test_rsa.t | 74 + .../openssl/test/recipes/15-test_rsaoaep.t | 161 + .../recipes/15-test_rsaoaep_data/plain_text | 1 + .../openssl/test/recipes/15-test_rsapss.t | 89 + .../15-test_rsapss_data/negativesaltlen.pem | 29 + .../openssl/test/recipes/15-test_sha.t | 12 + .../openssl/test/recipes/20-test_app.t | 31 + .../openssl/test/recipes/20-test_cli_fips.t | 401 + .../openssl/test/recipes/20-test_dgst.t | 249 + .../openssl/test/recipes/20-test_dhparam.t | 207 + .../test/recipes/20-test_dhparam_check.t | 91 + .../invalid/dh_p1024_t1862_pkcs3.pem | 8 + .../invalid/dh_p2048_t1862_pkcs3.pem | 13 + .../invalid/dh_p2048_t1864_pkcs3.pem | 13 + .../invalid/dh_p3072_t1862_pkcs3.pem | 19 + .../valid/dh_5114_1.pem | 8 + .../valid/dh_5114_2.pem | 14 + .../valid/dh_5114_3.pem | 14 + .../valid/dh_ffdhe2048.pem | 8 + .../valid/dhx_5114_2.pem | 14 + .../valid/dhx_ffdhe2048.pem | 13 + .../valid/dhx_p1024_q160_t1862.pem | 9 + .../valid/dhx_p1024_q160_t1864.pem | 9 + .../valid/dhx_p1024_q224_t1862.pem | 9 + .../valid/dhx_p1024_q256_t1862.pem | 10 + .../valid/dhx_p2048_q160_t1862.pem | 15 + .../valid/dhx_p2048_q224_t1862.pem | 15 + .../valid/dhx_p2048_q224_t1864.pem | 15 + .../valid/dhx_p2048_q256_t1862.pem | 15 + .../valid/dhx_p2048_q256_t1864.pem | 15 + .../valid/dhx_p3072_q160_t1862.pem | 20 + .../valid/dhx_p3072_q224_t1862.pem | 20 + .../valid/dhx_p3072_q256_t1862.pem | 20 + .../20-test_dhparam_data/pkcs3-2-1024.der | Bin 0 -> 138 bytes .../20-test_dhparam_data/pkcs3-2-1024.pem | 5 + .../20-test_dhparam_data/pkcs3-2-2048.der | Bin 0 -> 268 bytes .../20-test_dhparam_data/pkcs3-2-2048.pem | 8 + .../20-test_dhparam_data/pkcs3-5-1024.der | Bin 0 -> 138 bytes .../20-test_dhparam_data/pkcs3-5-1024.pem | 5 + .../20-test_dhparam_data/x942-0-1024.der | Bin 0 -> 319 bytes .../20-test_dhparam_data/x942-0-1024.pem | 9 + .../openssl/test/recipes/20-test_enc.t | 75 + .../openssl/test/recipes/20-test_enc_more.t | 66 + .../openssl/test/recipes/20-test_kdf.t | 112 + .../test/recipes/20-test_legacy_okay.t | 23 + .../openssl/test/recipes/20-test_mac.t | 224 + .../openssl/test/recipes/20-test_passwd.t | 135 + .../openssl/test/recipes/20-test_pkeyutl.t | 189 + .../test/recipes/20-test_rand_config.t | 103 + .../openssl/test/recipes/20-test_spkac.t | 41 + .../openssl/test/recipes/25-test_crl.t | 72 + .../openssl/test/recipes/25-test_d2i.t | 93 + .../openssl/test/recipes/25-test_eai_data.t | 72 + .../recipes/25-test_eai_data/ascii_chain.pem | 53 + .../recipes/25-test_eai_data/ascii_leaf.pem | 28 + .../test/recipes/25-test_eai_data/san.ascii | 2 + .../test/recipes/25-test_eai_data/san.utf8 | 2 + .../recipes/25-test_eai_data/utf8_chain.pem | 53 + .../recipes/25-test_eai_data/utf8_leaf.pem | 28 + .../openssl/test/recipes/25-test_pkcs7.t | 32 + .../25-test_pkcs7_data/malformed.pkcs7 | 3 + .../openssl/test/recipes/25-test_req.t | 475 + .../openssl/test/recipes/25-test_rusext.t | 33 + .../test/recipes/25-test_rusext_data/grfc.msb | 67 + .../recipes/25-test_rusext_data/grfc.utf8 | 67 + .../openssl/test/recipes/25-test_sid.t | 29 + .../openssl/test/recipes/25-test_verify.t | 529 + .../test/recipes/25-test_verify_store.t | 117 + .../openssl/test/recipes/25-test_x509.t | 203 + .../openssl/test/recipes/30-test_acvp.t | 30 + .../openssl/test/recipes/30-test_aesgcm.t | 12 + .../openssl/test/recipes/30-test_afalg.t | 21 + .../openssl/test/recipes/30-test_defltfips.t | 48 + .../recipes/30-test_defltfips/fipsmodule.cnf | 7 + .../openssl/test/recipes/30-test_engine.t | 25 + .../openssl/test/recipes/30-test_evp.t | 193 + .../30-test_evp_data/evpciph_aes_ccm_cavs.txt | 23927 +++++ .../30-test_evp_data/evpciph_aes_common.txt | 1305 + .../30-test_evp_data/evpciph_aes_cts.txt | 390 + .../30-test_evp_data/evpciph_aes_ocb.txt | 259 + .../30-test_evp_data/evpciph_aes_siv.txt | 44 + .../30-test_evp_data/evpciph_aes_stitched.txt | 126 + .../30-test_evp_data/evpciph_aes_wrap.txt | 174 + .../recipes/30-test_evp_data/evpciph_aria.txt | 261 + .../recipes/30-test_evp_data/evpciph_bf.txt | 68 + .../30-test_evp_data/evpciph_camellia.txt | 686 + .../30-test_evp_data/evpciph_camellia_cts.txt | 141 + .../30-test_evp_data/evpciph_cast5.txt | 448 + .../30-test_evp_data/evpciph_chacha.txt | 208 + .../recipes/30-test_evp_data/evpciph_des.txt | 100 + .../30-test_evp_data/evpciph_des3_common.txt | 37 + .../recipes/30-test_evp_data/evpciph_idea.txt | 652 + .../recipes/30-test_evp_data/evpciph_rc2.txt | 126 + .../recipes/30-test_evp_data/evpciph_rc4.txt | 78 + .../30-test_evp_data/evpciph_rc4_stitched.txt | 22 + .../recipes/30-test_evp_data/evpciph_rc5.txt | 129 + .../recipes/30-test_evp_data/evpciph_seed.txt | 405 + .../recipes/30-test_evp_data/evpciph_sm4.txt | 38 + .../recipes/30-test_evp_data/evpencod.txt | 192 + .../recipes/30-test_evp_data/evpkdf_hkdf.txt | 215 + .../recipes/30-test_evp_data/evpkdf_krb5.txt | 131 + .../30-test_evp_data/evpkdf_pbkdf1.txt | 136 + .../30-test_evp_data/evpkdf_pbkdf2.txt | 157 + .../30-test_evp_data/evpkdf_scrypt.txt | 63 + .../recipes/30-test_evp_data/evpkdf_ss.txt | 1121 + .../recipes/30-test_evp_data/evpkdf_ssh.txt | 4867 + .../30-test_evp_data/evpkdf_tls11_prf.txt | 37 + .../30-test_evp_data/evpkdf_tls12_prf.txt | 46 + .../30-test_evp_data/evpkdf_tls13_kdf.txt | 4937 + .../recipes/30-test_evp_data/evpkdf_x942.txt | 99 + .../30-test_evp_data/evpkdf_x942_des.txt | 26 + .../recipes/30-test_evp_data/evpkdf_x963.txt | 112 + .../recipes/30-test_evp_data/evpmac_blake.txt | 250 + .../30-test_evp_data/evpmac_cmac_des.txt | 28 + .../30-test_evp_data/evpmac_common.txt | 499 + .../30-test_evp_data/evpmac_poly1305.txt | 332 + .../30-test_evp_data/evpmac_siphash.txt | 193 + .../recipes/30-test_evp_data/evpmac_sm3.txt | 38 + .../recipes/30-test_evp_data/evpmd_blake.txt | 91 + .../recipes/30-test_evp_data/evpmd_md.txt | 125 + .../recipes/30-test_evp_data/evpmd_mdc2.txt | 26 + .../recipes/30-test_evp_data/evpmd_ripemd.txt | 54 + .../recipes/30-test_evp_data/evpmd_sha.txt | 293 + .../recipes/30-test_evp_data/evpmd_sm3.txt | 61 + .../30-test_evp_data/evpmd_whirlpool.txt | 60 + .../30-test_evp_data/evppbe_pbkdf2.txt | 163 + .../30-test_evp_data/evppbe_pkcs12.txt | 62 + .../30-test_evp_data/evppbe_scrypt.txt | 52 + .../30-test_evp_data/evppkey_brainpool.txt | 1360 + .../recipes/30-test_evp_data/evppkey_dh.txt | 167 + .../recipes/30-test_evp_data/evppkey_dsa.txt | 324 + .../recipes/30-test_evp_data/evppkey_ecc.txt | 4501 + .../recipes/30-test_evp_data/evppkey_ecdh.txt | 3626 + .../30-test_evp_data/evppkey_ecdsa.txt | 230 + .../recipes/30-test_evp_data/evppkey_ecx.txt | 582 + .../30-test_evp_data/evppkey_ffdhe.txt | 593 + .../recipes/30-test_evp_data/evppkey_kas.txt | 11667 +++ .../30-test_evp_data/evppkey_kdf_hkdf.txt | 195 + .../30-test_evp_data/evppkey_kdf_scrypt.txt | 63 + .../30-test_evp_data/evppkey_kdf_tls1_prf.txt | 71 + .../30-test_evp_data/evppkey_mismatch.txt | 85 + .../recipes/30-test_evp_data/evppkey_rsa.txt | 618 + .../30-test_evp_data/evppkey_rsa_common.txt | 1375 + .../recipes/30-test_evp_data/evppkey_sm2.txt | 85 + .../test/recipes/30-test_evp_data/evprand.txt | 79394 ++++++++++++++++ .../openssl/test/recipes/30-test_evp_extra.t | 24 + .../test/recipes/30-test_evp_fetch_prov.t | 127 + .../openssl/test/recipes/30-test_evp_kdf.t | 13 + .../openssl/test/recipes/30-test_evp_libctx.t | 46 + .../test/recipes/30-test_evp_pkey_dparam.t | 11 + .../test/recipes/30-test_evp_pkey_provided.t | 19 + .../30-test_evp_pkey_provided/DH.priv.der | Bin 0 -> 327 bytes .../30-test_evp_pkey_provided/DH.priv.pem | 9 + .../30-test_evp_pkey_provided/DH.priv.txt | 25 + .../30-test_evp_pkey_provided/DH.pub.der | Bin 0 -> 557 bytes .../30-test_evp_pkey_provided/DH.pub.pem | 14 + .../30-test_evp_pkey_provided/DH.pub.txt | 22 + .../30-test_evp_pkey_provided/DSA.priv.der | Bin 0 -> 617 bytes .../30-test_evp_pkey_provided/DSA.priv.pem | 15 + .../30-test_evp_pkey_provided/DSA.priv.txt | 72 + .../30-test_evp_pkey_provided/DSA.pub.der | Bin 0 -> 842 bytes .../30-test_evp_pkey_provided/DSA.pub.pem | 20 + .../30-test_evp_pkey_provided/DSA.pub.txt | 68 + .../30-test_evp_pkey_provided/EC.priv.der | Bin 0 -> 138 bytes .../30-test_evp_pkey_provided/EC.priv.pem | 5 + .../30-test_evp_pkey_provided/EC.priv.txt | 13 + .../30-test_evp_pkey_provided/EC.pub.der | Bin 0 -> 91 bytes .../30-test_evp_pkey_provided/EC.pub.pem | 4 + .../30-test_evp_pkey_provided/EC.pub.txt | 9 + .../ED25519.priv.der | Bin 0 -> 48 bytes .../ED25519.priv.pem | 3 + .../ED25519.priv.txt | 9 + .../30-test_evp_pkey_provided/ED25519.pub.der | Bin 0 -> 44 bytes .../30-test_evp_pkey_provided/ED25519.pub.pem | 3 + .../30-test_evp_pkey_provided/ED25519.pub.txt | 5 + .../30-test_evp_pkey_provided/ED448.priv.der | Bin 0 -> 73 bytes .../30-test_evp_pkey_provided/ED448.priv.pem | 4 + .../30-test_evp_pkey_provided/ED448.priv.txt | 11 + .../30-test_evp_pkey_provided/ED448.pub.der | Bin 0 -> 69 bytes .../30-test_evp_pkey_provided/ED448.pub.pem | 4 + .../30-test_evp_pkey_provided/ED448.pub.txt | 6 + .../30-test_evp_pkey_provided/RSA.priv.der | Bin 0 -> 70 bytes .../30-test_evp_pkey_provided/RSA.priv.pem | 4 + .../30-test_evp_pkey_provided/RSA.priv.txt | 9 + .../30-test_evp_pkey_provided/RSA.pub.der | Bin 0 -> 34 bytes .../30-test_evp_pkey_provided/RSA.pub.pem | 3 + .../30-test_evp_pkey_provided/RSA.pub.txt | 3 + .../30-test_evp_pkey_provided/X25519.priv.der | Bin 0 -> 48 bytes .../30-test_evp_pkey_provided/X25519.priv.pem | 3 + .../30-test_evp_pkey_provided/X25519.priv.txt | 9 + .../30-test_evp_pkey_provided/X25519.pub.der | Bin 0 -> 44 bytes .../30-test_evp_pkey_provided/X25519.pub.pem | 3 + .../30-test_evp_pkey_provided/X25519.pub.txt | 5 + .../30-test_evp_pkey_provided/X448.priv.der | Bin 0 -> 72 bytes .../30-test_evp_pkey_provided/X448.priv.pem | 4 + .../30-test_evp_pkey_provided/X448.priv.txt | 11 + .../30-test_evp_pkey_provided/X448.pub.der | Bin 0 -> 68 bytes .../30-test_evp_pkey_provided/X448.pub.pem | 4 + .../30-test_evp_pkey_provided/X448.pub.txt | 6 + .../openssl/test/recipes/30-test_pbelu.t | 12 + .../openssl/test/recipes/30-test_pkey_meth.t | 12 + .../test/recipes/30-test_pkey_meth_kdf.t | 12 + .../test/recipes/30-test_prov_config.t | 32 + .../test/recipes/30-test_provider_status.t | 49 + .../openssl/test/recipes/40-test_rehash.t | 98 + .../recipes/60-test_x509_check_cert_pkey.t | 65 + .../test/recipes/60-test_x509_dup_cert.t | 17 + .../openssl/test/recipes/60-test_x509_store.t | 53 + .../openssl/test/recipes/60-test_x509_time.t | 12 + .../openssl/test/recipes/61-test_bio_prefix.t | 55 + .../recipes/61-test_bio_prefix_data/args1.pl | 6 + .../recipes/61-test_bio_prefix_data/args2.pl | 3 + .../recipes/61-test_bio_prefix_data/in1.txt | 1 + .../recipes/61-test_bio_prefix_data/in2.txt | 1 + .../recipes/61-test_bio_prefix_data/out1.txt | 1 + .../recipes/61-test_bio_prefix_data/out2.txt | 1 + .../test/recipes/61-test_bio_readbuffer.t | 29 + .../openssl/test/recipes/65-test_cmp_asn.t | 22 + .../openssl/test/recipes/65-test_cmp_client.t | 42 + .../65-test_cmp_client_data/client.crt | 13 + .../65-test_cmp_client_data/client.csr | Bin 0 -> 424 bytes .../65-test_cmp_client_data/client.key | 7 + .../65-test_cmp_client_data/server.crt | 17 + .../65-test_cmp_client_data/server.key | 27 + .../openssl/test/recipes/65-test_cmp_ctx.t | 24 + .../openssl/test/recipes/65-test_cmp_hdr.t | 22 + .../openssl/test/recipes/65-test_cmp_msg.t | 41 + .../test/recipes/65-test_cmp_msg_data/new.key | 28 + .../recipes/65-test_cmp_msg_data/pkcs10.der | Bin 0 -> 615 bytes .../recipes/65-test_cmp_msg_data/server.crt | 17 + .../test/recipes/65-test_cmp_protect.t | 51 + .../65-test_cmp_protect_data/EndEntity1.crt | 16 + .../65-test_cmp_protect_data/EndEntity2.crt | 13 + .../65-test_cmp_protect_data/IP_PBM.der | Bin 0 -> 2107 bytes .../65-test_cmp_protect_data/IP_PBM.txt | 1 + .../65-test_cmp_protect_data/IR_protected.der | Bin 0 -> 968 bytes .../IR_unprotected.der | Bin 0 -> 838 bytes .../Intermediate_CA.crt | 12 + .../65-test_cmp_protect_data/Root_CA.crt | 17 + .../65-test_cmp_protect_data/server.crt | 17 + .../65-test_cmp_protect_data/server.pem | 27 + .../openssl/test/recipes/65-test_cmp_server.t | 40 + .../CR_protected_PBM_1234.der | Bin 0 -> 420 bytes .../openssl/test/recipes/65-test_cmp_status.t | 22 + .../openssl/test/recipes/65-test_cmp_vfy.t | 51 + .../65-test_cmp_vfy_data/EndEntity1.crt | 16 + .../65-test_cmp_vfy_data/EndEntity2.crt | 13 + .../IP_waitingStatus_PBM.der | Bin 0 -> 1801 bytes .../IP_waitingStatus_PBM.txt | 2 + .../65-test_cmp_vfy_data/IR_protected.der | Bin 0 -> 968 bytes .../IR_protected_0_extraCerts.der | Bin 0 -> 1087 bytes .../IR_protected_2_extraCerts.der | Bin 0 -> 2833 bytes .../65-test_cmp_vfy_data/IR_rmprotection.der | Bin 0 -> 1098 bytes .../65-test_cmp_vfy_data/IR_unprotected.der | Bin 0 -> 838 bytes .../65-test_cmp_vfy_data/Intermediate_CA.crt | 12 + .../recipes/65-test_cmp_vfy_data/Root_CA.crt | 17 + .../recipes/65-test_cmp_vfy_data/chain.txt | 4 + .../recipes/65-test_cmp_vfy_data/client.crt | 17 + .../65-test_cmp_vfy_data/insta.cert.pem | 25 + .../65-test_cmp_vfy_data/insta.priv.pem | 27 + .../65-test_cmp_vfy_data/insta_ca.cert.pem | 22 + .../recipes/65-test_cmp_vfy_data/server.crt | 17 + .../recipes/65-test_cmp_vfy_data/server.key | 27 + .../openssl/test/recipes/66-test_ossl_store.t | 22 + .../66-test_ossl_store_data/DH-params.pem | 8 + .../66-test_ossl_store_data/DHX-params.pem | 14 + .../66-test_ossl_store_data/DSA-params.pem | 14 + .../openssl/test/recipes/70-test_asyncio.t | 21 + .../openssl/test/recipes/70-test_bad_dtls.t | 20 + .../test/recipes/70-test_clienthello.t | 25 + .../openssl/test/recipes/70-test_comp.t | 110 + .../openssl/test/recipes/70-test_key_share.t | 475 + .../openssl/test/recipes/70-test_packet.t | 12 + .../openssl/test/recipes/70-test_recordlen.t | 21 + .../test/recipes/70-test_renegotiation.t | 151 + .../openssl/test/recipes/70-test_servername.t | 26 + .../test/recipes/70-test_sslcbcpadding.t | 133 + .../test/recipes/70-test_sslcertstatus.t | 67 + .../test/recipes/70-test_sslextension.t | 270 + .../test/recipes/70-test_sslmessages.t | 430 + .../openssl/test/recipes/70-test_sslrecords.t | 721 + .../test/recipes/70-test_sslsessiontick.t | 273 + .../openssl/test/recipes/70-test_sslsigalgs.t | 496 + .../test/recipes/70-test_sslsignature.t | 146 + .../test/recipes/70-test_sslskewith0p.t | 66 + .../test/recipes/70-test_sslversions.t | 190 + .../openssl/test/recipes/70-test_sslvertol.t | 138 + .../test/recipes/70-test_tls13alerts.t | 56 + .../test/recipes/70-test_tls13cookie.t | 121 + .../test/recipes/70-test_tls13downgrade.t | 129 + .../openssl/test/recipes/70-test_tls13hrr.t | 148 + .../test/recipes/70-test_tls13kexmodes.t | 375 + .../test/recipes/70-test_tls13messages.t | 392 + .../openssl/test/recipes/70-test_tls13psk.t | 159 + .../openssl/test/recipes/70-test_tlsextms.t | 257 + .../test/recipes/70-test_verify_extra.t | 17 + .../openssl/test/recipes/70-test_wpacket.t | 20 + .../openssl/test/recipes/71-test_ssl_ctx.t | 16 + .../openssl/test/recipes/79-test_http.t | 28 + .../openssl/openssl/test/recipes/80-test_ca.t | 287 + .../test/recipes/80-test_ca_data/revoked.key | 27 + .../test/recipes/80-test_cipherbytes.t | 26 + .../openssl/test/recipes/80-test_cipherlist.t | 31 + .../openssl/test/recipes/80-test_ciphername.t | 27 + .../openssl/test/recipes/80-test_cmp_http.t | 298 + .../80-test_cmp_http_data/Mock/12345.txt | 1 + .../Mock/big_issuing.crt | 1577 + .../80-test_cmp_http_data/Mock/big_root.crt | 1554 + .../80-test_cmp_http_data/Mock/big_server.crt | 1550 + .../Mock/big_trusted.crt | 1552 + .../80-test_cmp_http_data/Mock/csr.pem | 17 + .../80-test_cmp_http_data/Mock/empty.txt | 0 .../80-test_cmp_http_data/Mock/issuing.crt | 22 + .../Mock/issuing_expired.crt | 22 + .../80-test_cmp_http_data/Mock/new.key | 27 + .../Mock/new_pass_12345.key | 30 + .../80-test_cmp_http_data/Mock/new_pub.key | 9 + .../80-test_cmp_http_data/Mock/random.bin | 3 + .../80-test_cmp_http_data/Mock/root.crt | 22 + .../Mock/root_expired.crt | 21 + .../80-test_cmp_http_data/Mock/server.cnf | 16 + .../80-test_cmp_http_data/Mock/server.crt | 24 + .../80-test_cmp_http_data/Mock/server.key | 28 + .../80-test_cmp_http_data/Mock/signer.crt | 68 + .../80-test_cmp_http_data/Mock/signer.key | 27 + .../80-test_cmp_http_data/Mock/signer.p12 | Bin 0 -> 5475 bytes .../Mock/signer_issuing.crt | 45 + .../Mock/signer_only.crt | 21 + .../Mock/signer_root.crt | 22 + .../80-test_cmp_http_data/Mock/test.cnf | 141 + .../80-test_cmp_http_data/Mock/trusted.crt | 23 + .../80-test_cmp_http_data/Mock/wrong_csr.pem | 21 + .../80-test_cmp_http_data/test_commands.csv | 64 + .../80-test_cmp_http_data/test_connection.csv | 49 + .../test_credentials.csv | 46 + .../80-test_cmp_http_data/test_enrollment.csv | 114 + .../test_verification.csv | 50 + .../openssl/test/recipes/80-test_cms.t | 996 + .../80-test_cms_data/bad_signtime_attr.cms | Bin 0 -> 1524 bytes .../ciphertext_from_1_1_1.cms | 20 + .../80-test_cms_data/ct_multiple_attr.cms | Bin 0 -> 1549 bytes .../recipes/80-test_cms_data/no_ct_attr.cms | Bin 0 -> 1496 bytes .../recipes/80-test_cms_data/no_md_attr.cms | Bin 0 -> 1473 bytes .../recipes/80-test_cms_data/pkcs7-md4.pem | 32 + .../openssl/test/recipes/80-test_cmsapi.t | 22 + .../80-test_cmsapi_data/encryptedData.der | Bin 0 -> 82 bytes .../openssl/openssl/test/recipes/80-test_ct.t | 17 + .../openssl/test/recipes/80-test_dane.t | 28 + .../openssl/test/recipes/80-test_dtls.t | 20 + .../openssl/test/recipes/80-test_dtls_mtu.t | 21 + .../test/recipes/80-test_dtlsv1listen.t | 12 + .../openssl/test/recipes/80-test_ocsp.t | 228 + .../test/recipes/80-test_ocsp_data/cert.pem | 19 + .../test/recipes/80-test_ocsp_data/key.pem | 28 + .../openssl/test/recipes/80-test_pkcs12.t | 172 + .../test/recipes/80-test_pkcs12_data/bad1.p12 | Bin 0 -> 85 bytes .../test/recipes/80-test_pkcs12_data/bad2.p12 | Bin 0 -> 104 bytes .../test/recipes/80-test_pkcs12_data/bad3.p12 | Bin 0 -> 104 bytes .../test/recipes/80-test_policy_tree.t | 43 + .../80-test_policy_tree_data/large_leaf.pem | 11 + .../large_policy_tree.pem | 434 + .../80-test_policy_tree_data/small_leaf.pem | 11 + .../small_policy_tree.pem | 70 + .../openssl/test/recipes/80-test_ssl_new.t | 188 + .../openssl/test/recipes/80-test_ssl_old.t | 651 + .../recipes/80-test_ssl_old_data/dsa2048.pem | 14 + .../test/recipes/80-test_ssl_test_ctx.t | 19 + .../openssl/test/recipes/80-test_sslcorrupt.t | 20 + .../openssl/test/recipes/80-test_tsa.t | 250 + .../recipes/80-test_tsa_data/all-zero.tsq | Bin 0 -> 59 bytes .../recipes/80-test_tsa_data/comodo-aaa.pem | 25 + .../80-test_tsa_data/sectigo-all-zero.tsr | Bin 0 -> 4981 bytes .../80-test_tsa_data/sectigo-signer.pem | 40 + .../sectigo-time-stamping-ca.pem | 39 + .../80-test_tsa_data/user-trust-ca-aaa.pem | 32 + .../80-test_tsa_data/user-trust-ca.pem | 34 + .../openssl/test/recipes/80-test_x509aux.t | 30 + .../openssl/test/recipes/81-test_cmp_cli.t | 89 + .../openssl/test/recipes/90-test_asn1_time.t | 12 + .../openssl/test/recipes/90-test_async.t | 12 + .../openssl/test/recipes/90-test_bio_enc.t | 12 + .../test/recipes/90-test_bio_memleak.t | 12 + .../test/recipes/90-test_constant_time.t | 12 + .../openssl/test/recipes/90-test_fatalerr.t | 21 + .../openssl/test/recipes/90-test_fipsload.t | 31 + .../openssl/test/recipes/90-test_gmdiff.t | 12 + .../90-test_gost_data/server-cert2001.pem | 13 + .../90-test_gost_data/server-cert2012.pem | 13 + .../90-test_gost_data/server-key2001.pem | 4 + .../90-test_gost_data/server-key2012.pem | 4 + .../openssl/test/recipes/90-test_ige.t | 22 + .../openssl/test/recipes/90-test_includes.t | 30 + .../conf-includes/includes1.cnf | 33 + .../conf-includes/includes2.cnf | 53 + .../recipes/90-test_includes_data/incdir.cnf | 6 + .../90-test_includes_data/includes-broken.cnf | 5 + .../90-test_includes_data/includes-eq-ws.cnf | 5 + .../90-test_includes_data/includes-eq.cnf | 5 + .../90-test_includes_data/includes-file.cnf | 5 + .../90-test_includes_data/includes.cnf | 5 + .../vms-includes-file.cnf | 5 + .../90-test_includes_data/vms-includes.cnf | 5 + .../openssl/test/recipes/90-test_memleak.t | 19 + .../openssl/test/recipes/90-test_overhead.t | 17 + .../openssl/test/recipes/90-test_secmem.t | 12 + .../openssl/test/recipes/90-test_shlibload.t | 74 + .../openssl/test/recipes/90-test_srp.t | 12 + .../openssl/test/recipes/90-test_sslapi.t | 54 + .../recipes/90-test_sslapi_data/dhparams.pem | 122 + .../recipes/90-test_sslapi_data/passwd.txt | 1 + .../openssl/test/recipes/90-test_sslbuffers.t | 21 + .../openssl/test/recipes/90-test_store.t | 604 + .../recipes/90-test_store_data/dsaparam.pem | 14 + .../90-test_store_data/rsa-key-2432.pem | 32 + .../recipes/90-test_store_data/testrsa.msb | Bin 0 -> 308 bytes .../recipes/90-test_store_data/testrsa.pvk | Bin 0 -> 348 bytes .../openssl/test/recipes/90-test_sysdefault.t | 23 + .../openssl/test/recipes/90-test_threads.t | 56 + .../recipes/90-test_threads_data/rsakey.pem | 28 + .../test/recipes/90-test_time_offset.t | 12 + .../openssl/test/recipes/90-test_tls13ccs.t | 22 + .../test/recipes/90-test_tls13encryption.t | 20 + .../test/recipes/90-test_tls13secrets.t | 22 + .../openssl/test/recipes/90-test_traceapi.t | 12 + .../openssl/test/recipes/90-test_v3name.t | 12 + .../openssl/test/recipes/91-test_pkey_check.t | 106 + .../91-test_pkey_check_data/dhpkey.pem | 14 + .../91-test_pkey_check_data/dsapub.pem | 12 + .../dsapub_noparam.der | Bin 0 -> 108 bytes .../91-test_pkey_check_data/ec_p256_bad_0.pem | 4 + .../91-test_pkey_check_data/ec_p256_bad_1.pem | 4 + .../91-test_pkey_check_data/rsapub_17k.pem | 48 + .../91-test_pkey_check_data/sm2_bad_0.pem | 4 + .../91-test_pkey_check_data/sm2_bad_1.pem | 4 + .../91-test_pkey_check_data/sm2_bad_neg1.pem | 4 + .../recipes/95-test_external_gost_engine.t | 28 + .../gost_engine.sh | 55 + .../test/recipes/95-test_external_krb5.t | 27 + .../95-test_external_krb5_data/krb5.sh | 23 + .../test/recipes/95-test_external_pyca.t | 28 + .../cryptography.sh | 69 + .../openssl/test/recipes/99-test_ecstress.t | 23 + .../openssl/test/recipes/99-test_fuzz_asn1.t | 22 + .../test/recipes/99-test_fuzz_asn1parse.t | 22 + .../test/recipes/99-test_fuzz_bignum.t | 22 + .../openssl/test/recipes/99-test_fuzz_bndiv.t | 22 + .../test/recipes/99-test_fuzz_client.t | 22 + .../openssl/test/recipes/99-test_fuzz_cmp.t | 25 + .../openssl/test/recipes/99-test_fuzz_cms.t | 25 + .../openssl/test/recipes/99-test_fuzz_conf.t | 22 + .../openssl/test/recipes/99-test_fuzz_crl.t | 22 + .../openssl/test/recipes/99-test_fuzz_ct.t | 25 + .../test/recipes/99-test_fuzz_server.t | 22 + .../openssl/test/recipes/99-test_fuzz_x509.t | 22 + deps/openssl/openssl/test/recipes/fuzz.pl | 26 + .../openssl/test/recipes/ocsp-response.der | Bin 0 -> 1517 bytes .../openssl/test/recipes/tconversion.pl | 160 + deps/openssl/openssl/test/recordlentest.c | 204 + deps/openssl/openssl/test/rsa_complex.c | 32 + deps/openssl/openssl/test/rsa_mp_test.c | 296 + .../openssl/openssl/test/rsa_sp800_56b_test.c | 548 + deps/openssl/openssl/test/rsa_test.c | 400 + deps/openssl/openssl/test/run_tests.pl | 339 + deps/openssl/openssl/test/sanitytest.c | 143 + deps/openssl/openssl/test/secmemtest.c | 183 + deps/openssl/openssl/test/serverinfo.pem | 16 + deps/openssl/openssl/test/serverinfo2.pem | 8 + deps/openssl/openssl/test/servername_test.c | 268 + deps/openssl/openssl/test/session.pem | 31 + deps/openssl/openssl/test/sha_test.c | 110 + deps/openssl/openssl/test/shibboleth.pfx | Bin 0 -> 2519 bytes deps/openssl/openssl/test/shlibloadtest.c | 292 + deps/openssl/openssl/test/simpledynamic.c | 78 + deps/openssl/openssl/test/simpledynamic.h | 51 + .../openssl/test/siphash_internal_test.c | 291 + deps/openssl/openssl/test/sm2_internal_test.c | 428 + deps/openssl/openssl/test/sm3_internal_test.c | 84 + deps/openssl/openssl/test/sm4_internal_test.c | 86 + deps/openssl/openssl/test/smcont.bin | 3 + deps/openssl/openssl/test/smcont.txt | 1 + deps/openssl/openssl/test/smcont_zero.txt | 0 .../openssl/test/smime-certs/badrsa.pem | 18 + deps/openssl/openssl/test/smime-certs/ca.cnf | 68 + .../openssl/test/smime-certs/mksmime-certs.sh | 85 + .../openssl/openssl/test/smime-certs/smdh.pem | 47 + .../openssl/test/smime-certs/smdsa1.pem | 47 + .../openssl/test/smime-certs/smdsa2.pem | 47 + .../openssl/test/smime-certs/smdsa3.pem | 47 + .../openssl/test/smime-certs/smdsap.pem | 9 + .../openssl/test/smime-certs/smec1.pem | 22 + .../openssl/test/smime-certs/smec2.pem | 23 + .../openssl/test/smime-certs/smec3.pem | 22 + .../openssl/test/smime-certs/smroot.pem | 49 + .../openssl/test/smime-certs/smrsa1.pem | 49 + .../openssl/test/smime-certs/smrsa2.pem | 49 + .../openssl/test/smime-certs/smrsa3.pem | 49 + ...SignedInvalidMappingFromanyPolicyTest7.eml | 93 + deps/openssl/openssl/test/sparse_array_test.c | 197 + deps/openssl/openssl/test/srptest.c | 282 + .../openssl/test/ssl-tests/01-simple.cnf | 102 + .../openssl/test/ssl-tests/01-simple.cnf.in | 54 + .../test/ssl-tests/02-protocol-version.cnf | 18822 ++++ .../test/ssl-tests/02-protocol-version.cnf.in | 21 + .../test/ssl-tests/03-custom_verify.cnf | 266 + .../test/ssl-tests/03-custom_verify.cnf.in | 159 + .../openssl/test/ssl-tests/04-client_auth.cnf | 1132 + .../test/ssl-tests/04-client_auth.cnf.in | 218 + .../openssl/openssl/test/ssl-tests/05-sni.cnf | 308 + .../openssl/test/ssl-tests/05-sni.cnf.in | 173 + .../openssl/test/ssl-tests/06-sni-ticket.cnf | 767 + .../test/ssl-tests/06-sni-ticket.cnf.in | 101 + .../ssl-tests/07-dtls-protocol-version.cnf | 1820 + .../ssl-tests/07-dtls-protocol-version.cnf.in | 21 + .../openssl/openssl/test/ssl-tests/08-npn.cnf | 816 + .../openssl/test/ssl-tests/08-npn.cnf.in | 443 + .../openssl/test/ssl-tests/09-alpn.cnf | 619 + .../openssl/test/ssl-tests/09-alpn.cnf.in | 325 + .../openssl/test/ssl-tests/10-resumption.cnf | 2439 + .../test/ssl-tests/10-resumption.cnf.in | 21 + .../test/ssl-tests/11-dtls_resumption.cnf | 620 + .../test/ssl-tests/11-dtls_resumption.cnf.in | 21 + deps/openssl/openssl/test/ssl-tests/12-ct.cnf | 191 + .../openssl/test/ssl-tests/12-ct.cnf.in | 121 + .../test/ssl-tests/13-fragmentation.cnf | 577 + .../test/ssl-tests/13-fragmentation.cnf.in | 268 + .../openssl/test/ssl-tests/14-curves.cnf | 2379 + .../openssl/test/ssl-tests/14-curves.cnf.in | 117 + .../openssl/test/ssl-tests/15-certstatus.cnf | 62 + .../test/ssl-tests/15-certstatus.cnf.in | 45 + .../test/ssl-tests/16-dtls-certstatus.cnf | 62 + .../test/ssl-tests/16-dtls-certstatus.cnf.in | 97 + .../openssl/test/ssl-tests/17-renegotiate.cnf | 554 + .../test/ssl-tests/17-renegotiate.cnf.in | 316 + .../test/ssl-tests/18-dtls-renegotiate.cnf | 285 + .../test/ssl-tests/18-dtls-renegotiate.cnf.in | 210 + .../test/ssl-tests/19-mac-then-encrypt.cnf | 244 + .../test/ssl-tests/19-mac-then-encrypt.cnf.in | 155 + .../openssl/test/ssl-tests/20-cert-select.cnf | 1842 + .../test/ssl-tests/20-cert-select.cnf.in | 991 + .../openssl/test/ssl-tests/21-key-update.cnf | 112 + .../test/ssl-tests/21-key-update.cnf.in | 62 + .../openssl/test/ssl-tests/22-compression.cnf | 216 + .../test/ssl-tests/22-compression.cnf.in | 127 + .../openssl/openssl/test/ssl-tests/23-srp.cnf | 148 + .../openssl/test/ssl-tests/23-srp.cnf.in | 107 + .../openssl/test/ssl-tests/24-padding.cnf | 34 + .../openssl/test/ssl-tests/24-padding.cnf.in | 25 + .../openssl/test/ssl-tests/25-cipher.cnf | 244 + .../openssl/test/ssl-tests/25-cipher.cnf.in | 159 + .../test/ssl-tests/26-tls13_client_auth.cnf | 488 + .../ssl-tests/26-tls13_client_auth.cnf.in | 302 + .../test/ssl-tests/27-ticket-appdata.cnf | 146 + .../test/ssl-tests/27-ticket-appdata.cnf.in | 100 + .../openssl/test/ssl-tests/28-seclevel.cnf | 150 + .../openssl/test/ssl-tests/28-seclevel.cnf.in | 85 + .../test/ssl-tests/29-dtls-sctp-label-bug.cnf | 116 + .../ssl-tests/29-dtls-sctp-label-bug.cnf.in | 67 + .../ssl-tests/30-extended-master-secret.cnf | 203 + .../30-extended-master-secret.cnf.in | 122 + .../test/ssl-tests/protocol_version.pm | 391 + .../openssl/test/ssl-tests/ssltests_base.pm | 33 + .../test/ssl_cert_table_internal_test.c | 64 + deps/openssl/openssl/test/ssl_ctx_test.c | 76 + deps/openssl/openssl/test/ssl_old_test.c | 2999 + deps/openssl/openssl/test/ssl_test.c | 570 + deps/openssl/openssl/test/ssl_test.tmpl | 126 + deps/openssl/openssl/test/ssl_test_ctx_test.c | 264 + .../openssl/test/ssl_test_ctx_test.cnf | 97 + deps/openssl/openssl/test/sslapitest.c | 10903 +++ deps/openssl/openssl/test/sslbuffertest.c | 183 + deps/openssl/openssl/test/sslcorrupttest.c | 280 + deps/openssl/openssl/test/stack_test.c | 388 + deps/openssl/openssl/test/sysdefault.cnf | 22 + deps/openssl/openssl/test/sysdefaulttest.c | 50 + deps/openssl/openssl/test/test.cnf | 74 + deps/openssl/openssl/test/test_test.c | 579 + deps/openssl/openssl/test/testcrl.pem | 16 + deps/openssl/openssl/test/testdsa.pem | 12 + deps/openssl/openssl/test/testdsapub.pem | 12 + deps/openssl/openssl/test/testec-p112r1.pem | 7 + deps/openssl/openssl/test/testec-p256.pem | 5 + deps/openssl/openssl/test/testecpub-p256.pem | 4 + deps/openssl/openssl/test/tested25519.pem | 3 + deps/openssl/openssl/test/tested25519pub.pem | 3 + deps/openssl/openssl/test/tested448.pem | 4 + deps/openssl/openssl/test/tested448pub.pem | 4 + deps/openssl/openssl/test/testp7.pem | 46 + deps/openssl/openssl/test/testreq2.pem | 7 + deps/openssl/openssl/test/testrsa.pem | 10 + deps/openssl/openssl/test/testrsa2048.pem | 29 + deps/openssl/openssl/test/testrsa2048pub.pem | 9 + .../openssl/test/testrsa_withattrs.der | Bin 0 -> 1277 bytes .../openssl/test/testrsa_withattrs.pem | 29 + deps/openssl/openssl/test/testrsapss.pem | 28 + .../openssl/test/testrsapssmandatory.pem | 29 + deps/openssl/openssl/test/testrsapub.pem | 4 + deps/openssl/openssl/test/testsid.pem | 38 + deps/openssl/openssl/test/testutil.h | 635 + .../openssl/test/testutil/apps_shims.c | 56 + .../openssl/test/testutil/basic_output.c | 102 + deps/openssl/openssl/test/testutil/cb.c | 16 + deps/openssl/openssl/test/testutil/driver.c | 473 + .../openssl/test/testutil/fake_random.c | 231 + .../openssl/test/testutil/format_output.c | 535 + deps/openssl/openssl/test/testutil/load.c | 105 + deps/openssl/openssl/test/testutil/main.c | 40 + deps/openssl/openssl/test/testutil/options.c | 79 + deps/openssl/openssl/test/testutil/output.c | 58 + deps/openssl/openssl/test/testutil/output.h | 68 + deps/openssl/openssl/test/testutil/provider.c | 242 + deps/openssl/openssl/test/testutil/random.c | 40 + deps/openssl/openssl/test/testutil/stanza.c | 159 + .../openssl/test/testutil/test_cleanup.c | 14 + .../openssl/test/testutil/test_options.c | 21 + deps/openssl/openssl/test/testutil/tests.c | 472 + .../openssl/test/testutil/testutil_init.c | 145 + deps/openssl/openssl/test/testutil/tu_local.h | 61 + deps/openssl/openssl/test/testx509.pem | 10 + deps/openssl/openssl/test/threadstest.c | 728 + deps/openssl/openssl/test/threadstest.h | 82 + deps/openssl/openssl/test/threadstest_fips.c | 49 + deps/openssl/openssl/test/time_offset_test.c | 113 + deps/openssl/openssl/test/tls-provider.c | 857 + deps/openssl/openssl/test/tls13ccstest.c | 512 + .../openssl/test/tls13encryptiontest.c | 417 + deps/openssl/openssl/test/tls13secretstest.c | 408 + deps/openssl/openssl/test/trace_api_test.c | 163 + deps/openssl/openssl/test/uitest.c | 94 + deps/openssl/openssl/test/upcallstest.c | 121 + .../openssl/openssl/test/user_property_test.c | 132 + deps/openssl/openssl/test/v3-cert1.pem | 16 + deps/openssl/openssl/test/v3-cert2.pem | 16 + deps/openssl/openssl/test/v3_ca_exts.cnf | 5 + deps/openssl/openssl/test/v3ext.c | 478 + deps/openssl/openssl/test/v3nametest.c | 716 + deps/openssl/openssl/test/verify_extra_test.c | 341 + deps/openssl/openssl/test/versions.c | 21 + deps/openssl/openssl/test/wpackettest.c | 445 + .../openssl/test/x509_check_cert_pkey_test.c | 179 + .../openssl/openssl/test/x509_dup_cert_test.c | 53 + .../openssl/openssl/test/x509_internal_test.c | 110 + deps/openssl/openssl/test/x509_time_test.c | 604 + deps/openssl/openssl/test/x509aux.c | 186 + deps/openssl/openssl/util/libssl.num | 16 - deps/openssl/openssl/util/missingcrypto.txt | 59 + deps/openssl/openssl/util/missingssl.txt | 1 + deps/openssl/openssl/util/other.syms | 3 - .../openssl/util/perl/OpenSSL/config.pm | 14 +- 3546 files changed, 576764 insertions(+), 22719 deletions(-) create mode 100644 deps/openssl/openssl/BUILD.gn create mode 100644 deps/openssl/openssl/COPYRIGHT.OpenSource create mode 100644 deps/openssl/openssl/OAT.xml delete mode 100644 deps/openssl/openssl/README-OpenSSL.md create mode 100644 deps/openssl/openssl/README.OpenSource create mode 100644 deps/openssl/openssl/appveyor.yml create mode 100644 deps/openssl/openssl/bundle.json create mode 100644 deps/openssl/openssl/demos/README.txt create mode 100644 deps/openssl/openssl/demos/bio/Makefile create mode 100644 deps/openssl/openssl/demos/bio/README.txt create mode 100644 deps/openssl/openssl/demos/bio/accept.cnf create mode 100644 deps/openssl/openssl/demos/bio/client-arg.c create mode 100644 deps/openssl/openssl/demos/bio/client-conf.c create mode 100644 deps/openssl/openssl/demos/bio/cmod.cnf create mode 100644 deps/openssl/openssl/demos/bio/connect.cnf create mode 100644 deps/openssl/openssl/demos/bio/descrip.mms create mode 100644 deps/openssl/openssl/demos/bio/intca.pem create mode 100644 deps/openssl/openssl/demos/bio/root.pem create mode 100644 deps/openssl/openssl/demos/bio/saccept.c create mode 100644 deps/openssl/openssl/demos/bio/sconnect.c create mode 100644 deps/openssl/openssl/demos/bio/server-arg.c create mode 100644 deps/openssl/openssl/demos/bio/server-cmod.c create mode 100644 deps/openssl/openssl/demos/bio/server-conf.c create mode 100644 deps/openssl/openssl/demos/bio/server-ec.pem create mode 100644 deps/openssl/openssl/demos/bio/server.pem create mode 100644 deps/openssl/openssl/demos/bio/shared.opt create mode 100644 deps/openssl/openssl/demos/bio/static.opt create mode 100644 deps/openssl/openssl/demos/certs/README.txt create mode 100644 deps/openssl/openssl/demos/certs/apps/apps.cnf create mode 100644 deps/openssl/openssl/demos/certs/apps/ckey.pem create mode 100644 deps/openssl/openssl/demos/certs/apps/intkey.pem create mode 100644 deps/openssl/openssl/demos/certs/apps/mkacerts.sh create mode 100644 deps/openssl/openssl/demos/certs/apps/mkxcerts.sh create mode 100644 deps/openssl/openssl/demos/certs/apps/rootkey.pem create mode 100644 deps/openssl/openssl/demos/certs/apps/skey.pem create mode 100644 deps/openssl/openssl/demos/certs/apps/skey2.pem create mode 100644 deps/openssl/openssl/demos/certs/ca.cnf create mode 100644 deps/openssl/openssl/demos/certs/mkcerts.sh create mode 100644 deps/openssl/openssl/demos/certs/ocspquery.sh create mode 100644 deps/openssl/openssl/demos/certs/ocsprun.sh create mode 100644 deps/openssl/openssl/demos/cipher/Makefile create mode 100644 deps/openssl/openssl/demos/cipher/aesccm.c create mode 100644 deps/openssl/openssl/demos/cipher/aesgcm.c create mode 100644 deps/openssl/openssl/demos/cipher/aeskeywrap.c create mode 100644 deps/openssl/openssl/demos/cipher/ariacbc.c create mode 100644 deps/openssl/openssl/demos/cms/cacert.pem create mode 100644 deps/openssl/openssl/demos/cms/cakey.pem create mode 100644 deps/openssl/openssl/demos/cms/cms_comp.c create mode 100644 deps/openssl/openssl/demos/cms/cms_ddec.c create mode 100644 deps/openssl/openssl/demos/cms/cms_dec.c create mode 100644 deps/openssl/openssl/demos/cms/cms_denc.c create mode 100644 deps/openssl/openssl/demos/cms/cms_enc.c create mode 100644 deps/openssl/openssl/demos/cms/cms_sign.c create mode 100644 deps/openssl/openssl/demos/cms/cms_sign2.c create mode 100644 deps/openssl/openssl/demos/cms/cms_uncomp.c create mode 100644 deps/openssl/openssl/demos/cms/cms_ver.c create mode 100644 deps/openssl/openssl/demos/cms/comp.txt create mode 100644 deps/openssl/openssl/demos/cms/encr.txt create mode 100644 deps/openssl/openssl/demos/cms/sign.txt create mode 100644 deps/openssl/openssl/demos/cms/signer.pem create mode 100644 deps/openssl/openssl/demos/cms/signer2.pem create mode 100644 deps/openssl/openssl/demos/digest/BIO_f_md.c create mode 100644 deps/openssl/openssl/demos/digest/EVP_MD_demo.c create mode 100644 deps/openssl/openssl/demos/digest/EVP_MD_stdin.c create mode 100644 deps/openssl/openssl/demos/digest/EVP_MD_xof.c create mode 100644 deps/openssl/openssl/demos/digest/Makefile create mode 100644 deps/openssl/openssl/demos/encode/Makefile create mode 100644 deps/openssl/openssl/demos/encode/ec_encode.c create mode 100644 deps/openssl/openssl/demos/encode/rsa_encode.c create mode 100644 deps/openssl/openssl/demos/kdf/Makefile create mode 100644 deps/openssl/openssl/demos/kdf/hkdf.c create mode 100644 deps/openssl/openssl/demos/kdf/pbkdf2.c create mode 100644 deps/openssl/openssl/demos/kdf/scrypt.c create mode 100644 deps/openssl/openssl/demos/keyexch/x25519.c create mode 100644 deps/openssl/openssl/demos/mac/Makefile create mode 100644 deps/openssl/openssl/demos/mac/cmac-aes256.c create mode 100644 deps/openssl/openssl/demos/mac/gmac.c create mode 100644 deps/openssl/openssl/demos/mac/hmac-sha512.c create mode 100644 deps/openssl/openssl/demos/mac/poly1305.c create mode 100644 deps/openssl/openssl/demos/mac/siphash.c create mode 100644 deps/openssl/openssl/demos/pkcs12/pkread.c create mode 100644 deps/openssl/openssl/demos/pkcs12/pkwrite.c create mode 100644 deps/openssl/openssl/demos/pkey/EVP_PKEY_DSA_keygen.c create mode 100644 deps/openssl/openssl/demos/pkey/EVP_PKEY_DSA_paramfromdata.c create mode 100644 deps/openssl/openssl/demos/pkey/EVP_PKEY_DSA_paramgen.c create mode 100644 deps/openssl/openssl/demos/pkey/EVP_PKEY_DSA_paramvalidate.c create mode 100644 deps/openssl/openssl/demos/pkey/EVP_PKEY_EC_keygen.c create mode 100644 deps/openssl/openssl/demos/pkey/EVP_PKEY_RSA_keygen.c create mode 100644 deps/openssl/openssl/demos/pkey/Makefile create mode 100644 deps/openssl/openssl/demos/pkey/dsa.inc create mode 100644 deps/openssl/openssl/demos/signature/EVP_Signature_demo.c create mode 100644 deps/openssl/openssl/demos/signature/EVP_Signature_demo.h create mode 100644 deps/openssl/openssl/demos/signature/Makefile create mode 100644 deps/openssl/openssl/demos/signature/rsa_pss.h create mode 100644 deps/openssl/openssl/demos/signature/rsa_pss_direct.c create mode 100644 deps/openssl/openssl/demos/signature/rsa_pss_hash.c create mode 100644 deps/openssl/openssl/demos/smime/cacert.pem create mode 100644 deps/openssl/openssl/demos/smime/cakey.pem create mode 100644 deps/openssl/openssl/demos/smime/encr.txt create mode 100644 deps/openssl/openssl/demos/smime/sign.txt create mode 100644 deps/openssl/openssl/demos/smime/signer.pem create mode 100644 deps/openssl/openssl/demos/smime/signer2.pem create mode 100644 deps/openssl/openssl/demos/smime/smdec.c create mode 100644 deps/openssl/openssl/demos/smime/smenc.c create mode 100644 deps/openssl/openssl/demos/smime/smsign.c create mode 100644 deps/openssl/openssl/demos/smime/smsign2.c create mode 100644 deps/openssl/openssl/demos/smime/smver.c create mode 100644 deps/openssl/openssl/doc/HOWTO/certificates.txt create mode 100644 deps/openssl/openssl/doc/HOWTO/keys.txt create mode 100644 deps/openssl/openssl/doc/README.md create mode 100644 deps/openssl/openssl/doc/build.info create mode 100644 deps/openssl/openssl/doc/build.info.in create mode 100644 deps/openssl/openssl/doc/dir-locals.example.el create mode 100644 deps/openssl/openssl/doc/fingerprints.txt create mode 100644 deps/openssl/openssl/doc/images/openssl.svg create mode 100644 deps/openssl/openssl/doc/internal/man3/OPENSSL_SA.pod create mode 100644 deps/openssl/openssl/doc/internal/man3/OPTIONS.pod create mode 100644 deps/openssl/openssl/doc/internal/man3/OSSL_DEPRECATED.pod create mode 100644 deps/openssl/openssl/doc/internal/man3/OSSL_METHOD_STORE.pod create mode 100644 deps/openssl/openssl/doc/internal/man3/cms_add1_signing_cert.pod create mode 100644 deps/openssl/openssl/doc/internal/man3/evp_generic_fetch.pod create mode 100644 deps/openssl/openssl/doc/internal/man3/evp_keymgmt_newdata.pod create mode 100644 deps/openssl/openssl/doc/internal/man3/evp_keymgmt_util_export_to_provider.pod create mode 100644 deps/openssl/openssl/doc/internal/man3/evp_md_get_number.pod create mode 100644 deps/openssl/openssl/doc/internal/man3/evp_pkey_export_to_provider.pod create mode 100644 deps/openssl/openssl/doc/internal/man3/evp_pkey_get1_ED25519.pod create mode 100644 deps/openssl/openssl/doc/internal/man3/ossl_DER_w_begin_sequence.pod create mode 100644 deps/openssl/openssl/doc/internal/man3/ossl_DER_w_bn.pod create mode 100644 deps/openssl/openssl/doc/internal/man3/ossl_DER_w_precompiled.pod create mode 100644 deps/openssl/openssl/doc/internal/man3/ossl_algorithm_do_all.pod create mode 100644 deps/openssl/openssl/doc/internal/man3/ossl_cmp_X509_STORE_add1_certs.pod create mode 100644 deps/openssl/openssl/doc/internal/man3/ossl_cmp_asn1_octet_string_set1.pod create mode 100644 deps/openssl/openssl/doc/internal/man3/ossl_cmp_certreq_new.pod create mode 100644 deps/openssl/openssl/doc/internal/man3/ossl_cmp_ctx_set1_caPubs.pod create mode 100644 deps/openssl/openssl/doc/internal/man3/ossl_cmp_hdr_init.pod create mode 100644 deps/openssl/openssl/doc/internal/man3/ossl_cmp_mock_srv_new.pod create mode 100644 deps/openssl/openssl/doc/internal/man3/ossl_cmp_msg_check_update.pod create mode 100644 deps/openssl/openssl/doc/internal/man3/ossl_cmp_msg_create.pod create mode 100644 deps/openssl/openssl/doc/internal/man3/ossl_cmp_msg_protect.pod create mode 100644 deps/openssl/openssl/doc/internal/man3/ossl_cmp_pkisi_get_status.pod create mode 100644 deps/openssl/openssl/doc/internal/man3/ossl_cmp_print_log.pod create mode 100644 deps/openssl/openssl/doc/internal/man3/ossl_ends_with_dirsep.pod create mode 100644 deps/openssl/openssl/doc/internal/man3/ossl_global_properties_no_mirrored.pod create mode 100644 deps/openssl/openssl/doc/internal/man3/ossl_init_thread_deregister.pod create mode 100644 deps/openssl/openssl/doc/internal/man3/ossl_lib_ctx_get_data.pod create mode 100644 deps/openssl/openssl/doc/internal/man3/ossl_method_construct.pod create mode 100644 deps/openssl/openssl/doc/internal/man3/ossl_namemap_new.pod create mode 100644 deps/openssl/openssl/doc/internal/man3/ossl_provider_add_conf_module.pod create mode 100644 deps/openssl/openssl/doc/internal/man3/ossl_provider_new.pod create mode 100644 deps/openssl/openssl/doc/internal/man3/ossl_punycode_decode.pod create mode 100644 deps/openssl/openssl/doc/internal/man3/ossl_rand_get_entropy.pod create mode 100644 deps/openssl/openssl/doc/internal/man3/ossl_random_add_conf_module.pod create mode 100644 deps/openssl/openssl/doc/internal/man3/ossl_rsa_get0_all_params.pod create mode 100644 deps/openssl/openssl/doc/internal/man3/x509v3_cache_extensions.pod create mode 100644 deps/openssl/openssl/doc/internal/man7/DERlib.pod create mode 100644 deps/openssl/openssl/doc/internal/man7/EVP_PKEY.pod create mode 100644 deps/openssl/openssl/doc/internal/man7/VERSION.pod create mode 100644 deps/openssl/openssl/doc/internal/man7/build.info.pod create mode 100644 deps/openssl/openssl/doc/internal/man7/deprecation.pod create mode 100644 deps/openssl/openssl/doc/life-cycles/Makefile create mode 100644 deps/openssl/openssl/doc/life-cycles/README.md create mode 100644 deps/openssl/openssl/doc/life-cycles/cipher.dot create mode 100644 deps/openssl/openssl/doc/life-cycles/digest.dot create mode 100644 deps/openssl/openssl/doc/life-cycles/kdf.dot create mode 100644 deps/openssl/openssl/doc/life-cycles/lifecycles.ods create mode 100644 deps/openssl/openssl/doc/life-cycles/mac.dot create mode 100644 deps/openssl/openssl/doc/life-cycles/pkey.dot create mode 100644 deps/openssl/openssl/doc/life-cycles/rand.dot create mode 100644 deps/openssl/openssl/doc/man1/CA.pl.pod create mode 100644 deps/openssl/openssl/doc/man1/build.info create mode 100644 deps/openssl/openssl/doc/man1/openssl-asn1parse.pod.in create mode 100644 deps/openssl/openssl/doc/man1/openssl-ca.pod.in create mode 100644 deps/openssl/openssl/doc/man1/openssl-ciphers.pod.in create mode 100644 deps/openssl/openssl/doc/man1/openssl-cmds.pod.in create mode 100644 deps/openssl/openssl/doc/man1/openssl-cmp.pod.in create mode 100644 deps/openssl/openssl/doc/man1/openssl-cms.pod.in create mode 100644 deps/openssl/openssl/doc/man1/openssl-crl.pod.in create mode 100644 deps/openssl/openssl/doc/man1/openssl-crl2pkcs7.pod.in create mode 100644 deps/openssl/openssl/doc/man1/openssl-dgst.pod.in create mode 100644 deps/openssl/openssl/doc/man1/openssl-dhparam.pod.in create mode 100644 deps/openssl/openssl/doc/man1/openssl-dsa.pod.in create mode 100644 deps/openssl/openssl/doc/man1/openssl-dsaparam.pod.in create mode 100644 deps/openssl/openssl/doc/man1/openssl-ec.pod.in create mode 100644 deps/openssl/openssl/doc/man1/openssl-ecparam.pod.in create mode 100644 deps/openssl/openssl/doc/man1/openssl-enc.pod.in create mode 100644 deps/openssl/openssl/doc/man1/openssl-engine.pod.in create mode 100644 deps/openssl/openssl/doc/man1/openssl-errstr.pod.in create mode 100644 deps/openssl/openssl/doc/man1/openssl-fipsinstall.pod.in create mode 100644 deps/openssl/openssl/doc/man1/openssl-format-options.pod create mode 100644 deps/openssl/openssl/doc/man1/openssl-gendsa.pod.in create mode 100644 deps/openssl/openssl/doc/man1/openssl-genpkey.pod.in create mode 100644 deps/openssl/openssl/doc/man1/openssl-genrsa.pod.in create mode 100644 deps/openssl/openssl/doc/man1/openssl-info.pod.in create mode 100644 deps/openssl/openssl/doc/man1/openssl-kdf.pod.in create mode 100644 deps/openssl/openssl/doc/man1/openssl-list.pod.in create mode 100644 deps/openssl/openssl/doc/man1/openssl-mac.pod.in create mode 100644 deps/openssl/openssl/doc/man1/openssl-namedisplay-options.pod create mode 100644 deps/openssl/openssl/doc/man1/openssl-nseq.pod.in create mode 100644 deps/openssl/openssl/doc/man1/openssl-ocsp.pod.in create mode 100644 deps/openssl/openssl/doc/man1/openssl-passphrase-options.pod create mode 100644 deps/openssl/openssl/doc/man1/openssl-passwd.pod.in create mode 100644 deps/openssl/openssl/doc/man1/openssl-pkcs12.pod.in create mode 100644 deps/openssl/openssl/doc/man1/openssl-pkcs7.pod.in create mode 100644 deps/openssl/openssl/doc/man1/openssl-pkcs8.pod.in create mode 100644 deps/openssl/openssl/doc/man1/openssl-pkey.pod.in create mode 100644 deps/openssl/openssl/doc/man1/openssl-pkeyparam.pod.in create mode 100644 deps/openssl/openssl/doc/man1/openssl-pkeyutl.pod.in create mode 100644 deps/openssl/openssl/doc/man1/openssl-prime.pod.in create mode 100644 deps/openssl/openssl/doc/man1/openssl-rand.pod.in create mode 100644 deps/openssl/openssl/doc/man1/openssl-rehash.pod.in create mode 100644 deps/openssl/openssl/doc/man1/openssl-req.pod.in create mode 100644 deps/openssl/openssl/doc/man1/openssl-rsa.pod.in create mode 100644 deps/openssl/openssl/doc/man1/openssl-rsautl.pod.in create mode 100644 deps/openssl/openssl/doc/man1/openssl-s_client.pod.in create mode 100644 deps/openssl/openssl/doc/man1/openssl-s_server.pod.in create mode 100644 deps/openssl/openssl/doc/man1/openssl-s_time.pod.in create mode 100644 deps/openssl/openssl/doc/man1/openssl-sess_id.pod.in create mode 100644 deps/openssl/openssl/doc/man1/openssl-smime.pod.in create mode 100644 deps/openssl/openssl/doc/man1/openssl-speed.pod.in create mode 100644 deps/openssl/openssl/doc/man1/openssl-spkac.pod.in create mode 100644 deps/openssl/openssl/doc/man1/openssl-srp.pod.in create mode 100644 deps/openssl/openssl/doc/man1/openssl-storeutl.pod.in create mode 100644 deps/openssl/openssl/doc/man1/openssl-ts.pod.in create mode 100644 deps/openssl/openssl/doc/man1/openssl-verification-options.pod create mode 100644 deps/openssl/openssl/doc/man1/openssl-verify.pod.in create mode 100644 deps/openssl/openssl/doc/man1/openssl-version.pod.in create mode 100644 deps/openssl/openssl/doc/man1/openssl-x509.pod.in create mode 100644 deps/openssl/openssl/doc/man1/openssl.pod create mode 100644 deps/openssl/openssl/doc/man1/tsget.pod create mode 100644 deps/openssl/openssl/doc/man3/ADMISSIONS.pod create mode 100644 deps/openssl/openssl/doc/man3/ASN1_EXTERN_FUNCS.pod create mode 100644 deps/openssl/openssl/doc/man3/ASN1_INTEGER_get_int64.pod create mode 100644 deps/openssl/openssl/doc/man3/ASN1_INTEGER_new.pod create mode 100644 deps/openssl/openssl/doc/man3/ASN1_ITEM_lookup.pod create mode 100644 deps/openssl/openssl/doc/man3/ASN1_OBJECT_new.pod create mode 100644 deps/openssl/openssl/doc/man3/ASN1_STRING_TABLE_add.pod create mode 100644 deps/openssl/openssl/doc/man3/ASN1_STRING_length.pod create mode 100644 deps/openssl/openssl/doc/man3/ASN1_STRING_new.pod create mode 100644 deps/openssl/openssl/doc/man3/ASN1_STRING_print_ex.pod create mode 100644 deps/openssl/openssl/doc/man3/ASN1_TIME_set.pod create mode 100644 deps/openssl/openssl/doc/man3/ASN1_TYPE_get.pod create mode 100644 deps/openssl/openssl/doc/man3/ASN1_aux_cb.pod create mode 100644 deps/openssl/openssl/doc/man3/ASN1_generate_nconf.pod create mode 100644 deps/openssl/openssl/doc/man3/ASN1_item_d2i_bio.pod create mode 100644 deps/openssl/openssl/doc/man3/ASN1_item_new.pod create mode 100644 deps/openssl/openssl/doc/man3/ASN1_item_sign.pod create mode 100644 deps/openssl/openssl/doc/man3/ASYNC_WAIT_CTX_new.pod create mode 100644 deps/openssl/openssl/doc/man3/ASYNC_start_job.pod create mode 100644 deps/openssl/openssl/doc/man3/BF_encrypt.pod create mode 100644 deps/openssl/openssl/doc/man3/BIO_ADDR.pod create mode 100644 deps/openssl/openssl/doc/man3/BIO_ADDRINFO.pod create mode 100644 deps/openssl/openssl/doc/man3/BIO_connect.pod create mode 100644 deps/openssl/openssl/doc/man3/BIO_ctrl.pod create mode 100644 deps/openssl/openssl/doc/man3/BIO_f_base64.pod create mode 100644 deps/openssl/openssl/doc/man3/BIO_f_buffer.pod create mode 100644 deps/openssl/openssl/doc/man3/BIO_f_cipher.pod create mode 100644 deps/openssl/openssl/doc/man3/BIO_f_md.pod create mode 100644 deps/openssl/openssl/doc/man3/BIO_f_null.pod create mode 100644 deps/openssl/openssl/doc/man3/BIO_f_prefix.pod create mode 100644 deps/openssl/openssl/doc/man3/BIO_f_readbuffer.pod create mode 100644 deps/openssl/openssl/doc/man3/BIO_f_ssl.pod create mode 100644 deps/openssl/openssl/doc/man3/BIO_find_type.pod create mode 100644 deps/openssl/openssl/doc/man3/BIO_get_data.pod create mode 100644 deps/openssl/openssl/doc/man3/BIO_get_ex_new_index.pod create mode 100644 deps/openssl/openssl/doc/man3/BIO_meth_new.pod create mode 100644 deps/openssl/openssl/doc/man3/BIO_new.pod create mode 100644 deps/openssl/openssl/doc/man3/BIO_new_CMS.pod create mode 100644 deps/openssl/openssl/doc/man3/BIO_parse_hostserv.pod create mode 100644 deps/openssl/openssl/doc/man3/BIO_printf.pod create mode 100644 deps/openssl/openssl/doc/man3/BIO_push.pod create mode 100644 deps/openssl/openssl/doc/man3/BIO_read.pod create mode 100644 deps/openssl/openssl/doc/man3/BIO_s_accept.pod create mode 100644 deps/openssl/openssl/doc/man3/BIO_s_bio.pod create mode 100644 deps/openssl/openssl/doc/man3/BIO_s_connect.pod create mode 100644 deps/openssl/openssl/doc/man3/BIO_s_core.pod create mode 100644 deps/openssl/openssl/doc/man3/BIO_s_datagram.pod create mode 100644 deps/openssl/openssl/doc/man3/BIO_s_fd.pod create mode 100644 deps/openssl/openssl/doc/man3/BIO_s_file.pod create mode 100644 deps/openssl/openssl/doc/man3/BIO_s_mem.pod create mode 100644 deps/openssl/openssl/doc/man3/BIO_s_null.pod create mode 100644 deps/openssl/openssl/doc/man3/BIO_s_socket.pod create mode 100644 deps/openssl/openssl/doc/man3/BIO_set_callback.pod create mode 100644 deps/openssl/openssl/doc/man3/BIO_should_retry.pod create mode 100644 deps/openssl/openssl/doc/man3/BIO_socket_wait.pod create mode 100644 deps/openssl/openssl/doc/man3/BN_BLINDING_new.pod create mode 100644 deps/openssl/openssl/doc/man3/BN_CTX_new.pod create mode 100644 deps/openssl/openssl/doc/man3/BN_CTX_start.pod create mode 100644 deps/openssl/openssl/doc/man3/BN_add.pod create mode 100644 deps/openssl/openssl/doc/man3/BN_add_word.pod create mode 100644 deps/openssl/openssl/doc/man3/BN_bn2bin.pod create mode 100644 deps/openssl/openssl/doc/man3/BN_cmp.pod create mode 100644 deps/openssl/openssl/doc/man3/BN_copy.pod create mode 100644 deps/openssl/openssl/doc/man3/BN_generate_prime.pod create mode 100644 deps/openssl/openssl/doc/man3/BN_mod_exp_mont.pod create mode 100644 deps/openssl/openssl/doc/man3/BN_mod_inverse.pod create mode 100644 deps/openssl/openssl/doc/man3/BN_mod_mul_montgomery.pod create mode 100644 deps/openssl/openssl/doc/man3/BN_mod_mul_reciprocal.pod create mode 100644 deps/openssl/openssl/doc/man3/BN_new.pod create mode 100644 deps/openssl/openssl/doc/man3/BN_num_bytes.pod create mode 100644 deps/openssl/openssl/doc/man3/BN_rand.pod create mode 100644 deps/openssl/openssl/doc/man3/BN_security_bits.pod create mode 100644 deps/openssl/openssl/doc/man3/BN_set_bit.pod create mode 100644 deps/openssl/openssl/doc/man3/BN_swap.pod create mode 100644 deps/openssl/openssl/doc/man3/BN_zero.pod create mode 100644 deps/openssl/openssl/doc/man3/BUF_MEM_new.pod create mode 100644 deps/openssl/openssl/doc/man3/CMS_EncryptedData_decrypt.pod create mode 100644 deps/openssl/openssl/doc/man3/CMS_EncryptedData_encrypt.pod create mode 100644 deps/openssl/openssl/doc/man3/CMS_EnvelopedData_create.pod create mode 100644 deps/openssl/openssl/doc/man3/CMS_add0_cert.pod create mode 100644 deps/openssl/openssl/doc/man3/CMS_add1_recipient_cert.pod create mode 100644 deps/openssl/openssl/doc/man3/CMS_add1_signer.pod create mode 100644 deps/openssl/openssl/doc/man3/CMS_compress.pod create mode 100644 deps/openssl/openssl/doc/man3/CMS_data_create.pod create mode 100644 deps/openssl/openssl/doc/man3/CMS_decrypt.pod create mode 100644 deps/openssl/openssl/doc/man3/CMS_digest_create.pod create mode 100644 deps/openssl/openssl/doc/man3/CMS_encrypt.pod create mode 100644 deps/openssl/openssl/doc/man3/CMS_final.pod create mode 100644 deps/openssl/openssl/doc/man3/CMS_get0_RecipientInfos.pod create mode 100644 deps/openssl/openssl/doc/man3/CMS_get0_SignerInfos.pod create mode 100644 deps/openssl/openssl/doc/man3/CMS_get0_type.pod create mode 100644 deps/openssl/openssl/doc/man3/CMS_get1_ReceiptRequest.pod create mode 100644 deps/openssl/openssl/doc/man3/CMS_sign.pod create mode 100644 deps/openssl/openssl/doc/man3/CMS_sign_receipt.pod create mode 100644 deps/openssl/openssl/doc/man3/CMS_uncompress.pod create mode 100644 deps/openssl/openssl/doc/man3/CMS_verify.pod create mode 100644 deps/openssl/openssl/doc/man3/CMS_verify_receipt.pod create mode 100644 deps/openssl/openssl/doc/man3/CONF_modules_free.pod create mode 100644 deps/openssl/openssl/doc/man3/CONF_modules_load_file.pod create mode 100644 deps/openssl/openssl/doc/man3/CRYPTO_THREAD_run_once.pod create mode 100644 deps/openssl/openssl/doc/man3/CRYPTO_get_ex_new_index.pod create mode 100644 deps/openssl/openssl/doc/man3/CRYPTO_memcmp.pod create mode 100644 deps/openssl/openssl/doc/man3/CTLOG_STORE_get0_log_by_id.pod create mode 100644 deps/openssl/openssl/doc/man3/CTLOG_STORE_new.pod create mode 100644 deps/openssl/openssl/doc/man3/CTLOG_new.pod create mode 100644 deps/openssl/openssl/doc/man3/CT_POLICY_EVAL_CTX_new.pod create mode 100644 deps/openssl/openssl/doc/man3/DEFINE_STACK_OF.pod create mode 100644 deps/openssl/openssl/doc/man3/DES_random_key.pod create mode 100644 deps/openssl/openssl/doc/man3/DH_generate_key.pod create mode 100644 deps/openssl/openssl/doc/man3/DH_generate_parameters.pod create mode 100644 deps/openssl/openssl/doc/man3/DH_get0_pqg.pod create mode 100644 deps/openssl/openssl/doc/man3/DH_get_1024_160.pod create mode 100644 deps/openssl/openssl/doc/man3/DH_meth_new.pod create mode 100644 deps/openssl/openssl/doc/man3/DH_new.pod create mode 100644 deps/openssl/openssl/doc/man3/DH_new_by_nid.pod create mode 100644 deps/openssl/openssl/doc/man3/DH_set_method.pod create mode 100644 deps/openssl/openssl/doc/man3/DH_size.pod create mode 100644 deps/openssl/openssl/doc/man3/DSA_SIG_new.pod create mode 100644 deps/openssl/openssl/doc/man3/DSA_do_sign.pod create mode 100644 deps/openssl/openssl/doc/man3/DSA_dup_DH.pod create mode 100644 deps/openssl/openssl/doc/man3/DSA_generate_key.pod create mode 100644 deps/openssl/openssl/doc/man3/DSA_generate_parameters.pod create mode 100644 deps/openssl/openssl/doc/man3/DSA_get0_pqg.pod create mode 100644 deps/openssl/openssl/doc/man3/DSA_meth_new.pod create mode 100644 deps/openssl/openssl/doc/man3/DSA_new.pod create mode 100644 deps/openssl/openssl/doc/man3/DSA_set_method.pod create mode 100644 deps/openssl/openssl/doc/man3/DSA_sign.pod create mode 100644 deps/openssl/openssl/doc/man3/DSA_size.pod create mode 100644 deps/openssl/openssl/doc/man3/DTLS_get_data_mtu.pod create mode 100644 deps/openssl/openssl/doc/man3/DTLS_set_timer_cb.pod create mode 100644 deps/openssl/openssl/doc/man3/DTLSv1_listen.pod create mode 100644 deps/openssl/openssl/doc/man3/ECDSA_SIG_new.pod create mode 100644 deps/openssl/openssl/doc/man3/ECDSA_sign.pod create mode 100644 deps/openssl/openssl/doc/man3/ECPKParameters_print.pod create mode 100644 deps/openssl/openssl/doc/man3/EC_GFp_simple_method.pod create mode 100644 deps/openssl/openssl/doc/man3/EC_GROUP_copy.pod create mode 100644 deps/openssl/openssl/doc/man3/EC_GROUP_new.pod create mode 100644 deps/openssl/openssl/doc/man3/EC_KEY_get_enc_flags.pod create mode 100644 deps/openssl/openssl/doc/man3/EC_KEY_new.pod create mode 100644 deps/openssl/openssl/doc/man3/EC_POINT_add.pod create mode 100644 deps/openssl/openssl/doc/man3/EC_POINT_new.pod create mode 100644 deps/openssl/openssl/doc/man3/ENGINE_add.pod create mode 100644 deps/openssl/openssl/doc/man3/ERR_GET_LIB.pod create mode 100644 deps/openssl/openssl/doc/man3/ERR_clear_error.pod create mode 100644 deps/openssl/openssl/doc/man3/ERR_error_string.pod create mode 100644 deps/openssl/openssl/doc/man3/ERR_get_error.pod create mode 100644 deps/openssl/openssl/doc/man3/ERR_load_crypto_strings.pod create mode 100644 deps/openssl/openssl/doc/man3/ERR_load_strings.pod create mode 100644 deps/openssl/openssl/doc/man3/ERR_new.pod create mode 100644 deps/openssl/openssl/doc/man3/ERR_print_errors.pod create mode 100644 deps/openssl/openssl/doc/man3/ERR_put_error.pod create mode 100644 deps/openssl/openssl/doc/man3/ERR_remove_state.pod create mode 100644 deps/openssl/openssl/doc/man3/ERR_set_mark.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_ASYM_CIPHER_free.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_BytesToKey.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_CIPHER_CTX_get_cipher_data.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_CIPHER_CTX_get_original_iv.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_CIPHER_meth_new.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_DigestInit.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_DigestSignInit.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_DigestVerifyInit.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_EncodeInit.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_EncryptInit.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_KDF.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_KEM_free.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_KEYEXCH_free.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_KEYMGMT.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_MAC.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_MD_meth_new.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_OpenInit.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_PBE_CipherInit.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_PKEY2PKCS8.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_PKEY_ASN1_METHOD.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_PKEY_CTX_ctrl.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_PKEY_CTX_get0_libctx.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_PKEY_CTX_get0_pkey.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_PKEY_CTX_new.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_PKEY_CTX_set1_pbe_pass.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_PKEY_CTX_set_hkdf_md.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_PKEY_CTX_set_params.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_PKEY_CTX_set_rsa_pss_keygen_md.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_PKEY_CTX_set_scrypt_N.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_PKEY_CTX_set_tls1_prf_md.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_PKEY_asn1_get_count.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_PKEY_check.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_PKEY_copy_parameters.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_PKEY_decapsulate.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_PKEY_decrypt.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_PKEY_derive.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_PKEY_digestsign_supports_digest.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_PKEY_encapsulate.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_PKEY_encrypt.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_PKEY_fromdata.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_PKEY_get_default_digest_nid.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_PKEY_get_field_type.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_PKEY_get_group_name.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_PKEY_get_size.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_PKEY_gettable_params.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_PKEY_is_a.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_PKEY_keygen.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_PKEY_meth_get_count.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_PKEY_meth_new.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_PKEY_new.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_PKEY_print_private.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_PKEY_set1_RSA.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_PKEY_set1_encoded_public_key.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_PKEY_set_type.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_PKEY_settable_params.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_PKEY_sign.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_PKEY_todata.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_PKEY_verify.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_PKEY_verify_recover.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_RAND.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_SIGNATURE.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_SealInit.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_SignInit.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_VerifyInit.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_aes_128_gcm.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_aria_128_gcm.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_bf_cbc.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_blake2b512.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_camellia_128_ecb.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_cast5_cbc.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_chacha20.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_des_cbc.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_desx_cbc.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_idea_cbc.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_md2.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_md4.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_md5.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_mdc2.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_rc2_cbc.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_rc4.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_rc5_32_12_16_cbc.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_ripemd160.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_seed_cbc.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_set_default_properties.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_sha1.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_sha224.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_sha3_224.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_sm3.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_sm4_cbc.pod create mode 100644 deps/openssl/openssl/doc/man3/EVP_whirlpool.pod create mode 100644 deps/openssl/openssl/doc/man3/HMAC.pod create mode 100644 deps/openssl/openssl/doc/man3/MD5.pod create mode 100644 deps/openssl/openssl/doc/man3/MDC2_Init.pod create mode 100644 deps/openssl/openssl/doc/man3/NCONF_new_ex.pod create mode 100644 deps/openssl/openssl/doc/man3/OBJ_nid2obj.pod create mode 100644 deps/openssl/openssl/doc/man3/OCSP_REQUEST_new.pod create mode 100644 deps/openssl/openssl/doc/man3/OCSP_cert_to_id.pod create mode 100644 deps/openssl/openssl/doc/man3/OCSP_request_add1_nonce.pod create mode 100644 deps/openssl/openssl/doc/man3/OCSP_resp_find_status.pod create mode 100644 deps/openssl/openssl/doc/man3/OCSP_response_status.pod create mode 100644 deps/openssl/openssl/doc/man3/OCSP_sendreq_new.pod create mode 100644 deps/openssl/openssl/doc/man3/OPENSSL_Applink.pod create mode 100644 deps/openssl/openssl/doc/man3/OPENSSL_FILE.pod create mode 100644 deps/openssl/openssl/doc/man3/OPENSSL_LH_COMPFUNC.pod create mode 100644 deps/openssl/openssl/doc/man3/OPENSSL_LH_stats.pod create mode 100644 deps/openssl/openssl/doc/man3/OPENSSL_config.pod create mode 100644 deps/openssl/openssl/doc/man3/OPENSSL_fork_prepare.pod create mode 100644 deps/openssl/openssl/doc/man3/OPENSSL_gmtime.pod create mode 100644 deps/openssl/openssl/doc/man3/OPENSSL_hexchar2int.pod create mode 100644 deps/openssl/openssl/doc/man3/OPENSSL_ia32cap.pod create mode 100644 deps/openssl/openssl/doc/man3/OPENSSL_init_crypto.pod create mode 100644 deps/openssl/openssl/doc/man3/OPENSSL_init_ssl.pod create mode 100644 deps/openssl/openssl/doc/man3/OPENSSL_instrument_bus.pod create mode 100644 deps/openssl/openssl/doc/man3/OPENSSL_load_builtin_modules.pod create mode 100644 deps/openssl/openssl/doc/man3/OPENSSL_malloc.pod create mode 100644 deps/openssl/openssl/doc/man3/OPENSSL_s390xcap.pod create mode 100644 deps/openssl/openssl/doc/man3/OPENSSL_secure_malloc.pod create mode 100644 deps/openssl/openssl/doc/man3/OPENSSL_strcasecmp.pod create mode 100644 deps/openssl/openssl/doc/man3/OSSL_ALGORITHM.pod create mode 100644 deps/openssl/openssl/doc/man3/OSSL_CALLBACK.pod create mode 100644 deps/openssl/openssl/doc/man3/OSSL_CMP_CTX_new.pod create mode 100644 deps/openssl/openssl/doc/man3/OSSL_CMP_HDR_get0_transactionID.pod create mode 100644 deps/openssl/openssl/doc/man3/OSSL_CMP_ITAV_set0.pod create mode 100644 deps/openssl/openssl/doc/man3/OSSL_CMP_MSG_get0_header.pod create mode 100644 deps/openssl/openssl/doc/man3/OSSL_CMP_MSG_http_perform.pod create mode 100644 deps/openssl/openssl/doc/man3/OSSL_CMP_SRV_CTX_new.pod create mode 100644 deps/openssl/openssl/doc/man3/OSSL_CMP_STATUSINFO_new.pod create mode 100644 deps/openssl/openssl/doc/man3/OSSL_CMP_exec_certreq.pod create mode 100644 deps/openssl/openssl/doc/man3/OSSL_CMP_log_open.pod create mode 100644 deps/openssl/openssl/doc/man3/OSSL_CMP_validate_msg.pod create mode 100644 deps/openssl/openssl/doc/man3/OSSL_CORE_MAKE_FUNC.pod create mode 100644 deps/openssl/openssl/doc/man3/OSSL_CRMF_MSG_get0_tmpl.pod create mode 100644 deps/openssl/openssl/doc/man3/OSSL_CRMF_MSG_set0_validity.pod create mode 100644 deps/openssl/openssl/doc/man3/OSSL_CRMF_MSG_set1_regCtrl_regToken.pod create mode 100644 deps/openssl/openssl/doc/man3/OSSL_CRMF_MSG_set1_regInfo_certReq.pod create mode 100644 deps/openssl/openssl/doc/man3/OSSL_CRMF_pbmp_new.pod create mode 100644 deps/openssl/openssl/doc/man3/OSSL_DECODER.pod create mode 100644 deps/openssl/openssl/doc/man3/OSSL_DECODER_CTX.pod create mode 100644 deps/openssl/openssl/doc/man3/OSSL_DECODER_CTX_new_for_pkey.pod create mode 100644 deps/openssl/openssl/doc/man3/OSSL_DECODER_from_bio.pod create mode 100644 deps/openssl/openssl/doc/man3/OSSL_DISPATCH.pod create mode 100644 deps/openssl/openssl/doc/man3/OSSL_ENCODER.pod create mode 100644 deps/openssl/openssl/doc/man3/OSSL_ENCODER_CTX.pod create mode 100644 deps/openssl/openssl/doc/man3/OSSL_ENCODER_CTX_new_for_pkey.pod create mode 100644 deps/openssl/openssl/doc/man3/OSSL_ENCODER_to_bio.pod create mode 100644 deps/openssl/openssl/doc/man3/OSSL_ESS_check_signing_certs.pod create mode 100644 deps/openssl/openssl/doc/man3/OSSL_HTTP_REQ_CTX.pod create mode 100644 deps/openssl/openssl/doc/man3/OSSL_HTTP_parse_url.pod create mode 100644 deps/openssl/openssl/doc/man3/OSSL_HTTP_transfer.pod create mode 100644 deps/openssl/openssl/doc/man3/OSSL_ITEM.pod create mode 100644 deps/openssl/openssl/doc/man3/OSSL_LIB_CTX.pod create mode 100644 deps/openssl/openssl/doc/man3/OSSL_PARAM.pod create mode 100644 deps/openssl/openssl/doc/man3/OSSL_PARAM_BLD.pod create mode 100644 deps/openssl/openssl/doc/man3/OSSL_PARAM_allocate_from_text.pod create mode 100644 deps/openssl/openssl/doc/man3/OSSL_PARAM_dup.pod create mode 100644 deps/openssl/openssl/doc/man3/OSSL_PARAM_int.pod create mode 100644 deps/openssl/openssl/doc/man3/OSSL_PROVIDER.pod create mode 100644 deps/openssl/openssl/doc/man3/OSSL_SELF_TEST_new.pod create mode 100644 deps/openssl/openssl/doc/man3/OSSL_SELF_TEST_set_callback.pod create mode 100644 deps/openssl/openssl/doc/man3/OSSL_STORE_INFO.pod create mode 100644 deps/openssl/openssl/doc/man3/OSSL_STORE_LOADER.pod create mode 100644 deps/openssl/openssl/doc/man3/OSSL_STORE_SEARCH.pod create mode 100644 deps/openssl/openssl/doc/man3/OSSL_STORE_attach.pod create mode 100644 deps/openssl/openssl/doc/man3/OSSL_STORE_expect.pod create mode 100644 deps/openssl/openssl/doc/man3/OSSL_STORE_open.pod create mode 100644 deps/openssl/openssl/doc/man3/OSSL_trace_enabled.pod create mode 100644 deps/openssl/openssl/doc/man3/OSSL_trace_get_category_num.pod create mode 100644 deps/openssl/openssl/doc/man3/OSSL_trace_set_channel.pod create mode 100644 deps/openssl/openssl/doc/man3/OpenSSL_add_all_algorithms.pod create mode 100644 deps/openssl/openssl/doc/man3/OpenSSL_version.pod create mode 100644 deps/openssl/openssl/doc/man3/PEM_X509_INFO_read_bio_ex.pod create mode 100644 deps/openssl/openssl/doc/man3/PEM_bytes_read_bio.pod create mode 100644 deps/openssl/openssl/doc/man3/PEM_read.pod create mode 100644 deps/openssl/openssl/doc/man3/PEM_read_CMS.pod create mode 100644 deps/openssl/openssl/doc/man3/PEM_read_bio_PrivateKey.pod create mode 100644 deps/openssl/openssl/doc/man3/PEM_read_bio_ex.pod create mode 100644 deps/openssl/openssl/doc/man3/PEM_write_bio_CMS_stream.pod create mode 100644 deps/openssl/openssl/doc/man3/PEM_write_bio_PKCS7_stream.pod create mode 100644 deps/openssl/openssl/doc/man3/PKCS12_PBE_keyivgen.pod create mode 100644 deps/openssl/openssl/doc/man3/PKCS12_SAFEBAG_create_cert.pod create mode 100644 deps/openssl/openssl/doc/man3/PKCS12_SAFEBAG_get0_attrs.pod create mode 100644 deps/openssl/openssl/doc/man3/PKCS12_SAFEBAG_get1_cert.pod create mode 100644 deps/openssl/openssl/doc/man3/PKCS12_add1_attr_by_NID.pod create mode 100644 deps/openssl/openssl/doc/man3/PKCS12_add_CSPName_asc.pod create mode 100644 deps/openssl/openssl/doc/man3/PKCS12_add_cert.pod create mode 100644 deps/openssl/openssl/doc/man3/PKCS12_add_friendlyname_asc.pod create mode 100644 deps/openssl/openssl/doc/man3/PKCS12_add_localkeyid.pod create mode 100644 deps/openssl/openssl/doc/man3/PKCS12_add_safe.pod create mode 100644 deps/openssl/openssl/doc/man3/PKCS12_create.pod create mode 100644 deps/openssl/openssl/doc/man3/PKCS12_decrypt_skey.pod create mode 100644 deps/openssl/openssl/doc/man3/PKCS12_gen_mac.pod create mode 100644 deps/openssl/openssl/doc/man3/PKCS12_get_friendlyname.pod create mode 100644 deps/openssl/openssl/doc/man3/PKCS12_init.pod create mode 100644 deps/openssl/openssl/doc/man3/PKCS12_item_decrypt_d2i.pod create mode 100644 deps/openssl/openssl/doc/man3/PKCS12_key_gen_utf8_ex.pod create mode 100644 deps/openssl/openssl/doc/man3/PKCS12_newpass.pod create mode 100644 deps/openssl/openssl/doc/man3/PKCS12_pack_p7encdata.pod create mode 100644 deps/openssl/openssl/doc/man3/PKCS12_parse.pod create mode 100644 deps/openssl/openssl/doc/man3/PKCS5_PBE_keyivgen.pod create mode 100644 deps/openssl/openssl/doc/man3/PKCS5_PBKDF2_HMAC.pod create mode 100644 deps/openssl/openssl/doc/man3/PKCS7_decrypt.pod create mode 100644 deps/openssl/openssl/doc/man3/PKCS7_encrypt.pod create mode 100644 deps/openssl/openssl/doc/man3/PKCS7_get_octet_string.pod create mode 100644 deps/openssl/openssl/doc/man3/PKCS7_sign.pod create mode 100644 deps/openssl/openssl/doc/man3/PKCS7_sign_add_signer.pod create mode 100644 deps/openssl/openssl/doc/man3/PKCS7_type_is_other.pod create mode 100644 deps/openssl/openssl/doc/man3/PKCS7_verify.pod create mode 100644 deps/openssl/openssl/doc/man3/PKCS8_encrypt.pod create mode 100644 deps/openssl/openssl/doc/man3/PKCS8_pkey_add1_attr.pod create mode 100644 deps/openssl/openssl/doc/man3/RAND_add.pod create mode 100644 deps/openssl/openssl/doc/man3/RAND_bytes.pod create mode 100644 deps/openssl/openssl/doc/man3/RAND_cleanup.pod create mode 100644 deps/openssl/openssl/doc/man3/RAND_egd.pod create mode 100644 deps/openssl/openssl/doc/man3/RAND_get0_primary.pod create mode 100644 deps/openssl/openssl/doc/man3/RAND_load_file.pod create mode 100644 deps/openssl/openssl/doc/man3/RAND_set_DRBG_type.pod create mode 100644 deps/openssl/openssl/doc/man3/RAND_set_rand_method.pod create mode 100644 deps/openssl/openssl/doc/man3/RC4_set_key.pod create mode 100644 deps/openssl/openssl/doc/man3/RIPEMD160_Init.pod create mode 100644 deps/openssl/openssl/doc/man3/RSA_blinding_on.pod create mode 100644 deps/openssl/openssl/doc/man3/RSA_check_key.pod create mode 100644 deps/openssl/openssl/doc/man3/RSA_generate_key.pod create mode 100644 deps/openssl/openssl/doc/man3/RSA_get0_key.pod create mode 100644 deps/openssl/openssl/doc/man3/RSA_meth_new.pod create mode 100644 deps/openssl/openssl/doc/man3/RSA_new.pod create mode 100644 deps/openssl/openssl/doc/man3/RSA_padding_add_PKCS1_type_1.pod create mode 100644 deps/openssl/openssl/doc/man3/RSA_print.pod create mode 100644 deps/openssl/openssl/doc/man3/RSA_private_encrypt.pod create mode 100644 deps/openssl/openssl/doc/man3/RSA_public_encrypt.pod create mode 100644 deps/openssl/openssl/doc/man3/RSA_set_method.pod create mode 100644 deps/openssl/openssl/doc/man3/RSA_sign.pod create mode 100644 deps/openssl/openssl/doc/man3/RSA_sign_ASN1_OCTET_STRING.pod create mode 100644 deps/openssl/openssl/doc/man3/RSA_size.pod create mode 100644 deps/openssl/openssl/doc/man3/SCT_new.pod create mode 100644 deps/openssl/openssl/doc/man3/SCT_print.pod create mode 100644 deps/openssl/openssl/doc/man3/SCT_validate.pod create mode 100644 deps/openssl/openssl/doc/man3/SHA256_Init.pod create mode 100644 deps/openssl/openssl/doc/man3/SMIME_read_ASN1.pod create mode 100644 deps/openssl/openssl/doc/man3/SMIME_read_CMS.pod create mode 100644 deps/openssl/openssl/doc/man3/SMIME_read_PKCS7.pod create mode 100644 deps/openssl/openssl/doc/man3/SMIME_write_ASN1.pod create mode 100644 deps/openssl/openssl/doc/man3/SMIME_write_CMS.pod create mode 100644 deps/openssl/openssl/doc/man3/SMIME_write_PKCS7.pod create mode 100644 deps/openssl/openssl/doc/man3/SRP_Calc_B.pod create mode 100644 deps/openssl/openssl/doc/man3/SRP_VBASE_new.pod create mode 100644 deps/openssl/openssl/doc/man3/SRP_create_verifier.pod create mode 100644 deps/openssl/openssl/doc/man3/SRP_user_pwd_new.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_CIPHER_get_name.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_COMP_add_compression_method.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_CONF_CTX_new.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_CONF_CTX_set1_prefix.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_CONF_CTX_set_flags.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_CONF_CTX_set_ssl_ctx.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_CONF_cmd.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_CONF_cmd_argv.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_CTX_add1_chain_cert.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_CTX_add_extra_chain_cert.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_CTX_add_session.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_CTX_config.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_CTX_ctrl.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_CTX_dane_enable.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_CTX_flush_sessions.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_CTX_free.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_CTX_get0_param.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_CTX_get_verify_mode.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_CTX_has_client_custom_ext.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_CTX_load_verify_locations.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_CTX_new.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_CTX_sess_number.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_CTX_sess_set_cache_size.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_CTX_sess_set_get_cb.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_CTX_sessions.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_CTX_set0_CA_list.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_CTX_set1_curves.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_CTX_set1_sigalgs.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_CTX_set1_verify_cert_store.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_CTX_set_alpn_select_cb.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_CTX_set_cert_cb.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_CTX_set_cert_store.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_CTX_set_cert_verify_callback.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_CTX_set_cipher_list.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_CTX_set_client_cert_cb.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_CTX_set_client_hello_cb.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_CTX_set_ct_validation_callback.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_CTX_set_ctlog_list_file.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_CTX_set_default_passwd_cb.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_CTX_set_generate_session_id.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_CTX_set_info_callback.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_CTX_set_keylog_callback.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_CTX_set_max_cert_list.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_CTX_set_min_proto_version.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_CTX_set_mode.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_CTX_set_msg_callback.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_CTX_set_num_tickets.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_CTX_set_options.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_CTX_set_psk_client_callback.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_CTX_set_quiet_shutdown.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_CTX_set_read_ahead.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_CTX_set_record_padding_callback.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_CTX_set_security_level.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_CTX_set_session_cache_mode.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_CTX_set_session_id_context.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_CTX_set_session_ticket_cb.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_CTX_set_split_send_fragment.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_CTX_set_srp_password.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_CTX_set_ssl_version.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_CTX_set_stateless_cookie_generate_cb.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_CTX_set_timeout.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_CTX_set_tlsext_servername_callback.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_CTX_set_tlsext_status_cb.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_CTX_set_tlsext_ticket_key_cb.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_CTX_set_tlsext_use_srtp.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_CTX_set_tmp_dh_callback.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_CTX_set_tmp_ecdh.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_CTX_set_verify.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_CTX_use_certificate.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_CTX_use_psk_identity_hint.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_CTX_use_serverinfo.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_SESSION_free.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_SESSION_get0_cipher.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_SESSION_get0_hostname.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_SESSION_get0_id_context.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_SESSION_get0_peer.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_SESSION_get_compress_id.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_SESSION_get_protocol_version.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_SESSION_get_time.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_SESSION_has_ticket.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_SESSION_is_resumable.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_SESSION_print.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_SESSION_set1_id.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_accept.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_alert_type_string.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_alloc_buffers.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_check_chain.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_clear.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_connect.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_do_handshake.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_export_keying_material.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_extension_supported.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_free.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_get0_peer_scts.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_get_SSL_CTX.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_get_all_async_fds.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_get_certificate.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_get_ciphers.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_get_client_random.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_get_current_cipher.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_get_default_timeout.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_get_error.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_get_extms_support.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_get_fd.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_get_peer_cert_chain.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_get_peer_certificate.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_get_peer_signature_nid.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_get_peer_tmp_key.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_get_psk_identity.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_get_rbio.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_get_session.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_get_shared_sigalgs.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_get_verify_result.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_get_version.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_group_to_name.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_in_init.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_key_update.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_library_init.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_load_client_CA_file.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_new.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_pending.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_read.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_read_early_data.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_rstate_string.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_session_reused.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_set1_host.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_set_async_callback.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_set_bio.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_set_connect_state.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_set_fd.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_set_retry_verify.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_set_session.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_set_shutdown.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_set_verify_result.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_shutdown.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_state_string.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_want.pod create mode 100644 deps/openssl/openssl/doc/man3/SSL_write.pod create mode 100644 deps/openssl/openssl/doc/man3/TS_RESP_CTX_new.pod create mode 100644 deps/openssl/openssl/doc/man3/TS_VERIFY_CTX_set_certs.pod create mode 100644 deps/openssl/openssl/doc/man3/UI_STRING.pod create mode 100644 deps/openssl/openssl/doc/man3/UI_UTIL_read_pw.pod create mode 100644 deps/openssl/openssl/doc/man3/UI_create_method.pod create mode 100644 deps/openssl/openssl/doc/man3/UI_new.pod create mode 100644 deps/openssl/openssl/doc/man3/X509V3_get_d2i.pod create mode 100644 deps/openssl/openssl/doc/man3/X509V3_set_ctx.pod create mode 100644 deps/openssl/openssl/doc/man3/X509_ALGOR_dup.pod create mode 100644 deps/openssl/openssl/doc/man3/X509_CRL_get0_by_serial.pod create mode 100644 deps/openssl/openssl/doc/man3/X509_EXTENSION_set_object.pod create mode 100644 deps/openssl/openssl/doc/man3/X509_LOOKUP.pod create mode 100644 deps/openssl/openssl/doc/man3/X509_LOOKUP_hash_dir.pod create mode 100644 deps/openssl/openssl/doc/man3/X509_LOOKUP_meth_new.pod create mode 100644 deps/openssl/openssl/doc/man3/X509_NAME_ENTRY_get_object.pod create mode 100644 deps/openssl/openssl/doc/man3/X509_NAME_add_entry_by_txt.pod create mode 100644 deps/openssl/openssl/doc/man3/X509_NAME_get0_der.pod create mode 100644 deps/openssl/openssl/doc/man3/X509_NAME_get_index_by_NID.pod create mode 100644 deps/openssl/openssl/doc/man3/X509_NAME_print_ex.pod create mode 100644 deps/openssl/openssl/doc/man3/X509_PUBKEY_new.pod create mode 100644 deps/openssl/openssl/doc/man3/X509_SIG_get0.pod create mode 100644 deps/openssl/openssl/doc/man3/X509_STORE_CTX_get_error.pod create mode 100644 deps/openssl/openssl/doc/man3/X509_STORE_CTX_new.pod create mode 100644 deps/openssl/openssl/doc/man3/X509_STORE_CTX_set_verify_cb.pod create mode 100644 deps/openssl/openssl/doc/man3/X509_STORE_add_cert.pod create mode 100644 deps/openssl/openssl/doc/man3/X509_STORE_get0_param.pod create mode 100644 deps/openssl/openssl/doc/man3/X509_STORE_new.pod create mode 100644 deps/openssl/openssl/doc/man3/X509_STORE_set_verify_cb_func.pod create mode 100644 deps/openssl/openssl/doc/man3/X509_VERIFY_PARAM_set_flags.pod create mode 100644 deps/openssl/openssl/doc/man3/X509_add_cert.pod create mode 100644 deps/openssl/openssl/doc/man3/X509_check_ca.pod create mode 100644 deps/openssl/openssl/doc/man3/X509_check_host.pod create mode 100644 deps/openssl/openssl/doc/man3/X509_check_issued.pod create mode 100644 deps/openssl/openssl/doc/man3/X509_check_private_key.pod create mode 100644 deps/openssl/openssl/doc/man3/X509_check_purpose.pod create mode 100644 deps/openssl/openssl/doc/man3/X509_cmp.pod create mode 100644 deps/openssl/openssl/doc/man3/X509_cmp_time.pod create mode 100644 deps/openssl/openssl/doc/man3/X509_digest.pod create mode 100644 deps/openssl/openssl/doc/man3/X509_dup.pod create mode 100644 deps/openssl/openssl/doc/man3/X509_get0_distinguishing_id.pod create mode 100644 deps/openssl/openssl/doc/man3/X509_get0_notBefore.pod create mode 100644 deps/openssl/openssl/doc/man3/X509_get0_signature.pod create mode 100644 deps/openssl/openssl/doc/man3/X509_get0_uids.pod create mode 100644 deps/openssl/openssl/doc/man3/X509_get_extension_flags.pod create mode 100644 deps/openssl/openssl/doc/man3/X509_get_pubkey.pod create mode 100644 deps/openssl/openssl/doc/man3/X509_get_serialNumber.pod create mode 100644 deps/openssl/openssl/doc/man3/X509_get_subject_name.pod create mode 100644 deps/openssl/openssl/doc/man3/X509_get_version.pod create mode 100644 deps/openssl/openssl/doc/man3/X509_load_http.pod create mode 100644 deps/openssl/openssl/doc/man3/X509_new.pod create mode 100644 deps/openssl/openssl/doc/man3/X509_sign.pod create mode 100644 deps/openssl/openssl/doc/man3/X509_verify.pod create mode 100644 deps/openssl/openssl/doc/man3/X509_verify_cert.pod create mode 100644 deps/openssl/openssl/doc/man3/X509v3_get_ext_by_NID.pod create mode 100644 deps/openssl/openssl/doc/man3/b2i_PVK_bio_ex.pod create mode 100644 deps/openssl/openssl/doc/man3/d2i_PKCS8PrivateKey_bio.pod create mode 100644 deps/openssl/openssl/doc/man3/d2i_PrivateKey.pod create mode 100644 deps/openssl/openssl/doc/man3/d2i_RSAPrivateKey.pod create mode 100644 deps/openssl/openssl/doc/man3/d2i_SSL_SESSION.pod create mode 100644 deps/openssl/openssl/doc/man3/d2i_X509.pod create mode 100644 deps/openssl/openssl/doc/man3/i2d_CMS_bio_stream.pod create mode 100644 deps/openssl/openssl/doc/man3/i2d_PKCS7_bio_stream.pod create mode 100644 deps/openssl/openssl/doc/man3/i2d_re_X509_tbs.pod create mode 100644 deps/openssl/openssl/doc/man3/o2i_SCT_LIST.pod create mode 100644 deps/openssl/openssl/doc/man3/s2i_ASN1_IA5STRING.pod create mode 100644 deps/openssl/openssl/doc/man5/config.pod create mode 100644 deps/openssl/openssl/doc/man5/fips_config.pod create mode 100644 deps/openssl/openssl/doc/man5/x509v3_config.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_ASYM_CIPHER-RSA.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_ASYM_CIPHER-SM2.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_CIPHER-AES.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_CIPHER-ARIA.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_CIPHER-BLOWFISH.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_CIPHER-CAMELLIA.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_CIPHER-CAST.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_CIPHER-CHACHA.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_CIPHER-DES.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_CIPHER-IDEA.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_CIPHER-NULL.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_CIPHER-RC2.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_CIPHER-RC4.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_CIPHER-RC5.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_CIPHER-SEED.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_CIPHER-SM4.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_KDF-HKDF.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_KDF-KB.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_KDF-KRB5KDF.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_KDF-PBKDF1.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_KDF-PBKDF2.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_KDF-PKCS12KDF.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_KDF-SCRYPT.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_KDF-SS.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_KDF-SSHKDF.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_KDF-TLS13_KDF.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_KDF-TLS1_PRF.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_KDF-X942-ASN1.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_KDF-X942-CONCAT.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_KDF-X963.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_KEM-RSA.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_KEYEXCH-DH.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_KEYEXCH-ECDH.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_KEYEXCH-X25519.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_MAC-BLAKE2.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_MAC-CMAC.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_MAC-GMAC.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_MAC-HMAC.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_MAC-KMAC.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_MAC-Poly1305.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_MAC-Siphash.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_MD-BLAKE2.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_MD-MD2.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_MD-MD4.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_MD-MD5-SHA1.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_MD-MD5.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_MD-MDC2.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_MD-NULL.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_MD-RIPEMD160.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_MD-SHA1.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_MD-SHA2.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_MD-SHA3.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_MD-SHAKE.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_MD-SM3.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_MD-WHIRLPOOL.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_MD-common.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_PKEY-DH.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_PKEY-DSA.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_PKEY-EC.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_PKEY-FFC.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_PKEY-HMAC.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_PKEY-RSA.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_PKEY-SM2.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_PKEY-X25519.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_RAND-CTR-DRBG.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_RAND-HASH-DRBG.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_RAND-HMAC-DRBG.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_RAND-SEED-SRC.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_RAND-TEST-RAND.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_RAND.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_SIGNATURE-DSA.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_SIGNATURE-ECDSA.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_SIGNATURE-ED25519.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_SIGNATURE-HMAC.pod create mode 100644 deps/openssl/openssl/doc/man7/EVP_SIGNATURE-RSA.pod create mode 100644 deps/openssl/openssl/doc/man7/OSSL_PROVIDER-FIPS.pod create mode 100644 deps/openssl/openssl/doc/man7/OSSL_PROVIDER-base.pod create mode 100644 deps/openssl/openssl/doc/man7/OSSL_PROVIDER-default.pod create mode 100644 deps/openssl/openssl/doc/man7/OSSL_PROVIDER-legacy.pod create mode 100644 deps/openssl/openssl/doc/man7/OSSL_PROVIDER-null.pod create mode 100644 deps/openssl/openssl/doc/man7/RAND.pod create mode 100644 deps/openssl/openssl/doc/man7/RSA-PSS.pod create mode 100644 deps/openssl/openssl/doc/man7/X25519.pod create mode 100644 deps/openssl/openssl/doc/man7/bio.pod create mode 100644 deps/openssl/openssl/doc/man7/crypto.pod create mode 100644 deps/openssl/openssl/doc/man7/ct.pod create mode 100644 deps/openssl/openssl/doc/man7/des_modes.pod create mode 100644 deps/openssl/openssl/doc/man7/evp.pod create mode 100644 deps/openssl/openssl/doc/man7/fips_module.pod create mode 100644 deps/openssl/openssl/doc/man7/img/cipher.png create mode 100644 deps/openssl/openssl/doc/man7/img/digest.png create mode 100644 deps/openssl/openssl/doc/man7/img/kdf.png create mode 100644 deps/openssl/openssl/doc/man7/img/mac.png create mode 100644 deps/openssl/openssl/doc/man7/img/pkey.png create mode 100644 deps/openssl/openssl/doc/man7/img/rand.png create mode 100644 deps/openssl/openssl/doc/man7/life_cycle-cipher.pod create mode 100644 deps/openssl/openssl/doc/man7/life_cycle-digest.pod create mode 100644 deps/openssl/openssl/doc/man7/life_cycle-kdf.pod create mode 100644 deps/openssl/openssl/doc/man7/life_cycle-mac.pod create mode 100644 deps/openssl/openssl/doc/man7/life_cycle-pkey.pod create mode 100644 deps/openssl/openssl/doc/man7/life_cycle-rand.pod create mode 100644 deps/openssl/openssl/doc/man7/migration_guide.pod create mode 100644 deps/openssl/openssl/doc/man7/openssl-core.h.pod create mode 100644 deps/openssl/openssl/doc/man7/openssl-core_dispatch.h.pod create mode 100644 deps/openssl/openssl/doc/man7/openssl-core_names.h.pod create mode 100644 deps/openssl/openssl/doc/man7/openssl-env.pod create mode 100644 deps/openssl/openssl/doc/man7/openssl-glossary.pod create mode 100644 deps/openssl/openssl/doc/man7/openssl-threads.pod create mode 100644 deps/openssl/openssl/doc/man7/openssl_user_macros.pod.in create mode 100644 deps/openssl/openssl/doc/man7/ossl_store-file.pod create mode 100644 deps/openssl/openssl/doc/man7/ossl_store.pod create mode 100644 deps/openssl/openssl/doc/man7/passphrase-encoding.pod create mode 100644 deps/openssl/openssl/doc/man7/property.pod create mode 100644 deps/openssl/openssl/doc/man7/provider-asym_cipher.pod create mode 100644 deps/openssl/openssl/doc/man7/provider-base.pod create mode 100644 deps/openssl/openssl/doc/man7/provider-cipher.pod create mode 100644 deps/openssl/openssl/doc/man7/provider-decoder.pod create mode 100644 deps/openssl/openssl/doc/man7/provider-digest.pod create mode 100644 deps/openssl/openssl/doc/man7/provider-encoder.pod create mode 100644 deps/openssl/openssl/doc/man7/provider-kdf.pod create mode 100644 deps/openssl/openssl/doc/man7/provider-kem.pod create mode 100644 deps/openssl/openssl/doc/man7/provider-keyexch.pod create mode 100644 deps/openssl/openssl/doc/man7/provider-keymgmt.pod create mode 100644 deps/openssl/openssl/doc/man7/provider-mac.pod create mode 100644 deps/openssl/openssl/doc/man7/provider-object.pod create mode 100644 deps/openssl/openssl/doc/man7/provider-rand.pod create mode 100644 deps/openssl/openssl/doc/man7/provider-signature.pod create mode 100644 deps/openssl/openssl/doc/man7/provider-storemgmt.pod create mode 100644 deps/openssl/openssl/doc/man7/provider.pod create mode 100644 deps/openssl/openssl/doc/man7/proxy-certificates.pod create mode 100644 deps/openssl/openssl/doc/man7/ssl.pod create mode 100644 deps/openssl/openssl/doc/man7/x509.pod create mode 100644 deps/openssl/openssl/doc/openssl-c-indent.el create mode 100644 deps/openssl/openssl/doc/perlvars.pm create mode 100755 deps/openssl/openssl/empty.py create mode 100755 deps/openssl/openssl/make_openssl_build_all_generated.sh create mode 100644 deps/openssl/openssl/ohos_lite/BUILD.gn create mode 100644 deps/openssl/openssl/ohos_lite/crypto/cryptlib.c create mode 100644 deps/openssl/openssl/ohos_lite/crypto/ec/curve25519.c create mode 100644 deps/openssl/openssl/ohos_lite/crypto/ec/ec_local.h create mode 100644 deps/openssl/openssl/ohos_lite/crypto/mem_clr.c create mode 100644 deps/openssl/openssl/ohos_lite/crypto/sha/sha512.c create mode 100644 deps/openssl/openssl/ohos_lite/e_os.h create mode 100644 deps/openssl/openssl/ohos_lite/include/crypto/__DECC_INCLUDE_EPILOGUE.H create mode 100644 deps/openssl/openssl/ohos_lite/include/crypto/__DECC_INCLUDE_PROLOGUE.H create mode 100644 deps/openssl/openssl/ohos_lite/include/crypto/aria.h create mode 100644 deps/openssl/openssl/ohos_lite/include/crypto/asn1.h create mode 100644 deps/openssl/openssl/ohos_lite/include/crypto/async.h create mode 100644 deps/openssl/openssl/ohos_lite/include/crypto/bn.h create mode 100644 deps/openssl/openssl/ohos_lite/include/crypto/bn_conf.h create mode 100644 deps/openssl/openssl/ohos_lite/include/crypto/bn_conf.h.in create mode 100644 deps/openssl/openssl/ohos_lite/include/crypto/bn_dh.h create mode 100644 deps/openssl/openssl/ohos_lite/include/crypto/bn_srp.h create mode 100644 deps/openssl/openssl/ohos_lite/include/crypto/chacha.h create mode 100644 deps/openssl/openssl/ohos_lite/include/crypto/cryptlib.h create mode 100644 deps/openssl/openssl/ohos_lite/include/crypto/ctype.h create mode 100644 deps/openssl/openssl/ohos_lite/include/crypto/dso_conf.h create mode 100644 deps/openssl/openssl/ohos_lite/include/crypto/dso_conf.h.in create mode 100644 deps/openssl/openssl/ohos_lite/include/crypto/ec.h create mode 100644 deps/openssl/openssl/ohos_lite/include/crypto/engine.h create mode 100644 deps/openssl/openssl/ohos_lite/include/crypto/err.h create mode 100644 deps/openssl/openssl/ohos_lite/include/crypto/evp.h create mode 100644 deps/openssl/openssl/ohos_lite/include/crypto/lhash.h create mode 100644 deps/openssl/openssl/ohos_lite/include/crypto/md32_common.h create mode 100644 deps/openssl/openssl/ohos_lite/include/crypto/objects.h create mode 100644 deps/openssl/openssl/ohos_lite/include/crypto/poly1305.h create mode 100644 deps/openssl/openssl/ohos_lite/include/crypto/rand.h create mode 100644 deps/openssl/openssl/ohos_lite/include/crypto/sha.h create mode 100644 deps/openssl/openssl/ohos_lite/include/crypto/siphash.h create mode 100644 deps/openssl/openssl/ohos_lite/include/crypto/sm2.h create mode 100644 deps/openssl/openssl/ohos_lite/include/crypto/sm2err.h create mode 100644 deps/openssl/openssl/ohos_lite/include/crypto/sm3.h create mode 100644 deps/openssl/openssl/ohos_lite/include/crypto/sm4.h create mode 100644 deps/openssl/openssl/ohos_lite/include/crypto/store.h create mode 100644 deps/openssl/openssl/ohos_lite/include/crypto/x509.h create mode 100644 deps/openssl/openssl/ohos_lite/include/internal/__DECC_INCLUDE_EPILOGUE.H create mode 100644 deps/openssl/openssl/ohos_lite/include/internal/__DECC_INCLUDE_PROLOGUE.H create mode 100644 deps/openssl/openssl/ohos_lite/include/internal/bio.h create mode 100644 deps/openssl/openssl/ohos_lite/include/internal/comp.h create mode 100644 deps/openssl/openssl/ohos_lite/include/internal/conf.h create mode 100644 deps/openssl/openssl/ohos_lite/include/internal/constant_time.h create mode 100644 deps/openssl/openssl/ohos_lite/include/internal/cryptlib.h create mode 100644 deps/openssl/openssl/ohos_lite/include/internal/dane.h create mode 100644 deps/openssl/openssl/ohos_lite/include/internal/dso.h create mode 100644 deps/openssl/openssl/ohos_lite/include/internal/dsoerr.h create mode 100644 deps/openssl/openssl/ohos_lite/include/internal/err.h create mode 100644 deps/openssl/openssl/ohos_lite/include/internal/nelem.h create mode 100644 deps/openssl/openssl/ohos_lite/include/internal/numbers.h create mode 100644 deps/openssl/openssl/ohos_lite/include/internal/o_dir.h create mode 100644 deps/openssl/openssl/ohos_lite/include/internal/o_str.h create mode 100644 deps/openssl/openssl/ohos_lite/include/internal/refcount.h create mode 100644 deps/openssl/openssl/ohos_lite/include/internal/sockets.h create mode 100644 deps/openssl/openssl/ohos_lite/include/internal/sslconf.h create mode 100644 deps/openssl/openssl/ohos_lite/include/internal/thread_once.h create mode 100644 deps/openssl/openssl/ohos_lite/include/internal/tsan_assist.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/__DECC_INCLUDE_EPILOGUE.H create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/__DECC_INCLUDE_PROLOGUE.H create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/aes.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/asn1.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/asn1_mac.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/asn1err.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/asn1t.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/async.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/asyncerr.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/bio.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/bioerr.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/blowfish.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/bn.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/bnerr.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/buffer.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/buffererr.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/camellia.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/cast.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/cmac.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/cms.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/cmserr.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/comp.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/comperr.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/conf.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/conf_api.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/conferr.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/crypto.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/cryptoerr.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/ct.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/cterr.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/des.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/dh.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/dherr.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/dsa.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/dsaerr.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/dtls1.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/e_os2.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/ebcdic.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/ec.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/ecdh.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/ecdsa.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/ecerr.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/engine.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/engineerr.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/err.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/evp.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/evperr.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/hmac.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/idea.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/kdf.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/kdferr.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/lhash.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/md2.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/md4.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/md5.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/mdc2.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/modes.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/obj_mac.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/objects.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/objectserr.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/ocsp.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/ocsperr.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/opensslconf.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/opensslconf.h.in create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/opensslv.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/ossl_typ.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/pem.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/pem2.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/pemerr.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/pkcs12.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/pkcs12err.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/pkcs7.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/pkcs7err.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/rand.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/rand_drbg.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/randerr.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/rc2.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/rc4.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/rc5.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/ripemd.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/rsa.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/rsaerr.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/safestack.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/seed.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/sha.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/srp.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/srtp.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/ssl.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/ssl2.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/ssl3.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/sslerr.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/stack.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/store.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/storeerr.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/symhacks.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/tls1.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/ts.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/tserr.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/txt_db.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/ui.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/uierr.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/whrlpool.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/x509.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/x509_vfy.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/x509err.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/x509v3.h create mode 100644 deps/openssl/openssl/ohos_lite/include/openssl/x509v3err.h create mode 100644 deps/openssl/openssl/open_harmony_openssl_config/openssl.cnf create mode 100755 deps/openssl/openssl/run_command.py delete mode 100644 deps/openssl/openssl/ssl/ssl_quic.c delete mode 100644 deps/openssl/openssl/ssl/statem/statem_quic.c create mode 100644 deps/openssl/openssl/test/CAtsa.cnf create mode 100644 deps/openssl/openssl/test/README-dev.md create mode 100644 deps/openssl/openssl/test/README-external.md create mode 100644 deps/openssl/openssl/test/README.md create mode 100644 deps/openssl/openssl/test/README.ssltest.md create mode 100644 deps/openssl/openssl/test/aborttest.c create mode 100644 deps/openssl/openssl/test/acvp_test.c create mode 100644 deps/openssl/openssl/test/acvp_test.inc create mode 100644 deps/openssl/openssl/test/aesgcmtest.c create mode 100644 deps/openssl/openssl/test/afalgtest.c create mode 100644 deps/openssl/openssl/test/algorithmid_test.c create mode 100644 deps/openssl/openssl/test/asn1_decode_test.c create mode 100644 deps/openssl/openssl/test/asn1_dsa_internal_test.c create mode 100644 deps/openssl/openssl/test/asn1_encode_test.c create mode 100644 deps/openssl/openssl/test/asn1_internal_test.c create mode 100644 deps/openssl/openssl/test/asn1_string_table_test.c create mode 100644 deps/openssl/openssl/test/asn1_time_test.c create mode 100644 deps/openssl/openssl/test/asynciotest.c create mode 100644 deps/openssl/openssl/test/asynctest.c create mode 100644 deps/openssl/openssl/test/bad_dtls_test.c create mode 100644 deps/openssl/openssl/test/bftest.c create mode 100644 deps/openssl/openssl/test/bio_callback_test.c create mode 100644 deps/openssl/openssl/test/bio_core_test.c create mode 100644 deps/openssl/openssl/test/bio_enc_test.c create mode 100644 deps/openssl/openssl/test/bio_memleak_test.c create mode 100644 deps/openssl/openssl/test/bio_prefix_text.c create mode 100644 deps/openssl/openssl/test/bio_readbuffer_test.c create mode 100644 deps/openssl/openssl/test/bioprinttest.c create mode 100644 deps/openssl/openssl/test/bn_internal_test.c create mode 100644 deps/openssl/openssl/test/bn_rand_range.h create mode 100644 deps/openssl/openssl/test/bntest.c create mode 100755 deps/openssl/openssl/test/bntests.pl create mode 100644 deps/openssl/openssl/test/build.info create mode 100644 deps/openssl/openssl/test/ca-and-certs.cnf create mode 100644 deps/openssl/openssl/test/casttest.c create mode 100644 deps/openssl/openssl/test/certs/alt1-cert.pem create mode 100644 deps/openssl/openssl/test/certs/alt1-key.pem create mode 100644 deps/openssl/openssl/test/certs/alt2-cert.pem create mode 100644 deps/openssl/openssl/test/certs/alt2-key.pem create mode 100644 deps/openssl/openssl/test/certs/alt3-cert.pem create mode 100644 deps/openssl/openssl/test/certs/alt3-key.pem create mode 100644 deps/openssl/openssl/test/certs/bad-othername-cert.pem create mode 100644 deps/openssl/openssl/test/certs/bad-othername-namec-inter.pem create mode 100644 deps/openssl/openssl/test/certs/bad-othername-namec-key.pem create mode 100644 deps/openssl/openssl/test/certs/bad-othername-namec.pem create mode 100644 deps/openssl/openssl/test/certs/bad-pc3-cert.pem create mode 100644 deps/openssl/openssl/test/certs/bad-pc3-key.pem create mode 100644 deps/openssl/openssl/test/certs/bad-pc4-cert.pem create mode 100644 deps/openssl/openssl/test/certs/bad-pc4-key.pem create mode 100644 deps/openssl/openssl/test/certs/bad-pc6-cert.pem create mode 100644 deps/openssl/openssl/test/certs/bad-pc6-key.pem create mode 100644 deps/openssl/openssl/test/certs/bad.key create mode 100644 deps/openssl/openssl/test/certs/bad.pem create mode 100644 deps/openssl/openssl/test/certs/badalt1-cert.pem create mode 100644 deps/openssl/openssl/test/certs/badalt1-key.pem create mode 100644 deps/openssl/openssl/test/certs/badalt10-cert.pem create mode 100644 deps/openssl/openssl/test/certs/badalt10-key.pem create mode 100644 deps/openssl/openssl/test/certs/badalt2-cert.pem create mode 100644 deps/openssl/openssl/test/certs/badalt2-key.pem create mode 100644 deps/openssl/openssl/test/certs/badalt3-cert.pem create mode 100644 deps/openssl/openssl/test/certs/badalt3-key.pem create mode 100644 deps/openssl/openssl/test/certs/badalt4-cert.pem create mode 100644 deps/openssl/openssl/test/certs/badalt4-key.pem create mode 100644 deps/openssl/openssl/test/certs/badalt5-cert.pem create mode 100644 deps/openssl/openssl/test/certs/badalt5-key.pem create mode 100644 deps/openssl/openssl/test/certs/badalt6-cert.pem create mode 100644 deps/openssl/openssl/test/certs/badalt6-key.pem create mode 100644 deps/openssl/openssl/test/certs/badalt7-cert.pem create mode 100644 deps/openssl/openssl/test/certs/badalt7-key.pem create mode 100644 deps/openssl/openssl/test/certs/badalt8-cert.pem create mode 100644 deps/openssl/openssl/test/certs/badalt8-key.pem create mode 100644 deps/openssl/openssl/test/certs/badalt9-cert.pem create mode 100644 deps/openssl/openssl/test/certs/badalt9-key.pem create mode 100644 deps/openssl/openssl/test/certs/badcn1-cert.pem create mode 100644 deps/openssl/openssl/test/certs/badcn1-key.pem create mode 100644 deps/openssl/openssl/test/certs/ca+anyEKU.pem create mode 100644 deps/openssl/openssl/test/certs/ca+clientAuth.pem create mode 100644 deps/openssl/openssl/test/certs/ca+serverAuth.pem create mode 100644 deps/openssl/openssl/test/certs/ca-anyEKU.pem create mode 100644 deps/openssl/openssl/test/certs/ca-cert-768.pem create mode 100644 deps/openssl/openssl/test/certs/ca-cert-768i.pem create mode 100644 deps/openssl/openssl/test/certs/ca-cert-ec-explicit.pem create mode 100644 deps/openssl/openssl/test/certs/ca-cert-ec-named.pem create mode 100644 deps/openssl/openssl/test/certs/ca-cert-md5-any.pem create mode 100644 deps/openssl/openssl/test/certs/ca-cert-md5.pem create mode 100644 deps/openssl/openssl/test/certs/ca-cert.pem create mode 100644 deps/openssl/openssl/test/certs/ca-cert2.pem create mode 100644 deps/openssl/openssl/test/certs/ca-clientAuth.pem create mode 100644 deps/openssl/openssl/test/certs/ca-expired.pem create mode 100644 deps/openssl/openssl/test/certs/ca-key-768.pem create mode 100644 deps/openssl/openssl/test/certs/ca-key-ec-explicit.pem create mode 100644 deps/openssl/openssl/test/certs/ca-key-ec-named.pem create mode 100644 deps/openssl/openssl/test/certs/ca-key.pem create mode 100644 deps/openssl/openssl/test/certs/ca-key2.pem create mode 100644 deps/openssl/openssl/test/certs/ca-name2.pem create mode 100644 deps/openssl/openssl/test/certs/ca-nonbc.pem create mode 100644 deps/openssl/openssl/test/certs/ca-nonca.pem create mode 100644 deps/openssl/openssl/test/certs/ca-pol-cert.pem create mode 100644 deps/openssl/openssl/test/certs/ca-pss-cert.pem create mode 100644 deps/openssl/openssl/test/certs/ca-pss-key.pem create mode 100644 deps/openssl/openssl/test/certs/ca-root2.pem create mode 100644 deps/openssl/openssl/test/certs/ca-serverAuth.pem create mode 100644 deps/openssl/openssl/test/certs/cca+anyEKU.pem create mode 100644 deps/openssl/openssl/test/certs/cca+clientAuth.pem create mode 100644 deps/openssl/openssl/test/certs/cca+serverAuth.pem create mode 100644 deps/openssl/openssl/test/certs/cca-anyEKU.pem create mode 100644 deps/openssl/openssl/test/certs/cca-cert.pem create mode 100644 deps/openssl/openssl/test/certs/cca-clientAuth.pem create mode 100644 deps/openssl/openssl/test/certs/cca-serverAuth.pem create mode 100644 deps/openssl/openssl/test/certs/cert-key-cert.pem create mode 100644 deps/openssl/openssl/test/certs/client-ed25519-cert.pem create mode 100644 deps/openssl/openssl/test/certs/client-ed25519-key.pem create mode 100644 deps/openssl/openssl/test/certs/client-ed448-cert.pem create mode 100644 deps/openssl/openssl/test/certs/client-ed448-key.pem create mode 100644 deps/openssl/openssl/test/certs/croot+anyEKU.pem create mode 100644 deps/openssl/openssl/test/certs/croot+clientAuth.pem create mode 100644 deps/openssl/openssl/test/certs/croot+serverAuth.pem create mode 100644 deps/openssl/openssl/test/certs/croot-anyEKU.pem create mode 100644 deps/openssl/openssl/test/certs/croot-cert.pem create mode 100644 deps/openssl/openssl/test/certs/croot-clientAuth.pem create mode 100644 deps/openssl/openssl/test/certs/croot-serverAuth.pem create mode 100644 deps/openssl/openssl/test/certs/cross-key.pem create mode 100644 deps/openssl/openssl/test/certs/cross-root.pem create mode 100644 deps/openssl/openssl/test/certs/ct-server-key-public.pem create mode 100644 deps/openssl/openssl/test/certs/ct-server-key.pem create mode 100644 deps/openssl/openssl/test/certs/cyrillic.msb create mode 100644 deps/openssl/openssl/test/certs/cyrillic.pem create mode 100644 deps/openssl/openssl/test/certs/cyrillic.utf8 create mode 100644 deps/openssl/openssl/test/certs/cyrillic_crl.pem create mode 100644 deps/openssl/openssl/test/certs/cyrillic_crl.utf8 create mode 100644 deps/openssl/openssl/test/certs/dhk2048.pem create mode 100644 deps/openssl/openssl/test/certs/dhp2048.pem create mode 100644 deps/openssl/openssl/test/certs/ec_privkey_with_chain.pem create mode 100644 deps/openssl/openssl/test/certs/ee+clientAuth.pem create mode 100644 deps/openssl/openssl/test/certs/ee+serverAuth.pem create mode 100644 deps/openssl/openssl/test/certs/ee-cert-1024.pem create mode 100644 deps/openssl/openssl/test/certs/ee-cert-3072.pem create mode 100644 deps/openssl/openssl/test/certs/ee-cert-4096.pem create mode 100644 deps/openssl/openssl/test/certs/ee-cert-768.pem create mode 100644 deps/openssl/openssl/test/certs/ee-cert-768i.pem create mode 100644 deps/openssl/openssl/test/certs/ee-cert-8192.pem create mode 100644 deps/openssl/openssl/test/certs/ee-cert-crit-unknown-ext.pem create mode 100644 deps/openssl/openssl/test/certs/ee-cert-ec-explicit.pem create mode 100644 deps/openssl/openssl/test/certs/ee-cert-ec-named-explicit.pem create mode 100644 deps/openssl/openssl/test/certs/ee-cert-ec-named-named.pem create mode 100644 deps/openssl/openssl/test/certs/ee-cert-md5.pem create mode 100644 deps/openssl/openssl/test/certs/ee-cert-noncrit-unknown-ext.pem create mode 100644 deps/openssl/openssl/test/certs/ee-cert-ocsp-nocheck.pem create mode 100644 deps/openssl/openssl/test/certs/ee-cert-policies-bad.pem create mode 100644 deps/openssl/openssl/test/certs/ee-cert-policies.pem create mode 100644 deps/openssl/openssl/test/certs/ee-cert.pem create mode 100644 deps/openssl/openssl/test/certs/ee-cert2.pem create mode 100644 deps/openssl/openssl/test/certs/ee-client-chain.pem create mode 100644 deps/openssl/openssl/test/certs/ee-client.pem create mode 100644 deps/openssl/openssl/test/certs/ee-clientAuth.pem create mode 100644 deps/openssl/openssl/test/certs/ee-ecdsa-client-chain.pem create mode 100644 deps/openssl/openssl/test/certs/ee-ecdsa-key.pem create mode 100644 deps/openssl/openssl/test/certs/ee-ed25519.pem create mode 100644 deps/openssl/openssl/test/certs/ee-expired.pem create mode 100644 deps/openssl/openssl/test/certs/ee-key-1024.pem create mode 100644 deps/openssl/openssl/test/certs/ee-key-3072.pem create mode 100644 deps/openssl/openssl/test/certs/ee-key-4096.pem create mode 100644 deps/openssl/openssl/test/certs/ee-key-768.pem create mode 100644 deps/openssl/openssl/test/certs/ee-key-8192.pem create mode 100644 deps/openssl/openssl/test/certs/ee-key-ec-explicit.pem create mode 100644 deps/openssl/openssl/test/certs/ee-key-ec-named-explicit.pem create mode 100644 deps/openssl/openssl/test/certs/ee-key-ec-named-named.pem create mode 100644 deps/openssl/openssl/test/certs/ee-key.pem create mode 100644 deps/openssl/openssl/test/certs/ee-name2.pem create mode 100644 deps/openssl/openssl/test/certs/ee-pathlen.pem create mode 100644 deps/openssl/openssl/test/certs/ee-pss-cert.pem create mode 100644 deps/openssl/openssl/test/certs/ee-pss-sha1-cert.pem create mode 100644 deps/openssl/openssl/test/certs/ee-pss-sha256-cert.pem create mode 100644 deps/openssl/openssl/test/certs/ee-pss-wrong1.5-cert.pem create mode 100644 deps/openssl/openssl/test/certs/ee-self-signed.pem create mode 100644 deps/openssl/openssl/test/certs/ee-serverAuth.pem create mode 100644 deps/openssl/openssl/test/certs/ee-ss-with-keyCertSign.pem create mode 100644 deps/openssl/openssl/test/certs/embeddedSCTs1-key.pem create mode 100644 deps/openssl/openssl/test/certs/embeddedSCTs1.pem create mode 100644 deps/openssl/openssl/test/certs/embeddedSCTs1.sct create mode 100644 deps/openssl/openssl/test/certs/embeddedSCTs1.tlssct create mode 100644 deps/openssl/openssl/test/certs/embeddedSCTs1_issuer-key.pem create mode 100644 deps/openssl/openssl/test/certs/embeddedSCTs1_issuer.pem create mode 100644 deps/openssl/openssl/test/certs/embeddedSCTs3.pem create mode 100644 deps/openssl/openssl/test/certs/embeddedSCTs3.sct create mode 100644 deps/openssl/openssl/test/certs/embeddedSCTs3_issuer.pem create mode 100644 deps/openssl/openssl/test/certs/ext-check.csr create mode 100644 deps/openssl/openssl/test/certs/fake-gp.pem create mode 100644 deps/openssl/openssl/test/certs/goodcn1-cert.pem create mode 100644 deps/openssl/openssl/test/certs/goodcn1-key.pem create mode 100644 deps/openssl/openssl/test/certs/goodcn2-cert.pem create mode 100644 deps/openssl/openssl/test/certs/goodcn2-chain.pem create mode 100644 deps/openssl/openssl/test/certs/goodcn2-key.pem create mode 100644 deps/openssl/openssl/test/certs/grfc.pem create mode 100644 deps/openssl/openssl/test/certs/interCA.key create mode 100644 deps/openssl/openssl/test/certs/interCA.pem create mode 100644 deps/openssl/openssl/test/certs/invalid-cert.pem create mode 100644 deps/openssl/openssl/test/certs/key-pass-12345.pem create mode 100644 deps/openssl/openssl/test/certs/leaf-chain.pem create mode 100644 deps/openssl/openssl/test/certs/leaf-encrypted.key create mode 100644 deps/openssl/openssl/test/certs/leaf.key create mode 100644 deps/openssl/openssl/test/certs/leaf.pem create mode 100644 deps/openssl/openssl/test/certs/many-constraints.pem create mode 100644 deps/openssl/openssl/test/certs/many-names1.pem create mode 100644 deps/openssl/openssl/test/certs/many-names2.pem create mode 100644 deps/openssl/openssl/test/certs/many-names3.pem create mode 100755 deps/openssl/openssl/test/certs/mkcert.sh create mode 100644 deps/openssl/openssl/test/certs/nca+anyEKU.pem create mode 100644 deps/openssl/openssl/test/certs/nca+serverAuth.pem create mode 100644 deps/openssl/openssl/test/certs/ncca-cert.pem create mode 100644 deps/openssl/openssl/test/certs/ncca-key.pem create mode 100644 deps/openssl/openssl/test/certs/ncca1-cert.pem create mode 100644 deps/openssl/openssl/test/certs/ncca1-key.pem create mode 100644 deps/openssl/openssl/test/certs/ncca2-cert.pem create mode 100644 deps/openssl/openssl/test/certs/ncca2-key.pem create mode 100644 deps/openssl/openssl/test/certs/ncca3-cert.pem create mode 100644 deps/openssl/openssl/test/certs/ncca3-key.pem create mode 100644 deps/openssl/openssl/test/certs/nccaothername-cert.pem create mode 100644 deps/openssl/openssl/test/certs/nccaothername-key.pem create mode 100644 deps/openssl/openssl/test/certs/nroot+anyEKU.pem create mode 100644 deps/openssl/openssl/test/certs/nroot+serverAuth.pem create mode 100644 deps/openssl/openssl/test/certs/p256-server-cert.pem create mode 100644 deps/openssl/openssl/test/certs/p256-server-key.pem create mode 100644 deps/openssl/openssl/test/certs/p384-root-key.pem create mode 100644 deps/openssl/openssl/test/certs/p384-root.pem create mode 100644 deps/openssl/openssl/test/certs/p384-server-cert.pem create mode 100644 deps/openssl/openssl/test/certs/p384-server-key.pem create mode 100644 deps/openssl/openssl/test/certs/pathlen.pem create mode 100644 deps/openssl/openssl/test/certs/pc1-cert.pem create mode 100644 deps/openssl/openssl/test/certs/pc1-key.pem create mode 100644 deps/openssl/openssl/test/certs/pc2-cert.pem create mode 100644 deps/openssl/openssl/test/certs/pc2-key.pem create mode 100644 deps/openssl/openssl/test/certs/pc5-cert.pem create mode 100644 deps/openssl/openssl/test/certs/pc5-key.pem create mode 100644 deps/openssl/openssl/test/certs/pkitsta.pem create mode 100644 deps/openssl/openssl/test/certs/root+anyEKU.pem create mode 100644 deps/openssl/openssl/test/certs/root+clientAuth.pem create mode 100644 deps/openssl/openssl/test/certs/root+serverAuth.pem create mode 100644 deps/openssl/openssl/test/certs/root-anyEKU.pem create mode 100644 deps/openssl/openssl/test/certs/root-cert-768.pem create mode 100644 deps/openssl/openssl/test/certs/root-cert-md5.pem create mode 100644 deps/openssl/openssl/test/certs/root-cert-rsa2.pem create mode 100644 deps/openssl/openssl/test/certs/root-cert.pem create mode 100644 deps/openssl/openssl/test/certs/root-cert2.pem create mode 100644 deps/openssl/openssl/test/certs/root-clientAuth.pem create mode 100644 deps/openssl/openssl/test/certs/root-cross-cert.pem create mode 100644 deps/openssl/openssl/test/certs/root-ed25519.pem create mode 100644 deps/openssl/openssl/test/certs/root-ed25519.privkey.pem create mode 100644 deps/openssl/openssl/test/certs/root-ed25519.pubkey.pem create mode 100644 deps/openssl/openssl/test/certs/root-ed448-cert.pem create mode 100644 deps/openssl/openssl/test/certs/root-ed448-key.pem create mode 100644 deps/openssl/openssl/test/certs/root-expired.pem create mode 100644 deps/openssl/openssl/test/certs/root-key-768.pem create mode 100644 deps/openssl/openssl/test/certs/root-key.pem create mode 100644 deps/openssl/openssl/test/certs/root-key2.pem create mode 100644 deps/openssl/openssl/test/certs/root-name2.pem create mode 100644 deps/openssl/openssl/test/certs/root-nonca.pem create mode 100644 deps/openssl/openssl/test/certs/root-noserver.pem create mode 100644 deps/openssl/openssl/test/certs/root-serverAuth.pem create mode 100644 deps/openssl/openssl/test/certs/root2+clientAuth.pem create mode 100644 deps/openssl/openssl/test/certs/root2+serverAuth.pem create mode 100644 deps/openssl/openssl/test/certs/root2-serverAuth.pem create mode 100644 deps/openssl/openssl/test/certs/rootCA.key create mode 100644 deps/openssl/openssl/test/certs/rootCA.pem create mode 100644 deps/openssl/openssl/test/certs/rootcert.pem create mode 100644 deps/openssl/openssl/test/certs/rootkey.pem create mode 100644 deps/openssl/openssl/test/certs/roots.pem create mode 100644 deps/openssl/openssl/test/certs/sca+anyEKU.pem create mode 100644 deps/openssl/openssl/test/certs/sca+clientAuth.pem create mode 100644 deps/openssl/openssl/test/certs/sca+serverAuth.pem create mode 100644 deps/openssl/openssl/test/certs/sca-anyEKU.pem create mode 100644 deps/openssl/openssl/test/certs/sca-cert.pem create mode 100644 deps/openssl/openssl/test/certs/sca-clientAuth.pem create mode 100644 deps/openssl/openssl/test/certs/sca-serverAuth.pem create mode 100644 deps/openssl/openssl/test/certs/server-cecdsa-cert.pem create mode 100644 deps/openssl/openssl/test/certs/server-cecdsa-key.pem create mode 100644 deps/openssl/openssl/test/certs/server-dsa-cert.pem create mode 100644 deps/openssl/openssl/test/certs/server-dsa-key.pem create mode 100644 deps/openssl/openssl/test/certs/server-dsa-pubkey.pem create mode 100644 deps/openssl/openssl/test/certs/server-ecdsa-brainpoolP256r1-cert.pem create mode 100644 deps/openssl/openssl/test/certs/server-ecdsa-brainpoolP256r1-key.pem create mode 100644 deps/openssl/openssl/test/certs/server-ecdsa-cert.pem create mode 100644 deps/openssl/openssl/test/certs/server-ecdsa-key.pem create mode 100644 deps/openssl/openssl/test/certs/server-ed25519-cert.pem create mode 100644 deps/openssl/openssl/test/certs/server-ed25519-key.pem create mode 100644 deps/openssl/openssl/test/certs/server-ed448-cert.pem create mode 100644 deps/openssl/openssl/test/certs/server-ed448-key.pem create mode 100644 deps/openssl/openssl/test/certs/server-pss-cert.pem create mode 100644 deps/openssl/openssl/test/certs/server-pss-key.pem create mode 100644 deps/openssl/openssl/test/certs/server-pss-restrict-cert.pem create mode 100644 deps/openssl/openssl/test/certs/server-pss-restrict-key.pem create mode 100644 deps/openssl/openssl/test/certs/server-trusted.pem create mode 100644 deps/openssl/openssl/test/certs/servercert.pem create mode 100644 deps/openssl/openssl/test/certs/serverkey.pem create mode 100755 deps/openssl/openssl/test/certs/setup.sh create mode 100644 deps/openssl/openssl/test/certs/sm2-ca-cert.pem create mode 100644 deps/openssl/openssl/test/certs/sm2-csr.pem create mode 100644 deps/openssl/openssl/test/certs/sm2-root.crt create mode 100644 deps/openssl/openssl/test/certs/sm2-root.key create mode 100644 deps/openssl/openssl/test/certs/sm2.key create mode 100644 deps/openssl/openssl/test/certs/sm2.pem create mode 100644 deps/openssl/openssl/test/certs/some-names1.pem create mode 100644 deps/openssl/openssl/test/certs/some-names2.pem create mode 100644 deps/openssl/openssl/test/certs/some-names3.pem create mode 100644 deps/openssl/openssl/test/certs/sroot+anyEKU.pem create mode 100644 deps/openssl/openssl/test/certs/sroot+clientAuth.pem create mode 100644 deps/openssl/openssl/test/certs/sroot+serverAuth.pem create mode 100644 deps/openssl/openssl/test/certs/sroot-anyEKU.pem create mode 100644 deps/openssl/openssl/test/certs/sroot-cert.pem create mode 100644 deps/openssl/openssl/test/certs/sroot-clientAuth.pem create mode 100644 deps/openssl/openssl/test/certs/sroot-serverAuth.pem create mode 100644 deps/openssl/openssl/test/certs/subinterCA-ss.pem create mode 100644 deps/openssl/openssl/test/certs/subinterCA.key create mode 100644 deps/openssl/openssl/test/certs/subinterCA.pem create mode 100644 deps/openssl/openssl/test/certs/untrusted.pem create mode 100644 deps/openssl/openssl/test/certs/v3-certs-RC2.p12 create mode 100644 deps/openssl/openssl/test/certs/v3-certs-TDES.p12 create mode 100644 deps/openssl/openssl/test/certs/wrongcert.pem create mode 100644 deps/openssl/openssl/test/certs/wrongkey.pem create mode 100644 deps/openssl/openssl/test/certs/x509-check-key.pem create mode 100644 deps/openssl/openssl/test/certs/x509-check.csr create mode 100644 deps/openssl/openssl/test/chacha_internal_test.c create mode 100644 deps/openssl/openssl/test/cipher_overhead_test.c create mode 100644 deps/openssl/openssl/test/cipherbytes_test.c create mode 100644 deps/openssl/openssl/test/cipherlist_test.c create mode 100644 deps/openssl/openssl/test/ciphername_test.c create mode 100644 deps/openssl/openssl/test/clienthellotest.c create mode 100644 deps/openssl/openssl/test/cmactest.c create mode 100644 deps/openssl/openssl/test/cmp_asn_test.c create mode 100644 deps/openssl/openssl/test/cmp_client_test.c create mode 100644 deps/openssl/openssl/test/cmp_ctx_test.c create mode 100644 deps/openssl/openssl/test/cmp_hdr_test.c create mode 100644 deps/openssl/openssl/test/cmp_msg_test.c create mode 100644 deps/openssl/openssl/test/cmp_protect_test.c create mode 100644 deps/openssl/openssl/test/cmp_server_test.c create mode 100644 deps/openssl/openssl/test/cmp_status_test.c create mode 100644 deps/openssl/openssl/test/cmp_vfy_test.c create mode 100644 deps/openssl/openssl/test/cms-examples.pl create mode 100644 deps/openssl/openssl/test/cmsapitest.c create mode 100644 deps/openssl/openssl/test/conf_include_test.c create mode 100644 deps/openssl/openssl/test/confdump.c create mode 100644 deps/openssl/openssl/test/constant_time_test.c create mode 100644 deps/openssl/openssl/test/context_internal_test.c create mode 100644 deps/openssl/openssl/test/crltest.c create mode 100644 deps/openssl/openssl/test/ct/log_list.cnf create mode 100644 deps/openssl/openssl/test/ct/tls1.sct create mode 100644 deps/openssl/openssl/test/ct_test.c create mode 100644 deps/openssl/openssl/test/ctype_internal_test.c create mode 100644 deps/openssl/openssl/test/curve448_internal_test.c create mode 100644 deps/openssl/openssl/test/d2i-tests/bad-cms.der create mode 100644 deps/openssl/openssl/test/d2i-tests/bad-int-pad0.der create mode 100644 deps/openssl/openssl/test/d2i-tests/bad-int-padminus1.der create mode 100644 deps/openssl/openssl/test/d2i-tests/bad_bio.der create mode 100644 deps/openssl/openssl/test/d2i-tests/bad_cert.der create mode 100644 deps/openssl/openssl/test/d2i-tests/bad_generalname.der create mode 100644 deps/openssl/openssl/test/d2i-tests/high_tag.der create mode 100644 deps/openssl/openssl/test/d2i-tests/int0.der create mode 100644 deps/openssl/openssl/test/d2i-tests/int1.der create mode 100644 deps/openssl/openssl/test/d2i-tests/intminus1.der create mode 100644 deps/openssl/openssl/test/d2i_test.c create mode 100644 deps/openssl/openssl/test/dane-cross.in create mode 100644 deps/openssl/openssl/test/danetest.c create mode 100644 deps/openssl/openssl/test/danetest.in create mode 100644 deps/openssl/openssl/test/danetest.pem create mode 100644 deps/openssl/openssl/test/data.bin create mode 100644 deps/openssl/openssl/test/data2.bin create mode 100644 deps/openssl/openssl/test/default-and-fips.cnf create mode 100644 deps/openssl/openssl/test/default-and-legacy.cnf create mode 100644 deps/openssl/openssl/test/default.cnf create mode 100644 deps/openssl/openssl/test/defltfips_test.c create mode 100644 deps/openssl/openssl/test/destest.c create mode 100644 deps/openssl/openssl/test/dhtest.c create mode 100644 deps/openssl/openssl/test/drbgtest.c create mode 100644 deps/openssl/openssl/test/dsa_no_digest_size_test.c create mode 100644 deps/openssl/openssl/test/dsatest.c create mode 100644 deps/openssl/openssl/test/dtls_mtu_test.c create mode 100644 deps/openssl/openssl/test/dtlstest.c create mode 100644 deps/openssl/openssl/test/dtlsv1listentest.c create mode 100644 deps/openssl/openssl/test/ec_internal_test.c create mode 100644 deps/openssl/openssl/test/ecdsatest.c create mode 100644 deps/openssl/openssl/test/ecdsatest.h create mode 100644 deps/openssl/openssl/test/ecstresstest.c create mode 100644 deps/openssl/openssl/test/ectest.c create mode 100644 deps/openssl/openssl/test/endecode_test.c create mode 100644 deps/openssl/openssl/test/endecoder_legacy_test.c create mode 100644 deps/openssl/openssl/test/enginetest.c create mode 100644 deps/openssl/openssl/test/errtest.c create mode 100644 deps/openssl/openssl/test/evp_extra_test.c create mode 100644 deps/openssl/openssl/test/evp_extra_test2.c create mode 100644 deps/openssl/openssl/test/evp_fetch_prov_test.c create mode 100644 deps/openssl/openssl/test/evp_kdf_test.c create mode 100644 deps/openssl/openssl/test/evp_libctx_test.c create mode 100644 deps/openssl/openssl/test/evp_pkey_ctx_new_from_name.c create mode 100644 deps/openssl/openssl/test/evp_pkey_dparams_test.c create mode 100644 deps/openssl/openssl/test/evp_pkey_provided_test.c create mode 100644 deps/openssl/openssl/test/evp_test.c create mode 100644 deps/openssl/openssl/test/exdatatest.c create mode 100644 deps/openssl/openssl/test/exptest.c create mode 100644 deps/openssl/openssl/test/ext_internal_test.c create mode 100644 deps/openssl/openssl/test/fake_rsaprov.c create mode 100644 deps/openssl/openssl/test/fake_rsaprov.h create mode 100644 deps/openssl/openssl/test/fatalerrtest.c create mode 100644 deps/openssl/openssl/test/ffc_internal_test.c create mode 100644 deps/openssl/openssl/test/filterprov.c create mode 100644 deps/openssl/openssl/test/filterprov.h create mode 100644 deps/openssl/openssl/test/fips-alt.cnf create mode 100644 deps/openssl/openssl/test/fips-and-base.cnf create mode 100644 deps/openssl/openssl/test/fips.cnf create mode 100644 deps/openssl/openssl/test/fips_version_test.c create mode 100644 deps/openssl/openssl/test/generate_buildtest.pl create mode 100644 deps/openssl/openssl/test/generate_ssl_tests.pl create mode 100644 deps/openssl/openssl/test/gmdifftest.c create mode 100644 deps/openssl/openssl/test/helpers/cmp_testlib.c create mode 100644 deps/openssl/openssl/test/helpers/cmp_testlib.h create mode 100644 deps/openssl/openssl/test/helpers/handshake.c create mode 100644 deps/openssl/openssl/test/helpers/handshake.h create mode 100644 deps/openssl/openssl/test/helpers/handshake_srp.c create mode 100644 deps/openssl/openssl/test/helpers/pkcs12.c create mode 100644 deps/openssl/openssl/test/helpers/pkcs12.h create mode 100644 deps/openssl/openssl/test/helpers/predefined_dhparams.c rename deps/openssl/openssl/{include/openssl/quic.h => test/helpers/predefined_dhparams.h} (44%) create mode 100644 deps/openssl/openssl/test/helpers/ssl_test_ctx.c create mode 100644 deps/openssl/openssl/test/helpers/ssl_test_ctx.h create mode 100644 deps/openssl/openssl/test/helpers/ssltestlib.c create mode 100644 deps/openssl/openssl/test/helpers/ssltestlib.h create mode 100644 deps/openssl/openssl/test/hexstr_test.c create mode 100644 deps/openssl/openssl/test/hmactest.c create mode 100644 deps/openssl/openssl/test/http_test.c create mode 100644 deps/openssl/openssl/test/ideatest.c create mode 100644 deps/openssl/openssl/test/igetest.c create mode 100644 deps/openssl/openssl/test/insta.priv.pem create mode 100644 deps/openssl/openssl/test/insta_ca.cert.pem create mode 100644 deps/openssl/openssl/test/keymgmt_internal_test.c create mode 100644 deps/openssl/openssl/test/legacy.cnf create mode 100644 deps/openssl/openssl/test/lhash_test.c create mode 100644 deps/openssl/openssl/test/localetest.c create mode 100644 deps/openssl/openssl/test/mdc2_internal_test.c create mode 100644 deps/openssl/openssl/test/mdc2test.c create mode 100644 deps/openssl/openssl/test/memleaktest.c create mode 100644 deps/openssl/openssl/test/modes_internal_test.c create mode 100644 deps/openssl/openssl/test/moduleloadtest.c create mode 100644 deps/openssl/openssl/test/namemap_internal_test.c create mode 100644 deps/openssl/openssl/test/nodefltctxtest.c create mode 100644 deps/openssl/openssl/test/null.cnf create mode 100644 deps/openssl/openssl/test/ocsp-tests/D1.ors create mode 100644 deps/openssl/openssl/test/ocsp-tests/D1_Cert_EE.pem create mode 100644 deps/openssl/openssl/test/ocsp-tests/D1_Issuer_ICA.pem create mode 100644 deps/openssl/openssl/test/ocsp-tests/D2.ors create mode 100644 deps/openssl/openssl/test/ocsp-tests/D2_Cert_ICA.pem create mode 100644 deps/openssl/openssl/test/ocsp-tests/D2_Issuer_Root.pem create mode 100644 deps/openssl/openssl/test/ocsp-tests/D3.ors create mode 100644 deps/openssl/openssl/test/ocsp-tests/D3_Cert_EE.pem create mode 100644 deps/openssl/openssl/test/ocsp-tests/D3_Issuer_Root.pem create mode 100644 deps/openssl/openssl/test/ocsp-tests/ISDOSC_D1.ors create mode 100644 deps/openssl/openssl/test/ocsp-tests/ISDOSC_D2.ors create mode 100644 deps/openssl/openssl/test/ocsp-tests/ISDOSC_D3.ors create mode 100644 deps/openssl/openssl/test/ocsp-tests/ISIC_D1_Issuer_ICA.pem create mode 100644 deps/openssl/openssl/test/ocsp-tests/ISIC_D2_Issuer_Root.pem create mode 100644 deps/openssl/openssl/test/ocsp-tests/ISIC_D3_Issuer_Root.pem create mode 100644 deps/openssl/openssl/test/ocsp-tests/ISIC_ND1_Issuer_ICA.pem create mode 100644 deps/openssl/openssl/test/ocsp-tests/ISIC_ND2_Issuer_Root.pem create mode 100644 deps/openssl/openssl/test/ocsp-tests/ISIC_ND3_Issuer_Root.pem create mode 100644 deps/openssl/openssl/test/ocsp-tests/ISOP_D1.ors create mode 100644 deps/openssl/openssl/test/ocsp-tests/ISOP_D2.ors create mode 100644 deps/openssl/openssl/test/ocsp-tests/ISOP_D3.ors create mode 100644 deps/openssl/openssl/test/ocsp-tests/ISOP_ND1.ors create mode 100644 deps/openssl/openssl/test/ocsp-tests/ISOP_ND2.ors create mode 100644 deps/openssl/openssl/test/ocsp-tests/ISOP_ND3.ors create mode 100644 deps/openssl/openssl/test/ocsp-tests/ND1.ors create mode 100644 deps/openssl/openssl/test/ocsp-tests/ND1_Cert_EE.pem create mode 100644 deps/openssl/openssl/test/ocsp-tests/ND1_Cross_Root.pem create mode 100644 deps/openssl/openssl/test/ocsp-tests/ND1_Issuer_ICA-Cross.pem create mode 100644 deps/openssl/openssl/test/ocsp-tests/ND1_Issuer_ICA.pem create mode 100644 deps/openssl/openssl/test/ocsp-tests/ND2.ors create mode 100644 deps/openssl/openssl/test/ocsp-tests/ND2_Cert_ICA.pem create mode 100644 deps/openssl/openssl/test/ocsp-tests/ND2_Issuer_Root.pem create mode 100644 deps/openssl/openssl/test/ocsp-tests/ND3.ors create mode 100644 deps/openssl/openssl/test/ocsp-tests/ND3_Cert_EE.pem create mode 100644 deps/openssl/openssl/test/ocsp-tests/ND3_Issuer_Root.pem create mode 100644 deps/openssl/openssl/test/ocsp-tests/WIKH_D1.ors create mode 100644 deps/openssl/openssl/test/ocsp-tests/WIKH_D2.ors create mode 100644 deps/openssl/openssl/test/ocsp-tests/WIKH_D3.ors create mode 100644 deps/openssl/openssl/test/ocsp-tests/WIKH_ND1.ors create mode 100644 deps/openssl/openssl/test/ocsp-tests/WIKH_ND2.ors create mode 100644 deps/openssl/openssl/test/ocsp-tests/WIKH_ND3.ors create mode 100644 deps/openssl/openssl/test/ocsp-tests/WINH_D1.ors create mode 100644 deps/openssl/openssl/test/ocsp-tests/WINH_D2.ors create mode 100644 deps/openssl/openssl/test/ocsp-tests/WINH_D3.ors create mode 100644 deps/openssl/openssl/test/ocsp-tests/WINH_ND1.ors create mode 100644 deps/openssl/openssl/test/ocsp-tests/WINH_ND2.ors create mode 100644 deps/openssl/openssl/test/ocsp-tests/WINH_ND3.ors create mode 100644 deps/openssl/openssl/test/ocsp-tests/WKDOSC_D1.ors create mode 100644 deps/openssl/openssl/test/ocsp-tests/WKDOSC_D2.ors create mode 100644 deps/openssl/openssl/test/ocsp-tests/WKDOSC_D3.ors create mode 100644 deps/openssl/openssl/test/ocsp-tests/WKIC_D1_Issuer_ICA.pem create mode 100644 deps/openssl/openssl/test/ocsp-tests/WKIC_D2_Issuer_Root.pem create mode 100644 deps/openssl/openssl/test/ocsp-tests/WKIC_D3_Issuer_Root.pem create mode 100644 deps/openssl/openssl/test/ocsp-tests/WKIC_ND1_Issuer_ICA.pem create mode 100644 deps/openssl/openssl/test/ocsp-tests/WKIC_ND2_Issuer_Root.pem create mode 100644 deps/openssl/openssl/test/ocsp-tests/WKIC_ND3_Issuer_Root.pem create mode 100644 deps/openssl/openssl/test/ocsp-tests/WRID_D1.ors create mode 100644 deps/openssl/openssl/test/ocsp-tests/WRID_D2.ors create mode 100644 deps/openssl/openssl/test/ocsp-tests/WRID_D3.ors create mode 100644 deps/openssl/openssl/test/ocsp-tests/WRID_ND1.ors create mode 100644 deps/openssl/openssl/test/ocsp-tests/WRID_ND2.ors create mode 100644 deps/openssl/openssl/test/ocsp-tests/WRID_ND3.ors create mode 100644 deps/openssl/openssl/test/ocsp-tests/WSNIC_D1_Issuer_ICA.pem create mode 100644 deps/openssl/openssl/test/ocsp-tests/WSNIC_D2_Issuer_Root.pem create mode 100644 deps/openssl/openssl/test/ocsp-tests/WSNIC_D3_Issuer_Root.pem create mode 100644 deps/openssl/openssl/test/ocsp-tests/WSNIC_ND1_Issuer_ICA.pem create mode 100644 deps/openssl/openssl/test/ocsp-tests/WSNIC_ND2_Issuer_Root.pem create mode 100644 deps/openssl/openssl/test/ocsp-tests/WSNIC_ND3_Issuer_Root.pem create mode 100644 deps/openssl/openssl/test/ocspapitest.c create mode 100644 deps/openssl/openssl/test/ossl_store_test.c create mode 100644 deps/openssl/openssl/test/p_test.c create mode 100644 deps/openssl/openssl/test/packettest.c create mode 100644 deps/openssl/openssl/test/param_build_test.c create mode 100644 deps/openssl/openssl/test/params_api_test.c create mode 100644 deps/openssl/openssl/test/params_conversion_test.c create mode 100644 deps/openssl/openssl/test/params_test.c create mode 100644 deps/openssl/openssl/test/pbelutest.c create mode 100644 deps/openssl/openssl/test/pbetest.c create mode 100644 deps/openssl/openssl/test/pem_read_depr_test.c create mode 100644 deps/openssl/openssl/test/pemtest.c create mode 100644 deps/openssl/openssl/test/pkcs12_format_test.c create mode 100644 deps/openssl/openssl/test/pkcs7-1.pem create mode 100644 deps/openssl/openssl/test/pkcs7.pem create mode 100644 deps/openssl/openssl/test/pkcs7_test.c create mode 100644 deps/openssl/openssl/test/pkey_meth_kdf_test.c create mode 100644 deps/openssl/openssl/test/pkey_meth_test.c create mode 100644 deps/openssl/openssl/test/pkits-test.pl create mode 100644 deps/openssl/openssl/test/poly1305_internal_test.c create mode 100644 deps/openssl/openssl/test/property_test.c create mode 100644 deps/openssl/openssl/test/prov_config_test.c create mode 100644 deps/openssl/openssl/test/provfetchtest.c create mode 100644 deps/openssl/openssl/test/provider_fallback_test.c create mode 100644 deps/openssl/openssl/test/provider_internal_test.c create mode 100644 deps/openssl/openssl/test/provider_internal_test.cnf.in create mode 100644 deps/openssl/openssl/test/provider_pkey_test.c create mode 100644 deps/openssl/openssl/test/provider_status_test.c create mode 100644 deps/openssl/openssl/test/provider_test.c create mode 100644 deps/openssl/openssl/test/proxy.cnf create mode 100644 deps/openssl/openssl/test/punycode_test.c create mode 100644 deps/openssl/openssl/test/rand_status_test.c create mode 100644 deps/openssl/openssl/test/rand_test.c create mode 100644 deps/openssl/openssl/test/rc2test.c create mode 100644 deps/openssl/openssl/test/rc4test.c create mode 100644 deps/openssl/openssl/test/rc5test.c create mode 100644 deps/openssl/openssl/test/rdrand_sanitytest.c create mode 100644 deps/openssl/openssl/test/recipes/00-prep_fipsmodule_cnf.t create mode 100644 deps/openssl/openssl/test/recipes/01-test_abort.t create mode 100644 deps/openssl/openssl/test/recipes/01-test_fipsmodule_cnf.t create mode 100644 deps/openssl/openssl/test/recipes/01-test_sanity.t create mode 100644 deps/openssl/openssl/test/recipes/01-test_symbol_presence.t create mode 100644 deps/openssl/openssl/test/recipes/01-test_test.t create mode 100644 deps/openssl/openssl/test/recipes/02-test_errstr.t create mode 100644 deps/openssl/openssl/test/recipes/02-test_internal_context.t create mode 100644 deps/openssl/openssl/test/recipes/02-test_internal_ctype.t create mode 100644 deps/openssl/openssl/test/recipes/02-test_internal_exts.t create mode 100644 deps/openssl/openssl/test/recipes/02-test_internal_keymgmt.t create mode 100644 deps/openssl/openssl/test/recipes/02-test_internal_provider.t create mode 100644 deps/openssl/openssl/test/recipes/02-test_lhash.t create mode 100644 deps/openssl/openssl/test/recipes/02-test_localetest.t create mode 100644 deps/openssl/openssl/test/recipes/02-test_ordinals.t create mode 100644 deps/openssl/openssl/test/recipes/02-test_sparse_array.t create mode 100644 deps/openssl/openssl/test/recipes/02-test_stack.t create mode 100644 deps/openssl/openssl/test/recipes/03-test_exdata.t create mode 100644 deps/openssl/openssl/test/recipes/03-test_fipsinstall.t create mode 100644 deps/openssl/openssl/test/recipes/03-test_internal_asn1.t create mode 100644 deps/openssl/openssl/test/recipes/03-test_internal_asn1_dsa.t create mode 100644 deps/openssl/openssl/test/recipes/03-test_internal_bn.t create mode 100644 deps/openssl/openssl/test/recipes/03-test_internal_chacha.t create mode 100644 deps/openssl/openssl/test/recipes/03-test_internal_curve448.t create mode 100644 deps/openssl/openssl/test/recipes/03-test_internal_ec.t create mode 100644 deps/openssl/openssl/test/recipes/03-test_internal_ffc.t create mode 100644 deps/openssl/openssl/test/recipes/03-test_internal_mdc2.t create mode 100644 deps/openssl/openssl/test/recipes/03-test_internal_modes.t create mode 100644 deps/openssl/openssl/test/recipes/03-test_internal_namemap.t create mode 100644 deps/openssl/openssl/test/recipes/03-test_internal_poly1305.t create mode 100644 deps/openssl/openssl/test/recipes/03-test_internal_rsa_sp800_56b.t create mode 100644 deps/openssl/openssl/test/recipes/03-test_internal_siphash.t create mode 100644 deps/openssl/openssl/test/recipes/03-test_internal_sm2.t create mode 100644 deps/openssl/openssl/test/recipes/03-test_internal_sm3.t create mode 100644 deps/openssl/openssl/test/recipes/03-test_internal_sm4.t create mode 100644 deps/openssl/openssl/test/recipes/03-test_internal_ssl_cert_table.t create mode 100644 deps/openssl/openssl/test/recipes/03-test_internal_x509.t create mode 100644 deps/openssl/openssl/test/recipes/03-test_params_api.t create mode 100644 deps/openssl/openssl/test/recipes/03-test_property.t create mode 100644 deps/openssl/openssl/test/recipes/03-test_ui.t create mode 100644 deps/openssl/openssl/test/recipes/04-test_asn1_decode.t create mode 100644 deps/openssl/openssl/test/recipes/04-test_asn1_encode.t create mode 100644 deps/openssl/openssl/test/recipes/04-test_asn1_string_table.t create mode 100644 deps/openssl/openssl/test/recipes/04-test_bio_callback.t create mode 100644 deps/openssl/openssl/test/recipes/04-test_bio_core.t create mode 100644 deps/openssl/openssl/test/recipes/04-test_bioprint.t create mode 100644 deps/openssl/openssl/test/recipes/04-test_conf.t create mode 100644 deps/openssl/openssl/test/recipes/04-test_conf_data/dollarid_off.cnf create mode 100644 deps/openssl/openssl/test/recipes/04-test_conf_data/dollarid_off.txt create mode 100644 deps/openssl/openssl/test/recipes/04-test_conf_data/dollarid_on.cnf create mode 100644 deps/openssl/openssl/test/recipes/04-test_conf_data/dollarid_on.txt create mode 100644 deps/openssl/openssl/test/recipes/04-test_encoder_decoder.t create mode 100644 deps/openssl/openssl/test/recipes/04-test_encoder_decoder_legacy.t create mode 100644 deps/openssl/openssl/test/recipes/04-test_err.t create mode 100644 deps/openssl/openssl/test/recipes/04-test_hexstring.t create mode 100644 deps/openssl/openssl/test/recipes/04-test_nodefltctx.t create mode 100644 deps/openssl/openssl/test/recipes/04-test_param_build.t create mode 100644 deps/openssl/openssl/test/recipes/04-test_params.t create mode 100644 deps/openssl/openssl/test/recipes/04-test_params_conversion.t create mode 100644 deps/openssl/openssl/test/recipes/04-test_params_conversion_data/native_types.txt create mode 100644 deps/openssl/openssl/test/recipes/04-test_pem_read_depr.t create mode 100644 deps/openssl/openssl/test/recipes/04-test_pem_read_depr_data/dhparams.pem create mode 100644 deps/openssl/openssl/test/recipes/04-test_pem_read_depr_data/dsaparams.pem create mode 100644 deps/openssl/openssl/test/recipes/04-test_pem_read_depr_data/dsaprivatekey.pem create mode 100644 deps/openssl/openssl/test/recipes/04-test_pem_read_depr_data/dsapublickey.pem create mode 100644 deps/openssl/openssl/test/recipes/04-test_pem_read_depr_data/rsaprivatekey.pem create mode 100644 deps/openssl/openssl/test/recipes/04-test_pem_read_depr_data/rsapublickey.pem create mode 100644 deps/openssl/openssl/test/recipes/04-test_pem_read_depr_data/x942params.pem create mode 100644 deps/openssl/openssl/test/recipes/04-test_pem_reading.t create mode 100644 deps/openssl/openssl/test/recipes/04-test_pem_reading_data/NOTES.txt create mode 100644 deps/openssl/openssl/test/recipes/04-test_pem_reading_data/beermug.pem create mode 100644 deps/openssl/openssl/test/recipes/04-test_pem_reading_data/cert-1023line.pem create mode 100644 deps/openssl/openssl/test/recipes/04-test_pem_reading_data/cert-1024line.pem create mode 100644 deps/openssl/openssl/test/recipes/04-test_pem_reading_data/cert-1025line.pem create mode 100644 deps/openssl/openssl/test/recipes/04-test_pem_reading_data/cert-254-chars-at-the-end.pem create mode 100644 deps/openssl/openssl/test/recipes/04-test_pem_reading_data/cert-254-chars-in-the-middle.pem create mode 100644 deps/openssl/openssl/test/recipes/04-test_pem_reading_data/cert-255line.pem create mode 100644 deps/openssl/openssl/test/recipes/04-test_pem_reading_data/cert-256line.pem create mode 100644 deps/openssl/openssl/test/recipes/04-test_pem_reading_data/cert-257line.pem create mode 100644 deps/openssl/openssl/test/recipes/04-test_pem_reading_data/cert-blankline.pem create mode 100644 deps/openssl/openssl/test/recipes/04-test_pem_reading_data/cert-bom.pem create mode 100644 deps/openssl/openssl/test/recipes/04-test_pem_reading_data/cert-comment.pem create mode 100644 deps/openssl/openssl/test/recipes/04-test_pem_reading_data/cert-earlypad.pem create mode 100644 deps/openssl/openssl/test/recipes/04-test_pem_reading_data/cert-extrapad.pem create mode 100644 deps/openssl/openssl/test/recipes/04-test_pem_reading_data/cert-infixwhitespace.pem create mode 100644 deps/openssl/openssl/test/recipes/04-test_pem_reading_data/cert-junk.pem create mode 100644 deps/openssl/openssl/test/recipes/04-test_pem_reading_data/cert-leadingwhitespace.pem create mode 100644 deps/openssl/openssl/test/recipes/04-test_pem_reading_data/cert-longline.pem create mode 100644 deps/openssl/openssl/test/recipes/04-test_pem_reading_data/cert-misalignedpad.pem create mode 100644 deps/openssl/openssl/test/recipes/04-test_pem_reading_data/cert-onecolumn.pem create mode 100644 deps/openssl/openssl/test/recipes/04-test_pem_reading_data/cert-oneline-multiple-of-254.pem create mode 100644 deps/openssl/openssl/test/recipes/04-test_pem_reading_data/cert-oneline.pem create mode 100644 deps/openssl/openssl/test/recipes/04-test_pem_reading_data/cert-shortandlongline.pem create mode 100644 deps/openssl/openssl/test/recipes/04-test_pem_reading_data/cert-shortline.pem create mode 100644 deps/openssl/openssl/test/recipes/04-test_pem_reading_data/cert-threecolumn.pem create mode 100644 deps/openssl/openssl/test/recipes/04-test_pem_reading_data/cert-trailingwhitespace.pem create mode 100644 deps/openssl/openssl/test/recipes/04-test_pem_reading_data/cert.pem create mode 100644 deps/openssl/openssl/test/recipes/04-test_pem_reading_data/csr.pem create mode 100644 deps/openssl/openssl/test/recipes/04-test_pem_reading_data/dsa-1023line.pem create mode 100644 deps/openssl/openssl/test/recipes/04-test_pem_reading_data/dsa-1024line.pem create mode 100644 deps/openssl/openssl/test/recipes/04-test_pem_reading_data/dsa-1025line.pem create mode 100644 deps/openssl/openssl/test/recipes/04-test_pem_reading_data/dsa-255line.pem create mode 100644 deps/openssl/openssl/test/recipes/04-test_pem_reading_data/dsa-256line.pem create mode 100644 deps/openssl/openssl/test/recipes/04-test_pem_reading_data/dsa-257line.pem create mode 100644 deps/openssl/openssl/test/recipes/04-test_pem_reading_data/dsa-blankline.pem create mode 100644 deps/openssl/openssl/test/recipes/04-test_pem_reading_data/dsa-comment.pem create mode 100644 deps/openssl/openssl/test/recipes/04-test_pem_reading_data/dsa-corruptedheader.pem create mode 100644 deps/openssl/openssl/test/recipes/04-test_pem_reading_data/dsa-corruptiv.pem create mode 100644 deps/openssl/openssl/test/recipes/04-test_pem_reading_data/dsa-earlypad.pem create mode 100644 deps/openssl/openssl/test/recipes/04-test_pem_reading_data/dsa-extrapad.pem create mode 100644 deps/openssl/openssl/test/recipes/04-test_pem_reading_data/dsa-infixwhitespace.pem create mode 100644 deps/openssl/openssl/test/recipes/04-test_pem_reading_data/dsa-junk.pem create mode 100644 deps/openssl/openssl/test/recipes/04-test_pem_reading_data/dsa-leadingwhitespace.pem create mode 100644 deps/openssl/openssl/test/recipes/04-test_pem_reading_data/dsa-longline.pem create mode 100644 deps/openssl/openssl/test/recipes/04-test_pem_reading_data/dsa-misalignedpad.pem create mode 100644 deps/openssl/openssl/test/recipes/04-test_pem_reading_data/dsa-onecolumn.pem create mode 100644 deps/openssl/openssl/test/recipes/04-test_pem_reading_data/dsa-oneline.pem create mode 100644 deps/openssl/openssl/test/recipes/04-test_pem_reading_data/dsa-onelineheader.pem create mode 100644 deps/openssl/openssl/test/recipes/04-test_pem_reading_data/dsa-shortandlongline.pem create mode 100644 deps/openssl/openssl/test/recipes/04-test_pem_reading_data/dsa-shortline.pem create mode 100644 deps/openssl/openssl/test/recipes/04-test_pem_reading_data/dsa-threecolumn.pem create mode 100644 deps/openssl/openssl/test/recipes/04-test_pem_reading_data/dsa-trailingwhitespace.pem create mode 100644 deps/openssl/openssl/test/recipes/04-test_pem_reading_data/dsa.pem create mode 100644 deps/openssl/openssl/test/recipes/04-test_pem_reading_data/dsaparam.pem create mode 100644 deps/openssl/openssl/test/recipes/04-test_pem_reading_data/key.pem create mode 100644 deps/openssl/openssl/test/recipes/04-test_pem_reading_data/wellknown create mode 100644 deps/openssl/openssl/test/recipes/04-test_provfetch.t create mode 100644 deps/openssl/openssl/test/recipes/04-test_provider.t create mode 100644 deps/openssl/openssl/test/recipes/04-test_provider_fallback.t create mode 100644 deps/openssl/openssl/test/recipes/04-test_provider_pkey.t create mode 100644 deps/openssl/openssl/test/recipes/04-test_punycode.t create mode 100644 deps/openssl/openssl/test/recipes/04-test_upcalls.t create mode 100644 deps/openssl/openssl/test/recipes/05-test_bf.t create mode 100644 deps/openssl/openssl/test/recipes/05-test_cast.t create mode 100644 deps/openssl/openssl/test/recipes/05-test_cmac.t create mode 100644 deps/openssl/openssl/test/recipes/05-test_des.t create mode 100644 deps/openssl/openssl/test/recipes/05-test_hmac.t create mode 100644 deps/openssl/openssl/test/recipes/05-test_idea.t create mode 100644 deps/openssl/openssl/test/recipes/05-test_pbe.t create mode 100644 deps/openssl/openssl/test/recipes/05-test_rand.t create mode 100644 deps/openssl/openssl/test/recipes/05-test_rc2.t create mode 100644 deps/openssl/openssl/test/recipes/05-test_rc4.t create mode 100644 deps/openssl/openssl/test/recipes/05-test_rc5.t create mode 100644 deps/openssl/openssl/test/recipes/06-test_algorithmid.t create mode 100644 deps/openssl/openssl/test/recipes/06-test_rdrand_sanity.t create mode 100644 deps/openssl/openssl/test/recipes/10-test_bn.t create mode 100644 deps/openssl/openssl/test/recipes/10-test_bn_data/bnexp.txt create mode 100644 deps/openssl/openssl/test/recipes/10-test_bn_data/bngcd.txt create mode 100644 deps/openssl/openssl/test/recipes/10-test_bn_data/bnmod.txt create mode 100644 deps/openssl/openssl/test/recipes/10-test_bn_data/bnmul.txt create mode 100644 deps/openssl/openssl/test/recipes/10-test_bn_data/bnshift.txt create mode 100644 deps/openssl/openssl/test/recipes/10-test_bn_data/bnsum.txt create mode 100644 deps/openssl/openssl/test/recipes/10-test_exp.t create mode 100644 deps/openssl/openssl/test/recipes/15-test_dh.t create mode 100644 deps/openssl/openssl/test/recipes/15-test_dsa.t create mode 100644 deps/openssl/openssl/test/recipes/15-test_dsaparam.t create mode 100644 deps/openssl/openssl/test/recipes/15-test_dsaparam_data/invalid/p10240_q256_too_big.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_dsaparam_data/invalid/p2048_q256_bad_q.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_dsaparam_data/invalid/p768_q160_too_small.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_dsaparam_data/valid/p1024_q160_t1862.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_dsaparam_data/valid/p1024_q160_t1862_gind1.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_dsaparam_data/valid/p1024_q160_t1864.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_dsaparam_data/valid/p1024_q160_t1864_gind1.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_dsaparam_data/valid/p1024_q224_t1862.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_dsaparam_data/valid/p1024_q224_t1862_gind1.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_dsaparam_data/valid/p1024_q256_t1862.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_dsaparam_data/valid/p1024_q256_t1862_gind1.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_dsaparam_data/valid/p2048_q160_t1862.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_dsaparam_data/valid/p2048_q160_t1862_gind1.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_dsaparam_data/valid/p2048_q224_t1862.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_dsaparam_data/valid/p2048_q224_t1862_gind1.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_dsaparam_data/valid/p2048_q224_t1864.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_dsaparam_data/valid/p2048_q224_t1864_gind1.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_dsaparam_data/valid/p2048_q256_t1862.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_dsaparam_data/valid/p2048_q256_t1862_gind1.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_dsaparam_data/valid/p2048_q256_t1864.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_dsaparam_data/valid/p2048_q256_t1864_gind1.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_dsaparam_data/valid/p3072_q160_t1862.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_dsaparam_data/valid/p3072_q160_t1862_gind1.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_dsaparam_data/valid/p3072_q224_t1862.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_dsaparam_data/valid/p3072_q224_t1862_gind1.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_dsaparam_data/valid/p3072_q256_t1862.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_dsaparam_data/valid/p3072_q256_t1862_gind1.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_dsaparam_data/valid/p3072_q256_t1864.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_dsaparam_data/valid/p3072_q256_t1864_gind1.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ec.t create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecdsa.t create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam.t create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/invalid/c2pnb208w1-reducible.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/invalid/nistp256-nonprime.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/invalid/nistp256-offcurve.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/invalid/nistp256-wrongorder.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/noncanon/c2pnb163v1-explicit.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/noncanon/c2pnb208w1-explicit.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/noncanon/secp160k1-explicit.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/noncanon/secp192k1-explicit.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/noncanon/secp224k1-explicit.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/noncanon/secp256k1-explicit.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/noncanon/secp521r1-explicit.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/noncanon/sect113r1-explicit.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/noncanon/sect113r2-explicit.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/noncanon/sect163k1-explicit.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/noncanon/sect163r2-explicit.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/noncanon/sect193r1-explicit.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/noncanon/sect193r2-explicit.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/noncanon/sect233k1-explicit.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/noncanon/sect233r1-explicit.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/noncanon/sect239k1-explicit.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/noncanon/sect283k1-explicit.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/noncanon/sect283r1-explicit.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/noncanon/sect409k1-explicit.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/noncanon/sect409r1-explicit.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/noncanon/sect571k1-explicit.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/noncanon/sect571r1-explicit.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/noncanon/wap-wsg-idm-ecid-wtls1-explicit.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/noncanon/wap-wsg-idm-ecid-wtls10-explicit.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/noncanon/wap-wsg-idm-ecid-wtls11-explicit.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/noncanon/wap-wsg-idm-ecid-wtls3-explicit.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/noncanon/wap-wsg-idm-ecid-wtls4-explicit.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/noncanon/wap-wsg-idm-ecid-wtls5-explicit.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/noncanon/wap-wsg-idm-ecid-wtls8-explicit.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/noncanon/wap-wsg-idm-ecid-wtls9-explicit.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/c2pnb163v1-named.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/c2pnb163v2-explicit.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/c2pnb163v2-named.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/c2pnb163v3-explicit.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/c2pnb163v3-named.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/c2pnb176v1-explicit.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/c2pnb176v1-named.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/c2pnb208w1-named.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/c2pnb272w1-explicit.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/c2pnb272w1-named.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/c2pnb304w1-explicit.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/c2pnb304w1-named.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/c2pnb368w1-explicit.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/c2pnb368w1-named.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/c2tnb191v1-explicit.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/c2tnb191v1-named.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/c2tnb191v2-explicit.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/c2tnb191v2-named.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/c2tnb191v3-explicit.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/c2tnb191v3-named.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/c2tnb239v1-explicit.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/c2tnb239v1-named.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/c2tnb239v2-explicit.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/c2tnb239v2-named.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/c2tnb239v3-explicit.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/c2tnb239v3-named.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/c2tnb359v1-explicit.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/c2tnb359v1-named.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/c2tnb431r1-explicit.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/c2tnb431r1-named.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/prime192v1-explicit.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/prime192v1-named.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/prime192v2-explicit.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/prime192v2-named.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/prime192v3-explicit.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/prime192v3-named.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/prime239v1-explicit.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/prime239v1-named.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/prime239v2-explicit.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/prime239v2-named.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/prime239v3-explicit.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/prime239v3-named.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/prime256v1-explicit.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/prime256v1-named.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/secp112r1-explicit.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/secp112r1-named.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/secp112r2-explicit.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/secp112r2-named.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/secp128r1-explicit.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/secp128r1-named.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/secp128r2-explicit.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/secp128r2-named.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/secp160k1-named.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/secp160r1-explicit.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/secp160r1-named.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/secp160r2-explicit.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/secp160r2-named.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/secp192k1-named.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/secp224k1-named.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/secp224r1-explicit.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/secp224r1-named.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/secp256k1-named.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/secp384r1-explicit.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/secp384r1-named.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/secp521r1-named.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/sect113r1-named.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/sect113r2-named.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/sect131r1-explicit.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/sect131r1-named.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/sect131r2-explicit.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/sect131r2-named.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/sect163k1-named.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/sect163r1-explicit.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/sect163r1-named.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/sect163r2-named.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/sect193r1-named.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/sect193r2-named.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/sect233k1-named.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/sect233r1-named.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/sect239k1-named.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/sect283k1-named.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/sect283r1-named.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/sect409k1-named.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/sect409r1-named.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/sect571k1-named.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/sect571r1-named.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/wap-wsg-idm-ecid-wtls1-named.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/wap-wsg-idm-ecid-wtls10-named.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/wap-wsg-idm-ecid-wtls11-named.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/wap-wsg-idm-ecid-wtls12-explicit.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/wap-wsg-idm-ecid-wtls12-named.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/wap-wsg-idm-ecid-wtls3-named.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/wap-wsg-idm-ecid-wtls4-named.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/wap-wsg-idm-ecid-wtls5-named.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/wap-wsg-idm-ecid-wtls6-explicit.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/wap-wsg-idm-ecid-wtls6-named.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/wap-wsg-idm-ecid-wtls7-explicit.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/wap-wsg-idm-ecid-wtls7-named.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/wap-wsg-idm-ecid-wtls8-named.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_ecparam_data/valid/wap-wsg-idm-ecid-wtls9-named.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_gendh.t create mode 100644 deps/openssl/openssl/test/recipes/15-test_gendhparam.t create mode 100644 deps/openssl/openssl/test/recipes/15-test_gendsa.t create mode 100644 deps/openssl/openssl/test/recipes/15-test_genec.t create mode 100644 deps/openssl/openssl/test/recipes/15-test_genrsa.t create mode 100644 deps/openssl/openssl/test/recipes/15-test_mp_rsa.t create mode 100644 deps/openssl/openssl/test/recipes/15-test_mp_rsa_data/plain_text create mode 100644 deps/openssl/openssl/test/recipes/15-test_mp_rsa_data/rsamplcm.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_out_option.t create mode 100644 deps/openssl/openssl/test/recipes/15-test_rsa.t create mode 100644 deps/openssl/openssl/test/recipes/15-test_rsaoaep.t create mode 100644 deps/openssl/openssl/test/recipes/15-test_rsaoaep_data/plain_text create mode 100644 deps/openssl/openssl/test/recipes/15-test_rsapss.t create mode 100644 deps/openssl/openssl/test/recipes/15-test_rsapss_data/negativesaltlen.pem create mode 100644 deps/openssl/openssl/test/recipes/15-test_sha.t create mode 100644 deps/openssl/openssl/test/recipes/20-test_app.t create mode 100644 deps/openssl/openssl/test/recipes/20-test_cli_fips.t create mode 100644 deps/openssl/openssl/test/recipes/20-test_dgst.t create mode 100644 deps/openssl/openssl/test/recipes/20-test_dhparam.t create mode 100644 deps/openssl/openssl/test/recipes/20-test_dhparam_check.t create mode 100644 deps/openssl/openssl/test/recipes/20-test_dhparam_check_data/invalid/dh_p1024_t1862_pkcs3.pem create mode 100644 deps/openssl/openssl/test/recipes/20-test_dhparam_check_data/invalid/dh_p2048_t1862_pkcs3.pem create mode 100644 deps/openssl/openssl/test/recipes/20-test_dhparam_check_data/invalid/dh_p2048_t1864_pkcs3.pem create mode 100644 deps/openssl/openssl/test/recipes/20-test_dhparam_check_data/invalid/dh_p3072_t1862_pkcs3.pem create mode 100644 deps/openssl/openssl/test/recipes/20-test_dhparam_check_data/valid/dh_5114_1.pem create mode 100644 deps/openssl/openssl/test/recipes/20-test_dhparam_check_data/valid/dh_5114_2.pem create mode 100644 deps/openssl/openssl/test/recipes/20-test_dhparam_check_data/valid/dh_5114_3.pem create mode 100644 deps/openssl/openssl/test/recipes/20-test_dhparam_check_data/valid/dh_ffdhe2048.pem create mode 100644 deps/openssl/openssl/test/recipes/20-test_dhparam_check_data/valid/dhx_5114_2.pem create mode 100644 deps/openssl/openssl/test/recipes/20-test_dhparam_check_data/valid/dhx_ffdhe2048.pem create mode 100644 deps/openssl/openssl/test/recipes/20-test_dhparam_check_data/valid/dhx_p1024_q160_t1862.pem create mode 100644 deps/openssl/openssl/test/recipes/20-test_dhparam_check_data/valid/dhx_p1024_q160_t1864.pem create mode 100644 deps/openssl/openssl/test/recipes/20-test_dhparam_check_data/valid/dhx_p1024_q224_t1862.pem create mode 100644 deps/openssl/openssl/test/recipes/20-test_dhparam_check_data/valid/dhx_p1024_q256_t1862.pem create mode 100644 deps/openssl/openssl/test/recipes/20-test_dhparam_check_data/valid/dhx_p2048_q160_t1862.pem create mode 100644 deps/openssl/openssl/test/recipes/20-test_dhparam_check_data/valid/dhx_p2048_q224_t1862.pem create mode 100644 deps/openssl/openssl/test/recipes/20-test_dhparam_check_data/valid/dhx_p2048_q224_t1864.pem create mode 100644 deps/openssl/openssl/test/recipes/20-test_dhparam_check_data/valid/dhx_p2048_q256_t1862.pem create mode 100644 deps/openssl/openssl/test/recipes/20-test_dhparam_check_data/valid/dhx_p2048_q256_t1864.pem create mode 100644 deps/openssl/openssl/test/recipes/20-test_dhparam_check_data/valid/dhx_p3072_q160_t1862.pem create mode 100644 deps/openssl/openssl/test/recipes/20-test_dhparam_check_data/valid/dhx_p3072_q224_t1862.pem create mode 100644 deps/openssl/openssl/test/recipes/20-test_dhparam_check_data/valid/dhx_p3072_q256_t1862.pem create mode 100644 deps/openssl/openssl/test/recipes/20-test_dhparam_data/pkcs3-2-1024.der create mode 100644 deps/openssl/openssl/test/recipes/20-test_dhparam_data/pkcs3-2-1024.pem create mode 100644 deps/openssl/openssl/test/recipes/20-test_dhparam_data/pkcs3-2-2048.der create mode 100644 deps/openssl/openssl/test/recipes/20-test_dhparam_data/pkcs3-2-2048.pem create mode 100644 deps/openssl/openssl/test/recipes/20-test_dhparam_data/pkcs3-5-1024.der create mode 100644 deps/openssl/openssl/test/recipes/20-test_dhparam_data/pkcs3-5-1024.pem create mode 100644 deps/openssl/openssl/test/recipes/20-test_dhparam_data/x942-0-1024.der create mode 100644 deps/openssl/openssl/test/recipes/20-test_dhparam_data/x942-0-1024.pem create mode 100644 deps/openssl/openssl/test/recipes/20-test_enc.t create mode 100644 deps/openssl/openssl/test/recipes/20-test_enc_more.t create mode 100755 deps/openssl/openssl/test/recipes/20-test_kdf.t create mode 100755 deps/openssl/openssl/test/recipes/20-test_legacy_okay.t create mode 100644 deps/openssl/openssl/test/recipes/20-test_mac.t create mode 100644 deps/openssl/openssl/test/recipes/20-test_passwd.t create mode 100644 deps/openssl/openssl/test/recipes/20-test_pkeyutl.t create mode 100644 deps/openssl/openssl/test/recipes/20-test_rand_config.t create mode 100644 deps/openssl/openssl/test/recipes/20-test_spkac.t create mode 100644 deps/openssl/openssl/test/recipes/25-test_crl.t create mode 100644 deps/openssl/openssl/test/recipes/25-test_d2i.t create mode 100644 deps/openssl/openssl/test/recipes/25-test_eai_data.t create mode 100644 deps/openssl/openssl/test/recipes/25-test_eai_data/ascii_chain.pem create mode 100644 deps/openssl/openssl/test/recipes/25-test_eai_data/ascii_leaf.pem create mode 100644 deps/openssl/openssl/test/recipes/25-test_eai_data/san.ascii create mode 100644 deps/openssl/openssl/test/recipes/25-test_eai_data/san.utf8 create mode 100644 deps/openssl/openssl/test/recipes/25-test_eai_data/utf8_chain.pem create mode 100644 deps/openssl/openssl/test/recipes/25-test_eai_data/utf8_leaf.pem create mode 100644 deps/openssl/openssl/test/recipes/25-test_pkcs7.t create mode 100644 deps/openssl/openssl/test/recipes/25-test_pkcs7_data/malformed.pkcs7 create mode 100644 deps/openssl/openssl/test/recipes/25-test_req.t create mode 100644 deps/openssl/openssl/test/recipes/25-test_rusext.t create mode 100644 deps/openssl/openssl/test/recipes/25-test_rusext_data/grfc.msb create mode 100644 deps/openssl/openssl/test/recipes/25-test_rusext_data/grfc.utf8 create mode 100644 deps/openssl/openssl/test/recipes/25-test_sid.t create mode 100644 deps/openssl/openssl/test/recipes/25-test_verify.t create mode 100644 deps/openssl/openssl/test/recipes/25-test_verify_store.t create mode 100644 deps/openssl/openssl/test/recipes/25-test_x509.t create mode 100644 deps/openssl/openssl/test/recipes/30-test_acvp.t create mode 100644 deps/openssl/openssl/test/recipes/30-test_aesgcm.t create mode 100644 deps/openssl/openssl/test/recipes/30-test_afalg.t create mode 100644 deps/openssl/openssl/test/recipes/30-test_defltfips.t create mode 100644 deps/openssl/openssl/test/recipes/30-test_defltfips/fipsmodule.cnf create mode 100644 deps/openssl/openssl/test/recipes/30-test_engine.t create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp.t create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_data/evpciph_aes_ccm_cavs.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_data/evpciph_aes_common.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_data/evpciph_aes_cts.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_data/evpciph_aes_ocb.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_data/evpciph_aes_siv.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_data/evpciph_aes_stitched.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_data/evpciph_aes_wrap.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_data/evpciph_aria.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_data/evpciph_bf.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_data/evpciph_camellia.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_data/evpciph_camellia_cts.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_data/evpciph_cast5.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_data/evpciph_chacha.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_data/evpciph_des.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_data/evpciph_des3_common.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_data/evpciph_idea.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_data/evpciph_rc2.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_data/evpciph_rc4.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_data/evpciph_rc4_stitched.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_data/evpciph_rc5.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_data/evpciph_seed.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_data/evpciph_sm4.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_data/evpencod.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_data/evpkdf_hkdf.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_data/evpkdf_krb5.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_data/evpkdf_pbkdf1.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_data/evpkdf_pbkdf2.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_data/evpkdf_scrypt.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_data/evpkdf_ss.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_data/evpkdf_ssh.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_data/evpkdf_tls11_prf.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_data/evpkdf_tls12_prf.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_data/evpkdf_tls13_kdf.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_data/evpkdf_x942.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_data/evpkdf_x942_des.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_data/evpkdf_x963.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_data/evpmac_blake.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_data/evpmac_cmac_des.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_data/evpmac_common.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_data/evpmac_poly1305.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_data/evpmac_siphash.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_data/evpmac_sm3.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_data/evpmd_blake.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_data/evpmd_md.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_data/evpmd_mdc2.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_data/evpmd_ripemd.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_data/evpmd_sha.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_data/evpmd_sm3.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_data/evpmd_whirlpool.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_data/evppbe_pbkdf2.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_data/evppbe_pkcs12.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_data/evppbe_scrypt.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_data/evppkey_brainpool.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_data/evppkey_dh.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_data/evppkey_dsa.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_data/evppkey_ecc.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_data/evppkey_ecdh.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_data/evppkey_ecdsa.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_data/evppkey_ecx.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_data/evppkey_ffdhe.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_data/evppkey_kas.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_data/evppkey_kdf_hkdf.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_data/evppkey_kdf_scrypt.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_data/evppkey_kdf_tls1_prf.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_data/evppkey_mismatch.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_data/evppkey_rsa.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_data/evppkey_rsa_common.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_data/evppkey_sm2.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_data/evprand.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_extra.t create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_fetch_prov.t create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_kdf.t create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_libctx.t create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_pkey_dparam.t create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_pkey_provided.t create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_pkey_provided/DH.priv.der create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_pkey_provided/DH.priv.pem create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_pkey_provided/DH.priv.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_pkey_provided/DH.pub.der create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_pkey_provided/DH.pub.pem create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_pkey_provided/DH.pub.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_pkey_provided/DSA.priv.der create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_pkey_provided/DSA.priv.pem create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_pkey_provided/DSA.priv.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_pkey_provided/DSA.pub.der create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_pkey_provided/DSA.pub.pem create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_pkey_provided/DSA.pub.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_pkey_provided/EC.priv.der create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_pkey_provided/EC.priv.pem create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_pkey_provided/EC.priv.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_pkey_provided/EC.pub.der create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_pkey_provided/EC.pub.pem create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_pkey_provided/EC.pub.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_pkey_provided/ED25519.priv.der create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_pkey_provided/ED25519.priv.pem create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_pkey_provided/ED25519.priv.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_pkey_provided/ED25519.pub.der create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_pkey_provided/ED25519.pub.pem create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_pkey_provided/ED25519.pub.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_pkey_provided/ED448.priv.der create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_pkey_provided/ED448.priv.pem create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_pkey_provided/ED448.priv.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_pkey_provided/ED448.pub.der create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_pkey_provided/ED448.pub.pem create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_pkey_provided/ED448.pub.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_pkey_provided/RSA.priv.der create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_pkey_provided/RSA.priv.pem create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_pkey_provided/RSA.priv.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_pkey_provided/RSA.pub.der create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_pkey_provided/RSA.pub.pem create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_pkey_provided/RSA.pub.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_pkey_provided/X25519.priv.der create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_pkey_provided/X25519.priv.pem create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_pkey_provided/X25519.priv.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_pkey_provided/X25519.pub.der create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_pkey_provided/X25519.pub.pem create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_pkey_provided/X25519.pub.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_pkey_provided/X448.priv.der create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_pkey_provided/X448.priv.pem create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_pkey_provided/X448.priv.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_pkey_provided/X448.pub.der create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_pkey_provided/X448.pub.pem create mode 100644 deps/openssl/openssl/test/recipes/30-test_evp_pkey_provided/X448.pub.txt create mode 100644 deps/openssl/openssl/test/recipes/30-test_pbelu.t create mode 100644 deps/openssl/openssl/test/recipes/30-test_pkey_meth.t create mode 100644 deps/openssl/openssl/test/recipes/30-test_pkey_meth_kdf.t create mode 100644 deps/openssl/openssl/test/recipes/30-test_prov_config.t create mode 100644 deps/openssl/openssl/test/recipes/30-test_provider_status.t create mode 100644 deps/openssl/openssl/test/recipes/40-test_rehash.t create mode 100644 deps/openssl/openssl/test/recipes/60-test_x509_check_cert_pkey.t create mode 100644 deps/openssl/openssl/test/recipes/60-test_x509_dup_cert.t create mode 100644 deps/openssl/openssl/test/recipes/60-test_x509_store.t create mode 100644 deps/openssl/openssl/test/recipes/60-test_x509_time.t create mode 100644 deps/openssl/openssl/test/recipes/61-test_bio_prefix.t create mode 100644 deps/openssl/openssl/test/recipes/61-test_bio_prefix_data/args1.pl create mode 100644 deps/openssl/openssl/test/recipes/61-test_bio_prefix_data/args2.pl create mode 100644 deps/openssl/openssl/test/recipes/61-test_bio_prefix_data/in1.txt create mode 100644 deps/openssl/openssl/test/recipes/61-test_bio_prefix_data/in2.txt create mode 100644 deps/openssl/openssl/test/recipes/61-test_bio_prefix_data/out1.txt create mode 100644 deps/openssl/openssl/test/recipes/61-test_bio_prefix_data/out2.txt create mode 100644 deps/openssl/openssl/test/recipes/61-test_bio_readbuffer.t create mode 100644 deps/openssl/openssl/test/recipes/65-test_cmp_asn.t create mode 100644 deps/openssl/openssl/test/recipes/65-test_cmp_client.t create mode 100644 deps/openssl/openssl/test/recipes/65-test_cmp_client_data/client.crt create mode 100644 deps/openssl/openssl/test/recipes/65-test_cmp_client_data/client.csr create mode 100644 deps/openssl/openssl/test/recipes/65-test_cmp_client_data/client.key create mode 100644 deps/openssl/openssl/test/recipes/65-test_cmp_client_data/server.crt create mode 100644 deps/openssl/openssl/test/recipes/65-test_cmp_client_data/server.key create mode 100644 deps/openssl/openssl/test/recipes/65-test_cmp_ctx.t create mode 100644 deps/openssl/openssl/test/recipes/65-test_cmp_hdr.t create mode 100644 deps/openssl/openssl/test/recipes/65-test_cmp_msg.t create mode 100644 deps/openssl/openssl/test/recipes/65-test_cmp_msg_data/new.key create mode 100644 deps/openssl/openssl/test/recipes/65-test_cmp_msg_data/pkcs10.der create mode 100644 deps/openssl/openssl/test/recipes/65-test_cmp_msg_data/server.crt create mode 100644 deps/openssl/openssl/test/recipes/65-test_cmp_protect.t create mode 100644 deps/openssl/openssl/test/recipes/65-test_cmp_protect_data/EndEntity1.crt create mode 100644 deps/openssl/openssl/test/recipes/65-test_cmp_protect_data/EndEntity2.crt create mode 100644 deps/openssl/openssl/test/recipes/65-test_cmp_protect_data/IP_PBM.der create mode 100644 deps/openssl/openssl/test/recipes/65-test_cmp_protect_data/IP_PBM.txt create mode 100644 deps/openssl/openssl/test/recipes/65-test_cmp_protect_data/IR_protected.der create mode 100644 deps/openssl/openssl/test/recipes/65-test_cmp_protect_data/IR_unprotected.der create mode 100644 deps/openssl/openssl/test/recipes/65-test_cmp_protect_data/Intermediate_CA.crt create mode 100644 deps/openssl/openssl/test/recipes/65-test_cmp_protect_data/Root_CA.crt create mode 100644 deps/openssl/openssl/test/recipes/65-test_cmp_protect_data/server.crt create mode 100644 deps/openssl/openssl/test/recipes/65-test_cmp_protect_data/server.pem create mode 100644 deps/openssl/openssl/test/recipes/65-test_cmp_server.t create mode 100644 deps/openssl/openssl/test/recipes/65-test_cmp_server_data/CR_protected_PBM_1234.der create mode 100644 deps/openssl/openssl/test/recipes/65-test_cmp_status.t create mode 100644 deps/openssl/openssl/test/recipes/65-test_cmp_vfy.t create mode 100644 deps/openssl/openssl/test/recipes/65-test_cmp_vfy_data/EndEntity1.crt create mode 100644 deps/openssl/openssl/test/recipes/65-test_cmp_vfy_data/EndEntity2.crt create mode 100644 deps/openssl/openssl/test/recipes/65-test_cmp_vfy_data/IP_waitingStatus_PBM.der create mode 100644 deps/openssl/openssl/test/recipes/65-test_cmp_vfy_data/IP_waitingStatus_PBM.txt create mode 100644 deps/openssl/openssl/test/recipes/65-test_cmp_vfy_data/IR_protected.der create mode 100644 deps/openssl/openssl/test/recipes/65-test_cmp_vfy_data/IR_protected_0_extraCerts.der create mode 100644 deps/openssl/openssl/test/recipes/65-test_cmp_vfy_data/IR_protected_2_extraCerts.der create mode 100644 deps/openssl/openssl/test/recipes/65-test_cmp_vfy_data/IR_rmprotection.der create mode 100644 deps/openssl/openssl/test/recipes/65-test_cmp_vfy_data/IR_unprotected.der create mode 100644 deps/openssl/openssl/test/recipes/65-test_cmp_vfy_data/Intermediate_CA.crt create mode 100644 deps/openssl/openssl/test/recipes/65-test_cmp_vfy_data/Root_CA.crt create mode 100644 deps/openssl/openssl/test/recipes/65-test_cmp_vfy_data/chain.txt create mode 100644 deps/openssl/openssl/test/recipes/65-test_cmp_vfy_data/client.crt create mode 100644 deps/openssl/openssl/test/recipes/65-test_cmp_vfy_data/insta.cert.pem create mode 100644 deps/openssl/openssl/test/recipes/65-test_cmp_vfy_data/insta.priv.pem create mode 100644 deps/openssl/openssl/test/recipes/65-test_cmp_vfy_data/insta_ca.cert.pem create mode 100644 deps/openssl/openssl/test/recipes/65-test_cmp_vfy_data/server.crt create mode 100644 deps/openssl/openssl/test/recipes/65-test_cmp_vfy_data/server.key create mode 100644 deps/openssl/openssl/test/recipes/66-test_ossl_store.t create mode 100644 deps/openssl/openssl/test/recipes/66-test_ossl_store_data/DH-params.pem create mode 100644 deps/openssl/openssl/test/recipes/66-test_ossl_store_data/DHX-params.pem create mode 100644 deps/openssl/openssl/test/recipes/66-test_ossl_store_data/DSA-params.pem create mode 100644 deps/openssl/openssl/test/recipes/70-test_asyncio.t create mode 100644 deps/openssl/openssl/test/recipes/70-test_bad_dtls.t create mode 100644 deps/openssl/openssl/test/recipes/70-test_clienthello.t create mode 100644 deps/openssl/openssl/test/recipes/70-test_comp.t create mode 100644 deps/openssl/openssl/test/recipes/70-test_key_share.t create mode 100644 deps/openssl/openssl/test/recipes/70-test_packet.t create mode 100644 deps/openssl/openssl/test/recipes/70-test_recordlen.t create mode 100644 deps/openssl/openssl/test/recipes/70-test_renegotiation.t create mode 100644 deps/openssl/openssl/test/recipes/70-test_servername.t create mode 100644 deps/openssl/openssl/test/recipes/70-test_sslcbcpadding.t create mode 100644 deps/openssl/openssl/test/recipes/70-test_sslcertstatus.t create mode 100644 deps/openssl/openssl/test/recipes/70-test_sslextension.t create mode 100644 deps/openssl/openssl/test/recipes/70-test_sslmessages.t create mode 100644 deps/openssl/openssl/test/recipes/70-test_sslrecords.t create mode 100644 deps/openssl/openssl/test/recipes/70-test_sslsessiontick.t create mode 100644 deps/openssl/openssl/test/recipes/70-test_sslsigalgs.t create mode 100644 deps/openssl/openssl/test/recipes/70-test_sslsignature.t create mode 100644 deps/openssl/openssl/test/recipes/70-test_sslskewith0p.t create mode 100644 deps/openssl/openssl/test/recipes/70-test_sslversions.t create mode 100644 deps/openssl/openssl/test/recipes/70-test_sslvertol.t create mode 100644 deps/openssl/openssl/test/recipes/70-test_tls13alerts.t create mode 100644 deps/openssl/openssl/test/recipes/70-test_tls13cookie.t create mode 100644 deps/openssl/openssl/test/recipes/70-test_tls13downgrade.t create mode 100644 deps/openssl/openssl/test/recipes/70-test_tls13hrr.t create mode 100644 deps/openssl/openssl/test/recipes/70-test_tls13kexmodes.t create mode 100644 deps/openssl/openssl/test/recipes/70-test_tls13messages.t create mode 100644 deps/openssl/openssl/test/recipes/70-test_tls13psk.t create mode 100644 deps/openssl/openssl/test/recipes/70-test_tlsextms.t create mode 100644 deps/openssl/openssl/test/recipes/70-test_verify_extra.t create mode 100644 deps/openssl/openssl/test/recipes/70-test_wpacket.t create mode 100644 deps/openssl/openssl/test/recipes/71-test_ssl_ctx.t create mode 100644 deps/openssl/openssl/test/recipes/79-test_http.t create mode 100644 deps/openssl/openssl/test/recipes/80-test_ca.t create mode 100644 deps/openssl/openssl/test/recipes/80-test_ca_data/revoked.key create mode 100644 deps/openssl/openssl/test/recipes/80-test_cipherbytes.t create mode 100644 deps/openssl/openssl/test/recipes/80-test_cipherlist.t create mode 100644 deps/openssl/openssl/test/recipes/80-test_ciphername.t create mode 100644 deps/openssl/openssl/test/recipes/80-test_cmp_http.t create mode 100644 deps/openssl/openssl/test/recipes/80-test_cmp_http_data/Mock/12345.txt create mode 100644 deps/openssl/openssl/test/recipes/80-test_cmp_http_data/Mock/big_issuing.crt create mode 100644 deps/openssl/openssl/test/recipes/80-test_cmp_http_data/Mock/big_root.crt create mode 100644 deps/openssl/openssl/test/recipes/80-test_cmp_http_data/Mock/big_server.crt create mode 100644 deps/openssl/openssl/test/recipes/80-test_cmp_http_data/Mock/big_trusted.crt create mode 100644 deps/openssl/openssl/test/recipes/80-test_cmp_http_data/Mock/csr.pem create mode 100644 deps/openssl/openssl/test/recipes/80-test_cmp_http_data/Mock/empty.txt create mode 100644 deps/openssl/openssl/test/recipes/80-test_cmp_http_data/Mock/issuing.crt create mode 100644 deps/openssl/openssl/test/recipes/80-test_cmp_http_data/Mock/issuing_expired.crt create mode 100644 deps/openssl/openssl/test/recipes/80-test_cmp_http_data/Mock/new.key create mode 100644 deps/openssl/openssl/test/recipes/80-test_cmp_http_data/Mock/new_pass_12345.key create mode 100644 deps/openssl/openssl/test/recipes/80-test_cmp_http_data/Mock/new_pub.key create mode 100644 deps/openssl/openssl/test/recipes/80-test_cmp_http_data/Mock/random.bin create mode 100644 deps/openssl/openssl/test/recipes/80-test_cmp_http_data/Mock/root.crt create mode 100644 deps/openssl/openssl/test/recipes/80-test_cmp_http_data/Mock/root_expired.crt create mode 100644 deps/openssl/openssl/test/recipes/80-test_cmp_http_data/Mock/server.cnf create mode 100644 deps/openssl/openssl/test/recipes/80-test_cmp_http_data/Mock/server.crt create mode 100644 deps/openssl/openssl/test/recipes/80-test_cmp_http_data/Mock/server.key create mode 100644 deps/openssl/openssl/test/recipes/80-test_cmp_http_data/Mock/signer.crt create mode 100644 deps/openssl/openssl/test/recipes/80-test_cmp_http_data/Mock/signer.key create mode 100644 deps/openssl/openssl/test/recipes/80-test_cmp_http_data/Mock/signer.p12 create mode 100644 deps/openssl/openssl/test/recipes/80-test_cmp_http_data/Mock/signer_issuing.crt create mode 100644 deps/openssl/openssl/test/recipes/80-test_cmp_http_data/Mock/signer_only.crt create mode 100644 deps/openssl/openssl/test/recipes/80-test_cmp_http_data/Mock/signer_root.crt create mode 100644 deps/openssl/openssl/test/recipes/80-test_cmp_http_data/Mock/test.cnf create mode 100644 deps/openssl/openssl/test/recipes/80-test_cmp_http_data/Mock/trusted.crt create mode 100644 deps/openssl/openssl/test/recipes/80-test_cmp_http_data/Mock/wrong_csr.pem create mode 100644 deps/openssl/openssl/test/recipes/80-test_cmp_http_data/test_commands.csv create mode 100644 deps/openssl/openssl/test/recipes/80-test_cmp_http_data/test_connection.csv create mode 100644 deps/openssl/openssl/test/recipes/80-test_cmp_http_data/test_credentials.csv create mode 100644 deps/openssl/openssl/test/recipes/80-test_cmp_http_data/test_enrollment.csv create mode 100644 deps/openssl/openssl/test/recipes/80-test_cmp_http_data/test_verification.csv create mode 100644 deps/openssl/openssl/test/recipes/80-test_cms.t create mode 100644 deps/openssl/openssl/test/recipes/80-test_cms_data/bad_signtime_attr.cms create mode 100644 deps/openssl/openssl/test/recipes/80-test_cms_data/ciphertext_from_1_1_1.cms create mode 100644 deps/openssl/openssl/test/recipes/80-test_cms_data/ct_multiple_attr.cms create mode 100644 deps/openssl/openssl/test/recipes/80-test_cms_data/no_ct_attr.cms create mode 100644 deps/openssl/openssl/test/recipes/80-test_cms_data/no_md_attr.cms create mode 100644 deps/openssl/openssl/test/recipes/80-test_cms_data/pkcs7-md4.pem create mode 100644 deps/openssl/openssl/test/recipes/80-test_cmsapi.t create mode 100644 deps/openssl/openssl/test/recipes/80-test_cmsapi_data/encryptedData.der create mode 100644 deps/openssl/openssl/test/recipes/80-test_ct.t create mode 100644 deps/openssl/openssl/test/recipes/80-test_dane.t create mode 100644 deps/openssl/openssl/test/recipes/80-test_dtls.t create mode 100644 deps/openssl/openssl/test/recipes/80-test_dtls_mtu.t create mode 100644 deps/openssl/openssl/test/recipes/80-test_dtlsv1listen.t create mode 100644 deps/openssl/openssl/test/recipes/80-test_ocsp.t create mode 100644 deps/openssl/openssl/test/recipes/80-test_ocsp_data/cert.pem create mode 100644 deps/openssl/openssl/test/recipes/80-test_ocsp_data/key.pem create mode 100644 deps/openssl/openssl/test/recipes/80-test_pkcs12.t create mode 100644 deps/openssl/openssl/test/recipes/80-test_pkcs12_data/bad1.p12 create mode 100644 deps/openssl/openssl/test/recipes/80-test_pkcs12_data/bad2.p12 create mode 100644 deps/openssl/openssl/test/recipes/80-test_pkcs12_data/bad3.p12 create mode 100644 deps/openssl/openssl/test/recipes/80-test_policy_tree.t create mode 100644 deps/openssl/openssl/test/recipes/80-test_policy_tree_data/large_leaf.pem create mode 100644 deps/openssl/openssl/test/recipes/80-test_policy_tree_data/large_policy_tree.pem create mode 100644 deps/openssl/openssl/test/recipes/80-test_policy_tree_data/small_leaf.pem create mode 100644 deps/openssl/openssl/test/recipes/80-test_policy_tree_data/small_policy_tree.pem create mode 100644 deps/openssl/openssl/test/recipes/80-test_ssl_new.t create mode 100644 deps/openssl/openssl/test/recipes/80-test_ssl_old.t create mode 100644 deps/openssl/openssl/test/recipes/80-test_ssl_old_data/dsa2048.pem create mode 100644 deps/openssl/openssl/test/recipes/80-test_ssl_test_ctx.t create mode 100644 deps/openssl/openssl/test/recipes/80-test_sslcorrupt.t create mode 100644 deps/openssl/openssl/test/recipes/80-test_tsa.t create mode 100644 deps/openssl/openssl/test/recipes/80-test_tsa_data/all-zero.tsq create mode 100644 deps/openssl/openssl/test/recipes/80-test_tsa_data/comodo-aaa.pem create mode 100644 deps/openssl/openssl/test/recipes/80-test_tsa_data/sectigo-all-zero.tsr create mode 100644 deps/openssl/openssl/test/recipes/80-test_tsa_data/sectigo-signer.pem create mode 100644 deps/openssl/openssl/test/recipes/80-test_tsa_data/sectigo-time-stamping-ca.pem create mode 100644 deps/openssl/openssl/test/recipes/80-test_tsa_data/user-trust-ca-aaa.pem create mode 100644 deps/openssl/openssl/test/recipes/80-test_tsa_data/user-trust-ca.pem create mode 100644 deps/openssl/openssl/test/recipes/80-test_x509aux.t create mode 100644 deps/openssl/openssl/test/recipes/81-test_cmp_cli.t create mode 100644 deps/openssl/openssl/test/recipes/90-test_asn1_time.t create mode 100644 deps/openssl/openssl/test/recipes/90-test_async.t create mode 100644 deps/openssl/openssl/test/recipes/90-test_bio_enc.t create mode 100644 deps/openssl/openssl/test/recipes/90-test_bio_memleak.t create mode 100644 deps/openssl/openssl/test/recipes/90-test_constant_time.t create mode 100644 deps/openssl/openssl/test/recipes/90-test_fatalerr.t create mode 100644 deps/openssl/openssl/test/recipes/90-test_fipsload.t create mode 100644 deps/openssl/openssl/test/recipes/90-test_gmdiff.t create mode 100644 deps/openssl/openssl/test/recipes/90-test_gost_data/server-cert2001.pem create mode 100644 deps/openssl/openssl/test/recipes/90-test_gost_data/server-cert2012.pem create mode 100644 deps/openssl/openssl/test/recipes/90-test_gost_data/server-key2001.pem create mode 100644 deps/openssl/openssl/test/recipes/90-test_gost_data/server-key2012.pem create mode 100644 deps/openssl/openssl/test/recipes/90-test_ige.t create mode 100644 deps/openssl/openssl/test/recipes/90-test_includes.t create mode 100644 deps/openssl/openssl/test/recipes/90-test_includes_data/conf-includes/includes1.cnf create mode 100644 deps/openssl/openssl/test/recipes/90-test_includes_data/conf-includes/includes2.cnf create mode 100644 deps/openssl/openssl/test/recipes/90-test_includes_data/incdir.cnf create mode 100644 deps/openssl/openssl/test/recipes/90-test_includes_data/includes-broken.cnf create mode 100644 deps/openssl/openssl/test/recipes/90-test_includes_data/includes-eq-ws.cnf create mode 100644 deps/openssl/openssl/test/recipes/90-test_includes_data/includes-eq.cnf create mode 100644 deps/openssl/openssl/test/recipes/90-test_includes_data/includes-file.cnf create mode 100644 deps/openssl/openssl/test/recipes/90-test_includes_data/includes.cnf create mode 100644 deps/openssl/openssl/test/recipes/90-test_includes_data/vms-includes-file.cnf create mode 100644 deps/openssl/openssl/test/recipes/90-test_includes_data/vms-includes.cnf create mode 100644 deps/openssl/openssl/test/recipes/90-test_memleak.t create mode 100644 deps/openssl/openssl/test/recipes/90-test_overhead.t create mode 100644 deps/openssl/openssl/test/recipes/90-test_secmem.t create mode 100644 deps/openssl/openssl/test/recipes/90-test_shlibload.t create mode 100644 deps/openssl/openssl/test/recipes/90-test_srp.t create mode 100644 deps/openssl/openssl/test/recipes/90-test_sslapi.t create mode 100644 deps/openssl/openssl/test/recipes/90-test_sslapi_data/dhparams.pem create mode 100644 deps/openssl/openssl/test/recipes/90-test_sslapi_data/passwd.txt create mode 100644 deps/openssl/openssl/test/recipes/90-test_sslbuffers.t create mode 100644 deps/openssl/openssl/test/recipes/90-test_store.t create mode 100644 deps/openssl/openssl/test/recipes/90-test_store_data/dsaparam.pem create mode 100644 deps/openssl/openssl/test/recipes/90-test_store_data/rsa-key-2432.pem create mode 100644 deps/openssl/openssl/test/recipes/90-test_store_data/testrsa.msb create mode 100644 deps/openssl/openssl/test/recipes/90-test_store_data/testrsa.pvk create mode 100644 deps/openssl/openssl/test/recipes/90-test_sysdefault.t create mode 100644 deps/openssl/openssl/test/recipes/90-test_threads.t create mode 100644 deps/openssl/openssl/test/recipes/90-test_threads_data/rsakey.pem create mode 100644 deps/openssl/openssl/test/recipes/90-test_time_offset.t create mode 100644 deps/openssl/openssl/test/recipes/90-test_tls13ccs.t create mode 100644 deps/openssl/openssl/test/recipes/90-test_tls13encryption.t create mode 100644 deps/openssl/openssl/test/recipes/90-test_tls13secrets.t create mode 100644 deps/openssl/openssl/test/recipes/90-test_traceapi.t create mode 100644 deps/openssl/openssl/test/recipes/90-test_v3name.t create mode 100644 deps/openssl/openssl/test/recipes/91-test_pkey_check.t create mode 100644 deps/openssl/openssl/test/recipes/91-test_pkey_check_data/dhpkey.pem create mode 100644 deps/openssl/openssl/test/recipes/91-test_pkey_check_data/dsapub.pem create mode 100644 deps/openssl/openssl/test/recipes/91-test_pkey_check_data/dsapub_noparam.der create mode 100644 deps/openssl/openssl/test/recipes/91-test_pkey_check_data/ec_p256_bad_0.pem create mode 100644 deps/openssl/openssl/test/recipes/91-test_pkey_check_data/ec_p256_bad_1.pem create mode 100644 deps/openssl/openssl/test/recipes/91-test_pkey_check_data/rsapub_17k.pem create mode 100644 deps/openssl/openssl/test/recipes/91-test_pkey_check_data/sm2_bad_0.pem create mode 100644 deps/openssl/openssl/test/recipes/91-test_pkey_check_data/sm2_bad_1.pem create mode 100644 deps/openssl/openssl/test/recipes/91-test_pkey_check_data/sm2_bad_neg1.pem create mode 100644 deps/openssl/openssl/test/recipes/95-test_external_gost_engine.t create mode 100755 deps/openssl/openssl/test/recipes/95-test_external_gost_engine_data/gost_engine.sh create mode 100644 deps/openssl/openssl/test/recipes/95-test_external_krb5.t create mode 100755 deps/openssl/openssl/test/recipes/95-test_external_krb5_data/krb5.sh create mode 100644 deps/openssl/openssl/test/recipes/95-test_external_pyca.t create mode 100755 deps/openssl/openssl/test/recipes/95-test_external_pyca_data/cryptography.sh create mode 100644 deps/openssl/openssl/test/recipes/99-test_ecstress.t create mode 100644 deps/openssl/openssl/test/recipes/99-test_fuzz_asn1.t create mode 100644 deps/openssl/openssl/test/recipes/99-test_fuzz_asn1parse.t create mode 100644 deps/openssl/openssl/test/recipes/99-test_fuzz_bignum.t create mode 100644 deps/openssl/openssl/test/recipes/99-test_fuzz_bndiv.t create mode 100644 deps/openssl/openssl/test/recipes/99-test_fuzz_client.t create mode 100644 deps/openssl/openssl/test/recipes/99-test_fuzz_cmp.t create mode 100644 deps/openssl/openssl/test/recipes/99-test_fuzz_cms.t create mode 100644 deps/openssl/openssl/test/recipes/99-test_fuzz_conf.t create mode 100644 deps/openssl/openssl/test/recipes/99-test_fuzz_crl.t create mode 100644 deps/openssl/openssl/test/recipes/99-test_fuzz_ct.t create mode 100644 deps/openssl/openssl/test/recipes/99-test_fuzz_server.t create mode 100644 deps/openssl/openssl/test/recipes/99-test_fuzz_x509.t create mode 100644 deps/openssl/openssl/test/recipes/fuzz.pl create mode 100644 deps/openssl/openssl/test/recipes/ocsp-response.der create mode 100644 deps/openssl/openssl/test/recipes/tconversion.pl create mode 100644 deps/openssl/openssl/test/recordlentest.c create mode 100644 deps/openssl/openssl/test/rsa_complex.c create mode 100644 deps/openssl/openssl/test/rsa_mp_test.c create mode 100644 deps/openssl/openssl/test/rsa_sp800_56b_test.c create mode 100644 deps/openssl/openssl/test/rsa_test.c create mode 100644 deps/openssl/openssl/test/run_tests.pl create mode 100644 deps/openssl/openssl/test/sanitytest.c create mode 100644 deps/openssl/openssl/test/secmemtest.c create mode 100644 deps/openssl/openssl/test/serverinfo.pem create mode 100644 deps/openssl/openssl/test/serverinfo2.pem create mode 100644 deps/openssl/openssl/test/servername_test.c create mode 100644 deps/openssl/openssl/test/session.pem create mode 100644 deps/openssl/openssl/test/sha_test.c create mode 100644 deps/openssl/openssl/test/shibboleth.pfx create mode 100644 deps/openssl/openssl/test/shlibloadtest.c create mode 100644 deps/openssl/openssl/test/simpledynamic.c create mode 100644 deps/openssl/openssl/test/simpledynamic.h create mode 100644 deps/openssl/openssl/test/siphash_internal_test.c create mode 100644 deps/openssl/openssl/test/sm2_internal_test.c create mode 100644 deps/openssl/openssl/test/sm3_internal_test.c create mode 100644 deps/openssl/openssl/test/sm4_internal_test.c create mode 100644 deps/openssl/openssl/test/smcont.bin create mode 100644 deps/openssl/openssl/test/smcont.txt create mode 100644 deps/openssl/openssl/test/smcont_zero.txt create mode 100644 deps/openssl/openssl/test/smime-certs/badrsa.pem create mode 100644 deps/openssl/openssl/test/smime-certs/ca.cnf create mode 100644 deps/openssl/openssl/test/smime-certs/mksmime-certs.sh create mode 100644 deps/openssl/openssl/test/smime-certs/smdh.pem create mode 100644 deps/openssl/openssl/test/smime-certs/smdsa1.pem create mode 100644 deps/openssl/openssl/test/smime-certs/smdsa2.pem create mode 100644 deps/openssl/openssl/test/smime-certs/smdsa3.pem create mode 100644 deps/openssl/openssl/test/smime-certs/smdsap.pem create mode 100644 deps/openssl/openssl/test/smime-certs/smec1.pem create mode 100644 deps/openssl/openssl/test/smime-certs/smec2.pem create mode 100644 deps/openssl/openssl/test/smime-certs/smec3.pem create mode 100644 deps/openssl/openssl/test/smime-certs/smroot.pem create mode 100644 deps/openssl/openssl/test/smime-certs/smrsa1.pem create mode 100644 deps/openssl/openssl/test/smime-certs/smrsa2.pem create mode 100644 deps/openssl/openssl/test/smime-certs/smrsa3.pem create mode 100644 deps/openssl/openssl/test/smime-eml/SignedInvalidMappingFromanyPolicyTest7.eml create mode 100644 deps/openssl/openssl/test/sparse_array_test.c create mode 100644 deps/openssl/openssl/test/srptest.c create mode 100644 deps/openssl/openssl/test/ssl-tests/01-simple.cnf create mode 100644 deps/openssl/openssl/test/ssl-tests/01-simple.cnf.in create mode 100644 deps/openssl/openssl/test/ssl-tests/02-protocol-version.cnf create mode 100644 deps/openssl/openssl/test/ssl-tests/02-protocol-version.cnf.in create mode 100644 deps/openssl/openssl/test/ssl-tests/03-custom_verify.cnf create mode 100644 deps/openssl/openssl/test/ssl-tests/03-custom_verify.cnf.in create mode 100644 deps/openssl/openssl/test/ssl-tests/04-client_auth.cnf create mode 100644 deps/openssl/openssl/test/ssl-tests/04-client_auth.cnf.in create mode 100644 deps/openssl/openssl/test/ssl-tests/05-sni.cnf create mode 100644 deps/openssl/openssl/test/ssl-tests/05-sni.cnf.in create mode 100644 deps/openssl/openssl/test/ssl-tests/06-sni-ticket.cnf create mode 100644 deps/openssl/openssl/test/ssl-tests/06-sni-ticket.cnf.in create mode 100644 deps/openssl/openssl/test/ssl-tests/07-dtls-protocol-version.cnf create mode 100644 deps/openssl/openssl/test/ssl-tests/07-dtls-protocol-version.cnf.in create mode 100644 deps/openssl/openssl/test/ssl-tests/08-npn.cnf create mode 100644 deps/openssl/openssl/test/ssl-tests/08-npn.cnf.in create mode 100644 deps/openssl/openssl/test/ssl-tests/09-alpn.cnf create mode 100644 deps/openssl/openssl/test/ssl-tests/09-alpn.cnf.in create mode 100644 deps/openssl/openssl/test/ssl-tests/10-resumption.cnf create mode 100644 deps/openssl/openssl/test/ssl-tests/10-resumption.cnf.in create mode 100644 deps/openssl/openssl/test/ssl-tests/11-dtls_resumption.cnf create mode 100644 deps/openssl/openssl/test/ssl-tests/11-dtls_resumption.cnf.in create mode 100644 deps/openssl/openssl/test/ssl-tests/12-ct.cnf create mode 100644 deps/openssl/openssl/test/ssl-tests/12-ct.cnf.in create mode 100644 deps/openssl/openssl/test/ssl-tests/13-fragmentation.cnf create mode 100644 deps/openssl/openssl/test/ssl-tests/13-fragmentation.cnf.in create mode 100644 deps/openssl/openssl/test/ssl-tests/14-curves.cnf create mode 100644 deps/openssl/openssl/test/ssl-tests/14-curves.cnf.in create mode 100644 deps/openssl/openssl/test/ssl-tests/15-certstatus.cnf create mode 100644 deps/openssl/openssl/test/ssl-tests/15-certstatus.cnf.in create mode 100644 deps/openssl/openssl/test/ssl-tests/16-dtls-certstatus.cnf create mode 100644 deps/openssl/openssl/test/ssl-tests/16-dtls-certstatus.cnf.in create mode 100644 deps/openssl/openssl/test/ssl-tests/17-renegotiate.cnf create mode 100644 deps/openssl/openssl/test/ssl-tests/17-renegotiate.cnf.in create mode 100644 deps/openssl/openssl/test/ssl-tests/18-dtls-renegotiate.cnf create mode 100644 deps/openssl/openssl/test/ssl-tests/18-dtls-renegotiate.cnf.in create mode 100644 deps/openssl/openssl/test/ssl-tests/19-mac-then-encrypt.cnf create mode 100644 deps/openssl/openssl/test/ssl-tests/19-mac-then-encrypt.cnf.in create mode 100644 deps/openssl/openssl/test/ssl-tests/20-cert-select.cnf create mode 100644 deps/openssl/openssl/test/ssl-tests/20-cert-select.cnf.in create mode 100644 deps/openssl/openssl/test/ssl-tests/21-key-update.cnf create mode 100644 deps/openssl/openssl/test/ssl-tests/21-key-update.cnf.in create mode 100644 deps/openssl/openssl/test/ssl-tests/22-compression.cnf create mode 100644 deps/openssl/openssl/test/ssl-tests/22-compression.cnf.in create mode 100644 deps/openssl/openssl/test/ssl-tests/23-srp.cnf create mode 100644 deps/openssl/openssl/test/ssl-tests/23-srp.cnf.in create mode 100644 deps/openssl/openssl/test/ssl-tests/24-padding.cnf create mode 100644 deps/openssl/openssl/test/ssl-tests/24-padding.cnf.in create mode 100644 deps/openssl/openssl/test/ssl-tests/25-cipher.cnf create mode 100644 deps/openssl/openssl/test/ssl-tests/25-cipher.cnf.in create mode 100644 deps/openssl/openssl/test/ssl-tests/26-tls13_client_auth.cnf create mode 100644 deps/openssl/openssl/test/ssl-tests/26-tls13_client_auth.cnf.in create mode 100644 deps/openssl/openssl/test/ssl-tests/27-ticket-appdata.cnf create mode 100644 deps/openssl/openssl/test/ssl-tests/27-ticket-appdata.cnf.in create mode 100644 deps/openssl/openssl/test/ssl-tests/28-seclevel.cnf create mode 100644 deps/openssl/openssl/test/ssl-tests/28-seclevel.cnf.in create mode 100644 deps/openssl/openssl/test/ssl-tests/29-dtls-sctp-label-bug.cnf create mode 100644 deps/openssl/openssl/test/ssl-tests/29-dtls-sctp-label-bug.cnf.in create mode 100644 deps/openssl/openssl/test/ssl-tests/30-extended-master-secret.cnf create mode 100644 deps/openssl/openssl/test/ssl-tests/30-extended-master-secret.cnf.in create mode 100644 deps/openssl/openssl/test/ssl-tests/protocol_version.pm create mode 100644 deps/openssl/openssl/test/ssl-tests/ssltests_base.pm create mode 100644 deps/openssl/openssl/test/ssl_cert_table_internal_test.c create mode 100644 deps/openssl/openssl/test/ssl_ctx_test.c create mode 100644 deps/openssl/openssl/test/ssl_old_test.c create mode 100644 deps/openssl/openssl/test/ssl_test.c create mode 100644 deps/openssl/openssl/test/ssl_test.tmpl create mode 100644 deps/openssl/openssl/test/ssl_test_ctx_test.c create mode 100644 deps/openssl/openssl/test/ssl_test_ctx_test.cnf create mode 100644 deps/openssl/openssl/test/sslapitest.c create mode 100644 deps/openssl/openssl/test/sslbuffertest.c create mode 100644 deps/openssl/openssl/test/sslcorrupttest.c create mode 100644 deps/openssl/openssl/test/stack_test.c create mode 100644 deps/openssl/openssl/test/sysdefault.cnf create mode 100644 deps/openssl/openssl/test/sysdefaulttest.c create mode 100644 deps/openssl/openssl/test/test.cnf create mode 100644 deps/openssl/openssl/test/test_test.c create mode 100644 deps/openssl/openssl/test/testcrl.pem create mode 100644 deps/openssl/openssl/test/testdsa.pem create mode 100644 deps/openssl/openssl/test/testdsapub.pem create mode 100644 deps/openssl/openssl/test/testec-p112r1.pem create mode 100644 deps/openssl/openssl/test/testec-p256.pem create mode 100644 deps/openssl/openssl/test/testecpub-p256.pem create mode 100644 deps/openssl/openssl/test/tested25519.pem create mode 100644 deps/openssl/openssl/test/tested25519pub.pem create mode 100644 deps/openssl/openssl/test/tested448.pem create mode 100644 deps/openssl/openssl/test/tested448pub.pem create mode 100644 deps/openssl/openssl/test/testp7.pem create mode 100644 deps/openssl/openssl/test/testreq2.pem create mode 100644 deps/openssl/openssl/test/testrsa.pem create mode 100644 deps/openssl/openssl/test/testrsa2048.pem create mode 100644 deps/openssl/openssl/test/testrsa2048pub.pem create mode 100644 deps/openssl/openssl/test/testrsa_withattrs.der create mode 100644 deps/openssl/openssl/test/testrsa_withattrs.pem create mode 100644 deps/openssl/openssl/test/testrsapss.pem create mode 100644 deps/openssl/openssl/test/testrsapssmandatory.pem create mode 100644 deps/openssl/openssl/test/testrsapub.pem create mode 100644 deps/openssl/openssl/test/testsid.pem create mode 100644 deps/openssl/openssl/test/testutil.h create mode 100644 deps/openssl/openssl/test/testutil/apps_shims.c create mode 100644 deps/openssl/openssl/test/testutil/basic_output.c create mode 100644 deps/openssl/openssl/test/testutil/cb.c create mode 100644 deps/openssl/openssl/test/testutil/driver.c create mode 100644 deps/openssl/openssl/test/testutil/fake_random.c create mode 100644 deps/openssl/openssl/test/testutil/format_output.c create mode 100644 deps/openssl/openssl/test/testutil/load.c create mode 100644 deps/openssl/openssl/test/testutil/main.c create mode 100644 deps/openssl/openssl/test/testutil/options.c create mode 100644 deps/openssl/openssl/test/testutil/output.c create mode 100644 deps/openssl/openssl/test/testutil/output.h create mode 100644 deps/openssl/openssl/test/testutil/provider.c create mode 100644 deps/openssl/openssl/test/testutil/random.c create mode 100644 deps/openssl/openssl/test/testutil/stanza.c create mode 100644 deps/openssl/openssl/test/testutil/test_cleanup.c create mode 100644 deps/openssl/openssl/test/testutil/test_options.c create mode 100644 deps/openssl/openssl/test/testutil/tests.c create mode 100644 deps/openssl/openssl/test/testutil/testutil_init.c create mode 100644 deps/openssl/openssl/test/testutil/tu_local.h create mode 100644 deps/openssl/openssl/test/testx509.pem create mode 100644 deps/openssl/openssl/test/threadstest.c create mode 100644 deps/openssl/openssl/test/threadstest.h create mode 100644 deps/openssl/openssl/test/threadstest_fips.c create mode 100644 deps/openssl/openssl/test/time_offset_test.c create mode 100644 deps/openssl/openssl/test/tls-provider.c create mode 100644 deps/openssl/openssl/test/tls13ccstest.c create mode 100644 deps/openssl/openssl/test/tls13encryptiontest.c create mode 100644 deps/openssl/openssl/test/tls13secretstest.c create mode 100644 deps/openssl/openssl/test/trace_api_test.c create mode 100644 deps/openssl/openssl/test/uitest.c create mode 100644 deps/openssl/openssl/test/upcallstest.c create mode 100644 deps/openssl/openssl/test/user_property_test.c create mode 100644 deps/openssl/openssl/test/v3-cert1.pem create mode 100644 deps/openssl/openssl/test/v3-cert2.pem create mode 100644 deps/openssl/openssl/test/v3_ca_exts.cnf create mode 100644 deps/openssl/openssl/test/v3ext.c create mode 100644 deps/openssl/openssl/test/v3nametest.c create mode 100644 deps/openssl/openssl/test/verify_extra_test.c create mode 100644 deps/openssl/openssl/test/versions.c create mode 100644 deps/openssl/openssl/test/wpackettest.c create mode 100644 deps/openssl/openssl/test/x509_check_cert_pkey_test.c create mode 100644 deps/openssl/openssl/test/x509_dup_cert_test.c create mode 100644 deps/openssl/openssl/test/x509_internal_test.c create mode 100644 deps/openssl/openssl/test/x509_time_test.c create mode 100644 deps/openssl/openssl/test/x509aux.c diff --git a/deps/openssl/config/archs/BSD-x86/asm/configdata.pm b/deps/openssl/config/archs/BSD-x86/asm/configdata.pm index 8382e5a57..1d5402d47 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/configdata.pm +++ b/deps/openssl/config/archs/BSD-x86/asm/configdata.pm @@ -139,7 +139,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -156,7 +156,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.13+quic", + "full_version" => "3.0.9", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -203,7 +203,7 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "13", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -255,11 +255,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "30 Jan 2024", - "shlib_version" => "81.3", + "release_date" => "30 May 2023", + "shlib_version" => "3", "sourcedir" => ".", "target" => "BSD-x86", - "version" => "3.0.13" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -386,7 +386,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -781,9 +780,6 @@ our %unified_info = ( "providers/fips" => { "fips" => "1" }, - "test/p_minimal" => { - "noinst" => "1" - }, "test/p_test" => { "noinst" => "1" } @@ -852,9 +848,6 @@ our %unified_info = ( "test/asn1_internal_test" => { "noinst" => "1" }, - "test/asn1_stable_parse_test" => { - "noinst" => "1" - }, "test/asn1_string_table_test" => { "noinst" => "1" }, @@ -1044,9 +1037,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -1602,7 +1592,6 @@ our %unified_info = ( "OPENSSL_IA32_SSE2", "PADLOCK_ASM", "POLY1305_ASM", - "RC4_ASM", "RMD160_ASM", "SHA1_ASM", "SHA256_ASM", @@ -1650,11 +1639,7 @@ our %unified_info = ( "VPAES_ASM" ], "providers/liblegacy.a" => [ - "MD5_ASM", - "RC4_ASM" - ], - "test/evp_extra_test" => [ - "STATIC_LEGACY" + "MD5_ASM" ], "test/provider_internal_test" => [ "PROVIDER_INIT_FUNCTION_NAME=p_test_init" @@ -2409,9 +2394,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -2709,9 +2691,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -3480,9 +3459,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -3777,9 +3753,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -3813,12 +3786,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -4803,9 +4770,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -5103,9 +5067,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -5874,9 +5835,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -6171,9 +6129,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -6207,12 +6162,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -7210,10 +7159,6 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], - "test/asn1_stable_parse_test" => [ - "libcrypto", - "test/libtestutil.a" - ], "test/asn1_string_table_test" => [ "libcrypto", "test/libtestutil.a" @@ -7467,10 +7412,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -7736,8 +7677,6 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "libcrypto.a", - "providers/libcommon.a", - "providers/liblegacy.a", "test/libtestutil.a" ], "test/evp_extra_test2" => [ @@ -9824,7 +9763,6 @@ our %unified_info = ( }, "providers" => { "deps" => [ - "providers/evp_extra_test-bin-legacyprov.o", "providers/libcrypto-lib-baseprov.o", "providers/libcrypto-lib-defltprov.o", "providers/libcrypto-lib-nullprov.o", @@ -9832,9 +9770,6 @@ our %unified_info = ( "providers/libdefault.a" ], "products" => { - "bin" => [ - "test/evp_extra_test" - ], "dso" => [ "providers/fips", "providers/legacy" @@ -10271,7 +10206,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10322,7 +10256,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -11454,9 +11387,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -11754,9 +11684,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -12525,9 +12452,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -12822,9 +12746,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -12858,12 +12779,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -13848,9 +13763,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -14148,9 +14060,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -14919,9 +14828,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -15216,9 +15122,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -15252,12 +15155,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -16286,10 +16183,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16366,9 +16259,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "whrlpool" ], - "test/p_minimal.ld" => [ - "util/providers.num" - ], "test/p_test.ld" => [ "util/providers.num" ], @@ -16534,7 +16424,6 @@ our %unified_info = ( "doc/html/man3/CMS_get1_ReceiptRequest.html", "doc/html/man3/CMS_sign.html", "doc/html/man3/CMS_sign_receipt.html", - "doc/html/man3/CMS_signed_get_attr.html", "doc/html/man3/CMS_uncompress.html", "doc/html/man3/CMS_verify.html", "doc/html/man3/CMS_verify_receipt.html", @@ -16634,7 +16523,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_encapsulate.html", "doc/html/man3/EVP_PKEY_encrypt.html", "doc/html/man3/EVP_PKEY_fromdata.html", - "doc/html/man3/EVP_PKEY_get_attr.html", "doc/html/man3/EVP_PKEY_get_default_digest_nid.html", "doc/html/man3/EVP_PKEY_get_field_type.html", "doc/html/man3/EVP_PKEY_get_group_name.html", @@ -16891,7 +16779,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -16990,7 +16877,6 @@ our %unified_info = ( "doc/html/man3/X509V3_get_d2i.html", "doc/html/man3/X509V3_set_ctx.html", "doc/html/man3/X509_ALGOR_dup.html", - "doc/html/man3/X509_ATTRIBUTE.html", "doc/html/man3/X509_CRL_get0_by_serial.html", "doc/html/man3/X509_EXTENSION_set_object.html", "doc/html/man3/X509_LOOKUP.html", @@ -17002,8 +16888,6 @@ our %unified_info = ( "doc/html/man3/X509_NAME_get_index_by_NID.html", "doc/html/man3/X509_NAME_print_ex.html", "doc/html/man3/X509_PUBKEY_new.html", - "doc/html/man3/X509_REQ_get_attr.html", - "doc/html/man3/X509_REQ_get_extensions.html", "doc/html/man3/X509_SIG_get0.html", "doc/html/man3/X509_STORE_CTX_get_error.html", "doc/html/man3/X509_STORE_CTX_new.html", @@ -18301,10 +18185,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/asn1_stable_parse_test" => [ - "include", - "apps/include" - ], "test/asn1_string_table_test" => [ "include", "apps/include" @@ -18512,9 +18392,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -18774,9 +18651,7 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "include", - "apps/include", - "providers/common/include", - "providers/implementations/include" + "apps/include" ], "test/evp_extra_test2" => [ "include", @@ -19033,10 +18908,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/p_minimal" => [ - "include", - "." - ], "test/p_test" => [ "include", "." @@ -19526,7 +19397,6 @@ our %unified_info = ( "doc/man/man3/CMS_get1_ReceiptRequest.3", "doc/man/man3/CMS_sign.3", "doc/man/man3/CMS_sign_receipt.3", - "doc/man/man3/CMS_signed_get_attr.3", "doc/man/man3/CMS_uncompress.3", "doc/man/man3/CMS_verify.3", "doc/man/man3/CMS_verify_receipt.3", @@ -19626,7 +19496,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_encapsulate.3", "doc/man/man3/EVP_PKEY_encrypt.3", "doc/man/man3/EVP_PKEY_fromdata.3", - "doc/man/man3/EVP_PKEY_get_attr.3", "doc/man/man3/EVP_PKEY_get_default_digest_nid.3", "doc/man/man3/EVP_PKEY_get_field_type.3", "doc/man/man3/EVP_PKEY_get_group_name.3", @@ -19883,7 +19752,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -19982,7 +19850,6 @@ our %unified_info = ( "doc/man/man3/X509V3_get_d2i.3", "doc/man/man3/X509V3_set_ctx.3", "doc/man/man3/X509_ALGOR_dup.3", - "doc/man/man3/X509_ATTRIBUTE.3", "doc/man/man3/X509_CRL_get0_by_serial.3", "doc/man/man3/X509_EXTENSION_set_object.3", "doc/man/man3/X509_LOOKUP.3", @@ -19994,8 +19861,6 @@ our %unified_info = ( "doc/man/man3/X509_NAME_get_index_by_NID.3", "doc/man/man3/X509_NAME_print_ex.3", "doc/man/man3/X509_PUBKEY_new.3", - "doc/man/man3/X509_REQ_get_attr.3", - "doc/man/man3/X509_REQ_get_extensions.3", "doc/man/man3/X509_SIG_get0.3", "doc/man/man3/X509_STORE_CTX_get_error.3", "doc/man/man3/X509_STORE_CTX_new.3", @@ -20179,7 +20044,6 @@ our %unified_info = ( "modules" => [ "providers/fips", "providers/legacy", - "test/p_minimal", "test/p_test" ], "programs" => [ @@ -20205,7 +20069,6 @@ our %unified_info = ( "test/asn1_dsa_internal_test", "test/asn1_encode_test", "test/asn1_internal_test", - "test/asn1_stable_parse_test", "test/asn1_string_table_test", "test/asn1_time_test", "test/asynciotest", @@ -20269,7 +20132,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24476,7 +24338,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24503,7 +24364,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -24605,9 +24465,6 @@ our %unified_info = ( "providers/common/libfips-lib-securitycheck_fips.o" => [ "providers/common/securitycheck_fips.c" ], - "providers/evp_extra_test-bin-legacyprov.o" => [ - "providers/legacyprov.c" - ], "providers/fips" => [ "providers/fips.ld", "providers/fips/fips-dso-fips_entry.o" @@ -25754,9 +25611,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25838,9 +25692,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25898,12 +25749,6 @@ our %unified_info = ( "test/asn1_internal_test-bin-asn1_internal_test.o" => [ "test/asn1_internal_test.c" ], - "test/asn1_stable_parse_test" => [ - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" - ], - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" => [ - "test/asn1_stable_parse_test.c" - ], "test/asn1_string_table_test" => [ "test/asn1_string_table_test-bin-asn1_string_table_test.o" ], @@ -26283,12 +26128,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -26687,7 +26526,6 @@ our %unified_info = ( "test/errtest.c" ], "test/evp_extra_test" => [ - "providers/evp_extra_test-bin-legacyprov.o", "test/evp_extra_test-bin-evp_extra_test.o" ], "test/evp_extra_test-bin-evp_extra_test.o" => [ @@ -26978,13 +26816,6 @@ our %unified_info = ( "test/ossl_store_test-bin-ossl_store_test.o" => [ "test/ossl_store_test.c" ], - "test/p_minimal" => [ - "test/p_minimal-dso-p_minimal.o", - "test/p_minimal.ld" - ], - "test/p_minimal-dso-p_minimal.o" => [ - "test/p_minimal.c" - ], "test/p_test" => [ "test/p_test-dso-p_test.o", "test/p_test.ld" @@ -27668,8 +27499,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27696,7 +27527,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27713,8 +27544,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/BSD-x86/asm/crypto/aes/aes-586.S b/deps/openssl/config/archs/BSD-x86/asm/crypto/aes/aes-586.S index 54ca91832..4654a1af9 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/crypto/aes/aes-586.S +++ b/deps/openssl/config/archs/BSD-x86/asm/crypto/aes/aes-586.S @@ -2,10 +2,10 @@ .type __x86_AES_encrypt_compact,@function .align 4 __x86_AES_encrypt_compact: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl %edi,20(%esp) xorl (%edi),%eax @@ -265,10 +265,10 @@ L000loop: .type __sse_AES_encrypt_compact,@function .align 4 __sse_AES_encrypt_compact: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pxor (%edi),%mm0 pxor 8(%edi),%mm4 @@ -426,10 +426,10 @@ L002out: .type __x86_AES_encrypt,@function .align 4 __x86_AES_encrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl %edi,20(%esp) xorl (%edi),%eax @@ -980,10 +980,10 @@ LAES_Te: .align 4 _AES_encrypt: L_AES_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1048,10 +1048,10 @@ L005x86: .type __x86_AES_decrypt_compact,@function .align 4 __x86_AES_decrypt_compact: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl %edi,20(%esp) xorl (%edi),%eax @@ -1407,10 +1407,10 @@ L006loop: .type __sse_AES_decrypt_compact,@function .align 4 __sse_AES_decrypt_compact: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pxor (%edi),%mm0 pxor 8(%edi),%mm4 @@ -1627,10 +1627,10 @@ L008out: .type __x86_AES_decrypt,@function .align 4 __x86_AES_decrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl %edi,20(%esp) xorl (%edi),%eax @@ -2185,10 +2185,10 @@ LAES_Td: .align 4 _AES_decrypt: L_AES_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2255,10 +2255,10 @@ L011x86: .align 4 _AES_cbc_encrypt: L_AES_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2791,10 +2791,10 @@ L039slow_dec_partial_x86: .type __x86_AES_set_encrypt_key,@function .align 4 __x86_AES_set_encrypt_key: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3027,10 +3027,10 @@ L045exit: .align 4 _AES_set_encrypt_key: L_AES_set_encrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call __x86_AES_set_encrypt_key ret @@ -3039,10 +3039,10 @@ L_AES_set_encrypt_key_begin: .align 4 _AES_set_decrypt_key: L_AES_set_decrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call __x86_AES_set_encrypt_key cmpl $0,%eax diff --git a/deps/openssl/config/archs/BSD-x86/asm/crypto/aes/aesni-x86.S b/deps/openssl/config/archs/BSD-x86/asm/crypto/aes/aesni-x86.S index 0dfd8d39f..8866ea82e 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/crypto/aes/aesni-x86.S +++ b/deps/openssl/config/archs/BSD-x86/asm/crypto/aes/aesni-x86.S @@ -4,10 +4,10 @@ .align 4 _aesni_encrypt: L_aesni_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 12(%esp),%edx @@ -35,10 +35,10 @@ L000enc1_loop_1: .align 4 _aesni_decrypt: L_aesni_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 12(%esp),%edx @@ -64,10 +64,10 @@ L001dec1_loop_2: .type __aesni_encrypt2,@function .align 4 __aesni_encrypt2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -95,10 +95,10 @@ L002enc2_loop: .type __aesni_decrypt2,@function .align 4 __aesni_decrypt2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -126,10 +126,10 @@ L003dec2_loop: .type __aesni_encrypt3,@function .align 4 __aesni_encrypt3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -162,10 +162,10 @@ L004enc3_loop: .type __aesni_decrypt3,@function .align 4 __aesni_decrypt3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -198,10 +198,10 @@ L005dec3_loop: .type __aesni_encrypt4,@function .align 4 __aesni_encrypt4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 movups 16(%edx),%xmm1 @@ -240,10 +240,10 @@ L006enc4_loop: .type __aesni_decrypt4,@function .align 4 __aesni_decrypt4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 movups 16(%edx),%xmm1 @@ -282,10 +282,10 @@ L007dec4_loop: .type __aesni_encrypt6,@function .align 4 __aesni_encrypt6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -340,10 +340,10 @@ L_aesni_encrypt6_enter: .type __aesni_decrypt6,@function .align 4 __aesni_decrypt6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -400,10 +400,10 @@ L_aesni_decrypt6_enter: .align 4 _aesni_ecb_encrypt: L_aesni_ecb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -639,10 +639,10 @@ L012ecb_ret: .align 4 _aesni_ccm64_encrypt_blocks: L_aesni_ccm64_encrypt_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -731,10 +731,10 @@ L031ccm64_enc2_loop: .align 4 _aesni_ccm64_decrypt_blocks: L_aesni_ccm64_decrypt_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -858,10 +858,10 @@ L036enc1_loop_6: .align 4 _aesni_ctr32_encrypt_blocks: L_aesni_ctr32_encrypt_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1100,10 +1100,10 @@ L040ctr32_ret: .align 4 _aesni_xts_encrypt: L_aesni_xts_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1464,10 +1464,10 @@ L056xts_enc_ret: .align 4 _aesni_xts_decrypt: L_aesni_xts_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1858,10 +1858,10 @@ L069xts_dec_ret: .align 4 _aesni_ocb_encrypt: L_aesni_ocb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2257,10 +2257,10 @@ L078done: .align 4 _aesni_ocb_decrypt: L_aesni_ocb_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2656,10 +2656,10 @@ L088done: .align 4 _aesni_cbc_encrypt: L_aesni_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2919,10 +2919,10 @@ L094cbc_abort: .type __aesni_set_encrypt_key,@function .align 4 __aesni_set_encrypt_key: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3259,10 +3259,10 @@ L115bad_keybits: .align 4 _aesni_set_encrypt_key: L_aesni_set_encrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 8(%esp),%ecx @@ -3274,10 +3274,10 @@ L_aesni_set_encrypt_key_begin: .align 4 _aesni_set_decrypt_key: L_aesni_set_decrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 8(%esp),%ecx diff --git a/deps/openssl/config/archs/BSD-x86/asm/crypto/aes/vpaes-x86.S b/deps/openssl/config/archs/BSD-x86/asm/crypto/aes/vpaes-x86.S index ed3c31c5b..2ea0b6af4 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/crypto/aes/vpaes-x86.S +++ b/deps/openssl/config/archs/BSD-x86/asm/crypto/aes/vpaes-x86.S @@ -59,10 +59,10 @@ L_vpaes_consts: .type __vpaes_preheat,@function .align 4 __vpaes_preheat: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif addl (%esp),%ebp movdqa -48(%ebp),%xmm7 @@ -71,10 +71,10 @@ __vpaes_preheat: .type __vpaes_encrypt_core,@function .align 4 __vpaes_encrypt_core: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl $16,%ecx movl 240(%edx),%eax @@ -152,10 +152,10 @@ L000enc_entry: .type __vpaes_decrypt_core,@function .align 4 __vpaes_decrypt_core: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif leal 608(%ebp),%ebx movl 240(%edx),%eax @@ -244,10 +244,10 @@ L002dec_entry: .type __vpaes_schedule_core,@function .align 4 __vpaes_schedule_core: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif addl (%esp),%ebp movdqu (%esi),%xmm0 @@ -342,10 +342,10 @@ L013schedule_mangle_last_dec: .type __vpaes_schedule_192_smear,@function .align 4 __vpaes_schedule_192_smear: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pshufd $128,%xmm6,%xmm1 pshufd $254,%xmm7,%xmm0 @@ -358,10 +358,10 @@ __vpaes_schedule_192_smear: .type __vpaes_schedule_round,@function .align 4 __vpaes_schedule_round: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movdqa 8(%esp),%xmm2 pxor %xmm1,%xmm1 @@ -411,10 +411,10 @@ L_vpaes_schedule_low_round: .type __vpaes_schedule_transform,@function .align 4 __vpaes_schedule_transform: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movdqa -16(%ebp),%xmm2 movdqa %xmm2,%xmm1 @@ -430,10 +430,10 @@ __vpaes_schedule_transform: .type __vpaes_schedule_mangle,@function .align 4 __vpaes_schedule_mangle: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movdqa %xmm0,%xmm4 movdqa 128(%ebp),%xmm5 @@ -495,10 +495,10 @@ L015schedule_mangle_both: .align 4 _vpaes_set_encrypt_key: L_vpaes_set_encrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -532,10 +532,10 @@ L016pic_point: .align 4 _vpaes_set_decrypt_key: L_vpaes_set_decrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -574,10 +574,10 @@ L017pic_point: .align 4 _vpaes_encrypt: L_vpaes_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -607,10 +607,10 @@ L018pic_point: .align 4 _vpaes_decrypt: L_vpaes_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -640,10 +640,10 @@ L019pic_point: .align 4 _vpaes_cbc_encrypt: L_vpaes_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/BSD-x86/asm/crypto/bf/bf-586.S b/deps/openssl/config/archs/BSD-x86/asm/crypto/bf/bf-586.S index 3b44e17cf..4f880742c 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/crypto/bf/bf-586.S +++ b/deps/openssl/config/archs/BSD-x86/asm/crypto/bf/bf-586.S @@ -4,10 +4,10 @@ .align 4 _BF_encrypt: L_BF_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -358,10 +358,10 @@ L_BF_encrypt_begin: .align 4 _BF_decrypt: L_BF_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -712,10 +712,10 @@ L_BF_decrypt_begin: .align 4 _BF_cbc_encrypt: L_BF_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -780,55 +780,55 @@ L004PIC_point: xorl %edx,%edx jmp *%ebp L006ej7: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 6(%esi),%dh shll $8,%edx L007ej6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 5(%esi),%dh L008ej5: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 4(%esi),%dl L009ej4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%ecx jmp L010ejend L011ej3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 2(%esi),%ch shll $8,%ecx L012ej2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 1(%esi),%ch L013ej1: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb (%esi),%cl L010ejend: diff --git a/deps/openssl/config/archs/BSD-x86/asm/crypto/bn/bn-586.S b/deps/openssl/config/archs/BSD-x86/asm/crypto/bn/bn-586.S index 74f325b80..75f99c137 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/crypto/bn/bn-586.S +++ b/deps/openssl/config/archs/BSD-x86/asm/crypto/bn/bn-586.S @@ -4,10 +4,10 @@ .align 4 _bn_mul_add_words: L_bn_mul_add_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call L000PIC_me_up L000PIC_me_up: @@ -292,10 +292,10 @@ L009maw_end: .align 4 _bn_mul_words: L_bn_mul_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call L010PIC_me_up L010PIC_me_up: @@ -479,10 +479,10 @@ L016mw_end: .align 4 _bn_sqr_words: L_bn_sqr_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call L017PIC_me_up L017PIC_me_up: @@ -625,10 +625,10 @@ L022sw_end: .align 4 _bn_div_words: L_bn_div_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%eax @@ -640,10 +640,10 @@ L_bn_div_words_begin: .align 4 _bn_add_words: L_bn_add_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -826,10 +826,10 @@ L025aw_end: .align 4 _bn_sub_words: L_bn_sub_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1012,10 +1012,10 @@ L028aw_end: .align 4 _bn_sub_part_words: L_bn_sub_part_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/BSD-x86/asm/crypto/bn/co-586.S b/deps/openssl/config/archs/BSD-x86/asm/crypto/bn/co-586.S index 2acadf241..92649ab1e 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/crypto/bn/co-586.S +++ b/deps/openssl/config/archs/BSD-x86/asm/crypto/bn/co-586.S @@ -4,10 +4,10 @@ .align 4 _bn_mul_comba8: L_bn_mul_comba8_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi movl 12(%esp),%esi @@ -552,10 +552,10 @@ L_bn_mul_comba8_begin: .align 4 _bn_mul_comba4: L_bn_mul_comba4_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi movl 12(%esp),%esi @@ -724,10 +724,10 @@ L_bn_mul_comba4_begin: .align 4 _bn_sqr_comba8: L_bn_sqr_comba8_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi @@ -1136,10 +1136,10 @@ L_bn_sqr_comba8_begin: .align 4 _bn_sqr_comba4: L_bn_sqr_comba4_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi diff --git a/deps/openssl/config/archs/BSD-x86/asm/crypto/bn/x86-gf2m.S b/deps/openssl/config/archs/BSD-x86/asm/crypto/bn/x86-gf2m.S index 67ddae47d..b9fc9535e 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/crypto/bn/x86-gf2m.S +++ b/deps/openssl/config/archs/BSD-x86/asm/crypto/bn/x86-gf2m.S @@ -2,10 +2,10 @@ .type __mul_1x1_mmx,@function .align 4 __mul_1x1_mmx: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif subl $36,%esp movl %eax,%ecx @@ -109,10 +109,10 @@ __mul_1x1_mmx: .type __mul_1x1_ialu,@function .align 4 __mul_1x1_ialu: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif subl $36,%esp movl %eax,%ecx @@ -247,10 +247,10 @@ __mul_1x1_ialu: .align 4 _bn_GF2m_mul_2x2: L_bn_GF2m_mul_2x2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call L000PIC_me_up L000PIC_me_up: diff --git a/deps/openssl/config/archs/BSD-x86/asm/crypto/bn/x86-mont.S b/deps/openssl/config/archs/BSD-x86/asm/crypto/bn/x86-mont.S index 958fd5ceb..50e1d46fb 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/crypto/bn/x86-mont.S +++ b/deps/openssl/config/archs/BSD-x86/asm/crypto/bn/x86-mont.S @@ -4,10 +4,10 @@ .align 4 _bn_mul_mont: L_bn_mul_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/BSD-x86/asm/crypto/buildinf.h b/deps/openssl/config/archs/BSD-x86/asm/crypto/buildinf.h index 5ae248b0f..564e6a9f3 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/BSD-x86/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: BSD-x86" -#define DATE "built on: Wed Jan 31 12:57:29 2024 UTC" +#define DATE "built on: Tue Aug 6 12:20:44 2024 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/BSD-x86/asm/crypto/camellia/cmll-x86.S b/deps/openssl/config/archs/BSD-x86/asm/crypto/camellia/cmll-x86.S index d3a608342..d9e381a39 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/crypto/camellia/cmll-x86.S +++ b/deps/openssl/config/archs/BSD-x86/asm/crypto/camellia/cmll-x86.S @@ -4,10 +4,10 @@ .align 4 _Camellia_EncryptBlock_Rounds: L_Camellia_EncryptBlock_Rounds_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -62,10 +62,10 @@ L000pic_point: .align 4 _Camellia_EncryptBlock: L_Camellia_EncryptBlock_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl $128,%eax subl 4(%esp),%eax @@ -78,10 +78,10 @@ L_Camellia_EncryptBlock_begin: .align 4 _Camellia_encrypt: L_Camellia_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -134,10 +134,10 @@ L001pic_point: .type __x86_Camellia_encrypt,@function .align 4 __x86_Camellia_encrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif xorl (%edi),%eax xorl 4(%edi),%ebx @@ -368,10 +368,10 @@ L003done: .align 4 _Camellia_DecryptBlock_Rounds: L_Camellia_DecryptBlock_Rounds_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -426,10 +426,10 @@ L004pic_point: .align 4 _Camellia_DecryptBlock: L_Camellia_DecryptBlock_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl $128,%eax subl 4(%esp),%eax @@ -442,10 +442,10 @@ L_Camellia_DecryptBlock_begin: .align 4 _Camellia_decrypt: L_Camellia_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -498,10 +498,10 @@ L005pic_point: .type __x86_Camellia_decrypt,@function .align 4 __x86_Camellia_decrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif xorl (%edi),%eax xorl 4(%edi),%ebx @@ -732,10 +732,10 @@ L007done: .align 4 _Camellia_Ekeygen: L_Camellia_Ekeygen_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1577,10 +1577,10 @@ L013done: .align 4 _Camellia_set_key: L_Camellia_set_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebx movl 8(%esp),%ecx @@ -2133,10 +2133,10 @@ LCamellia_SBOX: .align 4 _Camellia_cbc_encrypt: L_Camellia_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/BSD-x86/asm/crypto/chacha/chacha-x86.S b/deps/openssl/config/archs/BSD-x86/asm/crypto/chacha/chacha-x86.S index 43fb04a04..de6c16532 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/crypto/chacha/chacha-x86.S +++ b/deps/openssl/config/archs/BSD-x86/asm/crypto/chacha/chacha-x86.S @@ -4,10 +4,10 @@ .align 4 _ChaCha20_ctr32: L_ChaCha20_ctr32_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -382,10 +382,10 @@ L000no_data: .align 4 _ChaCha20_ssse3: L_ChaCha20_ssse3_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -978,10 +978,10 @@ Lssse3_data: .align 4 _ChaCha20_xop: L_ChaCha20_xop_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/BSD-x86/asm/crypto/des/crypt586.S b/deps/openssl/config/archs/BSD-x86/asm/crypto/des/crypt586.S index 6d24c5d6a..20cebb630 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/crypto/des/crypt586.S +++ b/deps/openssl/config/archs/BSD-x86/asm/crypto/des/crypt586.S @@ -4,10 +4,10 @@ .align 4 _fcrypt_body: L_fcrypt_body_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/BSD-x86/asm/crypto/des/des-586.S b/deps/openssl/config/archs/BSD-x86/asm/crypto/des/des-586.S index cdc186dff..9714ec62b 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/crypto/des/des-586.S +++ b/deps/openssl/config/archs/BSD-x86/asm/crypto/des/des-586.S @@ -3,10 +3,10 @@ .type __x86_DES_encrypt,@function .align 4 __x86_DES_encrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ecx # Round 0 @@ -478,10 +478,10 @@ __x86_DES_encrypt: .type __x86_DES_decrypt,@function .align 4 __x86_DES_decrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ecx # Round 15 @@ -955,10 +955,10 @@ __x86_DES_decrypt: .align 4 _DES_encrypt1: L_DES_encrypt1_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi @@ -1072,10 +1072,10 @@ L002done: .align 4 _DES_encrypt2: L_DES_encrypt2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi @@ -1119,10 +1119,10 @@ L005done: .align 4 _DES_encrypt3: L_DES_encrypt3_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebx movl 8(%esp),%ebx @@ -1244,10 +1244,10 @@ L_DES_encrypt3_begin: .align 4 _DES_decrypt3: L_DES_decrypt3_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebx movl 8(%esp),%ebx @@ -1369,10 +1369,10 @@ L_DES_decrypt3_begin: .align 4 _DES_ncbc_encrypt: L_DES_ncbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -1435,55 +1435,55 @@ L010PIC_point: xorl %edx,%edx jmp *%ebp L012ej7: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 6(%esi),%dh shll $8,%edx L013ej6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 5(%esi),%dh L014ej5: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 4(%esi),%dl L015ej4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%ecx jmp L016ejend L017ej3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 2(%esi),%ch shll $8,%ecx L018ej2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 1(%esi),%ch L019ej1: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb (%esi),%cl L016ejend: @@ -1588,10 +1588,10 @@ L011cbc_enc_jmp_table: .align 4 _DES_ede3_cbc_encrypt: L_DES_ede3_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -1658,55 +1658,55 @@ L034PIC_point: xorl %edx,%edx jmp *%ebp L036ej7: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 6(%esi),%dh shll $8,%edx L037ej6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 5(%esi),%dh L038ej5: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 4(%esi),%dl L039ej4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%ecx jmp L040ejend L041ej3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 2(%esi),%ch shll $8,%ecx L042ej2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 1(%esi),%ch L043ej1: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb (%esi),%cl L040ejend: diff --git a/deps/openssl/config/archs/BSD-x86/asm/crypto/ec/ecp_nistz256-x86.S b/deps/openssl/config/archs/BSD-x86/asm/crypto/ec/ecp_nistz256-x86.S index 44d644b78..592bd5d4c 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/crypto/ec/ecp_nistz256-x86.S +++ b/deps/openssl/config/archs/BSD-x86/asm/crypto/ec/ecp_nistz256-x86.S @@ -2387,10 +2387,10 @@ LONE: .align 4 _ecp_nistz256_mul_by_2: L_ecp_nistz256_mul_by_2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2410,10 +2410,10 @@ L_ecp_nistz256_mul_by_2_begin: .align 4 _ecp_nistz256_mul_by_3: L_ecp_nistz256_mul_by_3_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2439,10 +2439,10 @@ L_ecp_nistz256_mul_by_3_begin: .align 4 _ecp_nistz256_div_by_2: L_ecp_nistz256_div_by_2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2459,10 +2459,10 @@ L_ecp_nistz256_div_by_2_begin: .type __ecp_nistz256_div_by_2,@function .align 4 __ecp_nistz256_div_by_2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%ebp xorl %edx,%edx @@ -2546,10 +2546,10 @@ __ecp_nistz256_div_by_2: .align 4 _ecp_nistz256_add: L_ecp_nistz256_add_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2567,10 +2567,10 @@ L_ecp_nistz256_add_begin: .type __ecp_nistz256_add,@function .align 4 __ecp_nistz256_add: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%eax movl 4(%esi),%ebx @@ -2648,10 +2648,10 @@ __ecp_nistz256_add: .align 4 _ecp_nistz256_sub: L_ecp_nistz256_sub_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2669,10 +2669,10 @@ L_ecp_nistz256_sub_begin: .type __ecp_nistz256_sub,@function .align 4 __ecp_nistz256_sub: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%eax movl 4(%esi),%ebx @@ -2731,10 +2731,10 @@ __ecp_nistz256_sub: .align 4 _ecp_nistz256_neg: L_ecp_nistz256_neg_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2763,10 +2763,10 @@ L_ecp_nistz256_neg_begin: .type __picup_eax,@function .align 4 __picup_eax: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esp),%eax ret @@ -2775,10 +2775,10 @@ __picup_eax: .align 4 _ecp_nistz256_to_mont: L_ecp_nistz256_to_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2803,10 +2803,10 @@ L000pic: .align 4 _ecp_nistz256_from_mont: L_ecp_nistz256_from_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2831,10 +2831,10 @@ L001pic: .align 4 _ecp_nistz256_mul_mont: L_ecp_nistz256_mul_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2859,10 +2859,10 @@ L002pic: .align 4 _ecp_nistz256_sqr_mont: L_ecp_nistz256_sqr_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2885,10 +2885,10 @@ L003pic: .type __ecp_nistz256_mul_mont,@function .align 4 __ecp_nistz256_mul_mont: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif andl $83886080,%eax cmpl $83886080,%eax @@ -3786,10 +3786,10 @@ L004mul_mont_ialu: .align 4 _ecp_nistz256_scatter_w5: L_ecp_nistz256_scatter_w5_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3823,10 +3823,10 @@ L006scatter_w5_loop: .align 4 _ecp_nistz256_gather_w5: L_ecp_nistz256_gather_w5_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3921,10 +3921,10 @@ L_ecp_nistz256_gather_w5_begin: .align 4 _ecp_nistz256_scatter_w7: L_ecp_nistz256_scatter_w7_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3956,10 +3956,10 @@ L007scatter_w7_loop: .align 4 _ecp_nistz256_gather_w7: L_ecp_nistz256_gather_w7_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -4174,10 +4174,10 @@ L_ecp_nistz256_gather_w7_begin: .align 4 _ecp_nistz256_point_double: L_ecp_nistz256_point_double_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -4305,10 +4305,10 @@ Lpoint_double_shortcut: .align 4 _ecp_nistz256_point_add: L_ecp_nistz256_point_add_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -4823,10 +4823,10 @@ L012add_done: .align 4 _ecp_nistz256_point_add_affine: L_ecp_nistz256_point_add_affine_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/BSD-x86/asm/crypto/md5/md5-586.S b/deps/openssl/config/archs/BSD-x86/asm/crypto/md5/md5-586.S index 814822863..5d340cc8d 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/crypto/md5/md5-586.S +++ b/deps/openssl/config/archs/BSD-x86/asm/crypto/md5/md5-586.S @@ -4,10 +4,10 @@ .align 4 _ossl_md5_block_asm_data_order: L_ossl_md5_block_asm_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi diff --git a/deps/openssl/config/archs/BSD-x86/asm/crypto/modes/ghash-x86.S b/deps/openssl/config/archs/BSD-x86/asm/crypto/modes/ghash-x86.S index 808dc3079..2cff65afd 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/crypto/modes/ghash-x86.S +++ b/deps/openssl/config/archs/BSD-x86/asm/crypto/modes/ghash-x86.S @@ -4,10 +4,10 @@ .align 4 _gcm_gmult_4bit_x86: L_gcm_gmult_4bit_x86_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -102,10 +102,10 @@ L001x86_break: .align 4 _gcm_ghash_4bit_x86: L_gcm_ghash_4bit_x86_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -215,10 +215,10 @@ L004x86_break: .align 4 _gcm_gmult_4bit_mmx: L_gcm_gmult_4bit_mmx_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -318,10 +318,10 @@ L007mmx_break: .align 4 _gcm_ghash_4bit_mmx: L_gcm_ghash_4bit_mmx_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -926,10 +926,10 @@ L009outer: .align 4 _gcm_init_clmul: L_gcm_init_clmul_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%eax @@ -999,10 +999,10 @@ L010pic: .align 4 _gcm_gmult_clmul: L_gcm_gmult_clmul_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 8(%esp),%edx @@ -1056,10 +1056,10 @@ L011pic: .align 4 _gcm_ghash_clmul: L_gcm_ghash_clmul_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/BSD-x86/asm/crypto/poly1305/poly1305-x86.S b/deps/openssl/config/archs/BSD-x86/asm/crypto/poly1305/poly1305-x86.S index 6fd5469a5..8466cccec 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/crypto/poly1305/poly1305-x86.S +++ b/deps/openssl/config/archs/BSD-x86/asm/crypto/poly1305/poly1305-x86.S @@ -5,10 +5,10 @@ .align 4 _poly1305_init: L_poly1305_init_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -71,10 +71,10 @@ L000nokey: .align 4 _poly1305_blocks: L_poly1305_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -243,10 +243,10 @@ L003nodata: .align 4 _poly1305_emit: L_poly1305_emit_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -306,10 +306,10 @@ Lenter_emit: .type __poly1305_init_sse2,@function .align 4 __poly1305_init_sse2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movdqu 24(%edi),%xmm4 leal 48(%edi),%edi @@ -512,10 +512,10 @@ L006square_break: .type __poly1305_blocks_sse2,@function .align 4 __poly1305_blocks_sse2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1277,10 +1277,10 @@ L007nodata: .type __poly1305_emit_sse2,@function .align 4 __poly1305_emit_sse2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1374,10 +1374,10 @@ __poly1305_emit_sse2: .type __poly1305_init_avx2,@function .align 4 __poly1305_init_avx2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif vmovdqu 24(%edi),%xmm4 leal 48(%edi),%edi @@ -1549,10 +1549,10 @@ L019square_break: .type __poly1305_blocks_avx2,@function .align 4 __poly1305_blocks_avx2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/BSD-x86/asm/crypto/rc4/rc4-586.S b/deps/openssl/config/archs/BSD-x86/asm/crypto/rc4/rc4-586.S index 55215f177..ea14690ff 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/crypto/rc4/rc4-586.S +++ b/deps/openssl/config/archs/BSD-x86/asm/crypto/rc4/rc4-586.S @@ -4,10 +4,10 @@ .align 4 _RC4: L_RC4_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -275,10 +275,10 @@ L000abort: .align 4 _RC4_set_key: L_RC4_set_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -358,10 +358,10 @@ L015exit: .align 4 _RC4_options: L_RC4_options_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call L018pic_point L018pic_point: diff --git a/deps/openssl/config/archs/BSD-x86/asm/crypto/ripemd/rmd-586.S b/deps/openssl/config/archs/BSD-x86/asm/crypto/ripemd/rmd-586.S index 454c77c96..15b698510 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/crypto/ripemd/rmd-586.S +++ b/deps/openssl/config/archs/BSD-x86/asm/crypto/ripemd/rmd-586.S @@ -4,10 +4,10 @@ .align 4 _ripemd160_block_asm_data_order: L_ripemd160_block_asm_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%eax diff --git a/deps/openssl/config/archs/BSD-x86/asm/crypto/sha/sha1-586.S b/deps/openssl/config/archs/BSD-x86/asm/crypto/sha/sha1-586.S index 2e977b873..0eaea0433 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/crypto/sha/sha1-586.S +++ b/deps/openssl/config/archs/BSD-x86/asm/crypto/sha/sha1-586.S @@ -4,10 +4,10 @@ .align 4 _sha1_block_data_order: L_sha1_block_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1403,10 +1403,10 @@ L002loop: .type __sha1_block_data_order_shaext,@function .align 4 __sha1_block_data_order_shaext: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1577,10 +1577,10 @@ L004loop_shaext: .type __sha1_block_data_order_ssse3,@function .align 4 __sha1_block_data_order_ssse3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2800,10 +2800,10 @@ L007done: .type __sha1_block_data_order_avx,@function .align 4 __sha1_block_data_order_avx: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/BSD-x86/asm/crypto/sha/sha256-586.S b/deps/openssl/config/archs/BSD-x86/asm/crypto/sha/sha256-586.S index ab935deb8..5b9c8a197 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/crypto/sha/sha256-586.S +++ b/deps/openssl/config/archs/BSD-x86/asm/crypto/sha/sha256-586.S @@ -4,10 +4,10 @@ .align 4 _sha256_block_data_order: L_sha256_block_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/BSD-x86/asm/crypto/sha/sha512-586.S b/deps/openssl/config/archs/BSD-x86/asm/crypto/sha/sha512-586.S index 0dea93b39..7be4ad8cd 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/crypto/sha/sha512-586.S +++ b/deps/openssl/config/archs/BSD-x86/asm/crypto/sha/sha512-586.S @@ -4,10 +4,10 @@ .align 4 _sha512_block_data_order: L_sha512_block_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/BSD-x86/asm/crypto/whrlpool/wp-mmx.S b/deps/openssl/config/archs/BSD-x86/asm/crypto/whrlpool/wp-mmx.S index 384b61736..b717addbd 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/crypto/whrlpool/wp-mmx.S +++ b/deps/openssl/config/archs/BSD-x86/asm/crypto/whrlpool/wp-mmx.S @@ -4,10 +4,10 @@ .align 4 _whirlpool_block_mmx: L_whirlpool_block_mmx_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/BSD-x86/asm/crypto/x86cpuid.S b/deps/openssl/config/archs/BSD-x86/asm/crypto/x86cpuid.S index 39d138a7e..e80a134a6 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/crypto/x86cpuid.S +++ b/deps/openssl/config/archs/BSD-x86/asm/crypto/x86cpuid.S @@ -4,10 +4,10 @@ .align 4 _OPENSSL_ia32_cpuid: L_OPENSSL_ia32_cpuid_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -152,10 +152,10 @@ L000nocpuid: .align 4 _OPENSSL_rdtsc: L_OPENSSL_rdtsc_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif xorl %eax,%eax xorl %edx,%edx @@ -174,10 +174,10 @@ L010notsc: .align 4 _OPENSSL_instrument_halt: L_OPENSSL_instrument_halt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call L011PIC_me_up L011PIC_me_up: @@ -211,10 +211,10 @@ L012nohalt: .align 4 _OPENSSL_far_spin: L_OPENSSL_far_spin_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushfl popl %eax @@ -242,10 +242,10 @@ L013nospin: .align 4 _OPENSSL_wipe_cpu: L_OPENSSL_wipe_cpu_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif xorl %eax,%eax xorl %edx,%edx @@ -278,10 +278,10 @@ L016no_x87: .align 4 _OPENSSL_atomic_add: L_OPENSSL_atomic_add_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%ecx @@ -301,10 +301,10 @@ L018spin: .align 4 _OPENSSL_cleanse: L_OPENSSL_cleanse_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%ecx @@ -342,10 +342,10 @@ L022aligned: .align 4 _CRYPTO_memcmp: L_CRYPTO_memcmp_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi @@ -375,10 +375,10 @@ L023no_data: .align 4 _OPENSSL_instrument_bus: L_OPENSSL_instrument_bus_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -428,10 +428,10 @@ L026nogo: .align 4 _OPENSSL_instrument_bus2: L_OPENSSL_instrument_bus2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -494,10 +494,10 @@ L029nogo: .align 4 _OPENSSL_ia32_rdrand_bytes: L_OPENSSL_ia32_rdrand_bytes_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %ebx @@ -541,10 +541,10 @@ L032done: .align 4 _OPENSSL_ia32_rdseed_bytes: L_OPENSSL_ia32_rdseed_bytes_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %ebx diff --git a/deps/openssl/config/archs/BSD-x86/asm/engines/e_padlock-x86.S b/deps/openssl/config/archs/BSD-x86/asm/engines/e_padlock-x86.S index fca7a343b..1a973e235 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/engines/e_padlock-x86.S +++ b/deps/openssl/config/archs/BSD-x86/asm/engines/e_padlock-x86.S @@ -4,10 +4,10 @@ .align 4 _padlock_capability: L_padlock_capability_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebx pushfl @@ -68,10 +68,10 @@ L000noluck: .align 4 _padlock_key_bswap: L_padlock_key_bswap_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 240(%edx),%ecx @@ -90,10 +90,10 @@ L003bswap_loop: .align 4 _padlock_verify_context: L_padlock_verify_context_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx leal Lpadlock_saved_context-L004verify_pic_point,%eax @@ -105,10 +105,10 @@ L004verify_pic_point: .type __padlock_verify_ctx,@function .align 4 __padlock_verify_ctx: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif addl (%esp),%eax btl $30,4(%esp) @@ -125,10 +125,10 @@ L005verified: .align 4 _padlock_reload_key: L_padlock_reload_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushfl popfl @@ -138,10 +138,10 @@ L_padlock_reload_key_begin: .align 4 _padlock_aes_block: L_padlock_aes_block_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -162,10 +162,10 @@ L_padlock_aes_block_begin: .align 4 _padlock_ecb_encrypt: L_padlock_ecb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -345,10 +345,10 @@ L006ecb_abort: .align 4 _padlock_cbc_encrypt: L_padlock_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -532,10 +532,10 @@ L018cbc_abort: .align 4 _padlock_cfb_encrypt: L_padlock_cfb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -658,10 +658,10 @@ L030cfb_abort: .align 4 _padlock_ofb_encrypt: L_padlock_ofb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -784,10 +784,10 @@ L039ofb_abort: .align 4 _padlock_ctr32_encrypt: L_padlock_ctr32_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -895,10 +895,10 @@ L048ctr32_abort: .align 4 _padlock_xstore: L_padlock_xstore_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi movl 8(%esp),%edi @@ -909,10 +909,10 @@ L_padlock_xstore_begin: .type __win32_segv_handler,@function .align 4 __win32_segv_handler: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl $1,%eax movl 4(%esp),%edx @@ -928,10 +928,10 @@ L055ret: .align 4 _padlock_sha1_oneshot: L_padlock_sha1_oneshot_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -963,10 +963,10 @@ L_padlock_sha1_oneshot_begin: .align 4 _padlock_sha1_blocks: L_padlock_sha1_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -997,10 +997,10 @@ L_padlock_sha1_blocks_begin: .align 4 _padlock_sha256_oneshot: L_padlock_sha256_oneshot_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -1032,10 +1032,10 @@ L_padlock_sha256_oneshot_begin: .align 4 _padlock_sha256_blocks: L_padlock_sha256_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -1066,10 +1066,10 @@ L_padlock_sha256_blocks_begin: .align 4 _padlock_sha512_blocks: L_padlock_sha512_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi diff --git a/deps/openssl/config/archs/BSD-x86/asm/include/openssl/bio.h b/deps/openssl/config/archs/BSD-x86/asm/include/openssl/bio.h index f9aa74731..e16cf622c 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/BSD-x86/asm/include/openssl/bio.h @@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, - int (*ossl_gets) (BIO *, char *, int)); + int (*gets) (BIO *, char *, int)); long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); diff --git a/deps/openssl/config/archs/BSD-x86/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/BSD-x86/asm/include/openssl/opensslv.h index 65f3bfa05..5bb97d596 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/BSD-x86/asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 13 +# define OPENSSL_VERSION_PATCH 9 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.13" -# define OPENSSL_FULL_VERSION_STR "3.0.13+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "30 Jan 2024" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13+quic 30 Jan 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/BSD-x86/asm/include/openssl/pkcs7.h b/deps/openssl/config/archs/BSD-x86/asm/include/openssl/pkcs7.h index 0ce79bf4f..557a0a726 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/include/openssl/pkcs7.h +++ b/deps/openssl/config/archs/BSD-x86/asm/include/openssl/pkcs7.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/pkcs7.h.in * - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -56,8 +56,8 @@ typedef struct pkcs7_signer_info_st { PKCS7_ISSUER_AND_SERIAL *issuer_and_serial; X509_ALGOR *digest_alg; STACK_OF(X509_ATTRIBUTE) *auth_attr; /* [ 0 ] */ - X509_ALGOR *digest_enc_alg; /* confusing name, actually used for signing */ - ASN1_OCTET_STRING *enc_digest; /* confusing name, actually signature */ + X509_ALGOR *digest_enc_alg; + ASN1_OCTET_STRING *enc_digest; STACK_OF(X509_ATTRIBUTE) *unauth_attr; /* [ 1 ] */ /* The private key to sign with */ EVP_PKEY *pkey; diff --git a/deps/openssl/config/archs/BSD-x86/asm/include/openssl/ssl.h b/deps/openssl/config/archs/BSD-x86/asm/include/openssl/ssl.h index 0f1915755..3df725c56 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/BSD-x86/asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/BSD-x86/asm/openssl-cl.gypi b/deps/openssl/config/archs/BSD-x86/asm/openssl-cl.gypi index 438030559..aa119eb5f 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/openssl-cl.gypi +++ b/deps/openssl/config/archs/BSD-x86/asm/openssl-cl.gypi @@ -17,7 +17,6 @@ 'OPENSSL_IA32_SSE2', 'PADLOCK_ASM', 'POLY1305_ASM', - 'RC4_ASM', 'RMD160_ASM', 'SHA1_ASM', 'SHA256_ASM', diff --git a/deps/openssl/config/archs/BSD-x86/asm/openssl.gypi b/deps/openssl/config/archs/BSD-x86/asm/openssl.gypi index c984f3e0f..3c3ba9695 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/openssl.gypi +++ b/deps/openssl/config/archs/BSD-x86/asm/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cfb.c', 'openssl/crypto/aes/aes_ecb.c', @@ -993,7 +991,6 @@ 'OPENSSL_IA32_SSE2', 'PADLOCK_ASM', 'POLY1305_ASM', - 'RC4_ASM', 'RMD160_ASM', 'SHA1_ASM', 'SHA256_ASM', diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/configdata.pm b/deps/openssl/config/archs/BSD-x86/asm_avx2/configdata.pm index ef047655a..c396b5d4f 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/configdata.pm @@ -139,7 +139,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -156,7 +156,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.13+quic", + "full_version" => "3.0.9", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -203,7 +203,7 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "13", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -255,11 +255,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "30 Jan 2024", - "shlib_version" => "81.3", + "release_date" => "30 May 2023", + "shlib_version" => "3", "sourcedir" => ".", "target" => "BSD-x86", - "version" => "3.0.13" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -386,7 +386,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -781,9 +780,6 @@ our %unified_info = ( "providers/fips" => { "fips" => "1" }, - "test/p_minimal" => { - "noinst" => "1" - }, "test/p_test" => { "noinst" => "1" } @@ -852,9 +848,6 @@ our %unified_info = ( "test/asn1_internal_test" => { "noinst" => "1" }, - "test/asn1_stable_parse_test" => { - "noinst" => "1" - }, "test/asn1_string_table_test" => { "noinst" => "1" }, @@ -1044,9 +1037,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -1602,7 +1592,6 @@ our %unified_info = ( "OPENSSL_IA32_SSE2", "PADLOCK_ASM", "POLY1305_ASM", - "RC4_ASM", "RMD160_ASM", "SHA1_ASM", "SHA256_ASM", @@ -1650,11 +1639,7 @@ our %unified_info = ( "VPAES_ASM" ], "providers/liblegacy.a" => [ - "MD5_ASM", - "RC4_ASM" - ], - "test/evp_extra_test" => [ - "STATIC_LEGACY" + "MD5_ASM" ], "test/provider_internal_test" => [ "PROVIDER_INIT_FUNCTION_NAME=p_test_init" @@ -2409,9 +2394,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -2709,9 +2691,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -3480,9 +3459,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -3777,9 +3753,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -3813,12 +3786,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -4803,9 +4770,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -5103,9 +5067,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -5874,9 +5835,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -6171,9 +6129,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -6207,12 +6162,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -7210,10 +7159,6 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], - "test/asn1_stable_parse_test" => [ - "libcrypto", - "test/libtestutil.a" - ], "test/asn1_string_table_test" => [ "libcrypto", "test/libtestutil.a" @@ -7467,10 +7412,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -7736,8 +7677,6 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "libcrypto.a", - "providers/libcommon.a", - "providers/liblegacy.a", "test/libtestutil.a" ], "test/evp_extra_test2" => [ @@ -9824,7 +9763,6 @@ our %unified_info = ( }, "providers" => { "deps" => [ - "providers/evp_extra_test-bin-legacyprov.o", "providers/libcrypto-lib-baseprov.o", "providers/libcrypto-lib-defltprov.o", "providers/libcrypto-lib-nullprov.o", @@ -9832,9 +9770,6 @@ our %unified_info = ( "providers/libdefault.a" ], "products" => { - "bin" => [ - "test/evp_extra_test" - ], "dso" => [ "providers/fips", "providers/legacy" @@ -10271,7 +10206,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10322,7 +10256,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -11454,9 +11387,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -11754,9 +11684,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -12525,9 +12452,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -12822,9 +12746,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -12858,12 +12779,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -13848,9 +13763,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -14148,9 +14060,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -14919,9 +14828,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -15216,9 +15122,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -15252,12 +15155,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -16286,10 +16183,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16366,9 +16259,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "whrlpool" ], - "test/p_minimal.ld" => [ - "util/providers.num" - ], "test/p_test.ld" => [ "util/providers.num" ], @@ -16534,7 +16424,6 @@ our %unified_info = ( "doc/html/man3/CMS_get1_ReceiptRequest.html", "doc/html/man3/CMS_sign.html", "doc/html/man3/CMS_sign_receipt.html", - "doc/html/man3/CMS_signed_get_attr.html", "doc/html/man3/CMS_uncompress.html", "doc/html/man3/CMS_verify.html", "doc/html/man3/CMS_verify_receipt.html", @@ -16634,7 +16523,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_encapsulate.html", "doc/html/man3/EVP_PKEY_encrypt.html", "doc/html/man3/EVP_PKEY_fromdata.html", - "doc/html/man3/EVP_PKEY_get_attr.html", "doc/html/man3/EVP_PKEY_get_default_digest_nid.html", "doc/html/man3/EVP_PKEY_get_field_type.html", "doc/html/man3/EVP_PKEY_get_group_name.html", @@ -16891,7 +16779,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -16990,7 +16877,6 @@ our %unified_info = ( "doc/html/man3/X509V3_get_d2i.html", "doc/html/man3/X509V3_set_ctx.html", "doc/html/man3/X509_ALGOR_dup.html", - "doc/html/man3/X509_ATTRIBUTE.html", "doc/html/man3/X509_CRL_get0_by_serial.html", "doc/html/man3/X509_EXTENSION_set_object.html", "doc/html/man3/X509_LOOKUP.html", @@ -17002,8 +16888,6 @@ our %unified_info = ( "doc/html/man3/X509_NAME_get_index_by_NID.html", "doc/html/man3/X509_NAME_print_ex.html", "doc/html/man3/X509_PUBKEY_new.html", - "doc/html/man3/X509_REQ_get_attr.html", - "doc/html/man3/X509_REQ_get_extensions.html", "doc/html/man3/X509_SIG_get0.html", "doc/html/man3/X509_STORE_CTX_get_error.html", "doc/html/man3/X509_STORE_CTX_new.html", @@ -18301,10 +18185,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/asn1_stable_parse_test" => [ - "include", - "apps/include" - ], "test/asn1_string_table_test" => [ "include", "apps/include" @@ -18512,9 +18392,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -18774,9 +18651,7 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "include", - "apps/include", - "providers/common/include", - "providers/implementations/include" + "apps/include" ], "test/evp_extra_test2" => [ "include", @@ -19033,10 +18908,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/p_minimal" => [ - "include", - "." - ], "test/p_test" => [ "include", "." @@ -19526,7 +19397,6 @@ our %unified_info = ( "doc/man/man3/CMS_get1_ReceiptRequest.3", "doc/man/man3/CMS_sign.3", "doc/man/man3/CMS_sign_receipt.3", - "doc/man/man3/CMS_signed_get_attr.3", "doc/man/man3/CMS_uncompress.3", "doc/man/man3/CMS_verify.3", "doc/man/man3/CMS_verify_receipt.3", @@ -19626,7 +19496,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_encapsulate.3", "doc/man/man3/EVP_PKEY_encrypt.3", "doc/man/man3/EVP_PKEY_fromdata.3", - "doc/man/man3/EVP_PKEY_get_attr.3", "doc/man/man3/EVP_PKEY_get_default_digest_nid.3", "doc/man/man3/EVP_PKEY_get_field_type.3", "doc/man/man3/EVP_PKEY_get_group_name.3", @@ -19883,7 +19752,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -19982,7 +19850,6 @@ our %unified_info = ( "doc/man/man3/X509V3_get_d2i.3", "doc/man/man3/X509V3_set_ctx.3", "doc/man/man3/X509_ALGOR_dup.3", - "doc/man/man3/X509_ATTRIBUTE.3", "doc/man/man3/X509_CRL_get0_by_serial.3", "doc/man/man3/X509_EXTENSION_set_object.3", "doc/man/man3/X509_LOOKUP.3", @@ -19994,8 +19861,6 @@ our %unified_info = ( "doc/man/man3/X509_NAME_get_index_by_NID.3", "doc/man/man3/X509_NAME_print_ex.3", "doc/man/man3/X509_PUBKEY_new.3", - "doc/man/man3/X509_REQ_get_attr.3", - "doc/man/man3/X509_REQ_get_extensions.3", "doc/man/man3/X509_SIG_get0.3", "doc/man/man3/X509_STORE_CTX_get_error.3", "doc/man/man3/X509_STORE_CTX_new.3", @@ -20179,7 +20044,6 @@ our %unified_info = ( "modules" => [ "providers/fips", "providers/legacy", - "test/p_minimal", "test/p_test" ], "programs" => [ @@ -20205,7 +20069,6 @@ our %unified_info = ( "test/asn1_dsa_internal_test", "test/asn1_encode_test", "test/asn1_internal_test", - "test/asn1_stable_parse_test", "test/asn1_string_table_test", "test/asn1_time_test", "test/asynciotest", @@ -20269,7 +20132,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24476,7 +24338,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24503,7 +24364,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -24605,9 +24465,6 @@ our %unified_info = ( "providers/common/libfips-lib-securitycheck_fips.o" => [ "providers/common/securitycheck_fips.c" ], - "providers/evp_extra_test-bin-legacyprov.o" => [ - "providers/legacyprov.c" - ], "providers/fips" => [ "providers/fips.ld", "providers/fips/fips-dso-fips_entry.o" @@ -25754,9 +25611,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25838,9 +25692,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25898,12 +25749,6 @@ our %unified_info = ( "test/asn1_internal_test-bin-asn1_internal_test.o" => [ "test/asn1_internal_test.c" ], - "test/asn1_stable_parse_test" => [ - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" - ], - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" => [ - "test/asn1_stable_parse_test.c" - ], "test/asn1_string_table_test" => [ "test/asn1_string_table_test-bin-asn1_string_table_test.o" ], @@ -26283,12 +26128,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -26687,7 +26526,6 @@ our %unified_info = ( "test/errtest.c" ], "test/evp_extra_test" => [ - "providers/evp_extra_test-bin-legacyprov.o", "test/evp_extra_test-bin-evp_extra_test.o" ], "test/evp_extra_test-bin-evp_extra_test.o" => [ @@ -26978,13 +26816,6 @@ our %unified_info = ( "test/ossl_store_test-bin-ossl_store_test.o" => [ "test/ossl_store_test.c" ], - "test/p_minimal" => [ - "test/p_minimal-dso-p_minimal.o", - "test/p_minimal.ld" - ], - "test/p_minimal-dso-p_minimal.o" => [ - "test/p_minimal.c" - ], "test/p_test" => [ "test/p_test-dso-p_test.o", "test/p_test.ld" @@ -27668,8 +27499,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27696,7 +27527,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27713,8 +27544,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/aes/aes-586.S b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/aes/aes-586.S index 54ca91832..4654a1af9 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/aes/aes-586.S +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/aes/aes-586.S @@ -2,10 +2,10 @@ .type __x86_AES_encrypt_compact,@function .align 4 __x86_AES_encrypt_compact: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl %edi,20(%esp) xorl (%edi),%eax @@ -265,10 +265,10 @@ L000loop: .type __sse_AES_encrypt_compact,@function .align 4 __sse_AES_encrypt_compact: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pxor (%edi),%mm0 pxor 8(%edi),%mm4 @@ -426,10 +426,10 @@ L002out: .type __x86_AES_encrypt,@function .align 4 __x86_AES_encrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl %edi,20(%esp) xorl (%edi),%eax @@ -980,10 +980,10 @@ LAES_Te: .align 4 _AES_encrypt: L_AES_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1048,10 +1048,10 @@ L005x86: .type __x86_AES_decrypt_compact,@function .align 4 __x86_AES_decrypt_compact: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl %edi,20(%esp) xorl (%edi),%eax @@ -1407,10 +1407,10 @@ L006loop: .type __sse_AES_decrypt_compact,@function .align 4 __sse_AES_decrypt_compact: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pxor (%edi),%mm0 pxor 8(%edi),%mm4 @@ -1627,10 +1627,10 @@ L008out: .type __x86_AES_decrypt,@function .align 4 __x86_AES_decrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl %edi,20(%esp) xorl (%edi),%eax @@ -2185,10 +2185,10 @@ LAES_Td: .align 4 _AES_decrypt: L_AES_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2255,10 +2255,10 @@ L011x86: .align 4 _AES_cbc_encrypt: L_AES_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2791,10 +2791,10 @@ L039slow_dec_partial_x86: .type __x86_AES_set_encrypt_key,@function .align 4 __x86_AES_set_encrypt_key: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3027,10 +3027,10 @@ L045exit: .align 4 _AES_set_encrypt_key: L_AES_set_encrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call __x86_AES_set_encrypt_key ret @@ -3039,10 +3039,10 @@ L_AES_set_encrypt_key_begin: .align 4 _AES_set_decrypt_key: L_AES_set_decrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call __x86_AES_set_encrypt_key cmpl $0,%eax diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/aes/aesni-x86.S b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/aes/aesni-x86.S index 0dfd8d39f..8866ea82e 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/aes/aesni-x86.S +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/aes/aesni-x86.S @@ -4,10 +4,10 @@ .align 4 _aesni_encrypt: L_aesni_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 12(%esp),%edx @@ -35,10 +35,10 @@ L000enc1_loop_1: .align 4 _aesni_decrypt: L_aesni_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 12(%esp),%edx @@ -64,10 +64,10 @@ L001dec1_loop_2: .type __aesni_encrypt2,@function .align 4 __aesni_encrypt2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -95,10 +95,10 @@ L002enc2_loop: .type __aesni_decrypt2,@function .align 4 __aesni_decrypt2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -126,10 +126,10 @@ L003dec2_loop: .type __aesni_encrypt3,@function .align 4 __aesni_encrypt3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -162,10 +162,10 @@ L004enc3_loop: .type __aesni_decrypt3,@function .align 4 __aesni_decrypt3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -198,10 +198,10 @@ L005dec3_loop: .type __aesni_encrypt4,@function .align 4 __aesni_encrypt4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 movups 16(%edx),%xmm1 @@ -240,10 +240,10 @@ L006enc4_loop: .type __aesni_decrypt4,@function .align 4 __aesni_decrypt4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 movups 16(%edx),%xmm1 @@ -282,10 +282,10 @@ L007dec4_loop: .type __aesni_encrypt6,@function .align 4 __aesni_encrypt6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -340,10 +340,10 @@ L_aesni_encrypt6_enter: .type __aesni_decrypt6,@function .align 4 __aesni_decrypt6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -400,10 +400,10 @@ L_aesni_decrypt6_enter: .align 4 _aesni_ecb_encrypt: L_aesni_ecb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -639,10 +639,10 @@ L012ecb_ret: .align 4 _aesni_ccm64_encrypt_blocks: L_aesni_ccm64_encrypt_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -731,10 +731,10 @@ L031ccm64_enc2_loop: .align 4 _aesni_ccm64_decrypt_blocks: L_aesni_ccm64_decrypt_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -858,10 +858,10 @@ L036enc1_loop_6: .align 4 _aesni_ctr32_encrypt_blocks: L_aesni_ctr32_encrypt_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1100,10 +1100,10 @@ L040ctr32_ret: .align 4 _aesni_xts_encrypt: L_aesni_xts_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1464,10 +1464,10 @@ L056xts_enc_ret: .align 4 _aesni_xts_decrypt: L_aesni_xts_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1858,10 +1858,10 @@ L069xts_dec_ret: .align 4 _aesni_ocb_encrypt: L_aesni_ocb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2257,10 +2257,10 @@ L078done: .align 4 _aesni_ocb_decrypt: L_aesni_ocb_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2656,10 +2656,10 @@ L088done: .align 4 _aesni_cbc_encrypt: L_aesni_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2919,10 +2919,10 @@ L094cbc_abort: .type __aesni_set_encrypt_key,@function .align 4 __aesni_set_encrypt_key: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3259,10 +3259,10 @@ L115bad_keybits: .align 4 _aesni_set_encrypt_key: L_aesni_set_encrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 8(%esp),%ecx @@ -3274,10 +3274,10 @@ L_aesni_set_encrypt_key_begin: .align 4 _aesni_set_decrypt_key: L_aesni_set_decrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 8(%esp),%ecx diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/aes/vpaes-x86.S b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/aes/vpaes-x86.S index ed3c31c5b..2ea0b6af4 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/aes/vpaes-x86.S +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/aes/vpaes-x86.S @@ -59,10 +59,10 @@ L_vpaes_consts: .type __vpaes_preheat,@function .align 4 __vpaes_preheat: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif addl (%esp),%ebp movdqa -48(%ebp),%xmm7 @@ -71,10 +71,10 @@ __vpaes_preheat: .type __vpaes_encrypt_core,@function .align 4 __vpaes_encrypt_core: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl $16,%ecx movl 240(%edx),%eax @@ -152,10 +152,10 @@ L000enc_entry: .type __vpaes_decrypt_core,@function .align 4 __vpaes_decrypt_core: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif leal 608(%ebp),%ebx movl 240(%edx),%eax @@ -244,10 +244,10 @@ L002dec_entry: .type __vpaes_schedule_core,@function .align 4 __vpaes_schedule_core: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif addl (%esp),%ebp movdqu (%esi),%xmm0 @@ -342,10 +342,10 @@ L013schedule_mangle_last_dec: .type __vpaes_schedule_192_smear,@function .align 4 __vpaes_schedule_192_smear: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pshufd $128,%xmm6,%xmm1 pshufd $254,%xmm7,%xmm0 @@ -358,10 +358,10 @@ __vpaes_schedule_192_smear: .type __vpaes_schedule_round,@function .align 4 __vpaes_schedule_round: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movdqa 8(%esp),%xmm2 pxor %xmm1,%xmm1 @@ -411,10 +411,10 @@ L_vpaes_schedule_low_round: .type __vpaes_schedule_transform,@function .align 4 __vpaes_schedule_transform: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movdqa -16(%ebp),%xmm2 movdqa %xmm2,%xmm1 @@ -430,10 +430,10 @@ __vpaes_schedule_transform: .type __vpaes_schedule_mangle,@function .align 4 __vpaes_schedule_mangle: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movdqa %xmm0,%xmm4 movdqa 128(%ebp),%xmm5 @@ -495,10 +495,10 @@ L015schedule_mangle_both: .align 4 _vpaes_set_encrypt_key: L_vpaes_set_encrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -532,10 +532,10 @@ L016pic_point: .align 4 _vpaes_set_decrypt_key: L_vpaes_set_decrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -574,10 +574,10 @@ L017pic_point: .align 4 _vpaes_encrypt: L_vpaes_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -607,10 +607,10 @@ L018pic_point: .align 4 _vpaes_decrypt: L_vpaes_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -640,10 +640,10 @@ L019pic_point: .align 4 _vpaes_cbc_encrypt: L_vpaes_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/bf/bf-586.S b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/bf/bf-586.S index 3b44e17cf..4f880742c 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/bf/bf-586.S +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/bf/bf-586.S @@ -4,10 +4,10 @@ .align 4 _BF_encrypt: L_BF_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -358,10 +358,10 @@ L_BF_encrypt_begin: .align 4 _BF_decrypt: L_BF_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -712,10 +712,10 @@ L_BF_decrypt_begin: .align 4 _BF_cbc_encrypt: L_BF_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -780,55 +780,55 @@ L004PIC_point: xorl %edx,%edx jmp *%ebp L006ej7: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 6(%esi),%dh shll $8,%edx L007ej6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 5(%esi),%dh L008ej5: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 4(%esi),%dl L009ej4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%ecx jmp L010ejend L011ej3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 2(%esi),%ch shll $8,%ecx L012ej2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 1(%esi),%ch L013ej1: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb (%esi),%cl L010ejend: diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/bn/bn-586.S b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/bn/bn-586.S index 74f325b80..75f99c137 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/bn/bn-586.S +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/bn/bn-586.S @@ -4,10 +4,10 @@ .align 4 _bn_mul_add_words: L_bn_mul_add_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call L000PIC_me_up L000PIC_me_up: @@ -292,10 +292,10 @@ L009maw_end: .align 4 _bn_mul_words: L_bn_mul_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call L010PIC_me_up L010PIC_me_up: @@ -479,10 +479,10 @@ L016mw_end: .align 4 _bn_sqr_words: L_bn_sqr_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call L017PIC_me_up L017PIC_me_up: @@ -625,10 +625,10 @@ L022sw_end: .align 4 _bn_div_words: L_bn_div_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%eax @@ -640,10 +640,10 @@ L_bn_div_words_begin: .align 4 _bn_add_words: L_bn_add_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -826,10 +826,10 @@ L025aw_end: .align 4 _bn_sub_words: L_bn_sub_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1012,10 +1012,10 @@ L028aw_end: .align 4 _bn_sub_part_words: L_bn_sub_part_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/bn/co-586.S b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/bn/co-586.S index 2acadf241..92649ab1e 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/bn/co-586.S +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/bn/co-586.S @@ -4,10 +4,10 @@ .align 4 _bn_mul_comba8: L_bn_mul_comba8_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi movl 12(%esp),%esi @@ -552,10 +552,10 @@ L_bn_mul_comba8_begin: .align 4 _bn_mul_comba4: L_bn_mul_comba4_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi movl 12(%esp),%esi @@ -724,10 +724,10 @@ L_bn_mul_comba4_begin: .align 4 _bn_sqr_comba8: L_bn_sqr_comba8_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi @@ -1136,10 +1136,10 @@ L_bn_sqr_comba8_begin: .align 4 _bn_sqr_comba4: L_bn_sqr_comba4_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/bn/x86-gf2m.S b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/bn/x86-gf2m.S index 67ddae47d..b9fc9535e 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/bn/x86-gf2m.S +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/bn/x86-gf2m.S @@ -2,10 +2,10 @@ .type __mul_1x1_mmx,@function .align 4 __mul_1x1_mmx: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif subl $36,%esp movl %eax,%ecx @@ -109,10 +109,10 @@ __mul_1x1_mmx: .type __mul_1x1_ialu,@function .align 4 __mul_1x1_ialu: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif subl $36,%esp movl %eax,%ecx @@ -247,10 +247,10 @@ __mul_1x1_ialu: .align 4 _bn_GF2m_mul_2x2: L_bn_GF2m_mul_2x2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call L000PIC_me_up L000PIC_me_up: diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/bn/x86-mont.S b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/bn/x86-mont.S index 958fd5ceb..50e1d46fb 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/bn/x86-mont.S +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/bn/x86-mont.S @@ -4,10 +4,10 @@ .align 4 _bn_mul_mont: L_bn_mul_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/buildinf.h index 5beff8d65..ed107a8b0 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: BSD-x86" -#define DATE "built on: Wed Jan 31 12:57:42 2024 UTC" +#define DATE "built on: Tue Aug 6 12:20:55 2024 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/camellia/cmll-x86.S b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/camellia/cmll-x86.S index d3a608342..d9e381a39 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/camellia/cmll-x86.S +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/camellia/cmll-x86.S @@ -4,10 +4,10 @@ .align 4 _Camellia_EncryptBlock_Rounds: L_Camellia_EncryptBlock_Rounds_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -62,10 +62,10 @@ L000pic_point: .align 4 _Camellia_EncryptBlock: L_Camellia_EncryptBlock_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl $128,%eax subl 4(%esp),%eax @@ -78,10 +78,10 @@ L_Camellia_EncryptBlock_begin: .align 4 _Camellia_encrypt: L_Camellia_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -134,10 +134,10 @@ L001pic_point: .type __x86_Camellia_encrypt,@function .align 4 __x86_Camellia_encrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif xorl (%edi),%eax xorl 4(%edi),%ebx @@ -368,10 +368,10 @@ L003done: .align 4 _Camellia_DecryptBlock_Rounds: L_Camellia_DecryptBlock_Rounds_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -426,10 +426,10 @@ L004pic_point: .align 4 _Camellia_DecryptBlock: L_Camellia_DecryptBlock_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl $128,%eax subl 4(%esp),%eax @@ -442,10 +442,10 @@ L_Camellia_DecryptBlock_begin: .align 4 _Camellia_decrypt: L_Camellia_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -498,10 +498,10 @@ L005pic_point: .type __x86_Camellia_decrypt,@function .align 4 __x86_Camellia_decrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif xorl (%edi),%eax xorl 4(%edi),%ebx @@ -732,10 +732,10 @@ L007done: .align 4 _Camellia_Ekeygen: L_Camellia_Ekeygen_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1577,10 +1577,10 @@ L013done: .align 4 _Camellia_set_key: L_Camellia_set_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebx movl 8(%esp),%ecx @@ -2133,10 +2133,10 @@ LCamellia_SBOX: .align 4 _Camellia_cbc_encrypt: L_Camellia_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/chacha/chacha-x86.S b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/chacha/chacha-x86.S index 43fb04a04..de6c16532 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/chacha/chacha-x86.S +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/chacha/chacha-x86.S @@ -4,10 +4,10 @@ .align 4 _ChaCha20_ctr32: L_ChaCha20_ctr32_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -382,10 +382,10 @@ L000no_data: .align 4 _ChaCha20_ssse3: L_ChaCha20_ssse3_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -978,10 +978,10 @@ Lssse3_data: .align 4 _ChaCha20_xop: L_ChaCha20_xop_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/des/crypt586.S b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/des/crypt586.S index 6d24c5d6a..20cebb630 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/des/crypt586.S +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/des/crypt586.S @@ -4,10 +4,10 @@ .align 4 _fcrypt_body: L_fcrypt_body_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/des/des-586.S b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/des/des-586.S index cdc186dff..9714ec62b 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/des/des-586.S +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/des/des-586.S @@ -3,10 +3,10 @@ .type __x86_DES_encrypt,@function .align 4 __x86_DES_encrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ecx # Round 0 @@ -478,10 +478,10 @@ __x86_DES_encrypt: .type __x86_DES_decrypt,@function .align 4 __x86_DES_decrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ecx # Round 15 @@ -955,10 +955,10 @@ __x86_DES_decrypt: .align 4 _DES_encrypt1: L_DES_encrypt1_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi @@ -1072,10 +1072,10 @@ L002done: .align 4 _DES_encrypt2: L_DES_encrypt2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi @@ -1119,10 +1119,10 @@ L005done: .align 4 _DES_encrypt3: L_DES_encrypt3_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebx movl 8(%esp),%ebx @@ -1244,10 +1244,10 @@ L_DES_encrypt3_begin: .align 4 _DES_decrypt3: L_DES_decrypt3_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebx movl 8(%esp),%ebx @@ -1369,10 +1369,10 @@ L_DES_decrypt3_begin: .align 4 _DES_ncbc_encrypt: L_DES_ncbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -1435,55 +1435,55 @@ L010PIC_point: xorl %edx,%edx jmp *%ebp L012ej7: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 6(%esi),%dh shll $8,%edx L013ej6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 5(%esi),%dh L014ej5: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 4(%esi),%dl L015ej4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%ecx jmp L016ejend L017ej3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 2(%esi),%ch shll $8,%ecx L018ej2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 1(%esi),%ch L019ej1: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb (%esi),%cl L016ejend: @@ -1588,10 +1588,10 @@ L011cbc_enc_jmp_table: .align 4 _DES_ede3_cbc_encrypt: L_DES_ede3_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -1658,55 +1658,55 @@ L034PIC_point: xorl %edx,%edx jmp *%ebp L036ej7: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 6(%esi),%dh shll $8,%edx L037ej6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 5(%esi),%dh L038ej5: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 4(%esi),%dl L039ej4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%ecx jmp L040ejend L041ej3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 2(%esi),%ch shll $8,%ecx L042ej2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 1(%esi),%ch L043ej1: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb (%esi),%cl L040ejend: diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/ec/ecp_nistz256-x86.S b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/ec/ecp_nistz256-x86.S index 44d644b78..592bd5d4c 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/ec/ecp_nistz256-x86.S +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/ec/ecp_nistz256-x86.S @@ -2387,10 +2387,10 @@ LONE: .align 4 _ecp_nistz256_mul_by_2: L_ecp_nistz256_mul_by_2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2410,10 +2410,10 @@ L_ecp_nistz256_mul_by_2_begin: .align 4 _ecp_nistz256_mul_by_3: L_ecp_nistz256_mul_by_3_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2439,10 +2439,10 @@ L_ecp_nistz256_mul_by_3_begin: .align 4 _ecp_nistz256_div_by_2: L_ecp_nistz256_div_by_2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2459,10 +2459,10 @@ L_ecp_nistz256_div_by_2_begin: .type __ecp_nistz256_div_by_2,@function .align 4 __ecp_nistz256_div_by_2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%ebp xorl %edx,%edx @@ -2546,10 +2546,10 @@ __ecp_nistz256_div_by_2: .align 4 _ecp_nistz256_add: L_ecp_nistz256_add_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2567,10 +2567,10 @@ L_ecp_nistz256_add_begin: .type __ecp_nistz256_add,@function .align 4 __ecp_nistz256_add: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%eax movl 4(%esi),%ebx @@ -2648,10 +2648,10 @@ __ecp_nistz256_add: .align 4 _ecp_nistz256_sub: L_ecp_nistz256_sub_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2669,10 +2669,10 @@ L_ecp_nistz256_sub_begin: .type __ecp_nistz256_sub,@function .align 4 __ecp_nistz256_sub: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%eax movl 4(%esi),%ebx @@ -2731,10 +2731,10 @@ __ecp_nistz256_sub: .align 4 _ecp_nistz256_neg: L_ecp_nistz256_neg_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2763,10 +2763,10 @@ L_ecp_nistz256_neg_begin: .type __picup_eax,@function .align 4 __picup_eax: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esp),%eax ret @@ -2775,10 +2775,10 @@ __picup_eax: .align 4 _ecp_nistz256_to_mont: L_ecp_nistz256_to_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2803,10 +2803,10 @@ L000pic: .align 4 _ecp_nistz256_from_mont: L_ecp_nistz256_from_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2831,10 +2831,10 @@ L001pic: .align 4 _ecp_nistz256_mul_mont: L_ecp_nistz256_mul_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2859,10 +2859,10 @@ L002pic: .align 4 _ecp_nistz256_sqr_mont: L_ecp_nistz256_sqr_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2885,10 +2885,10 @@ L003pic: .type __ecp_nistz256_mul_mont,@function .align 4 __ecp_nistz256_mul_mont: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif andl $83886080,%eax cmpl $83886080,%eax @@ -3786,10 +3786,10 @@ L004mul_mont_ialu: .align 4 _ecp_nistz256_scatter_w5: L_ecp_nistz256_scatter_w5_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3823,10 +3823,10 @@ L006scatter_w5_loop: .align 4 _ecp_nistz256_gather_w5: L_ecp_nistz256_gather_w5_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3921,10 +3921,10 @@ L_ecp_nistz256_gather_w5_begin: .align 4 _ecp_nistz256_scatter_w7: L_ecp_nistz256_scatter_w7_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3956,10 +3956,10 @@ L007scatter_w7_loop: .align 4 _ecp_nistz256_gather_w7: L_ecp_nistz256_gather_w7_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -4174,10 +4174,10 @@ L_ecp_nistz256_gather_w7_begin: .align 4 _ecp_nistz256_point_double: L_ecp_nistz256_point_double_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -4305,10 +4305,10 @@ Lpoint_double_shortcut: .align 4 _ecp_nistz256_point_add: L_ecp_nistz256_point_add_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -4823,10 +4823,10 @@ L012add_done: .align 4 _ecp_nistz256_point_add_affine: L_ecp_nistz256_point_add_affine_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/md5/md5-586.S b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/md5/md5-586.S index 814822863..5d340cc8d 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/md5/md5-586.S +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/md5/md5-586.S @@ -4,10 +4,10 @@ .align 4 _ossl_md5_block_asm_data_order: L_ossl_md5_block_asm_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/modes/ghash-x86.S b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/modes/ghash-x86.S index 808dc3079..2cff65afd 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/modes/ghash-x86.S +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/modes/ghash-x86.S @@ -4,10 +4,10 @@ .align 4 _gcm_gmult_4bit_x86: L_gcm_gmult_4bit_x86_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -102,10 +102,10 @@ L001x86_break: .align 4 _gcm_ghash_4bit_x86: L_gcm_ghash_4bit_x86_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -215,10 +215,10 @@ L004x86_break: .align 4 _gcm_gmult_4bit_mmx: L_gcm_gmult_4bit_mmx_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -318,10 +318,10 @@ L007mmx_break: .align 4 _gcm_ghash_4bit_mmx: L_gcm_ghash_4bit_mmx_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -926,10 +926,10 @@ L009outer: .align 4 _gcm_init_clmul: L_gcm_init_clmul_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%eax @@ -999,10 +999,10 @@ L010pic: .align 4 _gcm_gmult_clmul: L_gcm_gmult_clmul_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 8(%esp),%edx @@ -1056,10 +1056,10 @@ L011pic: .align 4 _gcm_ghash_clmul: L_gcm_ghash_clmul_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/poly1305/poly1305-x86.S b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/poly1305/poly1305-x86.S index 6fd5469a5..8466cccec 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/poly1305/poly1305-x86.S +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/poly1305/poly1305-x86.S @@ -5,10 +5,10 @@ .align 4 _poly1305_init: L_poly1305_init_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -71,10 +71,10 @@ L000nokey: .align 4 _poly1305_blocks: L_poly1305_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -243,10 +243,10 @@ L003nodata: .align 4 _poly1305_emit: L_poly1305_emit_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -306,10 +306,10 @@ Lenter_emit: .type __poly1305_init_sse2,@function .align 4 __poly1305_init_sse2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movdqu 24(%edi),%xmm4 leal 48(%edi),%edi @@ -512,10 +512,10 @@ L006square_break: .type __poly1305_blocks_sse2,@function .align 4 __poly1305_blocks_sse2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1277,10 +1277,10 @@ L007nodata: .type __poly1305_emit_sse2,@function .align 4 __poly1305_emit_sse2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1374,10 +1374,10 @@ __poly1305_emit_sse2: .type __poly1305_init_avx2,@function .align 4 __poly1305_init_avx2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif vmovdqu 24(%edi),%xmm4 leal 48(%edi),%edi @@ -1549,10 +1549,10 @@ L019square_break: .type __poly1305_blocks_avx2,@function .align 4 __poly1305_blocks_avx2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/rc4/rc4-586.S b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/rc4/rc4-586.S index 55215f177..ea14690ff 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/rc4/rc4-586.S +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/rc4/rc4-586.S @@ -4,10 +4,10 @@ .align 4 _RC4: L_RC4_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -275,10 +275,10 @@ L000abort: .align 4 _RC4_set_key: L_RC4_set_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -358,10 +358,10 @@ L015exit: .align 4 _RC4_options: L_RC4_options_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call L018pic_point L018pic_point: diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/ripemd/rmd-586.S b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/ripemd/rmd-586.S index 454c77c96..15b698510 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/ripemd/rmd-586.S +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/ripemd/rmd-586.S @@ -4,10 +4,10 @@ .align 4 _ripemd160_block_asm_data_order: L_ripemd160_block_asm_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%eax diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/sha/sha1-586.S b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/sha/sha1-586.S index 2e977b873..0eaea0433 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/sha/sha1-586.S +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/sha/sha1-586.S @@ -4,10 +4,10 @@ .align 4 _sha1_block_data_order: L_sha1_block_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1403,10 +1403,10 @@ L002loop: .type __sha1_block_data_order_shaext,@function .align 4 __sha1_block_data_order_shaext: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1577,10 +1577,10 @@ L004loop_shaext: .type __sha1_block_data_order_ssse3,@function .align 4 __sha1_block_data_order_ssse3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2800,10 +2800,10 @@ L007done: .type __sha1_block_data_order_avx,@function .align 4 __sha1_block_data_order_avx: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/sha/sha256-586.S b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/sha/sha256-586.S index ab935deb8..5b9c8a197 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/sha/sha256-586.S +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/sha/sha256-586.S @@ -4,10 +4,10 @@ .align 4 _sha256_block_data_order: L_sha256_block_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/sha/sha512-586.S b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/sha/sha512-586.S index 0dea93b39..7be4ad8cd 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/sha/sha512-586.S +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/sha/sha512-586.S @@ -4,10 +4,10 @@ .align 4 _sha512_block_data_order: L_sha512_block_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/whrlpool/wp-mmx.S b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/whrlpool/wp-mmx.S index 384b61736..b717addbd 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/whrlpool/wp-mmx.S +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/whrlpool/wp-mmx.S @@ -4,10 +4,10 @@ .align 4 _whirlpool_block_mmx: L_whirlpool_block_mmx_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/x86cpuid.S b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/x86cpuid.S index 39d138a7e..e80a134a6 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/x86cpuid.S +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/x86cpuid.S @@ -4,10 +4,10 @@ .align 4 _OPENSSL_ia32_cpuid: L_OPENSSL_ia32_cpuid_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -152,10 +152,10 @@ L000nocpuid: .align 4 _OPENSSL_rdtsc: L_OPENSSL_rdtsc_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif xorl %eax,%eax xorl %edx,%edx @@ -174,10 +174,10 @@ L010notsc: .align 4 _OPENSSL_instrument_halt: L_OPENSSL_instrument_halt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call L011PIC_me_up L011PIC_me_up: @@ -211,10 +211,10 @@ L012nohalt: .align 4 _OPENSSL_far_spin: L_OPENSSL_far_spin_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushfl popl %eax @@ -242,10 +242,10 @@ L013nospin: .align 4 _OPENSSL_wipe_cpu: L_OPENSSL_wipe_cpu_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif xorl %eax,%eax xorl %edx,%edx @@ -278,10 +278,10 @@ L016no_x87: .align 4 _OPENSSL_atomic_add: L_OPENSSL_atomic_add_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%ecx @@ -301,10 +301,10 @@ L018spin: .align 4 _OPENSSL_cleanse: L_OPENSSL_cleanse_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%ecx @@ -342,10 +342,10 @@ L022aligned: .align 4 _CRYPTO_memcmp: L_CRYPTO_memcmp_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi @@ -375,10 +375,10 @@ L023no_data: .align 4 _OPENSSL_instrument_bus: L_OPENSSL_instrument_bus_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -428,10 +428,10 @@ L026nogo: .align 4 _OPENSSL_instrument_bus2: L_OPENSSL_instrument_bus2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -494,10 +494,10 @@ L029nogo: .align 4 _OPENSSL_ia32_rdrand_bytes: L_OPENSSL_ia32_rdrand_bytes_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %ebx @@ -541,10 +541,10 @@ L032done: .align 4 _OPENSSL_ia32_rdseed_bytes: L_OPENSSL_ia32_rdseed_bytes_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %ebx diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/engines/e_padlock-x86.S b/deps/openssl/config/archs/BSD-x86/asm_avx2/engines/e_padlock-x86.S index fca7a343b..1a973e235 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/engines/e_padlock-x86.S +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/engines/e_padlock-x86.S @@ -4,10 +4,10 @@ .align 4 _padlock_capability: L_padlock_capability_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebx pushfl @@ -68,10 +68,10 @@ L000noluck: .align 4 _padlock_key_bswap: L_padlock_key_bswap_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 240(%edx),%ecx @@ -90,10 +90,10 @@ L003bswap_loop: .align 4 _padlock_verify_context: L_padlock_verify_context_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx leal Lpadlock_saved_context-L004verify_pic_point,%eax @@ -105,10 +105,10 @@ L004verify_pic_point: .type __padlock_verify_ctx,@function .align 4 __padlock_verify_ctx: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif addl (%esp),%eax btl $30,4(%esp) @@ -125,10 +125,10 @@ L005verified: .align 4 _padlock_reload_key: L_padlock_reload_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushfl popfl @@ -138,10 +138,10 @@ L_padlock_reload_key_begin: .align 4 _padlock_aes_block: L_padlock_aes_block_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -162,10 +162,10 @@ L_padlock_aes_block_begin: .align 4 _padlock_ecb_encrypt: L_padlock_ecb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -345,10 +345,10 @@ L006ecb_abort: .align 4 _padlock_cbc_encrypt: L_padlock_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -532,10 +532,10 @@ L018cbc_abort: .align 4 _padlock_cfb_encrypt: L_padlock_cfb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -658,10 +658,10 @@ L030cfb_abort: .align 4 _padlock_ofb_encrypt: L_padlock_ofb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -784,10 +784,10 @@ L039ofb_abort: .align 4 _padlock_ctr32_encrypt: L_padlock_ctr32_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -895,10 +895,10 @@ L048ctr32_abort: .align 4 _padlock_xstore: L_padlock_xstore_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi movl 8(%esp),%edi @@ -909,10 +909,10 @@ L_padlock_xstore_begin: .type __win32_segv_handler,@function .align 4 __win32_segv_handler: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl $1,%eax movl 4(%esp),%edx @@ -928,10 +928,10 @@ L055ret: .align 4 _padlock_sha1_oneshot: L_padlock_sha1_oneshot_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -963,10 +963,10 @@ L_padlock_sha1_oneshot_begin: .align 4 _padlock_sha1_blocks: L_padlock_sha1_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -997,10 +997,10 @@ L_padlock_sha1_blocks_begin: .align 4 _padlock_sha256_oneshot: L_padlock_sha256_oneshot_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -1032,10 +1032,10 @@ L_padlock_sha256_oneshot_begin: .align 4 _padlock_sha256_blocks: L_padlock_sha256_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -1066,10 +1066,10 @@ L_padlock_sha256_blocks_begin: .align 4 _padlock_sha512_blocks: L_padlock_sha512_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/include/openssl/bio.h b/deps/openssl/config/archs/BSD-x86/asm_avx2/include/openssl/bio.h index f9aa74731..e16cf622c 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/include/openssl/bio.h +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/include/openssl/bio.h @@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, - int (*ossl_gets) (BIO *, char *, int)); + int (*gets) (BIO *, char *, int)); long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/BSD-x86/asm_avx2/include/openssl/opensslv.h index 65f3bfa05..5bb97d596 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 13 +# define OPENSSL_VERSION_PATCH 9 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.13" -# define OPENSSL_FULL_VERSION_STR "3.0.13+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "30 Jan 2024" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13+quic 30 Jan 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/include/openssl/pkcs7.h b/deps/openssl/config/archs/BSD-x86/asm_avx2/include/openssl/pkcs7.h index 0ce79bf4f..557a0a726 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/include/openssl/pkcs7.h +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/include/openssl/pkcs7.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/pkcs7.h.in * - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -56,8 +56,8 @@ typedef struct pkcs7_signer_info_st { PKCS7_ISSUER_AND_SERIAL *issuer_and_serial; X509_ALGOR *digest_alg; STACK_OF(X509_ATTRIBUTE) *auth_attr; /* [ 0 ] */ - X509_ALGOR *digest_enc_alg; /* confusing name, actually used for signing */ - ASN1_OCTET_STRING *enc_digest; /* confusing name, actually signature */ + X509_ALGOR *digest_enc_alg; + ASN1_OCTET_STRING *enc_digest; STACK_OF(X509_ATTRIBUTE) *unauth_attr; /* [ 1 ] */ /* The private key to sign with */ EVP_PKEY *pkey; diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/BSD-x86/asm_avx2/include/openssl/ssl.h index 0f1915755..3df725c56 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/include/openssl/ssl.h +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/openssl-cl.gypi b/deps/openssl/config/archs/BSD-x86/asm_avx2/openssl-cl.gypi index dc324536e..806e39e55 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/openssl-cl.gypi +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/openssl-cl.gypi @@ -17,7 +17,6 @@ 'OPENSSL_IA32_SSE2', 'PADLOCK_ASM', 'POLY1305_ASM', - 'RC4_ASM', 'RMD160_ASM', 'SHA1_ASM', 'SHA256_ASM', diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/openssl.gypi b/deps/openssl/config/archs/BSD-x86/asm_avx2/openssl.gypi index 60512e2b5..34bf26588 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cfb.c', 'openssl/crypto/aes/aes_ecb.c', @@ -993,7 +991,6 @@ 'OPENSSL_IA32_SSE2', 'PADLOCK_ASM', 'POLY1305_ASM', - 'RC4_ASM', 'RMD160_ASM', 'SHA1_ASM', 'SHA256_ASM', diff --git a/deps/openssl/config/archs/BSD-x86/no-asm/configdata.pm b/deps/openssl/config/archs/BSD-x86/no-asm/configdata.pm index 449b67e73..2999a1bb9 100644 --- a/deps/openssl/config/archs/BSD-x86/no-asm/configdata.pm +++ b/deps/openssl/config/archs/BSD-x86/no-asm/configdata.pm @@ -139,7 +139,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [], @@ -154,7 +154,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.13+quic", + "full_version" => "3.0.9", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -202,7 +202,7 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "13", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -255,11 +255,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "30 Jan 2024", - "shlib_version" => "81.3", + "release_date" => "30 May 2023", + "shlib_version" => "3", "sourcedir" => ".", "target" => "BSD-x86", - "version" => "3.0.13" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -386,7 +386,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -782,9 +781,6 @@ our %unified_info = ( "providers/fips" => { "fips" => "1" }, - "test/p_minimal" => { - "noinst" => "1" - }, "test/p_test" => { "noinst" => "1" } @@ -853,9 +849,6 @@ our %unified_info = ( "test/asn1_internal_test" => { "noinst" => "1" }, - "test/asn1_stable_parse_test" => { - "noinst" => "1" - }, "test/asn1_string_table_test" => { "noinst" => "1" }, @@ -1045,9 +1038,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -1595,9 +1585,6 @@ our %unified_info = ( "providers/libfips.a" => [ "FIPS_MODULE" ], - "test/evp_extra_test" => [ - "STATIC_LEGACY" - ], "test/provider_internal_test" => [ "PROVIDER_INIT_FUNCTION_NAME=p_test_init" ], @@ -2351,9 +2338,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -2651,9 +2635,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -3422,9 +3403,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -3719,9 +3697,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -3755,12 +3730,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -4745,9 +4714,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -5045,9 +5011,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -5816,9 +5779,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -6113,9 +6073,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -6149,12 +6106,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -7152,10 +7103,6 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], - "test/asn1_stable_parse_test" => [ - "libcrypto", - "test/libtestutil.a" - ], "test/asn1_string_table_test" => [ "libcrypto", "test/libtestutil.a" @@ -7409,10 +7356,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -7678,8 +7621,6 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "libcrypto.a", - "providers/libcommon.a", - "providers/liblegacy.a", "test/libtestutil.a" ], "test/evp_extra_test2" => [ @@ -9744,7 +9685,6 @@ our %unified_info = ( }, "providers" => { "deps" => [ - "providers/evp_extra_test-bin-legacyprov.o", "providers/libcrypto-lib-baseprov.o", "providers/libcrypto-lib-defltprov.o", "providers/libcrypto-lib-nullprov.o", @@ -9752,9 +9692,6 @@ our %unified_info = ( "providers/libdefault.a" ], "products" => { - "bin" => [ - "test/evp_extra_test" - ], "dso" => [ "providers/fips", "providers/legacy" @@ -10191,7 +10128,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10242,7 +10178,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -11374,9 +11309,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -11674,9 +11606,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -12445,9 +12374,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -12742,9 +12668,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -12778,12 +12701,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -13768,9 +13685,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -14068,9 +13982,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -14839,9 +14750,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -15136,9 +15044,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -15172,12 +15077,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -16206,10 +16105,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16286,9 +16181,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "whrlpool" ], - "test/p_minimal.ld" => [ - "util/providers.num" - ], "test/p_test.ld" => [ "util/providers.num" ], @@ -16454,7 +16346,6 @@ our %unified_info = ( "doc/html/man3/CMS_get1_ReceiptRequest.html", "doc/html/man3/CMS_sign.html", "doc/html/man3/CMS_sign_receipt.html", - "doc/html/man3/CMS_signed_get_attr.html", "doc/html/man3/CMS_uncompress.html", "doc/html/man3/CMS_verify.html", "doc/html/man3/CMS_verify_receipt.html", @@ -16554,7 +16445,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_encapsulate.html", "doc/html/man3/EVP_PKEY_encrypt.html", "doc/html/man3/EVP_PKEY_fromdata.html", - "doc/html/man3/EVP_PKEY_get_attr.html", "doc/html/man3/EVP_PKEY_get_default_digest_nid.html", "doc/html/man3/EVP_PKEY_get_field_type.html", "doc/html/man3/EVP_PKEY_get_group_name.html", @@ -16811,7 +16701,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -16910,7 +16799,6 @@ our %unified_info = ( "doc/html/man3/X509V3_get_d2i.html", "doc/html/man3/X509V3_set_ctx.html", "doc/html/man3/X509_ALGOR_dup.html", - "doc/html/man3/X509_ATTRIBUTE.html", "doc/html/man3/X509_CRL_get0_by_serial.html", "doc/html/man3/X509_EXTENSION_set_object.html", "doc/html/man3/X509_LOOKUP.html", @@ -16922,8 +16810,6 @@ our %unified_info = ( "doc/html/man3/X509_NAME_get_index_by_NID.html", "doc/html/man3/X509_NAME_print_ex.html", "doc/html/man3/X509_PUBKEY_new.html", - "doc/html/man3/X509_REQ_get_attr.html", - "doc/html/man3/X509_REQ_get_extensions.html", "doc/html/man3/X509_SIG_get0.html", "doc/html/man3/X509_STORE_CTX_get_error.html", "doc/html/man3/X509_STORE_CTX_new.html", @@ -18221,10 +18107,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/asn1_stable_parse_test" => [ - "include", - "apps/include" - ], "test/asn1_string_table_test" => [ "include", "apps/include" @@ -18432,9 +18314,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -18694,9 +18573,7 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "include", - "apps/include", - "providers/common/include", - "providers/implementations/include" + "apps/include" ], "test/evp_extra_test2" => [ "include", @@ -18953,10 +18830,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/p_minimal" => [ - "include", - "." - ], "test/p_test" => [ "include", "." @@ -19446,7 +19319,6 @@ our %unified_info = ( "doc/man/man3/CMS_get1_ReceiptRequest.3", "doc/man/man3/CMS_sign.3", "doc/man/man3/CMS_sign_receipt.3", - "doc/man/man3/CMS_signed_get_attr.3", "doc/man/man3/CMS_uncompress.3", "doc/man/man3/CMS_verify.3", "doc/man/man3/CMS_verify_receipt.3", @@ -19546,7 +19418,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_encapsulate.3", "doc/man/man3/EVP_PKEY_encrypt.3", "doc/man/man3/EVP_PKEY_fromdata.3", - "doc/man/man3/EVP_PKEY_get_attr.3", "doc/man/man3/EVP_PKEY_get_default_digest_nid.3", "doc/man/man3/EVP_PKEY_get_field_type.3", "doc/man/man3/EVP_PKEY_get_group_name.3", @@ -19803,7 +19674,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -19902,7 +19772,6 @@ our %unified_info = ( "doc/man/man3/X509V3_get_d2i.3", "doc/man/man3/X509V3_set_ctx.3", "doc/man/man3/X509_ALGOR_dup.3", - "doc/man/man3/X509_ATTRIBUTE.3", "doc/man/man3/X509_CRL_get0_by_serial.3", "doc/man/man3/X509_EXTENSION_set_object.3", "doc/man/man3/X509_LOOKUP.3", @@ -19914,8 +19783,6 @@ our %unified_info = ( "doc/man/man3/X509_NAME_get_index_by_NID.3", "doc/man/man3/X509_NAME_print_ex.3", "doc/man/man3/X509_PUBKEY_new.3", - "doc/man/man3/X509_REQ_get_attr.3", - "doc/man/man3/X509_REQ_get_extensions.3", "doc/man/man3/X509_SIG_get0.3", "doc/man/man3/X509_STORE_CTX_get_error.3", "doc/man/man3/X509_STORE_CTX_new.3", @@ -20099,7 +19966,6 @@ our %unified_info = ( "modules" => [ "providers/fips", "providers/legacy", - "test/p_minimal", "test/p_test" ], "programs" => [ @@ -20125,7 +19991,6 @@ our %unified_info = ( "test/asn1_dsa_internal_test", "test/asn1_encode_test", "test/asn1_internal_test", - "test/asn1_stable_parse_test", "test/asn1_string_table_test", "test/asn1_time_test", "test/asynciotest", @@ -20189,7 +20054,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24318,7 +24182,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24345,7 +24208,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -24447,9 +24309,6 @@ our %unified_info = ( "providers/common/libfips-lib-securitycheck_fips.o" => [ "providers/common/securitycheck_fips.c" ], - "providers/evp_extra_test-bin-legacyprov.o" => [ - "providers/legacyprov.c" - ], "providers/fips" => [ "providers/fips.ld", "providers/fips/fips-dso-fips_entry.o" @@ -25586,9 +25445,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25670,9 +25526,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25730,12 +25583,6 @@ our %unified_info = ( "test/asn1_internal_test-bin-asn1_internal_test.o" => [ "test/asn1_internal_test.c" ], - "test/asn1_stable_parse_test" => [ - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" - ], - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" => [ - "test/asn1_stable_parse_test.c" - ], "test/asn1_string_table_test" => [ "test/asn1_string_table_test-bin-asn1_string_table_test.o" ], @@ -26115,12 +25962,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -26519,7 +26360,6 @@ our %unified_info = ( "test/errtest.c" ], "test/evp_extra_test" => [ - "providers/evp_extra_test-bin-legacyprov.o", "test/evp_extra_test-bin-evp_extra_test.o" ], "test/evp_extra_test-bin-evp_extra_test.o" => [ @@ -26810,13 +26650,6 @@ our %unified_info = ( "test/ossl_store_test-bin-ossl_store_test.o" => [ "test/ossl_store_test.c" ], - "test/p_minimal" => [ - "test/p_minimal-dso-p_minimal.o", - "test/p_minimal.ld" - ], - "test/p_minimal-dso-p_minimal.o" => [ - "test/p_minimal.c" - ], "test/p_test" => [ "test/p_test-dso-p_test.o", "test/p_test.ld" @@ -27503,8 +27336,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27531,7 +27364,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27548,8 +27381,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/BSD-x86/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/BSD-x86/no-asm/crypto/buildinf.h index 628312a9c..4a8211050 100644 --- a/deps/openssl/config/archs/BSD-x86/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/BSD-x86/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: BSD-x86" -#define DATE "built on: Wed Jan 31 12:57:55 2024 UTC" +#define DATE "built on: Tue Aug 6 12:21:07 2024 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/BSD-x86/no-asm/include/openssl/bio.h b/deps/openssl/config/archs/BSD-x86/no-asm/include/openssl/bio.h index f9aa74731..e16cf622c 100644 --- a/deps/openssl/config/archs/BSD-x86/no-asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/BSD-x86/no-asm/include/openssl/bio.h @@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, - int (*ossl_gets) (BIO *, char *, int)); + int (*gets) (BIO *, char *, int)); long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); diff --git a/deps/openssl/config/archs/BSD-x86/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/BSD-x86/no-asm/include/openssl/opensslv.h index 65f3bfa05..5bb97d596 100644 --- a/deps/openssl/config/archs/BSD-x86/no-asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/BSD-x86/no-asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 13 +# define OPENSSL_VERSION_PATCH 9 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.13" -# define OPENSSL_FULL_VERSION_STR "3.0.13+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "30 Jan 2024" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13+quic 30 Jan 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/BSD-x86/no-asm/include/openssl/pkcs7.h b/deps/openssl/config/archs/BSD-x86/no-asm/include/openssl/pkcs7.h index 0ce79bf4f..557a0a726 100644 --- a/deps/openssl/config/archs/BSD-x86/no-asm/include/openssl/pkcs7.h +++ b/deps/openssl/config/archs/BSD-x86/no-asm/include/openssl/pkcs7.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/pkcs7.h.in * - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -56,8 +56,8 @@ typedef struct pkcs7_signer_info_st { PKCS7_ISSUER_AND_SERIAL *issuer_and_serial; X509_ALGOR *digest_alg; STACK_OF(X509_ATTRIBUTE) *auth_attr; /* [ 0 ] */ - X509_ALGOR *digest_enc_alg; /* confusing name, actually used for signing */ - ASN1_OCTET_STRING *enc_digest; /* confusing name, actually signature */ + X509_ALGOR *digest_enc_alg; + ASN1_OCTET_STRING *enc_digest; STACK_OF(X509_ATTRIBUTE) *unauth_attr; /* [ 1 ] */ /* The private key to sign with */ EVP_PKEY *pkey; diff --git a/deps/openssl/config/archs/BSD-x86/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/BSD-x86/no-asm/include/openssl/ssl.h index 0f1915755..3df725c56 100644 --- a/deps/openssl/config/archs/BSD-x86/no-asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/BSD-x86/no-asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/BSD-x86/no-asm/openssl.gypi b/deps/openssl/config/archs/BSD-x86/no-asm/openssl.gypi index 12fdb1843..2031f41d6 100644 --- a/deps/openssl/config/archs/BSD-x86/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/BSD-x86/no-asm/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cbc.c', 'openssl/crypto/aes/aes_cfb.c', diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/configdata.pm b/deps/openssl/config/archs/BSD-x86_64/asm/configdata.pm index c98dd8360..d61106421 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm/configdata.pm +++ b/deps/openssl/config/archs/BSD-x86_64/asm/configdata.pm @@ -139,7 +139,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -156,7 +156,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.13+quic", + "full_version" => "3.0.9", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -203,7 +203,7 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "13", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -255,11 +255,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "30 Jan 2024", - "shlib_version" => "81.3", + "release_date" => "30 May 2023", + "shlib_version" => "3", "sourcedir" => ".", "target" => "BSD-x86_64", - "version" => "3.0.13" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -387,7 +387,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -782,9 +781,6 @@ our %unified_info = ( "providers/fips" => { "fips" => "1" }, - "test/p_minimal" => { - "noinst" => "1" - }, "test/p_test" => { "noinst" => "1" } @@ -853,9 +849,6 @@ our %unified_info = ( "test/asn1_internal_test" => { "noinst" => "1" }, - "test/asn1_stable_parse_test" => { - "noinst" => "1" - }, "test/asn1_string_table_test" => { "noinst" => "1" }, @@ -1045,9 +1038,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -1604,7 +1594,6 @@ our %unified_info = ( "OPENSSL_IA32_SSE2", "PADLOCK_ASM", "POLY1305_ASM", - "RC4_ASM", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", @@ -1656,11 +1645,7 @@ our %unified_info = ( "X25519_ASM" ], "providers/liblegacy.a" => [ - "MD5_ASM", - "RC4_ASM" - ], - "test/evp_extra_test" => [ - "STATIC_LEGACY" + "MD5_ASM" ], "test/provider_internal_test" => [ "PROVIDER_INIT_FUNCTION_NAME=p_test_init" @@ -2415,9 +2400,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -2715,9 +2697,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -3486,9 +3465,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -3783,9 +3759,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -3819,12 +3792,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -4809,9 +4776,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -5109,9 +5073,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -5880,9 +5841,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -6177,9 +6135,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -6213,12 +6168,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -7216,10 +7165,6 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], - "test/asn1_stable_parse_test" => [ - "libcrypto", - "test/libtestutil.a" - ], "test/asn1_string_table_test" => [ "libcrypto", "test/libtestutil.a" @@ -7473,10 +7418,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -7742,8 +7683,6 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "libcrypto.a", - "providers/libcommon.a", - "providers/liblegacy.a", "test/libtestutil.a" ], "test/evp_extra_test2" => [ @@ -9866,7 +9805,6 @@ our %unified_info = ( }, "providers" => { "deps" => [ - "providers/evp_extra_test-bin-legacyprov.o", "providers/libcrypto-lib-baseprov.o", "providers/libcrypto-lib-defltprov.o", "providers/libcrypto-lib-nullprov.o", @@ -9874,9 +9812,6 @@ our %unified_info = ( "providers/libdefault.a" ], "products" => { - "bin" => [ - "test/evp_extra_test" - ], "dso" => [ "providers/fips", "providers/legacy" @@ -10313,7 +10248,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10364,7 +10298,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -11496,9 +11429,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -11796,9 +11726,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -12567,9 +12494,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -12864,9 +12788,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -12900,12 +12821,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -13890,9 +13805,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -14190,9 +14102,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -14961,9 +14870,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -15258,9 +15164,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -15294,12 +15197,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -16328,10 +16225,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16408,9 +16301,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "whrlpool" ], - "test/p_minimal.ld" => [ - "util/providers.num" - ], "test/p_test.ld" => [ "util/providers.num" ], @@ -16576,7 +16466,6 @@ our %unified_info = ( "doc/html/man3/CMS_get1_ReceiptRequest.html", "doc/html/man3/CMS_sign.html", "doc/html/man3/CMS_sign_receipt.html", - "doc/html/man3/CMS_signed_get_attr.html", "doc/html/man3/CMS_uncompress.html", "doc/html/man3/CMS_verify.html", "doc/html/man3/CMS_verify_receipt.html", @@ -16676,7 +16565,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_encapsulate.html", "doc/html/man3/EVP_PKEY_encrypt.html", "doc/html/man3/EVP_PKEY_fromdata.html", - "doc/html/man3/EVP_PKEY_get_attr.html", "doc/html/man3/EVP_PKEY_get_default_digest_nid.html", "doc/html/man3/EVP_PKEY_get_field_type.html", "doc/html/man3/EVP_PKEY_get_group_name.html", @@ -16933,7 +16821,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -17032,7 +16919,6 @@ our %unified_info = ( "doc/html/man3/X509V3_get_d2i.html", "doc/html/man3/X509V3_set_ctx.html", "doc/html/man3/X509_ALGOR_dup.html", - "doc/html/man3/X509_ATTRIBUTE.html", "doc/html/man3/X509_CRL_get0_by_serial.html", "doc/html/man3/X509_EXTENSION_set_object.html", "doc/html/man3/X509_LOOKUP.html", @@ -17044,8 +16930,6 @@ our %unified_info = ( "doc/html/man3/X509_NAME_get_index_by_NID.html", "doc/html/man3/X509_NAME_print_ex.html", "doc/html/man3/X509_PUBKEY_new.html", - "doc/html/man3/X509_REQ_get_attr.html", - "doc/html/man3/X509_REQ_get_extensions.html", "doc/html/man3/X509_SIG_get0.html", "doc/html/man3/X509_STORE_CTX_get_error.html", "doc/html/man3/X509_STORE_CTX_new.html", @@ -18343,10 +18227,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/asn1_stable_parse_test" => [ - "include", - "apps/include" - ], "test/asn1_string_table_test" => [ "include", "apps/include" @@ -18554,9 +18434,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -18816,9 +18693,7 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "include", - "apps/include", - "providers/common/include", - "providers/implementations/include" + "apps/include" ], "test/evp_extra_test2" => [ "include", @@ -19075,10 +18950,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/p_minimal" => [ - "include", - "." - ], "test/p_test" => [ "include", "." @@ -19568,7 +19439,6 @@ our %unified_info = ( "doc/man/man3/CMS_get1_ReceiptRequest.3", "doc/man/man3/CMS_sign.3", "doc/man/man3/CMS_sign_receipt.3", - "doc/man/man3/CMS_signed_get_attr.3", "doc/man/man3/CMS_uncompress.3", "doc/man/man3/CMS_verify.3", "doc/man/man3/CMS_verify_receipt.3", @@ -19668,7 +19538,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_encapsulate.3", "doc/man/man3/EVP_PKEY_encrypt.3", "doc/man/man3/EVP_PKEY_fromdata.3", - "doc/man/man3/EVP_PKEY_get_attr.3", "doc/man/man3/EVP_PKEY_get_default_digest_nid.3", "doc/man/man3/EVP_PKEY_get_field_type.3", "doc/man/man3/EVP_PKEY_get_group_name.3", @@ -19925,7 +19794,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20024,7 +19892,6 @@ our %unified_info = ( "doc/man/man3/X509V3_get_d2i.3", "doc/man/man3/X509V3_set_ctx.3", "doc/man/man3/X509_ALGOR_dup.3", - "doc/man/man3/X509_ATTRIBUTE.3", "doc/man/man3/X509_CRL_get0_by_serial.3", "doc/man/man3/X509_EXTENSION_set_object.3", "doc/man/man3/X509_LOOKUP.3", @@ -20036,8 +19903,6 @@ our %unified_info = ( "doc/man/man3/X509_NAME_get_index_by_NID.3", "doc/man/man3/X509_NAME_print_ex.3", "doc/man/man3/X509_PUBKEY_new.3", - "doc/man/man3/X509_REQ_get_attr.3", - "doc/man/man3/X509_REQ_get_extensions.3", "doc/man/man3/X509_SIG_get0.3", "doc/man/man3/X509_STORE_CTX_get_error.3", "doc/man/man3/X509_STORE_CTX_new.3", @@ -20221,7 +20086,6 @@ our %unified_info = ( "modules" => [ "providers/fips", "providers/legacy", - "test/p_minimal", "test/p_test" ], "programs" => [ @@ -20247,7 +20111,6 @@ our %unified_info = ( "test/asn1_dsa_internal_test", "test/asn1_encode_test", "test/asn1_internal_test", - "test/asn1_stable_parse_test", "test/asn1_string_table_test", "test/asn1_time_test", "test/asynciotest", @@ -20311,7 +20174,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24609,7 +24471,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24636,7 +24497,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -24738,9 +24598,6 @@ our %unified_info = ( "providers/common/libfips-lib-securitycheck_fips.o" => [ "providers/common/securitycheck_fips.c" ], - "providers/evp_extra_test-bin-legacyprov.o" => [ - "providers/legacyprov.c" - ], "providers/fips" => [ "providers/fips.ld", "providers/fips/fips-dso-fips_entry.o" @@ -25900,9 +25757,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25984,9 +25838,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -26044,12 +25895,6 @@ our %unified_info = ( "test/asn1_internal_test-bin-asn1_internal_test.o" => [ "test/asn1_internal_test.c" ], - "test/asn1_stable_parse_test" => [ - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" - ], - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" => [ - "test/asn1_stable_parse_test.c" - ], "test/asn1_string_table_test" => [ "test/asn1_string_table_test-bin-asn1_string_table_test.o" ], @@ -26429,12 +26274,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -26833,7 +26672,6 @@ our %unified_info = ( "test/errtest.c" ], "test/evp_extra_test" => [ - "providers/evp_extra_test-bin-legacyprov.o", "test/evp_extra_test-bin-evp_extra_test.o" ], "test/evp_extra_test-bin-evp_extra_test.o" => [ @@ -27124,13 +26962,6 @@ our %unified_info = ( "test/ossl_store_test-bin-ossl_store_test.o" => [ "test/ossl_store_test.c" ], - "test/p_minimal" => [ - "test/p_minimal-dso-p_minimal.o", - "test/p_minimal.ld" - ], - "test/p_minimal-dso-p_minimal.o" => [ - "test/p_minimal.c" - ], "test/p_test" => [ "test/p_test-dso-p_test.o", "test/p_test.ld" @@ -27814,8 +27645,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27842,7 +27673,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27859,8 +27690,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/buildinf.h b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/buildinf.h index ae35447b7..bdfd4a933 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: BSD-x86_64" -#define DATE "built on: Wed Jan 31 12:58:07 2024 UTC" +#define DATE "built on: Tue Aug 6 12:21:18 2024 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/include/openssl/bio.h b/deps/openssl/config/archs/BSD-x86_64/asm/include/openssl/bio.h index f9aa74731..e16cf622c 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/BSD-x86_64/asm/include/openssl/bio.h @@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, - int (*ossl_gets) (BIO *, char *, int)); + int (*gets) (BIO *, char *, int)); long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/BSD-x86_64/asm/include/openssl/opensslv.h index 65f3bfa05..5bb97d596 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/BSD-x86_64/asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 13 +# define OPENSSL_VERSION_PATCH 9 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.13" -# define OPENSSL_FULL_VERSION_STR "3.0.13+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "30 Jan 2024" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13+quic 30 Jan 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/include/openssl/pkcs7.h b/deps/openssl/config/archs/BSD-x86_64/asm/include/openssl/pkcs7.h index 0ce79bf4f..557a0a726 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm/include/openssl/pkcs7.h +++ b/deps/openssl/config/archs/BSD-x86_64/asm/include/openssl/pkcs7.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/pkcs7.h.in * - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -56,8 +56,8 @@ typedef struct pkcs7_signer_info_st { PKCS7_ISSUER_AND_SERIAL *issuer_and_serial; X509_ALGOR *digest_alg; STACK_OF(X509_ATTRIBUTE) *auth_attr; /* [ 0 ] */ - X509_ALGOR *digest_enc_alg; /* confusing name, actually used for signing */ - ASN1_OCTET_STRING *enc_digest; /* confusing name, actually signature */ + X509_ALGOR *digest_enc_alg; + ASN1_OCTET_STRING *enc_digest; STACK_OF(X509_ATTRIBUTE) *unauth_attr; /* [ 1 ] */ /* The private key to sign with */ EVP_PKEY *pkey; diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/include/openssl/ssl.h b/deps/openssl/config/archs/BSD-x86_64/asm/include/openssl/ssl.h index 0f1915755..3df725c56 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/BSD-x86_64/asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/openssl-cl.gypi b/deps/openssl/config/archs/BSD-x86_64/asm/openssl-cl.gypi index bfe296a44..7a4fc80cc 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm/openssl-cl.gypi +++ b/deps/openssl/config/archs/BSD-x86_64/asm/openssl-cl.gypi @@ -18,7 +18,6 @@ 'OPENSSL_IA32_SSE2', 'PADLOCK_ASM', 'POLY1305_ASM', - 'RC4_ASM', 'SHA1_ASM', 'SHA256_ASM', 'SHA512_ASM', diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/openssl.gypi b/deps/openssl/config/archs/BSD-x86_64/asm/openssl.gypi index 7a468bd82..161e95f0c 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm/openssl.gypi +++ b/deps/openssl/config/archs/BSD-x86_64/asm/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cfb.c', 'openssl/crypto/aes/aes_ecb.c', @@ -1007,7 +1005,6 @@ 'OPENSSL_IA32_SSE2', 'PADLOCK_ASM', 'POLY1305_ASM', - 'RC4_ASM', 'SHA1_ASM', 'SHA256_ASM', 'SHA512_ASM', diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/configdata.pm b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/configdata.pm index 62e705ce7..b75ad5cf5 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/configdata.pm @@ -139,7 +139,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -156,7 +156,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.13+quic", + "full_version" => "3.0.9", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -203,7 +203,7 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "13", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -255,11 +255,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "30 Jan 2024", - "shlib_version" => "81.3", + "release_date" => "30 May 2023", + "shlib_version" => "3", "sourcedir" => ".", "target" => "BSD-x86_64", - "version" => "3.0.13" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -387,7 +387,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -782,9 +781,6 @@ our %unified_info = ( "providers/fips" => { "fips" => "1" }, - "test/p_minimal" => { - "noinst" => "1" - }, "test/p_test" => { "noinst" => "1" } @@ -853,9 +849,6 @@ our %unified_info = ( "test/asn1_internal_test" => { "noinst" => "1" }, - "test/asn1_stable_parse_test" => { - "noinst" => "1" - }, "test/asn1_string_table_test" => { "noinst" => "1" }, @@ -1045,9 +1038,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -1604,7 +1594,6 @@ our %unified_info = ( "OPENSSL_IA32_SSE2", "PADLOCK_ASM", "POLY1305_ASM", - "RC4_ASM", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", @@ -1656,11 +1645,7 @@ our %unified_info = ( "X25519_ASM" ], "providers/liblegacy.a" => [ - "MD5_ASM", - "RC4_ASM" - ], - "test/evp_extra_test" => [ - "STATIC_LEGACY" + "MD5_ASM" ], "test/provider_internal_test" => [ "PROVIDER_INIT_FUNCTION_NAME=p_test_init" @@ -2415,9 +2400,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -2715,9 +2697,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -3486,9 +3465,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -3783,9 +3759,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -3819,12 +3792,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -4809,9 +4776,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -5109,9 +5073,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -5880,9 +5841,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -6177,9 +6135,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -6213,12 +6168,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -7216,10 +7165,6 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], - "test/asn1_stable_parse_test" => [ - "libcrypto", - "test/libtestutil.a" - ], "test/asn1_string_table_test" => [ "libcrypto", "test/libtestutil.a" @@ -7473,10 +7418,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -7742,8 +7683,6 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "libcrypto.a", - "providers/libcommon.a", - "providers/liblegacy.a", "test/libtestutil.a" ], "test/evp_extra_test2" => [ @@ -9866,7 +9805,6 @@ our %unified_info = ( }, "providers" => { "deps" => [ - "providers/evp_extra_test-bin-legacyprov.o", "providers/libcrypto-lib-baseprov.o", "providers/libcrypto-lib-defltprov.o", "providers/libcrypto-lib-nullprov.o", @@ -9874,9 +9812,6 @@ our %unified_info = ( "providers/libdefault.a" ], "products" => { - "bin" => [ - "test/evp_extra_test" - ], "dso" => [ "providers/fips", "providers/legacy" @@ -10313,7 +10248,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10364,7 +10298,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -11496,9 +11429,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -11796,9 +11726,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -12567,9 +12494,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -12864,9 +12788,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -12900,12 +12821,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -13890,9 +13805,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -14190,9 +14102,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -14961,9 +14870,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -15258,9 +15164,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -15294,12 +15197,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -16328,10 +16225,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16408,9 +16301,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "whrlpool" ], - "test/p_minimal.ld" => [ - "util/providers.num" - ], "test/p_test.ld" => [ "util/providers.num" ], @@ -16576,7 +16466,6 @@ our %unified_info = ( "doc/html/man3/CMS_get1_ReceiptRequest.html", "doc/html/man3/CMS_sign.html", "doc/html/man3/CMS_sign_receipt.html", - "doc/html/man3/CMS_signed_get_attr.html", "doc/html/man3/CMS_uncompress.html", "doc/html/man3/CMS_verify.html", "doc/html/man3/CMS_verify_receipt.html", @@ -16676,7 +16565,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_encapsulate.html", "doc/html/man3/EVP_PKEY_encrypt.html", "doc/html/man3/EVP_PKEY_fromdata.html", - "doc/html/man3/EVP_PKEY_get_attr.html", "doc/html/man3/EVP_PKEY_get_default_digest_nid.html", "doc/html/man3/EVP_PKEY_get_field_type.html", "doc/html/man3/EVP_PKEY_get_group_name.html", @@ -16933,7 +16821,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -17032,7 +16919,6 @@ our %unified_info = ( "doc/html/man3/X509V3_get_d2i.html", "doc/html/man3/X509V3_set_ctx.html", "doc/html/man3/X509_ALGOR_dup.html", - "doc/html/man3/X509_ATTRIBUTE.html", "doc/html/man3/X509_CRL_get0_by_serial.html", "doc/html/man3/X509_EXTENSION_set_object.html", "doc/html/man3/X509_LOOKUP.html", @@ -17044,8 +16930,6 @@ our %unified_info = ( "doc/html/man3/X509_NAME_get_index_by_NID.html", "doc/html/man3/X509_NAME_print_ex.html", "doc/html/man3/X509_PUBKEY_new.html", - "doc/html/man3/X509_REQ_get_attr.html", - "doc/html/man3/X509_REQ_get_extensions.html", "doc/html/man3/X509_SIG_get0.html", "doc/html/man3/X509_STORE_CTX_get_error.html", "doc/html/man3/X509_STORE_CTX_new.html", @@ -18343,10 +18227,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/asn1_stable_parse_test" => [ - "include", - "apps/include" - ], "test/asn1_string_table_test" => [ "include", "apps/include" @@ -18554,9 +18434,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -18816,9 +18693,7 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "include", - "apps/include", - "providers/common/include", - "providers/implementations/include" + "apps/include" ], "test/evp_extra_test2" => [ "include", @@ -19075,10 +18950,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/p_minimal" => [ - "include", - "." - ], "test/p_test" => [ "include", "." @@ -19568,7 +19439,6 @@ our %unified_info = ( "doc/man/man3/CMS_get1_ReceiptRequest.3", "doc/man/man3/CMS_sign.3", "doc/man/man3/CMS_sign_receipt.3", - "doc/man/man3/CMS_signed_get_attr.3", "doc/man/man3/CMS_uncompress.3", "doc/man/man3/CMS_verify.3", "doc/man/man3/CMS_verify_receipt.3", @@ -19668,7 +19538,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_encapsulate.3", "doc/man/man3/EVP_PKEY_encrypt.3", "doc/man/man3/EVP_PKEY_fromdata.3", - "doc/man/man3/EVP_PKEY_get_attr.3", "doc/man/man3/EVP_PKEY_get_default_digest_nid.3", "doc/man/man3/EVP_PKEY_get_field_type.3", "doc/man/man3/EVP_PKEY_get_group_name.3", @@ -19925,7 +19794,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20024,7 +19892,6 @@ our %unified_info = ( "doc/man/man3/X509V3_get_d2i.3", "doc/man/man3/X509V3_set_ctx.3", "doc/man/man3/X509_ALGOR_dup.3", - "doc/man/man3/X509_ATTRIBUTE.3", "doc/man/man3/X509_CRL_get0_by_serial.3", "doc/man/man3/X509_EXTENSION_set_object.3", "doc/man/man3/X509_LOOKUP.3", @@ -20036,8 +19903,6 @@ our %unified_info = ( "doc/man/man3/X509_NAME_get_index_by_NID.3", "doc/man/man3/X509_NAME_print_ex.3", "doc/man/man3/X509_PUBKEY_new.3", - "doc/man/man3/X509_REQ_get_attr.3", - "doc/man/man3/X509_REQ_get_extensions.3", "doc/man/man3/X509_SIG_get0.3", "doc/man/man3/X509_STORE_CTX_get_error.3", "doc/man/man3/X509_STORE_CTX_new.3", @@ -20221,7 +20086,6 @@ our %unified_info = ( "modules" => [ "providers/fips", "providers/legacy", - "test/p_minimal", "test/p_test" ], "programs" => [ @@ -20247,7 +20111,6 @@ our %unified_info = ( "test/asn1_dsa_internal_test", "test/asn1_encode_test", "test/asn1_internal_test", - "test/asn1_stable_parse_test", "test/asn1_string_table_test", "test/asn1_time_test", "test/asynciotest", @@ -20311,7 +20174,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24609,7 +24471,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24636,7 +24497,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -24738,9 +24598,6 @@ our %unified_info = ( "providers/common/libfips-lib-securitycheck_fips.o" => [ "providers/common/securitycheck_fips.c" ], - "providers/evp_extra_test-bin-legacyprov.o" => [ - "providers/legacyprov.c" - ], "providers/fips" => [ "providers/fips.ld", "providers/fips/fips-dso-fips_entry.o" @@ -25900,9 +25757,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25984,9 +25838,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -26044,12 +25895,6 @@ our %unified_info = ( "test/asn1_internal_test-bin-asn1_internal_test.o" => [ "test/asn1_internal_test.c" ], - "test/asn1_stable_parse_test" => [ - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" - ], - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" => [ - "test/asn1_stable_parse_test.c" - ], "test/asn1_string_table_test" => [ "test/asn1_string_table_test-bin-asn1_string_table_test.o" ], @@ -26429,12 +26274,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -26833,7 +26672,6 @@ our %unified_info = ( "test/errtest.c" ], "test/evp_extra_test" => [ - "providers/evp_extra_test-bin-legacyprov.o", "test/evp_extra_test-bin-evp_extra_test.o" ], "test/evp_extra_test-bin-evp_extra_test.o" => [ @@ -27124,13 +26962,6 @@ our %unified_info = ( "test/ossl_store_test-bin-ossl_store_test.o" => [ "test/ossl_store_test.c" ], - "test/p_minimal" => [ - "test/p_minimal-dso-p_minimal.o", - "test/p_minimal.ld" - ], - "test/p_minimal-dso-p_minimal.o" => [ - "test/p_minimal.c" - ], "test/p_test" => [ "test/p_test-dso-p_test.o", "test/p_test.ld" @@ -27814,8 +27645,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27842,7 +27673,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27859,8 +27690,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/buildinf.h index bb3c01486..cdd455e44 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: BSD-x86_64" -#define DATE "built on: Wed Jan 31 12:58:22 2024 UTC" +#define DATE "built on: Tue Aug 6 12:21:32 2024 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/openssl/bio.h b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/openssl/bio.h index f9aa74731..e16cf622c 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/openssl/bio.h +++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/openssl/bio.h @@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, - int (*ossl_gets) (BIO *, char *, int)); + int (*gets) (BIO *, char *, int)); long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/openssl/opensslv.h index 65f3bfa05..5bb97d596 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 13 +# define OPENSSL_VERSION_PATCH 9 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.13" -# define OPENSSL_FULL_VERSION_STR "3.0.13+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "30 Jan 2024" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13+quic 30 Jan 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/openssl/pkcs7.h b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/openssl/pkcs7.h index 0ce79bf4f..557a0a726 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/openssl/pkcs7.h +++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/openssl/pkcs7.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/pkcs7.h.in * - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -56,8 +56,8 @@ typedef struct pkcs7_signer_info_st { PKCS7_ISSUER_AND_SERIAL *issuer_and_serial; X509_ALGOR *digest_alg; STACK_OF(X509_ATTRIBUTE) *auth_attr; /* [ 0 ] */ - X509_ALGOR *digest_enc_alg; /* confusing name, actually used for signing */ - ASN1_OCTET_STRING *enc_digest; /* confusing name, actually signature */ + X509_ALGOR *digest_enc_alg; + ASN1_OCTET_STRING *enc_digest; STACK_OF(X509_ATTRIBUTE) *unauth_attr; /* [ 1 ] */ /* The private key to sign with */ EVP_PKEY *pkey; diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/openssl/ssl.h index 0f1915755..3df725c56 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/openssl/ssl.h +++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/openssl-cl.gypi b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/openssl-cl.gypi index 108012655..42d807726 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/openssl-cl.gypi +++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/openssl-cl.gypi @@ -18,7 +18,6 @@ 'OPENSSL_IA32_SSE2', 'PADLOCK_ASM', 'POLY1305_ASM', - 'RC4_ASM', 'SHA1_ASM', 'SHA256_ASM', 'SHA512_ASM', diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/openssl.gypi b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/openssl.gypi index 6de0252f4..3ae12b8b8 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cfb.c', 'openssl/crypto/aes/aes_ecb.c', @@ -1007,7 +1005,6 @@ 'OPENSSL_IA32_SSE2', 'PADLOCK_ASM', 'POLY1305_ASM', - 'RC4_ASM', 'SHA1_ASM', 'SHA256_ASM', 'SHA512_ASM', diff --git a/deps/openssl/config/archs/BSD-x86_64/no-asm/configdata.pm b/deps/openssl/config/archs/BSD-x86_64/no-asm/configdata.pm index 419db86f7..4cbd5f9fb 100644 --- a/deps/openssl/config/archs/BSD-x86_64/no-asm/configdata.pm +++ b/deps/openssl/config/archs/BSD-x86_64/no-asm/configdata.pm @@ -139,7 +139,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [], @@ -154,7 +154,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.13+quic", + "full_version" => "3.0.9", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -202,7 +202,7 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "13", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -255,11 +255,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "30 Jan 2024", - "shlib_version" => "81.3", + "release_date" => "30 May 2023", + "shlib_version" => "3", "sourcedir" => ".", "target" => "BSD-x86_64", - "version" => "3.0.13" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -387,7 +387,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -783,9 +782,6 @@ our %unified_info = ( "providers/fips" => { "fips" => "1" }, - "test/p_minimal" => { - "noinst" => "1" - }, "test/p_test" => { "noinst" => "1" } @@ -854,9 +850,6 @@ our %unified_info = ( "test/asn1_internal_test" => { "noinst" => "1" }, - "test/asn1_stable_parse_test" => { - "noinst" => "1" - }, "test/asn1_string_table_test" => { "noinst" => "1" }, @@ -1046,9 +1039,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -1596,9 +1586,6 @@ our %unified_info = ( "providers/libfips.a" => [ "FIPS_MODULE" ], - "test/evp_extra_test" => [ - "STATIC_LEGACY" - ], "test/provider_internal_test" => [ "PROVIDER_INIT_FUNCTION_NAME=p_test_init" ], @@ -2352,9 +2339,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -2652,9 +2636,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -3423,9 +3404,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -3720,9 +3698,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -3756,12 +3731,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -4746,9 +4715,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -5046,9 +5012,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -5817,9 +5780,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -6114,9 +6074,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -6150,12 +6107,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -7153,10 +7104,6 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], - "test/asn1_stable_parse_test" => [ - "libcrypto", - "test/libtestutil.a" - ], "test/asn1_string_table_test" => [ "libcrypto", "test/libtestutil.a" @@ -7410,10 +7357,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -7679,8 +7622,6 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "libcrypto.a", - "providers/libcommon.a", - "providers/liblegacy.a", "test/libtestutil.a" ], "test/evp_extra_test2" => [ @@ -9745,7 +9686,6 @@ our %unified_info = ( }, "providers" => { "deps" => [ - "providers/evp_extra_test-bin-legacyprov.o", "providers/libcrypto-lib-baseprov.o", "providers/libcrypto-lib-defltprov.o", "providers/libcrypto-lib-nullprov.o", @@ -9753,9 +9693,6 @@ our %unified_info = ( "providers/libdefault.a" ], "products" => { - "bin" => [ - "test/evp_extra_test" - ], "dso" => [ "providers/fips", "providers/legacy" @@ -10192,7 +10129,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10243,7 +10179,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -11375,9 +11310,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -11675,9 +11607,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -12446,9 +12375,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -12743,9 +12669,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -12779,12 +12702,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -13769,9 +13686,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -14069,9 +13983,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -14840,9 +14751,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -15137,9 +15045,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -15173,12 +15078,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -16207,10 +16106,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16287,9 +16182,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "whrlpool" ], - "test/p_minimal.ld" => [ - "util/providers.num" - ], "test/p_test.ld" => [ "util/providers.num" ], @@ -16455,7 +16347,6 @@ our %unified_info = ( "doc/html/man3/CMS_get1_ReceiptRequest.html", "doc/html/man3/CMS_sign.html", "doc/html/man3/CMS_sign_receipt.html", - "doc/html/man3/CMS_signed_get_attr.html", "doc/html/man3/CMS_uncompress.html", "doc/html/man3/CMS_verify.html", "doc/html/man3/CMS_verify_receipt.html", @@ -16555,7 +16446,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_encapsulate.html", "doc/html/man3/EVP_PKEY_encrypt.html", "doc/html/man3/EVP_PKEY_fromdata.html", - "doc/html/man3/EVP_PKEY_get_attr.html", "doc/html/man3/EVP_PKEY_get_default_digest_nid.html", "doc/html/man3/EVP_PKEY_get_field_type.html", "doc/html/man3/EVP_PKEY_get_group_name.html", @@ -16812,7 +16702,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -16911,7 +16800,6 @@ our %unified_info = ( "doc/html/man3/X509V3_get_d2i.html", "doc/html/man3/X509V3_set_ctx.html", "doc/html/man3/X509_ALGOR_dup.html", - "doc/html/man3/X509_ATTRIBUTE.html", "doc/html/man3/X509_CRL_get0_by_serial.html", "doc/html/man3/X509_EXTENSION_set_object.html", "doc/html/man3/X509_LOOKUP.html", @@ -16923,8 +16811,6 @@ our %unified_info = ( "doc/html/man3/X509_NAME_get_index_by_NID.html", "doc/html/man3/X509_NAME_print_ex.html", "doc/html/man3/X509_PUBKEY_new.html", - "doc/html/man3/X509_REQ_get_attr.html", - "doc/html/man3/X509_REQ_get_extensions.html", "doc/html/man3/X509_SIG_get0.html", "doc/html/man3/X509_STORE_CTX_get_error.html", "doc/html/man3/X509_STORE_CTX_new.html", @@ -18222,10 +18108,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/asn1_stable_parse_test" => [ - "include", - "apps/include" - ], "test/asn1_string_table_test" => [ "include", "apps/include" @@ -18433,9 +18315,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -18695,9 +18574,7 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "include", - "apps/include", - "providers/common/include", - "providers/implementations/include" + "apps/include" ], "test/evp_extra_test2" => [ "include", @@ -18954,10 +18831,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/p_minimal" => [ - "include", - "." - ], "test/p_test" => [ "include", "." @@ -19447,7 +19320,6 @@ our %unified_info = ( "doc/man/man3/CMS_get1_ReceiptRequest.3", "doc/man/man3/CMS_sign.3", "doc/man/man3/CMS_sign_receipt.3", - "doc/man/man3/CMS_signed_get_attr.3", "doc/man/man3/CMS_uncompress.3", "doc/man/man3/CMS_verify.3", "doc/man/man3/CMS_verify_receipt.3", @@ -19547,7 +19419,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_encapsulate.3", "doc/man/man3/EVP_PKEY_encrypt.3", "doc/man/man3/EVP_PKEY_fromdata.3", - "doc/man/man3/EVP_PKEY_get_attr.3", "doc/man/man3/EVP_PKEY_get_default_digest_nid.3", "doc/man/man3/EVP_PKEY_get_field_type.3", "doc/man/man3/EVP_PKEY_get_group_name.3", @@ -19804,7 +19675,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -19903,7 +19773,6 @@ our %unified_info = ( "doc/man/man3/X509V3_get_d2i.3", "doc/man/man3/X509V3_set_ctx.3", "doc/man/man3/X509_ALGOR_dup.3", - "doc/man/man3/X509_ATTRIBUTE.3", "doc/man/man3/X509_CRL_get0_by_serial.3", "doc/man/man3/X509_EXTENSION_set_object.3", "doc/man/man3/X509_LOOKUP.3", @@ -19915,8 +19784,6 @@ our %unified_info = ( "doc/man/man3/X509_NAME_get_index_by_NID.3", "doc/man/man3/X509_NAME_print_ex.3", "doc/man/man3/X509_PUBKEY_new.3", - "doc/man/man3/X509_REQ_get_attr.3", - "doc/man/man3/X509_REQ_get_extensions.3", "doc/man/man3/X509_SIG_get0.3", "doc/man/man3/X509_STORE_CTX_get_error.3", "doc/man/man3/X509_STORE_CTX_new.3", @@ -20100,7 +19967,6 @@ our %unified_info = ( "modules" => [ "providers/fips", "providers/legacy", - "test/p_minimal", "test/p_test" ], "programs" => [ @@ -20126,7 +19992,6 @@ our %unified_info = ( "test/asn1_dsa_internal_test", "test/asn1_encode_test", "test/asn1_internal_test", - "test/asn1_stable_parse_test", "test/asn1_string_table_test", "test/asn1_time_test", "test/asynciotest", @@ -20190,7 +20055,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24319,7 +24183,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24346,7 +24209,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -24448,9 +24310,6 @@ our %unified_info = ( "providers/common/libfips-lib-securitycheck_fips.o" => [ "providers/common/securitycheck_fips.c" ], - "providers/evp_extra_test-bin-legacyprov.o" => [ - "providers/legacyprov.c" - ], "providers/fips" => [ "providers/fips.ld", "providers/fips/fips-dso-fips_entry.o" @@ -25587,9 +25446,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25671,9 +25527,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25731,12 +25584,6 @@ our %unified_info = ( "test/asn1_internal_test-bin-asn1_internal_test.o" => [ "test/asn1_internal_test.c" ], - "test/asn1_stable_parse_test" => [ - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" - ], - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" => [ - "test/asn1_stable_parse_test.c" - ], "test/asn1_string_table_test" => [ "test/asn1_string_table_test-bin-asn1_string_table_test.o" ], @@ -26116,12 +25963,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -26520,7 +26361,6 @@ our %unified_info = ( "test/errtest.c" ], "test/evp_extra_test" => [ - "providers/evp_extra_test-bin-legacyprov.o", "test/evp_extra_test-bin-evp_extra_test.o" ], "test/evp_extra_test-bin-evp_extra_test.o" => [ @@ -26811,13 +26651,6 @@ our %unified_info = ( "test/ossl_store_test-bin-ossl_store_test.o" => [ "test/ossl_store_test.c" ], - "test/p_minimal" => [ - "test/p_minimal-dso-p_minimal.o", - "test/p_minimal.ld" - ], - "test/p_minimal-dso-p_minimal.o" => [ - "test/p_minimal.c" - ], "test/p_test" => [ "test/p_test-dso-p_test.o", "test/p_test.ld" @@ -27504,8 +27337,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27532,7 +27365,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27549,8 +27382,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/BSD-x86_64/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/BSD-x86_64/no-asm/crypto/buildinf.h index 201f0f7d4..3f30583b7 100644 --- a/deps/openssl/config/archs/BSD-x86_64/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/BSD-x86_64/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: BSD-x86_64" -#define DATE "built on: Wed Jan 31 12:58:38 2024 UTC" +#define DATE "built on: Tue Aug 6 12:21:46 2024 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/BSD-x86_64/no-asm/include/openssl/bio.h b/deps/openssl/config/archs/BSD-x86_64/no-asm/include/openssl/bio.h index f9aa74731..e16cf622c 100644 --- a/deps/openssl/config/archs/BSD-x86_64/no-asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/BSD-x86_64/no-asm/include/openssl/bio.h @@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, - int (*ossl_gets) (BIO *, char *, int)); + int (*gets) (BIO *, char *, int)); long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); diff --git a/deps/openssl/config/archs/BSD-x86_64/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/BSD-x86_64/no-asm/include/openssl/opensslv.h index 65f3bfa05..5bb97d596 100644 --- a/deps/openssl/config/archs/BSD-x86_64/no-asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/BSD-x86_64/no-asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 13 +# define OPENSSL_VERSION_PATCH 9 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.13" -# define OPENSSL_FULL_VERSION_STR "3.0.13+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "30 Jan 2024" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13+quic 30 Jan 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/BSD-x86_64/no-asm/include/openssl/pkcs7.h b/deps/openssl/config/archs/BSD-x86_64/no-asm/include/openssl/pkcs7.h index 0ce79bf4f..557a0a726 100644 --- a/deps/openssl/config/archs/BSD-x86_64/no-asm/include/openssl/pkcs7.h +++ b/deps/openssl/config/archs/BSD-x86_64/no-asm/include/openssl/pkcs7.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/pkcs7.h.in * - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -56,8 +56,8 @@ typedef struct pkcs7_signer_info_st { PKCS7_ISSUER_AND_SERIAL *issuer_and_serial; X509_ALGOR *digest_alg; STACK_OF(X509_ATTRIBUTE) *auth_attr; /* [ 0 ] */ - X509_ALGOR *digest_enc_alg; /* confusing name, actually used for signing */ - ASN1_OCTET_STRING *enc_digest; /* confusing name, actually signature */ + X509_ALGOR *digest_enc_alg; + ASN1_OCTET_STRING *enc_digest; STACK_OF(X509_ATTRIBUTE) *unauth_attr; /* [ 1 ] */ /* The private key to sign with */ EVP_PKEY *pkey; diff --git a/deps/openssl/config/archs/BSD-x86_64/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/BSD-x86_64/no-asm/include/openssl/ssl.h index 0f1915755..3df725c56 100644 --- a/deps/openssl/config/archs/BSD-x86_64/no-asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/BSD-x86_64/no-asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/BSD-x86_64/no-asm/openssl.gypi b/deps/openssl/config/archs/BSD-x86_64/no-asm/openssl.gypi index d1d45e83d..bb080a96f 100644 --- a/deps/openssl/config/archs/BSD-x86_64/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/BSD-x86_64/no-asm/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cbc.c', 'openssl/crypto/aes/aes_cfb.c', diff --git a/deps/openssl/config/archs/VC-WIN32/asm/configdata.pm b/deps/openssl/config/archs/VC-WIN32/asm/configdata.pm index f724da475..3ece36500 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm/configdata.pm +++ b/deps/openssl/config/archs/VC-WIN32/asm/configdata.pm @@ -148,7 +148,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -165,7 +165,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.13+quic", + "full_version" => "3.0.9", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -216,7 +216,7 @@ our %config = ( ], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "13", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -268,11 +268,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "30 Jan 2024", - "shlib_version" => "81.3", + "release_date" => "30 May 2023", + "shlib_version" => "3", "sourcedir" => ".", "target" => "VC-WIN32", - "version" => "3.0.13" + "version" => "3.0.9" ); our %target = ( "AR" => "lib", @@ -287,7 +287,7 @@ our %target = ( "LDFLAGS" => "/nologo /debug", "MT" => "mt", "MTFLAGS" => "-nologo", - "RANLIB" => "CODE(0x5644d3bdea88)", + "RANLIB" => "CODE(0x55b16b710c78)", "RC" => "rc", "_conf_fname_int" => [ "Configurations/00-base-templates.conf", @@ -436,7 +436,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -832,9 +831,6 @@ our %unified_info = ( "providers/fips" => { "fips" => "1" }, - "test/p_minimal" => { - "noinst" => "1" - }, "test/p_test" => { "noinst" => "1" } @@ -903,9 +899,6 @@ our %unified_info = ( "test/asn1_internal_test" => { "noinst" => "1" }, - "test/asn1_stable_parse_test" => { - "noinst" => "1" - }, "test/asn1_string_table_test" => { "noinst" => "1" }, @@ -1095,9 +1088,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -1650,7 +1640,6 @@ our %unified_info = ( "OPENSSL_IA32_SSE2", "PADLOCK_ASM", "POLY1305_ASM", - "RC4_ASM", "RMD160_ASM", "SHA1_ASM", "SHA256_ASM", @@ -1698,11 +1687,7 @@ our %unified_info = ( "VPAES_ASM" ], "providers/liblegacy.a" => [ - "MD5_ASM", - "RC4_ASM" - ], - "test/evp_extra_test" => [ - "STATIC_LEGACY" + "MD5_ASM" ], "test/provider_internal_test" => [ "PROVIDER_INIT_FUNCTION_NAME=p_test_init" @@ -2457,9 +2442,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -2757,9 +2739,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -3528,9 +3507,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -3825,9 +3801,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -3861,12 +3834,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -4851,9 +4818,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -5151,9 +5115,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -5922,9 +5883,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -6219,9 +6177,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -6255,12 +6210,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -7264,10 +7213,6 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], - "test/asn1_stable_parse_test" => [ - "libcrypto", - "test/libtestutil.a" - ], "test/asn1_string_table_test" => [ "libcrypto", "test/libtestutil.a" @@ -7521,10 +7466,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -7790,8 +7731,6 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "libcrypto.a", - "providers/libcommon.a", - "providers/liblegacy.a", "test/libtestutil.a" ], "test/evp_extra_test2" => [ @@ -9879,7 +9818,6 @@ our %unified_info = ( }, "providers" => { "deps" => [ - "providers/evp_extra_test-bin-legacyprov.o", "providers/libcrypto-lib-baseprov.o", "providers/libcrypto-lib-defltprov.o", "providers/libcrypto-lib-nullprov.o", @@ -9887,9 +9825,6 @@ our %unified_info = ( "providers/libdefault.a" ], "products" => { - "bin" => [ - "test/evp_extra_test" - ], "dso" => [ "providers/fips", "providers/legacy" @@ -10326,7 +10261,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10377,7 +10311,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -11512,9 +11445,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -11812,9 +11742,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -12583,9 +12510,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -12880,9 +12804,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -12916,12 +12837,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -13906,9 +13821,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -14206,9 +14118,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -14977,9 +14886,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -15274,9 +15180,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -15310,12 +15213,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -16360,10 +16257,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16440,9 +16333,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "whrlpool" ], - "test/p_minimal.ld" => [ - "util/providers.num" - ], "test/p_test.ld" => [ "util/providers.num" ], @@ -16608,7 +16498,6 @@ our %unified_info = ( "doc/html/man3/CMS_get1_ReceiptRequest.html", "doc/html/man3/CMS_sign.html", "doc/html/man3/CMS_sign_receipt.html", - "doc/html/man3/CMS_signed_get_attr.html", "doc/html/man3/CMS_uncompress.html", "doc/html/man3/CMS_verify.html", "doc/html/man3/CMS_verify_receipt.html", @@ -16708,7 +16597,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_encapsulate.html", "doc/html/man3/EVP_PKEY_encrypt.html", "doc/html/man3/EVP_PKEY_fromdata.html", - "doc/html/man3/EVP_PKEY_get_attr.html", "doc/html/man3/EVP_PKEY_get_default_digest_nid.html", "doc/html/man3/EVP_PKEY_get_field_type.html", "doc/html/man3/EVP_PKEY_get_group_name.html", @@ -16965,7 +16853,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -17064,7 +16951,6 @@ our %unified_info = ( "doc/html/man3/X509V3_get_d2i.html", "doc/html/man3/X509V3_set_ctx.html", "doc/html/man3/X509_ALGOR_dup.html", - "doc/html/man3/X509_ATTRIBUTE.html", "doc/html/man3/X509_CRL_get0_by_serial.html", "doc/html/man3/X509_EXTENSION_set_object.html", "doc/html/man3/X509_LOOKUP.html", @@ -17076,8 +16962,6 @@ our %unified_info = ( "doc/html/man3/X509_NAME_get_index_by_NID.html", "doc/html/man3/X509_NAME_print_ex.html", "doc/html/man3/X509_PUBKEY_new.html", - "doc/html/man3/X509_REQ_get_attr.html", - "doc/html/man3/X509_REQ_get_extensions.html", "doc/html/man3/X509_SIG_get0.html", "doc/html/man3/X509_STORE_CTX_get_error.html", "doc/html/man3/X509_STORE_CTX_new.html", @@ -18381,10 +18265,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/asn1_stable_parse_test" => [ - "include", - "apps/include" - ], "test/asn1_string_table_test" => [ "include", "apps/include" @@ -18592,9 +18472,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -18854,9 +18731,7 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "include", - "apps/include", - "providers/common/include", - "providers/implementations/include" + "apps/include" ], "test/evp_extra_test2" => [ "include", @@ -19113,10 +18988,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/p_minimal" => [ - "include", - "." - ], "test/p_test" => [ "include", "." @@ -19606,7 +19477,6 @@ our %unified_info = ( "doc/man/man3/CMS_get1_ReceiptRequest.3", "doc/man/man3/CMS_sign.3", "doc/man/man3/CMS_sign_receipt.3", - "doc/man/man3/CMS_signed_get_attr.3", "doc/man/man3/CMS_uncompress.3", "doc/man/man3/CMS_verify.3", "doc/man/man3/CMS_verify_receipt.3", @@ -19706,7 +19576,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_encapsulate.3", "doc/man/man3/EVP_PKEY_encrypt.3", "doc/man/man3/EVP_PKEY_fromdata.3", - "doc/man/man3/EVP_PKEY_get_attr.3", "doc/man/man3/EVP_PKEY_get_default_digest_nid.3", "doc/man/man3/EVP_PKEY_get_field_type.3", "doc/man/man3/EVP_PKEY_get_group_name.3", @@ -19963,7 +19832,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20062,7 +19930,6 @@ our %unified_info = ( "doc/man/man3/X509V3_get_d2i.3", "doc/man/man3/X509V3_set_ctx.3", "doc/man/man3/X509_ALGOR_dup.3", - "doc/man/man3/X509_ATTRIBUTE.3", "doc/man/man3/X509_CRL_get0_by_serial.3", "doc/man/man3/X509_EXTENSION_set_object.3", "doc/man/man3/X509_LOOKUP.3", @@ -20074,8 +19941,6 @@ our %unified_info = ( "doc/man/man3/X509_NAME_get_index_by_NID.3", "doc/man/man3/X509_NAME_print_ex.3", "doc/man/man3/X509_PUBKEY_new.3", - "doc/man/man3/X509_REQ_get_attr.3", - "doc/man/man3/X509_REQ_get_extensions.3", "doc/man/man3/X509_SIG_get0.3", "doc/man/man3/X509_STORE_CTX_get_error.3", "doc/man/man3/X509_STORE_CTX_new.3", @@ -20259,7 +20124,6 @@ our %unified_info = ( "modules" => [ "providers/fips", "providers/legacy", - "test/p_minimal", "test/p_test" ], "programs" => [ @@ -20285,7 +20149,6 @@ our %unified_info = ( "test/asn1_dsa_internal_test", "test/asn1_encode_test", "test/asn1_internal_test", - "test/asn1_stable_parse_test", "test/asn1_string_table_test", "test/asn1_time_test", "test/asynciotest", @@ -20349,7 +20212,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24562,7 +24424,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24589,7 +24450,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -24691,9 +24551,6 @@ our %unified_info = ( "providers/common/libfips-lib-securitycheck_fips.o" => [ "providers/common/securitycheck_fips.c" ], - "providers/evp_extra_test-bin-legacyprov.o" => [ - "providers/legacyprov.c" - ], "providers/fips" => [ "providers/fips-dso-fips.res", "providers/fips.ld", @@ -25848,9 +25705,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25932,9 +25786,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25992,12 +25843,6 @@ our %unified_info = ( "test/asn1_internal_test-bin-asn1_internal_test.o" => [ "test/asn1_internal_test.c" ], - "test/asn1_stable_parse_test" => [ - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" - ], - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" => [ - "test/asn1_stable_parse_test.c" - ], "test/asn1_string_table_test" => [ "test/asn1_string_table_test-bin-asn1_string_table_test.o" ], @@ -26377,12 +26222,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -26781,7 +26620,6 @@ our %unified_info = ( "test/errtest.c" ], "test/evp_extra_test" => [ - "providers/evp_extra_test-bin-legacyprov.o", "test/evp_extra_test-bin-evp_extra_test.o" ], "test/evp_extra_test-bin-evp_extra_test.o" => [ @@ -27073,13 +26911,6 @@ our %unified_info = ( "test/ossl_store_test-bin-ossl_store_test.o" => [ "test/ossl_store_test.c" ], - "test/p_minimal" => [ - "test/p_minimal-dso-p_minimal.o", - "test/p_minimal.ld" - ], - "test/p_minimal-dso-p_minimal.o" => [ - "test/p_minimal.c" - ], "test/p_test" => [ "test/p_test-dso-p_test.o", "test/p_test.ld" @@ -27763,8 +27594,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27791,7 +27622,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27808,8 +27639,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/VC-WIN32/asm/crypto/bf/bf-586.asm b/deps/openssl/config/archs/VC-WIN32/asm/crypto/bf/bf-586.asm index c6653e1ef..5ded70a4b 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm/crypto/bf/bf-586.asm +++ b/deps/openssl/config/archs/VC-WIN32/asm/crypto/bf/bf-586.asm @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e168e085733c99f35f78ac1eb4f3e9df7b57b09421d07bff628f8db764e5013a +oid sha256:51f3f0f4739513744f8f600d6af79e923d21423866380b17ef991284744e1aa7 size 15347 diff --git a/deps/openssl/config/archs/VC-WIN32/asm/crypto/buildinf.h b/deps/openssl/config/archs/VC-WIN32/asm/crypto/buildinf.h index bdcc1602d..0ebaa35bc 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/VC-WIN32/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: " -#define DATE "built on: Wed Jan 31 13:07:51 2024 UTC" +#define DATE "built on: Tue Aug 6 12:30:07 2024 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/VC-WIN32/asm/crypto/des/des-586.asm b/deps/openssl/config/archs/VC-WIN32/asm/crypto/des/des-586.asm index 2d6d78683..b75706bf9 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm/crypto/des/des-586.asm +++ b/deps/openssl/config/archs/VC-WIN32/asm/crypto/des/des-586.asm @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f84d28b1d034abebd4d544a523567a94cba7642ed02dbbf2d0ccf744bff00f9c +oid sha256:13762507aebf85544d32847a958aed672447c0abeac71d0a450e3d961aecaff7 size 35501 diff --git a/deps/openssl/config/archs/VC-WIN32/asm/include/openssl/bio.h b/deps/openssl/config/archs/VC-WIN32/asm/include/openssl/bio.h index d094af47b..6ac2c7865 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/VC-WIN32/asm/include/openssl/bio.h @@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, - int (*ossl_gets) (BIO *, char *, int)); + int (*gets) (BIO *, char *, int)); long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); diff --git a/deps/openssl/config/archs/VC-WIN32/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/VC-WIN32/asm/include/openssl/opensslv.h index 61260779a..43ccbfff1 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/VC-WIN32/asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 13 +# define OPENSSL_VERSION_PATCH 9 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.13" -# define OPENSSL_FULL_VERSION_STR "3.0.13+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "30 Jan 2024" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13+quic 30 Jan 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/VC-WIN32/asm/include/openssl/pkcs7.h b/deps/openssl/config/archs/VC-WIN32/asm/include/openssl/pkcs7.h index 0a95a93e5..3978fd087 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm/include/openssl/pkcs7.h +++ b/deps/openssl/config/archs/VC-WIN32/asm/include/openssl/pkcs7.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by makefile from include/openssl/pkcs7.h.in * - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -56,8 +56,8 @@ typedef struct pkcs7_signer_info_st { PKCS7_ISSUER_AND_SERIAL *issuer_and_serial; X509_ALGOR *digest_alg; STACK_OF(X509_ATTRIBUTE) *auth_attr; /* [ 0 ] */ - X509_ALGOR *digest_enc_alg; /* confusing name, actually used for signing */ - ASN1_OCTET_STRING *enc_digest; /* confusing name, actually signature */ + X509_ALGOR *digest_enc_alg; + ASN1_OCTET_STRING *enc_digest; STACK_OF(X509_ATTRIBUTE) *unauth_attr; /* [ 1 ] */ /* The private key to sign with */ EVP_PKEY *pkey; diff --git a/deps/openssl/config/archs/VC-WIN32/asm/include/openssl/ssl.h b/deps/openssl/config/archs/VC-WIN32/asm/include/openssl/ssl.h index 9712ae165..7e9ca09bb 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/VC-WIN32/asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/VC-WIN32/asm/openssl-cl.gypi b/deps/openssl/config/archs/VC-WIN32/asm/openssl-cl.gypi index b0f6b78e5..8f32c2e84 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm/openssl-cl.gypi +++ b/deps/openssl/config/archs/VC-WIN32/asm/openssl-cl.gypi @@ -22,7 +22,6 @@ 'OPENSSL_IA32_SSE2', 'PADLOCK_ASM', 'POLY1305_ASM', - 'RC4_ASM', 'RMD160_ASM', 'SHA1_ASM', 'SHA256_ASM', diff --git a/deps/openssl/config/archs/VC-WIN32/asm/openssl.gypi b/deps/openssl/config/archs/VC-WIN32/asm/openssl.gypi index 7a415cb3d..41462bf7f 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm/openssl.gypi +++ b/deps/openssl/config/archs/VC-WIN32/asm/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cfb.c', 'openssl/crypto/aes/aes_ecb.c', @@ -995,7 +993,6 @@ 'OPENSSL_IA32_SSE2', 'PADLOCK_ASM', 'POLY1305_ASM', - 'RC4_ASM', 'RMD160_ASM', 'SHA1_ASM', 'SHA256_ASM', diff --git a/deps/openssl/config/archs/VC-WIN32/asm_avx2/configdata.pm b/deps/openssl/config/archs/VC-WIN32/asm_avx2/configdata.pm index 9585418f7..a888e01c7 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/VC-WIN32/asm_avx2/configdata.pm @@ -148,7 +148,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -165,7 +165,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.13+quic", + "full_version" => "3.0.9", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -216,7 +216,7 @@ our %config = ( ], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "13", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -268,11 +268,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "30 Jan 2024", - "shlib_version" => "81.3", + "release_date" => "30 May 2023", + "shlib_version" => "3", "sourcedir" => ".", "target" => "VC-WIN32", - "version" => "3.0.13" + "version" => "3.0.9" ); our %target = ( "AR" => "lib", @@ -287,7 +287,7 @@ our %target = ( "LDFLAGS" => "/nologo /debug", "MT" => "mt", "MTFLAGS" => "-nologo", - "RANLIB" => "CODE(0x564719267e28)", + "RANLIB" => "CODE(0x55660c742768)", "RC" => "rc", "_conf_fname_int" => [ "Configurations/00-base-templates.conf", @@ -436,7 +436,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -832,9 +831,6 @@ our %unified_info = ( "providers/fips" => { "fips" => "1" }, - "test/p_minimal" => { - "noinst" => "1" - }, "test/p_test" => { "noinst" => "1" } @@ -903,9 +899,6 @@ our %unified_info = ( "test/asn1_internal_test" => { "noinst" => "1" }, - "test/asn1_stable_parse_test" => { - "noinst" => "1" - }, "test/asn1_string_table_test" => { "noinst" => "1" }, @@ -1095,9 +1088,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -1650,7 +1640,6 @@ our %unified_info = ( "OPENSSL_IA32_SSE2", "PADLOCK_ASM", "POLY1305_ASM", - "RC4_ASM", "RMD160_ASM", "SHA1_ASM", "SHA256_ASM", @@ -1698,11 +1687,7 @@ our %unified_info = ( "VPAES_ASM" ], "providers/liblegacy.a" => [ - "MD5_ASM", - "RC4_ASM" - ], - "test/evp_extra_test" => [ - "STATIC_LEGACY" + "MD5_ASM" ], "test/provider_internal_test" => [ "PROVIDER_INIT_FUNCTION_NAME=p_test_init" @@ -2457,9 +2442,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -2757,9 +2739,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -3528,9 +3507,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -3825,9 +3801,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -3861,12 +3834,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -4851,9 +4818,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -5151,9 +5115,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -5922,9 +5883,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -6219,9 +6177,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -6255,12 +6210,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -7264,10 +7213,6 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], - "test/asn1_stable_parse_test" => [ - "libcrypto", - "test/libtestutil.a" - ], "test/asn1_string_table_test" => [ "libcrypto", "test/libtestutil.a" @@ -7521,10 +7466,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -7790,8 +7731,6 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "libcrypto.a", - "providers/libcommon.a", - "providers/liblegacy.a", "test/libtestutil.a" ], "test/evp_extra_test2" => [ @@ -9879,7 +9818,6 @@ our %unified_info = ( }, "providers" => { "deps" => [ - "providers/evp_extra_test-bin-legacyprov.o", "providers/libcrypto-lib-baseprov.o", "providers/libcrypto-lib-defltprov.o", "providers/libcrypto-lib-nullprov.o", @@ -9887,9 +9825,6 @@ our %unified_info = ( "providers/libdefault.a" ], "products" => { - "bin" => [ - "test/evp_extra_test" - ], "dso" => [ "providers/fips", "providers/legacy" @@ -10326,7 +10261,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10377,7 +10311,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -11512,9 +11445,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -11812,9 +11742,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -12583,9 +12510,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -12880,9 +12804,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -12916,12 +12837,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -13906,9 +13821,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -14206,9 +14118,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -14977,9 +14886,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -15274,9 +15180,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -15310,12 +15213,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -16360,10 +16257,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16440,9 +16333,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "whrlpool" ], - "test/p_minimal.ld" => [ - "util/providers.num" - ], "test/p_test.ld" => [ "util/providers.num" ], @@ -16608,7 +16498,6 @@ our %unified_info = ( "doc/html/man3/CMS_get1_ReceiptRequest.html", "doc/html/man3/CMS_sign.html", "doc/html/man3/CMS_sign_receipt.html", - "doc/html/man3/CMS_signed_get_attr.html", "doc/html/man3/CMS_uncompress.html", "doc/html/man3/CMS_verify.html", "doc/html/man3/CMS_verify_receipt.html", @@ -16708,7 +16597,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_encapsulate.html", "doc/html/man3/EVP_PKEY_encrypt.html", "doc/html/man3/EVP_PKEY_fromdata.html", - "doc/html/man3/EVP_PKEY_get_attr.html", "doc/html/man3/EVP_PKEY_get_default_digest_nid.html", "doc/html/man3/EVP_PKEY_get_field_type.html", "doc/html/man3/EVP_PKEY_get_group_name.html", @@ -16965,7 +16853,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -17064,7 +16951,6 @@ our %unified_info = ( "doc/html/man3/X509V3_get_d2i.html", "doc/html/man3/X509V3_set_ctx.html", "doc/html/man3/X509_ALGOR_dup.html", - "doc/html/man3/X509_ATTRIBUTE.html", "doc/html/man3/X509_CRL_get0_by_serial.html", "doc/html/man3/X509_EXTENSION_set_object.html", "doc/html/man3/X509_LOOKUP.html", @@ -17076,8 +16962,6 @@ our %unified_info = ( "doc/html/man3/X509_NAME_get_index_by_NID.html", "doc/html/man3/X509_NAME_print_ex.html", "doc/html/man3/X509_PUBKEY_new.html", - "doc/html/man3/X509_REQ_get_attr.html", - "doc/html/man3/X509_REQ_get_extensions.html", "doc/html/man3/X509_SIG_get0.html", "doc/html/man3/X509_STORE_CTX_get_error.html", "doc/html/man3/X509_STORE_CTX_new.html", @@ -18381,10 +18265,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/asn1_stable_parse_test" => [ - "include", - "apps/include" - ], "test/asn1_string_table_test" => [ "include", "apps/include" @@ -18592,9 +18472,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -18854,9 +18731,7 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "include", - "apps/include", - "providers/common/include", - "providers/implementations/include" + "apps/include" ], "test/evp_extra_test2" => [ "include", @@ -19113,10 +18988,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/p_minimal" => [ - "include", - "." - ], "test/p_test" => [ "include", "." @@ -19606,7 +19477,6 @@ our %unified_info = ( "doc/man/man3/CMS_get1_ReceiptRequest.3", "doc/man/man3/CMS_sign.3", "doc/man/man3/CMS_sign_receipt.3", - "doc/man/man3/CMS_signed_get_attr.3", "doc/man/man3/CMS_uncompress.3", "doc/man/man3/CMS_verify.3", "doc/man/man3/CMS_verify_receipt.3", @@ -19706,7 +19576,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_encapsulate.3", "doc/man/man3/EVP_PKEY_encrypt.3", "doc/man/man3/EVP_PKEY_fromdata.3", - "doc/man/man3/EVP_PKEY_get_attr.3", "doc/man/man3/EVP_PKEY_get_default_digest_nid.3", "doc/man/man3/EVP_PKEY_get_field_type.3", "doc/man/man3/EVP_PKEY_get_group_name.3", @@ -19963,7 +19832,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20062,7 +19930,6 @@ our %unified_info = ( "doc/man/man3/X509V3_get_d2i.3", "doc/man/man3/X509V3_set_ctx.3", "doc/man/man3/X509_ALGOR_dup.3", - "doc/man/man3/X509_ATTRIBUTE.3", "doc/man/man3/X509_CRL_get0_by_serial.3", "doc/man/man3/X509_EXTENSION_set_object.3", "doc/man/man3/X509_LOOKUP.3", @@ -20074,8 +19941,6 @@ our %unified_info = ( "doc/man/man3/X509_NAME_get_index_by_NID.3", "doc/man/man3/X509_NAME_print_ex.3", "doc/man/man3/X509_PUBKEY_new.3", - "doc/man/man3/X509_REQ_get_attr.3", - "doc/man/man3/X509_REQ_get_extensions.3", "doc/man/man3/X509_SIG_get0.3", "doc/man/man3/X509_STORE_CTX_get_error.3", "doc/man/man3/X509_STORE_CTX_new.3", @@ -20259,7 +20124,6 @@ our %unified_info = ( "modules" => [ "providers/fips", "providers/legacy", - "test/p_minimal", "test/p_test" ], "programs" => [ @@ -20285,7 +20149,6 @@ our %unified_info = ( "test/asn1_dsa_internal_test", "test/asn1_encode_test", "test/asn1_internal_test", - "test/asn1_stable_parse_test", "test/asn1_string_table_test", "test/asn1_time_test", "test/asynciotest", @@ -20349,7 +20212,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24562,7 +24424,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24589,7 +24450,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -24691,9 +24551,6 @@ our %unified_info = ( "providers/common/libfips-lib-securitycheck_fips.o" => [ "providers/common/securitycheck_fips.c" ], - "providers/evp_extra_test-bin-legacyprov.o" => [ - "providers/legacyprov.c" - ], "providers/fips" => [ "providers/fips-dso-fips.res", "providers/fips.ld", @@ -25848,9 +25705,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25932,9 +25786,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25992,12 +25843,6 @@ our %unified_info = ( "test/asn1_internal_test-bin-asn1_internal_test.o" => [ "test/asn1_internal_test.c" ], - "test/asn1_stable_parse_test" => [ - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" - ], - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" => [ - "test/asn1_stable_parse_test.c" - ], "test/asn1_string_table_test" => [ "test/asn1_string_table_test-bin-asn1_string_table_test.o" ], @@ -26377,12 +26222,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -26781,7 +26620,6 @@ our %unified_info = ( "test/errtest.c" ], "test/evp_extra_test" => [ - "providers/evp_extra_test-bin-legacyprov.o", "test/evp_extra_test-bin-evp_extra_test.o" ], "test/evp_extra_test-bin-evp_extra_test.o" => [ @@ -27073,13 +26911,6 @@ our %unified_info = ( "test/ossl_store_test-bin-ossl_store_test.o" => [ "test/ossl_store_test.c" ], - "test/p_minimal" => [ - "test/p_minimal-dso-p_minimal.o", - "test/p_minimal.ld" - ], - "test/p_minimal-dso-p_minimal.o" => [ - "test/p_minimal.c" - ], "test/p_test" => [ "test/p_test-dso-p_test.o", "test/p_test.ld" @@ -27763,8 +27594,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27791,7 +27622,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27808,8 +27639,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/bf/bf-586.asm b/deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/bf/bf-586.asm index c6653e1ef..5ded70a4b 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/bf/bf-586.asm +++ b/deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/bf/bf-586.asm @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e168e085733c99f35f78ac1eb4f3e9df7b57b09421d07bff628f8db764e5013a +oid sha256:51f3f0f4739513744f8f600d6af79e923d21423866380b17ef991284744e1aa7 size 15347 diff --git a/deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/buildinf.h index 71f6defc1..86c80fda3 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: " -#define DATE "built on: Wed Jan 31 13:08:03 2024 UTC" +#define DATE "built on: Tue Aug 6 12:30:18 2024 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/des/des-586.asm b/deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/des/des-586.asm index 2d6d78683..b75706bf9 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/des/des-586.asm +++ b/deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/des/des-586.asm @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f84d28b1d034abebd4d544a523567a94cba7642ed02dbbf2d0ccf744bff00f9c +oid sha256:13762507aebf85544d32847a958aed672447c0abeac71d0a450e3d961aecaff7 size 35501 diff --git a/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/openssl/bio.h b/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/openssl/bio.h index d094af47b..6ac2c7865 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/openssl/bio.h +++ b/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/openssl/bio.h @@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, - int (*ossl_gets) (BIO *, char *, int)); + int (*gets) (BIO *, char *, int)); long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); diff --git a/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/openssl/opensslv.h index 61260779a..43ccbfff1 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 13 +# define OPENSSL_VERSION_PATCH 9 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.13" -# define OPENSSL_FULL_VERSION_STR "3.0.13+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "30 Jan 2024" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13+quic 30 Jan 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/openssl/pkcs7.h b/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/openssl/pkcs7.h index 0a95a93e5..3978fd087 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/openssl/pkcs7.h +++ b/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/openssl/pkcs7.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by makefile from include/openssl/pkcs7.h.in * - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -56,8 +56,8 @@ typedef struct pkcs7_signer_info_st { PKCS7_ISSUER_AND_SERIAL *issuer_and_serial; X509_ALGOR *digest_alg; STACK_OF(X509_ATTRIBUTE) *auth_attr; /* [ 0 ] */ - X509_ALGOR *digest_enc_alg; /* confusing name, actually used for signing */ - ASN1_OCTET_STRING *enc_digest; /* confusing name, actually signature */ + X509_ALGOR *digest_enc_alg; + ASN1_OCTET_STRING *enc_digest; STACK_OF(X509_ATTRIBUTE) *unauth_attr; /* [ 1 ] */ /* The private key to sign with */ EVP_PKEY *pkey; diff --git a/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/openssl/ssl.h index 9712ae165..7e9ca09bb 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/openssl/ssl.h +++ b/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/VC-WIN32/asm_avx2/openssl-cl.gypi b/deps/openssl/config/archs/VC-WIN32/asm_avx2/openssl-cl.gypi index 487571baf..adeaadc5e 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm_avx2/openssl-cl.gypi +++ b/deps/openssl/config/archs/VC-WIN32/asm_avx2/openssl-cl.gypi @@ -22,7 +22,6 @@ 'OPENSSL_IA32_SSE2', 'PADLOCK_ASM', 'POLY1305_ASM', - 'RC4_ASM', 'RMD160_ASM', 'SHA1_ASM', 'SHA256_ASM', diff --git a/deps/openssl/config/archs/VC-WIN32/asm_avx2/openssl.gypi b/deps/openssl/config/archs/VC-WIN32/asm_avx2/openssl.gypi index 0eb291c5b..8040307c2 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/VC-WIN32/asm_avx2/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cfb.c', 'openssl/crypto/aes/aes_ecb.c', @@ -995,7 +993,6 @@ 'OPENSSL_IA32_SSE2', 'PADLOCK_ASM', 'POLY1305_ASM', - 'RC4_ASM', 'RMD160_ASM', 'SHA1_ASM', 'SHA256_ASM', diff --git a/deps/openssl/config/archs/VC-WIN32/no-asm/configdata.pm b/deps/openssl/config/archs/VC-WIN32/no-asm/configdata.pm index e5fcaa06b..d84395961 100644 --- a/deps/openssl/config/archs/VC-WIN32/no-asm/configdata.pm +++ b/deps/openssl/config/archs/VC-WIN32/no-asm/configdata.pm @@ -148,7 +148,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [], @@ -163,7 +163,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.13+quic", + "full_version" => "3.0.9", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -215,7 +215,7 @@ our %config = ( ], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "13", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -268,11 +268,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "30 Jan 2024", - "shlib_version" => "81.3", + "release_date" => "30 May 2023", + "shlib_version" => "3", "sourcedir" => ".", "target" => "VC-WIN32", - "version" => "3.0.13" + "version" => "3.0.9" ); our %target = ( "AR" => "lib", @@ -287,7 +287,7 @@ our %target = ( "LDFLAGS" => "/nologo /debug", "MT" => "mt", "MTFLAGS" => "-nologo", - "RANLIB" => "CODE(0x5571e27ca240)", + "RANLIB" => "CODE(0x55afb7494968)", "RC" => "rc", "_conf_fname_int" => [ "Configurations/00-base-templates.conf", @@ -436,7 +436,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -833,9 +832,6 @@ our %unified_info = ( "providers/fips" => { "fips" => "1" }, - "test/p_minimal" => { - "noinst" => "1" - }, "test/p_test" => { "noinst" => "1" } @@ -904,9 +900,6 @@ our %unified_info = ( "test/asn1_internal_test" => { "noinst" => "1" }, - "test/asn1_stable_parse_test" => { - "noinst" => "1" - }, "test/asn1_string_table_test" => { "noinst" => "1" }, @@ -1096,9 +1089,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -1643,9 +1633,6 @@ our %unified_info = ( "providers/libfips.a" => [ "FIPS_MODULE" ], - "test/evp_extra_test" => [ - "STATIC_LEGACY" - ], "test/provider_internal_test" => [ "PROVIDER_INIT_FUNCTION_NAME=p_test_init" ], @@ -2399,9 +2386,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -2699,9 +2683,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -3470,9 +3451,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -3767,9 +3745,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -3803,12 +3778,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -4793,9 +4762,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -5093,9 +5059,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -5864,9 +5827,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -6161,9 +6121,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -6197,12 +6154,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -7206,10 +7157,6 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], - "test/asn1_stable_parse_test" => [ - "libcrypto", - "test/libtestutil.a" - ], "test/asn1_string_table_test" => [ "libcrypto", "test/libtestutil.a" @@ -7463,10 +7410,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -7732,8 +7675,6 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "libcrypto.a", - "providers/libcommon.a", - "providers/liblegacy.a", "test/libtestutil.a" ], "test/evp_extra_test2" => [ @@ -9799,7 +9740,6 @@ our %unified_info = ( }, "providers" => { "deps" => [ - "providers/evp_extra_test-bin-legacyprov.o", "providers/libcrypto-lib-baseprov.o", "providers/libcrypto-lib-defltprov.o", "providers/libcrypto-lib-nullprov.o", @@ -9807,9 +9747,6 @@ our %unified_info = ( "providers/libdefault.a" ], "products" => { - "bin" => [ - "test/evp_extra_test" - ], "dso" => [ "providers/fips", "providers/legacy" @@ -10246,7 +10183,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10297,7 +10233,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -11432,9 +11367,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -11732,9 +11664,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -12503,9 +12432,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -12800,9 +12726,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -12836,12 +12759,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -13826,9 +13743,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -14126,9 +14040,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -14897,9 +14808,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -15194,9 +15102,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -15230,12 +15135,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -16280,10 +16179,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16360,9 +16255,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "whrlpool" ], - "test/p_minimal.ld" => [ - "util/providers.num" - ], "test/p_test.ld" => [ "util/providers.num" ], @@ -16528,7 +16420,6 @@ our %unified_info = ( "doc/html/man3/CMS_get1_ReceiptRequest.html", "doc/html/man3/CMS_sign.html", "doc/html/man3/CMS_sign_receipt.html", - "doc/html/man3/CMS_signed_get_attr.html", "doc/html/man3/CMS_uncompress.html", "doc/html/man3/CMS_verify.html", "doc/html/man3/CMS_verify_receipt.html", @@ -16628,7 +16519,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_encapsulate.html", "doc/html/man3/EVP_PKEY_encrypt.html", "doc/html/man3/EVP_PKEY_fromdata.html", - "doc/html/man3/EVP_PKEY_get_attr.html", "doc/html/man3/EVP_PKEY_get_default_digest_nid.html", "doc/html/man3/EVP_PKEY_get_field_type.html", "doc/html/man3/EVP_PKEY_get_group_name.html", @@ -16885,7 +16775,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -16984,7 +16873,6 @@ our %unified_info = ( "doc/html/man3/X509V3_get_d2i.html", "doc/html/man3/X509V3_set_ctx.html", "doc/html/man3/X509_ALGOR_dup.html", - "doc/html/man3/X509_ATTRIBUTE.html", "doc/html/man3/X509_CRL_get0_by_serial.html", "doc/html/man3/X509_EXTENSION_set_object.html", "doc/html/man3/X509_LOOKUP.html", @@ -16996,8 +16884,6 @@ our %unified_info = ( "doc/html/man3/X509_NAME_get_index_by_NID.html", "doc/html/man3/X509_NAME_print_ex.html", "doc/html/man3/X509_PUBKEY_new.html", - "doc/html/man3/X509_REQ_get_attr.html", - "doc/html/man3/X509_REQ_get_extensions.html", "doc/html/man3/X509_SIG_get0.html", "doc/html/man3/X509_STORE_CTX_get_error.html", "doc/html/man3/X509_STORE_CTX_new.html", @@ -18301,10 +18187,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/asn1_stable_parse_test" => [ - "include", - "apps/include" - ], "test/asn1_string_table_test" => [ "include", "apps/include" @@ -18512,9 +18394,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -18774,9 +18653,7 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "include", - "apps/include", - "providers/common/include", - "providers/implementations/include" + "apps/include" ], "test/evp_extra_test2" => [ "include", @@ -19033,10 +18910,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/p_minimal" => [ - "include", - "." - ], "test/p_test" => [ "include", "." @@ -19526,7 +19399,6 @@ our %unified_info = ( "doc/man/man3/CMS_get1_ReceiptRequest.3", "doc/man/man3/CMS_sign.3", "doc/man/man3/CMS_sign_receipt.3", - "doc/man/man3/CMS_signed_get_attr.3", "doc/man/man3/CMS_uncompress.3", "doc/man/man3/CMS_verify.3", "doc/man/man3/CMS_verify_receipt.3", @@ -19626,7 +19498,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_encapsulate.3", "doc/man/man3/EVP_PKEY_encrypt.3", "doc/man/man3/EVP_PKEY_fromdata.3", - "doc/man/man3/EVP_PKEY_get_attr.3", "doc/man/man3/EVP_PKEY_get_default_digest_nid.3", "doc/man/man3/EVP_PKEY_get_field_type.3", "doc/man/man3/EVP_PKEY_get_group_name.3", @@ -19883,7 +19754,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -19982,7 +19852,6 @@ our %unified_info = ( "doc/man/man3/X509V3_get_d2i.3", "doc/man/man3/X509V3_set_ctx.3", "doc/man/man3/X509_ALGOR_dup.3", - "doc/man/man3/X509_ATTRIBUTE.3", "doc/man/man3/X509_CRL_get0_by_serial.3", "doc/man/man3/X509_EXTENSION_set_object.3", "doc/man/man3/X509_LOOKUP.3", @@ -19994,8 +19863,6 @@ our %unified_info = ( "doc/man/man3/X509_NAME_get_index_by_NID.3", "doc/man/man3/X509_NAME_print_ex.3", "doc/man/man3/X509_PUBKEY_new.3", - "doc/man/man3/X509_REQ_get_attr.3", - "doc/man/man3/X509_REQ_get_extensions.3", "doc/man/man3/X509_SIG_get0.3", "doc/man/man3/X509_STORE_CTX_get_error.3", "doc/man/man3/X509_STORE_CTX_new.3", @@ -20179,7 +20046,6 @@ our %unified_info = ( "modules" => [ "providers/fips", "providers/legacy", - "test/p_minimal", "test/p_test" ], "programs" => [ @@ -20205,7 +20071,6 @@ our %unified_info = ( "test/asn1_dsa_internal_test", "test/asn1_encode_test", "test/asn1_internal_test", - "test/asn1_stable_parse_test", "test/asn1_string_table_test", "test/asn1_time_test", "test/asynciotest", @@ -20269,7 +20134,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24404,7 +24268,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24431,7 +24294,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -24533,9 +24395,6 @@ our %unified_info = ( "providers/common/libfips-lib-securitycheck_fips.o" => [ "providers/common/securitycheck_fips.c" ], - "providers/evp_extra_test-bin-legacyprov.o" => [ - "providers/legacyprov.c" - ], "providers/fips" => [ "providers/fips-dso-fips.res", "providers/fips.ld", @@ -25680,9 +25539,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25764,9 +25620,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25824,12 +25677,6 @@ our %unified_info = ( "test/asn1_internal_test-bin-asn1_internal_test.o" => [ "test/asn1_internal_test.c" ], - "test/asn1_stable_parse_test" => [ - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" - ], - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" => [ - "test/asn1_stable_parse_test.c" - ], "test/asn1_string_table_test" => [ "test/asn1_string_table_test-bin-asn1_string_table_test.o" ], @@ -26209,12 +26056,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -26613,7 +26454,6 @@ our %unified_info = ( "test/errtest.c" ], "test/evp_extra_test" => [ - "providers/evp_extra_test-bin-legacyprov.o", "test/evp_extra_test-bin-evp_extra_test.o" ], "test/evp_extra_test-bin-evp_extra_test.o" => [ @@ -26905,13 +26745,6 @@ our %unified_info = ( "test/ossl_store_test-bin-ossl_store_test.o" => [ "test/ossl_store_test.c" ], - "test/p_minimal" => [ - "test/p_minimal-dso-p_minimal.o", - "test/p_minimal.ld" - ], - "test/p_minimal-dso-p_minimal.o" => [ - "test/p_minimal.c" - ], "test/p_test" => [ "test/p_test-dso-p_test.o", "test/p_test.ld" @@ -27598,8 +27431,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27626,7 +27459,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27643,8 +27476,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/VC-WIN32/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/VC-WIN32/no-asm/crypto/buildinf.h index 6a3750ca2..bf2ad48b3 100644 --- a/deps/openssl/config/archs/VC-WIN32/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/VC-WIN32/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: " -#define DATE "built on: Wed Jan 31 13:08:15 2024 UTC" +#define DATE "built on: Tue Aug 6 12:30:29 2024 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/VC-WIN32/no-asm/include/openssl/bio.h b/deps/openssl/config/archs/VC-WIN32/no-asm/include/openssl/bio.h index d094af47b..6ac2c7865 100644 --- a/deps/openssl/config/archs/VC-WIN32/no-asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/VC-WIN32/no-asm/include/openssl/bio.h @@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, - int (*ossl_gets) (BIO *, char *, int)); + int (*gets) (BIO *, char *, int)); long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); diff --git a/deps/openssl/config/archs/VC-WIN32/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/VC-WIN32/no-asm/include/openssl/opensslv.h index 61260779a..43ccbfff1 100644 --- a/deps/openssl/config/archs/VC-WIN32/no-asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/VC-WIN32/no-asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 13 +# define OPENSSL_VERSION_PATCH 9 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.13" -# define OPENSSL_FULL_VERSION_STR "3.0.13+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "30 Jan 2024" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13+quic 30 Jan 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/VC-WIN32/no-asm/include/openssl/pkcs7.h b/deps/openssl/config/archs/VC-WIN32/no-asm/include/openssl/pkcs7.h index 0a95a93e5..3978fd087 100644 --- a/deps/openssl/config/archs/VC-WIN32/no-asm/include/openssl/pkcs7.h +++ b/deps/openssl/config/archs/VC-WIN32/no-asm/include/openssl/pkcs7.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by makefile from include/openssl/pkcs7.h.in * - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -56,8 +56,8 @@ typedef struct pkcs7_signer_info_st { PKCS7_ISSUER_AND_SERIAL *issuer_and_serial; X509_ALGOR *digest_alg; STACK_OF(X509_ATTRIBUTE) *auth_attr; /* [ 0 ] */ - X509_ALGOR *digest_enc_alg; /* confusing name, actually used for signing */ - ASN1_OCTET_STRING *enc_digest; /* confusing name, actually signature */ + X509_ALGOR *digest_enc_alg; + ASN1_OCTET_STRING *enc_digest; STACK_OF(X509_ATTRIBUTE) *unauth_attr; /* [ 1 ] */ /* The private key to sign with */ EVP_PKEY *pkey; diff --git a/deps/openssl/config/archs/VC-WIN32/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/VC-WIN32/no-asm/include/openssl/ssl.h index 9712ae165..7e9ca09bb 100644 --- a/deps/openssl/config/archs/VC-WIN32/no-asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/VC-WIN32/no-asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/VC-WIN32/no-asm/openssl.gypi b/deps/openssl/config/archs/VC-WIN32/no-asm/openssl.gypi index c4e4b169a..72b9b35f5 100644 --- a/deps/openssl/config/archs/VC-WIN32/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/VC-WIN32/no-asm/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cbc.c', 'openssl/crypto/aes/aes_cfb.c', diff --git a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/configdata.pm b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/configdata.pm index f0d251945..3f484dad5 100644 --- a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/configdata.pm +++ b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/configdata.pm @@ -147,7 +147,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [], @@ -163,7 +163,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.13+quic", + "full_version" => "3.0.9", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -213,7 +213,7 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "13", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -266,11 +266,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "30 Jan 2024", - "shlib_version" => "81.3", + "release_date" => "30 May 2023", + "shlib_version" => "3", "sourcedir" => ".", "target" => "VC-WIN64-ARM", - "version" => "3.0.13" + "version" => "3.0.9" ); our %target = ( "AR" => "lib", @@ -283,7 +283,7 @@ our %target = ( "LDFLAGS" => "/nologo /debug", "MT" => "mt", "MTFLAGS" => "-nologo", - "RANLIB" => "CODE(0x55d9bc8048e0)", + "RANLIB" => "CODE(0x564408abfa38)", "RC" => "rc", "_conf_fname_int" => [ "Configurations/00-base-templates.conf", @@ -428,7 +428,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -825,9 +824,6 @@ our %unified_info = ( "providers/fips" => { "fips" => "1" }, - "test/p_minimal" => { - "noinst" => "1" - }, "test/p_test" => { "noinst" => "1" } @@ -896,9 +892,6 @@ our %unified_info = ( "test/asn1_internal_test" => { "noinst" => "1" }, - "test/asn1_stable_parse_test" => { - "noinst" => "1" - }, "test/asn1_string_table_test" => { "noinst" => "1" }, @@ -1088,9 +1081,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -1635,9 +1625,6 @@ our %unified_info = ( "providers/libfips.a" => [ "FIPS_MODULE" ], - "test/evp_extra_test" => [ - "STATIC_LEGACY" - ], "test/provider_internal_test" => [ "PROVIDER_INIT_FUNCTION_NAME=p_test_init" ], @@ -2391,9 +2378,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -2691,9 +2675,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -3462,9 +3443,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -3759,9 +3737,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -3795,12 +3770,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -4785,9 +4754,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -5085,9 +5051,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -5856,9 +5819,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -6153,9 +6113,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -6189,12 +6146,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -7198,10 +7149,6 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], - "test/asn1_stable_parse_test" => [ - "libcrypto", - "test/libtestutil.a" - ], "test/asn1_string_table_test" => [ "libcrypto", "test/libtestutil.a" @@ -7455,10 +7402,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -7724,8 +7667,6 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "libcrypto.a", - "providers/libcommon.a", - "providers/liblegacy.a", "test/libtestutil.a" ], "test/evp_extra_test2" => [ @@ -9791,7 +9732,6 @@ our %unified_info = ( }, "providers" => { "deps" => [ - "providers/evp_extra_test-bin-legacyprov.o", "providers/libcrypto-lib-baseprov.o", "providers/libcrypto-lib-defltprov.o", "providers/libcrypto-lib-nullprov.o", @@ -9799,9 +9739,6 @@ our %unified_info = ( "providers/libdefault.a" ], "products" => { - "bin" => [ - "test/evp_extra_test" - ], "dso" => [ "providers/fips", "providers/legacy" @@ -10238,7 +10175,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10289,7 +10225,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -11424,9 +11359,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -11724,9 +11656,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -12495,9 +12424,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -12792,9 +12718,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -12828,12 +12751,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -13818,9 +13735,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -14118,9 +14032,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -14889,9 +14800,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -15186,9 +15094,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -15222,12 +15127,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -16272,10 +16171,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16352,9 +16247,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "whrlpool" ], - "test/p_minimal.ld" => [ - "util/providers.num" - ], "test/p_test.ld" => [ "util/providers.num" ], @@ -16520,7 +16412,6 @@ our %unified_info = ( "doc/html/man3/CMS_get1_ReceiptRequest.html", "doc/html/man3/CMS_sign.html", "doc/html/man3/CMS_sign_receipt.html", - "doc/html/man3/CMS_signed_get_attr.html", "doc/html/man3/CMS_uncompress.html", "doc/html/man3/CMS_verify.html", "doc/html/man3/CMS_verify_receipt.html", @@ -16620,7 +16511,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_encapsulate.html", "doc/html/man3/EVP_PKEY_encrypt.html", "doc/html/man3/EVP_PKEY_fromdata.html", - "doc/html/man3/EVP_PKEY_get_attr.html", "doc/html/man3/EVP_PKEY_get_default_digest_nid.html", "doc/html/man3/EVP_PKEY_get_field_type.html", "doc/html/man3/EVP_PKEY_get_group_name.html", @@ -16877,7 +16767,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -16976,7 +16865,6 @@ our %unified_info = ( "doc/html/man3/X509V3_get_d2i.html", "doc/html/man3/X509V3_set_ctx.html", "doc/html/man3/X509_ALGOR_dup.html", - "doc/html/man3/X509_ATTRIBUTE.html", "doc/html/man3/X509_CRL_get0_by_serial.html", "doc/html/man3/X509_EXTENSION_set_object.html", "doc/html/man3/X509_LOOKUP.html", @@ -16988,8 +16876,6 @@ our %unified_info = ( "doc/html/man3/X509_NAME_get_index_by_NID.html", "doc/html/man3/X509_NAME_print_ex.html", "doc/html/man3/X509_PUBKEY_new.html", - "doc/html/man3/X509_REQ_get_attr.html", - "doc/html/man3/X509_REQ_get_extensions.html", "doc/html/man3/X509_SIG_get0.html", "doc/html/man3/X509_STORE_CTX_get_error.html", "doc/html/man3/X509_STORE_CTX_new.html", @@ -18293,10 +18179,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/asn1_stable_parse_test" => [ - "include", - "apps/include" - ], "test/asn1_string_table_test" => [ "include", "apps/include" @@ -18504,9 +18386,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -18766,9 +18645,7 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "include", - "apps/include", - "providers/common/include", - "providers/implementations/include" + "apps/include" ], "test/evp_extra_test2" => [ "include", @@ -19025,10 +18902,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/p_minimal" => [ - "include", - "." - ], "test/p_test" => [ "include", "." @@ -19518,7 +19391,6 @@ our %unified_info = ( "doc/man/man3/CMS_get1_ReceiptRequest.3", "doc/man/man3/CMS_sign.3", "doc/man/man3/CMS_sign_receipt.3", - "doc/man/man3/CMS_signed_get_attr.3", "doc/man/man3/CMS_uncompress.3", "doc/man/man3/CMS_verify.3", "doc/man/man3/CMS_verify_receipt.3", @@ -19618,7 +19490,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_encapsulate.3", "doc/man/man3/EVP_PKEY_encrypt.3", "doc/man/man3/EVP_PKEY_fromdata.3", - "doc/man/man3/EVP_PKEY_get_attr.3", "doc/man/man3/EVP_PKEY_get_default_digest_nid.3", "doc/man/man3/EVP_PKEY_get_field_type.3", "doc/man/man3/EVP_PKEY_get_group_name.3", @@ -19875,7 +19746,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -19974,7 +19844,6 @@ our %unified_info = ( "doc/man/man3/X509V3_get_d2i.3", "doc/man/man3/X509V3_set_ctx.3", "doc/man/man3/X509_ALGOR_dup.3", - "doc/man/man3/X509_ATTRIBUTE.3", "doc/man/man3/X509_CRL_get0_by_serial.3", "doc/man/man3/X509_EXTENSION_set_object.3", "doc/man/man3/X509_LOOKUP.3", @@ -19986,8 +19855,6 @@ our %unified_info = ( "doc/man/man3/X509_NAME_get_index_by_NID.3", "doc/man/man3/X509_NAME_print_ex.3", "doc/man/man3/X509_PUBKEY_new.3", - "doc/man/man3/X509_REQ_get_attr.3", - "doc/man/man3/X509_REQ_get_extensions.3", "doc/man/man3/X509_SIG_get0.3", "doc/man/man3/X509_STORE_CTX_get_error.3", "doc/man/man3/X509_STORE_CTX_new.3", @@ -20171,7 +20038,6 @@ our %unified_info = ( "modules" => [ "providers/fips", "providers/legacy", - "test/p_minimal", "test/p_test" ], "programs" => [ @@ -20197,7 +20063,6 @@ our %unified_info = ( "test/asn1_dsa_internal_test", "test/asn1_encode_test", "test/asn1_internal_test", - "test/asn1_stable_parse_test", "test/asn1_string_table_test", "test/asn1_time_test", "test/asynciotest", @@ -20261,7 +20126,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24396,7 +24260,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24423,7 +24286,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -24525,9 +24387,6 @@ our %unified_info = ( "providers/common/libfips-lib-securitycheck_fips.o" => [ "providers/common/securitycheck_fips.c" ], - "providers/evp_extra_test-bin-legacyprov.o" => [ - "providers/legacyprov.c" - ], "providers/fips" => [ "providers/fips-dso-fips.res", "providers/fips.ld", @@ -25672,9 +25531,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25756,9 +25612,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25816,12 +25669,6 @@ our %unified_info = ( "test/asn1_internal_test-bin-asn1_internal_test.o" => [ "test/asn1_internal_test.c" ], - "test/asn1_stable_parse_test" => [ - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" - ], - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" => [ - "test/asn1_stable_parse_test.c" - ], "test/asn1_string_table_test" => [ "test/asn1_string_table_test-bin-asn1_string_table_test.o" ], @@ -26201,12 +26048,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -26605,7 +26446,6 @@ our %unified_info = ( "test/errtest.c" ], "test/evp_extra_test" => [ - "providers/evp_extra_test-bin-legacyprov.o", "test/evp_extra_test-bin-evp_extra_test.o" ], "test/evp_extra_test-bin-evp_extra_test.o" => [ @@ -26897,13 +26737,6 @@ our %unified_info = ( "test/ossl_store_test-bin-ossl_store_test.o" => [ "test/ossl_store_test.c" ], - "test/p_minimal" => [ - "test/p_minimal-dso-p_minimal.o", - "test/p_minimal.ld" - ], - "test/p_minimal-dso-p_minimal.o" => [ - "test/p_minimal.c" - ], "test/p_test" => [ "test/p_test-dso-p_test.o", "test/p_test.ld" @@ -27590,8 +27423,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27618,7 +27451,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27635,8 +27468,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/crypto/buildinf.h index 9787debf6..ee08c25dc 100644 --- a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: VC-WIN64-ARM" -#define DATE "built on: Wed Jan 31 13:08:26 2024 UTC" +#define DATE "built on: Tue Aug 6 12:30:39 2024 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/openssl/bio.h b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/openssl/bio.h index d094af47b..6ac2c7865 100644 --- a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/openssl/bio.h @@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, - int (*ossl_gets) (BIO *, char *, int)); + int (*gets) (BIO *, char *, int)); long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); diff --git a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/openssl/opensslv.h index 61260779a..43ccbfff1 100644 --- a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 13 +# define OPENSSL_VERSION_PATCH 9 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.13" -# define OPENSSL_FULL_VERSION_STR "3.0.13+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "30 Jan 2024" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13+quic 30 Jan 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/openssl/pkcs7.h b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/openssl/pkcs7.h index 0a95a93e5..3978fd087 100644 --- a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/openssl/pkcs7.h +++ b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/openssl/pkcs7.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by makefile from include/openssl/pkcs7.h.in * - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -56,8 +56,8 @@ typedef struct pkcs7_signer_info_st { PKCS7_ISSUER_AND_SERIAL *issuer_and_serial; X509_ALGOR *digest_alg; STACK_OF(X509_ATTRIBUTE) *auth_attr; /* [ 0 ] */ - X509_ALGOR *digest_enc_alg; /* confusing name, actually used for signing */ - ASN1_OCTET_STRING *enc_digest; /* confusing name, actually signature */ + X509_ALGOR *digest_enc_alg; + ASN1_OCTET_STRING *enc_digest; STACK_OF(X509_ATTRIBUTE) *unauth_attr; /* [ 1 ] */ /* The private key to sign with */ EVP_PKEY *pkey; diff --git a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/openssl/ssl.h index 9712ae165..7e9ca09bb 100644 --- a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/openssl.gypi b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/openssl.gypi index 81eb195af..f144e4b57 100644 --- a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cbc.c', 'openssl/crypto/aes/aes_cfb.c', diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/configdata.pm b/deps/openssl/config/archs/VC-WIN64A/asm/configdata.pm index 13e18c89b..c9864dd79 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm/configdata.pm +++ b/deps/openssl/config/archs/VC-WIN64A/asm/configdata.pm @@ -151,7 +151,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -168,7 +168,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.13+quic", + "full_version" => "3.0.9", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -219,7 +219,7 @@ our %config = ( ], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "13", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -271,11 +271,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "30 Jan 2024", - "shlib_version" => "81.3", + "release_date" => "30 May 2023", + "shlib_version" => "3", "sourcedir" => ".", "target" => "VC-WIN64A", - "version" => "3.0.13" + "version" => "3.0.9" ); our %target = ( "AR" => "lib", @@ -290,7 +290,7 @@ our %target = ( "LDFLAGS" => "/nologo /debug", "MT" => "mt", "MTFLAGS" => "-nologo", - "RANLIB" => "CODE(0x562d3fd74038)", + "RANLIB" => "CODE(0x5581fcabd3f8)", "RC" => "rc", "_conf_fname_int" => [ "Configurations/00-base-templates.conf", @@ -356,7 +356,7 @@ our %target = ( "mtoutflag" => "-outputresource:", "multilib" => "-x64", "perl_platform" => "Windows::MSVC", - "perlasm_scheme" => "nasm", + "perlasm_scheme" => "auto", "rcoutflag" => "/fo", "shared_cflag" => "", "shared_defflag" => "", @@ -440,7 +440,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -836,9 +835,6 @@ our %unified_info = ( "providers/fips" => { "fips" => "1" }, - "test/p_minimal" => { - "noinst" => "1" - }, "test/p_test" => { "noinst" => "1" } @@ -907,9 +903,6 @@ our %unified_info = ( "test/asn1_internal_test" => { "noinst" => "1" }, - "test/asn1_stable_parse_test" => { - "noinst" => "1" - }, "test/asn1_string_table_test" => { "noinst" => "1" }, @@ -1099,9 +1092,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -1655,7 +1645,6 @@ our %unified_info = ( "OPENSSL_IA32_SSE2", "PADLOCK_ASM", "POLY1305_ASM", - "RC4_ASM", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", @@ -1707,11 +1696,7 @@ our %unified_info = ( "X25519_ASM" ], "providers/liblegacy.a" => [ - "MD5_ASM", - "RC4_ASM" - ], - "test/evp_extra_test" => [ - "STATIC_LEGACY" + "MD5_ASM" ], "test/provider_internal_test" => [ "PROVIDER_INIT_FUNCTION_NAME=p_test_init" @@ -2466,9 +2451,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -2766,9 +2748,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -3537,9 +3516,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -3834,9 +3810,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -3870,12 +3843,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -4860,9 +4827,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -5160,9 +5124,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -5931,9 +5892,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -6228,9 +6186,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -6264,12 +6219,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -7273,10 +7222,6 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], - "test/asn1_stable_parse_test" => [ - "libcrypto", - "test/libtestutil.a" - ], "test/asn1_string_table_test" => [ "libcrypto", "test/libtestutil.a" @@ -7530,10 +7475,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -7799,8 +7740,6 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "libcrypto.a", - "providers/libcommon.a", - "providers/liblegacy.a", "test/libtestutil.a" ], "test/evp_extra_test2" => [ @@ -9914,7 +9853,6 @@ our %unified_info = ( }, "providers" => { "deps" => [ - "providers/evp_extra_test-bin-legacyprov.o", "providers/libcrypto-lib-baseprov.o", "providers/libcrypto-lib-defltprov.o", "providers/libcrypto-lib-nullprov.o", @@ -9922,9 +9860,6 @@ our %unified_info = ( "providers/libdefault.a" ], "products" => { - "bin" => [ - "test/evp_extra_test" - ], "dso" => [ "providers/fips", "providers/legacy" @@ -10361,7 +10296,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10412,7 +10346,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -11547,9 +11480,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -11847,9 +11777,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -12618,9 +12545,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -12915,9 +12839,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -12951,12 +12872,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -13941,9 +13856,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -14241,9 +14153,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -15012,9 +14921,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -15309,9 +15215,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -15345,12 +15248,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -16395,10 +16292,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16475,9 +16368,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "whrlpool" ], - "test/p_minimal.ld" => [ - "util/providers.num" - ], "test/p_test.ld" => [ "util/providers.num" ], @@ -16643,7 +16533,6 @@ our %unified_info = ( "doc/html/man3/CMS_get1_ReceiptRequest.html", "doc/html/man3/CMS_sign.html", "doc/html/man3/CMS_sign_receipt.html", - "doc/html/man3/CMS_signed_get_attr.html", "doc/html/man3/CMS_uncompress.html", "doc/html/man3/CMS_verify.html", "doc/html/man3/CMS_verify_receipt.html", @@ -16743,7 +16632,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_encapsulate.html", "doc/html/man3/EVP_PKEY_encrypt.html", "doc/html/man3/EVP_PKEY_fromdata.html", - "doc/html/man3/EVP_PKEY_get_attr.html", "doc/html/man3/EVP_PKEY_get_default_digest_nid.html", "doc/html/man3/EVP_PKEY_get_field_type.html", "doc/html/man3/EVP_PKEY_get_group_name.html", @@ -17000,7 +16888,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -17099,7 +16986,6 @@ our %unified_info = ( "doc/html/man3/X509V3_get_d2i.html", "doc/html/man3/X509V3_set_ctx.html", "doc/html/man3/X509_ALGOR_dup.html", - "doc/html/man3/X509_ATTRIBUTE.html", "doc/html/man3/X509_CRL_get0_by_serial.html", "doc/html/man3/X509_EXTENSION_set_object.html", "doc/html/man3/X509_LOOKUP.html", @@ -17111,8 +16997,6 @@ our %unified_info = ( "doc/html/man3/X509_NAME_get_index_by_NID.html", "doc/html/man3/X509_NAME_print_ex.html", "doc/html/man3/X509_PUBKEY_new.html", - "doc/html/man3/X509_REQ_get_attr.html", - "doc/html/man3/X509_REQ_get_extensions.html", "doc/html/man3/X509_SIG_get0.html", "doc/html/man3/X509_STORE_CTX_get_error.html", "doc/html/man3/X509_STORE_CTX_new.html", @@ -18416,10 +18300,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/asn1_stable_parse_test" => [ - "include", - "apps/include" - ], "test/asn1_string_table_test" => [ "include", "apps/include" @@ -18627,9 +18507,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -18889,9 +18766,7 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "include", - "apps/include", - "providers/common/include", - "providers/implementations/include" + "apps/include" ], "test/evp_extra_test2" => [ "include", @@ -19148,10 +19023,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/p_minimal" => [ - "include", - "." - ], "test/p_test" => [ "include", "." @@ -19641,7 +19512,6 @@ our %unified_info = ( "doc/man/man3/CMS_get1_ReceiptRequest.3", "doc/man/man3/CMS_sign.3", "doc/man/man3/CMS_sign_receipt.3", - "doc/man/man3/CMS_signed_get_attr.3", "doc/man/man3/CMS_uncompress.3", "doc/man/man3/CMS_verify.3", "doc/man/man3/CMS_verify_receipt.3", @@ -19741,7 +19611,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_encapsulate.3", "doc/man/man3/EVP_PKEY_encrypt.3", "doc/man/man3/EVP_PKEY_fromdata.3", - "doc/man/man3/EVP_PKEY_get_attr.3", "doc/man/man3/EVP_PKEY_get_default_digest_nid.3", "doc/man/man3/EVP_PKEY_get_field_type.3", "doc/man/man3/EVP_PKEY_get_group_name.3", @@ -19998,7 +19867,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20097,7 +19965,6 @@ our %unified_info = ( "doc/man/man3/X509V3_get_d2i.3", "doc/man/man3/X509V3_set_ctx.3", "doc/man/man3/X509_ALGOR_dup.3", - "doc/man/man3/X509_ATTRIBUTE.3", "doc/man/man3/X509_CRL_get0_by_serial.3", "doc/man/man3/X509_EXTENSION_set_object.3", "doc/man/man3/X509_LOOKUP.3", @@ -20109,8 +19976,6 @@ our %unified_info = ( "doc/man/man3/X509_NAME_get_index_by_NID.3", "doc/man/man3/X509_NAME_print_ex.3", "doc/man/man3/X509_PUBKEY_new.3", - "doc/man/man3/X509_REQ_get_attr.3", - "doc/man/man3/X509_REQ_get_extensions.3", "doc/man/man3/X509_SIG_get0.3", "doc/man/man3/X509_STORE_CTX_get_error.3", "doc/man/man3/X509_STORE_CTX_new.3", @@ -20294,7 +20159,6 @@ our %unified_info = ( "modules" => [ "providers/fips", "providers/legacy", - "test/p_minimal", "test/p_test" ], "programs" => [ @@ -20320,7 +20184,6 @@ our %unified_info = ( "test/asn1_dsa_internal_test", "test/asn1_encode_test", "test/asn1_internal_test", - "test/asn1_stable_parse_test", "test/asn1_string_table_test", "test/asn1_time_test", "test/asynciotest", @@ -20384,7 +20247,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24688,7 +24550,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24715,7 +24576,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -24817,9 +24677,6 @@ our %unified_info = ( "providers/common/libfips-lib-securitycheck_fips.o" => [ "providers/common/securitycheck_fips.c" ], - "providers/evp_extra_test-bin-legacyprov.o" => [ - "providers/legacyprov.c" - ], "providers/fips" => [ "providers/fips-dso-fips.res", "providers/fips.ld", @@ -25987,9 +25844,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -26071,9 +25925,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -26131,12 +25982,6 @@ our %unified_info = ( "test/asn1_internal_test-bin-asn1_internal_test.o" => [ "test/asn1_internal_test.c" ], - "test/asn1_stable_parse_test" => [ - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" - ], - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" => [ - "test/asn1_stable_parse_test.c" - ], "test/asn1_string_table_test" => [ "test/asn1_string_table_test-bin-asn1_string_table_test.o" ], @@ -26516,12 +26361,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -26920,7 +26759,6 @@ our %unified_info = ( "test/errtest.c" ], "test/evp_extra_test" => [ - "providers/evp_extra_test-bin-legacyprov.o", "test/evp_extra_test-bin-evp_extra_test.o" ], "test/evp_extra_test-bin-evp_extra_test.o" => [ @@ -27212,13 +27050,6 @@ our %unified_info = ( "test/ossl_store_test-bin-ossl_store_test.o" => [ "test/ossl_store_test.c" ], - "test/p_minimal" => [ - "test/p_minimal-dso-p_minimal.o", - "test/p_minimal.ld" - ], - "test/p_minimal-dso-p_minimal.o" => [ - "test/p_minimal.c" - ], "test/p_test" => [ "test/p_test-dso-p_test.o", "test/p_test.ld" @@ -27902,8 +27733,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27930,7 +27761,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27947,8 +27778,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/buildinf.h b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/buildinf.h index 98286464f..4838c2e45 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: " -#define DATE "built on: Wed Jan 31 13:07:09 2024 UTC" +#define DATE "built on: Tue Aug 6 12:29:28 2024 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/include/openssl/bio.h b/deps/openssl/config/archs/VC-WIN64A/asm/include/openssl/bio.h index d094af47b..6ac2c7865 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/VC-WIN64A/asm/include/openssl/bio.h @@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, - int (*ossl_gets) (BIO *, char *, int)); + int (*gets) (BIO *, char *, int)); long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/VC-WIN64A/asm/include/openssl/opensslv.h index 61260779a..43ccbfff1 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/VC-WIN64A/asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 13 +# define OPENSSL_VERSION_PATCH 9 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.13" -# define OPENSSL_FULL_VERSION_STR "3.0.13+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "30 Jan 2024" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13+quic 30 Jan 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/include/openssl/pkcs7.h b/deps/openssl/config/archs/VC-WIN64A/asm/include/openssl/pkcs7.h index 0a95a93e5..3978fd087 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm/include/openssl/pkcs7.h +++ b/deps/openssl/config/archs/VC-WIN64A/asm/include/openssl/pkcs7.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by makefile from include/openssl/pkcs7.h.in * - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -56,8 +56,8 @@ typedef struct pkcs7_signer_info_st { PKCS7_ISSUER_AND_SERIAL *issuer_and_serial; X509_ALGOR *digest_alg; STACK_OF(X509_ATTRIBUTE) *auth_attr; /* [ 0 ] */ - X509_ALGOR *digest_enc_alg; /* confusing name, actually used for signing */ - ASN1_OCTET_STRING *enc_digest; /* confusing name, actually signature */ + X509_ALGOR *digest_enc_alg; + ASN1_OCTET_STRING *enc_digest; STACK_OF(X509_ATTRIBUTE) *unauth_attr; /* [ 1 ] */ /* The private key to sign with */ EVP_PKEY *pkey; diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/include/openssl/ssl.h b/deps/openssl/config/archs/VC-WIN64A/asm/include/openssl/ssl.h index 9712ae165..7e9ca09bb 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/VC-WIN64A/asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/openssl-cl.gypi b/deps/openssl/config/archs/VC-WIN64A/asm/openssl-cl.gypi index 9b7e878e1..dc54c7aa2 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm/openssl-cl.gypi +++ b/deps/openssl/config/archs/VC-WIN64A/asm/openssl-cl.gypi @@ -23,7 +23,6 @@ 'OPENSSL_IA32_SSE2', 'PADLOCK_ASM', 'POLY1305_ASM', - 'RC4_ASM', 'SHA1_ASM', 'SHA256_ASM', 'SHA512_ASM', diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/openssl.gypi b/deps/openssl/config/archs/VC-WIN64A/asm/openssl.gypi index 5afa3d754..5c0b9cd13 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm/openssl.gypi +++ b/deps/openssl/config/archs/VC-WIN64A/asm/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cfb.c', 'openssl/crypto/aes/aes_ecb.c', @@ -1009,7 +1007,6 @@ 'OPENSSL_IA32_SSE2', 'PADLOCK_ASM', 'POLY1305_ASM', - 'RC4_ASM', 'SHA1_ASM', 'SHA256_ASM', 'SHA512_ASM', diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/configdata.pm b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/configdata.pm index 9841596b5..abac3b586 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/configdata.pm @@ -151,7 +151,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -168,7 +168,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.13+quic", + "full_version" => "3.0.9", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -219,7 +219,7 @@ our %config = ( ], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "13", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -271,11 +271,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "30 Jan 2024", - "shlib_version" => "81.3", + "release_date" => "30 May 2023", + "shlib_version" => "3", "sourcedir" => ".", "target" => "VC-WIN64A", - "version" => "3.0.13" + "version" => "3.0.9" ); our %target = ( "AR" => "lib", @@ -290,7 +290,7 @@ our %target = ( "LDFLAGS" => "/nologo /debug", "MT" => "mt", "MTFLAGS" => "-nologo", - "RANLIB" => "CODE(0x5579ca7a23f8)", + "RANLIB" => "CODE(0x55951447c3b8)", "RC" => "rc", "_conf_fname_int" => [ "Configurations/00-base-templates.conf", @@ -356,7 +356,7 @@ our %target = ( "mtoutflag" => "-outputresource:", "multilib" => "-x64", "perl_platform" => "Windows::MSVC", - "perlasm_scheme" => "nasm", + "perlasm_scheme" => "auto", "rcoutflag" => "/fo", "shared_cflag" => "", "shared_defflag" => "", @@ -440,7 +440,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -836,9 +835,6 @@ our %unified_info = ( "providers/fips" => { "fips" => "1" }, - "test/p_minimal" => { - "noinst" => "1" - }, "test/p_test" => { "noinst" => "1" } @@ -907,9 +903,6 @@ our %unified_info = ( "test/asn1_internal_test" => { "noinst" => "1" }, - "test/asn1_stable_parse_test" => { - "noinst" => "1" - }, "test/asn1_string_table_test" => { "noinst" => "1" }, @@ -1099,9 +1092,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -1655,7 +1645,6 @@ our %unified_info = ( "OPENSSL_IA32_SSE2", "PADLOCK_ASM", "POLY1305_ASM", - "RC4_ASM", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", @@ -1707,11 +1696,7 @@ our %unified_info = ( "X25519_ASM" ], "providers/liblegacy.a" => [ - "MD5_ASM", - "RC4_ASM" - ], - "test/evp_extra_test" => [ - "STATIC_LEGACY" + "MD5_ASM" ], "test/provider_internal_test" => [ "PROVIDER_INIT_FUNCTION_NAME=p_test_init" @@ -2466,9 +2451,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -2766,9 +2748,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -3537,9 +3516,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -3834,9 +3810,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -3870,12 +3843,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -4860,9 +4827,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -5160,9 +5124,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -5931,9 +5892,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -6228,9 +6186,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -6264,12 +6219,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -7273,10 +7222,6 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], - "test/asn1_stable_parse_test" => [ - "libcrypto", - "test/libtestutil.a" - ], "test/asn1_string_table_test" => [ "libcrypto", "test/libtestutil.a" @@ -7530,10 +7475,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -7799,8 +7740,6 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "libcrypto.a", - "providers/libcommon.a", - "providers/liblegacy.a", "test/libtestutil.a" ], "test/evp_extra_test2" => [ @@ -9914,7 +9853,6 @@ our %unified_info = ( }, "providers" => { "deps" => [ - "providers/evp_extra_test-bin-legacyprov.o", "providers/libcrypto-lib-baseprov.o", "providers/libcrypto-lib-defltprov.o", "providers/libcrypto-lib-nullprov.o", @@ -9922,9 +9860,6 @@ our %unified_info = ( "providers/libdefault.a" ], "products" => { - "bin" => [ - "test/evp_extra_test" - ], "dso" => [ "providers/fips", "providers/legacy" @@ -10361,7 +10296,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10412,7 +10346,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -11547,9 +11480,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -11847,9 +11777,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -12618,9 +12545,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -12915,9 +12839,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -12951,12 +12872,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -13941,9 +13856,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -14241,9 +14153,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -15012,9 +14921,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -15309,9 +15215,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -15345,12 +15248,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -16395,10 +16292,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16475,9 +16368,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "whrlpool" ], - "test/p_minimal.ld" => [ - "util/providers.num" - ], "test/p_test.ld" => [ "util/providers.num" ], @@ -16643,7 +16533,6 @@ our %unified_info = ( "doc/html/man3/CMS_get1_ReceiptRequest.html", "doc/html/man3/CMS_sign.html", "doc/html/man3/CMS_sign_receipt.html", - "doc/html/man3/CMS_signed_get_attr.html", "doc/html/man3/CMS_uncompress.html", "doc/html/man3/CMS_verify.html", "doc/html/man3/CMS_verify_receipt.html", @@ -16743,7 +16632,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_encapsulate.html", "doc/html/man3/EVP_PKEY_encrypt.html", "doc/html/man3/EVP_PKEY_fromdata.html", - "doc/html/man3/EVP_PKEY_get_attr.html", "doc/html/man3/EVP_PKEY_get_default_digest_nid.html", "doc/html/man3/EVP_PKEY_get_field_type.html", "doc/html/man3/EVP_PKEY_get_group_name.html", @@ -17000,7 +16888,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -17099,7 +16986,6 @@ our %unified_info = ( "doc/html/man3/X509V3_get_d2i.html", "doc/html/man3/X509V3_set_ctx.html", "doc/html/man3/X509_ALGOR_dup.html", - "doc/html/man3/X509_ATTRIBUTE.html", "doc/html/man3/X509_CRL_get0_by_serial.html", "doc/html/man3/X509_EXTENSION_set_object.html", "doc/html/man3/X509_LOOKUP.html", @@ -17111,8 +16997,6 @@ our %unified_info = ( "doc/html/man3/X509_NAME_get_index_by_NID.html", "doc/html/man3/X509_NAME_print_ex.html", "doc/html/man3/X509_PUBKEY_new.html", - "doc/html/man3/X509_REQ_get_attr.html", - "doc/html/man3/X509_REQ_get_extensions.html", "doc/html/man3/X509_SIG_get0.html", "doc/html/man3/X509_STORE_CTX_get_error.html", "doc/html/man3/X509_STORE_CTX_new.html", @@ -18416,10 +18300,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/asn1_stable_parse_test" => [ - "include", - "apps/include" - ], "test/asn1_string_table_test" => [ "include", "apps/include" @@ -18627,9 +18507,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -18889,9 +18766,7 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "include", - "apps/include", - "providers/common/include", - "providers/implementations/include" + "apps/include" ], "test/evp_extra_test2" => [ "include", @@ -19148,10 +19023,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/p_minimal" => [ - "include", - "." - ], "test/p_test" => [ "include", "." @@ -19641,7 +19512,6 @@ our %unified_info = ( "doc/man/man3/CMS_get1_ReceiptRequest.3", "doc/man/man3/CMS_sign.3", "doc/man/man3/CMS_sign_receipt.3", - "doc/man/man3/CMS_signed_get_attr.3", "doc/man/man3/CMS_uncompress.3", "doc/man/man3/CMS_verify.3", "doc/man/man3/CMS_verify_receipt.3", @@ -19741,7 +19611,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_encapsulate.3", "doc/man/man3/EVP_PKEY_encrypt.3", "doc/man/man3/EVP_PKEY_fromdata.3", - "doc/man/man3/EVP_PKEY_get_attr.3", "doc/man/man3/EVP_PKEY_get_default_digest_nid.3", "doc/man/man3/EVP_PKEY_get_field_type.3", "doc/man/man3/EVP_PKEY_get_group_name.3", @@ -19998,7 +19867,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20097,7 +19965,6 @@ our %unified_info = ( "doc/man/man3/X509V3_get_d2i.3", "doc/man/man3/X509V3_set_ctx.3", "doc/man/man3/X509_ALGOR_dup.3", - "doc/man/man3/X509_ATTRIBUTE.3", "doc/man/man3/X509_CRL_get0_by_serial.3", "doc/man/man3/X509_EXTENSION_set_object.3", "doc/man/man3/X509_LOOKUP.3", @@ -20109,8 +19976,6 @@ our %unified_info = ( "doc/man/man3/X509_NAME_get_index_by_NID.3", "doc/man/man3/X509_NAME_print_ex.3", "doc/man/man3/X509_PUBKEY_new.3", - "doc/man/man3/X509_REQ_get_attr.3", - "doc/man/man3/X509_REQ_get_extensions.3", "doc/man/man3/X509_SIG_get0.3", "doc/man/man3/X509_STORE_CTX_get_error.3", "doc/man/man3/X509_STORE_CTX_new.3", @@ -20294,7 +20159,6 @@ our %unified_info = ( "modules" => [ "providers/fips", "providers/legacy", - "test/p_minimal", "test/p_test" ], "programs" => [ @@ -20320,7 +20184,6 @@ our %unified_info = ( "test/asn1_dsa_internal_test", "test/asn1_encode_test", "test/asn1_internal_test", - "test/asn1_stable_parse_test", "test/asn1_string_table_test", "test/asn1_time_test", "test/asynciotest", @@ -20384,7 +20247,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24688,7 +24550,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24715,7 +24576,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -24817,9 +24677,6 @@ our %unified_info = ( "providers/common/libfips-lib-securitycheck_fips.o" => [ "providers/common/securitycheck_fips.c" ], - "providers/evp_extra_test-bin-legacyprov.o" => [ - "providers/legacyprov.c" - ], "providers/fips" => [ "providers/fips-dso-fips.res", "providers/fips.ld", @@ -25987,9 +25844,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -26071,9 +25925,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -26131,12 +25982,6 @@ our %unified_info = ( "test/asn1_internal_test-bin-asn1_internal_test.o" => [ "test/asn1_internal_test.c" ], - "test/asn1_stable_parse_test" => [ - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" - ], - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" => [ - "test/asn1_stable_parse_test.c" - ], "test/asn1_string_table_test" => [ "test/asn1_string_table_test-bin-asn1_string_table_test.o" ], @@ -26516,12 +26361,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -26920,7 +26759,6 @@ our %unified_info = ( "test/errtest.c" ], "test/evp_extra_test" => [ - "providers/evp_extra_test-bin-legacyprov.o", "test/evp_extra_test-bin-evp_extra_test.o" ], "test/evp_extra_test-bin-evp_extra_test.o" => [ @@ -27212,13 +27050,6 @@ our %unified_info = ( "test/ossl_store_test-bin-ossl_store_test.o" => [ "test/ossl_store_test.c" ], - "test/p_minimal" => [ - "test/p_minimal-dso-p_minimal.o", - "test/p_minimal.ld" - ], - "test/p_minimal-dso-p_minimal.o" => [ - "test/p_minimal.c" - ], "test/p_test" => [ "test/p_test-dso-p_test.o", "test/p_test.ld" @@ -27902,8 +27733,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27930,7 +27761,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27947,8 +27778,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/buildinf.h index 19f5adb77..25c9866ef 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: " -#define DATE "built on: Wed Jan 31 13:07:24 2024 UTC" +#define DATE "built on: Tue Aug 6 12:29:43 2024 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/openssl/bio.h b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/openssl/bio.h index d094af47b..6ac2c7865 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/openssl/bio.h +++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/openssl/bio.h @@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, - int (*ossl_gets) (BIO *, char *, int)); + int (*gets) (BIO *, char *, int)); long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/openssl/opensslv.h index 61260779a..43ccbfff1 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 13 +# define OPENSSL_VERSION_PATCH 9 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.13" -# define OPENSSL_FULL_VERSION_STR "3.0.13+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "30 Jan 2024" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13+quic 30 Jan 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/openssl/pkcs7.h b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/openssl/pkcs7.h index 0a95a93e5..3978fd087 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/openssl/pkcs7.h +++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/openssl/pkcs7.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by makefile from include/openssl/pkcs7.h.in * - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -56,8 +56,8 @@ typedef struct pkcs7_signer_info_st { PKCS7_ISSUER_AND_SERIAL *issuer_and_serial; X509_ALGOR *digest_alg; STACK_OF(X509_ATTRIBUTE) *auth_attr; /* [ 0 ] */ - X509_ALGOR *digest_enc_alg; /* confusing name, actually used for signing */ - ASN1_OCTET_STRING *enc_digest; /* confusing name, actually signature */ + X509_ALGOR *digest_enc_alg; + ASN1_OCTET_STRING *enc_digest; STACK_OF(X509_ATTRIBUTE) *unauth_attr; /* [ 1 ] */ /* The private key to sign with */ EVP_PKEY *pkey; diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/openssl/ssl.h index 9712ae165..7e9ca09bb 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/openssl/ssl.h +++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/openssl-cl.gypi b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/openssl-cl.gypi index 5eafa74db..1b37356b4 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/openssl-cl.gypi +++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/openssl-cl.gypi @@ -23,7 +23,6 @@ 'OPENSSL_IA32_SSE2', 'PADLOCK_ASM', 'POLY1305_ASM', - 'RC4_ASM', 'SHA1_ASM', 'SHA256_ASM', 'SHA512_ASM', diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/openssl.gypi b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/openssl.gypi index 582f8c93a..bd2885c12 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cfb.c', 'openssl/crypto/aes/aes_ecb.c', @@ -1009,7 +1007,6 @@ 'OPENSSL_IA32_SSE2', 'PADLOCK_ASM', 'POLY1305_ASM', - 'RC4_ASM', 'SHA1_ASM', 'SHA256_ASM', 'SHA512_ASM', diff --git a/deps/openssl/config/archs/VC-WIN64A/no-asm/configdata.pm b/deps/openssl/config/archs/VC-WIN64A/no-asm/configdata.pm index 9e8a1ec6d..a271e4854 100644 --- a/deps/openssl/config/archs/VC-WIN64A/no-asm/configdata.pm +++ b/deps/openssl/config/archs/VC-WIN64A/no-asm/configdata.pm @@ -151,7 +151,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [], @@ -166,7 +166,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.13+quic", + "full_version" => "3.0.9", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -218,7 +218,7 @@ our %config = ( ], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "13", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -271,11 +271,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "30 Jan 2024", - "shlib_version" => "81.3", + "release_date" => "30 May 2023", + "shlib_version" => "3", "sourcedir" => ".", "target" => "VC-WIN64A", - "version" => "3.0.13" + "version" => "3.0.9" ); our %target = ( "AR" => "lib", @@ -290,7 +290,7 @@ our %target = ( "LDFLAGS" => "/nologo /debug", "MT" => "mt", "MTFLAGS" => "-nologo", - "RANLIB" => "CODE(0x55ba24087cd0)", + "RANLIB" => "CODE(0x563eccbccdd8)", "RC" => "rc", "_conf_fname_int" => [ "Configurations/00-base-templates.conf", @@ -356,7 +356,7 @@ our %target = ( "mtoutflag" => "-outputresource:", "multilib" => "-x64", "perl_platform" => "Windows::MSVC", - "perlasm_scheme" => "nasm", + "perlasm_scheme" => "auto", "rcoutflag" => "/fo", "shared_cflag" => "", "shared_defflag" => "", @@ -440,7 +440,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -837,9 +836,6 @@ our %unified_info = ( "providers/fips" => { "fips" => "1" }, - "test/p_minimal" => { - "noinst" => "1" - }, "test/p_test" => { "noinst" => "1" } @@ -908,9 +904,6 @@ our %unified_info = ( "test/asn1_internal_test" => { "noinst" => "1" }, - "test/asn1_stable_parse_test" => { - "noinst" => "1" - }, "test/asn1_string_table_test" => { "noinst" => "1" }, @@ -1100,9 +1093,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -1647,9 +1637,6 @@ our %unified_info = ( "providers/libfips.a" => [ "FIPS_MODULE" ], - "test/evp_extra_test" => [ - "STATIC_LEGACY" - ], "test/provider_internal_test" => [ "PROVIDER_INIT_FUNCTION_NAME=p_test_init" ], @@ -2403,9 +2390,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -2703,9 +2687,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -3474,9 +3455,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -3771,9 +3749,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -3807,12 +3782,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -4797,9 +4766,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -5097,9 +5063,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -5868,9 +5831,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -6165,9 +6125,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -6201,12 +6158,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -7210,10 +7161,6 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], - "test/asn1_stable_parse_test" => [ - "libcrypto", - "test/libtestutil.a" - ], "test/asn1_string_table_test" => [ "libcrypto", "test/libtestutil.a" @@ -7467,10 +7414,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -7736,8 +7679,6 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "libcrypto.a", - "providers/libcommon.a", - "providers/liblegacy.a", "test/libtestutil.a" ], "test/evp_extra_test2" => [ @@ -9803,7 +9744,6 @@ our %unified_info = ( }, "providers" => { "deps" => [ - "providers/evp_extra_test-bin-legacyprov.o", "providers/libcrypto-lib-baseprov.o", "providers/libcrypto-lib-defltprov.o", "providers/libcrypto-lib-nullprov.o", @@ -9811,9 +9751,6 @@ our %unified_info = ( "providers/libdefault.a" ], "products" => { - "bin" => [ - "test/evp_extra_test" - ], "dso" => [ "providers/fips", "providers/legacy" @@ -10250,7 +10187,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10301,7 +10237,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -11436,9 +11371,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -11736,9 +11668,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -12507,9 +12436,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -12804,9 +12730,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -12840,12 +12763,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -13830,9 +13747,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -14130,9 +14044,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -14901,9 +14812,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -15198,9 +15106,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -15234,12 +15139,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -16284,10 +16183,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16364,9 +16259,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "whrlpool" ], - "test/p_minimal.ld" => [ - "util/providers.num" - ], "test/p_test.ld" => [ "util/providers.num" ], @@ -16532,7 +16424,6 @@ our %unified_info = ( "doc/html/man3/CMS_get1_ReceiptRequest.html", "doc/html/man3/CMS_sign.html", "doc/html/man3/CMS_sign_receipt.html", - "doc/html/man3/CMS_signed_get_attr.html", "doc/html/man3/CMS_uncompress.html", "doc/html/man3/CMS_verify.html", "doc/html/man3/CMS_verify_receipt.html", @@ -16632,7 +16523,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_encapsulate.html", "doc/html/man3/EVP_PKEY_encrypt.html", "doc/html/man3/EVP_PKEY_fromdata.html", - "doc/html/man3/EVP_PKEY_get_attr.html", "doc/html/man3/EVP_PKEY_get_default_digest_nid.html", "doc/html/man3/EVP_PKEY_get_field_type.html", "doc/html/man3/EVP_PKEY_get_group_name.html", @@ -16889,7 +16779,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -16988,7 +16877,6 @@ our %unified_info = ( "doc/html/man3/X509V3_get_d2i.html", "doc/html/man3/X509V3_set_ctx.html", "doc/html/man3/X509_ALGOR_dup.html", - "doc/html/man3/X509_ATTRIBUTE.html", "doc/html/man3/X509_CRL_get0_by_serial.html", "doc/html/man3/X509_EXTENSION_set_object.html", "doc/html/man3/X509_LOOKUP.html", @@ -17000,8 +16888,6 @@ our %unified_info = ( "doc/html/man3/X509_NAME_get_index_by_NID.html", "doc/html/man3/X509_NAME_print_ex.html", "doc/html/man3/X509_PUBKEY_new.html", - "doc/html/man3/X509_REQ_get_attr.html", - "doc/html/man3/X509_REQ_get_extensions.html", "doc/html/man3/X509_SIG_get0.html", "doc/html/man3/X509_STORE_CTX_get_error.html", "doc/html/man3/X509_STORE_CTX_new.html", @@ -18305,10 +18191,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/asn1_stable_parse_test" => [ - "include", - "apps/include" - ], "test/asn1_string_table_test" => [ "include", "apps/include" @@ -18516,9 +18398,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -18778,9 +18657,7 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "include", - "apps/include", - "providers/common/include", - "providers/implementations/include" + "apps/include" ], "test/evp_extra_test2" => [ "include", @@ -19037,10 +18914,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/p_minimal" => [ - "include", - "." - ], "test/p_test" => [ "include", "." @@ -19530,7 +19403,6 @@ our %unified_info = ( "doc/man/man3/CMS_get1_ReceiptRequest.3", "doc/man/man3/CMS_sign.3", "doc/man/man3/CMS_sign_receipt.3", - "doc/man/man3/CMS_signed_get_attr.3", "doc/man/man3/CMS_uncompress.3", "doc/man/man3/CMS_verify.3", "doc/man/man3/CMS_verify_receipt.3", @@ -19630,7 +19502,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_encapsulate.3", "doc/man/man3/EVP_PKEY_encrypt.3", "doc/man/man3/EVP_PKEY_fromdata.3", - "doc/man/man3/EVP_PKEY_get_attr.3", "doc/man/man3/EVP_PKEY_get_default_digest_nid.3", "doc/man/man3/EVP_PKEY_get_field_type.3", "doc/man/man3/EVP_PKEY_get_group_name.3", @@ -19887,7 +19758,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -19986,7 +19856,6 @@ our %unified_info = ( "doc/man/man3/X509V3_get_d2i.3", "doc/man/man3/X509V3_set_ctx.3", "doc/man/man3/X509_ALGOR_dup.3", - "doc/man/man3/X509_ATTRIBUTE.3", "doc/man/man3/X509_CRL_get0_by_serial.3", "doc/man/man3/X509_EXTENSION_set_object.3", "doc/man/man3/X509_LOOKUP.3", @@ -19998,8 +19867,6 @@ our %unified_info = ( "doc/man/man3/X509_NAME_get_index_by_NID.3", "doc/man/man3/X509_NAME_print_ex.3", "doc/man/man3/X509_PUBKEY_new.3", - "doc/man/man3/X509_REQ_get_attr.3", - "doc/man/man3/X509_REQ_get_extensions.3", "doc/man/man3/X509_SIG_get0.3", "doc/man/man3/X509_STORE_CTX_get_error.3", "doc/man/man3/X509_STORE_CTX_new.3", @@ -20183,7 +20050,6 @@ our %unified_info = ( "modules" => [ "providers/fips", "providers/legacy", - "test/p_minimal", "test/p_test" ], "programs" => [ @@ -20209,7 +20075,6 @@ our %unified_info = ( "test/asn1_dsa_internal_test", "test/asn1_encode_test", "test/asn1_internal_test", - "test/asn1_stable_parse_test", "test/asn1_string_table_test", "test/asn1_time_test", "test/asynciotest", @@ -20273,7 +20138,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24408,7 +24272,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24435,7 +24298,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -24537,9 +24399,6 @@ our %unified_info = ( "providers/common/libfips-lib-securitycheck_fips.o" => [ "providers/common/securitycheck_fips.c" ], - "providers/evp_extra_test-bin-legacyprov.o" => [ - "providers/legacyprov.c" - ], "providers/fips" => [ "providers/fips-dso-fips.res", "providers/fips.ld", @@ -25684,9 +25543,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25768,9 +25624,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25828,12 +25681,6 @@ our %unified_info = ( "test/asn1_internal_test-bin-asn1_internal_test.o" => [ "test/asn1_internal_test.c" ], - "test/asn1_stable_parse_test" => [ - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" - ], - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" => [ - "test/asn1_stable_parse_test.c" - ], "test/asn1_string_table_test" => [ "test/asn1_string_table_test-bin-asn1_string_table_test.o" ], @@ -26213,12 +26060,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -26617,7 +26458,6 @@ our %unified_info = ( "test/errtest.c" ], "test/evp_extra_test" => [ - "providers/evp_extra_test-bin-legacyprov.o", "test/evp_extra_test-bin-evp_extra_test.o" ], "test/evp_extra_test-bin-evp_extra_test.o" => [ @@ -26909,13 +26749,6 @@ our %unified_info = ( "test/ossl_store_test-bin-ossl_store_test.o" => [ "test/ossl_store_test.c" ], - "test/p_minimal" => [ - "test/p_minimal-dso-p_minimal.o", - "test/p_minimal.ld" - ], - "test/p_minimal-dso-p_minimal.o" => [ - "test/p_minimal.c" - ], "test/p_test" => [ "test/p_test-dso-p_test.o", "test/p_test.ld" @@ -27602,8 +27435,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27630,7 +27463,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27647,8 +27480,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/VC-WIN64A/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/VC-WIN64A/no-asm/crypto/buildinf.h index 98267ccf4..2faa9cc0f 100644 --- a/deps/openssl/config/archs/VC-WIN64A/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/VC-WIN64A/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: " -#define DATE "built on: Wed Jan 31 13:07:39 2024 UTC" +#define DATE "built on: Tue Aug 6 12:29:56 2024 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/bio.h b/deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/bio.h index d094af47b..6ac2c7865 100644 --- a/deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/bio.h @@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, - int (*ossl_gets) (BIO *, char *, int)); + int (*gets) (BIO *, char *, int)); long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); diff --git a/deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/opensslv.h index 61260779a..43ccbfff1 100644 --- a/deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 13 +# define OPENSSL_VERSION_PATCH 9 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.13" -# define OPENSSL_FULL_VERSION_STR "3.0.13+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "30 Jan 2024" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13+quic 30 Jan 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/pkcs7.h b/deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/pkcs7.h index 0a95a93e5..3978fd087 100644 --- a/deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/pkcs7.h +++ b/deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/pkcs7.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by makefile from include/openssl/pkcs7.h.in * - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -56,8 +56,8 @@ typedef struct pkcs7_signer_info_st { PKCS7_ISSUER_AND_SERIAL *issuer_and_serial; X509_ALGOR *digest_alg; STACK_OF(X509_ATTRIBUTE) *auth_attr; /* [ 0 ] */ - X509_ALGOR *digest_enc_alg; /* confusing name, actually used for signing */ - ASN1_OCTET_STRING *enc_digest; /* confusing name, actually signature */ + X509_ALGOR *digest_enc_alg; + ASN1_OCTET_STRING *enc_digest; STACK_OF(X509_ATTRIBUTE) *unauth_attr; /* [ 1 ] */ /* The private key to sign with */ EVP_PKEY *pkey; diff --git a/deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/ssl.h index 9712ae165..7e9ca09bb 100644 --- a/deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/VC-WIN64A/no-asm/openssl.gypi b/deps/openssl/config/archs/VC-WIN64A/no-asm/openssl.gypi index af84bdff8..3cdefe6bd 100644 --- a/deps/openssl/config/archs/VC-WIN64A/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/VC-WIN64A/no-asm/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cbc.c', 'openssl/crypto/aes/aes_cfb.c', diff --git a/deps/openssl/config/archs/aix64-gcc-as/asm/configdata.pm b/deps/openssl/config/archs/aix64-gcc-as/asm/configdata.pm index b85710539..a7ded9ad4 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/asm/configdata.pm +++ b/deps/openssl/config/archs/aix64-gcc-as/asm/configdata.pm @@ -139,7 +139,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -156,7 +156,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.13+quic", + "full_version" => "3.0.9", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,7 +206,7 @@ our %config = ( ], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "13", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -258,11 +258,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "30 Jan 2024", - "shlib_version" => "81.3", + "release_date" => "30 May 2023", + "shlib_version" => "3", "sourcedir" => ".", "target" => "aix64-gcc-as", - "version" => "3.0.13" + "version" => "3.0.9" ); our %target = ( "AR" => "ar -X64", @@ -389,7 +389,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -785,9 +784,6 @@ our %unified_info = ( "providers/fips" => { "fips" => "1" }, - "test/p_minimal" => { - "noinst" => "1" - }, "test/p_test" => { "noinst" => "1" } @@ -856,9 +852,6 @@ our %unified_info = ( "test/asn1_internal_test" => { "noinst" => "1" }, - "test/asn1_stable_parse_test" => { - "noinst" => "1" - }, "test/asn1_string_table_test" => { "noinst" => "1" }, @@ -1048,9 +1041,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -1636,9 +1626,6 @@ our %unified_info = ( "VPAES_ASM", "X25519_ASM" ], - "test/evp_extra_test" => [ - "STATIC_LEGACY" - ], "test/provider_internal_test" => [ "PROVIDER_INIT_FUNCTION_NAME=p_test_init" ], @@ -2392,9 +2379,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -2692,9 +2676,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -3463,9 +3444,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -3760,9 +3738,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -3796,12 +3771,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -4786,9 +4755,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -5086,9 +5052,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -5857,9 +5820,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -6154,9 +6114,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -6190,12 +6147,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -7193,10 +7144,6 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], - "test/asn1_stable_parse_test" => [ - "libcrypto", - "test/libtestutil.a" - ], "test/asn1_string_table_test" => [ "libcrypto", "test/libtestutil.a" @@ -7450,10 +7397,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -7719,8 +7662,6 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "libcrypto.a", - "providers/libcommon.a", - "providers/liblegacy.a", "test/libtestutil.a" ], "test/evp_extra_test2" => [ @@ -9822,7 +9763,6 @@ our %unified_info = ( }, "providers" => { "deps" => [ - "providers/evp_extra_test-bin-legacyprov.o", "providers/libcrypto-lib-baseprov.o", "providers/libcrypto-lib-defltprov.o", "providers/libcrypto-lib-nullprov.o", @@ -9830,9 +9770,6 @@ our %unified_info = ( "providers/libdefault.a" ], "products" => { - "bin" => [ - "test/evp_extra_test" - ], "dso" => [ "providers/fips", "providers/legacy" @@ -10269,7 +10206,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10320,7 +10256,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -11452,9 +11387,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -11752,9 +11684,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -12523,9 +12452,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -12820,9 +12746,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -12856,12 +12779,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -13846,9 +13763,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -14146,9 +14060,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -14917,9 +14828,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -15214,9 +15122,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -15250,12 +15155,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -16284,10 +16183,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16364,9 +16259,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "whrlpool" ], - "test/p_minimal.ld" => [ - "util/providers.num" - ], "test/p_test.ld" => [ "util/providers.num" ], @@ -16532,7 +16424,6 @@ our %unified_info = ( "doc/html/man3/CMS_get1_ReceiptRequest.html", "doc/html/man3/CMS_sign.html", "doc/html/man3/CMS_sign_receipt.html", - "doc/html/man3/CMS_signed_get_attr.html", "doc/html/man3/CMS_uncompress.html", "doc/html/man3/CMS_verify.html", "doc/html/man3/CMS_verify_receipt.html", @@ -16632,7 +16523,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_encapsulate.html", "doc/html/man3/EVP_PKEY_encrypt.html", "doc/html/man3/EVP_PKEY_fromdata.html", - "doc/html/man3/EVP_PKEY_get_attr.html", "doc/html/man3/EVP_PKEY_get_default_digest_nid.html", "doc/html/man3/EVP_PKEY_get_field_type.html", "doc/html/man3/EVP_PKEY_get_group_name.html", @@ -16889,7 +16779,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -16988,7 +16877,6 @@ our %unified_info = ( "doc/html/man3/X509V3_get_d2i.html", "doc/html/man3/X509V3_set_ctx.html", "doc/html/man3/X509_ALGOR_dup.html", - "doc/html/man3/X509_ATTRIBUTE.html", "doc/html/man3/X509_CRL_get0_by_serial.html", "doc/html/man3/X509_EXTENSION_set_object.html", "doc/html/man3/X509_LOOKUP.html", @@ -17000,8 +16888,6 @@ our %unified_info = ( "doc/html/man3/X509_NAME_get_index_by_NID.html", "doc/html/man3/X509_NAME_print_ex.html", "doc/html/man3/X509_PUBKEY_new.html", - "doc/html/man3/X509_REQ_get_attr.html", - "doc/html/man3/X509_REQ_get_extensions.html", "doc/html/man3/X509_SIG_get0.html", "doc/html/man3/X509_STORE_CTX_get_error.html", "doc/html/man3/X509_STORE_CTX_new.html", @@ -18299,10 +18185,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/asn1_stable_parse_test" => [ - "include", - "apps/include" - ], "test/asn1_string_table_test" => [ "include", "apps/include" @@ -18510,9 +18392,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -18772,9 +18651,7 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "include", - "apps/include", - "providers/common/include", - "providers/implementations/include" + "apps/include" ], "test/evp_extra_test2" => [ "include", @@ -19031,10 +18908,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/p_minimal" => [ - "include", - "." - ], "test/p_test" => [ "include", "." @@ -19524,7 +19397,6 @@ our %unified_info = ( "doc/man/man3/CMS_get1_ReceiptRequest.3", "doc/man/man3/CMS_sign.3", "doc/man/man3/CMS_sign_receipt.3", - "doc/man/man3/CMS_signed_get_attr.3", "doc/man/man3/CMS_uncompress.3", "doc/man/man3/CMS_verify.3", "doc/man/man3/CMS_verify_receipt.3", @@ -19624,7 +19496,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_encapsulate.3", "doc/man/man3/EVP_PKEY_encrypt.3", "doc/man/man3/EVP_PKEY_fromdata.3", - "doc/man/man3/EVP_PKEY_get_attr.3", "doc/man/man3/EVP_PKEY_get_default_digest_nid.3", "doc/man/man3/EVP_PKEY_get_field_type.3", "doc/man/man3/EVP_PKEY_get_group_name.3", @@ -19881,7 +19752,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -19980,7 +19850,6 @@ our %unified_info = ( "doc/man/man3/X509V3_get_d2i.3", "doc/man/man3/X509V3_set_ctx.3", "doc/man/man3/X509_ALGOR_dup.3", - "doc/man/man3/X509_ATTRIBUTE.3", "doc/man/man3/X509_CRL_get0_by_serial.3", "doc/man/man3/X509_EXTENSION_set_object.3", "doc/man/man3/X509_LOOKUP.3", @@ -19992,8 +19861,6 @@ our %unified_info = ( "doc/man/man3/X509_NAME_get_index_by_NID.3", "doc/man/man3/X509_NAME_print_ex.3", "doc/man/man3/X509_PUBKEY_new.3", - "doc/man/man3/X509_REQ_get_attr.3", - "doc/man/man3/X509_REQ_get_extensions.3", "doc/man/man3/X509_SIG_get0.3", "doc/man/man3/X509_STORE_CTX_get_error.3", "doc/man/man3/X509_STORE_CTX_new.3", @@ -20177,7 +20044,6 @@ our %unified_info = ( "modules" => [ "providers/fips", "providers/legacy", - "test/p_minimal", "test/p_test" ], "programs" => [ @@ -20203,7 +20069,6 @@ our %unified_info = ( "test/asn1_dsa_internal_test", "test/asn1_encode_test", "test/asn1_internal_test", - "test/asn1_stable_parse_test", "test/asn1_string_table_test", "test/asn1_time_test", "test/asynciotest", @@ -20267,7 +20132,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24527,7 +24391,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24554,7 +24417,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -24656,9 +24518,6 @@ our %unified_info = ( "providers/common/libfips-lib-securitycheck_fips.o" => [ "providers/common/securitycheck_fips.c" ], - "providers/evp_extra_test-bin-legacyprov.o" => [ - "providers/legacyprov.c" - ], "providers/fips" => [ "providers/fips.ld", "providers/fips/fips-dso-fips_entry.o" @@ -25812,9 +25671,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25896,9 +25752,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25956,12 +25809,6 @@ our %unified_info = ( "test/asn1_internal_test-bin-asn1_internal_test.o" => [ "test/asn1_internal_test.c" ], - "test/asn1_stable_parse_test" => [ - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" - ], - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" => [ - "test/asn1_stable_parse_test.c" - ], "test/asn1_string_table_test" => [ "test/asn1_string_table_test-bin-asn1_string_table_test.o" ], @@ -26341,12 +26188,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -26745,7 +26586,6 @@ our %unified_info = ( "test/errtest.c" ], "test/evp_extra_test" => [ - "providers/evp_extra_test-bin-legacyprov.o", "test/evp_extra_test-bin-evp_extra_test.o" ], "test/evp_extra_test-bin-evp_extra_test.o" => [ @@ -27036,13 +26876,6 @@ our %unified_info = ( "test/ossl_store_test-bin-ossl_store_test.o" => [ "test/ossl_store_test.c" ], - "test/p_minimal" => [ - "test/p_minimal-dso-p_minimal.o", - "test/p_minimal.ld" - ], - "test/p_minimal-dso-p_minimal.o" => [ - "test/p_minimal.c" - ], "test/p_test" => [ "test/p_test-dso-p_test.o", "test/p_test.ld" @@ -27729,8 +27562,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27757,7 +27590,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27774,8 +27607,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/aix64-gcc-as/asm/crypto/buildinf.h b/deps/openssl/config/archs/aix64-gcc-as/asm/crypto/buildinf.h index e6d5e6f9a..2b62e5e2e 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/aix64-gcc-as/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: aix64-gcc-as" -#define DATE "built on: Wed Jan 31 12:56:52 2024 UTC" +#define DATE "built on: Tue Aug 6 12:20:10 2024 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/aix64-gcc-as/asm/include/openssl/bio.h b/deps/openssl/config/archs/aix64-gcc-as/asm/include/openssl/bio.h index f9aa74731..e16cf622c 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/aix64-gcc-as/asm/include/openssl/bio.h @@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, - int (*ossl_gets) (BIO *, char *, int)); + int (*gets) (BIO *, char *, int)); long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); diff --git a/deps/openssl/config/archs/aix64-gcc-as/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/aix64-gcc-as/asm/include/openssl/opensslv.h index 65f3bfa05..5bb97d596 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/aix64-gcc-as/asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 13 +# define OPENSSL_VERSION_PATCH 9 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.13" -# define OPENSSL_FULL_VERSION_STR "3.0.13+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "30 Jan 2024" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13+quic 30 Jan 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/aix64-gcc-as/asm/include/openssl/pkcs7.h b/deps/openssl/config/archs/aix64-gcc-as/asm/include/openssl/pkcs7.h index 0ce79bf4f..557a0a726 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/asm/include/openssl/pkcs7.h +++ b/deps/openssl/config/archs/aix64-gcc-as/asm/include/openssl/pkcs7.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/pkcs7.h.in * - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -56,8 +56,8 @@ typedef struct pkcs7_signer_info_st { PKCS7_ISSUER_AND_SERIAL *issuer_and_serial; X509_ALGOR *digest_alg; STACK_OF(X509_ATTRIBUTE) *auth_attr; /* [ 0 ] */ - X509_ALGOR *digest_enc_alg; /* confusing name, actually used for signing */ - ASN1_OCTET_STRING *enc_digest; /* confusing name, actually signature */ + X509_ALGOR *digest_enc_alg; + ASN1_OCTET_STRING *enc_digest; STACK_OF(X509_ATTRIBUTE) *unauth_attr; /* [ 1 ] */ /* The private key to sign with */ EVP_PKEY *pkey; diff --git a/deps/openssl/config/archs/aix64-gcc-as/asm/include/openssl/ssl.h b/deps/openssl/config/archs/aix64-gcc-as/asm/include/openssl/ssl.h index 0f1915755..3df725c56 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/aix64-gcc-as/asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/aix64-gcc-as/asm/openssl.gypi b/deps/openssl/config/archs/aix64-gcc-as/asm/openssl.gypi index 8a048cba0..93acbf01f 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/asm/openssl.gypi +++ b/deps/openssl/config/archs/aix64-gcc-as/asm/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cbc.c', 'openssl/crypto/aes/aes_cfb.c', diff --git a/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/configdata.pm b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/configdata.pm index ff854e43c..3fff54645 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/configdata.pm @@ -139,7 +139,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -156,7 +156,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.13+quic", + "full_version" => "3.0.9", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,7 +206,7 @@ our %config = ( ], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "13", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -258,11 +258,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "30 Jan 2024", - "shlib_version" => "81.3", + "release_date" => "30 May 2023", + "shlib_version" => "3", "sourcedir" => ".", "target" => "aix64-gcc-as", - "version" => "3.0.13" + "version" => "3.0.9" ); our %target = ( "AR" => "ar -X64", @@ -389,7 +389,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -785,9 +784,6 @@ our %unified_info = ( "providers/fips" => { "fips" => "1" }, - "test/p_minimal" => { - "noinst" => "1" - }, "test/p_test" => { "noinst" => "1" } @@ -856,9 +852,6 @@ our %unified_info = ( "test/asn1_internal_test" => { "noinst" => "1" }, - "test/asn1_stable_parse_test" => { - "noinst" => "1" - }, "test/asn1_string_table_test" => { "noinst" => "1" }, @@ -1048,9 +1041,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -1636,9 +1626,6 @@ our %unified_info = ( "VPAES_ASM", "X25519_ASM" ], - "test/evp_extra_test" => [ - "STATIC_LEGACY" - ], "test/provider_internal_test" => [ "PROVIDER_INIT_FUNCTION_NAME=p_test_init" ], @@ -2392,9 +2379,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -2692,9 +2676,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -3463,9 +3444,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -3760,9 +3738,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -3796,12 +3771,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -4786,9 +4755,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -5086,9 +5052,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -5857,9 +5820,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -6154,9 +6114,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -6190,12 +6147,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -7193,10 +7144,6 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], - "test/asn1_stable_parse_test" => [ - "libcrypto", - "test/libtestutil.a" - ], "test/asn1_string_table_test" => [ "libcrypto", "test/libtestutil.a" @@ -7450,10 +7397,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -7719,8 +7662,6 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "libcrypto.a", - "providers/libcommon.a", - "providers/liblegacy.a", "test/libtestutil.a" ], "test/evp_extra_test2" => [ @@ -9822,7 +9763,6 @@ our %unified_info = ( }, "providers" => { "deps" => [ - "providers/evp_extra_test-bin-legacyprov.o", "providers/libcrypto-lib-baseprov.o", "providers/libcrypto-lib-defltprov.o", "providers/libcrypto-lib-nullprov.o", @@ -9830,9 +9770,6 @@ our %unified_info = ( "providers/libdefault.a" ], "products" => { - "bin" => [ - "test/evp_extra_test" - ], "dso" => [ "providers/fips", "providers/legacy" @@ -10269,7 +10206,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10320,7 +10256,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -11452,9 +11387,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -11752,9 +11684,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -12523,9 +12452,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -12820,9 +12746,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -12856,12 +12779,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -13846,9 +13763,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -14146,9 +14060,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -14917,9 +14828,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -15214,9 +15122,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -15250,12 +15155,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -16284,10 +16183,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16364,9 +16259,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "whrlpool" ], - "test/p_minimal.ld" => [ - "util/providers.num" - ], "test/p_test.ld" => [ "util/providers.num" ], @@ -16532,7 +16424,6 @@ our %unified_info = ( "doc/html/man3/CMS_get1_ReceiptRequest.html", "doc/html/man3/CMS_sign.html", "doc/html/man3/CMS_sign_receipt.html", - "doc/html/man3/CMS_signed_get_attr.html", "doc/html/man3/CMS_uncompress.html", "doc/html/man3/CMS_verify.html", "doc/html/man3/CMS_verify_receipt.html", @@ -16632,7 +16523,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_encapsulate.html", "doc/html/man3/EVP_PKEY_encrypt.html", "doc/html/man3/EVP_PKEY_fromdata.html", - "doc/html/man3/EVP_PKEY_get_attr.html", "doc/html/man3/EVP_PKEY_get_default_digest_nid.html", "doc/html/man3/EVP_PKEY_get_field_type.html", "doc/html/man3/EVP_PKEY_get_group_name.html", @@ -16889,7 +16779,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -16988,7 +16877,6 @@ our %unified_info = ( "doc/html/man3/X509V3_get_d2i.html", "doc/html/man3/X509V3_set_ctx.html", "doc/html/man3/X509_ALGOR_dup.html", - "doc/html/man3/X509_ATTRIBUTE.html", "doc/html/man3/X509_CRL_get0_by_serial.html", "doc/html/man3/X509_EXTENSION_set_object.html", "doc/html/man3/X509_LOOKUP.html", @@ -17000,8 +16888,6 @@ our %unified_info = ( "doc/html/man3/X509_NAME_get_index_by_NID.html", "doc/html/man3/X509_NAME_print_ex.html", "doc/html/man3/X509_PUBKEY_new.html", - "doc/html/man3/X509_REQ_get_attr.html", - "doc/html/man3/X509_REQ_get_extensions.html", "doc/html/man3/X509_SIG_get0.html", "doc/html/man3/X509_STORE_CTX_get_error.html", "doc/html/man3/X509_STORE_CTX_new.html", @@ -18299,10 +18185,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/asn1_stable_parse_test" => [ - "include", - "apps/include" - ], "test/asn1_string_table_test" => [ "include", "apps/include" @@ -18510,9 +18392,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -18772,9 +18651,7 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "include", - "apps/include", - "providers/common/include", - "providers/implementations/include" + "apps/include" ], "test/evp_extra_test2" => [ "include", @@ -19031,10 +18908,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/p_minimal" => [ - "include", - "." - ], "test/p_test" => [ "include", "." @@ -19524,7 +19397,6 @@ our %unified_info = ( "doc/man/man3/CMS_get1_ReceiptRequest.3", "doc/man/man3/CMS_sign.3", "doc/man/man3/CMS_sign_receipt.3", - "doc/man/man3/CMS_signed_get_attr.3", "doc/man/man3/CMS_uncompress.3", "doc/man/man3/CMS_verify.3", "doc/man/man3/CMS_verify_receipt.3", @@ -19624,7 +19496,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_encapsulate.3", "doc/man/man3/EVP_PKEY_encrypt.3", "doc/man/man3/EVP_PKEY_fromdata.3", - "doc/man/man3/EVP_PKEY_get_attr.3", "doc/man/man3/EVP_PKEY_get_default_digest_nid.3", "doc/man/man3/EVP_PKEY_get_field_type.3", "doc/man/man3/EVP_PKEY_get_group_name.3", @@ -19881,7 +19752,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -19980,7 +19850,6 @@ our %unified_info = ( "doc/man/man3/X509V3_get_d2i.3", "doc/man/man3/X509V3_set_ctx.3", "doc/man/man3/X509_ALGOR_dup.3", - "doc/man/man3/X509_ATTRIBUTE.3", "doc/man/man3/X509_CRL_get0_by_serial.3", "doc/man/man3/X509_EXTENSION_set_object.3", "doc/man/man3/X509_LOOKUP.3", @@ -19992,8 +19861,6 @@ our %unified_info = ( "doc/man/man3/X509_NAME_get_index_by_NID.3", "doc/man/man3/X509_NAME_print_ex.3", "doc/man/man3/X509_PUBKEY_new.3", - "doc/man/man3/X509_REQ_get_attr.3", - "doc/man/man3/X509_REQ_get_extensions.3", "doc/man/man3/X509_SIG_get0.3", "doc/man/man3/X509_STORE_CTX_get_error.3", "doc/man/man3/X509_STORE_CTX_new.3", @@ -20177,7 +20044,6 @@ our %unified_info = ( "modules" => [ "providers/fips", "providers/legacy", - "test/p_minimal", "test/p_test" ], "programs" => [ @@ -20203,7 +20069,6 @@ our %unified_info = ( "test/asn1_dsa_internal_test", "test/asn1_encode_test", "test/asn1_internal_test", - "test/asn1_stable_parse_test", "test/asn1_string_table_test", "test/asn1_time_test", "test/asynciotest", @@ -20267,7 +20132,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24527,7 +24391,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24554,7 +24417,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -24656,9 +24518,6 @@ our %unified_info = ( "providers/common/libfips-lib-securitycheck_fips.o" => [ "providers/common/securitycheck_fips.c" ], - "providers/evp_extra_test-bin-legacyprov.o" => [ - "providers/legacyprov.c" - ], "providers/fips" => [ "providers/fips.ld", "providers/fips/fips-dso-fips_entry.o" @@ -25812,9 +25671,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25896,9 +25752,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25956,12 +25809,6 @@ our %unified_info = ( "test/asn1_internal_test-bin-asn1_internal_test.o" => [ "test/asn1_internal_test.c" ], - "test/asn1_stable_parse_test" => [ - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" - ], - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" => [ - "test/asn1_stable_parse_test.c" - ], "test/asn1_string_table_test" => [ "test/asn1_string_table_test-bin-asn1_string_table_test.o" ], @@ -26341,12 +26188,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -26745,7 +26586,6 @@ our %unified_info = ( "test/errtest.c" ], "test/evp_extra_test" => [ - "providers/evp_extra_test-bin-legacyprov.o", "test/evp_extra_test-bin-evp_extra_test.o" ], "test/evp_extra_test-bin-evp_extra_test.o" => [ @@ -27036,13 +26876,6 @@ our %unified_info = ( "test/ossl_store_test-bin-ossl_store_test.o" => [ "test/ossl_store_test.c" ], - "test/p_minimal" => [ - "test/p_minimal-dso-p_minimal.o", - "test/p_minimal.ld" - ], - "test/p_minimal-dso-p_minimal.o" => [ - "test/p_minimal.c" - ], "test/p_test" => [ "test/p_test-dso-p_test.o", "test/p_test.ld" @@ -27729,8 +27562,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27757,7 +27590,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27774,8 +27607,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/crypto/buildinf.h index aa9a492f1..031c3aac1 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: aix64-gcc-as" -#define DATE "built on: Wed Jan 31 12:57:05 2024 UTC" +#define DATE "built on: Tue Aug 6 12:20:22 2024 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/include/openssl/bio.h b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/include/openssl/bio.h index f9aa74731..e16cf622c 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/include/openssl/bio.h +++ b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/include/openssl/bio.h @@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, - int (*ossl_gets) (BIO *, char *, int)); + int (*gets) (BIO *, char *, int)); long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); diff --git a/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/include/openssl/opensslv.h index 65f3bfa05..5bb97d596 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 13 +# define OPENSSL_VERSION_PATCH 9 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.13" -# define OPENSSL_FULL_VERSION_STR "3.0.13+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "30 Jan 2024" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13+quic 30 Jan 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/include/openssl/pkcs7.h b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/include/openssl/pkcs7.h index 0ce79bf4f..557a0a726 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/include/openssl/pkcs7.h +++ b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/include/openssl/pkcs7.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/pkcs7.h.in * - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -56,8 +56,8 @@ typedef struct pkcs7_signer_info_st { PKCS7_ISSUER_AND_SERIAL *issuer_and_serial; X509_ALGOR *digest_alg; STACK_OF(X509_ATTRIBUTE) *auth_attr; /* [ 0 ] */ - X509_ALGOR *digest_enc_alg; /* confusing name, actually used for signing */ - ASN1_OCTET_STRING *enc_digest; /* confusing name, actually signature */ + X509_ALGOR *digest_enc_alg; + ASN1_OCTET_STRING *enc_digest; STACK_OF(X509_ATTRIBUTE) *unauth_attr; /* [ 1 ] */ /* The private key to sign with */ EVP_PKEY *pkey; diff --git a/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/include/openssl/ssl.h index 0f1915755..3df725c56 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/include/openssl/ssl.h +++ b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/openssl.gypi b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/openssl.gypi index ab4157db9..912a5ae1d 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cbc.c', 'openssl/crypto/aes/aes_cfb.c', diff --git a/deps/openssl/config/archs/aix64-gcc-as/no-asm/configdata.pm b/deps/openssl/config/archs/aix64-gcc-as/no-asm/configdata.pm index e0fe47f3f..9ccafe709 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/no-asm/configdata.pm +++ b/deps/openssl/config/archs/aix64-gcc-as/no-asm/configdata.pm @@ -139,7 +139,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [], @@ -154,7 +154,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.13+quic", + "full_version" => "3.0.9", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -205,7 +205,7 @@ our %config = ( ], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "13", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -258,11 +258,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "30 Jan 2024", - "shlib_version" => "81.3", + "release_date" => "30 May 2023", + "shlib_version" => "3", "sourcedir" => ".", "target" => "aix64-gcc-as", - "version" => "3.0.13" + "version" => "3.0.9" ); our %target = ( "AR" => "ar -X64", @@ -389,7 +389,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -786,9 +785,6 @@ our %unified_info = ( "providers/fips" => { "fips" => "1" }, - "test/p_minimal" => { - "noinst" => "1" - }, "test/p_test" => { "noinst" => "1" } @@ -857,9 +853,6 @@ our %unified_info = ( "test/asn1_internal_test" => { "noinst" => "1" }, - "test/asn1_stable_parse_test" => { - "noinst" => "1" - }, "test/asn1_string_table_test" => { "noinst" => "1" }, @@ -1049,9 +1042,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -1599,9 +1589,6 @@ our %unified_info = ( "providers/libfips.a" => [ "FIPS_MODULE" ], - "test/evp_extra_test" => [ - "STATIC_LEGACY" - ], "test/provider_internal_test" => [ "PROVIDER_INIT_FUNCTION_NAME=p_test_init" ], @@ -2355,9 +2342,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -2655,9 +2639,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -3426,9 +3407,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -3723,9 +3701,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -3759,12 +3734,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -4749,9 +4718,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -5049,9 +5015,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -5820,9 +5783,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -6117,9 +6077,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -6153,12 +6110,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -7156,10 +7107,6 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], - "test/asn1_stable_parse_test" => [ - "libcrypto", - "test/libtestutil.a" - ], "test/asn1_string_table_test" => [ "libcrypto", "test/libtestutil.a" @@ -7413,10 +7360,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -7682,8 +7625,6 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "libcrypto.a", - "providers/libcommon.a", - "providers/liblegacy.a", "test/libtestutil.a" ], "test/evp_extra_test2" => [ @@ -9747,7 +9688,6 @@ our %unified_info = ( }, "providers" => { "deps" => [ - "providers/evp_extra_test-bin-legacyprov.o", "providers/libcrypto-lib-baseprov.o", "providers/libcrypto-lib-defltprov.o", "providers/libcrypto-lib-nullprov.o", @@ -9755,9 +9695,6 @@ our %unified_info = ( "providers/libdefault.a" ], "products" => { - "bin" => [ - "test/evp_extra_test" - ], "dso" => [ "providers/fips", "providers/legacy" @@ -10194,7 +10131,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10245,7 +10181,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -11377,9 +11312,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -11677,9 +11609,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -12448,9 +12377,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -12745,9 +12671,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -12781,12 +12704,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -13771,9 +13688,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -14071,9 +13985,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -14842,9 +14753,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -15139,9 +15047,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -15175,12 +15080,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -16209,10 +16108,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16289,9 +16184,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "whrlpool" ], - "test/p_minimal.ld" => [ - "util/providers.num" - ], "test/p_test.ld" => [ "util/providers.num" ], @@ -16457,7 +16349,6 @@ our %unified_info = ( "doc/html/man3/CMS_get1_ReceiptRequest.html", "doc/html/man3/CMS_sign.html", "doc/html/man3/CMS_sign_receipt.html", - "doc/html/man3/CMS_signed_get_attr.html", "doc/html/man3/CMS_uncompress.html", "doc/html/man3/CMS_verify.html", "doc/html/man3/CMS_verify_receipt.html", @@ -16557,7 +16448,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_encapsulate.html", "doc/html/man3/EVP_PKEY_encrypt.html", "doc/html/man3/EVP_PKEY_fromdata.html", - "doc/html/man3/EVP_PKEY_get_attr.html", "doc/html/man3/EVP_PKEY_get_default_digest_nid.html", "doc/html/man3/EVP_PKEY_get_field_type.html", "doc/html/man3/EVP_PKEY_get_group_name.html", @@ -16814,7 +16704,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -16913,7 +16802,6 @@ our %unified_info = ( "doc/html/man3/X509V3_get_d2i.html", "doc/html/man3/X509V3_set_ctx.html", "doc/html/man3/X509_ALGOR_dup.html", - "doc/html/man3/X509_ATTRIBUTE.html", "doc/html/man3/X509_CRL_get0_by_serial.html", "doc/html/man3/X509_EXTENSION_set_object.html", "doc/html/man3/X509_LOOKUP.html", @@ -16925,8 +16813,6 @@ our %unified_info = ( "doc/html/man3/X509_NAME_get_index_by_NID.html", "doc/html/man3/X509_NAME_print_ex.html", "doc/html/man3/X509_PUBKEY_new.html", - "doc/html/man3/X509_REQ_get_attr.html", - "doc/html/man3/X509_REQ_get_extensions.html", "doc/html/man3/X509_SIG_get0.html", "doc/html/man3/X509_STORE_CTX_get_error.html", "doc/html/man3/X509_STORE_CTX_new.html", @@ -18224,10 +18110,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/asn1_stable_parse_test" => [ - "include", - "apps/include" - ], "test/asn1_string_table_test" => [ "include", "apps/include" @@ -18435,9 +18317,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -18697,9 +18576,7 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "include", - "apps/include", - "providers/common/include", - "providers/implementations/include" + "apps/include" ], "test/evp_extra_test2" => [ "include", @@ -18956,10 +18833,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/p_minimal" => [ - "include", - "." - ], "test/p_test" => [ "include", "." @@ -19449,7 +19322,6 @@ our %unified_info = ( "doc/man/man3/CMS_get1_ReceiptRequest.3", "doc/man/man3/CMS_sign.3", "doc/man/man3/CMS_sign_receipt.3", - "doc/man/man3/CMS_signed_get_attr.3", "doc/man/man3/CMS_uncompress.3", "doc/man/man3/CMS_verify.3", "doc/man/man3/CMS_verify_receipt.3", @@ -19549,7 +19421,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_encapsulate.3", "doc/man/man3/EVP_PKEY_encrypt.3", "doc/man/man3/EVP_PKEY_fromdata.3", - "doc/man/man3/EVP_PKEY_get_attr.3", "doc/man/man3/EVP_PKEY_get_default_digest_nid.3", "doc/man/man3/EVP_PKEY_get_field_type.3", "doc/man/man3/EVP_PKEY_get_group_name.3", @@ -19806,7 +19677,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -19905,7 +19775,6 @@ our %unified_info = ( "doc/man/man3/X509V3_get_d2i.3", "doc/man/man3/X509V3_set_ctx.3", "doc/man/man3/X509_ALGOR_dup.3", - "doc/man/man3/X509_ATTRIBUTE.3", "doc/man/man3/X509_CRL_get0_by_serial.3", "doc/man/man3/X509_EXTENSION_set_object.3", "doc/man/man3/X509_LOOKUP.3", @@ -19917,8 +19786,6 @@ our %unified_info = ( "doc/man/man3/X509_NAME_get_index_by_NID.3", "doc/man/man3/X509_NAME_print_ex.3", "doc/man/man3/X509_PUBKEY_new.3", - "doc/man/man3/X509_REQ_get_attr.3", - "doc/man/man3/X509_REQ_get_extensions.3", "doc/man/man3/X509_SIG_get0.3", "doc/man/man3/X509_STORE_CTX_get_error.3", "doc/man/man3/X509_STORE_CTX_new.3", @@ -20102,7 +19969,6 @@ our %unified_info = ( "modules" => [ "providers/fips", "providers/legacy", - "test/p_minimal", "test/p_test" ], "programs" => [ @@ -20128,7 +19994,6 @@ our %unified_info = ( "test/asn1_dsa_internal_test", "test/asn1_encode_test", "test/asn1_internal_test", - "test/asn1_stable_parse_test", "test/asn1_string_table_test", "test/asn1_time_test", "test/asynciotest", @@ -20192,7 +20057,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24317,7 +24181,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24344,7 +24207,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -24446,9 +24308,6 @@ our %unified_info = ( "providers/common/libfips-lib-securitycheck_fips.o" => [ "providers/common/securitycheck_fips.c" ], - "providers/evp_extra_test-bin-legacyprov.o" => [ - "providers/legacyprov.c" - ], "providers/fips" => [ "providers/fips.ld", "providers/fips/fips-dso-fips_entry.o" @@ -25585,9 +25444,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25669,9 +25525,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25729,12 +25582,6 @@ our %unified_info = ( "test/asn1_internal_test-bin-asn1_internal_test.o" => [ "test/asn1_internal_test.c" ], - "test/asn1_stable_parse_test" => [ - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" - ], - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" => [ - "test/asn1_stable_parse_test.c" - ], "test/asn1_string_table_test" => [ "test/asn1_string_table_test-bin-asn1_string_table_test.o" ], @@ -26114,12 +25961,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -26518,7 +26359,6 @@ our %unified_info = ( "test/errtest.c" ], "test/evp_extra_test" => [ - "providers/evp_extra_test-bin-legacyprov.o", "test/evp_extra_test-bin-evp_extra_test.o" ], "test/evp_extra_test-bin-evp_extra_test.o" => [ @@ -26809,13 +26649,6 @@ our %unified_info = ( "test/ossl_store_test-bin-ossl_store_test.o" => [ "test/ossl_store_test.c" ], - "test/p_minimal" => [ - "test/p_minimal-dso-p_minimal.o", - "test/p_minimal.ld" - ], - "test/p_minimal-dso-p_minimal.o" => [ - "test/p_minimal.c" - ], "test/p_test" => [ "test/p_test-dso-p_test.o", "test/p_test.ld" @@ -27505,8 +27338,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27533,7 +27366,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27550,8 +27383,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/aix64-gcc-as/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/aix64-gcc-as/no-asm/crypto/buildinf.h index 5a1f77c7b..d3bf5ff98 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/aix64-gcc-as/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: aix64-gcc-as" -#define DATE "built on: Wed Jan 31 12:57:17 2024 UTC" +#define DATE "built on: Tue Aug 6 12:20:33 2024 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/aix64-gcc-as/no-asm/include/openssl/bio.h b/deps/openssl/config/archs/aix64-gcc-as/no-asm/include/openssl/bio.h index f9aa74731..e16cf622c 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/no-asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/aix64-gcc-as/no-asm/include/openssl/bio.h @@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, - int (*ossl_gets) (BIO *, char *, int)); + int (*gets) (BIO *, char *, int)); long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); diff --git a/deps/openssl/config/archs/aix64-gcc-as/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/aix64-gcc-as/no-asm/include/openssl/opensslv.h index 65f3bfa05..5bb97d596 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/no-asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/aix64-gcc-as/no-asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 13 +# define OPENSSL_VERSION_PATCH 9 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.13" -# define OPENSSL_FULL_VERSION_STR "3.0.13+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "30 Jan 2024" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13+quic 30 Jan 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/aix64-gcc-as/no-asm/include/openssl/pkcs7.h b/deps/openssl/config/archs/aix64-gcc-as/no-asm/include/openssl/pkcs7.h index 0ce79bf4f..557a0a726 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/no-asm/include/openssl/pkcs7.h +++ b/deps/openssl/config/archs/aix64-gcc-as/no-asm/include/openssl/pkcs7.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/pkcs7.h.in * - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -56,8 +56,8 @@ typedef struct pkcs7_signer_info_st { PKCS7_ISSUER_AND_SERIAL *issuer_and_serial; X509_ALGOR *digest_alg; STACK_OF(X509_ATTRIBUTE) *auth_attr; /* [ 0 ] */ - X509_ALGOR *digest_enc_alg; /* confusing name, actually used for signing */ - ASN1_OCTET_STRING *enc_digest; /* confusing name, actually signature */ + X509_ALGOR *digest_enc_alg; + ASN1_OCTET_STRING *enc_digest; STACK_OF(X509_ATTRIBUTE) *unauth_attr; /* [ 1 ] */ /* The private key to sign with */ EVP_PKEY *pkey; diff --git a/deps/openssl/config/archs/aix64-gcc-as/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/aix64-gcc-as/no-asm/include/openssl/ssl.h index 0f1915755..3df725c56 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/no-asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/aix64-gcc-as/no-asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/aix64-gcc-as/no-asm/openssl.gypi b/deps/openssl/config/archs/aix64-gcc-as/no-asm/openssl.gypi index 150635d1c..9cc458219 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/aix64-gcc-as/no-asm/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cbc.c', 'openssl/crypto/aes/aes_cfb.c', diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/configdata.pm b/deps/openssl/config/archs/darwin-i386-cc/asm/configdata.pm index 609612b69..514b59408 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/configdata.pm +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/configdata.pm @@ -139,7 +139,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -156,7 +156,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.13+quic", + "full_version" => "3.0.9", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,7 +206,7 @@ our %config = ( ], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "13", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -258,11 +258,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "30 Jan 2024", - "shlib_version" => "81.3", + "release_date" => "30 May 2023", + "shlib_version" => "3", "sourcedir" => ".", "target" => "darwin-i386-cc", - "version" => "3.0.13" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -387,7 +387,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -783,9 +782,6 @@ our %unified_info = ( "providers/fips" => { "fips" => "1" }, - "test/p_minimal" => { - "noinst" => "1" - }, "test/p_test" => { "noinst" => "1" } @@ -854,9 +850,6 @@ our %unified_info = ( "test/asn1_internal_test" => { "noinst" => "1" }, - "test/asn1_stable_parse_test" => { - "noinst" => "1" - }, "test/asn1_string_table_test" => { "noinst" => "1" }, @@ -1046,9 +1039,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -1604,7 +1594,6 @@ our %unified_info = ( "OPENSSL_IA32_SSE2", "PADLOCK_ASM", "POLY1305_ASM", - "RC4_ASM", "RMD160_ASM", "SHA1_ASM", "SHA256_ASM", @@ -1652,11 +1641,7 @@ our %unified_info = ( "VPAES_ASM" ], "providers/liblegacy.a" => [ - "MD5_ASM", - "RC4_ASM" - ], - "test/evp_extra_test" => [ - "STATIC_LEGACY" + "MD5_ASM" ], "test/provider_internal_test" => [ "PROVIDER_INIT_FUNCTION_NAME=p_test_init" @@ -2411,9 +2396,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -2711,9 +2693,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -3482,9 +3461,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -3779,9 +3755,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -3815,12 +3788,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -4805,9 +4772,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -5105,9 +5069,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -5876,9 +5837,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -6173,9 +6131,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -6209,12 +6164,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -7204,10 +7153,6 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], - "test/asn1_stable_parse_test" => [ - "libcrypto", - "test/libtestutil.a" - ], "test/asn1_string_table_test" => [ "libcrypto", "test/libtestutil.a" @@ -7461,10 +7406,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -7730,8 +7671,6 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "libcrypto.a", - "providers/libcommon.a", - "providers/liblegacy.a", "test/libtestutil.a" ], "test/evp_extra_test2" => [ @@ -9817,7 +9756,6 @@ our %unified_info = ( }, "providers" => { "deps" => [ - "providers/evp_extra_test-bin-legacyprov.o", "providers/libcrypto-lib-baseprov.o", "providers/libcrypto-lib-defltprov.o", "providers/libcrypto-lib-nullprov.o", @@ -9825,9 +9763,6 @@ our %unified_info = ( "providers/libdefault.a" ], "products" => { - "bin" => [ - "test/evp_extra_test" - ], "dso" => [ "providers/legacy" ], @@ -10263,7 +10198,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10314,7 +10248,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -11446,9 +11379,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -11746,9 +11676,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -12517,9 +12444,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -12814,9 +12738,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -12850,12 +12771,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -13840,9 +13755,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -14140,9 +14052,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -14911,9 +14820,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -15208,9 +15114,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -15244,12 +15147,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -16264,10 +16161,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16506,7 +16399,6 @@ our %unified_info = ( "doc/html/man3/CMS_get1_ReceiptRequest.html", "doc/html/man3/CMS_sign.html", "doc/html/man3/CMS_sign_receipt.html", - "doc/html/man3/CMS_signed_get_attr.html", "doc/html/man3/CMS_uncompress.html", "doc/html/man3/CMS_verify.html", "doc/html/man3/CMS_verify_receipt.html", @@ -16606,7 +16498,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_encapsulate.html", "doc/html/man3/EVP_PKEY_encrypt.html", "doc/html/man3/EVP_PKEY_fromdata.html", - "doc/html/man3/EVP_PKEY_get_attr.html", "doc/html/man3/EVP_PKEY_get_default_digest_nid.html", "doc/html/man3/EVP_PKEY_get_field_type.html", "doc/html/man3/EVP_PKEY_get_group_name.html", @@ -16863,7 +16754,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -16962,7 +16852,6 @@ our %unified_info = ( "doc/html/man3/X509V3_get_d2i.html", "doc/html/man3/X509V3_set_ctx.html", "doc/html/man3/X509_ALGOR_dup.html", - "doc/html/man3/X509_ATTRIBUTE.html", "doc/html/man3/X509_CRL_get0_by_serial.html", "doc/html/man3/X509_EXTENSION_set_object.html", "doc/html/man3/X509_LOOKUP.html", @@ -16974,8 +16863,6 @@ our %unified_info = ( "doc/html/man3/X509_NAME_get_index_by_NID.html", "doc/html/man3/X509_NAME_print_ex.html", "doc/html/man3/X509_PUBKEY_new.html", - "doc/html/man3/X509_REQ_get_attr.html", - "doc/html/man3/X509_REQ_get_extensions.html", "doc/html/man3/X509_SIG_get0.html", "doc/html/man3/X509_STORE_CTX_get_error.html", "doc/html/man3/X509_STORE_CTX_new.html", @@ -18265,10 +18152,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/asn1_stable_parse_test" => [ - "include", - "apps/include" - ], "test/asn1_string_table_test" => [ "include", "apps/include" @@ -18476,9 +18359,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -18738,9 +18618,7 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "include", - "apps/include", - "providers/common/include", - "providers/implementations/include" + "apps/include" ], "test/evp_extra_test2" => [ "include", @@ -18997,10 +18875,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/p_minimal" => [ - "include", - "." - ], "test/p_test" => [ "include", "." @@ -19490,7 +19364,6 @@ our %unified_info = ( "doc/man/man3/CMS_get1_ReceiptRequest.3", "doc/man/man3/CMS_sign.3", "doc/man/man3/CMS_sign_receipt.3", - "doc/man/man3/CMS_signed_get_attr.3", "doc/man/man3/CMS_uncompress.3", "doc/man/man3/CMS_verify.3", "doc/man/man3/CMS_verify_receipt.3", @@ -19590,7 +19463,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_encapsulate.3", "doc/man/man3/EVP_PKEY_encrypt.3", "doc/man/man3/EVP_PKEY_fromdata.3", - "doc/man/man3/EVP_PKEY_get_attr.3", "doc/man/man3/EVP_PKEY_get_default_digest_nid.3", "doc/man/man3/EVP_PKEY_get_field_type.3", "doc/man/man3/EVP_PKEY_get_group_name.3", @@ -19847,7 +19719,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -19946,7 +19817,6 @@ our %unified_info = ( "doc/man/man3/X509V3_get_d2i.3", "doc/man/man3/X509V3_set_ctx.3", "doc/man/man3/X509_ALGOR_dup.3", - "doc/man/man3/X509_ATTRIBUTE.3", "doc/man/man3/X509_CRL_get0_by_serial.3", "doc/man/man3/X509_EXTENSION_set_object.3", "doc/man/man3/X509_LOOKUP.3", @@ -19958,8 +19828,6 @@ our %unified_info = ( "doc/man/man3/X509_NAME_get_index_by_NID.3", "doc/man/man3/X509_NAME_print_ex.3", "doc/man/man3/X509_PUBKEY_new.3", - "doc/man/man3/X509_REQ_get_attr.3", - "doc/man/man3/X509_REQ_get_extensions.3", "doc/man/man3/X509_SIG_get0.3", "doc/man/man3/X509_STORE_CTX_get_error.3", "doc/man/man3/X509_STORE_CTX_new.3", @@ -20143,7 +20011,6 @@ our %unified_info = ( "modules" => [ "providers/fips", "providers/legacy", - "test/p_minimal", "test/p_test" ], "programs" => [ @@ -20169,7 +20036,6 @@ our %unified_info = ( "test/asn1_dsa_internal_test", "test/asn1_encode_test", "test/asn1_internal_test", - "test/asn1_stable_parse_test", "test/asn1_string_table_test", "test/asn1_time_test", "test/asynciotest", @@ -20233,7 +20099,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24436,7 +24301,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24463,7 +24327,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -24565,9 +24428,6 @@ our %unified_info = ( "providers/common/libfips-lib-securitycheck_fips.o" => [ "providers/common/securitycheck_fips.c" ], - "providers/evp_extra_test-bin-legacyprov.o" => [ - "providers/legacyprov.c" - ], "providers/fips" => [ "providers/fips/fips-dso-fips_entry.o" ], @@ -25712,9 +25572,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25796,9 +25653,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25856,12 +25710,6 @@ our %unified_info = ( "test/asn1_internal_test-bin-asn1_internal_test.o" => [ "test/asn1_internal_test.c" ], - "test/asn1_stable_parse_test" => [ - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" - ], - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" => [ - "test/asn1_stable_parse_test.c" - ], "test/asn1_string_table_test" => [ "test/asn1_string_table_test-bin-asn1_string_table_test.o" ], @@ -26241,12 +26089,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -26645,7 +26487,6 @@ our %unified_info = ( "test/errtest.c" ], "test/evp_extra_test" => [ - "providers/evp_extra_test-bin-legacyprov.o", "test/evp_extra_test-bin-evp_extra_test.o" ], "test/evp_extra_test-bin-evp_extra_test.o" => [ @@ -26936,12 +26777,6 @@ our %unified_info = ( "test/ossl_store_test-bin-ossl_store_test.o" => [ "test/ossl_store_test.c" ], - "test/p_minimal" => [ - "test/p_minimal-dso-p_minimal.o" - ], - "test/p_minimal-dso-p_minimal.o" => [ - "test/p_minimal.c" - ], "test/p_test" => [ "test/p_test-dso-p_test.o" ], @@ -27627,8 +27462,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27655,7 +27490,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27672,8 +27507,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/aes/aes-586.S b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/aes/aes-586.S index f474c45fd..e0eafe83f 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/aes/aes-586.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/aes/aes-586.S @@ -1,10 +1,10 @@ .text .align 4 __x86_AES_encrypt_compact: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl %edi,20(%esp) xorl (%edi),%eax @@ -263,10 +263,10 @@ L000loop: ret .align 4 __sse_AES_encrypt_compact: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pxor (%edi),%mm0 pxor 8(%edi),%mm4 @@ -423,10 +423,10 @@ L002out: ret .align 4 __x86_AES_encrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl %edi,20(%esp) xorl (%edi),%eax @@ -976,10 +976,10 @@ LAES_Te: .align 4 _AES_encrypt: L_AES_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1042,10 +1042,10 @@ L005x86: ret .align 4 __x86_AES_decrypt_compact: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl %edi,20(%esp) xorl (%edi),%eax @@ -1400,10 +1400,10 @@ L006loop: ret .align 4 __sse_AES_decrypt_compact: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pxor (%edi),%mm0 pxor 8(%edi),%mm4 @@ -1619,10 +1619,10 @@ L008out: ret .align 4 __x86_AES_decrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl %edi,20(%esp) xorl (%edi),%eax @@ -2176,10 +2176,10 @@ LAES_Td: .align 4 _AES_decrypt: L_AES_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2244,10 +2244,10 @@ L011x86: .align 4 _AES_cbc_encrypt: L_AES_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2778,10 +2778,10 @@ L039slow_dec_partial_x86: ret .align 4 __x86_AES_set_encrypt_key: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3013,10 +3013,10 @@ L045exit: .align 4 _AES_set_encrypt_key: L_AES_set_encrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call __x86_AES_set_encrypt_key ret @@ -3024,10 +3024,10 @@ L_AES_set_encrypt_key_begin: .align 4 _AES_set_decrypt_key: L_AES_set_decrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call __x86_AES_set_encrypt_key cmpl $0,%eax diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/aes/aesni-x86.S b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/aes/aesni-x86.S index 7a23ba959..cfb2150e4 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/aes/aesni-x86.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/aes/aesni-x86.S @@ -3,10 +3,10 @@ .align 4 _aesni_encrypt: L_aesni_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 12(%esp),%edx @@ -33,10 +33,10 @@ L000enc1_loop_1: .align 4 _aesni_decrypt: L_aesni_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 12(%esp),%edx @@ -61,10 +61,10 @@ L001dec1_loop_2: ret .align 4 __aesni_encrypt2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -91,10 +91,10 @@ L002enc2_loop: ret .align 4 __aesni_decrypt2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -121,10 +121,10 @@ L003dec2_loop: ret .align 4 __aesni_encrypt3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -156,10 +156,10 @@ L004enc3_loop: ret .align 4 __aesni_decrypt3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -191,10 +191,10 @@ L005dec3_loop: ret .align 4 __aesni_encrypt4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 movups 16(%edx),%xmm1 @@ -232,10 +232,10 @@ L006enc4_loop: ret .align 4 __aesni_decrypt4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 movups 16(%edx),%xmm1 @@ -273,10 +273,10 @@ L007dec4_loop: ret .align 4 __aesni_encrypt6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -330,10 +330,10 @@ L_aesni_encrypt6_enter: ret .align 4 __aesni_decrypt6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -389,10 +389,10 @@ L_aesni_decrypt6_enter: .align 4 _aesni_ecb_encrypt: L_aesni_ecb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -627,10 +627,10 @@ L012ecb_ret: .align 4 _aesni_ccm64_encrypt_blocks: L_aesni_ccm64_encrypt_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -718,10 +718,10 @@ L031ccm64_enc2_loop: .align 4 _aesni_ccm64_decrypt_blocks: L_aesni_ccm64_decrypt_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -844,10 +844,10 @@ L036enc1_loop_6: .align 4 _aesni_ctr32_encrypt_blocks: L_aesni_ctr32_encrypt_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1085,10 +1085,10 @@ L040ctr32_ret: .align 4 _aesni_xts_encrypt: L_aesni_xts_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1448,10 +1448,10 @@ L056xts_enc_ret: .align 4 _aesni_xts_decrypt: L_aesni_xts_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1841,10 +1841,10 @@ L069xts_dec_ret: .align 4 _aesni_ocb_encrypt: L_aesni_ocb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2239,10 +2239,10 @@ L078done: .align 4 _aesni_ocb_decrypt: L_aesni_ocb_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2637,10 +2637,10 @@ L088done: .align 4 _aesni_cbc_encrypt: L_aesni_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2899,10 +2899,10 @@ L094cbc_abort: ret .align 4 __aesni_set_encrypt_key: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3237,10 +3237,10 @@ L115bad_keybits: .align 4 _aesni_set_encrypt_key: L_aesni_set_encrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 8(%esp),%ecx @@ -3251,10 +3251,10 @@ L_aesni_set_encrypt_key_begin: .align 4 _aesni_set_decrypt_key: L_aesni_set_decrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 8(%esp),%ecx diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/aes/vpaes-x86.S b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/aes/vpaes-x86.S index 6e7c3afef..8ed38def8 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/aes/vpaes-x86.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/aes/vpaes-x86.S @@ -58,10 +58,10 @@ L_vpaes_consts: .align 6,0x90 .align 4 __vpaes_preheat: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif addl (%esp),%ebp movdqa -48(%ebp),%xmm7 @@ -69,10 +69,10 @@ __vpaes_preheat: ret .align 4 __vpaes_encrypt_core: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl $16,%ecx movl 240(%edx),%eax @@ -149,10 +149,10 @@ L000enc_entry: ret .align 4 __vpaes_decrypt_core: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif leal 608(%ebp),%ebx movl 240(%edx),%eax @@ -240,10 +240,10 @@ L002dec_entry: ret .align 4 __vpaes_schedule_core: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif addl (%esp),%ebp movdqu (%esi),%xmm0 @@ -337,10 +337,10 @@ L013schedule_mangle_last_dec: ret .align 4 __vpaes_schedule_192_smear: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pshufd $128,%xmm6,%xmm1 pshufd $254,%xmm7,%xmm0 @@ -352,10 +352,10 @@ __vpaes_schedule_192_smear: ret .align 4 __vpaes_schedule_round: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movdqa 8(%esp),%xmm2 pxor %xmm1,%xmm1 @@ -404,10 +404,10 @@ L_vpaes_schedule_low_round: ret .align 4 __vpaes_schedule_transform: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movdqa -16(%ebp),%xmm2 movdqa %xmm2,%xmm1 @@ -422,10 +422,10 @@ __vpaes_schedule_transform: ret .align 4 __vpaes_schedule_mangle: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movdqa %xmm0,%xmm4 movdqa 128(%ebp),%xmm5 @@ -486,10 +486,10 @@ L015schedule_mangle_both: .align 4 _vpaes_set_encrypt_key: L_vpaes_set_encrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -522,10 +522,10 @@ L016pic_point: .align 4 _vpaes_set_decrypt_key: L_vpaes_set_decrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -563,10 +563,10 @@ L017pic_point: .align 4 _vpaes_encrypt: L_vpaes_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -595,10 +595,10 @@ L018pic_point: .align 4 _vpaes_decrypt: L_vpaes_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -627,10 +627,10 @@ L019pic_point: .align 4 _vpaes_cbc_encrypt: L_vpaes_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bf/bf-586.S b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bf/bf-586.S index b049ee042..224e82f4f 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bf/bf-586.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bf/bf-586.S @@ -3,10 +3,10 @@ .align 4 _BF_encrypt: L_BF_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -356,10 +356,10 @@ L_BF_encrypt_begin: .align 4 _BF_decrypt: L_BF_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -709,10 +709,10 @@ L_BF_decrypt_begin: .align 4 _BF_cbc_encrypt: L_BF_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -777,55 +777,55 @@ L004PIC_point: xorl %edx,%edx jmp *%ebp L006ej7: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 6(%esi),%dh shll $8,%edx L007ej6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 5(%esi),%dh L008ej5: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 4(%esi),%dl L009ej4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%ecx jmp L010ejend L011ej3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 2(%esi),%ch shll $8,%ecx L012ej2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 1(%esi),%ch L013ej1: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb (%esi),%cl L010ejend: diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bn/bn-586.S b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bn/bn-586.S index 066935dd3..c68e429c8 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bn/bn-586.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bn/bn-586.S @@ -3,10 +3,10 @@ .align 4 _bn_mul_add_words: L_bn_mul_add_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call L000PIC_me_up L000PIC_me_up: @@ -289,10 +289,10 @@ L009maw_end: .align 4 _bn_mul_words: L_bn_mul_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call L010PIC_me_up L010PIC_me_up: @@ -474,10 +474,10 @@ L016mw_end: .align 4 _bn_sqr_words: L_bn_sqr_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call L017PIC_me_up L017PIC_me_up: @@ -618,10 +618,10 @@ L022sw_end: .align 4 _bn_div_words: L_bn_div_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%eax @@ -632,10 +632,10 @@ L_bn_div_words_begin: .align 4 _bn_add_words: L_bn_add_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -817,10 +817,10 @@ L025aw_end: .align 4 _bn_sub_words: L_bn_sub_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1002,10 +1002,10 @@ L028aw_end: .align 4 _bn_sub_part_words: L_bn_sub_part_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bn/co-586.S b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bn/co-586.S index 4dfecb94f..27f2f64b7 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bn/co-586.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bn/co-586.S @@ -3,10 +3,10 @@ .align 4 _bn_mul_comba8: L_bn_mul_comba8_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi movl 12(%esp),%esi @@ -550,10 +550,10 @@ L_bn_mul_comba8_begin: .align 4 _bn_mul_comba4: L_bn_mul_comba4_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi movl 12(%esp),%esi @@ -721,10 +721,10 @@ L_bn_mul_comba4_begin: .align 4 _bn_sqr_comba8: L_bn_sqr_comba8_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi @@ -1132,10 +1132,10 @@ L_bn_sqr_comba8_begin: .align 4 _bn_sqr_comba4: L_bn_sqr_comba4_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bn/x86-gf2m.S b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bn/x86-gf2m.S index 92bdaeac9..7e31dadc1 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bn/x86-gf2m.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bn/x86-gf2m.S @@ -1,10 +1,10 @@ .text .align 4 __mul_1x1_mmx: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif subl $36,%esp movl %eax,%ecx @@ -107,10 +107,10 @@ __mul_1x1_mmx: ret .align 4 __mul_1x1_ialu: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif subl $36,%esp movl %eax,%ecx @@ -244,10 +244,10 @@ __mul_1x1_ialu: .align 4 _bn_GF2m_mul_2x2: L_bn_GF2m_mul_2x2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call L000PIC_me_up L000PIC_me_up: diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bn/x86-mont.S b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bn/x86-mont.S index 7bca50014..4f5eef0e0 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bn/x86-mont.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bn/x86-mont.S @@ -3,10 +3,10 @@ .align 4 _bn_mul_mont: L_bn_mul_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/buildinf.h b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/buildinf.h index 491dfa9f4..ab256cb25 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: darwin-i386-cc" -#define DATE "built on: Wed Jan 31 12:59:31 2024 UTC" +#define DATE "built on: Tue Aug 6 12:22:36 2024 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/camellia/cmll-x86.S b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/camellia/cmll-x86.S index 088d99e88..d28a91962 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/camellia/cmll-x86.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/camellia/cmll-x86.S @@ -3,10 +3,10 @@ .align 4 _Camellia_EncryptBlock_Rounds: L_Camellia_EncryptBlock_Rounds_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -60,10 +60,10 @@ L000pic_point: .align 4 _Camellia_EncryptBlock: L_Camellia_EncryptBlock_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl $128,%eax subl 4(%esp),%eax @@ -75,10 +75,10 @@ L_Camellia_EncryptBlock_begin: .align 4 _Camellia_encrypt: L_Camellia_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -130,10 +130,10 @@ L001pic_point: ret .align 4 __x86_Camellia_encrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif xorl (%edi),%eax xorl 4(%edi),%ebx @@ -363,10 +363,10 @@ L003done: .align 4 _Camellia_DecryptBlock_Rounds: L_Camellia_DecryptBlock_Rounds_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -420,10 +420,10 @@ L004pic_point: .align 4 _Camellia_DecryptBlock: L_Camellia_DecryptBlock_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl $128,%eax subl 4(%esp),%eax @@ -435,10 +435,10 @@ L_Camellia_DecryptBlock_begin: .align 4 _Camellia_decrypt: L_Camellia_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -490,10 +490,10 @@ L005pic_point: ret .align 4 __x86_Camellia_decrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif xorl (%edi),%eax xorl 4(%edi),%ebx @@ -723,10 +723,10 @@ L007done: .align 4 _Camellia_Ekeygen: L_Camellia_Ekeygen_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1567,10 +1567,10 @@ L013done: .align 4 _Camellia_set_key: L_Camellia_set_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebx movl 8(%esp),%ecx @@ -2122,10 +2122,10 @@ LCamellia_SBOX: .align 4 _Camellia_cbc_encrypt: L_Camellia_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/chacha/chacha-x86.S b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/chacha/chacha-x86.S index fcc5df194..5f9bf22a9 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/chacha/chacha-x86.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/chacha/chacha-x86.S @@ -3,10 +3,10 @@ .align 4 _ChaCha20_ctr32: L_ChaCha20_ctr32_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -379,10 +379,10 @@ L000no_data: .align 4 _ChaCha20_ssse3: L_ChaCha20_ssse3_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -974,10 +974,10 @@ Lssse3_data: .align 4 _ChaCha20_xop: L_ChaCha20_xop_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/des/crypt586.S b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/des/crypt586.S index e059424fe..034b25752 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/des/crypt586.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/des/crypt586.S @@ -3,10 +3,10 @@ .align 4 _fcrypt_body: L_fcrypt_body_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/des/des-586.S b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/des/des-586.S index a0489166c..be8f83c14 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/des/des-586.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/des/des-586.S @@ -2,10 +2,10 @@ .globl _DES_SPtrans .align 4 __x86_DES_encrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ecx # Round 0 @@ -476,10 +476,10 @@ __x86_DES_encrypt: ret .align 4 __x86_DES_decrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ecx # Round 15 @@ -952,10 +952,10 @@ __x86_DES_decrypt: .align 4 _DES_encrypt1: L_DES_encrypt1_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi @@ -1068,10 +1068,10 @@ L002done: .align 4 _DES_encrypt2: L_DES_encrypt2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi @@ -1114,10 +1114,10 @@ L005done: .align 4 _DES_encrypt3: L_DES_encrypt3_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebx movl 8(%esp),%ebx @@ -1238,10 +1238,10 @@ L_DES_encrypt3_begin: .align 4 _DES_decrypt3: L_DES_decrypt3_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebx movl 8(%esp),%ebx @@ -1362,10 +1362,10 @@ L_DES_decrypt3_begin: .align 4 _DES_ncbc_encrypt: L_DES_ncbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -1428,55 +1428,55 @@ L010PIC_point: xorl %edx,%edx jmp *%ebp L012ej7: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 6(%esi),%dh shll $8,%edx L013ej6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 5(%esi),%dh L014ej5: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 4(%esi),%dl L015ej4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%ecx jmp L016ejend L017ej3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 2(%esi),%ch shll $8,%ecx L018ej2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 1(%esi),%ch L019ej1: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb (%esi),%cl L016ejend: @@ -1580,10 +1580,10 @@ L011cbc_enc_jmp_table: .align 4 _DES_ede3_cbc_encrypt: L_DES_ede3_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -1650,55 +1650,55 @@ L034PIC_point: xorl %edx,%edx jmp *%ebp L036ej7: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 6(%esi),%dh shll $8,%edx L037ej6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 5(%esi),%dh L038ej5: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 4(%esi),%dl L039ej4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%ecx jmp L040ejend L041ej3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 2(%esi),%ch shll $8,%ecx L042ej2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 1(%esi),%ch L043ej1: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb (%esi),%cl L040ejend: diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/ec/ecp_nistz256-x86.S b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/ec/ecp_nistz256-x86.S index 821f4fc12..b689c73ff 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/ec/ecp_nistz256-x86.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/ec/ecp_nistz256-x86.S @@ -2386,10 +2386,10 @@ LONE: .align 4 _ecp_nistz256_mul_by_2: L_ecp_nistz256_mul_by_2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2408,10 +2408,10 @@ L_ecp_nistz256_mul_by_2_begin: .align 4 _ecp_nistz256_mul_by_3: L_ecp_nistz256_mul_by_3_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2436,10 +2436,10 @@ L_ecp_nistz256_mul_by_3_begin: .align 4 _ecp_nistz256_div_by_2: L_ecp_nistz256_div_by_2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2455,10 +2455,10 @@ L_ecp_nistz256_div_by_2_begin: ret .align 4 __ecp_nistz256_div_by_2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%ebp xorl %edx,%edx @@ -2541,10 +2541,10 @@ __ecp_nistz256_div_by_2: .align 4 _ecp_nistz256_add: L_ecp_nistz256_add_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2561,10 +2561,10 @@ L_ecp_nistz256_add_begin: ret .align 4 __ecp_nistz256_add: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%eax movl 4(%esi),%ebx @@ -2641,10 +2641,10 @@ __ecp_nistz256_add: .align 4 _ecp_nistz256_sub: L_ecp_nistz256_sub_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2661,10 +2661,10 @@ L_ecp_nistz256_sub_begin: ret .align 4 __ecp_nistz256_sub: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%eax movl 4(%esi),%ebx @@ -2722,10 +2722,10 @@ __ecp_nistz256_sub: .align 4 _ecp_nistz256_neg: L_ecp_nistz256_neg_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2753,10 +2753,10 @@ L_ecp_nistz256_neg_begin: ret .align 4 __picup_eax: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esp),%eax ret @@ -2764,10 +2764,10 @@ __picup_eax: .align 4 _ecp_nistz256_to_mont: L_ecp_nistz256_to_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2790,10 +2790,10 @@ L000pic: .align 4 _ecp_nistz256_from_mont: L_ecp_nistz256_from_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2816,10 +2816,10 @@ L001pic: .align 4 _ecp_nistz256_mul_mont: L_ecp_nistz256_mul_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2842,10 +2842,10 @@ L002pic: .align 4 _ecp_nistz256_sqr_mont: L_ecp_nistz256_sqr_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2866,10 +2866,10 @@ L003pic: ret .align 4 __ecp_nistz256_mul_mont: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif andl $83886080,%eax cmpl $83886080,%eax @@ -3766,10 +3766,10 @@ L004mul_mont_ialu: .align 4 _ecp_nistz256_scatter_w5: L_ecp_nistz256_scatter_w5_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3802,10 +3802,10 @@ L006scatter_w5_loop: .align 4 _ecp_nistz256_gather_w5: L_ecp_nistz256_gather_w5_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3899,10 +3899,10 @@ L_ecp_nistz256_gather_w5_begin: .align 4 _ecp_nistz256_scatter_w7: L_ecp_nistz256_scatter_w7_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3933,10 +3933,10 @@ L007scatter_w7_loop: .align 4 _ecp_nistz256_gather_w7: L_ecp_nistz256_gather_w7_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -4150,10 +4150,10 @@ L_ecp_nistz256_gather_w7_begin: .align 4 _ecp_nistz256_point_double: L_ecp_nistz256_point_double_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -4279,10 +4279,10 @@ Lpoint_double_shortcut: .align 4 _ecp_nistz256_point_add: L_ecp_nistz256_point_add_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -4795,10 +4795,10 @@ L012add_done: .align 4 _ecp_nistz256_point_add_affine: L_ecp_nistz256_point_add_affine_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/md5/md5-586.S b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/md5/md5-586.S index 9ee5a8d80..3b6e2bcd6 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/md5/md5-586.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/md5/md5-586.S @@ -3,10 +3,10 @@ .align 4 _ossl_md5_block_asm_data_order: L_ossl_md5_block_asm_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/modes/ghash-x86.S b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/modes/ghash-x86.S index e06d1f7a0..af9992b13 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/modes/ghash-x86.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/modes/ghash-x86.S @@ -3,10 +3,10 @@ .align 4 _gcm_gmult_4bit_x86: L_gcm_gmult_4bit_x86_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -100,10 +100,10 @@ L001x86_break: .align 4 _gcm_ghash_4bit_x86: L_gcm_ghash_4bit_x86_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -212,10 +212,10 @@ L004x86_break: .align 4 _gcm_gmult_4bit_mmx: L_gcm_gmult_4bit_mmx_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -314,10 +314,10 @@ L007mmx_break: .align 4 _gcm_ghash_4bit_mmx: L_gcm_ghash_4bit_mmx_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -921,10 +921,10 @@ L009outer: .align 4 _gcm_init_clmul: L_gcm_init_clmul_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%eax @@ -993,10 +993,10 @@ L010pic: .align 4 _gcm_gmult_clmul: L_gcm_gmult_clmul_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 8(%esp),%edx @@ -1049,10 +1049,10 @@ L011pic: .align 4 _gcm_ghash_clmul: L_gcm_ghash_clmul_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/poly1305/poly1305-x86.S b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/poly1305/poly1305-x86.S index 96cf0c9fe..a875d95c1 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/poly1305/poly1305-x86.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/poly1305/poly1305-x86.S @@ -4,10 +4,10 @@ .align 4 _poly1305_init: L_poly1305_init_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -68,10 +68,10 @@ L000nokey: .align 4 _poly1305_blocks: L_poly1305_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -239,10 +239,10 @@ L003nodata: .align 4 _poly1305_emit: L_poly1305_emit_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -301,10 +301,10 @@ Lenter_emit: .align 5,0x90 .align 4 __poly1305_init_sse2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movdqu 24(%edi),%xmm4 leal 48(%edi),%edi @@ -506,10 +506,10 @@ L006square_break: .align 5,0x90 .align 4 __poly1305_blocks_sse2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1270,10 +1270,10 @@ L007nodata: .align 5,0x90 .align 4 __poly1305_emit_sse2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1366,10 +1366,10 @@ __poly1305_emit_sse2: .align 5,0x90 .align 4 __poly1305_init_avx2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif vmovdqu 24(%edi),%xmm4 leal 48(%edi),%edi @@ -1540,10 +1540,10 @@ L019square_break: .align 5,0x90 .align 4 __poly1305_blocks_avx2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/rc4/rc4-586.S b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/rc4/rc4-586.S index 380980855..36f7dcd44 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/rc4/rc4-586.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/rc4/rc4-586.S @@ -3,10 +3,10 @@ .align 4 _RC4: L_RC4_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -272,10 +272,10 @@ L000abort: .align 4 _RC4_set_key: L_RC4_set_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -353,10 +353,10 @@ L015exit: .align 4 _RC4_options: L_RC4_options_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call L018pic_point L018pic_point: diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/ripemd/rmd-586.S b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/ripemd/rmd-586.S index 2c284c730..e03283ada 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/ripemd/rmd-586.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/ripemd/rmd-586.S @@ -3,10 +3,10 @@ .align 4 _ripemd160_block_asm_data_order: L_ripemd160_block_asm_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%eax diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/sha/sha1-586.S b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/sha/sha1-586.S index feb96c11a..b7b5798f3 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/sha/sha1-586.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/sha/sha1-586.S @@ -3,10 +3,10 @@ .align 4 _sha1_block_data_order: L_sha1_block_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1400,10 +1400,10 @@ L002loop: ret .align 4 __sha1_block_data_order_shaext: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1573,10 +1573,10 @@ L004loop_shaext: ret .align 4 __sha1_block_data_order_ssse3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2795,10 +2795,10 @@ L007done: ret .align 4 __sha1_block_data_order_avx: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/sha/sha256-586.S b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/sha/sha256-586.S index e1dfe28d2..20b89b477 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/sha/sha256-586.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/sha/sha256-586.S @@ -3,10 +3,10 @@ .align 4 _sha256_block_data_order: L_sha256_block_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/sha/sha512-586.S b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/sha/sha512-586.S index f9eb6e285..aac95a47b 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/sha/sha512-586.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/sha/sha512-586.S @@ -3,10 +3,10 @@ .align 4 _sha512_block_data_order: L_sha512_block_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/whrlpool/wp-mmx.S b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/whrlpool/wp-mmx.S index 9804d68ba..0d1c56212 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/whrlpool/wp-mmx.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/whrlpool/wp-mmx.S @@ -3,10 +3,10 @@ .align 4 _whirlpool_block_mmx: L_whirlpool_block_mmx_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/x86cpuid.S b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/x86cpuid.S index 8e0719f37..aecd5dd75 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/x86cpuid.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/x86cpuid.S @@ -3,10 +3,10 @@ .align 4 _OPENSSL_ia32_cpuid: L_OPENSSL_ia32_cpuid_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -150,10 +150,10 @@ L000nocpuid: .align 4 _OPENSSL_rdtsc: L_OPENSSL_rdtsc_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif xorl %eax,%eax xorl %edx,%edx @@ -170,10 +170,10 @@ L010notsc: .align 4 _OPENSSL_instrument_halt: L_OPENSSL_instrument_halt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call L011PIC_me_up L011PIC_me_up: @@ -205,10 +205,10 @@ L012nohalt: .align 4 _OPENSSL_far_spin: L_OPENSSL_far_spin_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushfl popl %eax @@ -235,10 +235,10 @@ L013nospin: .align 4 _OPENSSL_wipe_cpu: L_OPENSSL_wipe_cpu_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif xorl %eax,%eax xorl %edx,%edx @@ -269,10 +269,10 @@ L016no_x87: .align 4 _OPENSSL_atomic_add: L_OPENSSL_atomic_add_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%ecx @@ -291,10 +291,10 @@ L018spin: .align 4 _OPENSSL_cleanse: L_OPENSSL_cleanse_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%ecx @@ -331,10 +331,10 @@ L022aligned: .align 4 _CRYPTO_memcmp: L_CRYPTO_memcmp_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi @@ -363,10 +363,10 @@ L023no_data: .align 4 _OPENSSL_instrument_bus: L_OPENSSL_instrument_bus_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -414,10 +414,10 @@ L026nogo: .align 4 _OPENSSL_instrument_bus2: L_OPENSSL_instrument_bus2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -478,10 +478,10 @@ L029nogo: .align 4 _OPENSSL_ia32_rdrand_bytes: L_OPENSSL_ia32_rdrand_bytes_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %ebx @@ -524,10 +524,10 @@ L032done: .align 4 _OPENSSL_ia32_rdseed_bytes: L_OPENSSL_ia32_rdseed_bytes_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %ebx diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/engines/e_padlock-x86.S b/deps/openssl/config/archs/darwin-i386-cc/asm/engines/e_padlock-x86.S index 9b7ebf7ad..26efbeac9 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/engines/e_padlock-x86.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/engines/e_padlock-x86.S @@ -3,10 +3,10 @@ .align 4 _padlock_capability: L_padlock_capability_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebx pushfl @@ -66,10 +66,10 @@ L000noluck: .align 4 _padlock_key_bswap: L_padlock_key_bswap_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 240(%edx),%ecx @@ -87,10 +87,10 @@ L003bswap_loop: .align 4 _padlock_verify_context: L_padlock_verify_context_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx leal Lpadlock_saved_context-L004verify_pic_point,%eax @@ -101,10 +101,10 @@ L004verify_pic_point: ret .align 4 __padlock_verify_ctx: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif addl (%esp),%eax btl $30,4(%esp) @@ -120,10 +120,10 @@ L005verified: .align 4 _padlock_reload_key: L_padlock_reload_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushfl popfl @@ -132,10 +132,10 @@ L_padlock_reload_key_begin: .align 4 _padlock_aes_block: L_padlock_aes_block_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -155,10 +155,10 @@ L_padlock_aes_block_begin: .align 4 _padlock_ecb_encrypt: L_padlock_ecb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -337,10 +337,10 @@ L006ecb_abort: .align 4 _padlock_cbc_encrypt: L_padlock_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -523,10 +523,10 @@ L018cbc_abort: .align 4 _padlock_cfb_encrypt: L_padlock_cfb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -648,10 +648,10 @@ L030cfb_abort: .align 4 _padlock_ofb_encrypt: L_padlock_ofb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -773,10 +773,10 @@ L039ofb_abort: .align 4 _padlock_ctr32_encrypt: L_padlock_ctr32_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -883,10 +883,10 @@ L048ctr32_abort: .align 4 _padlock_xstore: L_padlock_xstore_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi movl 8(%esp),%edi @@ -896,10 +896,10 @@ L_padlock_xstore_begin: ret .align 4 __win32_segv_handler: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl $1,%eax movl 4(%esp),%edx @@ -914,10 +914,10 @@ L055ret: .align 4 _padlock_sha1_oneshot: L_padlock_sha1_oneshot_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -948,10 +948,10 @@ L_padlock_sha1_oneshot_begin: .align 4 _padlock_sha1_blocks: L_padlock_sha1_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -981,10 +981,10 @@ L_padlock_sha1_blocks_begin: .align 4 _padlock_sha256_oneshot: L_padlock_sha256_oneshot_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -1015,10 +1015,10 @@ L_padlock_sha256_oneshot_begin: .align 4 _padlock_sha256_blocks: L_padlock_sha256_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -1048,10 +1048,10 @@ L_padlock_sha256_blocks_begin: .align 4 _padlock_sha512_blocks: L_padlock_sha512_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/bio.h b/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/bio.h index f9aa74731..e16cf622c 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/bio.h @@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, - int (*ossl_gets) (BIO *, char *, int)); + int (*gets) (BIO *, char *, int)); long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/opensslv.h index 65f3bfa05..5bb97d596 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 13 +# define OPENSSL_VERSION_PATCH 9 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.13" -# define OPENSSL_FULL_VERSION_STR "3.0.13+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "30 Jan 2024" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13+quic 30 Jan 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/pkcs7.h b/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/pkcs7.h index 0ce79bf4f..557a0a726 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/pkcs7.h +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/pkcs7.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/pkcs7.h.in * - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -56,8 +56,8 @@ typedef struct pkcs7_signer_info_st { PKCS7_ISSUER_AND_SERIAL *issuer_and_serial; X509_ALGOR *digest_alg; STACK_OF(X509_ATTRIBUTE) *auth_attr; /* [ 0 ] */ - X509_ALGOR *digest_enc_alg; /* confusing name, actually used for signing */ - ASN1_OCTET_STRING *enc_digest; /* confusing name, actually signature */ + X509_ALGOR *digest_enc_alg; + ASN1_OCTET_STRING *enc_digest; STACK_OF(X509_ATTRIBUTE) *unauth_attr; /* [ 1 ] */ /* The private key to sign with */ EVP_PKEY *pkey; diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/ssl.h b/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/ssl.h index 0f1915755..3df725c56 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/openssl-cl.gypi b/deps/openssl/config/archs/darwin-i386-cc/asm/openssl-cl.gypi index eeb54ba66..fa640617e 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/openssl-cl.gypi +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/openssl-cl.gypi @@ -17,7 +17,6 @@ 'OPENSSL_IA32_SSE2', 'PADLOCK_ASM', 'POLY1305_ASM', - 'RC4_ASM', 'RMD160_ASM', 'SHA1_ASM', 'SHA256_ASM', diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/openssl.gypi b/deps/openssl/config/archs/darwin-i386-cc/asm/openssl.gypi index 1fac08080..03e43f7fd 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/openssl.gypi +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cfb.c', 'openssl/crypto/aes/aes_ecb.c', @@ -990,7 +988,6 @@ 'OPENSSL_IA32_SSE2', 'PADLOCK_ASM', 'POLY1305_ASM', - 'RC4_ASM', 'RMD160_ASM', 'SHA1_ASM', 'SHA256_ASM', diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/configdata.pm b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/configdata.pm index d92a94efb..4f675f76c 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/configdata.pm @@ -139,7 +139,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -156,7 +156,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.13+quic", + "full_version" => "3.0.9", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,7 +206,7 @@ our %config = ( ], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "13", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -258,11 +258,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "30 Jan 2024", - "shlib_version" => "81.3", + "release_date" => "30 May 2023", + "shlib_version" => "3", "sourcedir" => ".", "target" => "darwin-i386-cc", - "version" => "3.0.13" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -387,7 +387,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -783,9 +782,6 @@ our %unified_info = ( "providers/fips" => { "fips" => "1" }, - "test/p_minimal" => { - "noinst" => "1" - }, "test/p_test" => { "noinst" => "1" } @@ -854,9 +850,6 @@ our %unified_info = ( "test/asn1_internal_test" => { "noinst" => "1" }, - "test/asn1_stable_parse_test" => { - "noinst" => "1" - }, "test/asn1_string_table_test" => { "noinst" => "1" }, @@ -1046,9 +1039,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -1604,7 +1594,6 @@ our %unified_info = ( "OPENSSL_IA32_SSE2", "PADLOCK_ASM", "POLY1305_ASM", - "RC4_ASM", "RMD160_ASM", "SHA1_ASM", "SHA256_ASM", @@ -1652,11 +1641,7 @@ our %unified_info = ( "VPAES_ASM" ], "providers/liblegacy.a" => [ - "MD5_ASM", - "RC4_ASM" - ], - "test/evp_extra_test" => [ - "STATIC_LEGACY" + "MD5_ASM" ], "test/provider_internal_test" => [ "PROVIDER_INIT_FUNCTION_NAME=p_test_init" @@ -2411,9 +2396,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -2711,9 +2693,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -3482,9 +3461,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -3779,9 +3755,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -3815,12 +3788,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -4805,9 +4772,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -5105,9 +5069,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -5876,9 +5837,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -6173,9 +6131,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -6209,12 +6164,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -7204,10 +7153,6 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], - "test/asn1_stable_parse_test" => [ - "libcrypto", - "test/libtestutil.a" - ], "test/asn1_string_table_test" => [ "libcrypto", "test/libtestutil.a" @@ -7461,10 +7406,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -7730,8 +7671,6 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "libcrypto.a", - "providers/libcommon.a", - "providers/liblegacy.a", "test/libtestutil.a" ], "test/evp_extra_test2" => [ @@ -9817,7 +9756,6 @@ our %unified_info = ( }, "providers" => { "deps" => [ - "providers/evp_extra_test-bin-legacyprov.o", "providers/libcrypto-lib-baseprov.o", "providers/libcrypto-lib-defltprov.o", "providers/libcrypto-lib-nullprov.o", @@ -9825,9 +9763,6 @@ our %unified_info = ( "providers/libdefault.a" ], "products" => { - "bin" => [ - "test/evp_extra_test" - ], "dso" => [ "providers/legacy" ], @@ -10263,7 +10198,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10314,7 +10248,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -11446,9 +11379,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -11746,9 +11676,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -12517,9 +12444,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -12814,9 +12738,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -12850,12 +12771,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -13840,9 +13755,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -14140,9 +14052,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -14911,9 +14820,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -15208,9 +15114,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -15244,12 +15147,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -16264,10 +16161,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16506,7 +16399,6 @@ our %unified_info = ( "doc/html/man3/CMS_get1_ReceiptRequest.html", "doc/html/man3/CMS_sign.html", "doc/html/man3/CMS_sign_receipt.html", - "doc/html/man3/CMS_signed_get_attr.html", "doc/html/man3/CMS_uncompress.html", "doc/html/man3/CMS_verify.html", "doc/html/man3/CMS_verify_receipt.html", @@ -16606,7 +16498,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_encapsulate.html", "doc/html/man3/EVP_PKEY_encrypt.html", "doc/html/man3/EVP_PKEY_fromdata.html", - "doc/html/man3/EVP_PKEY_get_attr.html", "doc/html/man3/EVP_PKEY_get_default_digest_nid.html", "doc/html/man3/EVP_PKEY_get_field_type.html", "doc/html/man3/EVP_PKEY_get_group_name.html", @@ -16863,7 +16754,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -16962,7 +16852,6 @@ our %unified_info = ( "doc/html/man3/X509V3_get_d2i.html", "doc/html/man3/X509V3_set_ctx.html", "doc/html/man3/X509_ALGOR_dup.html", - "doc/html/man3/X509_ATTRIBUTE.html", "doc/html/man3/X509_CRL_get0_by_serial.html", "doc/html/man3/X509_EXTENSION_set_object.html", "doc/html/man3/X509_LOOKUP.html", @@ -16974,8 +16863,6 @@ our %unified_info = ( "doc/html/man3/X509_NAME_get_index_by_NID.html", "doc/html/man3/X509_NAME_print_ex.html", "doc/html/man3/X509_PUBKEY_new.html", - "doc/html/man3/X509_REQ_get_attr.html", - "doc/html/man3/X509_REQ_get_extensions.html", "doc/html/man3/X509_SIG_get0.html", "doc/html/man3/X509_STORE_CTX_get_error.html", "doc/html/man3/X509_STORE_CTX_new.html", @@ -18265,10 +18152,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/asn1_stable_parse_test" => [ - "include", - "apps/include" - ], "test/asn1_string_table_test" => [ "include", "apps/include" @@ -18476,9 +18359,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -18738,9 +18618,7 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "include", - "apps/include", - "providers/common/include", - "providers/implementations/include" + "apps/include" ], "test/evp_extra_test2" => [ "include", @@ -18997,10 +18875,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/p_minimal" => [ - "include", - "." - ], "test/p_test" => [ "include", "." @@ -19490,7 +19364,6 @@ our %unified_info = ( "doc/man/man3/CMS_get1_ReceiptRequest.3", "doc/man/man3/CMS_sign.3", "doc/man/man3/CMS_sign_receipt.3", - "doc/man/man3/CMS_signed_get_attr.3", "doc/man/man3/CMS_uncompress.3", "doc/man/man3/CMS_verify.3", "doc/man/man3/CMS_verify_receipt.3", @@ -19590,7 +19463,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_encapsulate.3", "doc/man/man3/EVP_PKEY_encrypt.3", "doc/man/man3/EVP_PKEY_fromdata.3", - "doc/man/man3/EVP_PKEY_get_attr.3", "doc/man/man3/EVP_PKEY_get_default_digest_nid.3", "doc/man/man3/EVP_PKEY_get_field_type.3", "doc/man/man3/EVP_PKEY_get_group_name.3", @@ -19847,7 +19719,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -19946,7 +19817,6 @@ our %unified_info = ( "doc/man/man3/X509V3_get_d2i.3", "doc/man/man3/X509V3_set_ctx.3", "doc/man/man3/X509_ALGOR_dup.3", - "doc/man/man3/X509_ATTRIBUTE.3", "doc/man/man3/X509_CRL_get0_by_serial.3", "doc/man/man3/X509_EXTENSION_set_object.3", "doc/man/man3/X509_LOOKUP.3", @@ -19958,8 +19828,6 @@ our %unified_info = ( "doc/man/man3/X509_NAME_get_index_by_NID.3", "doc/man/man3/X509_NAME_print_ex.3", "doc/man/man3/X509_PUBKEY_new.3", - "doc/man/man3/X509_REQ_get_attr.3", - "doc/man/man3/X509_REQ_get_extensions.3", "doc/man/man3/X509_SIG_get0.3", "doc/man/man3/X509_STORE_CTX_get_error.3", "doc/man/man3/X509_STORE_CTX_new.3", @@ -20143,7 +20011,6 @@ our %unified_info = ( "modules" => [ "providers/fips", "providers/legacy", - "test/p_minimal", "test/p_test" ], "programs" => [ @@ -20169,7 +20036,6 @@ our %unified_info = ( "test/asn1_dsa_internal_test", "test/asn1_encode_test", "test/asn1_internal_test", - "test/asn1_stable_parse_test", "test/asn1_string_table_test", "test/asn1_time_test", "test/asynciotest", @@ -20233,7 +20099,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24436,7 +24301,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24463,7 +24327,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -24565,9 +24428,6 @@ our %unified_info = ( "providers/common/libfips-lib-securitycheck_fips.o" => [ "providers/common/securitycheck_fips.c" ], - "providers/evp_extra_test-bin-legacyprov.o" => [ - "providers/legacyprov.c" - ], "providers/fips" => [ "providers/fips/fips-dso-fips_entry.o" ], @@ -25712,9 +25572,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25796,9 +25653,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25856,12 +25710,6 @@ our %unified_info = ( "test/asn1_internal_test-bin-asn1_internal_test.o" => [ "test/asn1_internal_test.c" ], - "test/asn1_stable_parse_test" => [ - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" - ], - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" => [ - "test/asn1_stable_parse_test.c" - ], "test/asn1_string_table_test" => [ "test/asn1_string_table_test-bin-asn1_string_table_test.o" ], @@ -26241,12 +26089,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -26645,7 +26487,6 @@ our %unified_info = ( "test/errtest.c" ], "test/evp_extra_test" => [ - "providers/evp_extra_test-bin-legacyprov.o", "test/evp_extra_test-bin-evp_extra_test.o" ], "test/evp_extra_test-bin-evp_extra_test.o" => [ @@ -26936,12 +26777,6 @@ our %unified_info = ( "test/ossl_store_test-bin-ossl_store_test.o" => [ "test/ossl_store_test.c" ], - "test/p_minimal" => [ - "test/p_minimal-dso-p_minimal.o" - ], - "test/p_minimal-dso-p_minimal.o" => [ - "test/p_minimal.c" - ], "test/p_test" => [ "test/p_test-dso-p_test.o" ], @@ -27627,8 +27462,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27655,7 +27490,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27672,8 +27507,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/aes/aes-586.S b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/aes/aes-586.S index f474c45fd..e0eafe83f 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/aes/aes-586.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/aes/aes-586.S @@ -1,10 +1,10 @@ .text .align 4 __x86_AES_encrypt_compact: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl %edi,20(%esp) xorl (%edi),%eax @@ -263,10 +263,10 @@ L000loop: ret .align 4 __sse_AES_encrypt_compact: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pxor (%edi),%mm0 pxor 8(%edi),%mm4 @@ -423,10 +423,10 @@ L002out: ret .align 4 __x86_AES_encrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl %edi,20(%esp) xorl (%edi),%eax @@ -976,10 +976,10 @@ LAES_Te: .align 4 _AES_encrypt: L_AES_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1042,10 +1042,10 @@ L005x86: ret .align 4 __x86_AES_decrypt_compact: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl %edi,20(%esp) xorl (%edi),%eax @@ -1400,10 +1400,10 @@ L006loop: ret .align 4 __sse_AES_decrypt_compact: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pxor (%edi),%mm0 pxor 8(%edi),%mm4 @@ -1619,10 +1619,10 @@ L008out: ret .align 4 __x86_AES_decrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl %edi,20(%esp) xorl (%edi),%eax @@ -2176,10 +2176,10 @@ LAES_Td: .align 4 _AES_decrypt: L_AES_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2244,10 +2244,10 @@ L011x86: .align 4 _AES_cbc_encrypt: L_AES_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2778,10 +2778,10 @@ L039slow_dec_partial_x86: ret .align 4 __x86_AES_set_encrypt_key: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3013,10 +3013,10 @@ L045exit: .align 4 _AES_set_encrypt_key: L_AES_set_encrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call __x86_AES_set_encrypt_key ret @@ -3024,10 +3024,10 @@ L_AES_set_encrypt_key_begin: .align 4 _AES_set_decrypt_key: L_AES_set_decrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call __x86_AES_set_encrypt_key cmpl $0,%eax diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/aes/aesni-x86.S b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/aes/aesni-x86.S index 7a23ba959..cfb2150e4 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/aes/aesni-x86.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/aes/aesni-x86.S @@ -3,10 +3,10 @@ .align 4 _aesni_encrypt: L_aesni_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 12(%esp),%edx @@ -33,10 +33,10 @@ L000enc1_loop_1: .align 4 _aesni_decrypt: L_aesni_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 12(%esp),%edx @@ -61,10 +61,10 @@ L001dec1_loop_2: ret .align 4 __aesni_encrypt2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -91,10 +91,10 @@ L002enc2_loop: ret .align 4 __aesni_decrypt2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -121,10 +121,10 @@ L003dec2_loop: ret .align 4 __aesni_encrypt3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -156,10 +156,10 @@ L004enc3_loop: ret .align 4 __aesni_decrypt3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -191,10 +191,10 @@ L005dec3_loop: ret .align 4 __aesni_encrypt4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 movups 16(%edx),%xmm1 @@ -232,10 +232,10 @@ L006enc4_loop: ret .align 4 __aesni_decrypt4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 movups 16(%edx),%xmm1 @@ -273,10 +273,10 @@ L007dec4_loop: ret .align 4 __aesni_encrypt6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -330,10 +330,10 @@ L_aesni_encrypt6_enter: ret .align 4 __aesni_decrypt6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -389,10 +389,10 @@ L_aesni_decrypt6_enter: .align 4 _aesni_ecb_encrypt: L_aesni_ecb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -627,10 +627,10 @@ L012ecb_ret: .align 4 _aesni_ccm64_encrypt_blocks: L_aesni_ccm64_encrypt_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -718,10 +718,10 @@ L031ccm64_enc2_loop: .align 4 _aesni_ccm64_decrypt_blocks: L_aesni_ccm64_decrypt_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -844,10 +844,10 @@ L036enc1_loop_6: .align 4 _aesni_ctr32_encrypt_blocks: L_aesni_ctr32_encrypt_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1085,10 +1085,10 @@ L040ctr32_ret: .align 4 _aesni_xts_encrypt: L_aesni_xts_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1448,10 +1448,10 @@ L056xts_enc_ret: .align 4 _aesni_xts_decrypt: L_aesni_xts_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1841,10 +1841,10 @@ L069xts_dec_ret: .align 4 _aesni_ocb_encrypt: L_aesni_ocb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2239,10 +2239,10 @@ L078done: .align 4 _aesni_ocb_decrypt: L_aesni_ocb_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2637,10 +2637,10 @@ L088done: .align 4 _aesni_cbc_encrypt: L_aesni_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2899,10 +2899,10 @@ L094cbc_abort: ret .align 4 __aesni_set_encrypt_key: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3237,10 +3237,10 @@ L115bad_keybits: .align 4 _aesni_set_encrypt_key: L_aesni_set_encrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 8(%esp),%ecx @@ -3251,10 +3251,10 @@ L_aesni_set_encrypt_key_begin: .align 4 _aesni_set_decrypt_key: L_aesni_set_decrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 8(%esp),%ecx diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/aes/vpaes-x86.S b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/aes/vpaes-x86.S index 6e7c3afef..8ed38def8 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/aes/vpaes-x86.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/aes/vpaes-x86.S @@ -58,10 +58,10 @@ L_vpaes_consts: .align 6,0x90 .align 4 __vpaes_preheat: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif addl (%esp),%ebp movdqa -48(%ebp),%xmm7 @@ -69,10 +69,10 @@ __vpaes_preheat: ret .align 4 __vpaes_encrypt_core: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl $16,%ecx movl 240(%edx),%eax @@ -149,10 +149,10 @@ L000enc_entry: ret .align 4 __vpaes_decrypt_core: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif leal 608(%ebp),%ebx movl 240(%edx),%eax @@ -240,10 +240,10 @@ L002dec_entry: ret .align 4 __vpaes_schedule_core: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif addl (%esp),%ebp movdqu (%esi),%xmm0 @@ -337,10 +337,10 @@ L013schedule_mangle_last_dec: ret .align 4 __vpaes_schedule_192_smear: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pshufd $128,%xmm6,%xmm1 pshufd $254,%xmm7,%xmm0 @@ -352,10 +352,10 @@ __vpaes_schedule_192_smear: ret .align 4 __vpaes_schedule_round: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movdqa 8(%esp),%xmm2 pxor %xmm1,%xmm1 @@ -404,10 +404,10 @@ L_vpaes_schedule_low_round: ret .align 4 __vpaes_schedule_transform: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movdqa -16(%ebp),%xmm2 movdqa %xmm2,%xmm1 @@ -422,10 +422,10 @@ __vpaes_schedule_transform: ret .align 4 __vpaes_schedule_mangle: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movdqa %xmm0,%xmm4 movdqa 128(%ebp),%xmm5 @@ -486,10 +486,10 @@ L015schedule_mangle_both: .align 4 _vpaes_set_encrypt_key: L_vpaes_set_encrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -522,10 +522,10 @@ L016pic_point: .align 4 _vpaes_set_decrypt_key: L_vpaes_set_decrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -563,10 +563,10 @@ L017pic_point: .align 4 _vpaes_encrypt: L_vpaes_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -595,10 +595,10 @@ L018pic_point: .align 4 _vpaes_decrypt: L_vpaes_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -627,10 +627,10 @@ L019pic_point: .align 4 _vpaes_cbc_encrypt: L_vpaes_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/bf/bf-586.S b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/bf/bf-586.S index b049ee042..224e82f4f 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/bf/bf-586.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/bf/bf-586.S @@ -3,10 +3,10 @@ .align 4 _BF_encrypt: L_BF_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -356,10 +356,10 @@ L_BF_encrypt_begin: .align 4 _BF_decrypt: L_BF_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -709,10 +709,10 @@ L_BF_decrypt_begin: .align 4 _BF_cbc_encrypt: L_BF_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -777,55 +777,55 @@ L004PIC_point: xorl %edx,%edx jmp *%ebp L006ej7: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 6(%esi),%dh shll $8,%edx L007ej6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 5(%esi),%dh L008ej5: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 4(%esi),%dl L009ej4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%ecx jmp L010ejend L011ej3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 2(%esi),%ch shll $8,%ecx L012ej2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 1(%esi),%ch L013ej1: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb (%esi),%cl L010ejend: diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/bn/bn-586.S b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/bn/bn-586.S index 066935dd3..c68e429c8 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/bn/bn-586.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/bn/bn-586.S @@ -3,10 +3,10 @@ .align 4 _bn_mul_add_words: L_bn_mul_add_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call L000PIC_me_up L000PIC_me_up: @@ -289,10 +289,10 @@ L009maw_end: .align 4 _bn_mul_words: L_bn_mul_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call L010PIC_me_up L010PIC_me_up: @@ -474,10 +474,10 @@ L016mw_end: .align 4 _bn_sqr_words: L_bn_sqr_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call L017PIC_me_up L017PIC_me_up: @@ -618,10 +618,10 @@ L022sw_end: .align 4 _bn_div_words: L_bn_div_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%eax @@ -632,10 +632,10 @@ L_bn_div_words_begin: .align 4 _bn_add_words: L_bn_add_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -817,10 +817,10 @@ L025aw_end: .align 4 _bn_sub_words: L_bn_sub_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1002,10 +1002,10 @@ L028aw_end: .align 4 _bn_sub_part_words: L_bn_sub_part_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/bn/co-586.S b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/bn/co-586.S index 4dfecb94f..27f2f64b7 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/bn/co-586.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/bn/co-586.S @@ -3,10 +3,10 @@ .align 4 _bn_mul_comba8: L_bn_mul_comba8_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi movl 12(%esp),%esi @@ -550,10 +550,10 @@ L_bn_mul_comba8_begin: .align 4 _bn_mul_comba4: L_bn_mul_comba4_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi movl 12(%esp),%esi @@ -721,10 +721,10 @@ L_bn_mul_comba4_begin: .align 4 _bn_sqr_comba8: L_bn_sqr_comba8_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi @@ -1132,10 +1132,10 @@ L_bn_sqr_comba8_begin: .align 4 _bn_sqr_comba4: L_bn_sqr_comba4_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/bn/x86-gf2m.S b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/bn/x86-gf2m.S index 92bdaeac9..7e31dadc1 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/bn/x86-gf2m.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/bn/x86-gf2m.S @@ -1,10 +1,10 @@ .text .align 4 __mul_1x1_mmx: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif subl $36,%esp movl %eax,%ecx @@ -107,10 +107,10 @@ __mul_1x1_mmx: ret .align 4 __mul_1x1_ialu: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif subl $36,%esp movl %eax,%ecx @@ -244,10 +244,10 @@ __mul_1x1_ialu: .align 4 _bn_GF2m_mul_2x2: L_bn_GF2m_mul_2x2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call L000PIC_me_up L000PIC_me_up: diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/bn/x86-mont.S b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/bn/x86-mont.S index 7bca50014..4f5eef0e0 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/bn/x86-mont.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/bn/x86-mont.S @@ -3,10 +3,10 @@ .align 4 _bn_mul_mont: L_bn_mul_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/buildinf.h index 89c993059..46b7e3102 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: darwin-i386-cc" -#define DATE "built on: Wed Jan 31 12:59:44 2024 UTC" +#define DATE "built on: Tue Aug 6 12:22:47 2024 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/camellia/cmll-x86.S b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/camellia/cmll-x86.S index 088d99e88..d28a91962 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/camellia/cmll-x86.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/camellia/cmll-x86.S @@ -3,10 +3,10 @@ .align 4 _Camellia_EncryptBlock_Rounds: L_Camellia_EncryptBlock_Rounds_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -60,10 +60,10 @@ L000pic_point: .align 4 _Camellia_EncryptBlock: L_Camellia_EncryptBlock_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl $128,%eax subl 4(%esp),%eax @@ -75,10 +75,10 @@ L_Camellia_EncryptBlock_begin: .align 4 _Camellia_encrypt: L_Camellia_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -130,10 +130,10 @@ L001pic_point: ret .align 4 __x86_Camellia_encrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif xorl (%edi),%eax xorl 4(%edi),%ebx @@ -363,10 +363,10 @@ L003done: .align 4 _Camellia_DecryptBlock_Rounds: L_Camellia_DecryptBlock_Rounds_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -420,10 +420,10 @@ L004pic_point: .align 4 _Camellia_DecryptBlock: L_Camellia_DecryptBlock_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl $128,%eax subl 4(%esp),%eax @@ -435,10 +435,10 @@ L_Camellia_DecryptBlock_begin: .align 4 _Camellia_decrypt: L_Camellia_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -490,10 +490,10 @@ L005pic_point: ret .align 4 __x86_Camellia_decrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif xorl (%edi),%eax xorl 4(%edi),%ebx @@ -723,10 +723,10 @@ L007done: .align 4 _Camellia_Ekeygen: L_Camellia_Ekeygen_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1567,10 +1567,10 @@ L013done: .align 4 _Camellia_set_key: L_Camellia_set_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebx movl 8(%esp),%ecx @@ -2122,10 +2122,10 @@ LCamellia_SBOX: .align 4 _Camellia_cbc_encrypt: L_Camellia_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/chacha/chacha-x86.S b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/chacha/chacha-x86.S index fcc5df194..5f9bf22a9 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/chacha/chacha-x86.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/chacha/chacha-x86.S @@ -3,10 +3,10 @@ .align 4 _ChaCha20_ctr32: L_ChaCha20_ctr32_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -379,10 +379,10 @@ L000no_data: .align 4 _ChaCha20_ssse3: L_ChaCha20_ssse3_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -974,10 +974,10 @@ Lssse3_data: .align 4 _ChaCha20_xop: L_ChaCha20_xop_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/des/crypt586.S b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/des/crypt586.S index e059424fe..034b25752 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/des/crypt586.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/des/crypt586.S @@ -3,10 +3,10 @@ .align 4 _fcrypt_body: L_fcrypt_body_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/des/des-586.S b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/des/des-586.S index a0489166c..be8f83c14 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/des/des-586.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/des/des-586.S @@ -2,10 +2,10 @@ .globl _DES_SPtrans .align 4 __x86_DES_encrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ecx # Round 0 @@ -476,10 +476,10 @@ __x86_DES_encrypt: ret .align 4 __x86_DES_decrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ecx # Round 15 @@ -952,10 +952,10 @@ __x86_DES_decrypt: .align 4 _DES_encrypt1: L_DES_encrypt1_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi @@ -1068,10 +1068,10 @@ L002done: .align 4 _DES_encrypt2: L_DES_encrypt2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi @@ -1114,10 +1114,10 @@ L005done: .align 4 _DES_encrypt3: L_DES_encrypt3_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebx movl 8(%esp),%ebx @@ -1238,10 +1238,10 @@ L_DES_encrypt3_begin: .align 4 _DES_decrypt3: L_DES_decrypt3_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebx movl 8(%esp),%ebx @@ -1362,10 +1362,10 @@ L_DES_decrypt3_begin: .align 4 _DES_ncbc_encrypt: L_DES_ncbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -1428,55 +1428,55 @@ L010PIC_point: xorl %edx,%edx jmp *%ebp L012ej7: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 6(%esi),%dh shll $8,%edx L013ej6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 5(%esi),%dh L014ej5: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 4(%esi),%dl L015ej4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%ecx jmp L016ejend L017ej3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 2(%esi),%ch shll $8,%ecx L018ej2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 1(%esi),%ch L019ej1: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb (%esi),%cl L016ejend: @@ -1580,10 +1580,10 @@ L011cbc_enc_jmp_table: .align 4 _DES_ede3_cbc_encrypt: L_DES_ede3_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -1650,55 +1650,55 @@ L034PIC_point: xorl %edx,%edx jmp *%ebp L036ej7: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 6(%esi),%dh shll $8,%edx L037ej6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 5(%esi),%dh L038ej5: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 4(%esi),%dl L039ej4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%ecx jmp L040ejend L041ej3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 2(%esi),%ch shll $8,%ecx L042ej2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 1(%esi),%ch L043ej1: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb (%esi),%cl L040ejend: diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/ec/ecp_nistz256-x86.S b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/ec/ecp_nistz256-x86.S index 821f4fc12..b689c73ff 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/ec/ecp_nistz256-x86.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/ec/ecp_nistz256-x86.S @@ -2386,10 +2386,10 @@ LONE: .align 4 _ecp_nistz256_mul_by_2: L_ecp_nistz256_mul_by_2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2408,10 +2408,10 @@ L_ecp_nistz256_mul_by_2_begin: .align 4 _ecp_nistz256_mul_by_3: L_ecp_nistz256_mul_by_3_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2436,10 +2436,10 @@ L_ecp_nistz256_mul_by_3_begin: .align 4 _ecp_nistz256_div_by_2: L_ecp_nistz256_div_by_2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2455,10 +2455,10 @@ L_ecp_nistz256_div_by_2_begin: ret .align 4 __ecp_nistz256_div_by_2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%ebp xorl %edx,%edx @@ -2541,10 +2541,10 @@ __ecp_nistz256_div_by_2: .align 4 _ecp_nistz256_add: L_ecp_nistz256_add_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2561,10 +2561,10 @@ L_ecp_nistz256_add_begin: ret .align 4 __ecp_nistz256_add: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%eax movl 4(%esi),%ebx @@ -2641,10 +2641,10 @@ __ecp_nistz256_add: .align 4 _ecp_nistz256_sub: L_ecp_nistz256_sub_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2661,10 +2661,10 @@ L_ecp_nistz256_sub_begin: ret .align 4 __ecp_nistz256_sub: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%eax movl 4(%esi),%ebx @@ -2722,10 +2722,10 @@ __ecp_nistz256_sub: .align 4 _ecp_nistz256_neg: L_ecp_nistz256_neg_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2753,10 +2753,10 @@ L_ecp_nistz256_neg_begin: ret .align 4 __picup_eax: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esp),%eax ret @@ -2764,10 +2764,10 @@ __picup_eax: .align 4 _ecp_nistz256_to_mont: L_ecp_nistz256_to_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2790,10 +2790,10 @@ L000pic: .align 4 _ecp_nistz256_from_mont: L_ecp_nistz256_from_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2816,10 +2816,10 @@ L001pic: .align 4 _ecp_nistz256_mul_mont: L_ecp_nistz256_mul_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2842,10 +2842,10 @@ L002pic: .align 4 _ecp_nistz256_sqr_mont: L_ecp_nistz256_sqr_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2866,10 +2866,10 @@ L003pic: ret .align 4 __ecp_nistz256_mul_mont: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif andl $83886080,%eax cmpl $83886080,%eax @@ -3766,10 +3766,10 @@ L004mul_mont_ialu: .align 4 _ecp_nistz256_scatter_w5: L_ecp_nistz256_scatter_w5_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3802,10 +3802,10 @@ L006scatter_w5_loop: .align 4 _ecp_nistz256_gather_w5: L_ecp_nistz256_gather_w5_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3899,10 +3899,10 @@ L_ecp_nistz256_gather_w5_begin: .align 4 _ecp_nistz256_scatter_w7: L_ecp_nistz256_scatter_w7_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3933,10 +3933,10 @@ L007scatter_w7_loop: .align 4 _ecp_nistz256_gather_w7: L_ecp_nistz256_gather_w7_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -4150,10 +4150,10 @@ L_ecp_nistz256_gather_w7_begin: .align 4 _ecp_nistz256_point_double: L_ecp_nistz256_point_double_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -4279,10 +4279,10 @@ Lpoint_double_shortcut: .align 4 _ecp_nistz256_point_add: L_ecp_nistz256_point_add_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -4795,10 +4795,10 @@ L012add_done: .align 4 _ecp_nistz256_point_add_affine: L_ecp_nistz256_point_add_affine_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/md5/md5-586.S b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/md5/md5-586.S index 9ee5a8d80..3b6e2bcd6 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/md5/md5-586.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/md5/md5-586.S @@ -3,10 +3,10 @@ .align 4 _ossl_md5_block_asm_data_order: L_ossl_md5_block_asm_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/modes/ghash-x86.S b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/modes/ghash-x86.S index e06d1f7a0..af9992b13 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/modes/ghash-x86.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/modes/ghash-x86.S @@ -3,10 +3,10 @@ .align 4 _gcm_gmult_4bit_x86: L_gcm_gmult_4bit_x86_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -100,10 +100,10 @@ L001x86_break: .align 4 _gcm_ghash_4bit_x86: L_gcm_ghash_4bit_x86_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -212,10 +212,10 @@ L004x86_break: .align 4 _gcm_gmult_4bit_mmx: L_gcm_gmult_4bit_mmx_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -314,10 +314,10 @@ L007mmx_break: .align 4 _gcm_ghash_4bit_mmx: L_gcm_ghash_4bit_mmx_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -921,10 +921,10 @@ L009outer: .align 4 _gcm_init_clmul: L_gcm_init_clmul_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%eax @@ -993,10 +993,10 @@ L010pic: .align 4 _gcm_gmult_clmul: L_gcm_gmult_clmul_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 8(%esp),%edx @@ -1049,10 +1049,10 @@ L011pic: .align 4 _gcm_ghash_clmul: L_gcm_ghash_clmul_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/poly1305/poly1305-x86.S b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/poly1305/poly1305-x86.S index 96cf0c9fe..a875d95c1 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/poly1305/poly1305-x86.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/poly1305/poly1305-x86.S @@ -4,10 +4,10 @@ .align 4 _poly1305_init: L_poly1305_init_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -68,10 +68,10 @@ L000nokey: .align 4 _poly1305_blocks: L_poly1305_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -239,10 +239,10 @@ L003nodata: .align 4 _poly1305_emit: L_poly1305_emit_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -301,10 +301,10 @@ Lenter_emit: .align 5,0x90 .align 4 __poly1305_init_sse2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movdqu 24(%edi),%xmm4 leal 48(%edi),%edi @@ -506,10 +506,10 @@ L006square_break: .align 5,0x90 .align 4 __poly1305_blocks_sse2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1270,10 +1270,10 @@ L007nodata: .align 5,0x90 .align 4 __poly1305_emit_sse2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1366,10 +1366,10 @@ __poly1305_emit_sse2: .align 5,0x90 .align 4 __poly1305_init_avx2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif vmovdqu 24(%edi),%xmm4 leal 48(%edi),%edi @@ -1540,10 +1540,10 @@ L019square_break: .align 5,0x90 .align 4 __poly1305_blocks_avx2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/rc4/rc4-586.S b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/rc4/rc4-586.S index 380980855..36f7dcd44 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/rc4/rc4-586.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/rc4/rc4-586.S @@ -3,10 +3,10 @@ .align 4 _RC4: L_RC4_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -272,10 +272,10 @@ L000abort: .align 4 _RC4_set_key: L_RC4_set_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -353,10 +353,10 @@ L015exit: .align 4 _RC4_options: L_RC4_options_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call L018pic_point L018pic_point: diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/ripemd/rmd-586.S b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/ripemd/rmd-586.S index 2c284c730..e03283ada 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/ripemd/rmd-586.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/ripemd/rmd-586.S @@ -3,10 +3,10 @@ .align 4 _ripemd160_block_asm_data_order: L_ripemd160_block_asm_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%eax diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/sha/sha1-586.S b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/sha/sha1-586.S index feb96c11a..b7b5798f3 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/sha/sha1-586.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/sha/sha1-586.S @@ -3,10 +3,10 @@ .align 4 _sha1_block_data_order: L_sha1_block_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1400,10 +1400,10 @@ L002loop: ret .align 4 __sha1_block_data_order_shaext: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1573,10 +1573,10 @@ L004loop_shaext: ret .align 4 __sha1_block_data_order_ssse3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2795,10 +2795,10 @@ L007done: ret .align 4 __sha1_block_data_order_avx: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/sha/sha256-586.S b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/sha/sha256-586.S index e1dfe28d2..20b89b477 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/sha/sha256-586.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/sha/sha256-586.S @@ -3,10 +3,10 @@ .align 4 _sha256_block_data_order: L_sha256_block_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/sha/sha512-586.S b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/sha/sha512-586.S index f9eb6e285..aac95a47b 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/sha/sha512-586.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/sha/sha512-586.S @@ -3,10 +3,10 @@ .align 4 _sha512_block_data_order: L_sha512_block_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/whrlpool/wp-mmx.S b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/whrlpool/wp-mmx.S index 9804d68ba..0d1c56212 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/whrlpool/wp-mmx.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/whrlpool/wp-mmx.S @@ -3,10 +3,10 @@ .align 4 _whirlpool_block_mmx: L_whirlpool_block_mmx_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/x86cpuid.S b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/x86cpuid.S index 8e0719f37..aecd5dd75 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/x86cpuid.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/x86cpuid.S @@ -3,10 +3,10 @@ .align 4 _OPENSSL_ia32_cpuid: L_OPENSSL_ia32_cpuid_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -150,10 +150,10 @@ L000nocpuid: .align 4 _OPENSSL_rdtsc: L_OPENSSL_rdtsc_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif xorl %eax,%eax xorl %edx,%edx @@ -170,10 +170,10 @@ L010notsc: .align 4 _OPENSSL_instrument_halt: L_OPENSSL_instrument_halt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call L011PIC_me_up L011PIC_me_up: @@ -205,10 +205,10 @@ L012nohalt: .align 4 _OPENSSL_far_spin: L_OPENSSL_far_spin_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushfl popl %eax @@ -235,10 +235,10 @@ L013nospin: .align 4 _OPENSSL_wipe_cpu: L_OPENSSL_wipe_cpu_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif xorl %eax,%eax xorl %edx,%edx @@ -269,10 +269,10 @@ L016no_x87: .align 4 _OPENSSL_atomic_add: L_OPENSSL_atomic_add_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%ecx @@ -291,10 +291,10 @@ L018spin: .align 4 _OPENSSL_cleanse: L_OPENSSL_cleanse_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%ecx @@ -331,10 +331,10 @@ L022aligned: .align 4 _CRYPTO_memcmp: L_CRYPTO_memcmp_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi @@ -363,10 +363,10 @@ L023no_data: .align 4 _OPENSSL_instrument_bus: L_OPENSSL_instrument_bus_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -414,10 +414,10 @@ L026nogo: .align 4 _OPENSSL_instrument_bus2: L_OPENSSL_instrument_bus2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -478,10 +478,10 @@ L029nogo: .align 4 _OPENSSL_ia32_rdrand_bytes: L_OPENSSL_ia32_rdrand_bytes_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %ebx @@ -524,10 +524,10 @@ L032done: .align 4 _OPENSSL_ia32_rdseed_bytes: L_OPENSSL_ia32_rdseed_bytes_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %ebx diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/engines/e_padlock-x86.S b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/engines/e_padlock-x86.S index 9b7ebf7ad..26efbeac9 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/engines/e_padlock-x86.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/engines/e_padlock-x86.S @@ -3,10 +3,10 @@ .align 4 _padlock_capability: L_padlock_capability_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebx pushfl @@ -66,10 +66,10 @@ L000noluck: .align 4 _padlock_key_bswap: L_padlock_key_bswap_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 240(%edx),%ecx @@ -87,10 +87,10 @@ L003bswap_loop: .align 4 _padlock_verify_context: L_padlock_verify_context_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx leal Lpadlock_saved_context-L004verify_pic_point,%eax @@ -101,10 +101,10 @@ L004verify_pic_point: ret .align 4 __padlock_verify_ctx: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif addl (%esp),%eax btl $30,4(%esp) @@ -120,10 +120,10 @@ L005verified: .align 4 _padlock_reload_key: L_padlock_reload_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushfl popfl @@ -132,10 +132,10 @@ L_padlock_reload_key_begin: .align 4 _padlock_aes_block: L_padlock_aes_block_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -155,10 +155,10 @@ L_padlock_aes_block_begin: .align 4 _padlock_ecb_encrypt: L_padlock_ecb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -337,10 +337,10 @@ L006ecb_abort: .align 4 _padlock_cbc_encrypt: L_padlock_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -523,10 +523,10 @@ L018cbc_abort: .align 4 _padlock_cfb_encrypt: L_padlock_cfb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -648,10 +648,10 @@ L030cfb_abort: .align 4 _padlock_ofb_encrypt: L_padlock_ofb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -773,10 +773,10 @@ L039ofb_abort: .align 4 _padlock_ctr32_encrypt: L_padlock_ctr32_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -883,10 +883,10 @@ L048ctr32_abort: .align 4 _padlock_xstore: L_padlock_xstore_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi movl 8(%esp),%edi @@ -896,10 +896,10 @@ L_padlock_xstore_begin: ret .align 4 __win32_segv_handler: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl $1,%eax movl 4(%esp),%edx @@ -914,10 +914,10 @@ L055ret: .align 4 _padlock_sha1_oneshot: L_padlock_sha1_oneshot_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -948,10 +948,10 @@ L_padlock_sha1_oneshot_begin: .align 4 _padlock_sha1_blocks: L_padlock_sha1_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -981,10 +981,10 @@ L_padlock_sha1_blocks_begin: .align 4 _padlock_sha256_oneshot: L_padlock_sha256_oneshot_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -1015,10 +1015,10 @@ L_padlock_sha256_oneshot_begin: .align 4 _padlock_sha256_blocks: L_padlock_sha256_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -1048,10 +1048,10 @@ L_padlock_sha256_blocks_begin: .align 4 _padlock_sha512_blocks: L_padlock_sha512_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/openssl/bio.h b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/openssl/bio.h index f9aa74731..e16cf622c 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/openssl/bio.h +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/openssl/bio.h @@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, - int (*ossl_gets) (BIO *, char *, int)); + int (*gets) (BIO *, char *, int)); long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/openssl/opensslv.h index 65f3bfa05..5bb97d596 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 13 +# define OPENSSL_VERSION_PATCH 9 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.13" -# define OPENSSL_FULL_VERSION_STR "3.0.13+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "30 Jan 2024" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13+quic 30 Jan 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/openssl/pkcs7.h b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/openssl/pkcs7.h index 0ce79bf4f..557a0a726 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/openssl/pkcs7.h +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/openssl/pkcs7.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/pkcs7.h.in * - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -56,8 +56,8 @@ typedef struct pkcs7_signer_info_st { PKCS7_ISSUER_AND_SERIAL *issuer_and_serial; X509_ALGOR *digest_alg; STACK_OF(X509_ATTRIBUTE) *auth_attr; /* [ 0 ] */ - X509_ALGOR *digest_enc_alg; /* confusing name, actually used for signing */ - ASN1_OCTET_STRING *enc_digest; /* confusing name, actually signature */ + X509_ALGOR *digest_enc_alg; + ASN1_OCTET_STRING *enc_digest; STACK_OF(X509_ATTRIBUTE) *unauth_attr; /* [ 1 ] */ /* The private key to sign with */ EVP_PKEY *pkey; diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/openssl/ssl.h index 0f1915755..3df725c56 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/openssl/ssl.h +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/openssl-cl.gypi b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/openssl-cl.gypi index 235d0cac0..41086e27b 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/openssl-cl.gypi +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/openssl-cl.gypi @@ -17,7 +17,6 @@ 'OPENSSL_IA32_SSE2', 'PADLOCK_ASM', 'POLY1305_ASM', - 'RC4_ASM', 'RMD160_ASM', 'SHA1_ASM', 'SHA256_ASM', diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/openssl.gypi b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/openssl.gypi index 0f428fdfb..9cb1370ce 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cfb.c', 'openssl/crypto/aes/aes_ecb.c', @@ -990,7 +988,6 @@ 'OPENSSL_IA32_SSE2', 'PADLOCK_ASM', 'POLY1305_ASM', - 'RC4_ASM', 'RMD160_ASM', 'SHA1_ASM', 'SHA256_ASM', diff --git a/deps/openssl/config/archs/darwin-i386-cc/no-asm/configdata.pm b/deps/openssl/config/archs/darwin-i386-cc/no-asm/configdata.pm index d5b971f9d..b758cf2d5 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/no-asm/configdata.pm +++ b/deps/openssl/config/archs/darwin-i386-cc/no-asm/configdata.pm @@ -139,7 +139,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [], @@ -154,7 +154,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.13+quic", + "full_version" => "3.0.9", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -205,7 +205,7 @@ our %config = ( ], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "13", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -258,11 +258,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "30 Jan 2024", - "shlib_version" => "81.3", + "release_date" => "30 May 2023", + "shlib_version" => "3", "sourcedir" => ".", "target" => "darwin-i386-cc", - "version" => "3.0.13" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -387,7 +387,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -784,9 +783,6 @@ our %unified_info = ( "providers/fips" => { "fips" => "1" }, - "test/p_minimal" => { - "noinst" => "1" - }, "test/p_test" => { "noinst" => "1" } @@ -855,9 +851,6 @@ our %unified_info = ( "test/asn1_internal_test" => { "noinst" => "1" }, - "test/asn1_stable_parse_test" => { - "noinst" => "1" - }, "test/asn1_string_table_test" => { "noinst" => "1" }, @@ -1047,9 +1040,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -1597,9 +1587,6 @@ our %unified_info = ( "providers/libfips.a" => [ "FIPS_MODULE" ], - "test/evp_extra_test" => [ - "STATIC_LEGACY" - ], "test/provider_internal_test" => [ "PROVIDER_INIT_FUNCTION_NAME=p_test_init" ], @@ -2353,9 +2340,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -2653,9 +2637,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -3424,9 +3405,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -3721,9 +3699,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -3757,12 +3732,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -4747,9 +4716,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -5047,9 +5013,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -5818,9 +5781,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -6115,9 +6075,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -6151,12 +6108,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -7146,10 +7097,6 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], - "test/asn1_stable_parse_test" => [ - "libcrypto", - "test/libtestutil.a" - ], "test/asn1_string_table_test" => [ "libcrypto", "test/libtestutil.a" @@ -7403,10 +7350,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -7672,8 +7615,6 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "libcrypto.a", - "providers/libcommon.a", - "providers/liblegacy.a", "test/libtestutil.a" ], "test/evp_extra_test2" => [ @@ -9737,7 +9678,6 @@ our %unified_info = ( }, "providers" => { "deps" => [ - "providers/evp_extra_test-bin-legacyprov.o", "providers/libcrypto-lib-baseprov.o", "providers/libcrypto-lib-defltprov.o", "providers/libcrypto-lib-nullprov.o", @@ -9745,9 +9685,6 @@ our %unified_info = ( "providers/libdefault.a" ], "products" => { - "bin" => [ - "test/evp_extra_test" - ], "dso" => [ "providers/legacy" ], @@ -10183,7 +10120,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10234,7 +10170,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -11366,9 +11301,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -11666,9 +11598,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -12437,9 +12366,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -12734,9 +12660,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -12770,12 +12693,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -13760,9 +13677,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -14060,9 +13974,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -14831,9 +14742,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -15128,9 +15036,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -15164,12 +15069,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -16184,10 +16083,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16426,7 +16321,6 @@ our %unified_info = ( "doc/html/man3/CMS_get1_ReceiptRequest.html", "doc/html/man3/CMS_sign.html", "doc/html/man3/CMS_sign_receipt.html", - "doc/html/man3/CMS_signed_get_attr.html", "doc/html/man3/CMS_uncompress.html", "doc/html/man3/CMS_verify.html", "doc/html/man3/CMS_verify_receipt.html", @@ -16526,7 +16420,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_encapsulate.html", "doc/html/man3/EVP_PKEY_encrypt.html", "doc/html/man3/EVP_PKEY_fromdata.html", - "doc/html/man3/EVP_PKEY_get_attr.html", "doc/html/man3/EVP_PKEY_get_default_digest_nid.html", "doc/html/man3/EVP_PKEY_get_field_type.html", "doc/html/man3/EVP_PKEY_get_group_name.html", @@ -16783,7 +16676,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -16882,7 +16774,6 @@ our %unified_info = ( "doc/html/man3/X509V3_get_d2i.html", "doc/html/man3/X509V3_set_ctx.html", "doc/html/man3/X509_ALGOR_dup.html", - "doc/html/man3/X509_ATTRIBUTE.html", "doc/html/man3/X509_CRL_get0_by_serial.html", "doc/html/man3/X509_EXTENSION_set_object.html", "doc/html/man3/X509_LOOKUP.html", @@ -16894,8 +16785,6 @@ our %unified_info = ( "doc/html/man3/X509_NAME_get_index_by_NID.html", "doc/html/man3/X509_NAME_print_ex.html", "doc/html/man3/X509_PUBKEY_new.html", - "doc/html/man3/X509_REQ_get_attr.html", - "doc/html/man3/X509_REQ_get_extensions.html", "doc/html/man3/X509_SIG_get0.html", "doc/html/man3/X509_STORE_CTX_get_error.html", "doc/html/man3/X509_STORE_CTX_new.html", @@ -18185,10 +18074,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/asn1_stable_parse_test" => [ - "include", - "apps/include" - ], "test/asn1_string_table_test" => [ "include", "apps/include" @@ -18396,9 +18281,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -18658,9 +18540,7 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "include", - "apps/include", - "providers/common/include", - "providers/implementations/include" + "apps/include" ], "test/evp_extra_test2" => [ "include", @@ -18917,10 +18797,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/p_minimal" => [ - "include", - "." - ], "test/p_test" => [ "include", "." @@ -19410,7 +19286,6 @@ our %unified_info = ( "doc/man/man3/CMS_get1_ReceiptRequest.3", "doc/man/man3/CMS_sign.3", "doc/man/man3/CMS_sign_receipt.3", - "doc/man/man3/CMS_signed_get_attr.3", "doc/man/man3/CMS_uncompress.3", "doc/man/man3/CMS_verify.3", "doc/man/man3/CMS_verify_receipt.3", @@ -19510,7 +19385,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_encapsulate.3", "doc/man/man3/EVP_PKEY_encrypt.3", "doc/man/man3/EVP_PKEY_fromdata.3", - "doc/man/man3/EVP_PKEY_get_attr.3", "doc/man/man3/EVP_PKEY_get_default_digest_nid.3", "doc/man/man3/EVP_PKEY_get_field_type.3", "doc/man/man3/EVP_PKEY_get_group_name.3", @@ -19767,7 +19641,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -19866,7 +19739,6 @@ our %unified_info = ( "doc/man/man3/X509V3_get_d2i.3", "doc/man/man3/X509V3_set_ctx.3", "doc/man/man3/X509_ALGOR_dup.3", - "doc/man/man3/X509_ATTRIBUTE.3", "doc/man/man3/X509_CRL_get0_by_serial.3", "doc/man/man3/X509_EXTENSION_set_object.3", "doc/man/man3/X509_LOOKUP.3", @@ -19878,8 +19750,6 @@ our %unified_info = ( "doc/man/man3/X509_NAME_get_index_by_NID.3", "doc/man/man3/X509_NAME_print_ex.3", "doc/man/man3/X509_PUBKEY_new.3", - "doc/man/man3/X509_REQ_get_attr.3", - "doc/man/man3/X509_REQ_get_extensions.3", "doc/man/man3/X509_SIG_get0.3", "doc/man/man3/X509_STORE_CTX_get_error.3", "doc/man/man3/X509_STORE_CTX_new.3", @@ -20063,7 +19933,6 @@ our %unified_info = ( "modules" => [ "providers/fips", "providers/legacy", - "test/p_minimal", "test/p_test" ], "programs" => [ @@ -20089,7 +19958,6 @@ our %unified_info = ( "test/asn1_dsa_internal_test", "test/asn1_encode_test", "test/asn1_internal_test", - "test/asn1_stable_parse_test", "test/asn1_string_table_test", "test/asn1_time_test", "test/asynciotest", @@ -20153,7 +20021,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24278,7 +24145,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24305,7 +24171,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -24407,9 +24272,6 @@ our %unified_info = ( "providers/common/libfips-lib-securitycheck_fips.o" => [ "providers/common/securitycheck_fips.c" ], - "providers/evp_extra_test-bin-legacyprov.o" => [ - "providers/legacyprov.c" - ], "providers/fips" => [ "providers/fips/fips-dso-fips_entry.o" ], @@ -25544,9 +25406,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25628,9 +25487,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25688,12 +25544,6 @@ our %unified_info = ( "test/asn1_internal_test-bin-asn1_internal_test.o" => [ "test/asn1_internal_test.c" ], - "test/asn1_stable_parse_test" => [ - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" - ], - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" => [ - "test/asn1_stable_parse_test.c" - ], "test/asn1_string_table_test" => [ "test/asn1_string_table_test-bin-asn1_string_table_test.o" ], @@ -26073,12 +25923,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -26477,7 +26321,6 @@ our %unified_info = ( "test/errtest.c" ], "test/evp_extra_test" => [ - "providers/evp_extra_test-bin-legacyprov.o", "test/evp_extra_test-bin-evp_extra_test.o" ], "test/evp_extra_test-bin-evp_extra_test.o" => [ @@ -26768,12 +26611,6 @@ our %unified_info = ( "test/ossl_store_test-bin-ossl_store_test.o" => [ "test/ossl_store_test.c" ], - "test/p_minimal" => [ - "test/p_minimal-dso-p_minimal.o" - ], - "test/p_minimal-dso-p_minimal.o" => [ - "test/p_minimal.c" - ], "test/p_test" => [ "test/p_test-dso-p_test.o" ], @@ -27462,8 +27299,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27490,7 +27327,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27507,8 +27344,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/darwin-i386-cc/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/darwin-i386-cc/no-asm/crypto/buildinf.h index 2d13043ce..f615fa7fc 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/darwin-i386-cc/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: darwin-i386-cc" -#define DATE "built on: Wed Jan 31 12:59:57 2024 UTC" +#define DATE "built on: Tue Aug 6 12:22:59 2024 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/openssl/bio.h b/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/openssl/bio.h index f9aa74731..e16cf622c 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/openssl/bio.h @@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, - int (*ossl_gets) (BIO *, char *, int)); + int (*gets) (BIO *, char *, int)); long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); diff --git a/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/openssl/opensslv.h index 65f3bfa05..5bb97d596 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 13 +# define OPENSSL_VERSION_PATCH 9 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.13" -# define OPENSSL_FULL_VERSION_STR "3.0.13+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "30 Jan 2024" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13+quic 30 Jan 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/openssl/pkcs7.h b/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/openssl/pkcs7.h index 0ce79bf4f..557a0a726 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/openssl/pkcs7.h +++ b/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/openssl/pkcs7.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/pkcs7.h.in * - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -56,8 +56,8 @@ typedef struct pkcs7_signer_info_st { PKCS7_ISSUER_AND_SERIAL *issuer_and_serial; X509_ALGOR *digest_alg; STACK_OF(X509_ATTRIBUTE) *auth_attr; /* [ 0 ] */ - X509_ALGOR *digest_enc_alg; /* confusing name, actually used for signing */ - ASN1_OCTET_STRING *enc_digest; /* confusing name, actually signature */ + X509_ALGOR *digest_enc_alg; + ASN1_OCTET_STRING *enc_digest; STACK_OF(X509_ATTRIBUTE) *unauth_attr; /* [ 1 ] */ /* The private key to sign with */ EVP_PKEY *pkey; diff --git a/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/openssl/ssl.h index 0f1915755..3df725c56 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/darwin-i386-cc/no-asm/openssl.gypi b/deps/openssl/config/archs/darwin-i386-cc/no-asm/openssl.gypi index 7469c552c..fb2e7f750 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/darwin-i386-cc/no-asm/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cbc.c', 'openssl/crypto/aes/aes_cfb.c', diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm/configdata.pm b/deps/openssl/config/archs/darwin64-arm64-cc/asm/configdata.pm index 5085e5ad4..c5588d457 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm/configdata.pm +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm/configdata.pm @@ -139,7 +139,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -156,7 +156,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.13+quic", + "full_version" => "3.0.9", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,7 +206,7 @@ our %config = ( ], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "13", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -258,11 +258,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "30 Jan 2024", - "shlib_version" => "81.3", + "release_date" => "30 May 2023", + "shlib_version" => "3", "sourcedir" => ".", "target" => "darwin64-arm64-cc", - "version" => "3.0.13" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -387,7 +387,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -783,9 +782,6 @@ our %unified_info = ( "providers/fips" => { "fips" => "1" }, - "test/p_minimal" => { - "noinst" => "1" - }, "test/p_test" => { "noinst" => "1" } @@ -854,9 +850,6 @@ our %unified_info = ( "test/asn1_internal_test" => { "noinst" => "1" }, - "test/asn1_stable_parse_test" => { - "noinst" => "1" - }, "test/asn1_string_table_test" => { "noinst" => "1" }, @@ -1046,9 +1039,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -1628,9 +1618,6 @@ our %unified_info = ( "SHA512_ASM", "VPAES_ASM" ], - "test/evp_extra_test" => [ - "STATIC_LEGACY" - ], "test/provider_internal_test" => [ "PROVIDER_INIT_FUNCTION_NAME=p_test_init" ], @@ -2384,9 +2371,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -2684,9 +2668,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -3455,9 +3436,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -3752,9 +3730,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -3788,12 +3763,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -4778,9 +4747,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -5078,9 +5044,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -5849,9 +5812,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -6146,9 +6106,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -6182,12 +6139,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -7177,10 +7128,6 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], - "test/asn1_stable_parse_test" => [ - "libcrypto", - "test/libtestutil.a" - ], "test/asn1_string_table_test" => [ "libcrypto", "test/libtestutil.a" @@ -7434,10 +7381,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -7703,8 +7646,6 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "libcrypto.a", - "providers/libcommon.a", - "providers/liblegacy.a", "test/libtestutil.a" ], "test/evp_extra_test2" => [ @@ -9791,7 +9732,6 @@ our %unified_info = ( }, "providers" => { "deps" => [ - "providers/evp_extra_test-bin-legacyprov.o", "providers/libcrypto-lib-baseprov.o", "providers/libcrypto-lib-defltprov.o", "providers/libcrypto-lib-nullprov.o", @@ -9799,9 +9739,6 @@ our %unified_info = ( "providers/libdefault.a" ], "products" => { - "bin" => [ - "test/evp_extra_test" - ], "dso" => [ "providers/legacy" ], @@ -10237,7 +10174,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10288,7 +10224,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -11420,9 +11355,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -11720,9 +11652,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -12491,9 +12420,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -12788,9 +12714,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -12824,12 +12747,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -13814,9 +13731,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -14114,9 +14028,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -14885,9 +14796,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -15182,9 +15090,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -15218,12 +15123,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -16238,10 +16137,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16480,7 +16375,6 @@ our %unified_info = ( "doc/html/man3/CMS_get1_ReceiptRequest.html", "doc/html/man3/CMS_sign.html", "doc/html/man3/CMS_sign_receipt.html", - "doc/html/man3/CMS_signed_get_attr.html", "doc/html/man3/CMS_uncompress.html", "doc/html/man3/CMS_verify.html", "doc/html/man3/CMS_verify_receipt.html", @@ -16580,7 +16474,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_encapsulate.html", "doc/html/man3/EVP_PKEY_encrypt.html", "doc/html/man3/EVP_PKEY_fromdata.html", - "doc/html/man3/EVP_PKEY_get_attr.html", "doc/html/man3/EVP_PKEY_get_default_digest_nid.html", "doc/html/man3/EVP_PKEY_get_field_type.html", "doc/html/man3/EVP_PKEY_get_group_name.html", @@ -16837,7 +16730,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -16936,7 +16828,6 @@ our %unified_info = ( "doc/html/man3/X509V3_get_d2i.html", "doc/html/man3/X509V3_set_ctx.html", "doc/html/man3/X509_ALGOR_dup.html", - "doc/html/man3/X509_ATTRIBUTE.html", "doc/html/man3/X509_CRL_get0_by_serial.html", "doc/html/man3/X509_EXTENSION_set_object.html", "doc/html/man3/X509_LOOKUP.html", @@ -16948,8 +16839,6 @@ our %unified_info = ( "doc/html/man3/X509_NAME_get_index_by_NID.html", "doc/html/man3/X509_NAME_print_ex.html", "doc/html/man3/X509_PUBKEY_new.html", - "doc/html/man3/X509_REQ_get_attr.html", - "doc/html/man3/X509_REQ_get_extensions.html", "doc/html/man3/X509_SIG_get0.html", "doc/html/man3/X509_STORE_CTX_get_error.html", "doc/html/man3/X509_STORE_CTX_new.html", @@ -18299,10 +18188,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/asn1_stable_parse_test" => [ - "include", - "apps/include" - ], "test/asn1_string_table_test" => [ "include", "apps/include" @@ -18510,9 +18395,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -18772,9 +18654,7 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "include", - "apps/include", - "providers/common/include", - "providers/implementations/include" + "apps/include" ], "test/evp_extra_test2" => [ "include", @@ -19031,10 +18911,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/p_minimal" => [ - "include", - "." - ], "test/p_test" => [ "include", "." @@ -19524,7 +19400,6 @@ our %unified_info = ( "doc/man/man3/CMS_get1_ReceiptRequest.3", "doc/man/man3/CMS_sign.3", "doc/man/man3/CMS_sign_receipt.3", - "doc/man/man3/CMS_signed_get_attr.3", "doc/man/man3/CMS_uncompress.3", "doc/man/man3/CMS_verify.3", "doc/man/man3/CMS_verify_receipt.3", @@ -19624,7 +19499,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_encapsulate.3", "doc/man/man3/EVP_PKEY_encrypt.3", "doc/man/man3/EVP_PKEY_fromdata.3", - "doc/man/man3/EVP_PKEY_get_attr.3", "doc/man/man3/EVP_PKEY_get_default_digest_nid.3", "doc/man/man3/EVP_PKEY_get_field_type.3", "doc/man/man3/EVP_PKEY_get_group_name.3", @@ -19881,7 +19755,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -19980,7 +19853,6 @@ our %unified_info = ( "doc/man/man3/X509V3_get_d2i.3", "doc/man/man3/X509V3_set_ctx.3", "doc/man/man3/X509_ALGOR_dup.3", - "doc/man/man3/X509_ATTRIBUTE.3", "doc/man/man3/X509_CRL_get0_by_serial.3", "doc/man/man3/X509_EXTENSION_set_object.3", "doc/man/man3/X509_LOOKUP.3", @@ -19992,8 +19864,6 @@ our %unified_info = ( "doc/man/man3/X509_NAME_get_index_by_NID.3", "doc/man/man3/X509_NAME_print_ex.3", "doc/man/man3/X509_PUBKEY_new.3", - "doc/man/man3/X509_REQ_get_attr.3", - "doc/man/man3/X509_REQ_get_extensions.3", "doc/man/man3/X509_SIG_get0.3", "doc/man/man3/X509_STORE_CTX_get_error.3", "doc/man/man3/X509_STORE_CTX_new.3", @@ -20177,7 +20047,6 @@ our %unified_info = ( "modules" => [ "providers/fips", "providers/legacy", - "test/p_minimal", "test/p_test" ], "programs" => [ @@ -20203,7 +20072,6 @@ our %unified_info = ( "test/asn1_dsa_internal_test", "test/asn1_encode_test", "test/asn1_internal_test", - "test/asn1_stable_parse_test", "test/asn1_string_table_test", "test/asn1_time_test", "test/asynciotest", @@ -20267,7 +20135,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24473,7 +24340,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24500,7 +24366,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -24602,9 +24467,6 @@ our %unified_info = ( "providers/common/libfips-lib-securitycheck_fips.o" => [ "providers/common/securitycheck_fips.c" ], - "providers/evp_extra_test-bin-legacyprov.o" => [ - "providers/legacyprov.c" - ], "providers/fips" => [ "providers/fips/fips-dso-fips_entry.o" ], @@ -25750,9 +25612,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25834,9 +25693,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25894,12 +25750,6 @@ our %unified_info = ( "test/asn1_internal_test-bin-asn1_internal_test.o" => [ "test/asn1_internal_test.c" ], - "test/asn1_stable_parse_test" => [ - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" - ], - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" => [ - "test/asn1_stable_parse_test.c" - ], "test/asn1_string_table_test" => [ "test/asn1_string_table_test-bin-asn1_string_table_test.o" ], @@ -26279,12 +26129,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -26683,7 +26527,6 @@ our %unified_info = ( "test/errtest.c" ], "test/evp_extra_test" => [ - "providers/evp_extra_test-bin-legacyprov.o", "test/evp_extra_test-bin-evp_extra_test.o" ], "test/evp_extra_test-bin-evp_extra_test.o" => [ @@ -26974,12 +26817,6 @@ our %unified_info = ( "test/ossl_store_test-bin-ossl_store_test.o" => [ "test/ossl_store_test.c" ], - "test/p_minimal" => [ - "test/p_minimal-dso-p_minimal.o" - ], - "test/p_minimal-dso-p_minimal.o" => [ - "test/p_minimal.c" - ], "test/p_test" => [ "test/p_test-dso-p_test.o" ], @@ -27665,8 +27502,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27693,7 +27530,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27710,8 +27547,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm/crypto/aes/aesv8-armx.S b/deps/openssl/config/archs/darwin64-arm64-cc/asm/crypto/aes/aesv8-armx.S index ae20ad9ff..5e3afc1ce 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm/crypto/aes/aesv8-armx.S +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm/crypto/aes/aesv8-armx.S @@ -103,7 +103,7 @@ L192: Loop192: tbl v6.16b,{v4.16b},v2.16b ext v5.16b,v0.16b,v3.16b,#12 -#ifdef __AARCH64EB__ +#ifdef __ARMEB__ st1 {v4.4s},[x2],#16 sub x2,x2,#8 #else @@ -1510,7 +1510,7 @@ _aes_v8_ctr32_encrypt_blocks: ldr w5,[x3,#240] ldr w8, [x4, #12] -#ifdef __AARCH64EB__ +#ifdef __ARMEB__ ld1 {v0.16b},[x4] #else ld1 {v0.4s},[x4] @@ -1527,7 +1527,7 @@ _aes_v8_ctr32_encrypt_blocks: add x7,x3,#32 mov w6,w5 csel x12,xzr,x12,lo -#ifndef __AARCH64EB__ +#ifndef __ARMEB__ rev w8, w8 #endif orr v1.16b,v0.16b,v0.16b diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm/crypto/buildinf.h b/deps/openssl/config/archs/darwin64-arm64-cc/asm/crypto/buildinf.h index 8b0c98970..f33e15f6c 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: darwin64-arm64-cc" -#define DATE "built on: Wed Jan 31 13:00:08 2024 UTC" +#define DATE "built on: Tue Aug 6 12:23:09 2024 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm/crypto/modes/ghashv8-armx.S b/deps/openssl/config/archs/darwin64-arm64-cc/asm/crypto/modes/ghashv8-armx.S index dc71d8508..200c0d031 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm/crypto/modes/ghashv8-armx.S +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm/crypto/modes/ghashv8-armx.S @@ -101,7 +101,7 @@ _gcm_gmult_v8: movi v19.16b,#0xe1 ld1 {v20.2d,v21.2d},[x1] //load twisted H, ... shl v19.2d,v19.2d,#57 -#ifndef __AARCH64EB__ +#ifndef __ARMEB__ rev64 v17.16b,v17.16b #endif ext v3.16b,v17.16b,v17.16b,#8 @@ -126,7 +126,7 @@ _gcm_gmult_v8: eor v18.16b,v18.16b,v2.16b eor v0.16b,v0.16b,v18.16b -#ifndef __AARCH64EB__ +#ifndef __ARMEB__ rev64 v0.16b,v0.16b #endif ext v0.16b,v0.16b,v0.16b,#8 @@ -163,14 +163,14 @@ _gcm_ghash_v8: ext v0.16b,v0.16b,v0.16b,#8 //rotate Xi ld1 {v16.2d},[x2],#16 //load [rotated] I[0] shl v19.2d,v19.2d,#57 //compose 0xc2.0 constant -#ifndef __AARCH64EB__ +#ifndef __ARMEB__ rev64 v16.16b,v16.16b rev64 v0.16b,v0.16b #endif ext v3.16b,v16.16b,v16.16b,#8 //rotate I[0] b.lo Lodd_tail_v8 //x3 was less than 32 ld1 {v17.2d},[x2],x12 //load [rotated] I[1] -#ifndef __AARCH64EB__ +#ifndef __ARMEB__ rev64 v17.16b,v17.16b #endif ext v7.16b,v17.16b,v17.16b,#8 @@ -202,13 +202,13 @@ Loop_mod2x_v8: eor v18.16b,v0.16b,v2.16b eor v1.16b,v1.16b,v17.16b ld1 {v17.2d},[x2],x12 //load [rotated] I[i+3] -#ifndef __AARCH64EB__ +#ifndef __ARMEB__ rev64 v16.16b,v16.16b #endif eor v1.16b,v1.16b,v18.16b pmull v18.1q,v0.1d,v19.1d //1st phase of reduction -#ifndef __AARCH64EB__ +#ifndef __ARMEB__ rev64 v17.16b,v17.16b #endif ins v2.d[0],v1.d[1] @@ -258,7 +258,7 @@ Lodd_tail_v8: eor v0.16b,v0.16b,v18.16b Ldone_v8: -#ifndef __AARCH64EB__ +#ifndef __ARMEB__ rev64 v0.16b,v0.16b #endif ext v0.16b,v0.16b,v0.16b,#8 @@ -277,7 +277,7 @@ Lgcm_ghash_v8_4x: shl v19.2d,v19.2d,#57 //compose 0xc2.0 constant ld1 {v4.2d,v5.2d,v6.2d,v7.2d},[x2],#64 -#ifndef __AARCH64EB__ +#ifndef __ARMEB__ rev64 v0.16b,v0.16b rev64 v5.16b,v5.16b rev64 v6.16b,v6.16b @@ -321,7 +321,7 @@ Loop4x: eor v16.16b,v4.16b,v0.16b ld1 {v4.2d,v5.2d,v6.2d,v7.2d},[x2],#64 ext v3.16b,v16.16b,v16.16b,#8 -#ifndef __AARCH64EB__ +#ifndef __ARMEB__ rev64 v5.16b,v5.16b rev64 v6.16b,v6.16b rev64 v7.16b,v7.16b @@ -404,7 +404,7 @@ Lthree: eor v1.16b,v1.16b,v17.16b ld1 {v4.2d,v5.2d,v6.2d},[x2] eor v1.16b,v1.16b,v18.16b -#ifndef __AARCH64EB__ +#ifndef __ARMEB__ rev64 v5.16b,v5.16b rev64 v6.16b,v6.16b rev64 v4.16b,v4.16b @@ -456,7 +456,7 @@ Ltwo: eor v1.16b,v1.16b,v17.16b ld1 {v4.2d,v5.2d},[x2] eor v1.16b,v1.16b,v18.16b -#ifndef __AARCH64EB__ +#ifndef __ARMEB__ rev64 v5.16b,v5.16b rev64 v4.16b,v4.16b #endif @@ -499,7 +499,7 @@ Lone: eor v1.16b,v1.16b,v17.16b ld1 {v4.2d},[x2] eor v1.16b,v1.16b,v18.16b -#ifndef __AARCH64EB__ +#ifndef __ARMEB__ rev64 v4.16b,v4.16b #endif @@ -539,7 +539,7 @@ Ldone4x: eor v0.16b,v0.16b,v18.16b ext v0.16b,v0.16b,v0.16b,#8 -#ifndef __AARCH64EB__ +#ifndef __ARMEB__ rev64 v0.16b,v0.16b #endif st1 {v0.2d},[x0] //write out Xi diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm/crypto/poly1305/poly1305-armv8.S b/deps/openssl/config/archs/darwin64-arm64-cc/asm/crypto/poly1305/poly1305-armv8.S index a044e14cb..90b6d357a 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm/crypto/poly1305/poly1305-armv8.S +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm/crypto/poly1305/poly1305-armv8.S @@ -28,7 +28,7 @@ _poly1305_init: ldp x7,x8,[x1] // load key mov x9,#0xfffffffc0fffffff movk x9,#0x0fff,lsl#48 -#ifdef __AARCH64EB__ +#ifdef __ARMEB__ rev x7,x7 // flip bytes rev x8,x8 #endif @@ -75,7 +75,7 @@ Lpoly1305_blocks: Loop: ldp x10,x11,[x1],#16 // load input sub x2,x2,#16 -#ifdef __AARCH64EB__ +#ifdef __ARMEB__ rev x10,x10 rev x11,x11 #endif @@ -140,13 +140,13 @@ Lpoly1305_emit: csel x4,x4,x12,eq csel x5,x5,x13,eq -#ifdef __AARCH64EB__ +#ifdef __ARMEB__ ror x10,x10,#32 // flip nonce words ror x11,x11,#32 #endif adds x4,x4,x10 // accumulate nonce adc x5,x5,x11 -#ifdef __AARCH64EB__ +#ifdef __ARMEB__ rev x4,x4 // flip output bytes rev x5,x5 #endif @@ -266,7 +266,7 @@ Lblocks_neon: adcs x5,x5,xzr adc x6,x6,xzr -#ifdef __AARCH64EB__ +#ifdef __ARMEB__ rev x12,x12 rev x13,x13 #endif @@ -312,7 +312,7 @@ Lbase2_64_neon: ldp x12,x13,[x1],#16 // load input sub x2,x2,#16 add x9,x8,x8,lsr#2 // s1 = r1 + (r1 >> 2) -#ifdef __AARCH64EB__ +#ifdef __ARMEB__ rev x12,x12 rev x13,x13 #endif @@ -397,7 +397,7 @@ Ldo_neon: lsl x3,x3,#24 add x15,x0,#48 -#ifdef __AARCH64EB__ +#ifdef __ARMEB__ rev x8,x8 rev x12,x12 rev x9,x9 @@ -433,7 +433,7 @@ Ldo_neon: ld1 {v4.4s,v5.4s,v6.4s,v7.4s},[x15],#64 ld1 {v8.4s},[x15] -#ifdef __AARCH64EB__ +#ifdef __ARMEB__ rev x8,x8 rev x12,x12 rev x9,x9 @@ -494,7 +494,7 @@ Loop_neon: umull v20.2d,v14.2s,v1.s[2] ldp x9,x13,[x16],#48 umull v19.2d,v14.2s,v0.s[2] -#ifdef __AARCH64EB__ +#ifdef __ARMEB__ rev x8,x8 rev x12,x12 rev x9,x9 @@ -559,7 +559,7 @@ Loop_neon: umlal v23.2d,v11.2s,v3.s[0] umlal v20.2d,v11.2s,v8.s[0] umlal v21.2d,v11.2s,v0.s[0] -#ifdef __AARCH64EB__ +#ifdef __ARMEB__ rev x8,x8 rev x12,x12 rev x9,x9 @@ -840,13 +840,13 @@ Lpoly1305_emit_neon: csel x4,x4,x12,eq csel x5,x5,x13,eq -#ifdef __AARCH64EB__ +#ifdef __ARMEB__ ror x10,x10,#32 // flip nonce words ror x11,x11,#32 #endif adds x4,x4,x10 // accumulate nonce adc x5,x5,x11 -#ifdef __AARCH64EB__ +#ifdef __ARMEB__ rev x4,x4 // flip output bytes rev x5,x5 #endif diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm/include/openssl/bio.h b/deps/openssl/config/archs/darwin64-arm64-cc/asm/include/openssl/bio.h index f9aa74731..e16cf622c 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm/include/openssl/bio.h @@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, - int (*ossl_gets) (BIO *, char *, int)); + int (*gets) (BIO *, char *, int)); long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/darwin64-arm64-cc/asm/include/openssl/opensslv.h index 65f3bfa05..5bb97d596 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 13 +# define OPENSSL_VERSION_PATCH 9 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.13" -# define OPENSSL_FULL_VERSION_STR "3.0.13+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "30 Jan 2024" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13+quic 30 Jan 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm/include/openssl/pkcs7.h b/deps/openssl/config/archs/darwin64-arm64-cc/asm/include/openssl/pkcs7.h index 0ce79bf4f..557a0a726 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm/include/openssl/pkcs7.h +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm/include/openssl/pkcs7.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/pkcs7.h.in * - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -56,8 +56,8 @@ typedef struct pkcs7_signer_info_st { PKCS7_ISSUER_AND_SERIAL *issuer_and_serial; X509_ALGOR *digest_alg; STACK_OF(X509_ATTRIBUTE) *auth_attr; /* [ 0 ] */ - X509_ALGOR *digest_enc_alg; /* confusing name, actually used for signing */ - ASN1_OCTET_STRING *enc_digest; /* confusing name, actually signature */ + X509_ALGOR *digest_enc_alg; + ASN1_OCTET_STRING *enc_digest; STACK_OF(X509_ATTRIBUTE) *unauth_attr; /* [ 1 ] */ /* The private key to sign with */ EVP_PKEY *pkey; diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm/include/openssl/ssl.h b/deps/openssl/config/archs/darwin64-arm64-cc/asm/include/openssl/ssl.h index 0f1915755..3df725c56 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm/openssl.gypi b/deps/openssl/config/archs/darwin64-arm64-cc/asm/openssl.gypi index 91173eeb0..5028c50d6 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm/openssl.gypi +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cbc.c', 'openssl/crypto/aes/aes_cfb.c', diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/configdata.pm b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/configdata.pm index bdb02ff56..21e224985 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/configdata.pm @@ -139,7 +139,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -156,7 +156,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.13+quic", + "full_version" => "3.0.9", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,7 +206,7 @@ our %config = ( ], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "13", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -258,11 +258,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "30 Jan 2024", - "shlib_version" => "81.3", + "release_date" => "30 May 2023", + "shlib_version" => "3", "sourcedir" => ".", "target" => "darwin64-arm64-cc", - "version" => "3.0.13" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -387,7 +387,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -783,9 +782,6 @@ our %unified_info = ( "providers/fips" => { "fips" => "1" }, - "test/p_minimal" => { - "noinst" => "1" - }, "test/p_test" => { "noinst" => "1" } @@ -854,9 +850,6 @@ our %unified_info = ( "test/asn1_internal_test" => { "noinst" => "1" }, - "test/asn1_stable_parse_test" => { - "noinst" => "1" - }, "test/asn1_string_table_test" => { "noinst" => "1" }, @@ -1046,9 +1039,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -1628,9 +1618,6 @@ our %unified_info = ( "SHA512_ASM", "VPAES_ASM" ], - "test/evp_extra_test" => [ - "STATIC_LEGACY" - ], "test/provider_internal_test" => [ "PROVIDER_INIT_FUNCTION_NAME=p_test_init" ], @@ -2384,9 +2371,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -2684,9 +2668,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -3455,9 +3436,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -3752,9 +3730,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -3788,12 +3763,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -4778,9 +4747,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -5078,9 +5044,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -5849,9 +5812,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -6146,9 +6106,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -6182,12 +6139,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -7177,10 +7128,6 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], - "test/asn1_stable_parse_test" => [ - "libcrypto", - "test/libtestutil.a" - ], "test/asn1_string_table_test" => [ "libcrypto", "test/libtestutil.a" @@ -7434,10 +7381,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -7703,8 +7646,6 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "libcrypto.a", - "providers/libcommon.a", - "providers/liblegacy.a", "test/libtestutil.a" ], "test/evp_extra_test2" => [ @@ -9791,7 +9732,6 @@ our %unified_info = ( }, "providers" => { "deps" => [ - "providers/evp_extra_test-bin-legacyprov.o", "providers/libcrypto-lib-baseprov.o", "providers/libcrypto-lib-defltprov.o", "providers/libcrypto-lib-nullprov.o", @@ -9799,9 +9739,6 @@ our %unified_info = ( "providers/libdefault.a" ], "products" => { - "bin" => [ - "test/evp_extra_test" - ], "dso" => [ "providers/legacy" ], @@ -10237,7 +10174,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10288,7 +10224,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -11420,9 +11355,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -11720,9 +11652,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -12491,9 +12420,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -12788,9 +12714,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -12824,12 +12747,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -13814,9 +13731,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -14114,9 +14028,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -14885,9 +14796,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -15182,9 +15090,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -15218,12 +15123,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -16238,10 +16137,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16480,7 +16375,6 @@ our %unified_info = ( "doc/html/man3/CMS_get1_ReceiptRequest.html", "doc/html/man3/CMS_sign.html", "doc/html/man3/CMS_sign_receipt.html", - "doc/html/man3/CMS_signed_get_attr.html", "doc/html/man3/CMS_uncompress.html", "doc/html/man3/CMS_verify.html", "doc/html/man3/CMS_verify_receipt.html", @@ -16580,7 +16474,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_encapsulate.html", "doc/html/man3/EVP_PKEY_encrypt.html", "doc/html/man3/EVP_PKEY_fromdata.html", - "doc/html/man3/EVP_PKEY_get_attr.html", "doc/html/man3/EVP_PKEY_get_default_digest_nid.html", "doc/html/man3/EVP_PKEY_get_field_type.html", "doc/html/man3/EVP_PKEY_get_group_name.html", @@ -16837,7 +16730,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -16936,7 +16828,6 @@ our %unified_info = ( "doc/html/man3/X509V3_get_d2i.html", "doc/html/man3/X509V3_set_ctx.html", "doc/html/man3/X509_ALGOR_dup.html", - "doc/html/man3/X509_ATTRIBUTE.html", "doc/html/man3/X509_CRL_get0_by_serial.html", "doc/html/man3/X509_EXTENSION_set_object.html", "doc/html/man3/X509_LOOKUP.html", @@ -16948,8 +16839,6 @@ our %unified_info = ( "doc/html/man3/X509_NAME_get_index_by_NID.html", "doc/html/man3/X509_NAME_print_ex.html", "doc/html/man3/X509_PUBKEY_new.html", - "doc/html/man3/X509_REQ_get_attr.html", - "doc/html/man3/X509_REQ_get_extensions.html", "doc/html/man3/X509_SIG_get0.html", "doc/html/man3/X509_STORE_CTX_get_error.html", "doc/html/man3/X509_STORE_CTX_new.html", @@ -18299,10 +18188,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/asn1_stable_parse_test" => [ - "include", - "apps/include" - ], "test/asn1_string_table_test" => [ "include", "apps/include" @@ -18510,9 +18395,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -18772,9 +18654,7 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "include", - "apps/include", - "providers/common/include", - "providers/implementations/include" + "apps/include" ], "test/evp_extra_test2" => [ "include", @@ -19031,10 +18911,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/p_minimal" => [ - "include", - "." - ], "test/p_test" => [ "include", "." @@ -19524,7 +19400,6 @@ our %unified_info = ( "doc/man/man3/CMS_get1_ReceiptRequest.3", "doc/man/man3/CMS_sign.3", "doc/man/man3/CMS_sign_receipt.3", - "doc/man/man3/CMS_signed_get_attr.3", "doc/man/man3/CMS_uncompress.3", "doc/man/man3/CMS_verify.3", "doc/man/man3/CMS_verify_receipt.3", @@ -19624,7 +19499,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_encapsulate.3", "doc/man/man3/EVP_PKEY_encrypt.3", "doc/man/man3/EVP_PKEY_fromdata.3", - "doc/man/man3/EVP_PKEY_get_attr.3", "doc/man/man3/EVP_PKEY_get_default_digest_nid.3", "doc/man/man3/EVP_PKEY_get_field_type.3", "doc/man/man3/EVP_PKEY_get_group_name.3", @@ -19881,7 +19755,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -19980,7 +19853,6 @@ our %unified_info = ( "doc/man/man3/X509V3_get_d2i.3", "doc/man/man3/X509V3_set_ctx.3", "doc/man/man3/X509_ALGOR_dup.3", - "doc/man/man3/X509_ATTRIBUTE.3", "doc/man/man3/X509_CRL_get0_by_serial.3", "doc/man/man3/X509_EXTENSION_set_object.3", "doc/man/man3/X509_LOOKUP.3", @@ -19992,8 +19864,6 @@ our %unified_info = ( "doc/man/man3/X509_NAME_get_index_by_NID.3", "doc/man/man3/X509_NAME_print_ex.3", "doc/man/man3/X509_PUBKEY_new.3", - "doc/man/man3/X509_REQ_get_attr.3", - "doc/man/man3/X509_REQ_get_extensions.3", "doc/man/man3/X509_SIG_get0.3", "doc/man/man3/X509_STORE_CTX_get_error.3", "doc/man/man3/X509_STORE_CTX_new.3", @@ -20177,7 +20047,6 @@ our %unified_info = ( "modules" => [ "providers/fips", "providers/legacy", - "test/p_minimal", "test/p_test" ], "programs" => [ @@ -20203,7 +20072,6 @@ our %unified_info = ( "test/asn1_dsa_internal_test", "test/asn1_encode_test", "test/asn1_internal_test", - "test/asn1_stable_parse_test", "test/asn1_string_table_test", "test/asn1_time_test", "test/asynciotest", @@ -20267,7 +20135,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24473,7 +24340,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24500,7 +24366,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -24602,9 +24467,6 @@ our %unified_info = ( "providers/common/libfips-lib-securitycheck_fips.o" => [ "providers/common/securitycheck_fips.c" ], - "providers/evp_extra_test-bin-legacyprov.o" => [ - "providers/legacyprov.c" - ], "providers/fips" => [ "providers/fips/fips-dso-fips_entry.o" ], @@ -25750,9 +25612,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25834,9 +25693,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25894,12 +25750,6 @@ our %unified_info = ( "test/asn1_internal_test-bin-asn1_internal_test.o" => [ "test/asn1_internal_test.c" ], - "test/asn1_stable_parse_test" => [ - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" - ], - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" => [ - "test/asn1_stable_parse_test.c" - ], "test/asn1_string_table_test" => [ "test/asn1_string_table_test-bin-asn1_string_table_test.o" ], @@ -26279,12 +26129,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -26683,7 +26527,6 @@ our %unified_info = ( "test/errtest.c" ], "test/evp_extra_test" => [ - "providers/evp_extra_test-bin-legacyprov.o", "test/evp_extra_test-bin-evp_extra_test.o" ], "test/evp_extra_test-bin-evp_extra_test.o" => [ @@ -26974,12 +26817,6 @@ our %unified_info = ( "test/ossl_store_test-bin-ossl_store_test.o" => [ "test/ossl_store_test.c" ], - "test/p_minimal" => [ - "test/p_minimal-dso-p_minimal.o" - ], - "test/p_minimal-dso-p_minimal.o" => [ - "test/p_minimal.c" - ], "test/p_test" => [ "test/p_test-dso-p_test.o" ], @@ -27665,8 +27502,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27693,7 +27530,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27710,8 +27547,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/crypto/aes/aesv8-armx.S b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/crypto/aes/aesv8-armx.S index ae20ad9ff..5e3afc1ce 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/crypto/aes/aesv8-armx.S +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/crypto/aes/aesv8-armx.S @@ -103,7 +103,7 @@ L192: Loop192: tbl v6.16b,{v4.16b},v2.16b ext v5.16b,v0.16b,v3.16b,#12 -#ifdef __AARCH64EB__ +#ifdef __ARMEB__ st1 {v4.4s},[x2],#16 sub x2,x2,#8 #else @@ -1510,7 +1510,7 @@ _aes_v8_ctr32_encrypt_blocks: ldr w5,[x3,#240] ldr w8, [x4, #12] -#ifdef __AARCH64EB__ +#ifdef __ARMEB__ ld1 {v0.16b},[x4] #else ld1 {v0.4s},[x4] @@ -1527,7 +1527,7 @@ _aes_v8_ctr32_encrypt_blocks: add x7,x3,#32 mov w6,w5 csel x12,xzr,x12,lo -#ifndef __AARCH64EB__ +#ifndef __ARMEB__ rev w8, w8 #endif orr v1.16b,v0.16b,v0.16b diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/crypto/buildinf.h index e209ae9d1..70f37630c 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: darwin64-arm64-cc" -#define DATE "built on: Wed Jan 31 13:00:21 2024 UTC" +#define DATE "built on: Tue Aug 6 12:23:20 2024 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/crypto/modes/ghashv8-armx.S b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/crypto/modes/ghashv8-armx.S index dc71d8508..200c0d031 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/crypto/modes/ghashv8-armx.S +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/crypto/modes/ghashv8-armx.S @@ -101,7 +101,7 @@ _gcm_gmult_v8: movi v19.16b,#0xe1 ld1 {v20.2d,v21.2d},[x1] //load twisted H, ... shl v19.2d,v19.2d,#57 -#ifndef __AARCH64EB__ +#ifndef __ARMEB__ rev64 v17.16b,v17.16b #endif ext v3.16b,v17.16b,v17.16b,#8 @@ -126,7 +126,7 @@ _gcm_gmult_v8: eor v18.16b,v18.16b,v2.16b eor v0.16b,v0.16b,v18.16b -#ifndef __AARCH64EB__ +#ifndef __ARMEB__ rev64 v0.16b,v0.16b #endif ext v0.16b,v0.16b,v0.16b,#8 @@ -163,14 +163,14 @@ _gcm_ghash_v8: ext v0.16b,v0.16b,v0.16b,#8 //rotate Xi ld1 {v16.2d},[x2],#16 //load [rotated] I[0] shl v19.2d,v19.2d,#57 //compose 0xc2.0 constant -#ifndef __AARCH64EB__ +#ifndef __ARMEB__ rev64 v16.16b,v16.16b rev64 v0.16b,v0.16b #endif ext v3.16b,v16.16b,v16.16b,#8 //rotate I[0] b.lo Lodd_tail_v8 //x3 was less than 32 ld1 {v17.2d},[x2],x12 //load [rotated] I[1] -#ifndef __AARCH64EB__ +#ifndef __ARMEB__ rev64 v17.16b,v17.16b #endif ext v7.16b,v17.16b,v17.16b,#8 @@ -202,13 +202,13 @@ Loop_mod2x_v8: eor v18.16b,v0.16b,v2.16b eor v1.16b,v1.16b,v17.16b ld1 {v17.2d},[x2],x12 //load [rotated] I[i+3] -#ifndef __AARCH64EB__ +#ifndef __ARMEB__ rev64 v16.16b,v16.16b #endif eor v1.16b,v1.16b,v18.16b pmull v18.1q,v0.1d,v19.1d //1st phase of reduction -#ifndef __AARCH64EB__ +#ifndef __ARMEB__ rev64 v17.16b,v17.16b #endif ins v2.d[0],v1.d[1] @@ -258,7 +258,7 @@ Lodd_tail_v8: eor v0.16b,v0.16b,v18.16b Ldone_v8: -#ifndef __AARCH64EB__ +#ifndef __ARMEB__ rev64 v0.16b,v0.16b #endif ext v0.16b,v0.16b,v0.16b,#8 @@ -277,7 +277,7 @@ Lgcm_ghash_v8_4x: shl v19.2d,v19.2d,#57 //compose 0xc2.0 constant ld1 {v4.2d,v5.2d,v6.2d,v7.2d},[x2],#64 -#ifndef __AARCH64EB__ +#ifndef __ARMEB__ rev64 v0.16b,v0.16b rev64 v5.16b,v5.16b rev64 v6.16b,v6.16b @@ -321,7 +321,7 @@ Loop4x: eor v16.16b,v4.16b,v0.16b ld1 {v4.2d,v5.2d,v6.2d,v7.2d},[x2],#64 ext v3.16b,v16.16b,v16.16b,#8 -#ifndef __AARCH64EB__ +#ifndef __ARMEB__ rev64 v5.16b,v5.16b rev64 v6.16b,v6.16b rev64 v7.16b,v7.16b @@ -404,7 +404,7 @@ Lthree: eor v1.16b,v1.16b,v17.16b ld1 {v4.2d,v5.2d,v6.2d},[x2] eor v1.16b,v1.16b,v18.16b -#ifndef __AARCH64EB__ +#ifndef __ARMEB__ rev64 v5.16b,v5.16b rev64 v6.16b,v6.16b rev64 v4.16b,v4.16b @@ -456,7 +456,7 @@ Ltwo: eor v1.16b,v1.16b,v17.16b ld1 {v4.2d,v5.2d},[x2] eor v1.16b,v1.16b,v18.16b -#ifndef __AARCH64EB__ +#ifndef __ARMEB__ rev64 v5.16b,v5.16b rev64 v4.16b,v4.16b #endif @@ -499,7 +499,7 @@ Lone: eor v1.16b,v1.16b,v17.16b ld1 {v4.2d},[x2] eor v1.16b,v1.16b,v18.16b -#ifndef __AARCH64EB__ +#ifndef __ARMEB__ rev64 v4.16b,v4.16b #endif @@ -539,7 +539,7 @@ Ldone4x: eor v0.16b,v0.16b,v18.16b ext v0.16b,v0.16b,v0.16b,#8 -#ifndef __AARCH64EB__ +#ifndef __ARMEB__ rev64 v0.16b,v0.16b #endif st1 {v0.2d},[x0] //write out Xi diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/crypto/poly1305/poly1305-armv8.S b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/crypto/poly1305/poly1305-armv8.S index a044e14cb..90b6d357a 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/crypto/poly1305/poly1305-armv8.S +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/crypto/poly1305/poly1305-armv8.S @@ -28,7 +28,7 @@ _poly1305_init: ldp x7,x8,[x1] // load key mov x9,#0xfffffffc0fffffff movk x9,#0x0fff,lsl#48 -#ifdef __AARCH64EB__ +#ifdef __ARMEB__ rev x7,x7 // flip bytes rev x8,x8 #endif @@ -75,7 +75,7 @@ Lpoly1305_blocks: Loop: ldp x10,x11,[x1],#16 // load input sub x2,x2,#16 -#ifdef __AARCH64EB__ +#ifdef __ARMEB__ rev x10,x10 rev x11,x11 #endif @@ -140,13 +140,13 @@ Lpoly1305_emit: csel x4,x4,x12,eq csel x5,x5,x13,eq -#ifdef __AARCH64EB__ +#ifdef __ARMEB__ ror x10,x10,#32 // flip nonce words ror x11,x11,#32 #endif adds x4,x4,x10 // accumulate nonce adc x5,x5,x11 -#ifdef __AARCH64EB__ +#ifdef __ARMEB__ rev x4,x4 // flip output bytes rev x5,x5 #endif @@ -266,7 +266,7 @@ Lblocks_neon: adcs x5,x5,xzr adc x6,x6,xzr -#ifdef __AARCH64EB__ +#ifdef __ARMEB__ rev x12,x12 rev x13,x13 #endif @@ -312,7 +312,7 @@ Lbase2_64_neon: ldp x12,x13,[x1],#16 // load input sub x2,x2,#16 add x9,x8,x8,lsr#2 // s1 = r1 + (r1 >> 2) -#ifdef __AARCH64EB__ +#ifdef __ARMEB__ rev x12,x12 rev x13,x13 #endif @@ -397,7 +397,7 @@ Ldo_neon: lsl x3,x3,#24 add x15,x0,#48 -#ifdef __AARCH64EB__ +#ifdef __ARMEB__ rev x8,x8 rev x12,x12 rev x9,x9 @@ -433,7 +433,7 @@ Ldo_neon: ld1 {v4.4s,v5.4s,v6.4s,v7.4s},[x15],#64 ld1 {v8.4s},[x15] -#ifdef __AARCH64EB__ +#ifdef __ARMEB__ rev x8,x8 rev x12,x12 rev x9,x9 @@ -494,7 +494,7 @@ Loop_neon: umull v20.2d,v14.2s,v1.s[2] ldp x9,x13,[x16],#48 umull v19.2d,v14.2s,v0.s[2] -#ifdef __AARCH64EB__ +#ifdef __ARMEB__ rev x8,x8 rev x12,x12 rev x9,x9 @@ -559,7 +559,7 @@ Loop_neon: umlal v23.2d,v11.2s,v3.s[0] umlal v20.2d,v11.2s,v8.s[0] umlal v21.2d,v11.2s,v0.s[0] -#ifdef __AARCH64EB__ +#ifdef __ARMEB__ rev x8,x8 rev x12,x12 rev x9,x9 @@ -840,13 +840,13 @@ Lpoly1305_emit_neon: csel x4,x4,x12,eq csel x5,x5,x13,eq -#ifdef __AARCH64EB__ +#ifdef __ARMEB__ ror x10,x10,#32 // flip nonce words ror x11,x11,#32 #endif adds x4,x4,x10 // accumulate nonce adc x5,x5,x11 -#ifdef __AARCH64EB__ +#ifdef __ARMEB__ rev x4,x4 // flip output bytes rev x5,x5 #endif diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/include/openssl/bio.h b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/include/openssl/bio.h index f9aa74731..e16cf622c 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/include/openssl/bio.h +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/include/openssl/bio.h @@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, - int (*ossl_gets) (BIO *, char *, int)); + int (*gets) (BIO *, char *, int)); long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/include/openssl/opensslv.h index 65f3bfa05..5bb97d596 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 13 +# define OPENSSL_VERSION_PATCH 9 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.13" -# define OPENSSL_FULL_VERSION_STR "3.0.13+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "30 Jan 2024" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13+quic 30 Jan 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/include/openssl/pkcs7.h b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/include/openssl/pkcs7.h index 0ce79bf4f..557a0a726 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/include/openssl/pkcs7.h +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/include/openssl/pkcs7.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/pkcs7.h.in * - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -56,8 +56,8 @@ typedef struct pkcs7_signer_info_st { PKCS7_ISSUER_AND_SERIAL *issuer_and_serial; X509_ALGOR *digest_alg; STACK_OF(X509_ATTRIBUTE) *auth_attr; /* [ 0 ] */ - X509_ALGOR *digest_enc_alg; /* confusing name, actually used for signing */ - ASN1_OCTET_STRING *enc_digest; /* confusing name, actually signature */ + X509_ALGOR *digest_enc_alg; + ASN1_OCTET_STRING *enc_digest; STACK_OF(X509_ATTRIBUTE) *unauth_attr; /* [ 1 ] */ /* The private key to sign with */ EVP_PKEY *pkey; diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/include/openssl/ssl.h index 0f1915755..3df725c56 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/include/openssl/ssl.h +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/openssl.gypi b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/openssl.gypi index 61a8836a9..edd82ba51 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cbc.c', 'openssl/crypto/aes/aes_cfb.c', diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/configdata.pm b/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/configdata.pm index 752eaf3a6..782d96e7b 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/configdata.pm +++ b/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/configdata.pm @@ -139,7 +139,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [], @@ -154,7 +154,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.13+quic", + "full_version" => "3.0.9", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -205,7 +205,7 @@ our %config = ( ], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "13", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -258,11 +258,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "30 Jan 2024", - "shlib_version" => "81.3", + "release_date" => "30 May 2023", + "shlib_version" => "3", "sourcedir" => ".", "target" => "darwin64-arm64-cc", - "version" => "3.0.13" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -387,7 +387,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -784,9 +783,6 @@ our %unified_info = ( "providers/fips" => { "fips" => "1" }, - "test/p_minimal" => { - "noinst" => "1" - }, "test/p_test" => { "noinst" => "1" } @@ -855,9 +851,6 @@ our %unified_info = ( "test/asn1_internal_test" => { "noinst" => "1" }, - "test/asn1_stable_parse_test" => { - "noinst" => "1" - }, "test/asn1_string_table_test" => { "noinst" => "1" }, @@ -1047,9 +1040,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -1597,9 +1587,6 @@ our %unified_info = ( "providers/libfips.a" => [ "FIPS_MODULE" ], - "test/evp_extra_test" => [ - "STATIC_LEGACY" - ], "test/provider_internal_test" => [ "PROVIDER_INIT_FUNCTION_NAME=p_test_init" ], @@ -2353,9 +2340,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -2653,9 +2637,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -3424,9 +3405,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -3721,9 +3699,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -3757,12 +3732,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -4747,9 +4716,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -5047,9 +5013,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -5818,9 +5781,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -6115,9 +6075,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -6151,12 +6108,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -7146,10 +7097,6 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], - "test/asn1_stable_parse_test" => [ - "libcrypto", - "test/libtestutil.a" - ], "test/asn1_string_table_test" => [ "libcrypto", "test/libtestutil.a" @@ -7403,10 +7350,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -7672,8 +7615,6 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "libcrypto.a", - "providers/libcommon.a", - "providers/liblegacy.a", "test/libtestutil.a" ], "test/evp_extra_test2" => [ @@ -9737,7 +9678,6 @@ our %unified_info = ( }, "providers" => { "deps" => [ - "providers/evp_extra_test-bin-legacyprov.o", "providers/libcrypto-lib-baseprov.o", "providers/libcrypto-lib-defltprov.o", "providers/libcrypto-lib-nullprov.o", @@ -9745,9 +9685,6 @@ our %unified_info = ( "providers/libdefault.a" ], "products" => { - "bin" => [ - "test/evp_extra_test" - ], "dso" => [ "providers/legacy" ], @@ -10183,7 +10120,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10234,7 +10170,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -11366,9 +11301,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -11666,9 +11598,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -12437,9 +12366,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -12734,9 +12660,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -12770,12 +12693,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -13760,9 +13677,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -14060,9 +13974,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -14831,9 +14742,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -15128,9 +15036,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -15164,12 +15069,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -16184,10 +16083,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16426,7 +16321,6 @@ our %unified_info = ( "doc/html/man3/CMS_get1_ReceiptRequest.html", "doc/html/man3/CMS_sign.html", "doc/html/man3/CMS_sign_receipt.html", - "doc/html/man3/CMS_signed_get_attr.html", "doc/html/man3/CMS_uncompress.html", "doc/html/man3/CMS_verify.html", "doc/html/man3/CMS_verify_receipt.html", @@ -16526,7 +16420,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_encapsulate.html", "doc/html/man3/EVP_PKEY_encrypt.html", "doc/html/man3/EVP_PKEY_fromdata.html", - "doc/html/man3/EVP_PKEY_get_attr.html", "doc/html/man3/EVP_PKEY_get_default_digest_nid.html", "doc/html/man3/EVP_PKEY_get_field_type.html", "doc/html/man3/EVP_PKEY_get_group_name.html", @@ -16783,7 +16676,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -16882,7 +16774,6 @@ our %unified_info = ( "doc/html/man3/X509V3_get_d2i.html", "doc/html/man3/X509V3_set_ctx.html", "doc/html/man3/X509_ALGOR_dup.html", - "doc/html/man3/X509_ATTRIBUTE.html", "doc/html/man3/X509_CRL_get0_by_serial.html", "doc/html/man3/X509_EXTENSION_set_object.html", "doc/html/man3/X509_LOOKUP.html", @@ -16894,8 +16785,6 @@ our %unified_info = ( "doc/html/man3/X509_NAME_get_index_by_NID.html", "doc/html/man3/X509_NAME_print_ex.html", "doc/html/man3/X509_PUBKEY_new.html", - "doc/html/man3/X509_REQ_get_attr.html", - "doc/html/man3/X509_REQ_get_extensions.html", "doc/html/man3/X509_SIG_get0.html", "doc/html/man3/X509_STORE_CTX_get_error.html", "doc/html/man3/X509_STORE_CTX_new.html", @@ -18185,10 +18074,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/asn1_stable_parse_test" => [ - "include", - "apps/include" - ], "test/asn1_string_table_test" => [ "include", "apps/include" @@ -18396,9 +18281,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -18658,9 +18540,7 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "include", - "apps/include", - "providers/common/include", - "providers/implementations/include" + "apps/include" ], "test/evp_extra_test2" => [ "include", @@ -18917,10 +18797,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/p_minimal" => [ - "include", - "." - ], "test/p_test" => [ "include", "." @@ -19410,7 +19286,6 @@ our %unified_info = ( "doc/man/man3/CMS_get1_ReceiptRequest.3", "doc/man/man3/CMS_sign.3", "doc/man/man3/CMS_sign_receipt.3", - "doc/man/man3/CMS_signed_get_attr.3", "doc/man/man3/CMS_uncompress.3", "doc/man/man3/CMS_verify.3", "doc/man/man3/CMS_verify_receipt.3", @@ -19510,7 +19385,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_encapsulate.3", "doc/man/man3/EVP_PKEY_encrypt.3", "doc/man/man3/EVP_PKEY_fromdata.3", - "doc/man/man3/EVP_PKEY_get_attr.3", "doc/man/man3/EVP_PKEY_get_default_digest_nid.3", "doc/man/man3/EVP_PKEY_get_field_type.3", "doc/man/man3/EVP_PKEY_get_group_name.3", @@ -19767,7 +19641,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -19866,7 +19739,6 @@ our %unified_info = ( "doc/man/man3/X509V3_get_d2i.3", "doc/man/man3/X509V3_set_ctx.3", "doc/man/man3/X509_ALGOR_dup.3", - "doc/man/man3/X509_ATTRIBUTE.3", "doc/man/man3/X509_CRL_get0_by_serial.3", "doc/man/man3/X509_EXTENSION_set_object.3", "doc/man/man3/X509_LOOKUP.3", @@ -19878,8 +19750,6 @@ our %unified_info = ( "doc/man/man3/X509_NAME_get_index_by_NID.3", "doc/man/man3/X509_NAME_print_ex.3", "doc/man/man3/X509_PUBKEY_new.3", - "doc/man/man3/X509_REQ_get_attr.3", - "doc/man/man3/X509_REQ_get_extensions.3", "doc/man/man3/X509_SIG_get0.3", "doc/man/man3/X509_STORE_CTX_get_error.3", "doc/man/man3/X509_STORE_CTX_new.3", @@ -20063,7 +19933,6 @@ our %unified_info = ( "modules" => [ "providers/fips", "providers/legacy", - "test/p_minimal", "test/p_test" ], "programs" => [ @@ -20089,7 +19958,6 @@ our %unified_info = ( "test/asn1_dsa_internal_test", "test/asn1_encode_test", "test/asn1_internal_test", - "test/asn1_stable_parse_test", "test/asn1_string_table_test", "test/asn1_time_test", "test/asynciotest", @@ -20153,7 +20021,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24278,7 +24145,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24305,7 +24171,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -24407,9 +24272,6 @@ our %unified_info = ( "providers/common/libfips-lib-securitycheck_fips.o" => [ "providers/common/securitycheck_fips.c" ], - "providers/evp_extra_test-bin-legacyprov.o" => [ - "providers/legacyprov.c" - ], "providers/fips" => [ "providers/fips/fips-dso-fips_entry.o" ], @@ -25544,9 +25406,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25628,9 +25487,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25688,12 +25544,6 @@ our %unified_info = ( "test/asn1_internal_test-bin-asn1_internal_test.o" => [ "test/asn1_internal_test.c" ], - "test/asn1_stable_parse_test" => [ - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" - ], - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" => [ - "test/asn1_stable_parse_test.c" - ], "test/asn1_string_table_test" => [ "test/asn1_string_table_test-bin-asn1_string_table_test.o" ], @@ -26073,12 +25923,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -26477,7 +26321,6 @@ our %unified_info = ( "test/errtest.c" ], "test/evp_extra_test" => [ - "providers/evp_extra_test-bin-legacyprov.o", "test/evp_extra_test-bin-evp_extra_test.o" ], "test/evp_extra_test-bin-evp_extra_test.o" => [ @@ -26768,12 +26611,6 @@ our %unified_info = ( "test/ossl_store_test-bin-ossl_store_test.o" => [ "test/ossl_store_test.c" ], - "test/p_minimal" => [ - "test/p_minimal-dso-p_minimal.o" - ], - "test/p_minimal-dso-p_minimal.o" => [ - "test/p_minimal.c" - ], "test/p_test" => [ "test/p_test-dso-p_test.o" ], @@ -27462,8 +27299,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27490,7 +27327,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27507,8 +27344,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/crypto/buildinf.h index f58186b30..f36f40692 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: darwin64-arm64-cc" -#define DATE "built on: Wed Jan 31 13:00:33 2024 UTC" +#define DATE "built on: Tue Aug 6 12:23:31 2024 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/include/openssl/bio.h b/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/include/openssl/bio.h index f9aa74731..e16cf622c 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/include/openssl/bio.h @@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, - int (*ossl_gets) (BIO *, char *, int)); + int (*gets) (BIO *, char *, int)); long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/include/openssl/opensslv.h index 65f3bfa05..5bb97d596 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 13 +# define OPENSSL_VERSION_PATCH 9 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.13" -# define OPENSSL_FULL_VERSION_STR "3.0.13+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "30 Jan 2024" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13+quic 30 Jan 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/include/openssl/pkcs7.h b/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/include/openssl/pkcs7.h index 0ce79bf4f..557a0a726 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/include/openssl/pkcs7.h +++ b/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/include/openssl/pkcs7.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/pkcs7.h.in * - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -56,8 +56,8 @@ typedef struct pkcs7_signer_info_st { PKCS7_ISSUER_AND_SERIAL *issuer_and_serial; X509_ALGOR *digest_alg; STACK_OF(X509_ATTRIBUTE) *auth_attr; /* [ 0 ] */ - X509_ALGOR *digest_enc_alg; /* confusing name, actually used for signing */ - ASN1_OCTET_STRING *enc_digest; /* confusing name, actually signature */ + X509_ALGOR *digest_enc_alg; + ASN1_OCTET_STRING *enc_digest; STACK_OF(X509_ATTRIBUTE) *unauth_attr; /* [ 1 ] */ /* The private key to sign with */ EVP_PKEY *pkey; diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/include/openssl/ssl.h index 0f1915755..3df725c56 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/openssl.gypi b/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/openssl.gypi index 835387a25..67fd4d4b7 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cbc.c', 'openssl/crypto/aes/aes_cfb.c', diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/configdata.pm b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/configdata.pm index 2d3418aa6..5b20d747d 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/configdata.pm +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/configdata.pm @@ -139,7 +139,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -156,7 +156,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.13+quic", + "full_version" => "3.0.9", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,7 +206,7 @@ our %config = ( ], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "13", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -258,11 +258,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "30 Jan 2024", - "shlib_version" => "81.3", + "release_date" => "30 May 2023", + "shlib_version" => "3", "sourcedir" => ".", "target" => "darwin64-x86_64-cc", - "version" => "3.0.13" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -387,7 +387,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -783,9 +782,6 @@ our %unified_info = ( "providers/fips" => { "fips" => "1" }, - "test/p_minimal" => { - "noinst" => "1" - }, "test/p_test" => { "noinst" => "1" } @@ -854,9 +850,6 @@ our %unified_info = ( "test/asn1_internal_test" => { "noinst" => "1" }, - "test/asn1_stable_parse_test" => { - "noinst" => "1" - }, "test/asn1_string_table_test" => { "noinst" => "1" }, @@ -1046,9 +1039,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -1605,7 +1595,6 @@ our %unified_info = ( "OPENSSL_IA32_SSE2", "PADLOCK_ASM", "POLY1305_ASM", - "RC4_ASM", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", @@ -1657,11 +1646,7 @@ our %unified_info = ( "X25519_ASM" ], "providers/liblegacy.a" => [ - "MD5_ASM", - "RC4_ASM" - ], - "test/evp_extra_test" => [ - "STATIC_LEGACY" + "MD5_ASM" ], "test/provider_internal_test" => [ "PROVIDER_INIT_FUNCTION_NAME=p_test_init" @@ -2416,9 +2401,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -2716,9 +2698,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -3487,9 +3466,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -3784,9 +3760,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -3820,12 +3793,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -4810,9 +4777,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -5110,9 +5074,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -5881,9 +5842,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -6178,9 +6136,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -6214,12 +6169,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -7209,10 +7158,6 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], - "test/asn1_stable_parse_test" => [ - "libcrypto", - "test/libtestutil.a" - ], "test/asn1_string_table_test" => [ "libcrypto", "test/libtestutil.a" @@ -7466,10 +7411,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -7735,8 +7676,6 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "libcrypto.a", - "providers/libcommon.a", - "providers/liblegacy.a", "test/libtestutil.a" ], "test/evp_extra_test2" => [ @@ -9858,7 +9797,6 @@ our %unified_info = ( }, "providers" => { "deps" => [ - "providers/evp_extra_test-bin-legacyprov.o", "providers/libcrypto-lib-baseprov.o", "providers/libcrypto-lib-defltprov.o", "providers/libcrypto-lib-nullprov.o", @@ -9866,9 +9804,6 @@ our %unified_info = ( "providers/libdefault.a" ], "products" => { - "bin" => [ - "test/evp_extra_test" - ], "dso" => [ "providers/legacy" ], @@ -10304,7 +10239,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10355,7 +10289,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -11487,9 +11420,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -11787,9 +11717,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -12558,9 +12485,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -12855,9 +12779,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -12891,12 +12812,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -13881,9 +13796,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -14181,9 +14093,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -14952,9 +14861,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -15249,9 +15155,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -15285,12 +15188,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -16305,10 +16202,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16547,7 +16440,6 @@ our %unified_info = ( "doc/html/man3/CMS_get1_ReceiptRequest.html", "doc/html/man3/CMS_sign.html", "doc/html/man3/CMS_sign_receipt.html", - "doc/html/man3/CMS_signed_get_attr.html", "doc/html/man3/CMS_uncompress.html", "doc/html/man3/CMS_verify.html", "doc/html/man3/CMS_verify_receipt.html", @@ -16647,7 +16539,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_encapsulate.html", "doc/html/man3/EVP_PKEY_encrypt.html", "doc/html/man3/EVP_PKEY_fromdata.html", - "doc/html/man3/EVP_PKEY_get_attr.html", "doc/html/man3/EVP_PKEY_get_default_digest_nid.html", "doc/html/man3/EVP_PKEY_get_field_type.html", "doc/html/man3/EVP_PKEY_get_group_name.html", @@ -16904,7 +16795,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -17003,7 +16893,6 @@ our %unified_info = ( "doc/html/man3/X509V3_get_d2i.html", "doc/html/man3/X509V3_set_ctx.html", "doc/html/man3/X509_ALGOR_dup.html", - "doc/html/man3/X509_ATTRIBUTE.html", "doc/html/man3/X509_CRL_get0_by_serial.html", "doc/html/man3/X509_EXTENSION_set_object.html", "doc/html/man3/X509_LOOKUP.html", @@ -17015,8 +16904,6 @@ our %unified_info = ( "doc/html/man3/X509_NAME_get_index_by_NID.html", "doc/html/man3/X509_NAME_print_ex.html", "doc/html/man3/X509_PUBKEY_new.html", - "doc/html/man3/X509_REQ_get_attr.html", - "doc/html/man3/X509_REQ_get_extensions.html", "doc/html/man3/X509_SIG_get0.html", "doc/html/man3/X509_STORE_CTX_get_error.html", "doc/html/man3/X509_STORE_CTX_new.html", @@ -18306,10 +18193,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/asn1_stable_parse_test" => [ - "include", - "apps/include" - ], "test/asn1_string_table_test" => [ "include", "apps/include" @@ -18517,9 +18400,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -18779,9 +18659,7 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "include", - "apps/include", - "providers/common/include", - "providers/implementations/include" + "apps/include" ], "test/evp_extra_test2" => [ "include", @@ -19038,10 +18916,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/p_minimal" => [ - "include", - "." - ], "test/p_test" => [ "include", "." @@ -19531,7 +19405,6 @@ our %unified_info = ( "doc/man/man3/CMS_get1_ReceiptRequest.3", "doc/man/man3/CMS_sign.3", "doc/man/man3/CMS_sign_receipt.3", - "doc/man/man3/CMS_signed_get_attr.3", "doc/man/man3/CMS_uncompress.3", "doc/man/man3/CMS_verify.3", "doc/man/man3/CMS_verify_receipt.3", @@ -19631,7 +19504,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_encapsulate.3", "doc/man/man3/EVP_PKEY_encrypt.3", "doc/man/man3/EVP_PKEY_fromdata.3", - "doc/man/man3/EVP_PKEY_get_attr.3", "doc/man/man3/EVP_PKEY_get_default_digest_nid.3", "doc/man/man3/EVP_PKEY_get_field_type.3", "doc/man/man3/EVP_PKEY_get_group_name.3", @@ -19888,7 +19760,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -19987,7 +19858,6 @@ our %unified_info = ( "doc/man/man3/X509V3_get_d2i.3", "doc/man/man3/X509V3_set_ctx.3", "doc/man/man3/X509_ALGOR_dup.3", - "doc/man/man3/X509_ATTRIBUTE.3", "doc/man/man3/X509_CRL_get0_by_serial.3", "doc/man/man3/X509_EXTENSION_set_object.3", "doc/man/man3/X509_LOOKUP.3", @@ -19999,8 +19869,6 @@ our %unified_info = ( "doc/man/man3/X509_NAME_get_index_by_NID.3", "doc/man/man3/X509_NAME_print_ex.3", "doc/man/man3/X509_PUBKEY_new.3", - "doc/man/man3/X509_REQ_get_attr.3", - "doc/man/man3/X509_REQ_get_extensions.3", "doc/man/man3/X509_SIG_get0.3", "doc/man/man3/X509_STORE_CTX_get_error.3", "doc/man/man3/X509_STORE_CTX_new.3", @@ -20184,7 +20052,6 @@ our %unified_info = ( "modules" => [ "providers/fips", "providers/legacy", - "test/p_minimal", "test/p_test" ], "programs" => [ @@ -20210,7 +20077,6 @@ our %unified_info = ( "test/asn1_dsa_internal_test", "test/asn1_encode_test", "test/asn1_internal_test", - "test/asn1_stable_parse_test", "test/asn1_string_table_test", "test/asn1_time_test", "test/asynciotest", @@ -20274,7 +20140,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24568,7 +24433,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24595,7 +24459,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -24697,9 +24560,6 @@ our %unified_info = ( "providers/common/libfips-lib-securitycheck_fips.o" => [ "providers/common/securitycheck_fips.c" ], - "providers/evp_extra_test-bin-legacyprov.o" => [ - "providers/legacyprov.c" - ], "providers/fips" => [ "providers/fips/fips-dso-fips_entry.o" ], @@ -25857,9 +25717,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25941,9 +25798,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -26001,12 +25855,6 @@ our %unified_info = ( "test/asn1_internal_test-bin-asn1_internal_test.o" => [ "test/asn1_internal_test.c" ], - "test/asn1_stable_parse_test" => [ - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" - ], - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" => [ - "test/asn1_stable_parse_test.c" - ], "test/asn1_string_table_test" => [ "test/asn1_string_table_test-bin-asn1_string_table_test.o" ], @@ -26386,12 +26234,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -26790,7 +26632,6 @@ our %unified_info = ( "test/errtest.c" ], "test/evp_extra_test" => [ - "providers/evp_extra_test-bin-legacyprov.o", "test/evp_extra_test-bin-evp_extra_test.o" ], "test/evp_extra_test-bin-evp_extra_test.o" => [ @@ -27081,12 +26922,6 @@ our %unified_info = ( "test/ossl_store_test-bin-ossl_store_test.o" => [ "test/ossl_store_test.c" ], - "test/p_minimal" => [ - "test/p_minimal-dso-p_minimal.o" - ], - "test/p_minimal-dso-p_minimal.o" => [ - "test/p_minimal.c" - ], "test/p_test" => [ "test/p_test-dso-p_test.o" ], @@ -27772,8 +27607,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27800,7 +27635,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27817,8 +27652,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/buildinf.h b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/buildinf.h index e53812582..e1b412fa0 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: darwin64-x86_64-cc" -#define DATE "built on: Wed Jan 31 12:58:49 2024 UTC" +#define DATE "built on: Tue Aug 6 12:21:57 2024 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/openssl/bio.h b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/openssl/bio.h index f9aa74731..e16cf622c 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/openssl/bio.h @@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, - int (*ossl_gets) (BIO *, char *, int)); + int (*gets) (BIO *, char *, int)); long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/openssl/opensslv.h index 65f3bfa05..5bb97d596 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 13 +# define OPENSSL_VERSION_PATCH 9 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.13" -# define OPENSSL_FULL_VERSION_STR "3.0.13+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "30 Jan 2024" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13+quic 30 Jan 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/openssl/pkcs7.h b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/openssl/pkcs7.h index 0ce79bf4f..557a0a726 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/openssl/pkcs7.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/openssl/pkcs7.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/pkcs7.h.in * - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -56,8 +56,8 @@ typedef struct pkcs7_signer_info_st { PKCS7_ISSUER_AND_SERIAL *issuer_and_serial; X509_ALGOR *digest_alg; STACK_OF(X509_ATTRIBUTE) *auth_attr; /* [ 0 ] */ - X509_ALGOR *digest_enc_alg; /* confusing name, actually used for signing */ - ASN1_OCTET_STRING *enc_digest; /* confusing name, actually signature */ + X509_ALGOR *digest_enc_alg; + ASN1_OCTET_STRING *enc_digest; STACK_OF(X509_ATTRIBUTE) *unauth_attr; /* [ 1 ] */ /* The private key to sign with */ EVP_PKEY *pkey; diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/openssl/ssl.h b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/openssl/ssl.h index 0f1915755..3df725c56 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/openssl-cl.gypi b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/openssl-cl.gypi index 6fc980121..22e4d3d9c 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/openssl-cl.gypi +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/openssl-cl.gypi @@ -18,7 +18,6 @@ 'OPENSSL_IA32_SSE2', 'PADLOCK_ASM', 'POLY1305_ASM', - 'RC4_ASM', 'SHA1_ASM', 'SHA256_ASM', 'SHA512_ASM', diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/openssl.gypi b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/openssl.gypi index 454a35a31..5199240ed 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/openssl.gypi +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cfb.c', 'openssl/crypto/aes/aes_ecb.c', @@ -1004,7 +1002,6 @@ 'OPENSSL_IA32_SSE2', 'PADLOCK_ASM', 'POLY1305_ASM', - 'RC4_ASM', 'SHA1_ASM', 'SHA256_ASM', 'SHA512_ASM', diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/configdata.pm b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/configdata.pm index ea30dc93d..fdcac7f7c 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/configdata.pm @@ -139,7 +139,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -156,7 +156,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.13+quic", + "full_version" => "3.0.9", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,7 +206,7 @@ our %config = ( ], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "13", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -258,11 +258,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "30 Jan 2024", - "shlib_version" => "81.3", + "release_date" => "30 May 2023", + "shlib_version" => "3", "sourcedir" => ".", "target" => "darwin64-x86_64-cc", - "version" => "3.0.13" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -387,7 +387,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -783,9 +782,6 @@ our %unified_info = ( "providers/fips" => { "fips" => "1" }, - "test/p_minimal" => { - "noinst" => "1" - }, "test/p_test" => { "noinst" => "1" } @@ -854,9 +850,6 @@ our %unified_info = ( "test/asn1_internal_test" => { "noinst" => "1" }, - "test/asn1_stable_parse_test" => { - "noinst" => "1" - }, "test/asn1_string_table_test" => { "noinst" => "1" }, @@ -1046,9 +1039,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -1605,7 +1595,6 @@ our %unified_info = ( "OPENSSL_IA32_SSE2", "PADLOCK_ASM", "POLY1305_ASM", - "RC4_ASM", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", @@ -1657,11 +1646,7 @@ our %unified_info = ( "X25519_ASM" ], "providers/liblegacy.a" => [ - "MD5_ASM", - "RC4_ASM" - ], - "test/evp_extra_test" => [ - "STATIC_LEGACY" + "MD5_ASM" ], "test/provider_internal_test" => [ "PROVIDER_INIT_FUNCTION_NAME=p_test_init" @@ -2416,9 +2401,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -2716,9 +2698,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -3487,9 +3466,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -3784,9 +3760,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -3820,12 +3793,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -4810,9 +4777,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -5110,9 +5074,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -5881,9 +5842,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -6178,9 +6136,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -6214,12 +6169,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -7209,10 +7158,6 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], - "test/asn1_stable_parse_test" => [ - "libcrypto", - "test/libtestutil.a" - ], "test/asn1_string_table_test" => [ "libcrypto", "test/libtestutil.a" @@ -7466,10 +7411,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -7735,8 +7676,6 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "libcrypto.a", - "providers/libcommon.a", - "providers/liblegacy.a", "test/libtestutil.a" ], "test/evp_extra_test2" => [ @@ -9858,7 +9797,6 @@ our %unified_info = ( }, "providers" => { "deps" => [ - "providers/evp_extra_test-bin-legacyprov.o", "providers/libcrypto-lib-baseprov.o", "providers/libcrypto-lib-defltprov.o", "providers/libcrypto-lib-nullprov.o", @@ -9866,9 +9804,6 @@ our %unified_info = ( "providers/libdefault.a" ], "products" => { - "bin" => [ - "test/evp_extra_test" - ], "dso" => [ "providers/legacy" ], @@ -10304,7 +10239,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10355,7 +10289,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -11487,9 +11420,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -11787,9 +11717,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -12558,9 +12485,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -12855,9 +12779,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -12891,12 +12812,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -13881,9 +13796,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -14181,9 +14093,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -14952,9 +14861,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -15249,9 +15155,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -15285,12 +15188,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -16305,10 +16202,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16547,7 +16440,6 @@ our %unified_info = ( "doc/html/man3/CMS_get1_ReceiptRequest.html", "doc/html/man3/CMS_sign.html", "doc/html/man3/CMS_sign_receipt.html", - "doc/html/man3/CMS_signed_get_attr.html", "doc/html/man3/CMS_uncompress.html", "doc/html/man3/CMS_verify.html", "doc/html/man3/CMS_verify_receipt.html", @@ -16647,7 +16539,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_encapsulate.html", "doc/html/man3/EVP_PKEY_encrypt.html", "doc/html/man3/EVP_PKEY_fromdata.html", - "doc/html/man3/EVP_PKEY_get_attr.html", "doc/html/man3/EVP_PKEY_get_default_digest_nid.html", "doc/html/man3/EVP_PKEY_get_field_type.html", "doc/html/man3/EVP_PKEY_get_group_name.html", @@ -16904,7 +16795,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -17003,7 +16893,6 @@ our %unified_info = ( "doc/html/man3/X509V3_get_d2i.html", "doc/html/man3/X509V3_set_ctx.html", "doc/html/man3/X509_ALGOR_dup.html", - "doc/html/man3/X509_ATTRIBUTE.html", "doc/html/man3/X509_CRL_get0_by_serial.html", "doc/html/man3/X509_EXTENSION_set_object.html", "doc/html/man3/X509_LOOKUP.html", @@ -17015,8 +16904,6 @@ our %unified_info = ( "doc/html/man3/X509_NAME_get_index_by_NID.html", "doc/html/man3/X509_NAME_print_ex.html", "doc/html/man3/X509_PUBKEY_new.html", - "doc/html/man3/X509_REQ_get_attr.html", - "doc/html/man3/X509_REQ_get_extensions.html", "doc/html/man3/X509_SIG_get0.html", "doc/html/man3/X509_STORE_CTX_get_error.html", "doc/html/man3/X509_STORE_CTX_new.html", @@ -18306,10 +18193,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/asn1_stable_parse_test" => [ - "include", - "apps/include" - ], "test/asn1_string_table_test" => [ "include", "apps/include" @@ -18517,9 +18400,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -18779,9 +18659,7 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "include", - "apps/include", - "providers/common/include", - "providers/implementations/include" + "apps/include" ], "test/evp_extra_test2" => [ "include", @@ -19038,10 +18916,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/p_minimal" => [ - "include", - "." - ], "test/p_test" => [ "include", "." @@ -19531,7 +19405,6 @@ our %unified_info = ( "doc/man/man3/CMS_get1_ReceiptRequest.3", "doc/man/man3/CMS_sign.3", "doc/man/man3/CMS_sign_receipt.3", - "doc/man/man3/CMS_signed_get_attr.3", "doc/man/man3/CMS_uncompress.3", "doc/man/man3/CMS_verify.3", "doc/man/man3/CMS_verify_receipt.3", @@ -19631,7 +19504,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_encapsulate.3", "doc/man/man3/EVP_PKEY_encrypt.3", "doc/man/man3/EVP_PKEY_fromdata.3", - "doc/man/man3/EVP_PKEY_get_attr.3", "doc/man/man3/EVP_PKEY_get_default_digest_nid.3", "doc/man/man3/EVP_PKEY_get_field_type.3", "doc/man/man3/EVP_PKEY_get_group_name.3", @@ -19888,7 +19760,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -19987,7 +19858,6 @@ our %unified_info = ( "doc/man/man3/X509V3_get_d2i.3", "doc/man/man3/X509V3_set_ctx.3", "doc/man/man3/X509_ALGOR_dup.3", - "doc/man/man3/X509_ATTRIBUTE.3", "doc/man/man3/X509_CRL_get0_by_serial.3", "doc/man/man3/X509_EXTENSION_set_object.3", "doc/man/man3/X509_LOOKUP.3", @@ -19999,8 +19869,6 @@ our %unified_info = ( "doc/man/man3/X509_NAME_get_index_by_NID.3", "doc/man/man3/X509_NAME_print_ex.3", "doc/man/man3/X509_PUBKEY_new.3", - "doc/man/man3/X509_REQ_get_attr.3", - "doc/man/man3/X509_REQ_get_extensions.3", "doc/man/man3/X509_SIG_get0.3", "doc/man/man3/X509_STORE_CTX_get_error.3", "doc/man/man3/X509_STORE_CTX_new.3", @@ -20184,7 +20052,6 @@ our %unified_info = ( "modules" => [ "providers/fips", "providers/legacy", - "test/p_minimal", "test/p_test" ], "programs" => [ @@ -20210,7 +20077,6 @@ our %unified_info = ( "test/asn1_dsa_internal_test", "test/asn1_encode_test", "test/asn1_internal_test", - "test/asn1_stable_parse_test", "test/asn1_string_table_test", "test/asn1_time_test", "test/asynciotest", @@ -20274,7 +20140,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24568,7 +24433,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24595,7 +24459,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -24697,9 +24560,6 @@ our %unified_info = ( "providers/common/libfips-lib-securitycheck_fips.o" => [ "providers/common/securitycheck_fips.c" ], - "providers/evp_extra_test-bin-legacyprov.o" => [ - "providers/legacyprov.c" - ], "providers/fips" => [ "providers/fips/fips-dso-fips_entry.o" ], @@ -25857,9 +25717,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25941,9 +25798,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -26001,12 +25855,6 @@ our %unified_info = ( "test/asn1_internal_test-bin-asn1_internal_test.o" => [ "test/asn1_internal_test.c" ], - "test/asn1_stable_parse_test" => [ - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" - ], - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" => [ - "test/asn1_stable_parse_test.c" - ], "test/asn1_string_table_test" => [ "test/asn1_string_table_test-bin-asn1_string_table_test.o" ], @@ -26386,12 +26234,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -26790,7 +26632,6 @@ our %unified_info = ( "test/errtest.c" ], "test/evp_extra_test" => [ - "providers/evp_extra_test-bin-legacyprov.o", "test/evp_extra_test-bin-evp_extra_test.o" ], "test/evp_extra_test-bin-evp_extra_test.o" => [ @@ -27081,12 +26922,6 @@ our %unified_info = ( "test/ossl_store_test-bin-ossl_store_test.o" => [ "test/ossl_store_test.c" ], - "test/p_minimal" => [ - "test/p_minimal-dso-p_minimal.o" - ], - "test/p_minimal-dso-p_minimal.o" => [ - "test/p_minimal.c" - ], "test/p_test" => [ "test/p_test-dso-p_test.o" ], @@ -27772,8 +27607,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27800,7 +27635,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27817,8 +27652,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/buildinf.h index 588d59e09..d4b93a53f 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: darwin64-x86_64-cc" -#define DATE "built on: Wed Jan 31 12:59:05 2024 UTC" +#define DATE "built on: Tue Aug 6 12:22:11 2024 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/bio.h b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/bio.h index f9aa74731..e16cf622c 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/bio.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/bio.h @@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, - int (*ossl_gets) (BIO *, char *, int)); + int (*gets) (BIO *, char *, int)); long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/opensslv.h index 65f3bfa05..5bb97d596 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 13 +# define OPENSSL_VERSION_PATCH 9 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.13" -# define OPENSSL_FULL_VERSION_STR "3.0.13+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "30 Jan 2024" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13+quic 30 Jan 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/pkcs7.h b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/pkcs7.h index 0ce79bf4f..557a0a726 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/pkcs7.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/pkcs7.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/pkcs7.h.in * - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -56,8 +56,8 @@ typedef struct pkcs7_signer_info_st { PKCS7_ISSUER_AND_SERIAL *issuer_and_serial; X509_ALGOR *digest_alg; STACK_OF(X509_ATTRIBUTE) *auth_attr; /* [ 0 ] */ - X509_ALGOR *digest_enc_alg; /* confusing name, actually used for signing */ - ASN1_OCTET_STRING *enc_digest; /* confusing name, actually signature */ + X509_ALGOR *digest_enc_alg; + ASN1_OCTET_STRING *enc_digest; STACK_OF(X509_ATTRIBUTE) *unauth_attr; /* [ 1 ] */ /* The private key to sign with */ EVP_PKEY *pkey; diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/ssl.h index 0f1915755..3df725c56 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/ssl.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/openssl-cl.gypi b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/openssl-cl.gypi index b4fdd2479..0b8979e20 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/openssl-cl.gypi +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/openssl-cl.gypi @@ -18,7 +18,6 @@ 'OPENSSL_IA32_SSE2', 'PADLOCK_ASM', 'POLY1305_ASM', - 'RC4_ASM', 'SHA1_ASM', 'SHA256_ASM', 'SHA512_ASM', diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/openssl.gypi b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/openssl.gypi index b6218392f..e4d08edfd 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cfb.c', 'openssl/crypto/aes/aes_ecb.c', @@ -1004,7 +1002,6 @@ 'OPENSSL_IA32_SSE2', 'PADLOCK_ASM', 'POLY1305_ASM', - 'RC4_ASM', 'SHA1_ASM', 'SHA256_ASM', 'SHA512_ASM', diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/configdata.pm b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/configdata.pm index b008b9a8a..188aa1c63 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/configdata.pm +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/configdata.pm @@ -139,7 +139,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [], @@ -154,7 +154,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.13+quic", + "full_version" => "3.0.9", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -205,7 +205,7 @@ our %config = ( ], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "13", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -258,11 +258,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "30 Jan 2024", - "shlib_version" => "81.3", + "release_date" => "30 May 2023", + "shlib_version" => "3", "sourcedir" => ".", "target" => "darwin64-x86_64-cc", - "version" => "3.0.13" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -387,7 +387,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -784,9 +783,6 @@ our %unified_info = ( "providers/fips" => { "fips" => "1" }, - "test/p_minimal" => { - "noinst" => "1" - }, "test/p_test" => { "noinst" => "1" } @@ -855,9 +851,6 @@ our %unified_info = ( "test/asn1_internal_test" => { "noinst" => "1" }, - "test/asn1_stable_parse_test" => { - "noinst" => "1" - }, "test/asn1_string_table_test" => { "noinst" => "1" }, @@ -1047,9 +1040,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -1597,9 +1587,6 @@ our %unified_info = ( "providers/libfips.a" => [ "FIPS_MODULE" ], - "test/evp_extra_test" => [ - "STATIC_LEGACY" - ], "test/provider_internal_test" => [ "PROVIDER_INIT_FUNCTION_NAME=p_test_init" ], @@ -2353,9 +2340,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -2653,9 +2637,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -3424,9 +3405,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -3721,9 +3699,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -3757,12 +3732,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -4747,9 +4716,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -5047,9 +5013,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -5818,9 +5781,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -6115,9 +6075,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -6151,12 +6108,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -7146,10 +7097,6 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], - "test/asn1_stable_parse_test" => [ - "libcrypto", - "test/libtestutil.a" - ], "test/asn1_string_table_test" => [ "libcrypto", "test/libtestutil.a" @@ -7403,10 +7350,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -7672,8 +7615,6 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "libcrypto.a", - "providers/libcommon.a", - "providers/liblegacy.a", "test/libtestutil.a" ], "test/evp_extra_test2" => [ @@ -9737,7 +9678,6 @@ our %unified_info = ( }, "providers" => { "deps" => [ - "providers/evp_extra_test-bin-legacyprov.o", "providers/libcrypto-lib-baseprov.o", "providers/libcrypto-lib-defltprov.o", "providers/libcrypto-lib-nullprov.o", @@ -9745,9 +9685,6 @@ our %unified_info = ( "providers/libdefault.a" ], "products" => { - "bin" => [ - "test/evp_extra_test" - ], "dso" => [ "providers/legacy" ], @@ -10183,7 +10120,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10234,7 +10170,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -11366,9 +11301,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -11666,9 +11598,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -12437,9 +12366,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -12734,9 +12660,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -12770,12 +12693,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -13760,9 +13677,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -14060,9 +13974,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -14831,9 +14742,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -15128,9 +15036,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -15164,12 +15069,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -16184,10 +16083,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16426,7 +16321,6 @@ our %unified_info = ( "doc/html/man3/CMS_get1_ReceiptRequest.html", "doc/html/man3/CMS_sign.html", "doc/html/man3/CMS_sign_receipt.html", - "doc/html/man3/CMS_signed_get_attr.html", "doc/html/man3/CMS_uncompress.html", "doc/html/man3/CMS_verify.html", "doc/html/man3/CMS_verify_receipt.html", @@ -16526,7 +16420,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_encapsulate.html", "doc/html/man3/EVP_PKEY_encrypt.html", "doc/html/man3/EVP_PKEY_fromdata.html", - "doc/html/man3/EVP_PKEY_get_attr.html", "doc/html/man3/EVP_PKEY_get_default_digest_nid.html", "doc/html/man3/EVP_PKEY_get_field_type.html", "doc/html/man3/EVP_PKEY_get_group_name.html", @@ -16783,7 +16676,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -16882,7 +16774,6 @@ our %unified_info = ( "doc/html/man3/X509V3_get_d2i.html", "doc/html/man3/X509V3_set_ctx.html", "doc/html/man3/X509_ALGOR_dup.html", - "doc/html/man3/X509_ATTRIBUTE.html", "doc/html/man3/X509_CRL_get0_by_serial.html", "doc/html/man3/X509_EXTENSION_set_object.html", "doc/html/man3/X509_LOOKUP.html", @@ -16894,8 +16785,6 @@ our %unified_info = ( "doc/html/man3/X509_NAME_get_index_by_NID.html", "doc/html/man3/X509_NAME_print_ex.html", "doc/html/man3/X509_PUBKEY_new.html", - "doc/html/man3/X509_REQ_get_attr.html", - "doc/html/man3/X509_REQ_get_extensions.html", "doc/html/man3/X509_SIG_get0.html", "doc/html/man3/X509_STORE_CTX_get_error.html", "doc/html/man3/X509_STORE_CTX_new.html", @@ -18185,10 +18074,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/asn1_stable_parse_test" => [ - "include", - "apps/include" - ], "test/asn1_string_table_test" => [ "include", "apps/include" @@ -18396,9 +18281,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -18658,9 +18540,7 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "include", - "apps/include", - "providers/common/include", - "providers/implementations/include" + "apps/include" ], "test/evp_extra_test2" => [ "include", @@ -18917,10 +18797,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/p_minimal" => [ - "include", - "." - ], "test/p_test" => [ "include", "." @@ -19410,7 +19286,6 @@ our %unified_info = ( "doc/man/man3/CMS_get1_ReceiptRequest.3", "doc/man/man3/CMS_sign.3", "doc/man/man3/CMS_sign_receipt.3", - "doc/man/man3/CMS_signed_get_attr.3", "doc/man/man3/CMS_uncompress.3", "doc/man/man3/CMS_verify.3", "doc/man/man3/CMS_verify_receipt.3", @@ -19510,7 +19385,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_encapsulate.3", "doc/man/man3/EVP_PKEY_encrypt.3", "doc/man/man3/EVP_PKEY_fromdata.3", - "doc/man/man3/EVP_PKEY_get_attr.3", "doc/man/man3/EVP_PKEY_get_default_digest_nid.3", "doc/man/man3/EVP_PKEY_get_field_type.3", "doc/man/man3/EVP_PKEY_get_group_name.3", @@ -19767,7 +19641,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -19866,7 +19739,6 @@ our %unified_info = ( "doc/man/man3/X509V3_get_d2i.3", "doc/man/man3/X509V3_set_ctx.3", "doc/man/man3/X509_ALGOR_dup.3", - "doc/man/man3/X509_ATTRIBUTE.3", "doc/man/man3/X509_CRL_get0_by_serial.3", "doc/man/man3/X509_EXTENSION_set_object.3", "doc/man/man3/X509_LOOKUP.3", @@ -19878,8 +19750,6 @@ our %unified_info = ( "doc/man/man3/X509_NAME_get_index_by_NID.3", "doc/man/man3/X509_NAME_print_ex.3", "doc/man/man3/X509_PUBKEY_new.3", - "doc/man/man3/X509_REQ_get_attr.3", - "doc/man/man3/X509_REQ_get_extensions.3", "doc/man/man3/X509_SIG_get0.3", "doc/man/man3/X509_STORE_CTX_get_error.3", "doc/man/man3/X509_STORE_CTX_new.3", @@ -20063,7 +19933,6 @@ our %unified_info = ( "modules" => [ "providers/fips", "providers/legacy", - "test/p_minimal", "test/p_test" ], "programs" => [ @@ -20089,7 +19958,6 @@ our %unified_info = ( "test/asn1_dsa_internal_test", "test/asn1_encode_test", "test/asn1_internal_test", - "test/asn1_stable_parse_test", "test/asn1_string_table_test", "test/asn1_time_test", "test/asynciotest", @@ -20153,7 +20021,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24278,7 +24145,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24305,7 +24171,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -24407,9 +24272,6 @@ our %unified_info = ( "providers/common/libfips-lib-securitycheck_fips.o" => [ "providers/common/securitycheck_fips.c" ], - "providers/evp_extra_test-bin-legacyprov.o" => [ - "providers/legacyprov.c" - ], "providers/fips" => [ "providers/fips/fips-dso-fips_entry.o" ], @@ -25544,9 +25406,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25628,9 +25487,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25688,12 +25544,6 @@ our %unified_info = ( "test/asn1_internal_test-bin-asn1_internal_test.o" => [ "test/asn1_internal_test.c" ], - "test/asn1_stable_parse_test" => [ - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" - ], - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" => [ - "test/asn1_stable_parse_test.c" - ], "test/asn1_string_table_test" => [ "test/asn1_string_table_test-bin-asn1_string_table_test.o" ], @@ -26073,12 +25923,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -26477,7 +26321,6 @@ our %unified_info = ( "test/errtest.c" ], "test/evp_extra_test" => [ - "providers/evp_extra_test-bin-legacyprov.o", "test/evp_extra_test-bin-evp_extra_test.o" ], "test/evp_extra_test-bin-evp_extra_test.o" => [ @@ -26768,12 +26611,6 @@ our %unified_info = ( "test/ossl_store_test-bin-ossl_store_test.o" => [ "test/ossl_store_test.c" ], - "test/p_minimal" => [ - "test/p_minimal-dso-p_minimal.o" - ], - "test/p_minimal-dso-p_minimal.o" => [ - "test/p_minimal.c" - ], "test/p_test" => [ "test/p_test-dso-p_test.o" ], @@ -27462,8 +27299,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27490,7 +27327,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27507,8 +27344,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/crypto/buildinf.h index 36035d10a..52a453c4d 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: darwin64-x86_64-cc" -#define DATE "built on: Wed Jan 31 12:59:20 2024 UTC" +#define DATE "built on: Tue Aug 6 12:22:25 2024 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/bio.h b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/bio.h index f9aa74731..e16cf622c 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/bio.h @@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, - int (*ossl_gets) (BIO *, char *, int)); + int (*gets) (BIO *, char *, int)); long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/opensslv.h index 65f3bfa05..5bb97d596 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 13 +# define OPENSSL_VERSION_PATCH 9 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.13" -# define OPENSSL_FULL_VERSION_STR "3.0.13+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "30 Jan 2024" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13+quic 30 Jan 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/pkcs7.h b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/pkcs7.h index 0ce79bf4f..557a0a726 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/pkcs7.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/pkcs7.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/pkcs7.h.in * - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -56,8 +56,8 @@ typedef struct pkcs7_signer_info_st { PKCS7_ISSUER_AND_SERIAL *issuer_and_serial; X509_ALGOR *digest_alg; STACK_OF(X509_ATTRIBUTE) *auth_attr; /* [ 0 ] */ - X509_ALGOR *digest_enc_alg; /* confusing name, actually used for signing */ - ASN1_OCTET_STRING *enc_digest; /* confusing name, actually signature */ + X509_ALGOR *digest_enc_alg; + ASN1_OCTET_STRING *enc_digest; STACK_OF(X509_ATTRIBUTE) *unauth_attr; /* [ 1 ] */ /* The private key to sign with */ EVP_PKEY *pkey; diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/ssl.h index 0f1915755..3df725c56 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/openssl.gypi b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/openssl.gypi index d2f0708ed..cd8cb60dc 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cbc.c', 'openssl/crypto/aes/aes_cfb.c', diff --git a/deps/openssl/config/archs/linux-aarch64/asm/configdata.pm b/deps/openssl/config/archs/linux-aarch64/asm/configdata.pm index 6b9f0f9e2..f5f7abc69 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm/configdata.pm +++ b/deps/openssl/config/archs/linux-aarch64/asm/configdata.pm @@ -142,7 +142,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -159,7 +159,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.13+quic", + "full_version" => "3.0.9", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -207,7 +207,7 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "13", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "30 Jan 2024", - "shlib_version" => "81.3", + "release_date" => "30 May 2023", + "shlib_version" => "3", "sourcedir" => ".", "target" => "linux-aarch64", - "version" => "3.0.13" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -394,7 +394,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -790,9 +789,6 @@ our %unified_info = ( "providers/fips" => { "fips" => "1" }, - "test/p_minimal" => { - "noinst" => "1" - }, "test/p_test" => { "noinst" => "1" } @@ -861,9 +857,6 @@ our %unified_info = ( "test/asn1_internal_test" => { "noinst" => "1" }, - "test/asn1_stable_parse_test" => { - "noinst" => "1" - }, "test/asn1_string_table_test" => { "noinst" => "1" }, @@ -1053,9 +1046,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -1635,9 +1625,6 @@ our %unified_info = ( "SHA512_ASM", "VPAES_ASM" ], - "test/evp_extra_test" => [ - "STATIC_LEGACY" - ], "test/provider_internal_test" => [ "PROVIDER_INIT_FUNCTION_NAME=p_test_init" ], @@ -2391,9 +2378,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -2691,9 +2675,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -3462,9 +3443,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -3759,9 +3737,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -3795,12 +3770,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -4785,9 +4754,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -5085,9 +5051,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -5856,9 +5819,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -6153,9 +6113,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -6189,12 +6146,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -7192,10 +7143,6 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], - "test/asn1_stable_parse_test" => [ - "libcrypto", - "test/libtestutil.a" - ], "test/asn1_string_table_test" => [ "libcrypto", "test/libtestutil.a" @@ -7449,10 +7396,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -7718,8 +7661,6 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "libcrypto.a", - "providers/libcommon.a", - "providers/liblegacy.a", "test/libtestutil.a" ], "test/evp_extra_test2" => [ @@ -9806,7 +9747,6 @@ our %unified_info = ( }, "providers" => { "deps" => [ - "providers/evp_extra_test-bin-legacyprov.o", "providers/libcrypto-lib-baseprov.o", "providers/libcrypto-lib-defltprov.o", "providers/libcrypto-lib-nullprov.o", @@ -9814,9 +9754,6 @@ our %unified_info = ( "providers/libdefault.a" ], "products" => { - "bin" => [ - "test/evp_extra_test" - ], "dso" => [ "providers/fips", "providers/legacy" @@ -10253,7 +10190,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10304,7 +10240,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -11436,9 +11371,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -11736,9 +11668,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -12507,9 +12436,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -12804,9 +12730,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -12840,12 +12763,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -13830,9 +13747,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -14130,9 +14044,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -14901,9 +14812,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -15198,9 +15106,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -15234,12 +15139,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -16268,10 +16167,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16348,9 +16243,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "whrlpool" ], - "test/p_minimal.ld" => [ - "util/providers.num" - ], "test/p_test.ld" => [ "util/providers.num" ], @@ -16516,7 +16408,6 @@ our %unified_info = ( "doc/html/man3/CMS_get1_ReceiptRequest.html", "doc/html/man3/CMS_sign.html", "doc/html/man3/CMS_sign_receipt.html", - "doc/html/man3/CMS_signed_get_attr.html", "doc/html/man3/CMS_uncompress.html", "doc/html/man3/CMS_verify.html", "doc/html/man3/CMS_verify_receipt.html", @@ -16616,7 +16507,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_encapsulate.html", "doc/html/man3/EVP_PKEY_encrypt.html", "doc/html/man3/EVP_PKEY_fromdata.html", - "doc/html/man3/EVP_PKEY_get_attr.html", "doc/html/man3/EVP_PKEY_get_default_digest_nid.html", "doc/html/man3/EVP_PKEY_get_field_type.html", "doc/html/man3/EVP_PKEY_get_group_name.html", @@ -16873,7 +16763,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -16972,7 +16861,6 @@ our %unified_info = ( "doc/html/man3/X509V3_get_d2i.html", "doc/html/man3/X509V3_set_ctx.html", "doc/html/man3/X509_ALGOR_dup.html", - "doc/html/man3/X509_ATTRIBUTE.html", "doc/html/man3/X509_CRL_get0_by_serial.html", "doc/html/man3/X509_EXTENSION_set_object.html", "doc/html/man3/X509_LOOKUP.html", @@ -16984,8 +16872,6 @@ our %unified_info = ( "doc/html/man3/X509_NAME_get_index_by_NID.html", "doc/html/man3/X509_NAME_print_ex.html", "doc/html/man3/X509_PUBKEY_new.html", - "doc/html/man3/X509_REQ_get_attr.html", - "doc/html/man3/X509_REQ_get_extensions.html", "doc/html/man3/X509_SIG_get0.html", "doc/html/man3/X509_STORE_CTX_get_error.html", "doc/html/man3/X509_STORE_CTX_new.html", @@ -18343,10 +18229,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/asn1_stable_parse_test" => [ - "include", - "apps/include" - ], "test/asn1_string_table_test" => [ "include", "apps/include" @@ -18554,9 +18436,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -18816,9 +18695,7 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "include", - "apps/include", - "providers/common/include", - "providers/implementations/include" + "apps/include" ], "test/evp_extra_test2" => [ "include", @@ -19075,10 +18952,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/p_minimal" => [ - "include", - "." - ], "test/p_test" => [ "include", "." @@ -19568,7 +19441,6 @@ our %unified_info = ( "doc/man/man3/CMS_get1_ReceiptRequest.3", "doc/man/man3/CMS_sign.3", "doc/man/man3/CMS_sign_receipt.3", - "doc/man/man3/CMS_signed_get_attr.3", "doc/man/man3/CMS_uncompress.3", "doc/man/man3/CMS_verify.3", "doc/man/man3/CMS_verify_receipt.3", @@ -19668,7 +19540,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_encapsulate.3", "doc/man/man3/EVP_PKEY_encrypt.3", "doc/man/man3/EVP_PKEY_fromdata.3", - "doc/man/man3/EVP_PKEY_get_attr.3", "doc/man/man3/EVP_PKEY_get_default_digest_nid.3", "doc/man/man3/EVP_PKEY_get_field_type.3", "doc/man/man3/EVP_PKEY_get_group_name.3", @@ -19925,7 +19796,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20024,7 +19894,6 @@ our %unified_info = ( "doc/man/man3/X509V3_get_d2i.3", "doc/man/man3/X509V3_set_ctx.3", "doc/man/man3/X509_ALGOR_dup.3", - "doc/man/man3/X509_ATTRIBUTE.3", "doc/man/man3/X509_CRL_get0_by_serial.3", "doc/man/man3/X509_EXTENSION_set_object.3", "doc/man/man3/X509_LOOKUP.3", @@ -20036,8 +19905,6 @@ our %unified_info = ( "doc/man/man3/X509_NAME_get_index_by_NID.3", "doc/man/man3/X509_NAME_print_ex.3", "doc/man/man3/X509_PUBKEY_new.3", - "doc/man/man3/X509_REQ_get_attr.3", - "doc/man/man3/X509_REQ_get_extensions.3", "doc/man/man3/X509_SIG_get0.3", "doc/man/man3/X509_STORE_CTX_get_error.3", "doc/man/man3/X509_STORE_CTX_new.3", @@ -20221,7 +20088,6 @@ our %unified_info = ( "modules" => [ "providers/fips", "providers/legacy", - "test/p_minimal", "test/p_test" ], "programs" => [ @@ -20247,7 +20113,6 @@ our %unified_info = ( "test/asn1_dsa_internal_test", "test/asn1_encode_test", "test/asn1_internal_test", - "test/asn1_stable_parse_test", "test/asn1_string_table_test", "test/asn1_time_test", "test/asynciotest", @@ -20311,7 +20176,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24517,7 +24381,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24544,7 +24407,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -24646,9 +24508,6 @@ our %unified_info = ( "providers/common/libfips-lib-securitycheck_fips.o" => [ "providers/common/securitycheck_fips.c" ], - "providers/evp_extra_test-bin-legacyprov.o" => [ - "providers/legacyprov.c" - ], "providers/fips" => [ "providers/fips.ld", "providers/fips/fips-dso-fips_entry.o" @@ -25796,9 +25655,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25880,9 +25736,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25940,12 +25793,6 @@ our %unified_info = ( "test/asn1_internal_test-bin-asn1_internal_test.o" => [ "test/asn1_internal_test.c" ], - "test/asn1_stable_parse_test" => [ - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" - ], - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" => [ - "test/asn1_stable_parse_test.c" - ], "test/asn1_string_table_test" => [ "test/asn1_string_table_test-bin-asn1_string_table_test.o" ], @@ -26325,12 +26172,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -26729,7 +26570,6 @@ our %unified_info = ( "test/errtest.c" ], "test/evp_extra_test" => [ - "providers/evp_extra_test-bin-legacyprov.o", "test/evp_extra_test-bin-evp_extra_test.o" ], "test/evp_extra_test-bin-evp_extra_test.o" => [ @@ -27020,13 +26860,6 @@ our %unified_info = ( "test/ossl_store_test-bin-ossl_store_test.o" => [ "test/ossl_store_test.c" ], - "test/p_minimal" => [ - "test/p_minimal-dso-p_minimal.o", - "test/p_minimal.ld" - ], - "test/p_minimal-dso-p_minimal.o" => [ - "test/p_minimal.c" - ], "test/p_test" => [ "test/p_test-dso-p_test.o", "test/p_test.ld" @@ -27713,8 +27546,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27741,7 +27574,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27758,8 +27591,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux-aarch64/asm/crypto/aes/aesv8-armx.S b/deps/openssl/config/archs/linux-aarch64/asm/crypto/aes/aesv8-armx.S index 0d2a81daf..51c4d7208 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm/crypto/aes/aesv8-armx.S +++ b/deps/openssl/config/archs/linux-aarch64/asm/crypto/aes/aesv8-armx.S @@ -103,7 +103,7 @@ aes_v8_set_encrypt_key: .Loop192: tbl v6.16b,{v4.16b},v2.16b ext v5.16b,v0.16b,v3.16b,#12 -#ifdef __AARCH64EB__ +#ifdef __ARMEB__ st1 {v4.4s},[x2],#16 sub x2,x2,#8 #else @@ -1510,7 +1510,7 @@ aes_v8_ctr32_encrypt_blocks: ldr w5,[x3,#240] ldr w8, [x4, #12] -#ifdef __AARCH64EB__ +#ifdef __ARMEB__ ld1 {v0.16b},[x4] #else ld1 {v0.4s},[x4] @@ -1527,7 +1527,7 @@ aes_v8_ctr32_encrypt_blocks: add x7,x3,#32 mov w6,w5 csel x12,xzr,x12,lo -#ifndef __AARCH64EB__ +#ifndef __ARMEB__ rev w8, w8 #endif orr v1.16b,v0.16b,v0.16b diff --git a/deps/openssl/config/archs/linux-aarch64/asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-aarch64/asm/crypto/buildinf.h index 45946ceaf..f7f7721fc 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-aarch64/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-aarch64" -#define DATE "built on: Wed Jan 31 13:00:44 2024 UTC" +#define DATE "built on: Tue Aug 6 12:23:42 2024 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-aarch64/asm/crypto/modes/ghashv8-armx.S b/deps/openssl/config/archs/linux-aarch64/asm/crypto/modes/ghashv8-armx.S index ea6a66a22..acd52eb95 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm/crypto/modes/ghashv8-armx.S +++ b/deps/openssl/config/archs/linux-aarch64/asm/crypto/modes/ghashv8-armx.S @@ -101,7 +101,7 @@ gcm_gmult_v8: movi v19.16b,#0xe1 ld1 {v20.2d,v21.2d},[x1] //load twisted H, ... shl v19.2d,v19.2d,#57 -#ifndef __AARCH64EB__ +#ifndef __ARMEB__ rev64 v17.16b,v17.16b #endif ext v3.16b,v17.16b,v17.16b,#8 @@ -126,7 +126,7 @@ gcm_gmult_v8: eor v18.16b,v18.16b,v2.16b eor v0.16b,v0.16b,v18.16b -#ifndef __AARCH64EB__ +#ifndef __ARMEB__ rev64 v0.16b,v0.16b #endif ext v0.16b,v0.16b,v0.16b,#8 @@ -163,14 +163,14 @@ gcm_ghash_v8: ext v0.16b,v0.16b,v0.16b,#8 //rotate Xi ld1 {v16.2d},[x2],#16 //load [rotated] I[0] shl v19.2d,v19.2d,#57 //compose 0xc2.0 constant -#ifndef __AARCH64EB__ +#ifndef __ARMEB__ rev64 v16.16b,v16.16b rev64 v0.16b,v0.16b #endif ext v3.16b,v16.16b,v16.16b,#8 //rotate I[0] b.lo .Lodd_tail_v8 //x3 was less than 32 ld1 {v17.2d},[x2],x12 //load [rotated] I[1] -#ifndef __AARCH64EB__ +#ifndef __ARMEB__ rev64 v17.16b,v17.16b #endif ext v7.16b,v17.16b,v17.16b,#8 @@ -202,13 +202,13 @@ gcm_ghash_v8: eor v18.16b,v0.16b,v2.16b eor v1.16b,v1.16b,v17.16b ld1 {v17.2d},[x2],x12 //load [rotated] I[i+3] -#ifndef __AARCH64EB__ +#ifndef __ARMEB__ rev64 v16.16b,v16.16b #endif eor v1.16b,v1.16b,v18.16b pmull v18.1q,v0.1d,v19.1d //1st phase of reduction -#ifndef __AARCH64EB__ +#ifndef __ARMEB__ rev64 v17.16b,v17.16b #endif ins v2.d[0],v1.d[1] @@ -258,7 +258,7 @@ gcm_ghash_v8: eor v0.16b,v0.16b,v18.16b .Ldone_v8: -#ifndef __AARCH64EB__ +#ifndef __ARMEB__ rev64 v0.16b,v0.16b #endif ext v0.16b,v0.16b,v0.16b,#8 @@ -277,7 +277,7 @@ gcm_ghash_v8_4x: shl v19.2d,v19.2d,#57 //compose 0xc2.0 constant ld1 {v4.2d,v5.2d,v6.2d,v7.2d},[x2],#64 -#ifndef __AARCH64EB__ +#ifndef __ARMEB__ rev64 v0.16b,v0.16b rev64 v5.16b,v5.16b rev64 v6.16b,v6.16b @@ -321,7 +321,7 @@ gcm_ghash_v8_4x: eor v16.16b,v4.16b,v0.16b ld1 {v4.2d,v5.2d,v6.2d,v7.2d},[x2],#64 ext v3.16b,v16.16b,v16.16b,#8 -#ifndef __AARCH64EB__ +#ifndef __ARMEB__ rev64 v5.16b,v5.16b rev64 v6.16b,v6.16b rev64 v7.16b,v7.16b @@ -404,7 +404,7 @@ gcm_ghash_v8_4x: eor v1.16b,v1.16b,v17.16b ld1 {v4.2d,v5.2d,v6.2d},[x2] eor v1.16b,v1.16b,v18.16b -#ifndef __AARCH64EB__ +#ifndef __ARMEB__ rev64 v5.16b,v5.16b rev64 v6.16b,v6.16b rev64 v4.16b,v4.16b @@ -456,7 +456,7 @@ gcm_ghash_v8_4x: eor v1.16b,v1.16b,v17.16b ld1 {v4.2d,v5.2d},[x2] eor v1.16b,v1.16b,v18.16b -#ifndef __AARCH64EB__ +#ifndef __ARMEB__ rev64 v5.16b,v5.16b rev64 v4.16b,v4.16b #endif @@ -499,7 +499,7 @@ gcm_ghash_v8_4x: eor v1.16b,v1.16b,v17.16b ld1 {v4.2d},[x2] eor v1.16b,v1.16b,v18.16b -#ifndef __AARCH64EB__ +#ifndef __ARMEB__ rev64 v4.16b,v4.16b #endif @@ -539,7 +539,7 @@ gcm_ghash_v8_4x: eor v0.16b,v0.16b,v18.16b ext v0.16b,v0.16b,v0.16b,#8 -#ifndef __AARCH64EB__ +#ifndef __ARMEB__ rev64 v0.16b,v0.16b #endif st1 {v0.2d},[x0] //write out Xi diff --git a/deps/openssl/config/archs/linux-aarch64/asm/crypto/poly1305/poly1305-armv8.S b/deps/openssl/config/archs/linux-aarch64/asm/crypto/poly1305/poly1305-armv8.S index 98ebf4853..ea8f39022 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm/crypto/poly1305/poly1305-armv8.S +++ b/deps/openssl/config/archs/linux-aarch64/asm/crypto/poly1305/poly1305-armv8.S @@ -28,7 +28,7 @@ poly1305_init: ldp x7,x8,[x1] // load key mov x9,#0xfffffffc0fffffff movk x9,#0x0fff,lsl#48 -#ifdef __AARCH64EB__ +#ifdef __ARMEB__ rev x7,x7 // flip bytes rev x8,x8 #endif @@ -75,7 +75,7 @@ poly1305_blocks: .Loop: ldp x10,x11,[x1],#16 // load input sub x2,x2,#16 -#ifdef __AARCH64EB__ +#ifdef __ARMEB__ rev x10,x10 rev x11,x11 #endif @@ -140,13 +140,13 @@ poly1305_emit: csel x4,x4,x12,eq csel x5,x5,x13,eq -#ifdef __AARCH64EB__ +#ifdef __ARMEB__ ror x10,x10,#32 // flip nonce words ror x11,x11,#32 #endif adds x4,x4,x10 // accumulate nonce adc x5,x5,x11 -#ifdef __AARCH64EB__ +#ifdef __ARMEB__ rev x4,x4 // flip output bytes rev x5,x5 #endif @@ -266,7 +266,7 @@ poly1305_blocks_neon: adcs x5,x5,xzr adc x6,x6,xzr -#ifdef __AARCH64EB__ +#ifdef __ARMEB__ rev x12,x12 rev x13,x13 #endif @@ -312,7 +312,7 @@ poly1305_blocks_neon: ldp x12,x13,[x1],#16 // load input sub x2,x2,#16 add x9,x8,x8,lsr#2 // s1 = r1 + (r1 >> 2) -#ifdef __AARCH64EB__ +#ifdef __ARMEB__ rev x12,x12 rev x13,x13 #endif @@ -397,7 +397,7 @@ poly1305_blocks_neon: lsl x3,x3,#24 add x15,x0,#48 -#ifdef __AARCH64EB__ +#ifdef __ARMEB__ rev x8,x8 rev x12,x12 rev x9,x9 @@ -433,7 +433,7 @@ poly1305_blocks_neon: ld1 {v4.4s,v5.4s,v6.4s,v7.4s},[x15],#64 ld1 {v8.4s},[x15] -#ifdef __AARCH64EB__ +#ifdef __ARMEB__ rev x8,x8 rev x12,x12 rev x9,x9 @@ -494,7 +494,7 @@ poly1305_blocks_neon: umull v20.2d,v14.2s,v1.s[2] ldp x9,x13,[x16],#48 umull v19.2d,v14.2s,v0.s[2] -#ifdef __AARCH64EB__ +#ifdef __ARMEB__ rev x8,x8 rev x12,x12 rev x9,x9 @@ -559,7 +559,7 @@ poly1305_blocks_neon: umlal v23.2d,v11.2s,v3.s[0] umlal v20.2d,v11.2s,v8.s[0] umlal v21.2d,v11.2s,v0.s[0] -#ifdef __AARCH64EB__ +#ifdef __ARMEB__ rev x8,x8 rev x12,x12 rev x9,x9 @@ -840,13 +840,13 @@ poly1305_emit_neon: csel x4,x4,x12,eq csel x5,x5,x13,eq -#ifdef __AARCH64EB__ +#ifdef __ARMEB__ ror x10,x10,#32 // flip nonce words ror x11,x11,#32 #endif adds x4,x4,x10 // accumulate nonce adc x5,x5,x11 -#ifdef __AARCH64EB__ +#ifdef __ARMEB__ rev x4,x4 // flip output bytes rev x5,x5 #endif diff --git a/deps/openssl/config/archs/linux-aarch64/asm/include/openssl/bio.h b/deps/openssl/config/archs/linux-aarch64/asm/include/openssl/bio.h index f9aa74731..e16cf622c 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/linux-aarch64/asm/include/openssl/bio.h @@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, - int (*ossl_gets) (BIO *, char *, int)); + int (*gets) (BIO *, char *, int)); long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); diff --git a/deps/openssl/config/archs/linux-aarch64/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux-aarch64/asm/include/openssl/opensslv.h index 65f3bfa05..5bb97d596 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux-aarch64/asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 13 +# define OPENSSL_VERSION_PATCH 9 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.13" -# define OPENSSL_FULL_VERSION_STR "3.0.13+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "30 Jan 2024" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13+quic 30 Jan 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux-aarch64/asm/include/openssl/pkcs7.h b/deps/openssl/config/archs/linux-aarch64/asm/include/openssl/pkcs7.h index 0ce79bf4f..557a0a726 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm/include/openssl/pkcs7.h +++ b/deps/openssl/config/archs/linux-aarch64/asm/include/openssl/pkcs7.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/pkcs7.h.in * - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -56,8 +56,8 @@ typedef struct pkcs7_signer_info_st { PKCS7_ISSUER_AND_SERIAL *issuer_and_serial; X509_ALGOR *digest_alg; STACK_OF(X509_ATTRIBUTE) *auth_attr; /* [ 0 ] */ - X509_ALGOR *digest_enc_alg; /* confusing name, actually used for signing */ - ASN1_OCTET_STRING *enc_digest; /* confusing name, actually signature */ + X509_ALGOR *digest_enc_alg; + ASN1_OCTET_STRING *enc_digest; STACK_OF(X509_ATTRIBUTE) *unauth_attr; /* [ 1 ] */ /* The private key to sign with */ EVP_PKEY *pkey; diff --git a/deps/openssl/config/archs/linux-aarch64/asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux-aarch64/asm/include/openssl/ssl.h index 0f1915755..3df725c56 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux-aarch64/asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/linux-aarch64/asm/openssl.gypi b/deps/openssl/config/archs/linux-aarch64/asm/openssl.gypi index 5990887c0..4e0923be8 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm/openssl.gypi +++ b/deps/openssl/config/archs/linux-aarch64/asm/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cbc.c', 'openssl/crypto/aes/aes_cfb.c', diff --git a/deps/openssl/config/archs/linux-aarch64/asm_avx2/configdata.pm b/deps/openssl/config/archs/linux-aarch64/asm_avx2/configdata.pm index c0ce61cbb..614b6959e 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/linux-aarch64/asm_avx2/configdata.pm @@ -142,7 +142,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -159,7 +159,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.13+quic", + "full_version" => "3.0.9", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -207,7 +207,7 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "13", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "30 Jan 2024", - "shlib_version" => "81.3", + "release_date" => "30 May 2023", + "shlib_version" => "3", "sourcedir" => ".", "target" => "linux-aarch64", - "version" => "3.0.13" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -394,7 +394,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -790,9 +789,6 @@ our %unified_info = ( "providers/fips" => { "fips" => "1" }, - "test/p_minimal" => { - "noinst" => "1" - }, "test/p_test" => { "noinst" => "1" } @@ -861,9 +857,6 @@ our %unified_info = ( "test/asn1_internal_test" => { "noinst" => "1" }, - "test/asn1_stable_parse_test" => { - "noinst" => "1" - }, "test/asn1_string_table_test" => { "noinst" => "1" }, @@ -1053,9 +1046,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -1635,9 +1625,6 @@ our %unified_info = ( "SHA512_ASM", "VPAES_ASM" ], - "test/evp_extra_test" => [ - "STATIC_LEGACY" - ], "test/provider_internal_test" => [ "PROVIDER_INIT_FUNCTION_NAME=p_test_init" ], @@ -2391,9 +2378,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -2691,9 +2675,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -3462,9 +3443,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -3759,9 +3737,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -3795,12 +3770,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -4785,9 +4754,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -5085,9 +5051,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -5856,9 +5819,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -6153,9 +6113,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -6189,12 +6146,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -7192,10 +7143,6 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], - "test/asn1_stable_parse_test" => [ - "libcrypto", - "test/libtestutil.a" - ], "test/asn1_string_table_test" => [ "libcrypto", "test/libtestutil.a" @@ -7449,10 +7396,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -7718,8 +7661,6 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "libcrypto.a", - "providers/libcommon.a", - "providers/liblegacy.a", "test/libtestutil.a" ], "test/evp_extra_test2" => [ @@ -9806,7 +9747,6 @@ our %unified_info = ( }, "providers" => { "deps" => [ - "providers/evp_extra_test-bin-legacyprov.o", "providers/libcrypto-lib-baseprov.o", "providers/libcrypto-lib-defltprov.o", "providers/libcrypto-lib-nullprov.o", @@ -9814,9 +9754,6 @@ our %unified_info = ( "providers/libdefault.a" ], "products" => { - "bin" => [ - "test/evp_extra_test" - ], "dso" => [ "providers/fips", "providers/legacy" @@ -10253,7 +10190,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10304,7 +10240,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -11436,9 +11371,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -11736,9 +11668,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -12507,9 +12436,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -12804,9 +12730,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -12840,12 +12763,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -13830,9 +13747,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -14130,9 +14044,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -14901,9 +14812,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -15198,9 +15106,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -15234,12 +15139,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -16268,10 +16167,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16348,9 +16243,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "whrlpool" ], - "test/p_minimal.ld" => [ - "util/providers.num" - ], "test/p_test.ld" => [ "util/providers.num" ], @@ -16516,7 +16408,6 @@ our %unified_info = ( "doc/html/man3/CMS_get1_ReceiptRequest.html", "doc/html/man3/CMS_sign.html", "doc/html/man3/CMS_sign_receipt.html", - "doc/html/man3/CMS_signed_get_attr.html", "doc/html/man3/CMS_uncompress.html", "doc/html/man3/CMS_verify.html", "doc/html/man3/CMS_verify_receipt.html", @@ -16616,7 +16507,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_encapsulate.html", "doc/html/man3/EVP_PKEY_encrypt.html", "doc/html/man3/EVP_PKEY_fromdata.html", - "doc/html/man3/EVP_PKEY_get_attr.html", "doc/html/man3/EVP_PKEY_get_default_digest_nid.html", "doc/html/man3/EVP_PKEY_get_field_type.html", "doc/html/man3/EVP_PKEY_get_group_name.html", @@ -16873,7 +16763,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -16972,7 +16861,6 @@ our %unified_info = ( "doc/html/man3/X509V3_get_d2i.html", "doc/html/man3/X509V3_set_ctx.html", "doc/html/man3/X509_ALGOR_dup.html", - "doc/html/man3/X509_ATTRIBUTE.html", "doc/html/man3/X509_CRL_get0_by_serial.html", "doc/html/man3/X509_EXTENSION_set_object.html", "doc/html/man3/X509_LOOKUP.html", @@ -16984,8 +16872,6 @@ our %unified_info = ( "doc/html/man3/X509_NAME_get_index_by_NID.html", "doc/html/man3/X509_NAME_print_ex.html", "doc/html/man3/X509_PUBKEY_new.html", - "doc/html/man3/X509_REQ_get_attr.html", - "doc/html/man3/X509_REQ_get_extensions.html", "doc/html/man3/X509_SIG_get0.html", "doc/html/man3/X509_STORE_CTX_get_error.html", "doc/html/man3/X509_STORE_CTX_new.html", @@ -18343,10 +18229,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/asn1_stable_parse_test" => [ - "include", - "apps/include" - ], "test/asn1_string_table_test" => [ "include", "apps/include" @@ -18554,9 +18436,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -18816,9 +18695,7 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "include", - "apps/include", - "providers/common/include", - "providers/implementations/include" + "apps/include" ], "test/evp_extra_test2" => [ "include", @@ -19075,10 +18952,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/p_minimal" => [ - "include", - "." - ], "test/p_test" => [ "include", "." @@ -19568,7 +19441,6 @@ our %unified_info = ( "doc/man/man3/CMS_get1_ReceiptRequest.3", "doc/man/man3/CMS_sign.3", "doc/man/man3/CMS_sign_receipt.3", - "doc/man/man3/CMS_signed_get_attr.3", "doc/man/man3/CMS_uncompress.3", "doc/man/man3/CMS_verify.3", "doc/man/man3/CMS_verify_receipt.3", @@ -19668,7 +19540,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_encapsulate.3", "doc/man/man3/EVP_PKEY_encrypt.3", "doc/man/man3/EVP_PKEY_fromdata.3", - "doc/man/man3/EVP_PKEY_get_attr.3", "doc/man/man3/EVP_PKEY_get_default_digest_nid.3", "doc/man/man3/EVP_PKEY_get_field_type.3", "doc/man/man3/EVP_PKEY_get_group_name.3", @@ -19925,7 +19796,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20024,7 +19894,6 @@ our %unified_info = ( "doc/man/man3/X509V3_get_d2i.3", "doc/man/man3/X509V3_set_ctx.3", "doc/man/man3/X509_ALGOR_dup.3", - "doc/man/man3/X509_ATTRIBUTE.3", "doc/man/man3/X509_CRL_get0_by_serial.3", "doc/man/man3/X509_EXTENSION_set_object.3", "doc/man/man3/X509_LOOKUP.3", @@ -20036,8 +19905,6 @@ our %unified_info = ( "doc/man/man3/X509_NAME_get_index_by_NID.3", "doc/man/man3/X509_NAME_print_ex.3", "doc/man/man3/X509_PUBKEY_new.3", - "doc/man/man3/X509_REQ_get_attr.3", - "doc/man/man3/X509_REQ_get_extensions.3", "doc/man/man3/X509_SIG_get0.3", "doc/man/man3/X509_STORE_CTX_get_error.3", "doc/man/man3/X509_STORE_CTX_new.3", @@ -20221,7 +20088,6 @@ our %unified_info = ( "modules" => [ "providers/fips", "providers/legacy", - "test/p_minimal", "test/p_test" ], "programs" => [ @@ -20247,7 +20113,6 @@ our %unified_info = ( "test/asn1_dsa_internal_test", "test/asn1_encode_test", "test/asn1_internal_test", - "test/asn1_stable_parse_test", "test/asn1_string_table_test", "test/asn1_time_test", "test/asynciotest", @@ -20311,7 +20176,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24517,7 +24381,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24544,7 +24407,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -24646,9 +24508,6 @@ our %unified_info = ( "providers/common/libfips-lib-securitycheck_fips.o" => [ "providers/common/securitycheck_fips.c" ], - "providers/evp_extra_test-bin-legacyprov.o" => [ - "providers/legacyprov.c" - ], "providers/fips" => [ "providers/fips.ld", "providers/fips/fips-dso-fips_entry.o" @@ -25796,9 +25655,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25880,9 +25736,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25940,12 +25793,6 @@ our %unified_info = ( "test/asn1_internal_test-bin-asn1_internal_test.o" => [ "test/asn1_internal_test.c" ], - "test/asn1_stable_parse_test" => [ - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" - ], - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" => [ - "test/asn1_stable_parse_test.c" - ], "test/asn1_string_table_test" => [ "test/asn1_string_table_test-bin-asn1_string_table_test.o" ], @@ -26325,12 +26172,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -26729,7 +26570,6 @@ our %unified_info = ( "test/errtest.c" ], "test/evp_extra_test" => [ - "providers/evp_extra_test-bin-legacyprov.o", "test/evp_extra_test-bin-evp_extra_test.o" ], "test/evp_extra_test-bin-evp_extra_test.o" => [ @@ -27020,13 +26860,6 @@ our %unified_info = ( "test/ossl_store_test-bin-ossl_store_test.o" => [ "test/ossl_store_test.c" ], - "test/p_minimal" => [ - "test/p_minimal-dso-p_minimal.o", - "test/p_minimal.ld" - ], - "test/p_minimal-dso-p_minimal.o" => [ - "test/p_minimal.c" - ], "test/p_test" => [ "test/p_test-dso-p_test.o", "test/p_test.ld" @@ -27713,8 +27546,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27741,7 +27574,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27758,8 +27591,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/aes/aesv8-armx.S b/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/aes/aesv8-armx.S index 0d2a81daf..51c4d7208 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/aes/aesv8-armx.S +++ b/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/aes/aesv8-armx.S @@ -103,7 +103,7 @@ aes_v8_set_encrypt_key: .Loop192: tbl v6.16b,{v4.16b},v2.16b ext v5.16b,v0.16b,v3.16b,#12 -#ifdef __AARCH64EB__ +#ifdef __ARMEB__ st1 {v4.4s},[x2],#16 sub x2,x2,#8 #else @@ -1510,7 +1510,7 @@ aes_v8_ctr32_encrypt_blocks: ldr w5,[x3,#240] ldr w8, [x4, #12] -#ifdef __AARCH64EB__ +#ifdef __ARMEB__ ld1 {v0.16b},[x4] #else ld1 {v0.4s},[x4] @@ -1527,7 +1527,7 @@ aes_v8_ctr32_encrypt_blocks: add x7,x3,#32 mov w6,w5 csel x12,xzr,x12,lo -#ifndef __AARCH64EB__ +#ifndef __ARMEB__ rev w8, w8 #endif orr v1.16b,v0.16b,v0.16b diff --git a/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/buildinf.h index b44bd4bb5..408067d65 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-aarch64" -#define DATE "built on: Wed Jan 31 13:00:57 2024 UTC" +#define DATE "built on: Tue Aug 6 12:23:53 2024 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/modes/ghashv8-armx.S b/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/modes/ghashv8-armx.S index ea6a66a22..acd52eb95 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/modes/ghashv8-armx.S +++ b/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/modes/ghashv8-armx.S @@ -101,7 +101,7 @@ gcm_gmult_v8: movi v19.16b,#0xe1 ld1 {v20.2d,v21.2d},[x1] //load twisted H, ... shl v19.2d,v19.2d,#57 -#ifndef __AARCH64EB__ +#ifndef __ARMEB__ rev64 v17.16b,v17.16b #endif ext v3.16b,v17.16b,v17.16b,#8 @@ -126,7 +126,7 @@ gcm_gmult_v8: eor v18.16b,v18.16b,v2.16b eor v0.16b,v0.16b,v18.16b -#ifndef __AARCH64EB__ +#ifndef __ARMEB__ rev64 v0.16b,v0.16b #endif ext v0.16b,v0.16b,v0.16b,#8 @@ -163,14 +163,14 @@ gcm_ghash_v8: ext v0.16b,v0.16b,v0.16b,#8 //rotate Xi ld1 {v16.2d},[x2],#16 //load [rotated] I[0] shl v19.2d,v19.2d,#57 //compose 0xc2.0 constant -#ifndef __AARCH64EB__ +#ifndef __ARMEB__ rev64 v16.16b,v16.16b rev64 v0.16b,v0.16b #endif ext v3.16b,v16.16b,v16.16b,#8 //rotate I[0] b.lo .Lodd_tail_v8 //x3 was less than 32 ld1 {v17.2d},[x2],x12 //load [rotated] I[1] -#ifndef __AARCH64EB__ +#ifndef __ARMEB__ rev64 v17.16b,v17.16b #endif ext v7.16b,v17.16b,v17.16b,#8 @@ -202,13 +202,13 @@ gcm_ghash_v8: eor v18.16b,v0.16b,v2.16b eor v1.16b,v1.16b,v17.16b ld1 {v17.2d},[x2],x12 //load [rotated] I[i+3] -#ifndef __AARCH64EB__ +#ifndef __ARMEB__ rev64 v16.16b,v16.16b #endif eor v1.16b,v1.16b,v18.16b pmull v18.1q,v0.1d,v19.1d //1st phase of reduction -#ifndef __AARCH64EB__ +#ifndef __ARMEB__ rev64 v17.16b,v17.16b #endif ins v2.d[0],v1.d[1] @@ -258,7 +258,7 @@ gcm_ghash_v8: eor v0.16b,v0.16b,v18.16b .Ldone_v8: -#ifndef __AARCH64EB__ +#ifndef __ARMEB__ rev64 v0.16b,v0.16b #endif ext v0.16b,v0.16b,v0.16b,#8 @@ -277,7 +277,7 @@ gcm_ghash_v8_4x: shl v19.2d,v19.2d,#57 //compose 0xc2.0 constant ld1 {v4.2d,v5.2d,v6.2d,v7.2d},[x2],#64 -#ifndef __AARCH64EB__ +#ifndef __ARMEB__ rev64 v0.16b,v0.16b rev64 v5.16b,v5.16b rev64 v6.16b,v6.16b @@ -321,7 +321,7 @@ gcm_ghash_v8_4x: eor v16.16b,v4.16b,v0.16b ld1 {v4.2d,v5.2d,v6.2d,v7.2d},[x2],#64 ext v3.16b,v16.16b,v16.16b,#8 -#ifndef __AARCH64EB__ +#ifndef __ARMEB__ rev64 v5.16b,v5.16b rev64 v6.16b,v6.16b rev64 v7.16b,v7.16b @@ -404,7 +404,7 @@ gcm_ghash_v8_4x: eor v1.16b,v1.16b,v17.16b ld1 {v4.2d,v5.2d,v6.2d},[x2] eor v1.16b,v1.16b,v18.16b -#ifndef __AARCH64EB__ +#ifndef __ARMEB__ rev64 v5.16b,v5.16b rev64 v6.16b,v6.16b rev64 v4.16b,v4.16b @@ -456,7 +456,7 @@ gcm_ghash_v8_4x: eor v1.16b,v1.16b,v17.16b ld1 {v4.2d,v5.2d},[x2] eor v1.16b,v1.16b,v18.16b -#ifndef __AARCH64EB__ +#ifndef __ARMEB__ rev64 v5.16b,v5.16b rev64 v4.16b,v4.16b #endif @@ -499,7 +499,7 @@ gcm_ghash_v8_4x: eor v1.16b,v1.16b,v17.16b ld1 {v4.2d},[x2] eor v1.16b,v1.16b,v18.16b -#ifndef __AARCH64EB__ +#ifndef __ARMEB__ rev64 v4.16b,v4.16b #endif @@ -539,7 +539,7 @@ gcm_ghash_v8_4x: eor v0.16b,v0.16b,v18.16b ext v0.16b,v0.16b,v0.16b,#8 -#ifndef __AARCH64EB__ +#ifndef __ARMEB__ rev64 v0.16b,v0.16b #endif st1 {v0.2d},[x0] //write out Xi diff --git a/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/poly1305/poly1305-armv8.S b/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/poly1305/poly1305-armv8.S index 98ebf4853..ea8f39022 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/poly1305/poly1305-armv8.S +++ b/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/poly1305/poly1305-armv8.S @@ -28,7 +28,7 @@ poly1305_init: ldp x7,x8,[x1] // load key mov x9,#0xfffffffc0fffffff movk x9,#0x0fff,lsl#48 -#ifdef __AARCH64EB__ +#ifdef __ARMEB__ rev x7,x7 // flip bytes rev x8,x8 #endif @@ -75,7 +75,7 @@ poly1305_blocks: .Loop: ldp x10,x11,[x1],#16 // load input sub x2,x2,#16 -#ifdef __AARCH64EB__ +#ifdef __ARMEB__ rev x10,x10 rev x11,x11 #endif @@ -140,13 +140,13 @@ poly1305_emit: csel x4,x4,x12,eq csel x5,x5,x13,eq -#ifdef __AARCH64EB__ +#ifdef __ARMEB__ ror x10,x10,#32 // flip nonce words ror x11,x11,#32 #endif adds x4,x4,x10 // accumulate nonce adc x5,x5,x11 -#ifdef __AARCH64EB__ +#ifdef __ARMEB__ rev x4,x4 // flip output bytes rev x5,x5 #endif @@ -266,7 +266,7 @@ poly1305_blocks_neon: adcs x5,x5,xzr adc x6,x6,xzr -#ifdef __AARCH64EB__ +#ifdef __ARMEB__ rev x12,x12 rev x13,x13 #endif @@ -312,7 +312,7 @@ poly1305_blocks_neon: ldp x12,x13,[x1],#16 // load input sub x2,x2,#16 add x9,x8,x8,lsr#2 // s1 = r1 + (r1 >> 2) -#ifdef __AARCH64EB__ +#ifdef __ARMEB__ rev x12,x12 rev x13,x13 #endif @@ -397,7 +397,7 @@ poly1305_blocks_neon: lsl x3,x3,#24 add x15,x0,#48 -#ifdef __AARCH64EB__ +#ifdef __ARMEB__ rev x8,x8 rev x12,x12 rev x9,x9 @@ -433,7 +433,7 @@ poly1305_blocks_neon: ld1 {v4.4s,v5.4s,v6.4s,v7.4s},[x15],#64 ld1 {v8.4s},[x15] -#ifdef __AARCH64EB__ +#ifdef __ARMEB__ rev x8,x8 rev x12,x12 rev x9,x9 @@ -494,7 +494,7 @@ poly1305_blocks_neon: umull v20.2d,v14.2s,v1.s[2] ldp x9,x13,[x16],#48 umull v19.2d,v14.2s,v0.s[2] -#ifdef __AARCH64EB__ +#ifdef __ARMEB__ rev x8,x8 rev x12,x12 rev x9,x9 @@ -559,7 +559,7 @@ poly1305_blocks_neon: umlal v23.2d,v11.2s,v3.s[0] umlal v20.2d,v11.2s,v8.s[0] umlal v21.2d,v11.2s,v0.s[0] -#ifdef __AARCH64EB__ +#ifdef __ARMEB__ rev x8,x8 rev x12,x12 rev x9,x9 @@ -840,13 +840,13 @@ poly1305_emit_neon: csel x4,x4,x12,eq csel x5,x5,x13,eq -#ifdef __AARCH64EB__ +#ifdef __ARMEB__ ror x10,x10,#32 // flip nonce words ror x11,x11,#32 #endif adds x4,x4,x10 // accumulate nonce adc x5,x5,x11 -#ifdef __AARCH64EB__ +#ifdef __ARMEB__ rev x4,x4 // flip output bytes rev x5,x5 #endif diff --git a/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/openssl/bio.h b/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/openssl/bio.h index f9aa74731..e16cf622c 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/openssl/bio.h +++ b/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/openssl/bio.h @@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, - int (*ossl_gets) (BIO *, char *, int)); + int (*gets) (BIO *, char *, int)); long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); diff --git a/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/openssl/opensslv.h index 65f3bfa05..5bb97d596 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 13 +# define OPENSSL_VERSION_PATCH 9 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.13" -# define OPENSSL_FULL_VERSION_STR "3.0.13+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "30 Jan 2024" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13+quic 30 Jan 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/openssl/pkcs7.h b/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/openssl/pkcs7.h index 0ce79bf4f..557a0a726 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/openssl/pkcs7.h +++ b/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/openssl/pkcs7.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/pkcs7.h.in * - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -56,8 +56,8 @@ typedef struct pkcs7_signer_info_st { PKCS7_ISSUER_AND_SERIAL *issuer_and_serial; X509_ALGOR *digest_alg; STACK_OF(X509_ATTRIBUTE) *auth_attr; /* [ 0 ] */ - X509_ALGOR *digest_enc_alg; /* confusing name, actually used for signing */ - ASN1_OCTET_STRING *enc_digest; /* confusing name, actually signature */ + X509_ALGOR *digest_enc_alg; + ASN1_OCTET_STRING *enc_digest; STACK_OF(X509_ATTRIBUTE) *unauth_attr; /* [ 1 ] */ /* The private key to sign with */ EVP_PKEY *pkey; diff --git a/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/openssl/ssl.h index 0f1915755..3df725c56 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/linux-aarch64/asm_avx2/openssl.gypi b/deps/openssl/config/archs/linux-aarch64/asm_avx2/openssl.gypi index c7cb2091b..b9d76aee0 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/linux-aarch64/asm_avx2/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cbc.c', 'openssl/crypto/aes/aes_cfb.c', diff --git a/deps/openssl/config/archs/linux-aarch64/no-asm/configdata.pm b/deps/openssl/config/archs/linux-aarch64/no-asm/configdata.pm index 09dbbbd0f..e9d8df75f 100644 --- a/deps/openssl/config/archs/linux-aarch64/no-asm/configdata.pm +++ b/deps/openssl/config/archs/linux-aarch64/no-asm/configdata.pm @@ -142,7 +142,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [], @@ -157,7 +157,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.13+quic", + "full_version" => "3.0.9", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,7 +206,7 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "13", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "30 Jan 2024", - "shlib_version" => "81.3", + "release_date" => "30 May 2023", + "shlib_version" => "3", "sourcedir" => ".", "target" => "linux-aarch64", - "version" => "3.0.13" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -394,7 +394,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -791,9 +790,6 @@ our %unified_info = ( "providers/fips" => { "fips" => "1" }, - "test/p_minimal" => { - "noinst" => "1" - }, "test/p_test" => { "noinst" => "1" } @@ -862,9 +858,6 @@ our %unified_info = ( "test/asn1_internal_test" => { "noinst" => "1" }, - "test/asn1_stable_parse_test" => { - "noinst" => "1" - }, "test/asn1_string_table_test" => { "noinst" => "1" }, @@ -1054,9 +1047,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -1604,9 +1594,6 @@ our %unified_info = ( "providers/libfips.a" => [ "FIPS_MODULE" ], - "test/evp_extra_test" => [ - "STATIC_LEGACY" - ], "test/provider_internal_test" => [ "PROVIDER_INIT_FUNCTION_NAME=p_test_init" ], @@ -2360,9 +2347,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -2660,9 +2644,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -3431,9 +3412,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -3728,9 +3706,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -3764,12 +3739,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -4754,9 +4723,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -5054,9 +5020,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -5825,9 +5788,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -6122,9 +6082,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -6158,12 +6115,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -7161,10 +7112,6 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], - "test/asn1_stable_parse_test" => [ - "libcrypto", - "test/libtestutil.a" - ], "test/asn1_string_table_test" => [ "libcrypto", "test/libtestutil.a" @@ -7418,10 +7365,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -7687,8 +7630,6 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "libcrypto.a", - "providers/libcommon.a", - "providers/liblegacy.a", "test/libtestutil.a" ], "test/evp_extra_test2" => [ @@ -9752,7 +9693,6 @@ our %unified_info = ( }, "providers" => { "deps" => [ - "providers/evp_extra_test-bin-legacyprov.o", "providers/libcrypto-lib-baseprov.o", "providers/libcrypto-lib-defltprov.o", "providers/libcrypto-lib-nullprov.o", @@ -9760,9 +9700,6 @@ our %unified_info = ( "providers/libdefault.a" ], "products" => { - "bin" => [ - "test/evp_extra_test" - ], "dso" => [ "providers/fips", "providers/legacy" @@ -10199,7 +10136,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10250,7 +10186,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -11382,9 +11317,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -11682,9 +11614,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -12453,9 +12382,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -12750,9 +12676,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -12786,12 +12709,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -13776,9 +13693,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -14076,9 +13990,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -14847,9 +14758,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -15144,9 +15052,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -15180,12 +15085,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -16214,10 +16113,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16294,9 +16189,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "whrlpool" ], - "test/p_minimal.ld" => [ - "util/providers.num" - ], "test/p_test.ld" => [ "util/providers.num" ], @@ -16462,7 +16354,6 @@ our %unified_info = ( "doc/html/man3/CMS_get1_ReceiptRequest.html", "doc/html/man3/CMS_sign.html", "doc/html/man3/CMS_sign_receipt.html", - "doc/html/man3/CMS_signed_get_attr.html", "doc/html/man3/CMS_uncompress.html", "doc/html/man3/CMS_verify.html", "doc/html/man3/CMS_verify_receipt.html", @@ -16562,7 +16453,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_encapsulate.html", "doc/html/man3/EVP_PKEY_encrypt.html", "doc/html/man3/EVP_PKEY_fromdata.html", - "doc/html/man3/EVP_PKEY_get_attr.html", "doc/html/man3/EVP_PKEY_get_default_digest_nid.html", "doc/html/man3/EVP_PKEY_get_field_type.html", "doc/html/man3/EVP_PKEY_get_group_name.html", @@ -16819,7 +16709,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -16918,7 +16807,6 @@ our %unified_info = ( "doc/html/man3/X509V3_get_d2i.html", "doc/html/man3/X509V3_set_ctx.html", "doc/html/man3/X509_ALGOR_dup.html", - "doc/html/man3/X509_ATTRIBUTE.html", "doc/html/man3/X509_CRL_get0_by_serial.html", "doc/html/man3/X509_EXTENSION_set_object.html", "doc/html/man3/X509_LOOKUP.html", @@ -16930,8 +16818,6 @@ our %unified_info = ( "doc/html/man3/X509_NAME_get_index_by_NID.html", "doc/html/man3/X509_NAME_print_ex.html", "doc/html/man3/X509_PUBKEY_new.html", - "doc/html/man3/X509_REQ_get_attr.html", - "doc/html/man3/X509_REQ_get_extensions.html", "doc/html/man3/X509_SIG_get0.html", "doc/html/man3/X509_STORE_CTX_get_error.html", "doc/html/man3/X509_STORE_CTX_new.html", @@ -18229,10 +18115,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/asn1_stable_parse_test" => [ - "include", - "apps/include" - ], "test/asn1_string_table_test" => [ "include", "apps/include" @@ -18440,9 +18322,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -18702,9 +18581,7 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "include", - "apps/include", - "providers/common/include", - "providers/implementations/include" + "apps/include" ], "test/evp_extra_test2" => [ "include", @@ -18961,10 +18838,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/p_minimal" => [ - "include", - "." - ], "test/p_test" => [ "include", "." @@ -19454,7 +19327,6 @@ our %unified_info = ( "doc/man/man3/CMS_get1_ReceiptRequest.3", "doc/man/man3/CMS_sign.3", "doc/man/man3/CMS_sign_receipt.3", - "doc/man/man3/CMS_signed_get_attr.3", "doc/man/man3/CMS_uncompress.3", "doc/man/man3/CMS_verify.3", "doc/man/man3/CMS_verify_receipt.3", @@ -19554,7 +19426,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_encapsulate.3", "doc/man/man3/EVP_PKEY_encrypt.3", "doc/man/man3/EVP_PKEY_fromdata.3", - "doc/man/man3/EVP_PKEY_get_attr.3", "doc/man/man3/EVP_PKEY_get_default_digest_nid.3", "doc/man/man3/EVP_PKEY_get_field_type.3", "doc/man/man3/EVP_PKEY_get_group_name.3", @@ -19811,7 +19682,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -19910,7 +19780,6 @@ our %unified_info = ( "doc/man/man3/X509V3_get_d2i.3", "doc/man/man3/X509V3_set_ctx.3", "doc/man/man3/X509_ALGOR_dup.3", - "doc/man/man3/X509_ATTRIBUTE.3", "doc/man/man3/X509_CRL_get0_by_serial.3", "doc/man/man3/X509_EXTENSION_set_object.3", "doc/man/man3/X509_LOOKUP.3", @@ -19922,8 +19791,6 @@ our %unified_info = ( "doc/man/man3/X509_NAME_get_index_by_NID.3", "doc/man/man3/X509_NAME_print_ex.3", "doc/man/man3/X509_PUBKEY_new.3", - "doc/man/man3/X509_REQ_get_attr.3", - "doc/man/man3/X509_REQ_get_extensions.3", "doc/man/man3/X509_SIG_get0.3", "doc/man/man3/X509_STORE_CTX_get_error.3", "doc/man/man3/X509_STORE_CTX_new.3", @@ -20107,7 +19974,6 @@ our %unified_info = ( "modules" => [ "providers/fips", "providers/legacy", - "test/p_minimal", "test/p_test" ], "programs" => [ @@ -20133,7 +19999,6 @@ our %unified_info = ( "test/asn1_dsa_internal_test", "test/asn1_encode_test", "test/asn1_internal_test", - "test/asn1_stable_parse_test", "test/asn1_string_table_test", "test/asn1_time_test", "test/asynciotest", @@ -20197,7 +20062,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24322,7 +24186,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24349,7 +24212,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -24451,9 +24313,6 @@ our %unified_info = ( "providers/common/libfips-lib-securitycheck_fips.o" => [ "providers/common/securitycheck_fips.c" ], - "providers/evp_extra_test-bin-legacyprov.o" => [ - "providers/legacyprov.c" - ], "providers/fips" => [ "providers/fips.ld", "providers/fips/fips-dso-fips_entry.o" @@ -25590,9 +25449,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25674,9 +25530,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25734,12 +25587,6 @@ our %unified_info = ( "test/asn1_internal_test-bin-asn1_internal_test.o" => [ "test/asn1_internal_test.c" ], - "test/asn1_stable_parse_test" => [ - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" - ], - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" => [ - "test/asn1_stable_parse_test.c" - ], "test/asn1_string_table_test" => [ "test/asn1_string_table_test-bin-asn1_string_table_test.o" ], @@ -26119,12 +25966,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -26523,7 +26364,6 @@ our %unified_info = ( "test/errtest.c" ], "test/evp_extra_test" => [ - "providers/evp_extra_test-bin-legacyprov.o", "test/evp_extra_test-bin-evp_extra_test.o" ], "test/evp_extra_test-bin-evp_extra_test.o" => [ @@ -26814,13 +26654,6 @@ our %unified_info = ( "test/ossl_store_test-bin-ossl_store_test.o" => [ "test/ossl_store_test.c" ], - "test/p_minimal" => [ - "test/p_minimal-dso-p_minimal.o", - "test/p_minimal.ld" - ], - "test/p_minimal-dso-p_minimal.o" => [ - "test/p_minimal.c" - ], "test/p_test" => [ "test/p_test-dso-p_test.o", "test/p_test.ld" @@ -27510,8 +27343,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27538,7 +27371,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27555,8 +27388,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux-aarch64/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-aarch64/no-asm/crypto/buildinf.h index d1a00e8b4..dc63dfd6a 100644 --- a/deps/openssl/config/archs/linux-aarch64/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-aarch64/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-aarch64" -#define DATE "built on: Wed Jan 31 13:01:10 2024 UTC" +#define DATE "built on: Tue Aug 6 12:24:05 2024 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/bio.h b/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/bio.h index f9aa74731..e16cf622c 100644 --- a/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/bio.h @@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, - int (*ossl_gets) (BIO *, char *, int)); + int (*gets) (BIO *, char *, int)); long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); diff --git a/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/opensslv.h index 65f3bfa05..5bb97d596 100644 --- a/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 13 +# define OPENSSL_VERSION_PATCH 9 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.13" -# define OPENSSL_FULL_VERSION_STR "3.0.13+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "30 Jan 2024" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13+quic 30 Jan 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/pkcs7.h b/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/pkcs7.h index 0ce79bf4f..557a0a726 100644 --- a/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/pkcs7.h +++ b/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/pkcs7.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/pkcs7.h.in * - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -56,8 +56,8 @@ typedef struct pkcs7_signer_info_st { PKCS7_ISSUER_AND_SERIAL *issuer_and_serial; X509_ALGOR *digest_alg; STACK_OF(X509_ATTRIBUTE) *auth_attr; /* [ 0 ] */ - X509_ALGOR *digest_enc_alg; /* confusing name, actually used for signing */ - ASN1_OCTET_STRING *enc_digest; /* confusing name, actually signature */ + X509_ALGOR *digest_enc_alg; + ASN1_OCTET_STRING *enc_digest; STACK_OF(X509_ATTRIBUTE) *unauth_attr; /* [ 1 ] */ /* The private key to sign with */ EVP_PKEY *pkey; diff --git a/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/ssl.h index 0f1915755..3df725c56 100644 --- a/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/linux-aarch64/no-asm/openssl.gypi b/deps/openssl/config/archs/linux-aarch64/no-asm/openssl.gypi index f20a2ba24..387362a47 100644 --- a/deps/openssl/config/archs/linux-aarch64/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/linux-aarch64/no-asm/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cbc.c', 'openssl/crypto/aes/aes_cfb.c', diff --git a/deps/openssl/config/archs/linux-armv4/asm/configdata.pm b/deps/openssl/config/archs/linux-armv4/asm/configdata.pm index b56c2ea33..c8e09923c 100644 --- a/deps/openssl/config/archs/linux-armv4/asm/configdata.pm +++ b/deps/openssl/config/archs/linux-armv4/asm/configdata.pm @@ -142,7 +142,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -159,7 +159,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.13+quic", + "full_version" => "3.0.9", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -207,7 +207,7 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "13", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "30 Jan 2024", - "shlib_version" => "81.3", + "release_date" => "30 May 2023", + "shlib_version" => "3", "sourcedir" => ".", "target" => "linux-armv4", - "version" => "3.0.13" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -394,7 +394,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -790,9 +789,6 @@ our %unified_info = ( "providers/fips" => { "fips" => "1" }, - "test/p_minimal" => { - "noinst" => "1" - }, "test/p_test" => { "noinst" => "1" } @@ -861,9 +857,6 @@ our %unified_info = ( "test/asn1_internal_test" => { "noinst" => "1" }, - "test/asn1_stable_parse_test" => { - "noinst" => "1" - }, "test/asn1_string_table_test" => { "noinst" => "1" }, @@ -1053,9 +1046,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -1643,9 +1633,6 @@ our %unified_info = ( "SHA256_ASM", "SHA512_ASM" ], - "test/evp_extra_test" => [ - "STATIC_LEGACY" - ], "test/provider_internal_test" => [ "PROVIDER_INIT_FUNCTION_NAME=p_test_init" ], @@ -2399,9 +2386,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -2699,9 +2683,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -3470,9 +3451,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -3767,9 +3745,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -3803,12 +3778,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -4793,9 +4762,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -5093,9 +5059,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -5864,9 +5827,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -6161,9 +6121,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -6197,12 +6154,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -7200,10 +7151,6 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], - "test/asn1_stable_parse_test" => [ - "libcrypto", - "test/libtestutil.a" - ], "test/asn1_string_table_test" => [ "libcrypto", "test/libtestutil.a" @@ -7457,10 +7404,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -7726,8 +7669,6 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "libcrypto.a", - "providers/libcommon.a", - "providers/liblegacy.a", "test/libtestutil.a" ], "test/evp_extra_test2" => [ @@ -9816,7 +9757,6 @@ our %unified_info = ( }, "providers" => { "deps" => [ - "providers/evp_extra_test-bin-legacyprov.o", "providers/libcrypto-lib-baseprov.o", "providers/libcrypto-lib-defltprov.o", "providers/libcrypto-lib-nullprov.o", @@ -9824,9 +9764,6 @@ our %unified_info = ( "providers/libdefault.a" ], "products" => { - "bin" => [ - "test/evp_extra_test" - ], "dso" => [ "providers/fips", "providers/legacy" @@ -10263,7 +10200,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10314,7 +10250,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -11446,9 +11381,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -11746,9 +11678,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -12517,9 +12446,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -12814,9 +12740,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -12850,12 +12773,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -13840,9 +13757,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -14140,9 +14054,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -14911,9 +14822,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -15208,9 +15116,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -15244,12 +15149,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -16278,10 +16177,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16358,9 +16253,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "whrlpool" ], - "test/p_minimal.ld" => [ - "util/providers.num" - ], "test/p_test.ld" => [ "util/providers.num" ], @@ -16526,7 +16418,6 @@ our %unified_info = ( "doc/html/man3/CMS_get1_ReceiptRequest.html", "doc/html/man3/CMS_sign.html", "doc/html/man3/CMS_sign_receipt.html", - "doc/html/man3/CMS_signed_get_attr.html", "doc/html/man3/CMS_uncompress.html", "doc/html/man3/CMS_verify.html", "doc/html/man3/CMS_verify_receipt.html", @@ -16626,7 +16517,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_encapsulate.html", "doc/html/man3/EVP_PKEY_encrypt.html", "doc/html/man3/EVP_PKEY_fromdata.html", - "doc/html/man3/EVP_PKEY_get_attr.html", "doc/html/man3/EVP_PKEY_get_default_digest_nid.html", "doc/html/man3/EVP_PKEY_get_field_type.html", "doc/html/man3/EVP_PKEY_get_group_name.html", @@ -16883,7 +16773,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -16982,7 +16871,6 @@ our %unified_info = ( "doc/html/man3/X509V3_get_d2i.html", "doc/html/man3/X509V3_set_ctx.html", "doc/html/man3/X509_ALGOR_dup.html", - "doc/html/man3/X509_ATTRIBUTE.html", "doc/html/man3/X509_CRL_get0_by_serial.html", "doc/html/man3/X509_EXTENSION_set_object.html", "doc/html/man3/X509_LOOKUP.html", @@ -16994,8 +16882,6 @@ our %unified_info = ( "doc/html/man3/X509_NAME_get_index_by_NID.html", "doc/html/man3/X509_NAME_print_ex.html", "doc/html/man3/X509_PUBKEY_new.html", - "doc/html/man3/X509_REQ_get_attr.html", - "doc/html/man3/X509_REQ_get_extensions.html", "doc/html/man3/X509_SIG_get0.html", "doc/html/man3/X509_STORE_CTX_get_error.html", "doc/html/man3/X509_STORE_CTX_new.html", @@ -18377,10 +18263,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/asn1_stable_parse_test" => [ - "include", - "apps/include" - ], "test/asn1_string_table_test" => [ "include", "apps/include" @@ -18588,9 +18470,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -18850,9 +18729,7 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "include", - "apps/include", - "providers/common/include", - "providers/implementations/include" + "apps/include" ], "test/evp_extra_test2" => [ "include", @@ -19109,10 +18986,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/p_minimal" => [ - "include", - "." - ], "test/p_test" => [ "include", "." @@ -19602,7 +19475,6 @@ our %unified_info = ( "doc/man/man3/CMS_get1_ReceiptRequest.3", "doc/man/man3/CMS_sign.3", "doc/man/man3/CMS_sign_receipt.3", - "doc/man/man3/CMS_signed_get_attr.3", "doc/man/man3/CMS_uncompress.3", "doc/man/man3/CMS_verify.3", "doc/man/man3/CMS_verify_receipt.3", @@ -19702,7 +19574,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_encapsulate.3", "doc/man/man3/EVP_PKEY_encrypt.3", "doc/man/man3/EVP_PKEY_fromdata.3", - "doc/man/man3/EVP_PKEY_get_attr.3", "doc/man/man3/EVP_PKEY_get_default_digest_nid.3", "doc/man/man3/EVP_PKEY_get_field_type.3", "doc/man/man3/EVP_PKEY_get_group_name.3", @@ -19959,7 +19830,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20058,7 +19928,6 @@ our %unified_info = ( "doc/man/man3/X509V3_get_d2i.3", "doc/man/man3/X509V3_set_ctx.3", "doc/man/man3/X509_ALGOR_dup.3", - "doc/man/man3/X509_ATTRIBUTE.3", "doc/man/man3/X509_CRL_get0_by_serial.3", "doc/man/man3/X509_EXTENSION_set_object.3", "doc/man/man3/X509_LOOKUP.3", @@ -20070,8 +19939,6 @@ our %unified_info = ( "doc/man/man3/X509_NAME_get_index_by_NID.3", "doc/man/man3/X509_NAME_print_ex.3", "doc/man/man3/X509_PUBKEY_new.3", - "doc/man/man3/X509_REQ_get_attr.3", - "doc/man/man3/X509_REQ_get_extensions.3", "doc/man/man3/X509_SIG_get0.3", "doc/man/man3/X509_STORE_CTX_get_error.3", "doc/man/man3/X509_STORE_CTX_new.3", @@ -20255,7 +20122,6 @@ our %unified_info = ( "modules" => [ "providers/fips", "providers/legacy", - "test/p_minimal", "test/p_test" ], "programs" => [ @@ -20281,7 +20147,6 @@ our %unified_info = ( "test/asn1_dsa_internal_test", "test/asn1_encode_test", "test/asn1_internal_test", - "test/asn1_stable_parse_test", "test/asn1_string_table_test", "test/asn1_time_test", "test/asynciotest", @@ -20345,7 +20210,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24558,7 +24422,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24585,7 +24448,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -24687,9 +24549,6 @@ our %unified_info = ( "providers/common/libfips-lib-securitycheck_fips.o" => [ "providers/common/securitycheck_fips.c" ], - "providers/evp_extra_test-bin-legacyprov.o" => [ - "providers/legacyprov.c" - ], "providers/fips" => [ "providers/fips.ld", "providers/fips/fips-dso-fips_entry.o" @@ -25838,9 +25697,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25922,9 +25778,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25982,12 +25835,6 @@ our %unified_info = ( "test/asn1_internal_test-bin-asn1_internal_test.o" => [ "test/asn1_internal_test.c" ], - "test/asn1_stable_parse_test" => [ - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" - ], - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" => [ - "test/asn1_stable_parse_test.c" - ], "test/asn1_string_table_test" => [ "test/asn1_string_table_test-bin-asn1_string_table_test.o" ], @@ -26367,12 +26214,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -26771,7 +26612,6 @@ our %unified_info = ( "test/errtest.c" ], "test/evp_extra_test" => [ - "providers/evp_extra_test-bin-legacyprov.o", "test/evp_extra_test-bin-evp_extra_test.o" ], "test/evp_extra_test-bin-evp_extra_test.o" => [ @@ -27062,13 +26902,6 @@ our %unified_info = ( "test/ossl_store_test-bin-ossl_store_test.o" => [ "test/ossl_store_test.c" ], - "test/p_minimal" => [ - "test/p_minimal-dso-p_minimal.o", - "test/p_minimal.ld" - ], - "test/p_minimal-dso-p_minimal.o" => [ - "test/p_minimal.c" - ], "test/p_test" => [ "test/p_test-dso-p_test.o", "test/p_test.ld" @@ -27755,8 +27588,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27783,7 +27616,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27800,8 +27633,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux-armv4/asm/crypto/aes/bsaes-armv7.S b/deps/openssl/config/archs/linux-armv4/asm/crypto/aes/bsaes-armv7.S index 545d7f76c..4b7f66214 100644 --- a/deps/openssl/config/archs/linux-armv4/asm/crypto/aes/bsaes-armv7.S +++ b/deps/openssl/config/archs/linux-armv4/asm/crypto/aes/bsaes-armv7.S @@ -1131,7 +1131,7 @@ ossl_bsaes_cbc_encrypt: vstmia r4, {q7} .align 2 -0: + #endif vld1.8 {q15}, [r8] @ load IV @@ -1391,7 +1391,7 @@ ossl_bsaes_ctr32_encrypt_blocks: vstmia r12, {q7} @ save last round key .align 2 -0: add r12, r3, #248 + add r12, r3, #248 vld1.8 {q0}, [r8] @ load counter add r8, r6, #.LREVM0SR-.LM0 @ borrow r8 vldmia r12, {q4} @ load round0 key @@ -1626,7 +1626,7 @@ ossl_bsaes_xts_encrypt: vstmia r12, {q7} .align 2 -0: sub sp, #0x90 @ place for tweak[9] + sub sp, #0x90 @ place for tweak[9] #endif vld1.8 {q8}, [r0] @ initial tweak @@ -2112,7 +2112,7 @@ ossl_bsaes_xts_decrypt: vstmia r4, {q7} .align 2 -0: sub sp, #0x90 @ place for tweak[9] + sub sp, #0x90 @ place for tweak[9] #endif vld1.8 {q8}, [r0] @ initial tweak adr r2, .Lxts_magic diff --git a/deps/openssl/config/archs/linux-armv4/asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-armv4/asm/crypto/buildinf.h index 6c556e948..b7c5dee38 100644 --- a/deps/openssl/config/archs/linux-armv4/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-armv4/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-armv4" -#define DATE "built on: Wed Jan 31 13:01:21 2024 UTC" +#define DATE "built on: Tue Aug 6 12:24:15 2024 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-armv4/asm/include/openssl/bio.h b/deps/openssl/config/archs/linux-armv4/asm/include/openssl/bio.h index f9aa74731..e16cf622c 100644 --- a/deps/openssl/config/archs/linux-armv4/asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/linux-armv4/asm/include/openssl/bio.h @@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, - int (*ossl_gets) (BIO *, char *, int)); + int (*gets) (BIO *, char *, int)); long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); diff --git a/deps/openssl/config/archs/linux-armv4/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux-armv4/asm/include/openssl/opensslv.h index 65f3bfa05..5bb97d596 100644 --- a/deps/openssl/config/archs/linux-armv4/asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux-armv4/asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 13 +# define OPENSSL_VERSION_PATCH 9 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.13" -# define OPENSSL_FULL_VERSION_STR "3.0.13+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "30 Jan 2024" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13+quic 30 Jan 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux-armv4/asm/include/openssl/pkcs7.h b/deps/openssl/config/archs/linux-armv4/asm/include/openssl/pkcs7.h index 0ce79bf4f..557a0a726 100644 --- a/deps/openssl/config/archs/linux-armv4/asm/include/openssl/pkcs7.h +++ b/deps/openssl/config/archs/linux-armv4/asm/include/openssl/pkcs7.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/pkcs7.h.in * - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -56,8 +56,8 @@ typedef struct pkcs7_signer_info_st { PKCS7_ISSUER_AND_SERIAL *issuer_and_serial; X509_ALGOR *digest_alg; STACK_OF(X509_ATTRIBUTE) *auth_attr; /* [ 0 ] */ - X509_ALGOR *digest_enc_alg; /* confusing name, actually used for signing */ - ASN1_OCTET_STRING *enc_digest; /* confusing name, actually signature */ + X509_ALGOR *digest_enc_alg; + ASN1_OCTET_STRING *enc_digest; STACK_OF(X509_ATTRIBUTE) *unauth_attr; /* [ 1 ] */ /* The private key to sign with */ EVP_PKEY *pkey; diff --git a/deps/openssl/config/archs/linux-armv4/asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux-armv4/asm/include/openssl/ssl.h index 0f1915755..3df725c56 100644 --- a/deps/openssl/config/archs/linux-armv4/asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux-armv4/asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/linux-armv4/asm/openssl.gypi b/deps/openssl/config/archs/linux-armv4/asm/openssl.gypi index 8fd7c43c4..849f58d4b 100644 --- a/deps/openssl/config/archs/linux-armv4/asm/openssl.gypi +++ b/deps/openssl/config/archs/linux-armv4/asm/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cbc.c', 'openssl/crypto/aes/aes_cfb.c', diff --git a/deps/openssl/config/archs/linux-armv4/asm_avx2/configdata.pm b/deps/openssl/config/archs/linux-armv4/asm_avx2/configdata.pm index 76009b2de..dabad628e 100644 --- a/deps/openssl/config/archs/linux-armv4/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/linux-armv4/asm_avx2/configdata.pm @@ -142,7 +142,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -159,7 +159,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.13+quic", + "full_version" => "3.0.9", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -207,7 +207,7 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "13", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "30 Jan 2024", - "shlib_version" => "81.3", + "release_date" => "30 May 2023", + "shlib_version" => "3", "sourcedir" => ".", "target" => "linux-armv4", - "version" => "3.0.13" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -394,7 +394,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -790,9 +789,6 @@ our %unified_info = ( "providers/fips" => { "fips" => "1" }, - "test/p_minimal" => { - "noinst" => "1" - }, "test/p_test" => { "noinst" => "1" } @@ -861,9 +857,6 @@ our %unified_info = ( "test/asn1_internal_test" => { "noinst" => "1" }, - "test/asn1_stable_parse_test" => { - "noinst" => "1" - }, "test/asn1_string_table_test" => { "noinst" => "1" }, @@ -1053,9 +1046,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -1643,9 +1633,6 @@ our %unified_info = ( "SHA256_ASM", "SHA512_ASM" ], - "test/evp_extra_test" => [ - "STATIC_LEGACY" - ], "test/provider_internal_test" => [ "PROVIDER_INIT_FUNCTION_NAME=p_test_init" ], @@ -2399,9 +2386,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -2699,9 +2683,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -3470,9 +3451,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -3767,9 +3745,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -3803,12 +3778,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -4793,9 +4762,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -5093,9 +5059,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -5864,9 +5827,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -6161,9 +6121,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -6197,12 +6154,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -7200,10 +7151,6 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], - "test/asn1_stable_parse_test" => [ - "libcrypto", - "test/libtestutil.a" - ], "test/asn1_string_table_test" => [ "libcrypto", "test/libtestutil.a" @@ -7457,10 +7404,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -7726,8 +7669,6 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "libcrypto.a", - "providers/libcommon.a", - "providers/liblegacy.a", "test/libtestutil.a" ], "test/evp_extra_test2" => [ @@ -9816,7 +9757,6 @@ our %unified_info = ( }, "providers" => { "deps" => [ - "providers/evp_extra_test-bin-legacyprov.o", "providers/libcrypto-lib-baseprov.o", "providers/libcrypto-lib-defltprov.o", "providers/libcrypto-lib-nullprov.o", @@ -9824,9 +9764,6 @@ our %unified_info = ( "providers/libdefault.a" ], "products" => { - "bin" => [ - "test/evp_extra_test" - ], "dso" => [ "providers/fips", "providers/legacy" @@ -10263,7 +10200,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10314,7 +10250,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -11446,9 +11381,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -11746,9 +11678,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -12517,9 +12446,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -12814,9 +12740,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -12850,12 +12773,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -13840,9 +13757,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -14140,9 +14054,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -14911,9 +14822,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -15208,9 +15116,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -15244,12 +15149,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -16278,10 +16177,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16358,9 +16253,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "whrlpool" ], - "test/p_minimal.ld" => [ - "util/providers.num" - ], "test/p_test.ld" => [ "util/providers.num" ], @@ -16526,7 +16418,6 @@ our %unified_info = ( "doc/html/man3/CMS_get1_ReceiptRequest.html", "doc/html/man3/CMS_sign.html", "doc/html/man3/CMS_sign_receipt.html", - "doc/html/man3/CMS_signed_get_attr.html", "doc/html/man3/CMS_uncompress.html", "doc/html/man3/CMS_verify.html", "doc/html/man3/CMS_verify_receipt.html", @@ -16626,7 +16517,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_encapsulate.html", "doc/html/man3/EVP_PKEY_encrypt.html", "doc/html/man3/EVP_PKEY_fromdata.html", - "doc/html/man3/EVP_PKEY_get_attr.html", "doc/html/man3/EVP_PKEY_get_default_digest_nid.html", "doc/html/man3/EVP_PKEY_get_field_type.html", "doc/html/man3/EVP_PKEY_get_group_name.html", @@ -16883,7 +16773,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -16982,7 +16871,6 @@ our %unified_info = ( "doc/html/man3/X509V3_get_d2i.html", "doc/html/man3/X509V3_set_ctx.html", "doc/html/man3/X509_ALGOR_dup.html", - "doc/html/man3/X509_ATTRIBUTE.html", "doc/html/man3/X509_CRL_get0_by_serial.html", "doc/html/man3/X509_EXTENSION_set_object.html", "doc/html/man3/X509_LOOKUP.html", @@ -16994,8 +16882,6 @@ our %unified_info = ( "doc/html/man3/X509_NAME_get_index_by_NID.html", "doc/html/man3/X509_NAME_print_ex.html", "doc/html/man3/X509_PUBKEY_new.html", - "doc/html/man3/X509_REQ_get_attr.html", - "doc/html/man3/X509_REQ_get_extensions.html", "doc/html/man3/X509_SIG_get0.html", "doc/html/man3/X509_STORE_CTX_get_error.html", "doc/html/man3/X509_STORE_CTX_new.html", @@ -18377,10 +18263,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/asn1_stable_parse_test" => [ - "include", - "apps/include" - ], "test/asn1_string_table_test" => [ "include", "apps/include" @@ -18588,9 +18470,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -18850,9 +18729,7 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "include", - "apps/include", - "providers/common/include", - "providers/implementations/include" + "apps/include" ], "test/evp_extra_test2" => [ "include", @@ -19109,10 +18986,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/p_minimal" => [ - "include", - "." - ], "test/p_test" => [ "include", "." @@ -19602,7 +19475,6 @@ our %unified_info = ( "doc/man/man3/CMS_get1_ReceiptRequest.3", "doc/man/man3/CMS_sign.3", "doc/man/man3/CMS_sign_receipt.3", - "doc/man/man3/CMS_signed_get_attr.3", "doc/man/man3/CMS_uncompress.3", "doc/man/man3/CMS_verify.3", "doc/man/man3/CMS_verify_receipt.3", @@ -19702,7 +19574,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_encapsulate.3", "doc/man/man3/EVP_PKEY_encrypt.3", "doc/man/man3/EVP_PKEY_fromdata.3", - "doc/man/man3/EVP_PKEY_get_attr.3", "doc/man/man3/EVP_PKEY_get_default_digest_nid.3", "doc/man/man3/EVP_PKEY_get_field_type.3", "doc/man/man3/EVP_PKEY_get_group_name.3", @@ -19959,7 +19830,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20058,7 +19928,6 @@ our %unified_info = ( "doc/man/man3/X509V3_get_d2i.3", "doc/man/man3/X509V3_set_ctx.3", "doc/man/man3/X509_ALGOR_dup.3", - "doc/man/man3/X509_ATTRIBUTE.3", "doc/man/man3/X509_CRL_get0_by_serial.3", "doc/man/man3/X509_EXTENSION_set_object.3", "doc/man/man3/X509_LOOKUP.3", @@ -20070,8 +19939,6 @@ our %unified_info = ( "doc/man/man3/X509_NAME_get_index_by_NID.3", "doc/man/man3/X509_NAME_print_ex.3", "doc/man/man3/X509_PUBKEY_new.3", - "doc/man/man3/X509_REQ_get_attr.3", - "doc/man/man3/X509_REQ_get_extensions.3", "doc/man/man3/X509_SIG_get0.3", "doc/man/man3/X509_STORE_CTX_get_error.3", "doc/man/man3/X509_STORE_CTX_new.3", @@ -20255,7 +20122,6 @@ our %unified_info = ( "modules" => [ "providers/fips", "providers/legacy", - "test/p_minimal", "test/p_test" ], "programs" => [ @@ -20281,7 +20147,6 @@ our %unified_info = ( "test/asn1_dsa_internal_test", "test/asn1_encode_test", "test/asn1_internal_test", - "test/asn1_stable_parse_test", "test/asn1_string_table_test", "test/asn1_time_test", "test/asynciotest", @@ -20345,7 +20210,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24558,7 +24422,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24585,7 +24448,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -24687,9 +24549,6 @@ our %unified_info = ( "providers/common/libfips-lib-securitycheck_fips.o" => [ "providers/common/securitycheck_fips.c" ], - "providers/evp_extra_test-bin-legacyprov.o" => [ - "providers/legacyprov.c" - ], "providers/fips" => [ "providers/fips.ld", "providers/fips/fips-dso-fips_entry.o" @@ -25838,9 +25697,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25922,9 +25778,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25982,12 +25835,6 @@ our %unified_info = ( "test/asn1_internal_test-bin-asn1_internal_test.o" => [ "test/asn1_internal_test.c" ], - "test/asn1_stable_parse_test" => [ - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" - ], - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" => [ - "test/asn1_stable_parse_test.c" - ], "test/asn1_string_table_test" => [ "test/asn1_string_table_test-bin-asn1_string_table_test.o" ], @@ -26367,12 +26214,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -26771,7 +26612,6 @@ our %unified_info = ( "test/errtest.c" ], "test/evp_extra_test" => [ - "providers/evp_extra_test-bin-legacyprov.o", "test/evp_extra_test-bin-evp_extra_test.o" ], "test/evp_extra_test-bin-evp_extra_test.o" => [ @@ -27062,13 +26902,6 @@ our %unified_info = ( "test/ossl_store_test-bin-ossl_store_test.o" => [ "test/ossl_store_test.c" ], - "test/p_minimal" => [ - "test/p_minimal-dso-p_minimal.o", - "test/p_minimal.ld" - ], - "test/p_minimal-dso-p_minimal.o" => [ - "test/p_minimal.c" - ], "test/p_test" => [ "test/p_test-dso-p_test.o", "test/p_test.ld" @@ -27755,8 +27588,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27783,7 +27616,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27800,8 +27633,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/aes/bsaes-armv7.S b/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/aes/bsaes-armv7.S index 545d7f76c..4b7f66214 100644 --- a/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/aes/bsaes-armv7.S +++ b/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/aes/bsaes-armv7.S @@ -1131,7 +1131,7 @@ ossl_bsaes_cbc_encrypt: vstmia r4, {q7} .align 2 -0: + #endif vld1.8 {q15}, [r8] @ load IV @@ -1391,7 +1391,7 @@ ossl_bsaes_ctr32_encrypt_blocks: vstmia r12, {q7} @ save last round key .align 2 -0: add r12, r3, #248 + add r12, r3, #248 vld1.8 {q0}, [r8] @ load counter add r8, r6, #.LREVM0SR-.LM0 @ borrow r8 vldmia r12, {q4} @ load round0 key @@ -1626,7 +1626,7 @@ ossl_bsaes_xts_encrypt: vstmia r12, {q7} .align 2 -0: sub sp, #0x90 @ place for tweak[9] + sub sp, #0x90 @ place for tweak[9] #endif vld1.8 {q8}, [r0] @ initial tweak @@ -2112,7 +2112,7 @@ ossl_bsaes_xts_decrypt: vstmia r4, {q7} .align 2 -0: sub sp, #0x90 @ place for tweak[9] + sub sp, #0x90 @ place for tweak[9] #endif vld1.8 {q8}, [r0] @ initial tweak adr r2, .Lxts_magic diff --git a/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/buildinf.h index 3c25da4cb..432e345d5 100644 --- a/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-armv4" -#define DATE "built on: Wed Jan 31 13:01:34 2024 UTC" +#define DATE "built on: Tue Aug 6 12:24:27 2024 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-armv4/asm_avx2/include/openssl/bio.h b/deps/openssl/config/archs/linux-armv4/asm_avx2/include/openssl/bio.h index f9aa74731..e16cf622c 100644 --- a/deps/openssl/config/archs/linux-armv4/asm_avx2/include/openssl/bio.h +++ b/deps/openssl/config/archs/linux-armv4/asm_avx2/include/openssl/bio.h @@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, - int (*ossl_gets) (BIO *, char *, int)); + int (*gets) (BIO *, char *, int)); long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); diff --git a/deps/openssl/config/archs/linux-armv4/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/linux-armv4/asm_avx2/include/openssl/opensslv.h index 65f3bfa05..5bb97d596 100644 --- a/deps/openssl/config/archs/linux-armv4/asm_avx2/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux-armv4/asm_avx2/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 13 +# define OPENSSL_VERSION_PATCH 9 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.13" -# define OPENSSL_FULL_VERSION_STR "3.0.13+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "30 Jan 2024" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13+quic 30 Jan 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux-armv4/asm_avx2/include/openssl/pkcs7.h b/deps/openssl/config/archs/linux-armv4/asm_avx2/include/openssl/pkcs7.h index 0ce79bf4f..557a0a726 100644 --- a/deps/openssl/config/archs/linux-armv4/asm_avx2/include/openssl/pkcs7.h +++ b/deps/openssl/config/archs/linux-armv4/asm_avx2/include/openssl/pkcs7.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/pkcs7.h.in * - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -56,8 +56,8 @@ typedef struct pkcs7_signer_info_st { PKCS7_ISSUER_AND_SERIAL *issuer_and_serial; X509_ALGOR *digest_alg; STACK_OF(X509_ATTRIBUTE) *auth_attr; /* [ 0 ] */ - X509_ALGOR *digest_enc_alg; /* confusing name, actually used for signing */ - ASN1_OCTET_STRING *enc_digest; /* confusing name, actually signature */ + X509_ALGOR *digest_enc_alg; + ASN1_OCTET_STRING *enc_digest; STACK_OF(X509_ATTRIBUTE) *unauth_attr; /* [ 1 ] */ /* The private key to sign with */ EVP_PKEY *pkey; diff --git a/deps/openssl/config/archs/linux-armv4/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/linux-armv4/asm_avx2/include/openssl/ssl.h index 0f1915755..3df725c56 100644 --- a/deps/openssl/config/archs/linux-armv4/asm_avx2/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux-armv4/asm_avx2/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/linux-armv4/asm_avx2/openssl.gypi b/deps/openssl/config/archs/linux-armv4/asm_avx2/openssl.gypi index 9b5941454..76181e218 100644 --- a/deps/openssl/config/archs/linux-armv4/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/linux-armv4/asm_avx2/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cbc.c', 'openssl/crypto/aes/aes_cfb.c', diff --git a/deps/openssl/config/archs/linux-armv4/no-asm/configdata.pm b/deps/openssl/config/archs/linux-armv4/no-asm/configdata.pm index 2e34266f4..e7270b30b 100644 --- a/deps/openssl/config/archs/linux-armv4/no-asm/configdata.pm +++ b/deps/openssl/config/archs/linux-armv4/no-asm/configdata.pm @@ -142,7 +142,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [], @@ -157,7 +157,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.13+quic", + "full_version" => "3.0.9", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,7 +206,7 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "13", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "30 Jan 2024", - "shlib_version" => "81.3", + "release_date" => "30 May 2023", + "shlib_version" => "3", "sourcedir" => ".", "target" => "linux-armv4", - "version" => "3.0.13" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -394,7 +394,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -791,9 +790,6 @@ our %unified_info = ( "providers/fips" => { "fips" => "1" }, - "test/p_minimal" => { - "noinst" => "1" - }, "test/p_test" => { "noinst" => "1" } @@ -862,9 +858,6 @@ our %unified_info = ( "test/asn1_internal_test" => { "noinst" => "1" }, - "test/asn1_stable_parse_test" => { - "noinst" => "1" - }, "test/asn1_string_table_test" => { "noinst" => "1" }, @@ -1054,9 +1047,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -1604,9 +1594,6 @@ our %unified_info = ( "providers/libfips.a" => [ "FIPS_MODULE" ], - "test/evp_extra_test" => [ - "STATIC_LEGACY" - ], "test/provider_internal_test" => [ "PROVIDER_INIT_FUNCTION_NAME=p_test_init" ], @@ -2360,9 +2347,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -2660,9 +2644,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -3431,9 +3412,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -3728,9 +3706,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -3764,12 +3739,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -4754,9 +4723,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -5054,9 +5020,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -5825,9 +5788,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -6122,9 +6082,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -6158,12 +6115,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -7161,10 +7112,6 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], - "test/asn1_stable_parse_test" => [ - "libcrypto", - "test/libtestutil.a" - ], "test/asn1_string_table_test" => [ "libcrypto", "test/libtestutil.a" @@ -7418,10 +7365,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -7687,8 +7630,6 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "libcrypto.a", - "providers/libcommon.a", - "providers/liblegacy.a", "test/libtestutil.a" ], "test/evp_extra_test2" => [ @@ -9752,7 +9693,6 @@ our %unified_info = ( }, "providers" => { "deps" => [ - "providers/evp_extra_test-bin-legacyprov.o", "providers/libcrypto-lib-baseprov.o", "providers/libcrypto-lib-defltprov.o", "providers/libcrypto-lib-nullprov.o", @@ -9760,9 +9700,6 @@ our %unified_info = ( "providers/libdefault.a" ], "products" => { - "bin" => [ - "test/evp_extra_test" - ], "dso" => [ "providers/fips", "providers/legacy" @@ -10199,7 +10136,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10250,7 +10186,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -11382,9 +11317,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -11682,9 +11614,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -12453,9 +12382,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -12750,9 +12676,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -12786,12 +12709,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -13776,9 +13693,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -14076,9 +13990,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -14847,9 +14758,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -15144,9 +15052,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -15180,12 +15085,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -16214,10 +16113,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16294,9 +16189,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "whrlpool" ], - "test/p_minimal.ld" => [ - "util/providers.num" - ], "test/p_test.ld" => [ "util/providers.num" ], @@ -16462,7 +16354,6 @@ our %unified_info = ( "doc/html/man3/CMS_get1_ReceiptRequest.html", "doc/html/man3/CMS_sign.html", "doc/html/man3/CMS_sign_receipt.html", - "doc/html/man3/CMS_signed_get_attr.html", "doc/html/man3/CMS_uncompress.html", "doc/html/man3/CMS_verify.html", "doc/html/man3/CMS_verify_receipt.html", @@ -16562,7 +16453,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_encapsulate.html", "doc/html/man3/EVP_PKEY_encrypt.html", "doc/html/man3/EVP_PKEY_fromdata.html", - "doc/html/man3/EVP_PKEY_get_attr.html", "doc/html/man3/EVP_PKEY_get_default_digest_nid.html", "doc/html/man3/EVP_PKEY_get_field_type.html", "doc/html/man3/EVP_PKEY_get_group_name.html", @@ -16819,7 +16709,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -16918,7 +16807,6 @@ our %unified_info = ( "doc/html/man3/X509V3_get_d2i.html", "doc/html/man3/X509V3_set_ctx.html", "doc/html/man3/X509_ALGOR_dup.html", - "doc/html/man3/X509_ATTRIBUTE.html", "doc/html/man3/X509_CRL_get0_by_serial.html", "doc/html/man3/X509_EXTENSION_set_object.html", "doc/html/man3/X509_LOOKUP.html", @@ -16930,8 +16818,6 @@ our %unified_info = ( "doc/html/man3/X509_NAME_get_index_by_NID.html", "doc/html/man3/X509_NAME_print_ex.html", "doc/html/man3/X509_PUBKEY_new.html", - "doc/html/man3/X509_REQ_get_attr.html", - "doc/html/man3/X509_REQ_get_extensions.html", "doc/html/man3/X509_SIG_get0.html", "doc/html/man3/X509_STORE_CTX_get_error.html", "doc/html/man3/X509_STORE_CTX_new.html", @@ -18229,10 +18115,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/asn1_stable_parse_test" => [ - "include", - "apps/include" - ], "test/asn1_string_table_test" => [ "include", "apps/include" @@ -18440,9 +18322,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -18702,9 +18581,7 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "include", - "apps/include", - "providers/common/include", - "providers/implementations/include" + "apps/include" ], "test/evp_extra_test2" => [ "include", @@ -18961,10 +18838,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/p_minimal" => [ - "include", - "." - ], "test/p_test" => [ "include", "." @@ -19454,7 +19327,6 @@ our %unified_info = ( "doc/man/man3/CMS_get1_ReceiptRequest.3", "doc/man/man3/CMS_sign.3", "doc/man/man3/CMS_sign_receipt.3", - "doc/man/man3/CMS_signed_get_attr.3", "doc/man/man3/CMS_uncompress.3", "doc/man/man3/CMS_verify.3", "doc/man/man3/CMS_verify_receipt.3", @@ -19554,7 +19426,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_encapsulate.3", "doc/man/man3/EVP_PKEY_encrypt.3", "doc/man/man3/EVP_PKEY_fromdata.3", - "doc/man/man3/EVP_PKEY_get_attr.3", "doc/man/man3/EVP_PKEY_get_default_digest_nid.3", "doc/man/man3/EVP_PKEY_get_field_type.3", "doc/man/man3/EVP_PKEY_get_group_name.3", @@ -19811,7 +19682,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -19910,7 +19780,6 @@ our %unified_info = ( "doc/man/man3/X509V3_get_d2i.3", "doc/man/man3/X509V3_set_ctx.3", "doc/man/man3/X509_ALGOR_dup.3", - "doc/man/man3/X509_ATTRIBUTE.3", "doc/man/man3/X509_CRL_get0_by_serial.3", "doc/man/man3/X509_EXTENSION_set_object.3", "doc/man/man3/X509_LOOKUP.3", @@ -19922,8 +19791,6 @@ our %unified_info = ( "doc/man/man3/X509_NAME_get_index_by_NID.3", "doc/man/man3/X509_NAME_print_ex.3", "doc/man/man3/X509_PUBKEY_new.3", - "doc/man/man3/X509_REQ_get_attr.3", - "doc/man/man3/X509_REQ_get_extensions.3", "doc/man/man3/X509_SIG_get0.3", "doc/man/man3/X509_STORE_CTX_get_error.3", "doc/man/man3/X509_STORE_CTX_new.3", @@ -20107,7 +19974,6 @@ our %unified_info = ( "modules" => [ "providers/fips", "providers/legacy", - "test/p_minimal", "test/p_test" ], "programs" => [ @@ -20133,7 +19999,6 @@ our %unified_info = ( "test/asn1_dsa_internal_test", "test/asn1_encode_test", "test/asn1_internal_test", - "test/asn1_stable_parse_test", "test/asn1_string_table_test", "test/asn1_time_test", "test/asynciotest", @@ -20197,7 +20062,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24322,7 +24186,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24349,7 +24212,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -24451,9 +24313,6 @@ our %unified_info = ( "providers/common/libfips-lib-securitycheck_fips.o" => [ "providers/common/securitycheck_fips.c" ], - "providers/evp_extra_test-bin-legacyprov.o" => [ - "providers/legacyprov.c" - ], "providers/fips" => [ "providers/fips.ld", "providers/fips/fips-dso-fips_entry.o" @@ -25590,9 +25449,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25674,9 +25530,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25734,12 +25587,6 @@ our %unified_info = ( "test/asn1_internal_test-bin-asn1_internal_test.o" => [ "test/asn1_internal_test.c" ], - "test/asn1_stable_parse_test" => [ - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" - ], - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" => [ - "test/asn1_stable_parse_test.c" - ], "test/asn1_string_table_test" => [ "test/asn1_string_table_test-bin-asn1_string_table_test.o" ], @@ -26119,12 +25966,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -26523,7 +26364,6 @@ our %unified_info = ( "test/errtest.c" ], "test/evp_extra_test" => [ - "providers/evp_extra_test-bin-legacyprov.o", "test/evp_extra_test-bin-evp_extra_test.o" ], "test/evp_extra_test-bin-evp_extra_test.o" => [ @@ -26814,13 +26654,6 @@ our %unified_info = ( "test/ossl_store_test-bin-ossl_store_test.o" => [ "test/ossl_store_test.c" ], - "test/p_minimal" => [ - "test/p_minimal-dso-p_minimal.o", - "test/p_minimal.ld" - ], - "test/p_minimal-dso-p_minimal.o" => [ - "test/p_minimal.c" - ], "test/p_test" => [ "test/p_test-dso-p_test.o", "test/p_test.ld" @@ -27510,8 +27343,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27538,7 +27371,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27555,8 +27388,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux-armv4/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-armv4/no-asm/crypto/buildinf.h index 7a8a7caa4..ff6b951ea 100644 --- a/deps/openssl/config/archs/linux-armv4/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-armv4/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-armv4" -#define DATE "built on: Wed Jan 31 13:01:46 2024 UTC" +#define DATE "built on: Tue Aug 6 12:24:38 2024 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-armv4/no-asm/include/openssl/bio.h b/deps/openssl/config/archs/linux-armv4/no-asm/include/openssl/bio.h index f9aa74731..e16cf622c 100644 --- a/deps/openssl/config/archs/linux-armv4/no-asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/linux-armv4/no-asm/include/openssl/bio.h @@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, - int (*ossl_gets) (BIO *, char *, int)); + int (*gets) (BIO *, char *, int)); long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); diff --git a/deps/openssl/config/archs/linux-armv4/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux-armv4/no-asm/include/openssl/opensslv.h index 65f3bfa05..5bb97d596 100644 --- a/deps/openssl/config/archs/linux-armv4/no-asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux-armv4/no-asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 13 +# define OPENSSL_VERSION_PATCH 9 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.13" -# define OPENSSL_FULL_VERSION_STR "3.0.13+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "30 Jan 2024" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13+quic 30 Jan 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux-armv4/no-asm/include/openssl/pkcs7.h b/deps/openssl/config/archs/linux-armv4/no-asm/include/openssl/pkcs7.h index 0ce79bf4f..557a0a726 100644 --- a/deps/openssl/config/archs/linux-armv4/no-asm/include/openssl/pkcs7.h +++ b/deps/openssl/config/archs/linux-armv4/no-asm/include/openssl/pkcs7.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/pkcs7.h.in * - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -56,8 +56,8 @@ typedef struct pkcs7_signer_info_st { PKCS7_ISSUER_AND_SERIAL *issuer_and_serial; X509_ALGOR *digest_alg; STACK_OF(X509_ATTRIBUTE) *auth_attr; /* [ 0 ] */ - X509_ALGOR *digest_enc_alg; /* confusing name, actually used for signing */ - ASN1_OCTET_STRING *enc_digest; /* confusing name, actually signature */ + X509_ALGOR *digest_enc_alg; + ASN1_OCTET_STRING *enc_digest; STACK_OF(X509_ATTRIBUTE) *unauth_attr; /* [ 1 ] */ /* The private key to sign with */ EVP_PKEY *pkey; diff --git a/deps/openssl/config/archs/linux-armv4/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux-armv4/no-asm/include/openssl/ssl.h index 0f1915755..3df725c56 100644 --- a/deps/openssl/config/archs/linux-armv4/no-asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux-armv4/no-asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/linux-armv4/no-asm/openssl.gypi b/deps/openssl/config/archs/linux-armv4/no-asm/openssl.gypi index cc4efdf7d..6ad73f414 100644 --- a/deps/openssl/config/archs/linux-armv4/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/linux-armv4/no-asm/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cbc.c', 'openssl/crypto/aes/aes_cfb.c', diff --git a/deps/openssl/config/archs/linux-elf/asm/configdata.pm b/deps/openssl/config/archs/linux-elf/asm/configdata.pm index 7892d0e6f..fbfd1dcdc 100644 --- a/deps/openssl/config/archs/linux-elf/asm/configdata.pm +++ b/deps/openssl/config/archs/linux-elf/asm/configdata.pm @@ -142,7 +142,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -159,7 +159,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.13+quic", + "full_version" => "3.0.9", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -207,7 +207,7 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "13", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "30 Jan 2024", - "shlib_version" => "81.3", + "release_date" => "30 May 2023", + "shlib_version" => "3", "sourcedir" => ".", "target" => "linux-elf", - "version" => "3.0.13" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -393,7 +393,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -789,9 +788,6 @@ our %unified_info = ( "providers/fips" => { "fips" => "1" }, - "test/p_minimal" => { - "noinst" => "1" - }, "test/p_test" => { "noinst" => "1" } @@ -860,9 +856,6 @@ our %unified_info = ( "test/asn1_internal_test" => { "noinst" => "1" }, - "test/asn1_stable_parse_test" => { - "noinst" => "1" - }, "test/asn1_string_table_test" => { "noinst" => "1" }, @@ -1052,9 +1045,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -1610,7 +1600,6 @@ our %unified_info = ( "OPENSSL_IA32_SSE2", "PADLOCK_ASM", "POLY1305_ASM", - "RC4_ASM", "RMD160_ASM", "SHA1_ASM", "SHA256_ASM", @@ -1658,11 +1647,7 @@ our %unified_info = ( "VPAES_ASM" ], "providers/liblegacy.a" => [ - "MD5_ASM", - "RC4_ASM" - ], - "test/evp_extra_test" => [ - "STATIC_LEGACY" + "MD5_ASM" ], "test/provider_internal_test" => [ "PROVIDER_INIT_FUNCTION_NAME=p_test_init" @@ -2417,9 +2402,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -2717,9 +2699,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -3488,9 +3467,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -3785,9 +3761,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -3821,12 +3794,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -4811,9 +4778,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -5111,9 +5075,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -5882,9 +5843,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -6179,9 +6137,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -6215,12 +6170,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -7218,10 +7167,6 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], - "test/asn1_stable_parse_test" => [ - "libcrypto", - "test/libtestutil.a" - ], "test/asn1_string_table_test" => [ "libcrypto", "test/libtestutil.a" @@ -7475,10 +7420,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -7744,8 +7685,6 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "libcrypto.a", - "providers/libcommon.a", - "providers/liblegacy.a", "test/libtestutil.a" ], "test/evp_extra_test2" => [ @@ -9831,7 +9770,6 @@ our %unified_info = ( }, "providers" => { "deps" => [ - "providers/evp_extra_test-bin-legacyprov.o", "providers/libcrypto-lib-baseprov.o", "providers/libcrypto-lib-defltprov.o", "providers/libcrypto-lib-nullprov.o", @@ -9839,9 +9777,6 @@ our %unified_info = ( "providers/libdefault.a" ], "products" => { - "bin" => [ - "test/evp_extra_test" - ], "dso" => [ "providers/fips", "providers/legacy" @@ -10278,7 +10213,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10329,7 +10263,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -11461,9 +11394,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -11761,9 +11691,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -12532,9 +12459,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -12829,9 +12753,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -12865,12 +12786,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -13855,9 +13770,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -14155,9 +14067,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -14926,9 +14835,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -15223,9 +15129,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -15259,12 +15162,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -16293,10 +16190,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16373,9 +16266,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "whrlpool" ], - "test/p_minimal.ld" => [ - "util/providers.num" - ], "test/p_test.ld" => [ "util/providers.num" ], @@ -16541,7 +16431,6 @@ our %unified_info = ( "doc/html/man3/CMS_get1_ReceiptRequest.html", "doc/html/man3/CMS_sign.html", "doc/html/man3/CMS_sign_receipt.html", - "doc/html/man3/CMS_signed_get_attr.html", "doc/html/man3/CMS_uncompress.html", "doc/html/man3/CMS_verify.html", "doc/html/man3/CMS_verify_receipt.html", @@ -16641,7 +16530,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_encapsulate.html", "doc/html/man3/EVP_PKEY_encrypt.html", "doc/html/man3/EVP_PKEY_fromdata.html", - "doc/html/man3/EVP_PKEY_get_attr.html", "doc/html/man3/EVP_PKEY_get_default_digest_nid.html", "doc/html/man3/EVP_PKEY_get_field_type.html", "doc/html/man3/EVP_PKEY_get_group_name.html", @@ -16898,7 +16786,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -16997,7 +16884,6 @@ our %unified_info = ( "doc/html/man3/X509V3_get_d2i.html", "doc/html/man3/X509V3_set_ctx.html", "doc/html/man3/X509_ALGOR_dup.html", - "doc/html/man3/X509_ATTRIBUTE.html", "doc/html/man3/X509_CRL_get0_by_serial.html", "doc/html/man3/X509_EXTENSION_set_object.html", "doc/html/man3/X509_LOOKUP.html", @@ -17009,8 +16895,6 @@ our %unified_info = ( "doc/html/man3/X509_NAME_get_index_by_NID.html", "doc/html/man3/X509_NAME_print_ex.html", "doc/html/man3/X509_PUBKEY_new.html", - "doc/html/man3/X509_REQ_get_attr.html", - "doc/html/man3/X509_REQ_get_extensions.html", "doc/html/man3/X509_SIG_get0.html", "doc/html/man3/X509_STORE_CTX_get_error.html", "doc/html/man3/X509_STORE_CTX_new.html", @@ -18308,10 +18192,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/asn1_stable_parse_test" => [ - "include", - "apps/include" - ], "test/asn1_string_table_test" => [ "include", "apps/include" @@ -18519,9 +18399,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -18781,9 +18658,7 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "include", - "apps/include", - "providers/common/include", - "providers/implementations/include" + "apps/include" ], "test/evp_extra_test2" => [ "include", @@ -19040,10 +18915,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/p_minimal" => [ - "include", - "." - ], "test/p_test" => [ "include", "." @@ -19533,7 +19404,6 @@ our %unified_info = ( "doc/man/man3/CMS_get1_ReceiptRequest.3", "doc/man/man3/CMS_sign.3", "doc/man/man3/CMS_sign_receipt.3", - "doc/man/man3/CMS_signed_get_attr.3", "doc/man/man3/CMS_uncompress.3", "doc/man/man3/CMS_verify.3", "doc/man/man3/CMS_verify_receipt.3", @@ -19633,7 +19503,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_encapsulate.3", "doc/man/man3/EVP_PKEY_encrypt.3", "doc/man/man3/EVP_PKEY_fromdata.3", - "doc/man/man3/EVP_PKEY_get_attr.3", "doc/man/man3/EVP_PKEY_get_default_digest_nid.3", "doc/man/man3/EVP_PKEY_get_field_type.3", "doc/man/man3/EVP_PKEY_get_group_name.3", @@ -19890,7 +19759,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -19989,7 +19857,6 @@ our %unified_info = ( "doc/man/man3/X509V3_get_d2i.3", "doc/man/man3/X509V3_set_ctx.3", "doc/man/man3/X509_ALGOR_dup.3", - "doc/man/man3/X509_ATTRIBUTE.3", "doc/man/man3/X509_CRL_get0_by_serial.3", "doc/man/man3/X509_EXTENSION_set_object.3", "doc/man/man3/X509_LOOKUP.3", @@ -20001,8 +19868,6 @@ our %unified_info = ( "doc/man/man3/X509_NAME_get_index_by_NID.3", "doc/man/man3/X509_NAME_print_ex.3", "doc/man/man3/X509_PUBKEY_new.3", - "doc/man/man3/X509_REQ_get_attr.3", - "doc/man/man3/X509_REQ_get_extensions.3", "doc/man/man3/X509_SIG_get0.3", "doc/man/man3/X509_STORE_CTX_get_error.3", "doc/man/man3/X509_STORE_CTX_new.3", @@ -20186,7 +20051,6 @@ our %unified_info = ( "modules" => [ "providers/fips", "providers/legacy", - "test/p_minimal", "test/p_test" ], "programs" => [ @@ -20212,7 +20076,6 @@ our %unified_info = ( "test/asn1_dsa_internal_test", "test/asn1_encode_test", "test/asn1_internal_test", - "test/asn1_stable_parse_test", "test/asn1_string_table_test", "test/asn1_time_test", "test/asynciotest", @@ -20276,7 +20139,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24479,7 +24341,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24506,7 +24367,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -24608,9 +24468,6 @@ our %unified_info = ( "providers/common/libfips-lib-securitycheck_fips.o" => [ "providers/common/securitycheck_fips.c" ], - "providers/evp_extra_test-bin-legacyprov.o" => [ - "providers/legacyprov.c" - ], "providers/fips" => [ "providers/fips.ld", "providers/fips/fips-dso-fips_entry.o" @@ -25757,9 +25614,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25841,9 +25695,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25901,12 +25752,6 @@ our %unified_info = ( "test/asn1_internal_test-bin-asn1_internal_test.o" => [ "test/asn1_internal_test.c" ], - "test/asn1_stable_parse_test" => [ - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" - ], - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" => [ - "test/asn1_stable_parse_test.c" - ], "test/asn1_string_table_test" => [ "test/asn1_string_table_test-bin-asn1_string_table_test.o" ], @@ -26286,12 +26131,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -26690,7 +26529,6 @@ our %unified_info = ( "test/errtest.c" ], "test/evp_extra_test" => [ - "providers/evp_extra_test-bin-legacyprov.o", "test/evp_extra_test-bin-evp_extra_test.o" ], "test/evp_extra_test-bin-evp_extra_test.o" => [ @@ -26981,13 +26819,6 @@ our %unified_info = ( "test/ossl_store_test-bin-ossl_store_test.o" => [ "test/ossl_store_test.c" ], - "test/p_minimal" => [ - "test/p_minimal-dso-p_minimal.o", - "test/p_minimal.ld" - ], - "test/p_minimal-dso-p_minimal.o" => [ - "test/p_minimal.c" - ], "test/p_test" => [ "test/p_test-dso-p_test.o", "test/p_test.ld" @@ -27674,8 +27505,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27702,7 +27533,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27719,8 +27550,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux-elf/asm/crypto/aes/aes-586.S b/deps/openssl/config/archs/linux-elf/asm/crypto/aes/aes-586.S index 628a3b633..9ee3fc9a5 100644 --- a/deps/openssl/config/archs/linux-elf/asm/crypto/aes/aes-586.S +++ b/deps/openssl/config/archs/linux-elf/asm/crypto/aes/aes-586.S @@ -2,10 +2,10 @@ .type _x86_AES_encrypt_compact,@function .align 16 _x86_AES_encrypt_compact: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl %edi,20(%esp) xorl (%edi),%eax @@ -274,10 +274,10 @@ _x86_AES_encrypt_compact: .type _sse_AES_encrypt_compact,@function .align 16 _sse_AES_encrypt_compact: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pxor (%edi),%mm0 pxor 8(%edi),%mm4 @@ -436,10 +436,10 @@ _sse_AES_encrypt_compact: .type _x86_AES_encrypt,@function .align 16 _x86_AES_encrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl %edi,20(%esp) xorl (%edi),%eax @@ -995,10 +995,10 @@ _x86_AES_encrypt: .align 16 AES_encrypt: .L_AES_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1063,10 +1063,10 @@ AES_encrypt: .type _x86_AES_decrypt_compact,@function .align 16 _x86_AES_decrypt_compact: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl %edi,20(%esp) xorl (%edi),%eax @@ -1423,10 +1423,10 @@ _x86_AES_decrypt_compact: .type _sse_AES_decrypt_compact,@function .align 16 _sse_AES_decrypt_compact: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pxor (%edi),%mm0 pxor 8(%edi),%mm4 @@ -1644,10 +1644,10 @@ _sse_AES_decrypt_compact: .type _x86_AES_decrypt,@function .align 16 _x86_AES_decrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl %edi,20(%esp) xorl (%edi),%eax @@ -2207,10 +2207,10 @@ _x86_AES_decrypt: .align 16 AES_decrypt: .L_AES_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2277,10 +2277,10 @@ AES_decrypt: .align 16 AES_cbc_encrypt: .L_AES_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2813,10 +2813,10 @@ AES_cbc_encrypt: .type _x86_AES_set_encrypt_key,@function .align 16 _x86_AES_set_encrypt_key: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3050,10 +3050,10 @@ _x86_AES_set_encrypt_key: .align 16 AES_set_encrypt_key: .L_AES_set_encrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call _x86_AES_set_encrypt_key ret @@ -3063,10 +3063,10 @@ AES_set_encrypt_key: .align 16 AES_set_decrypt_key: .L_AES_set_decrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call _x86_AES_set_encrypt_key cmpl $0,%eax diff --git a/deps/openssl/config/archs/linux-elf/asm/crypto/aes/aesni-x86.S b/deps/openssl/config/archs/linux-elf/asm/crypto/aes/aesni-x86.S index 9191466ee..eb2d01b16 100644 --- a/deps/openssl/config/archs/linux-elf/asm/crypto/aes/aesni-x86.S +++ b/deps/openssl/config/archs/linux-elf/asm/crypto/aes/aesni-x86.S @@ -4,10 +4,10 @@ .align 16 aesni_encrypt: .L_aesni_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 12(%esp),%edx @@ -36,10 +36,10 @@ aesni_encrypt: .align 16 aesni_decrypt: .L_aesni_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 12(%esp),%edx @@ -66,10 +66,10 @@ aesni_decrypt: .type _aesni_encrypt2,@function .align 16 _aesni_encrypt2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -98,10 +98,10 @@ _aesni_encrypt2: .type _aesni_decrypt2,@function .align 16 _aesni_decrypt2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -130,10 +130,10 @@ _aesni_decrypt2: .type _aesni_encrypt3,@function .align 16 _aesni_encrypt3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -167,10 +167,10 @@ _aesni_encrypt3: .type _aesni_decrypt3,@function .align 16 _aesni_decrypt3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -204,10 +204,10 @@ _aesni_decrypt3: .type _aesni_encrypt4,@function .align 16 _aesni_encrypt4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 movups 16(%edx),%xmm1 @@ -247,10 +247,10 @@ _aesni_encrypt4: .type _aesni_decrypt4,@function .align 16 _aesni_decrypt4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 movups 16(%edx),%xmm1 @@ -290,10 +290,10 @@ _aesni_decrypt4: .type _aesni_encrypt6,@function .align 16 _aesni_encrypt6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -349,10 +349,10 @@ _aesni_encrypt6: .type _aesni_decrypt6,@function .align 16 _aesni_decrypt6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -410,10 +410,10 @@ _aesni_decrypt6: .align 16 aesni_ecb_encrypt: .L_aesni_ecb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -650,10 +650,10 @@ aesni_ecb_encrypt: .align 16 aesni_ccm64_encrypt_blocks: .L_aesni_ccm64_encrypt_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -743,10 +743,10 @@ aesni_ccm64_encrypt_blocks: .align 16 aesni_ccm64_decrypt_blocks: .L_aesni_ccm64_decrypt_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -871,10 +871,10 @@ aesni_ccm64_decrypt_blocks: .align 16 aesni_ctr32_encrypt_blocks: .L_aesni_ctr32_encrypt_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1114,10 +1114,10 @@ aesni_ctr32_encrypt_blocks: .align 16 aesni_xts_encrypt: .L_aesni_xts_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1479,10 +1479,10 @@ aesni_xts_encrypt: .align 16 aesni_xts_decrypt: .L_aesni_xts_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1874,10 +1874,10 @@ aesni_xts_decrypt: .align 16 aesni_ocb_encrypt: .L_aesni_ocb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2274,10 +2274,10 @@ aesni_ocb_encrypt: .align 16 aesni_ocb_decrypt: .L_aesni_ocb_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2674,10 +2674,10 @@ aesni_ocb_decrypt: .align 16 aesni_cbc_encrypt: .L_aesni_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2938,10 +2938,10 @@ aesni_cbc_encrypt: .type _aesni_set_encrypt_key,@function .align 16 _aesni_set_encrypt_key: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3278,10 +3278,10 @@ _aesni_set_encrypt_key: .align 16 aesni_set_encrypt_key: .L_aesni_set_encrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 8(%esp),%ecx @@ -3294,10 +3294,10 @@ aesni_set_encrypt_key: .align 16 aesni_set_decrypt_key: .L_aesni_set_decrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 8(%esp),%ecx diff --git a/deps/openssl/config/archs/linux-elf/asm/crypto/aes/vpaes-x86.S b/deps/openssl/config/archs/linux-elf/asm/crypto/aes/vpaes-x86.S index 39d00e772..f3adb7054 100644 --- a/deps/openssl/config/archs/linux-elf/asm/crypto/aes/vpaes-x86.S +++ b/deps/openssl/config/archs/linux-elf/asm/crypto/aes/vpaes-x86.S @@ -59,10 +59,10 @@ .type _vpaes_preheat,@function .align 16 _vpaes_preheat: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif addl (%esp),%ebp movdqa -48(%ebp),%xmm7 @@ -72,10 +72,10 @@ _vpaes_preheat: .type _vpaes_encrypt_core,@function .align 16 _vpaes_encrypt_core: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl $16,%ecx movl 240(%edx),%eax @@ -154,10 +154,10 @@ _vpaes_encrypt_core: .type _vpaes_decrypt_core,@function .align 16 _vpaes_decrypt_core: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif leal 608(%ebp),%ebx movl 240(%edx),%eax @@ -247,10 +247,10 @@ _vpaes_decrypt_core: .type _vpaes_schedule_core,@function .align 16 _vpaes_schedule_core: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif addl (%esp),%ebp movdqu (%esi),%xmm0 @@ -346,10 +346,10 @@ _vpaes_schedule_core: .type _vpaes_schedule_192_smear,@function .align 16 _vpaes_schedule_192_smear: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pshufd $128,%xmm6,%xmm1 pshufd $254,%xmm7,%xmm0 @@ -363,10 +363,10 @@ _vpaes_schedule_192_smear: .type _vpaes_schedule_round,@function .align 16 _vpaes_schedule_round: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movdqa 8(%esp),%xmm2 pxor %xmm1,%xmm1 @@ -417,10 +417,10 @@ _vpaes_schedule_round: .type _vpaes_schedule_transform,@function .align 16 _vpaes_schedule_transform: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movdqa -16(%ebp),%xmm2 movdqa %xmm2,%xmm1 @@ -437,10 +437,10 @@ _vpaes_schedule_transform: .type _vpaes_schedule_mangle,@function .align 16 _vpaes_schedule_mangle: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movdqa %xmm0,%xmm4 movdqa 128(%ebp),%xmm5 @@ -503,10 +503,10 @@ _vpaes_schedule_mangle: .align 16 vpaes_set_encrypt_key: .L_vpaes_set_encrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -541,10 +541,10 @@ vpaes_set_encrypt_key: .align 16 vpaes_set_decrypt_key: .L_vpaes_set_decrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -584,10 +584,10 @@ vpaes_set_decrypt_key: .align 16 vpaes_encrypt: .L_vpaes_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -618,10 +618,10 @@ vpaes_encrypt: .align 16 vpaes_decrypt: .L_vpaes_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -652,10 +652,10 @@ vpaes_decrypt: .align 16 vpaes_cbc_encrypt: .L_vpaes_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/linux-elf/asm/crypto/bf/bf-586.S b/deps/openssl/config/archs/linux-elf/asm/crypto/bf/bf-586.S index a3ff8edf8..801b28d56 100644 --- a/deps/openssl/config/archs/linux-elf/asm/crypto/bf/bf-586.S +++ b/deps/openssl/config/archs/linux-elf/asm/crypto/bf/bf-586.S @@ -4,10 +4,10 @@ .align 16 BF_encrypt: .L_BF_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -359,10 +359,10 @@ BF_encrypt: .align 16 BF_decrypt: .L_BF_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -714,10 +714,10 @@ BF_decrypt: .align 16 BF_cbc_encrypt: .L_BF_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -782,55 +782,55 @@ BF_cbc_encrypt: xorl %edx,%edx jmp *%ebp .L006ej7: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 6(%esi),%dh shll $8,%edx .L007ej6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 5(%esi),%dh .L008ej5: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 4(%esi),%dl .L009ej4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%ecx jmp .L010ejend .L011ej3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 2(%esi),%ch shll $8,%ecx .L012ej2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 1(%esi),%ch .L013ej1: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb (%esi),%cl .L010ejend: diff --git a/deps/openssl/config/archs/linux-elf/asm/crypto/bn/bn-586.S b/deps/openssl/config/archs/linux-elf/asm/crypto/bn/bn-586.S index 2495ae694..a74e6470b 100644 --- a/deps/openssl/config/archs/linux-elf/asm/crypto/bn/bn-586.S +++ b/deps/openssl/config/archs/linux-elf/asm/crypto/bn/bn-586.S @@ -4,10 +4,10 @@ .align 16 bn_mul_add_words: .L_bn_mul_add_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call .L000PIC_me_up .L000PIC_me_up: @@ -292,10 +292,10 @@ bn_mul_add_words: .align 16 bn_mul_words: .L_bn_mul_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call .L010PIC_me_up .L010PIC_me_up: @@ -479,10 +479,10 @@ bn_mul_words: .align 16 bn_sqr_words: .L_bn_sqr_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call .L017PIC_me_up .L017PIC_me_up: @@ -625,10 +625,10 @@ bn_sqr_words: .align 16 bn_div_words: .L_bn_div_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%eax @@ -641,10 +641,10 @@ bn_div_words: .align 16 bn_add_words: .L_bn_add_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -828,10 +828,10 @@ bn_add_words: .align 16 bn_sub_words: .L_bn_sub_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1015,10 +1015,10 @@ bn_sub_words: .align 16 bn_sub_part_words: .L_bn_sub_part_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/linux-elf/asm/crypto/bn/co-586.S b/deps/openssl/config/archs/linux-elf/asm/crypto/bn/co-586.S index 9a9045539..bc8cd2888 100644 --- a/deps/openssl/config/archs/linux-elf/asm/crypto/bn/co-586.S +++ b/deps/openssl/config/archs/linux-elf/asm/crypto/bn/co-586.S @@ -4,10 +4,10 @@ .align 16 bn_mul_comba8: .L_bn_mul_comba8_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi movl 12(%esp),%esi @@ -553,10 +553,10 @@ bn_mul_comba8: .align 16 bn_mul_comba4: .L_bn_mul_comba4_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi movl 12(%esp),%esi @@ -726,10 +726,10 @@ bn_mul_comba4: .align 16 bn_sqr_comba8: .L_bn_sqr_comba8_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi @@ -1139,10 +1139,10 @@ bn_sqr_comba8: .align 16 bn_sqr_comba4: .L_bn_sqr_comba4_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi diff --git a/deps/openssl/config/archs/linux-elf/asm/crypto/bn/x86-gf2m.S b/deps/openssl/config/archs/linux-elf/asm/crypto/bn/x86-gf2m.S index fcb54e967..b784b7cbe 100644 --- a/deps/openssl/config/archs/linux-elf/asm/crypto/bn/x86-gf2m.S +++ b/deps/openssl/config/archs/linux-elf/asm/crypto/bn/x86-gf2m.S @@ -2,10 +2,10 @@ .type _mul_1x1_mmx,@function .align 16 _mul_1x1_mmx: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif subl $36,%esp movl %eax,%ecx @@ -110,10 +110,10 @@ _mul_1x1_mmx: .type _mul_1x1_ialu,@function .align 16 _mul_1x1_ialu: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif subl $36,%esp movl %eax,%ecx @@ -249,10 +249,10 @@ _mul_1x1_ialu: .align 16 bn_GF2m_mul_2x2: .L_bn_GF2m_mul_2x2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call .L000PIC_me_up .L000PIC_me_up: diff --git a/deps/openssl/config/archs/linux-elf/asm/crypto/bn/x86-mont.S b/deps/openssl/config/archs/linux-elf/asm/crypto/bn/x86-mont.S index 7dddbf7d8..5d8a4c6cb 100644 --- a/deps/openssl/config/archs/linux-elf/asm/crypto/bn/x86-mont.S +++ b/deps/openssl/config/archs/linux-elf/asm/crypto/bn/x86-mont.S @@ -4,10 +4,10 @@ .align 16 bn_mul_mont: .L_bn_mul_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/linux-elf/asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-elf/asm/crypto/buildinf.h index 96090e047..f7ee48e82 100644 --- a/deps/openssl/config/archs/linux-elf/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-elf/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-elf" -#define DATE "built on: Wed Jan 31 13:01:58 2024 UTC" +#define DATE "built on: Tue Aug 6 12:24:49 2024 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-elf/asm/crypto/camellia/cmll-x86.S b/deps/openssl/config/archs/linux-elf/asm/crypto/camellia/cmll-x86.S index bcbaf49e0..f4b77edc3 100644 --- a/deps/openssl/config/archs/linux-elf/asm/crypto/camellia/cmll-x86.S +++ b/deps/openssl/config/archs/linux-elf/asm/crypto/camellia/cmll-x86.S @@ -4,10 +4,10 @@ .align 16 Camellia_EncryptBlock_Rounds: .L_Camellia_EncryptBlock_Rounds_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -63,10 +63,10 @@ Camellia_EncryptBlock_Rounds: .align 16 Camellia_EncryptBlock: .L_Camellia_EncryptBlock_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl $128,%eax subl 4(%esp),%eax @@ -80,10 +80,10 @@ Camellia_EncryptBlock: .align 16 Camellia_encrypt: .L_Camellia_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -137,10 +137,10 @@ Camellia_encrypt: .type _x86_Camellia_encrypt,@function .align 16 _x86_Camellia_encrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif xorl (%edi),%eax xorl 4(%edi),%ebx @@ -372,10 +372,10 @@ _x86_Camellia_encrypt: .align 16 Camellia_DecryptBlock_Rounds: .L_Camellia_DecryptBlock_Rounds_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -431,10 +431,10 @@ Camellia_DecryptBlock_Rounds: .align 16 Camellia_DecryptBlock: .L_Camellia_DecryptBlock_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl $128,%eax subl 4(%esp),%eax @@ -448,10 +448,10 @@ Camellia_DecryptBlock: .align 16 Camellia_decrypt: .L_Camellia_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -505,10 +505,10 @@ Camellia_decrypt: .type _x86_Camellia_decrypt,@function .align 16 _x86_Camellia_decrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif xorl (%edi),%eax xorl 4(%edi),%ebx @@ -740,10 +740,10 @@ _x86_Camellia_decrypt: .align 16 Camellia_Ekeygen: .L_Camellia_Ekeygen_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1586,10 +1586,10 @@ Camellia_Ekeygen: .align 16 Camellia_set_key: .L_Camellia_set_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebx movl 8(%esp),%ecx @@ -2143,10 +2143,10 @@ Camellia_set_key: .align 16 Camellia_cbc_encrypt: .L_Camellia_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/linux-elf/asm/crypto/chacha/chacha-x86.S b/deps/openssl/config/archs/linux-elf/asm/crypto/chacha/chacha-x86.S index 9cc4027c7..ec98cb32f 100644 --- a/deps/openssl/config/archs/linux-elf/asm/crypto/chacha/chacha-x86.S +++ b/deps/openssl/config/archs/linux-elf/asm/crypto/chacha/chacha-x86.S @@ -4,10 +4,10 @@ .align 16 ChaCha20_ctr32: .L_ChaCha20_ctr32_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -382,10 +382,10 @@ ChaCha20_ctr32: .align 16 ChaCha20_ssse3: .L_ChaCha20_ssse3_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -979,10 +979,10 @@ ChaCha20_ssse3: .align 16 ChaCha20_xop: .L_ChaCha20_xop_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/linux-elf/asm/crypto/des/crypt586.S b/deps/openssl/config/archs/linux-elf/asm/crypto/des/crypt586.S index ac4b251ec..29ba0fa70 100644 --- a/deps/openssl/config/archs/linux-elf/asm/crypto/des/crypt586.S +++ b/deps/openssl/config/archs/linux-elf/asm/crypto/des/crypt586.S @@ -4,10 +4,10 @@ .align 16 fcrypt_body: .L_fcrypt_body_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/linux-elf/asm/crypto/des/des-586.S b/deps/openssl/config/archs/linux-elf/asm/crypto/des/des-586.S index 90449e4fa..b3839fa88 100644 --- a/deps/openssl/config/archs/linux-elf/asm/crypto/des/des-586.S +++ b/deps/openssl/config/archs/linux-elf/asm/crypto/des/des-586.S @@ -3,10 +3,10 @@ .type _x86_DES_encrypt,@function .align 16 _x86_DES_encrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ecx @@ -479,10 +479,10 @@ _x86_DES_encrypt: .type _x86_DES_decrypt,@function .align 16 _x86_DES_decrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ecx @@ -957,10 +957,10 @@ _x86_DES_decrypt: .align 16 DES_encrypt1: .L_DES_encrypt1_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi @@ -1075,10 +1075,10 @@ DES_encrypt1: .align 16 DES_encrypt2: .L_DES_encrypt2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi @@ -1123,10 +1123,10 @@ DES_encrypt2: .align 16 DES_encrypt3: .L_DES_encrypt3_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebx movl 8(%esp),%ebx @@ -1249,10 +1249,10 @@ DES_encrypt3: .align 16 DES_decrypt3: .L_DES_decrypt3_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebx movl 8(%esp),%ebx @@ -1375,10 +1375,10 @@ DES_decrypt3: .align 16 DES_ncbc_encrypt: .L_DES_ncbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -1441,55 +1441,55 @@ DES_ncbc_encrypt: xorl %edx,%edx jmp *%ebp .L012ej7: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 6(%esi),%dh shll $8,%edx .L013ej6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 5(%esi),%dh .L014ej5: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 4(%esi),%dl .L015ej4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%ecx jmp .L016ejend .L017ej3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 2(%esi),%ch shll $8,%ecx .L018ej2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 1(%esi),%ch .L019ej1: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb (%esi),%cl .L016ejend: @@ -1595,10 +1595,10 @@ DES_ncbc_encrypt: .align 16 DES_ede3_cbc_encrypt: .L_DES_ede3_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -1665,55 +1665,55 @@ DES_ede3_cbc_encrypt: xorl %edx,%edx jmp *%ebp .L036ej7: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 6(%esi),%dh shll $8,%edx .L037ej6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 5(%esi),%dh .L038ej5: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 4(%esi),%dl .L039ej4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%ecx jmp .L040ejend .L041ej3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 2(%esi),%ch shll $8,%ecx .L042ej2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 1(%esi),%ch .L043ej1: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb (%esi),%cl .L040ejend: diff --git a/deps/openssl/config/archs/linux-elf/asm/crypto/ec/ecp_nistz256-x86.S b/deps/openssl/config/archs/linux-elf/asm/crypto/ec/ecp_nistz256-x86.S index 4e17d5eb8..f822079f8 100644 --- a/deps/openssl/config/archs/linux-elf/asm/crypto/ec/ecp_nistz256-x86.S +++ b/deps/openssl/config/archs/linux-elf/asm/crypto/ec/ecp_nistz256-x86.S @@ -2387,10 +2387,10 @@ ecp_nistz256_precomputed: .align 16 ecp_nistz256_mul_by_2: .L_ecp_nistz256_mul_by_2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2411,10 +2411,10 @@ ecp_nistz256_mul_by_2: .align 16 ecp_nistz256_mul_by_3: .L_ecp_nistz256_mul_by_3_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2441,10 +2441,10 @@ ecp_nistz256_mul_by_3: .align 16 ecp_nistz256_div_by_2: .L_ecp_nistz256_div_by_2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2462,10 +2462,10 @@ ecp_nistz256_div_by_2: .type _ecp_nistz256_div_by_2,@function .align 16 _ecp_nistz256_div_by_2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%ebp xorl %edx,%edx @@ -2550,10 +2550,10 @@ _ecp_nistz256_div_by_2: .align 16 ecp_nistz256_add: .L_ecp_nistz256_add_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2572,10 +2572,10 @@ ecp_nistz256_add: .type _ecp_nistz256_add,@function .align 16 _ecp_nistz256_add: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%eax movl 4(%esi),%ebx @@ -2654,10 +2654,10 @@ _ecp_nistz256_add: .align 16 ecp_nistz256_sub: .L_ecp_nistz256_sub_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2676,10 +2676,10 @@ ecp_nistz256_sub: .type _ecp_nistz256_sub,@function .align 16 _ecp_nistz256_sub: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%eax movl 4(%esi),%ebx @@ -2739,10 +2739,10 @@ _ecp_nistz256_sub: .align 16 ecp_nistz256_neg: .L_ecp_nistz256_neg_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2772,10 +2772,10 @@ ecp_nistz256_neg: .type _picup_eax,@function .align 16 _picup_eax: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esp),%eax ret @@ -2785,10 +2785,10 @@ _picup_eax: .align 16 ecp_nistz256_to_mont: .L_ecp_nistz256_to_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2813,10 +2813,10 @@ ecp_nistz256_to_mont: .align 16 ecp_nistz256_from_mont: .L_ecp_nistz256_from_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2841,10 +2841,10 @@ ecp_nistz256_from_mont: .align 16 ecp_nistz256_mul_mont: .L_ecp_nistz256_mul_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2869,10 +2869,10 @@ ecp_nistz256_mul_mont: .align 16 ecp_nistz256_sqr_mont: .L_ecp_nistz256_sqr_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2895,10 +2895,10 @@ ecp_nistz256_sqr_mont: .type _ecp_nistz256_mul_mont,@function .align 16 _ecp_nistz256_mul_mont: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif andl $83886080,%eax cmpl $83886080,%eax @@ -3797,10 +3797,10 @@ _ecp_nistz256_mul_mont: .align 16 ecp_nistz256_scatter_w5: .L_ecp_nistz256_scatter_w5_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3835,10 +3835,10 @@ ecp_nistz256_scatter_w5: .align 16 ecp_nistz256_gather_w5: .L_ecp_nistz256_gather_w5_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3934,10 +3934,10 @@ ecp_nistz256_gather_w5: .align 16 ecp_nistz256_scatter_w7: .L_ecp_nistz256_scatter_w7_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3970,10 +3970,10 @@ ecp_nistz256_scatter_w7: .align 16 ecp_nistz256_gather_w7: .L_ecp_nistz256_gather_w7_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -4189,10 +4189,10 @@ ecp_nistz256_gather_w7: .align 16 ecp_nistz256_point_double: .L_ecp_nistz256_point_double_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -4320,10 +4320,10 @@ ecp_nistz256_point_double: .align 16 ecp_nistz256_point_add: .L_ecp_nistz256_point_add_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -4838,10 +4838,10 @@ ecp_nistz256_point_add: .align 16 ecp_nistz256_point_add_affine: .L_ecp_nistz256_point_add_affine_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/linux-elf/asm/crypto/md5/md5-586.S b/deps/openssl/config/archs/linux-elf/asm/crypto/md5/md5-586.S index 33c01af67..7e96dc647 100644 --- a/deps/openssl/config/archs/linux-elf/asm/crypto/md5/md5-586.S +++ b/deps/openssl/config/archs/linux-elf/asm/crypto/md5/md5-586.S @@ -4,10 +4,10 @@ .align 16 ossl_md5_block_asm_data_order: .L_ossl_md5_block_asm_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi diff --git a/deps/openssl/config/archs/linux-elf/asm/crypto/modes/ghash-x86.S b/deps/openssl/config/archs/linux-elf/asm/crypto/modes/ghash-x86.S index dd80e32c5..9b3361acd 100644 --- a/deps/openssl/config/archs/linux-elf/asm/crypto/modes/ghash-x86.S +++ b/deps/openssl/config/archs/linux-elf/asm/crypto/modes/ghash-x86.S @@ -4,10 +4,10 @@ .align 16 gcm_gmult_4bit_x86: .L_gcm_gmult_4bit_x86_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -103,10 +103,10 @@ gcm_gmult_4bit_x86: .align 16 gcm_ghash_4bit_x86: .L_gcm_ghash_4bit_x86_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -217,10 +217,10 @@ gcm_ghash_4bit_x86: .align 16 gcm_gmult_4bit_mmx: .L_gcm_gmult_4bit_mmx_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -321,10 +321,10 @@ gcm_gmult_4bit_mmx: .align 16 gcm_ghash_4bit_mmx: .L_gcm_ghash_4bit_mmx_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -930,10 +930,10 @@ gcm_ghash_4bit_mmx: .align 16 gcm_init_clmul: .L_gcm_init_clmul_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%eax @@ -1004,10 +1004,10 @@ gcm_init_clmul: .align 16 gcm_gmult_clmul: .L_gcm_gmult_clmul_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 8(%esp),%edx @@ -1062,10 +1062,10 @@ gcm_gmult_clmul: .align 16 gcm_ghash_clmul: .L_gcm_ghash_clmul_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/linux-elf/asm/crypto/poly1305/poly1305-x86.S b/deps/openssl/config/archs/linux-elf/asm/crypto/poly1305/poly1305-x86.S index f95649fae..e76632cd1 100644 --- a/deps/openssl/config/archs/linux-elf/asm/crypto/poly1305/poly1305-x86.S +++ b/deps/openssl/config/archs/linux-elf/asm/crypto/poly1305/poly1305-x86.S @@ -5,10 +5,10 @@ .align 16 poly1305_init: .L_poly1305_init_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -71,10 +71,10 @@ poly1305_init: .align 16 poly1305_blocks: .L_poly1305_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -244,10 +244,10 @@ poly1305_blocks: .align 16 poly1305_emit: .L_poly1305_emit_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -308,10 +308,10 @@ poly1305_emit: .type _poly1305_init_sse2,@function .align 16 _poly1305_init_sse2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movdqu 24(%edi),%xmm4 leal 48(%edi),%edi @@ -515,10 +515,10 @@ _poly1305_init_sse2: .type _poly1305_blocks_sse2,@function .align 16 _poly1305_blocks_sse2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1281,10 +1281,10 @@ _poly1305_blocks_sse2: .type _poly1305_emit_sse2,@function .align 16 _poly1305_emit_sse2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1379,10 +1379,10 @@ _poly1305_emit_sse2: .type _poly1305_init_avx2,@function .align 16 _poly1305_init_avx2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif vmovdqu 24(%edi),%xmm4 leal 48(%edi),%edi @@ -1555,10 +1555,10 @@ _poly1305_init_avx2: .type _poly1305_blocks_avx2,@function .align 16 _poly1305_blocks_avx2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/linux-elf/asm/crypto/rc4/rc4-586.S b/deps/openssl/config/archs/linux-elf/asm/crypto/rc4/rc4-586.S index da909a31e..a10b047a7 100644 --- a/deps/openssl/config/archs/linux-elf/asm/crypto/rc4/rc4-586.S +++ b/deps/openssl/config/archs/linux-elf/asm/crypto/rc4/rc4-586.S @@ -4,10 +4,10 @@ .align 16 RC4: .L_RC4_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -275,10 +275,10 @@ RC4: .align 16 RC4_set_key: .L_RC4_set_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -358,10 +358,10 @@ RC4_set_key: .align 16 RC4_options: .L_RC4_options_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call .L018pic_point .L018pic_point: diff --git a/deps/openssl/config/archs/linux-elf/asm/crypto/ripemd/rmd-586.S b/deps/openssl/config/archs/linux-elf/asm/crypto/ripemd/rmd-586.S index 57b95af6d..4f3ea459c 100644 --- a/deps/openssl/config/archs/linux-elf/asm/crypto/ripemd/rmd-586.S +++ b/deps/openssl/config/archs/linux-elf/asm/crypto/ripemd/rmd-586.S @@ -4,10 +4,10 @@ .align 16 ripemd160_block_asm_data_order: .L_ripemd160_block_asm_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%eax diff --git a/deps/openssl/config/archs/linux-elf/asm/crypto/sha/sha1-586.S b/deps/openssl/config/archs/linux-elf/asm/crypto/sha/sha1-586.S index ddc85b3d8..4b60a71ee 100644 --- a/deps/openssl/config/archs/linux-elf/asm/crypto/sha/sha1-586.S +++ b/deps/openssl/config/archs/linux-elf/asm/crypto/sha/sha1-586.S @@ -4,10 +4,10 @@ .align 16 sha1_block_data_order: .L_sha1_block_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1403,10 +1403,10 @@ sha1_block_data_order: .type _sha1_block_data_order_shaext,@function .align 16 _sha1_block_data_order_shaext: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1578,10 +1578,10 @@ _sha1_block_data_order_shaext: .type _sha1_block_data_order_ssse3,@function .align 16 _sha1_block_data_order_ssse3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2802,10 +2802,10 @@ _sha1_block_data_order_ssse3: .type _sha1_block_data_order_avx,@function .align 16 _sha1_block_data_order_avx: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/linux-elf/asm/crypto/sha/sha256-586.S b/deps/openssl/config/archs/linux-elf/asm/crypto/sha/sha256-586.S index 9436ca5e1..c8599bd58 100644 --- a/deps/openssl/config/archs/linux-elf/asm/crypto/sha/sha256-586.S +++ b/deps/openssl/config/archs/linux-elf/asm/crypto/sha/sha256-586.S @@ -4,10 +4,10 @@ .align 16 sha256_block_data_order: .L_sha256_block_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/linux-elf/asm/crypto/sha/sha512-586.S b/deps/openssl/config/archs/linux-elf/asm/crypto/sha/sha512-586.S index c7cf815b4..99d198dd9 100644 --- a/deps/openssl/config/archs/linux-elf/asm/crypto/sha/sha512-586.S +++ b/deps/openssl/config/archs/linux-elf/asm/crypto/sha/sha512-586.S @@ -4,10 +4,10 @@ .align 16 sha512_block_data_order: .L_sha512_block_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/linux-elf/asm/crypto/whrlpool/wp-mmx.S b/deps/openssl/config/archs/linux-elf/asm/crypto/whrlpool/wp-mmx.S index 9fb9ca1e4..ee571f645 100644 --- a/deps/openssl/config/archs/linux-elf/asm/crypto/whrlpool/wp-mmx.S +++ b/deps/openssl/config/archs/linux-elf/asm/crypto/whrlpool/wp-mmx.S @@ -4,10 +4,10 @@ .align 16 whirlpool_block_mmx: .L_whirlpool_block_mmx_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/linux-elf/asm/crypto/x86cpuid.S b/deps/openssl/config/archs/linux-elf/asm/crypto/x86cpuid.S index eedacacfe..d4f2ec09e 100644 --- a/deps/openssl/config/archs/linux-elf/asm/crypto/x86cpuid.S +++ b/deps/openssl/config/archs/linux-elf/asm/crypto/x86cpuid.S @@ -4,10 +4,10 @@ .align 16 OPENSSL_ia32_cpuid: .L_OPENSSL_ia32_cpuid_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -153,10 +153,10 @@ OPENSSL_ia32_cpuid: .align 16 OPENSSL_rdtsc: .L_OPENSSL_rdtsc_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif xorl %eax,%eax xorl %edx,%edx @@ -175,10 +175,10 @@ OPENSSL_rdtsc: .align 16 OPENSSL_instrument_halt: .L_OPENSSL_instrument_halt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call .L011PIC_me_up .L011PIC_me_up: @@ -212,10 +212,10 @@ OPENSSL_instrument_halt: .align 16 OPENSSL_far_spin: .L_OPENSSL_far_spin_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushfl popl %eax @@ -244,10 +244,10 @@ OPENSSL_far_spin: .align 16 OPENSSL_wipe_cpu: .L_OPENSSL_wipe_cpu_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif xorl %eax,%eax xorl %edx,%edx @@ -280,10 +280,10 @@ OPENSSL_wipe_cpu: .align 16 OPENSSL_atomic_add: .L_OPENSSL_atomic_add_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%ecx @@ -304,10 +304,10 @@ OPENSSL_atomic_add: .align 16 OPENSSL_cleanse: .L_OPENSSL_cleanse_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%ecx @@ -346,10 +346,10 @@ OPENSSL_cleanse: .align 16 CRYPTO_memcmp: .L_CRYPTO_memcmp_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi @@ -380,10 +380,10 @@ CRYPTO_memcmp: .align 16 OPENSSL_instrument_bus: .L_OPENSSL_instrument_bus_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -433,10 +433,10 @@ OPENSSL_instrument_bus: .align 16 OPENSSL_instrument_bus2: .L_OPENSSL_instrument_bus2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -499,10 +499,10 @@ OPENSSL_instrument_bus2: .align 16 OPENSSL_ia32_rdrand_bytes: .L_OPENSSL_ia32_rdrand_bytes_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %ebx @@ -547,10 +547,10 @@ OPENSSL_ia32_rdrand_bytes: .align 16 OPENSSL_ia32_rdseed_bytes: .L_OPENSSL_ia32_rdseed_bytes_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %ebx diff --git a/deps/openssl/config/archs/linux-elf/asm/engines/e_padlock-x86.S b/deps/openssl/config/archs/linux-elf/asm/engines/e_padlock-x86.S index 81e4ec050..cea65eba3 100644 --- a/deps/openssl/config/archs/linux-elf/asm/engines/e_padlock-x86.S +++ b/deps/openssl/config/archs/linux-elf/asm/engines/e_padlock-x86.S @@ -4,10 +4,10 @@ .align 16 padlock_capability: .L_padlock_capability_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebx pushfl @@ -69,10 +69,10 @@ padlock_capability: .align 16 padlock_key_bswap: .L_padlock_key_bswap_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 240(%edx),%ecx @@ -92,10 +92,10 @@ padlock_key_bswap: .align 16 padlock_verify_context: .L_padlock_verify_context_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx leal .Lpadlock_saved_context-.L004verify_pic_point,%eax @@ -108,10 +108,10 @@ padlock_verify_context: .type _padlock_verify_ctx,@function .align 16 _padlock_verify_ctx: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif addl (%esp),%eax btl $30,4(%esp) @@ -129,10 +129,10 @@ _padlock_verify_ctx: .align 16 padlock_reload_key: .L_padlock_reload_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushfl popfl @@ -143,10 +143,10 @@ padlock_reload_key: .align 16 padlock_aes_block: .L_padlock_aes_block_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -168,10 +168,10 @@ padlock_aes_block: .align 16 padlock_ecb_encrypt: .L_padlock_ecb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -352,10 +352,10 @@ padlock_ecb_encrypt: .align 16 padlock_cbc_encrypt: .L_padlock_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -540,10 +540,10 @@ padlock_cbc_encrypt: .align 16 padlock_cfb_encrypt: .L_padlock_cfb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -667,10 +667,10 @@ padlock_cfb_encrypt: .align 16 padlock_ofb_encrypt: .L_padlock_ofb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -794,10 +794,10 @@ padlock_ofb_encrypt: .align 16 padlock_ctr32_encrypt: .L_padlock_ctr32_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -906,10 +906,10 @@ padlock_ctr32_encrypt: .align 16 padlock_xstore: .L_padlock_xstore_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi movl 8(%esp),%edi @@ -921,10 +921,10 @@ padlock_xstore: .type _win32_segv_handler,@function .align 16 _win32_segv_handler: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl $1,%eax movl 4(%esp),%edx @@ -941,10 +941,10 @@ _win32_segv_handler: .align 16 padlock_sha1_oneshot: .L_padlock_sha1_oneshot_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -977,10 +977,10 @@ padlock_sha1_oneshot: .align 16 padlock_sha1_blocks: .L_padlock_sha1_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -1012,10 +1012,10 @@ padlock_sha1_blocks: .align 16 padlock_sha256_oneshot: .L_padlock_sha256_oneshot_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -1048,10 +1048,10 @@ padlock_sha256_oneshot: .align 16 padlock_sha256_blocks: .L_padlock_sha256_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -1083,10 +1083,10 @@ padlock_sha256_blocks: .align 16 padlock_sha512_blocks: .L_padlock_sha512_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi diff --git a/deps/openssl/config/archs/linux-elf/asm/include/openssl/bio.h b/deps/openssl/config/archs/linux-elf/asm/include/openssl/bio.h index f9aa74731..e16cf622c 100644 --- a/deps/openssl/config/archs/linux-elf/asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/linux-elf/asm/include/openssl/bio.h @@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, - int (*ossl_gets) (BIO *, char *, int)); + int (*gets) (BIO *, char *, int)); long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); diff --git a/deps/openssl/config/archs/linux-elf/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux-elf/asm/include/openssl/opensslv.h index 65f3bfa05..5bb97d596 100644 --- a/deps/openssl/config/archs/linux-elf/asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux-elf/asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 13 +# define OPENSSL_VERSION_PATCH 9 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.13" -# define OPENSSL_FULL_VERSION_STR "3.0.13+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "30 Jan 2024" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13+quic 30 Jan 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux-elf/asm/include/openssl/pkcs7.h b/deps/openssl/config/archs/linux-elf/asm/include/openssl/pkcs7.h index 0ce79bf4f..557a0a726 100644 --- a/deps/openssl/config/archs/linux-elf/asm/include/openssl/pkcs7.h +++ b/deps/openssl/config/archs/linux-elf/asm/include/openssl/pkcs7.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/pkcs7.h.in * - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -56,8 +56,8 @@ typedef struct pkcs7_signer_info_st { PKCS7_ISSUER_AND_SERIAL *issuer_and_serial; X509_ALGOR *digest_alg; STACK_OF(X509_ATTRIBUTE) *auth_attr; /* [ 0 ] */ - X509_ALGOR *digest_enc_alg; /* confusing name, actually used for signing */ - ASN1_OCTET_STRING *enc_digest; /* confusing name, actually signature */ + X509_ALGOR *digest_enc_alg; + ASN1_OCTET_STRING *enc_digest; STACK_OF(X509_ATTRIBUTE) *unauth_attr; /* [ 1 ] */ /* The private key to sign with */ EVP_PKEY *pkey; diff --git a/deps/openssl/config/archs/linux-elf/asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux-elf/asm/include/openssl/ssl.h index 0f1915755..3df725c56 100644 --- a/deps/openssl/config/archs/linux-elf/asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux-elf/asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/linux-elf/asm/openssl-cl.gypi b/deps/openssl/config/archs/linux-elf/asm/openssl-cl.gypi index 8f021d5c2..412214ff0 100644 --- a/deps/openssl/config/archs/linux-elf/asm/openssl-cl.gypi +++ b/deps/openssl/config/archs/linux-elf/asm/openssl-cl.gypi @@ -18,7 +18,6 @@ 'OPENSSL_IA32_SSE2', 'PADLOCK_ASM', 'POLY1305_ASM', - 'RC4_ASM', 'RMD160_ASM', 'SHA1_ASM', 'SHA256_ASM', diff --git a/deps/openssl/config/archs/linux-elf/asm/openssl.gypi b/deps/openssl/config/archs/linux-elf/asm/openssl.gypi index 0cf7d926c..f8c77dadb 100644 --- a/deps/openssl/config/archs/linux-elf/asm/openssl.gypi +++ b/deps/openssl/config/archs/linux-elf/asm/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cfb.c', 'openssl/crypto/aes/aes_ecb.c', @@ -993,7 +991,6 @@ 'OPENSSL_IA32_SSE2', 'PADLOCK_ASM', 'POLY1305_ASM', - 'RC4_ASM', 'RMD160_ASM', 'SHA1_ASM', 'SHA256_ASM', diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/configdata.pm b/deps/openssl/config/archs/linux-elf/asm_avx2/configdata.pm index aeb57e7bc..2bb369998 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/configdata.pm @@ -142,7 +142,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -159,7 +159,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.13+quic", + "full_version" => "3.0.9", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -207,7 +207,7 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "13", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "30 Jan 2024", - "shlib_version" => "81.3", + "release_date" => "30 May 2023", + "shlib_version" => "3", "sourcedir" => ".", "target" => "linux-elf", - "version" => "3.0.13" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -393,7 +393,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -789,9 +788,6 @@ our %unified_info = ( "providers/fips" => { "fips" => "1" }, - "test/p_minimal" => { - "noinst" => "1" - }, "test/p_test" => { "noinst" => "1" } @@ -860,9 +856,6 @@ our %unified_info = ( "test/asn1_internal_test" => { "noinst" => "1" }, - "test/asn1_stable_parse_test" => { - "noinst" => "1" - }, "test/asn1_string_table_test" => { "noinst" => "1" }, @@ -1052,9 +1045,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -1610,7 +1600,6 @@ our %unified_info = ( "OPENSSL_IA32_SSE2", "PADLOCK_ASM", "POLY1305_ASM", - "RC4_ASM", "RMD160_ASM", "SHA1_ASM", "SHA256_ASM", @@ -1658,11 +1647,7 @@ our %unified_info = ( "VPAES_ASM" ], "providers/liblegacy.a" => [ - "MD5_ASM", - "RC4_ASM" - ], - "test/evp_extra_test" => [ - "STATIC_LEGACY" + "MD5_ASM" ], "test/provider_internal_test" => [ "PROVIDER_INIT_FUNCTION_NAME=p_test_init" @@ -2417,9 +2402,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -2717,9 +2699,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -3488,9 +3467,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -3785,9 +3761,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -3821,12 +3794,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -4811,9 +4778,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -5111,9 +5075,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -5882,9 +5843,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -6179,9 +6137,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -6215,12 +6170,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -7218,10 +7167,6 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], - "test/asn1_stable_parse_test" => [ - "libcrypto", - "test/libtestutil.a" - ], "test/asn1_string_table_test" => [ "libcrypto", "test/libtestutil.a" @@ -7475,10 +7420,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -7744,8 +7685,6 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "libcrypto.a", - "providers/libcommon.a", - "providers/liblegacy.a", "test/libtestutil.a" ], "test/evp_extra_test2" => [ @@ -9831,7 +9770,6 @@ our %unified_info = ( }, "providers" => { "deps" => [ - "providers/evp_extra_test-bin-legacyprov.o", "providers/libcrypto-lib-baseprov.o", "providers/libcrypto-lib-defltprov.o", "providers/libcrypto-lib-nullprov.o", @@ -9839,9 +9777,6 @@ our %unified_info = ( "providers/libdefault.a" ], "products" => { - "bin" => [ - "test/evp_extra_test" - ], "dso" => [ "providers/fips", "providers/legacy" @@ -10278,7 +10213,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10329,7 +10263,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -11461,9 +11394,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -11761,9 +11691,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -12532,9 +12459,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -12829,9 +12753,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -12865,12 +12786,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -13855,9 +13770,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -14155,9 +14067,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -14926,9 +14835,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -15223,9 +15129,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -15259,12 +15162,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -16293,10 +16190,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16373,9 +16266,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "whrlpool" ], - "test/p_minimal.ld" => [ - "util/providers.num" - ], "test/p_test.ld" => [ "util/providers.num" ], @@ -16541,7 +16431,6 @@ our %unified_info = ( "doc/html/man3/CMS_get1_ReceiptRequest.html", "doc/html/man3/CMS_sign.html", "doc/html/man3/CMS_sign_receipt.html", - "doc/html/man3/CMS_signed_get_attr.html", "doc/html/man3/CMS_uncompress.html", "doc/html/man3/CMS_verify.html", "doc/html/man3/CMS_verify_receipt.html", @@ -16641,7 +16530,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_encapsulate.html", "doc/html/man3/EVP_PKEY_encrypt.html", "doc/html/man3/EVP_PKEY_fromdata.html", - "doc/html/man3/EVP_PKEY_get_attr.html", "doc/html/man3/EVP_PKEY_get_default_digest_nid.html", "doc/html/man3/EVP_PKEY_get_field_type.html", "doc/html/man3/EVP_PKEY_get_group_name.html", @@ -16898,7 +16786,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -16997,7 +16884,6 @@ our %unified_info = ( "doc/html/man3/X509V3_get_d2i.html", "doc/html/man3/X509V3_set_ctx.html", "doc/html/man3/X509_ALGOR_dup.html", - "doc/html/man3/X509_ATTRIBUTE.html", "doc/html/man3/X509_CRL_get0_by_serial.html", "doc/html/man3/X509_EXTENSION_set_object.html", "doc/html/man3/X509_LOOKUP.html", @@ -17009,8 +16895,6 @@ our %unified_info = ( "doc/html/man3/X509_NAME_get_index_by_NID.html", "doc/html/man3/X509_NAME_print_ex.html", "doc/html/man3/X509_PUBKEY_new.html", - "doc/html/man3/X509_REQ_get_attr.html", - "doc/html/man3/X509_REQ_get_extensions.html", "doc/html/man3/X509_SIG_get0.html", "doc/html/man3/X509_STORE_CTX_get_error.html", "doc/html/man3/X509_STORE_CTX_new.html", @@ -18308,10 +18192,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/asn1_stable_parse_test" => [ - "include", - "apps/include" - ], "test/asn1_string_table_test" => [ "include", "apps/include" @@ -18519,9 +18399,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -18781,9 +18658,7 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "include", - "apps/include", - "providers/common/include", - "providers/implementations/include" + "apps/include" ], "test/evp_extra_test2" => [ "include", @@ -19040,10 +18915,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/p_minimal" => [ - "include", - "." - ], "test/p_test" => [ "include", "." @@ -19533,7 +19404,6 @@ our %unified_info = ( "doc/man/man3/CMS_get1_ReceiptRequest.3", "doc/man/man3/CMS_sign.3", "doc/man/man3/CMS_sign_receipt.3", - "doc/man/man3/CMS_signed_get_attr.3", "doc/man/man3/CMS_uncompress.3", "doc/man/man3/CMS_verify.3", "doc/man/man3/CMS_verify_receipt.3", @@ -19633,7 +19503,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_encapsulate.3", "doc/man/man3/EVP_PKEY_encrypt.3", "doc/man/man3/EVP_PKEY_fromdata.3", - "doc/man/man3/EVP_PKEY_get_attr.3", "doc/man/man3/EVP_PKEY_get_default_digest_nid.3", "doc/man/man3/EVP_PKEY_get_field_type.3", "doc/man/man3/EVP_PKEY_get_group_name.3", @@ -19890,7 +19759,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -19989,7 +19857,6 @@ our %unified_info = ( "doc/man/man3/X509V3_get_d2i.3", "doc/man/man3/X509V3_set_ctx.3", "doc/man/man3/X509_ALGOR_dup.3", - "doc/man/man3/X509_ATTRIBUTE.3", "doc/man/man3/X509_CRL_get0_by_serial.3", "doc/man/man3/X509_EXTENSION_set_object.3", "doc/man/man3/X509_LOOKUP.3", @@ -20001,8 +19868,6 @@ our %unified_info = ( "doc/man/man3/X509_NAME_get_index_by_NID.3", "doc/man/man3/X509_NAME_print_ex.3", "doc/man/man3/X509_PUBKEY_new.3", - "doc/man/man3/X509_REQ_get_attr.3", - "doc/man/man3/X509_REQ_get_extensions.3", "doc/man/man3/X509_SIG_get0.3", "doc/man/man3/X509_STORE_CTX_get_error.3", "doc/man/man3/X509_STORE_CTX_new.3", @@ -20186,7 +20051,6 @@ our %unified_info = ( "modules" => [ "providers/fips", "providers/legacy", - "test/p_minimal", "test/p_test" ], "programs" => [ @@ -20212,7 +20076,6 @@ our %unified_info = ( "test/asn1_dsa_internal_test", "test/asn1_encode_test", "test/asn1_internal_test", - "test/asn1_stable_parse_test", "test/asn1_string_table_test", "test/asn1_time_test", "test/asynciotest", @@ -20276,7 +20139,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24479,7 +24341,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24506,7 +24367,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -24608,9 +24468,6 @@ our %unified_info = ( "providers/common/libfips-lib-securitycheck_fips.o" => [ "providers/common/securitycheck_fips.c" ], - "providers/evp_extra_test-bin-legacyprov.o" => [ - "providers/legacyprov.c" - ], "providers/fips" => [ "providers/fips.ld", "providers/fips/fips-dso-fips_entry.o" @@ -25757,9 +25614,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25841,9 +25695,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25901,12 +25752,6 @@ our %unified_info = ( "test/asn1_internal_test-bin-asn1_internal_test.o" => [ "test/asn1_internal_test.c" ], - "test/asn1_stable_parse_test" => [ - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" - ], - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" => [ - "test/asn1_stable_parse_test.c" - ], "test/asn1_string_table_test" => [ "test/asn1_string_table_test-bin-asn1_string_table_test.o" ], @@ -26286,12 +26131,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -26690,7 +26529,6 @@ our %unified_info = ( "test/errtest.c" ], "test/evp_extra_test" => [ - "providers/evp_extra_test-bin-legacyprov.o", "test/evp_extra_test-bin-evp_extra_test.o" ], "test/evp_extra_test-bin-evp_extra_test.o" => [ @@ -26981,13 +26819,6 @@ our %unified_info = ( "test/ossl_store_test-bin-ossl_store_test.o" => [ "test/ossl_store_test.c" ], - "test/p_minimal" => [ - "test/p_minimal-dso-p_minimal.o", - "test/p_minimal.ld" - ], - "test/p_minimal-dso-p_minimal.o" => [ - "test/p_minimal.c" - ], "test/p_test" => [ "test/p_test-dso-p_test.o", "test/p_test.ld" @@ -27674,8 +27505,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27702,7 +27533,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27719,8 +27550,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/aes/aes-586.S b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/aes/aes-586.S index 628a3b633..9ee3fc9a5 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/aes/aes-586.S +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/aes/aes-586.S @@ -2,10 +2,10 @@ .type _x86_AES_encrypt_compact,@function .align 16 _x86_AES_encrypt_compact: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl %edi,20(%esp) xorl (%edi),%eax @@ -274,10 +274,10 @@ _x86_AES_encrypt_compact: .type _sse_AES_encrypt_compact,@function .align 16 _sse_AES_encrypt_compact: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pxor (%edi),%mm0 pxor 8(%edi),%mm4 @@ -436,10 +436,10 @@ _sse_AES_encrypt_compact: .type _x86_AES_encrypt,@function .align 16 _x86_AES_encrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl %edi,20(%esp) xorl (%edi),%eax @@ -995,10 +995,10 @@ _x86_AES_encrypt: .align 16 AES_encrypt: .L_AES_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1063,10 +1063,10 @@ AES_encrypt: .type _x86_AES_decrypt_compact,@function .align 16 _x86_AES_decrypt_compact: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl %edi,20(%esp) xorl (%edi),%eax @@ -1423,10 +1423,10 @@ _x86_AES_decrypt_compact: .type _sse_AES_decrypt_compact,@function .align 16 _sse_AES_decrypt_compact: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pxor (%edi),%mm0 pxor 8(%edi),%mm4 @@ -1644,10 +1644,10 @@ _sse_AES_decrypt_compact: .type _x86_AES_decrypt,@function .align 16 _x86_AES_decrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl %edi,20(%esp) xorl (%edi),%eax @@ -2207,10 +2207,10 @@ _x86_AES_decrypt: .align 16 AES_decrypt: .L_AES_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2277,10 +2277,10 @@ AES_decrypt: .align 16 AES_cbc_encrypt: .L_AES_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2813,10 +2813,10 @@ AES_cbc_encrypt: .type _x86_AES_set_encrypt_key,@function .align 16 _x86_AES_set_encrypt_key: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3050,10 +3050,10 @@ _x86_AES_set_encrypt_key: .align 16 AES_set_encrypt_key: .L_AES_set_encrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call _x86_AES_set_encrypt_key ret @@ -3063,10 +3063,10 @@ AES_set_encrypt_key: .align 16 AES_set_decrypt_key: .L_AES_set_decrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call _x86_AES_set_encrypt_key cmpl $0,%eax diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/aes/aesni-x86.S b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/aes/aesni-x86.S index 9191466ee..eb2d01b16 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/aes/aesni-x86.S +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/aes/aesni-x86.S @@ -4,10 +4,10 @@ .align 16 aesni_encrypt: .L_aesni_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 12(%esp),%edx @@ -36,10 +36,10 @@ aesni_encrypt: .align 16 aesni_decrypt: .L_aesni_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 12(%esp),%edx @@ -66,10 +66,10 @@ aesni_decrypt: .type _aesni_encrypt2,@function .align 16 _aesni_encrypt2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -98,10 +98,10 @@ _aesni_encrypt2: .type _aesni_decrypt2,@function .align 16 _aesni_decrypt2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -130,10 +130,10 @@ _aesni_decrypt2: .type _aesni_encrypt3,@function .align 16 _aesni_encrypt3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -167,10 +167,10 @@ _aesni_encrypt3: .type _aesni_decrypt3,@function .align 16 _aesni_decrypt3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -204,10 +204,10 @@ _aesni_decrypt3: .type _aesni_encrypt4,@function .align 16 _aesni_encrypt4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 movups 16(%edx),%xmm1 @@ -247,10 +247,10 @@ _aesni_encrypt4: .type _aesni_decrypt4,@function .align 16 _aesni_decrypt4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 movups 16(%edx),%xmm1 @@ -290,10 +290,10 @@ _aesni_decrypt4: .type _aesni_encrypt6,@function .align 16 _aesni_encrypt6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -349,10 +349,10 @@ _aesni_encrypt6: .type _aesni_decrypt6,@function .align 16 _aesni_decrypt6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -410,10 +410,10 @@ _aesni_decrypt6: .align 16 aesni_ecb_encrypt: .L_aesni_ecb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -650,10 +650,10 @@ aesni_ecb_encrypt: .align 16 aesni_ccm64_encrypt_blocks: .L_aesni_ccm64_encrypt_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -743,10 +743,10 @@ aesni_ccm64_encrypt_blocks: .align 16 aesni_ccm64_decrypt_blocks: .L_aesni_ccm64_decrypt_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -871,10 +871,10 @@ aesni_ccm64_decrypt_blocks: .align 16 aesni_ctr32_encrypt_blocks: .L_aesni_ctr32_encrypt_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1114,10 +1114,10 @@ aesni_ctr32_encrypt_blocks: .align 16 aesni_xts_encrypt: .L_aesni_xts_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1479,10 +1479,10 @@ aesni_xts_encrypt: .align 16 aesni_xts_decrypt: .L_aesni_xts_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1874,10 +1874,10 @@ aesni_xts_decrypt: .align 16 aesni_ocb_encrypt: .L_aesni_ocb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2274,10 +2274,10 @@ aesni_ocb_encrypt: .align 16 aesni_ocb_decrypt: .L_aesni_ocb_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2674,10 +2674,10 @@ aesni_ocb_decrypt: .align 16 aesni_cbc_encrypt: .L_aesni_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2938,10 +2938,10 @@ aesni_cbc_encrypt: .type _aesni_set_encrypt_key,@function .align 16 _aesni_set_encrypt_key: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3278,10 +3278,10 @@ _aesni_set_encrypt_key: .align 16 aesni_set_encrypt_key: .L_aesni_set_encrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 8(%esp),%ecx @@ -3294,10 +3294,10 @@ aesni_set_encrypt_key: .align 16 aesni_set_decrypt_key: .L_aesni_set_decrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 8(%esp),%ecx diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/aes/vpaes-x86.S b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/aes/vpaes-x86.S index 39d00e772..f3adb7054 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/aes/vpaes-x86.S +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/aes/vpaes-x86.S @@ -59,10 +59,10 @@ .type _vpaes_preheat,@function .align 16 _vpaes_preheat: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif addl (%esp),%ebp movdqa -48(%ebp),%xmm7 @@ -72,10 +72,10 @@ _vpaes_preheat: .type _vpaes_encrypt_core,@function .align 16 _vpaes_encrypt_core: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl $16,%ecx movl 240(%edx),%eax @@ -154,10 +154,10 @@ _vpaes_encrypt_core: .type _vpaes_decrypt_core,@function .align 16 _vpaes_decrypt_core: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif leal 608(%ebp),%ebx movl 240(%edx),%eax @@ -247,10 +247,10 @@ _vpaes_decrypt_core: .type _vpaes_schedule_core,@function .align 16 _vpaes_schedule_core: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif addl (%esp),%ebp movdqu (%esi),%xmm0 @@ -346,10 +346,10 @@ _vpaes_schedule_core: .type _vpaes_schedule_192_smear,@function .align 16 _vpaes_schedule_192_smear: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pshufd $128,%xmm6,%xmm1 pshufd $254,%xmm7,%xmm0 @@ -363,10 +363,10 @@ _vpaes_schedule_192_smear: .type _vpaes_schedule_round,@function .align 16 _vpaes_schedule_round: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movdqa 8(%esp),%xmm2 pxor %xmm1,%xmm1 @@ -417,10 +417,10 @@ _vpaes_schedule_round: .type _vpaes_schedule_transform,@function .align 16 _vpaes_schedule_transform: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movdqa -16(%ebp),%xmm2 movdqa %xmm2,%xmm1 @@ -437,10 +437,10 @@ _vpaes_schedule_transform: .type _vpaes_schedule_mangle,@function .align 16 _vpaes_schedule_mangle: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movdqa %xmm0,%xmm4 movdqa 128(%ebp),%xmm5 @@ -503,10 +503,10 @@ _vpaes_schedule_mangle: .align 16 vpaes_set_encrypt_key: .L_vpaes_set_encrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -541,10 +541,10 @@ vpaes_set_encrypt_key: .align 16 vpaes_set_decrypt_key: .L_vpaes_set_decrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -584,10 +584,10 @@ vpaes_set_decrypt_key: .align 16 vpaes_encrypt: .L_vpaes_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -618,10 +618,10 @@ vpaes_encrypt: .align 16 vpaes_decrypt: .L_vpaes_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -652,10 +652,10 @@ vpaes_decrypt: .align 16 vpaes_cbc_encrypt: .L_vpaes_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/bf/bf-586.S b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/bf/bf-586.S index a3ff8edf8..801b28d56 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/bf/bf-586.S +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/bf/bf-586.S @@ -4,10 +4,10 @@ .align 16 BF_encrypt: .L_BF_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -359,10 +359,10 @@ BF_encrypt: .align 16 BF_decrypt: .L_BF_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -714,10 +714,10 @@ BF_decrypt: .align 16 BF_cbc_encrypt: .L_BF_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -782,55 +782,55 @@ BF_cbc_encrypt: xorl %edx,%edx jmp *%ebp .L006ej7: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 6(%esi),%dh shll $8,%edx .L007ej6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 5(%esi),%dh .L008ej5: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 4(%esi),%dl .L009ej4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%ecx jmp .L010ejend .L011ej3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 2(%esi),%ch shll $8,%ecx .L012ej2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 1(%esi),%ch .L013ej1: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb (%esi),%cl .L010ejend: diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/bn/bn-586.S b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/bn/bn-586.S index 2495ae694..a74e6470b 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/bn/bn-586.S +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/bn/bn-586.S @@ -4,10 +4,10 @@ .align 16 bn_mul_add_words: .L_bn_mul_add_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call .L000PIC_me_up .L000PIC_me_up: @@ -292,10 +292,10 @@ bn_mul_add_words: .align 16 bn_mul_words: .L_bn_mul_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call .L010PIC_me_up .L010PIC_me_up: @@ -479,10 +479,10 @@ bn_mul_words: .align 16 bn_sqr_words: .L_bn_sqr_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call .L017PIC_me_up .L017PIC_me_up: @@ -625,10 +625,10 @@ bn_sqr_words: .align 16 bn_div_words: .L_bn_div_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%eax @@ -641,10 +641,10 @@ bn_div_words: .align 16 bn_add_words: .L_bn_add_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -828,10 +828,10 @@ bn_add_words: .align 16 bn_sub_words: .L_bn_sub_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1015,10 +1015,10 @@ bn_sub_words: .align 16 bn_sub_part_words: .L_bn_sub_part_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/bn/co-586.S b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/bn/co-586.S index 9a9045539..bc8cd2888 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/bn/co-586.S +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/bn/co-586.S @@ -4,10 +4,10 @@ .align 16 bn_mul_comba8: .L_bn_mul_comba8_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi movl 12(%esp),%esi @@ -553,10 +553,10 @@ bn_mul_comba8: .align 16 bn_mul_comba4: .L_bn_mul_comba4_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi movl 12(%esp),%esi @@ -726,10 +726,10 @@ bn_mul_comba4: .align 16 bn_sqr_comba8: .L_bn_sqr_comba8_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi @@ -1139,10 +1139,10 @@ bn_sqr_comba8: .align 16 bn_sqr_comba4: .L_bn_sqr_comba4_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/bn/x86-gf2m.S b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/bn/x86-gf2m.S index fcb54e967..b784b7cbe 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/bn/x86-gf2m.S +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/bn/x86-gf2m.S @@ -2,10 +2,10 @@ .type _mul_1x1_mmx,@function .align 16 _mul_1x1_mmx: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif subl $36,%esp movl %eax,%ecx @@ -110,10 +110,10 @@ _mul_1x1_mmx: .type _mul_1x1_ialu,@function .align 16 _mul_1x1_ialu: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif subl $36,%esp movl %eax,%ecx @@ -249,10 +249,10 @@ _mul_1x1_ialu: .align 16 bn_GF2m_mul_2x2: .L_bn_GF2m_mul_2x2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call .L000PIC_me_up .L000PIC_me_up: diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/bn/x86-mont.S b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/bn/x86-mont.S index 7dddbf7d8..5d8a4c6cb 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/bn/x86-mont.S +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/bn/x86-mont.S @@ -4,10 +4,10 @@ .align 16 bn_mul_mont: .L_bn_mul_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/buildinf.h index f92ceb415..bdaf11aef 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-elf" -#define DATE "built on: Wed Jan 31 13:02:11 2024 UTC" +#define DATE "built on: Tue Aug 6 12:25:00 2024 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/camellia/cmll-x86.S b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/camellia/cmll-x86.S index bcbaf49e0..f4b77edc3 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/camellia/cmll-x86.S +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/camellia/cmll-x86.S @@ -4,10 +4,10 @@ .align 16 Camellia_EncryptBlock_Rounds: .L_Camellia_EncryptBlock_Rounds_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -63,10 +63,10 @@ Camellia_EncryptBlock_Rounds: .align 16 Camellia_EncryptBlock: .L_Camellia_EncryptBlock_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl $128,%eax subl 4(%esp),%eax @@ -80,10 +80,10 @@ Camellia_EncryptBlock: .align 16 Camellia_encrypt: .L_Camellia_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -137,10 +137,10 @@ Camellia_encrypt: .type _x86_Camellia_encrypt,@function .align 16 _x86_Camellia_encrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif xorl (%edi),%eax xorl 4(%edi),%ebx @@ -372,10 +372,10 @@ _x86_Camellia_encrypt: .align 16 Camellia_DecryptBlock_Rounds: .L_Camellia_DecryptBlock_Rounds_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -431,10 +431,10 @@ Camellia_DecryptBlock_Rounds: .align 16 Camellia_DecryptBlock: .L_Camellia_DecryptBlock_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl $128,%eax subl 4(%esp),%eax @@ -448,10 +448,10 @@ Camellia_DecryptBlock: .align 16 Camellia_decrypt: .L_Camellia_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -505,10 +505,10 @@ Camellia_decrypt: .type _x86_Camellia_decrypt,@function .align 16 _x86_Camellia_decrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif xorl (%edi),%eax xorl 4(%edi),%ebx @@ -740,10 +740,10 @@ _x86_Camellia_decrypt: .align 16 Camellia_Ekeygen: .L_Camellia_Ekeygen_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1586,10 +1586,10 @@ Camellia_Ekeygen: .align 16 Camellia_set_key: .L_Camellia_set_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebx movl 8(%esp),%ecx @@ -2143,10 +2143,10 @@ Camellia_set_key: .align 16 Camellia_cbc_encrypt: .L_Camellia_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/chacha/chacha-x86.S b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/chacha/chacha-x86.S index 9cc4027c7..ec98cb32f 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/chacha/chacha-x86.S +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/chacha/chacha-x86.S @@ -4,10 +4,10 @@ .align 16 ChaCha20_ctr32: .L_ChaCha20_ctr32_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -382,10 +382,10 @@ ChaCha20_ctr32: .align 16 ChaCha20_ssse3: .L_ChaCha20_ssse3_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -979,10 +979,10 @@ ChaCha20_ssse3: .align 16 ChaCha20_xop: .L_ChaCha20_xop_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/des/crypt586.S b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/des/crypt586.S index ac4b251ec..29ba0fa70 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/des/crypt586.S +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/des/crypt586.S @@ -4,10 +4,10 @@ .align 16 fcrypt_body: .L_fcrypt_body_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/des/des-586.S b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/des/des-586.S index 90449e4fa..b3839fa88 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/des/des-586.S +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/des/des-586.S @@ -3,10 +3,10 @@ .type _x86_DES_encrypt,@function .align 16 _x86_DES_encrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ecx @@ -479,10 +479,10 @@ _x86_DES_encrypt: .type _x86_DES_decrypt,@function .align 16 _x86_DES_decrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ecx @@ -957,10 +957,10 @@ _x86_DES_decrypt: .align 16 DES_encrypt1: .L_DES_encrypt1_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi @@ -1075,10 +1075,10 @@ DES_encrypt1: .align 16 DES_encrypt2: .L_DES_encrypt2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi @@ -1123,10 +1123,10 @@ DES_encrypt2: .align 16 DES_encrypt3: .L_DES_encrypt3_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebx movl 8(%esp),%ebx @@ -1249,10 +1249,10 @@ DES_encrypt3: .align 16 DES_decrypt3: .L_DES_decrypt3_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebx movl 8(%esp),%ebx @@ -1375,10 +1375,10 @@ DES_decrypt3: .align 16 DES_ncbc_encrypt: .L_DES_ncbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -1441,55 +1441,55 @@ DES_ncbc_encrypt: xorl %edx,%edx jmp *%ebp .L012ej7: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 6(%esi),%dh shll $8,%edx .L013ej6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 5(%esi),%dh .L014ej5: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 4(%esi),%dl .L015ej4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%ecx jmp .L016ejend .L017ej3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 2(%esi),%ch shll $8,%ecx .L018ej2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 1(%esi),%ch .L019ej1: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb (%esi),%cl .L016ejend: @@ -1595,10 +1595,10 @@ DES_ncbc_encrypt: .align 16 DES_ede3_cbc_encrypt: .L_DES_ede3_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -1665,55 +1665,55 @@ DES_ede3_cbc_encrypt: xorl %edx,%edx jmp *%ebp .L036ej7: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 6(%esi),%dh shll $8,%edx .L037ej6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 5(%esi),%dh .L038ej5: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 4(%esi),%dl .L039ej4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%ecx jmp .L040ejend .L041ej3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 2(%esi),%ch shll $8,%ecx .L042ej2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 1(%esi),%ch .L043ej1: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb (%esi),%cl .L040ejend: diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/ec/ecp_nistz256-x86.S b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/ec/ecp_nistz256-x86.S index 4e17d5eb8..f822079f8 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/ec/ecp_nistz256-x86.S +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/ec/ecp_nistz256-x86.S @@ -2387,10 +2387,10 @@ ecp_nistz256_precomputed: .align 16 ecp_nistz256_mul_by_2: .L_ecp_nistz256_mul_by_2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2411,10 +2411,10 @@ ecp_nistz256_mul_by_2: .align 16 ecp_nistz256_mul_by_3: .L_ecp_nistz256_mul_by_3_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2441,10 +2441,10 @@ ecp_nistz256_mul_by_3: .align 16 ecp_nistz256_div_by_2: .L_ecp_nistz256_div_by_2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2462,10 +2462,10 @@ ecp_nistz256_div_by_2: .type _ecp_nistz256_div_by_2,@function .align 16 _ecp_nistz256_div_by_2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%ebp xorl %edx,%edx @@ -2550,10 +2550,10 @@ _ecp_nistz256_div_by_2: .align 16 ecp_nistz256_add: .L_ecp_nistz256_add_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2572,10 +2572,10 @@ ecp_nistz256_add: .type _ecp_nistz256_add,@function .align 16 _ecp_nistz256_add: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%eax movl 4(%esi),%ebx @@ -2654,10 +2654,10 @@ _ecp_nistz256_add: .align 16 ecp_nistz256_sub: .L_ecp_nistz256_sub_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2676,10 +2676,10 @@ ecp_nistz256_sub: .type _ecp_nistz256_sub,@function .align 16 _ecp_nistz256_sub: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%eax movl 4(%esi),%ebx @@ -2739,10 +2739,10 @@ _ecp_nistz256_sub: .align 16 ecp_nistz256_neg: .L_ecp_nistz256_neg_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2772,10 +2772,10 @@ ecp_nistz256_neg: .type _picup_eax,@function .align 16 _picup_eax: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esp),%eax ret @@ -2785,10 +2785,10 @@ _picup_eax: .align 16 ecp_nistz256_to_mont: .L_ecp_nistz256_to_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2813,10 +2813,10 @@ ecp_nistz256_to_mont: .align 16 ecp_nistz256_from_mont: .L_ecp_nistz256_from_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2841,10 +2841,10 @@ ecp_nistz256_from_mont: .align 16 ecp_nistz256_mul_mont: .L_ecp_nistz256_mul_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2869,10 +2869,10 @@ ecp_nistz256_mul_mont: .align 16 ecp_nistz256_sqr_mont: .L_ecp_nistz256_sqr_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2895,10 +2895,10 @@ ecp_nistz256_sqr_mont: .type _ecp_nistz256_mul_mont,@function .align 16 _ecp_nistz256_mul_mont: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif andl $83886080,%eax cmpl $83886080,%eax @@ -3797,10 +3797,10 @@ _ecp_nistz256_mul_mont: .align 16 ecp_nistz256_scatter_w5: .L_ecp_nistz256_scatter_w5_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3835,10 +3835,10 @@ ecp_nistz256_scatter_w5: .align 16 ecp_nistz256_gather_w5: .L_ecp_nistz256_gather_w5_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3934,10 +3934,10 @@ ecp_nistz256_gather_w5: .align 16 ecp_nistz256_scatter_w7: .L_ecp_nistz256_scatter_w7_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3970,10 +3970,10 @@ ecp_nistz256_scatter_w7: .align 16 ecp_nistz256_gather_w7: .L_ecp_nistz256_gather_w7_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -4189,10 +4189,10 @@ ecp_nistz256_gather_w7: .align 16 ecp_nistz256_point_double: .L_ecp_nistz256_point_double_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -4320,10 +4320,10 @@ ecp_nistz256_point_double: .align 16 ecp_nistz256_point_add: .L_ecp_nistz256_point_add_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -4838,10 +4838,10 @@ ecp_nistz256_point_add: .align 16 ecp_nistz256_point_add_affine: .L_ecp_nistz256_point_add_affine_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/md5/md5-586.S b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/md5/md5-586.S index 33c01af67..7e96dc647 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/md5/md5-586.S +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/md5/md5-586.S @@ -4,10 +4,10 @@ .align 16 ossl_md5_block_asm_data_order: .L_ossl_md5_block_asm_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/modes/ghash-x86.S b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/modes/ghash-x86.S index dd80e32c5..9b3361acd 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/modes/ghash-x86.S +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/modes/ghash-x86.S @@ -4,10 +4,10 @@ .align 16 gcm_gmult_4bit_x86: .L_gcm_gmult_4bit_x86_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -103,10 +103,10 @@ gcm_gmult_4bit_x86: .align 16 gcm_ghash_4bit_x86: .L_gcm_ghash_4bit_x86_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -217,10 +217,10 @@ gcm_ghash_4bit_x86: .align 16 gcm_gmult_4bit_mmx: .L_gcm_gmult_4bit_mmx_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -321,10 +321,10 @@ gcm_gmult_4bit_mmx: .align 16 gcm_ghash_4bit_mmx: .L_gcm_ghash_4bit_mmx_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -930,10 +930,10 @@ gcm_ghash_4bit_mmx: .align 16 gcm_init_clmul: .L_gcm_init_clmul_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%eax @@ -1004,10 +1004,10 @@ gcm_init_clmul: .align 16 gcm_gmult_clmul: .L_gcm_gmult_clmul_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 8(%esp),%edx @@ -1062,10 +1062,10 @@ gcm_gmult_clmul: .align 16 gcm_ghash_clmul: .L_gcm_ghash_clmul_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/poly1305/poly1305-x86.S b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/poly1305/poly1305-x86.S index f95649fae..e76632cd1 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/poly1305/poly1305-x86.S +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/poly1305/poly1305-x86.S @@ -5,10 +5,10 @@ .align 16 poly1305_init: .L_poly1305_init_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -71,10 +71,10 @@ poly1305_init: .align 16 poly1305_blocks: .L_poly1305_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -244,10 +244,10 @@ poly1305_blocks: .align 16 poly1305_emit: .L_poly1305_emit_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -308,10 +308,10 @@ poly1305_emit: .type _poly1305_init_sse2,@function .align 16 _poly1305_init_sse2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movdqu 24(%edi),%xmm4 leal 48(%edi),%edi @@ -515,10 +515,10 @@ _poly1305_init_sse2: .type _poly1305_blocks_sse2,@function .align 16 _poly1305_blocks_sse2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1281,10 +1281,10 @@ _poly1305_blocks_sse2: .type _poly1305_emit_sse2,@function .align 16 _poly1305_emit_sse2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1379,10 +1379,10 @@ _poly1305_emit_sse2: .type _poly1305_init_avx2,@function .align 16 _poly1305_init_avx2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif vmovdqu 24(%edi),%xmm4 leal 48(%edi),%edi @@ -1555,10 +1555,10 @@ _poly1305_init_avx2: .type _poly1305_blocks_avx2,@function .align 16 _poly1305_blocks_avx2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/rc4/rc4-586.S b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/rc4/rc4-586.S index da909a31e..a10b047a7 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/rc4/rc4-586.S +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/rc4/rc4-586.S @@ -4,10 +4,10 @@ .align 16 RC4: .L_RC4_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -275,10 +275,10 @@ RC4: .align 16 RC4_set_key: .L_RC4_set_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -358,10 +358,10 @@ RC4_set_key: .align 16 RC4_options: .L_RC4_options_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call .L018pic_point .L018pic_point: diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/ripemd/rmd-586.S b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/ripemd/rmd-586.S index 57b95af6d..4f3ea459c 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/ripemd/rmd-586.S +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/ripemd/rmd-586.S @@ -4,10 +4,10 @@ .align 16 ripemd160_block_asm_data_order: .L_ripemd160_block_asm_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%eax diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/sha/sha1-586.S b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/sha/sha1-586.S index ddc85b3d8..4b60a71ee 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/sha/sha1-586.S +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/sha/sha1-586.S @@ -4,10 +4,10 @@ .align 16 sha1_block_data_order: .L_sha1_block_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1403,10 +1403,10 @@ sha1_block_data_order: .type _sha1_block_data_order_shaext,@function .align 16 _sha1_block_data_order_shaext: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1578,10 +1578,10 @@ _sha1_block_data_order_shaext: .type _sha1_block_data_order_ssse3,@function .align 16 _sha1_block_data_order_ssse3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2802,10 +2802,10 @@ _sha1_block_data_order_ssse3: .type _sha1_block_data_order_avx,@function .align 16 _sha1_block_data_order_avx: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/sha/sha256-586.S b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/sha/sha256-586.S index 9436ca5e1..c8599bd58 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/sha/sha256-586.S +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/sha/sha256-586.S @@ -4,10 +4,10 @@ .align 16 sha256_block_data_order: .L_sha256_block_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/sha/sha512-586.S b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/sha/sha512-586.S index c7cf815b4..99d198dd9 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/sha/sha512-586.S +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/sha/sha512-586.S @@ -4,10 +4,10 @@ .align 16 sha512_block_data_order: .L_sha512_block_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/whrlpool/wp-mmx.S b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/whrlpool/wp-mmx.S index 9fb9ca1e4..ee571f645 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/whrlpool/wp-mmx.S +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/whrlpool/wp-mmx.S @@ -4,10 +4,10 @@ .align 16 whirlpool_block_mmx: .L_whirlpool_block_mmx_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/x86cpuid.S b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/x86cpuid.S index eedacacfe..d4f2ec09e 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/x86cpuid.S +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/x86cpuid.S @@ -4,10 +4,10 @@ .align 16 OPENSSL_ia32_cpuid: .L_OPENSSL_ia32_cpuid_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -153,10 +153,10 @@ OPENSSL_ia32_cpuid: .align 16 OPENSSL_rdtsc: .L_OPENSSL_rdtsc_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif xorl %eax,%eax xorl %edx,%edx @@ -175,10 +175,10 @@ OPENSSL_rdtsc: .align 16 OPENSSL_instrument_halt: .L_OPENSSL_instrument_halt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call .L011PIC_me_up .L011PIC_me_up: @@ -212,10 +212,10 @@ OPENSSL_instrument_halt: .align 16 OPENSSL_far_spin: .L_OPENSSL_far_spin_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushfl popl %eax @@ -244,10 +244,10 @@ OPENSSL_far_spin: .align 16 OPENSSL_wipe_cpu: .L_OPENSSL_wipe_cpu_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif xorl %eax,%eax xorl %edx,%edx @@ -280,10 +280,10 @@ OPENSSL_wipe_cpu: .align 16 OPENSSL_atomic_add: .L_OPENSSL_atomic_add_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%ecx @@ -304,10 +304,10 @@ OPENSSL_atomic_add: .align 16 OPENSSL_cleanse: .L_OPENSSL_cleanse_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%ecx @@ -346,10 +346,10 @@ OPENSSL_cleanse: .align 16 CRYPTO_memcmp: .L_CRYPTO_memcmp_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi @@ -380,10 +380,10 @@ CRYPTO_memcmp: .align 16 OPENSSL_instrument_bus: .L_OPENSSL_instrument_bus_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -433,10 +433,10 @@ OPENSSL_instrument_bus: .align 16 OPENSSL_instrument_bus2: .L_OPENSSL_instrument_bus2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -499,10 +499,10 @@ OPENSSL_instrument_bus2: .align 16 OPENSSL_ia32_rdrand_bytes: .L_OPENSSL_ia32_rdrand_bytes_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %ebx @@ -547,10 +547,10 @@ OPENSSL_ia32_rdrand_bytes: .align 16 OPENSSL_ia32_rdseed_bytes: .L_OPENSSL_ia32_rdseed_bytes_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %ebx diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/engines/e_padlock-x86.S b/deps/openssl/config/archs/linux-elf/asm_avx2/engines/e_padlock-x86.S index 81e4ec050..cea65eba3 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/engines/e_padlock-x86.S +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/engines/e_padlock-x86.S @@ -4,10 +4,10 @@ .align 16 padlock_capability: .L_padlock_capability_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebx pushfl @@ -69,10 +69,10 @@ padlock_capability: .align 16 padlock_key_bswap: .L_padlock_key_bswap_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 240(%edx),%ecx @@ -92,10 +92,10 @@ padlock_key_bswap: .align 16 padlock_verify_context: .L_padlock_verify_context_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx leal .Lpadlock_saved_context-.L004verify_pic_point,%eax @@ -108,10 +108,10 @@ padlock_verify_context: .type _padlock_verify_ctx,@function .align 16 _padlock_verify_ctx: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif addl (%esp),%eax btl $30,4(%esp) @@ -129,10 +129,10 @@ _padlock_verify_ctx: .align 16 padlock_reload_key: .L_padlock_reload_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushfl popfl @@ -143,10 +143,10 @@ padlock_reload_key: .align 16 padlock_aes_block: .L_padlock_aes_block_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -168,10 +168,10 @@ padlock_aes_block: .align 16 padlock_ecb_encrypt: .L_padlock_ecb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -352,10 +352,10 @@ padlock_ecb_encrypt: .align 16 padlock_cbc_encrypt: .L_padlock_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -540,10 +540,10 @@ padlock_cbc_encrypt: .align 16 padlock_cfb_encrypt: .L_padlock_cfb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -667,10 +667,10 @@ padlock_cfb_encrypt: .align 16 padlock_ofb_encrypt: .L_padlock_ofb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -794,10 +794,10 @@ padlock_ofb_encrypt: .align 16 padlock_ctr32_encrypt: .L_padlock_ctr32_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -906,10 +906,10 @@ padlock_ctr32_encrypt: .align 16 padlock_xstore: .L_padlock_xstore_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi movl 8(%esp),%edi @@ -921,10 +921,10 @@ padlock_xstore: .type _win32_segv_handler,@function .align 16 _win32_segv_handler: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl $1,%eax movl 4(%esp),%edx @@ -941,10 +941,10 @@ _win32_segv_handler: .align 16 padlock_sha1_oneshot: .L_padlock_sha1_oneshot_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -977,10 +977,10 @@ padlock_sha1_oneshot: .align 16 padlock_sha1_blocks: .L_padlock_sha1_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -1012,10 +1012,10 @@ padlock_sha1_blocks: .align 16 padlock_sha256_oneshot: .L_padlock_sha256_oneshot_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -1048,10 +1048,10 @@ padlock_sha256_oneshot: .align 16 padlock_sha256_blocks: .L_padlock_sha256_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -1083,10 +1083,10 @@ padlock_sha256_blocks: .align 16 padlock_sha512_blocks: .L_padlock_sha512_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/include/openssl/bio.h b/deps/openssl/config/archs/linux-elf/asm_avx2/include/openssl/bio.h index f9aa74731..e16cf622c 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/include/openssl/bio.h +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/include/openssl/bio.h @@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, - int (*ossl_gets) (BIO *, char *, int)); + int (*gets) (BIO *, char *, int)); long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/linux-elf/asm_avx2/include/openssl/opensslv.h index 65f3bfa05..5bb97d596 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 13 +# define OPENSSL_VERSION_PATCH 9 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.13" -# define OPENSSL_FULL_VERSION_STR "3.0.13+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "30 Jan 2024" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13+quic 30 Jan 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/include/openssl/pkcs7.h b/deps/openssl/config/archs/linux-elf/asm_avx2/include/openssl/pkcs7.h index 0ce79bf4f..557a0a726 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/include/openssl/pkcs7.h +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/include/openssl/pkcs7.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/pkcs7.h.in * - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -56,8 +56,8 @@ typedef struct pkcs7_signer_info_st { PKCS7_ISSUER_AND_SERIAL *issuer_and_serial; X509_ALGOR *digest_alg; STACK_OF(X509_ATTRIBUTE) *auth_attr; /* [ 0 ] */ - X509_ALGOR *digest_enc_alg; /* confusing name, actually used for signing */ - ASN1_OCTET_STRING *enc_digest; /* confusing name, actually signature */ + X509_ALGOR *digest_enc_alg; + ASN1_OCTET_STRING *enc_digest; STACK_OF(X509_ATTRIBUTE) *unauth_attr; /* [ 1 ] */ /* The private key to sign with */ EVP_PKEY *pkey; diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/linux-elf/asm_avx2/include/openssl/ssl.h index 0f1915755..3df725c56 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/openssl-cl.gypi b/deps/openssl/config/archs/linux-elf/asm_avx2/openssl-cl.gypi index 4e2c60206..2e818082b 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/openssl-cl.gypi +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/openssl-cl.gypi @@ -18,7 +18,6 @@ 'OPENSSL_IA32_SSE2', 'PADLOCK_ASM', 'POLY1305_ASM', - 'RC4_ASM', 'RMD160_ASM', 'SHA1_ASM', 'SHA256_ASM', diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/openssl.gypi b/deps/openssl/config/archs/linux-elf/asm_avx2/openssl.gypi index 4ca065ef1..a9dc47abe 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cfb.c', 'openssl/crypto/aes/aes_ecb.c', @@ -993,7 +991,6 @@ 'OPENSSL_IA32_SSE2', 'PADLOCK_ASM', 'POLY1305_ASM', - 'RC4_ASM', 'RMD160_ASM', 'SHA1_ASM', 'SHA256_ASM', diff --git a/deps/openssl/config/archs/linux-elf/no-asm/configdata.pm b/deps/openssl/config/archs/linux-elf/no-asm/configdata.pm index f8c616164..2c956a572 100644 --- a/deps/openssl/config/archs/linux-elf/no-asm/configdata.pm +++ b/deps/openssl/config/archs/linux-elf/no-asm/configdata.pm @@ -142,7 +142,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [], @@ -157,7 +157,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.13+quic", + "full_version" => "3.0.9", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,7 +206,7 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "13", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "30 Jan 2024", - "shlib_version" => "81.3", + "release_date" => "30 May 2023", + "shlib_version" => "3", "sourcedir" => ".", "target" => "linux-elf", - "version" => "3.0.13" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -393,7 +393,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -790,9 +789,6 @@ our %unified_info = ( "providers/fips" => { "fips" => "1" }, - "test/p_minimal" => { - "noinst" => "1" - }, "test/p_test" => { "noinst" => "1" } @@ -861,9 +857,6 @@ our %unified_info = ( "test/asn1_internal_test" => { "noinst" => "1" }, - "test/asn1_stable_parse_test" => { - "noinst" => "1" - }, "test/asn1_string_table_test" => { "noinst" => "1" }, @@ -1053,9 +1046,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -1603,9 +1593,6 @@ our %unified_info = ( "providers/libfips.a" => [ "FIPS_MODULE" ], - "test/evp_extra_test" => [ - "STATIC_LEGACY" - ], "test/provider_internal_test" => [ "PROVIDER_INIT_FUNCTION_NAME=p_test_init" ], @@ -2359,9 +2346,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -2659,9 +2643,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -3430,9 +3411,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -3727,9 +3705,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -3763,12 +3738,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -4753,9 +4722,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -5053,9 +5019,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -5824,9 +5787,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -6121,9 +6081,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -6157,12 +6114,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -7160,10 +7111,6 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], - "test/asn1_stable_parse_test" => [ - "libcrypto", - "test/libtestutil.a" - ], "test/asn1_string_table_test" => [ "libcrypto", "test/libtestutil.a" @@ -7417,10 +7364,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -7686,8 +7629,6 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "libcrypto.a", - "providers/libcommon.a", - "providers/liblegacy.a", "test/libtestutil.a" ], "test/evp_extra_test2" => [ @@ -9751,7 +9692,6 @@ our %unified_info = ( }, "providers" => { "deps" => [ - "providers/evp_extra_test-bin-legacyprov.o", "providers/libcrypto-lib-baseprov.o", "providers/libcrypto-lib-defltprov.o", "providers/libcrypto-lib-nullprov.o", @@ -9759,9 +9699,6 @@ our %unified_info = ( "providers/libdefault.a" ], "products" => { - "bin" => [ - "test/evp_extra_test" - ], "dso" => [ "providers/fips", "providers/legacy" @@ -10198,7 +10135,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10249,7 +10185,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -11381,9 +11316,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -11681,9 +11613,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -12452,9 +12381,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -12749,9 +12675,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -12785,12 +12708,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -13775,9 +13692,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -14075,9 +13989,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -14846,9 +14757,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -15143,9 +15051,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -15179,12 +15084,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -16213,10 +16112,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16293,9 +16188,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "whrlpool" ], - "test/p_minimal.ld" => [ - "util/providers.num" - ], "test/p_test.ld" => [ "util/providers.num" ], @@ -16461,7 +16353,6 @@ our %unified_info = ( "doc/html/man3/CMS_get1_ReceiptRequest.html", "doc/html/man3/CMS_sign.html", "doc/html/man3/CMS_sign_receipt.html", - "doc/html/man3/CMS_signed_get_attr.html", "doc/html/man3/CMS_uncompress.html", "doc/html/man3/CMS_verify.html", "doc/html/man3/CMS_verify_receipt.html", @@ -16561,7 +16452,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_encapsulate.html", "doc/html/man3/EVP_PKEY_encrypt.html", "doc/html/man3/EVP_PKEY_fromdata.html", - "doc/html/man3/EVP_PKEY_get_attr.html", "doc/html/man3/EVP_PKEY_get_default_digest_nid.html", "doc/html/man3/EVP_PKEY_get_field_type.html", "doc/html/man3/EVP_PKEY_get_group_name.html", @@ -16818,7 +16708,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -16917,7 +16806,6 @@ our %unified_info = ( "doc/html/man3/X509V3_get_d2i.html", "doc/html/man3/X509V3_set_ctx.html", "doc/html/man3/X509_ALGOR_dup.html", - "doc/html/man3/X509_ATTRIBUTE.html", "doc/html/man3/X509_CRL_get0_by_serial.html", "doc/html/man3/X509_EXTENSION_set_object.html", "doc/html/man3/X509_LOOKUP.html", @@ -16929,8 +16817,6 @@ our %unified_info = ( "doc/html/man3/X509_NAME_get_index_by_NID.html", "doc/html/man3/X509_NAME_print_ex.html", "doc/html/man3/X509_PUBKEY_new.html", - "doc/html/man3/X509_REQ_get_attr.html", - "doc/html/man3/X509_REQ_get_extensions.html", "doc/html/man3/X509_SIG_get0.html", "doc/html/man3/X509_STORE_CTX_get_error.html", "doc/html/man3/X509_STORE_CTX_new.html", @@ -18228,10 +18114,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/asn1_stable_parse_test" => [ - "include", - "apps/include" - ], "test/asn1_string_table_test" => [ "include", "apps/include" @@ -18439,9 +18321,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -18701,9 +18580,7 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "include", - "apps/include", - "providers/common/include", - "providers/implementations/include" + "apps/include" ], "test/evp_extra_test2" => [ "include", @@ -18960,10 +18837,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/p_minimal" => [ - "include", - "." - ], "test/p_test" => [ "include", "." @@ -19453,7 +19326,6 @@ our %unified_info = ( "doc/man/man3/CMS_get1_ReceiptRequest.3", "doc/man/man3/CMS_sign.3", "doc/man/man3/CMS_sign_receipt.3", - "doc/man/man3/CMS_signed_get_attr.3", "doc/man/man3/CMS_uncompress.3", "doc/man/man3/CMS_verify.3", "doc/man/man3/CMS_verify_receipt.3", @@ -19553,7 +19425,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_encapsulate.3", "doc/man/man3/EVP_PKEY_encrypt.3", "doc/man/man3/EVP_PKEY_fromdata.3", - "doc/man/man3/EVP_PKEY_get_attr.3", "doc/man/man3/EVP_PKEY_get_default_digest_nid.3", "doc/man/man3/EVP_PKEY_get_field_type.3", "doc/man/man3/EVP_PKEY_get_group_name.3", @@ -19810,7 +19681,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -19909,7 +19779,6 @@ our %unified_info = ( "doc/man/man3/X509V3_get_d2i.3", "doc/man/man3/X509V3_set_ctx.3", "doc/man/man3/X509_ALGOR_dup.3", - "doc/man/man3/X509_ATTRIBUTE.3", "doc/man/man3/X509_CRL_get0_by_serial.3", "doc/man/man3/X509_EXTENSION_set_object.3", "doc/man/man3/X509_LOOKUP.3", @@ -19921,8 +19790,6 @@ our %unified_info = ( "doc/man/man3/X509_NAME_get_index_by_NID.3", "doc/man/man3/X509_NAME_print_ex.3", "doc/man/man3/X509_PUBKEY_new.3", - "doc/man/man3/X509_REQ_get_attr.3", - "doc/man/man3/X509_REQ_get_extensions.3", "doc/man/man3/X509_SIG_get0.3", "doc/man/man3/X509_STORE_CTX_get_error.3", "doc/man/man3/X509_STORE_CTX_new.3", @@ -20106,7 +19973,6 @@ our %unified_info = ( "modules" => [ "providers/fips", "providers/legacy", - "test/p_minimal", "test/p_test" ], "programs" => [ @@ -20132,7 +19998,6 @@ our %unified_info = ( "test/asn1_dsa_internal_test", "test/asn1_encode_test", "test/asn1_internal_test", - "test/asn1_stable_parse_test", "test/asn1_string_table_test", "test/asn1_time_test", "test/asynciotest", @@ -20196,7 +20061,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24321,7 +24185,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24348,7 +24211,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -24450,9 +24312,6 @@ our %unified_info = ( "providers/common/libfips-lib-securitycheck_fips.o" => [ "providers/common/securitycheck_fips.c" ], - "providers/evp_extra_test-bin-legacyprov.o" => [ - "providers/legacyprov.c" - ], "providers/fips" => [ "providers/fips.ld", "providers/fips/fips-dso-fips_entry.o" @@ -25589,9 +25448,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25673,9 +25529,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25733,12 +25586,6 @@ our %unified_info = ( "test/asn1_internal_test-bin-asn1_internal_test.o" => [ "test/asn1_internal_test.c" ], - "test/asn1_stable_parse_test" => [ - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" - ], - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" => [ - "test/asn1_stable_parse_test.c" - ], "test/asn1_string_table_test" => [ "test/asn1_string_table_test-bin-asn1_string_table_test.o" ], @@ -26118,12 +25965,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -26522,7 +26363,6 @@ our %unified_info = ( "test/errtest.c" ], "test/evp_extra_test" => [ - "providers/evp_extra_test-bin-legacyprov.o", "test/evp_extra_test-bin-evp_extra_test.o" ], "test/evp_extra_test-bin-evp_extra_test.o" => [ @@ -26813,13 +26653,6 @@ our %unified_info = ( "test/ossl_store_test-bin-ossl_store_test.o" => [ "test/ossl_store_test.c" ], - "test/p_minimal" => [ - "test/p_minimal-dso-p_minimal.o", - "test/p_minimal.ld" - ], - "test/p_minimal-dso-p_minimal.o" => [ - "test/p_minimal.c" - ], "test/p_test" => [ "test/p_test-dso-p_test.o", "test/p_test.ld" @@ -27509,8 +27342,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27537,7 +27370,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27554,8 +27387,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux-elf/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-elf/no-asm/crypto/buildinf.h index 9a4d8ec2a..66516e784 100644 --- a/deps/openssl/config/archs/linux-elf/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-elf/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-elf" -#define DATE "built on: Wed Jan 31 13:02:24 2024 UTC" +#define DATE "built on: Tue Aug 6 12:25:12 2024 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-elf/no-asm/include/openssl/bio.h b/deps/openssl/config/archs/linux-elf/no-asm/include/openssl/bio.h index f9aa74731..e16cf622c 100644 --- a/deps/openssl/config/archs/linux-elf/no-asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/linux-elf/no-asm/include/openssl/bio.h @@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, - int (*ossl_gets) (BIO *, char *, int)); + int (*gets) (BIO *, char *, int)); long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); diff --git a/deps/openssl/config/archs/linux-elf/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux-elf/no-asm/include/openssl/opensslv.h index 65f3bfa05..5bb97d596 100644 --- a/deps/openssl/config/archs/linux-elf/no-asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux-elf/no-asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 13 +# define OPENSSL_VERSION_PATCH 9 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.13" -# define OPENSSL_FULL_VERSION_STR "3.0.13+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "30 Jan 2024" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13+quic 30 Jan 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux-elf/no-asm/include/openssl/pkcs7.h b/deps/openssl/config/archs/linux-elf/no-asm/include/openssl/pkcs7.h index 0ce79bf4f..557a0a726 100644 --- a/deps/openssl/config/archs/linux-elf/no-asm/include/openssl/pkcs7.h +++ b/deps/openssl/config/archs/linux-elf/no-asm/include/openssl/pkcs7.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/pkcs7.h.in * - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -56,8 +56,8 @@ typedef struct pkcs7_signer_info_st { PKCS7_ISSUER_AND_SERIAL *issuer_and_serial; X509_ALGOR *digest_alg; STACK_OF(X509_ATTRIBUTE) *auth_attr; /* [ 0 ] */ - X509_ALGOR *digest_enc_alg; /* confusing name, actually used for signing */ - ASN1_OCTET_STRING *enc_digest; /* confusing name, actually signature */ + X509_ALGOR *digest_enc_alg; + ASN1_OCTET_STRING *enc_digest; STACK_OF(X509_ATTRIBUTE) *unauth_attr; /* [ 1 ] */ /* The private key to sign with */ EVP_PKEY *pkey; diff --git a/deps/openssl/config/archs/linux-elf/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux-elf/no-asm/include/openssl/ssl.h index 0f1915755..3df725c56 100644 --- a/deps/openssl/config/archs/linux-elf/no-asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux-elf/no-asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/linux-elf/no-asm/openssl.gypi b/deps/openssl/config/archs/linux-elf/no-asm/openssl.gypi index 3b06ffbee..8bc730460 100644 --- a/deps/openssl/config/archs/linux-elf/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/linux-elf/no-asm/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cbc.c', 'openssl/crypto/aes/aes_cfb.c', diff --git a/deps/openssl/config/archs/linux-ppc64le/asm/configdata.pm b/deps/openssl/config/archs/linux-ppc64le/asm/configdata.pm index 294b69122..1ed8c30b5 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm/configdata.pm +++ b/deps/openssl/config/archs/linux-ppc64le/asm/configdata.pm @@ -142,7 +142,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -159,7 +159,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.13+quic", + "full_version" => "3.0.9", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -207,7 +207,7 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "13", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "30 Jan 2024", - "shlib_version" => "81.3", + "release_date" => "30 May 2023", + "shlib_version" => "3", "sourcedir" => ".", "target" => "linux-ppc64le", - "version" => "3.0.13" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -394,7 +394,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -790,9 +789,6 @@ our %unified_info = ( "providers/fips" => { "fips" => "1" }, - "test/p_minimal" => { - "noinst" => "1" - }, "test/p_test" => { "noinst" => "1" } @@ -861,9 +857,6 @@ our %unified_info = ( "test/asn1_internal_test" => { "noinst" => "1" }, - "test/asn1_stable_parse_test" => { - "noinst" => "1" - }, "test/asn1_string_table_test" => { "noinst" => "1" }, @@ -1053,9 +1046,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -1641,9 +1631,6 @@ our %unified_info = ( "VPAES_ASM", "X25519_ASM" ], - "test/evp_extra_test" => [ - "STATIC_LEGACY" - ], "test/provider_internal_test" => [ "PROVIDER_INIT_FUNCTION_NAME=p_test_init" ], @@ -2397,9 +2384,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -2697,9 +2681,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -3468,9 +3449,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -3765,9 +3743,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -3801,12 +3776,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -4791,9 +4760,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -5091,9 +5057,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -5862,9 +5825,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -6159,9 +6119,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -6195,12 +6152,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -7198,10 +7149,6 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], - "test/asn1_stable_parse_test" => [ - "libcrypto", - "test/libtestutil.a" - ], "test/asn1_string_table_test" => [ "libcrypto", "test/libtestutil.a" @@ -7455,10 +7402,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -7724,8 +7667,6 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "libcrypto.a", - "providers/libcommon.a", - "providers/liblegacy.a", "test/libtestutil.a" ], "test/evp_extra_test2" => [ @@ -9827,7 +9768,6 @@ our %unified_info = ( }, "providers" => { "deps" => [ - "providers/evp_extra_test-bin-legacyprov.o", "providers/libcrypto-lib-baseprov.o", "providers/libcrypto-lib-defltprov.o", "providers/libcrypto-lib-nullprov.o", @@ -9835,9 +9775,6 @@ our %unified_info = ( "providers/libdefault.a" ], "products" => { - "bin" => [ - "test/evp_extra_test" - ], "dso" => [ "providers/fips", "providers/legacy" @@ -10274,7 +10211,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10325,7 +10261,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -11457,9 +11392,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -11757,9 +11689,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -12528,9 +12457,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -12825,9 +12751,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -12861,12 +12784,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -13851,9 +13768,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -14151,9 +14065,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -14922,9 +14833,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -15219,9 +15127,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -15255,12 +15160,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -16289,10 +16188,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16369,9 +16264,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "whrlpool" ], - "test/p_minimal.ld" => [ - "util/providers.num" - ], "test/p_test.ld" => [ "util/providers.num" ], @@ -16537,7 +16429,6 @@ our %unified_info = ( "doc/html/man3/CMS_get1_ReceiptRequest.html", "doc/html/man3/CMS_sign.html", "doc/html/man3/CMS_sign_receipt.html", - "doc/html/man3/CMS_signed_get_attr.html", "doc/html/man3/CMS_uncompress.html", "doc/html/man3/CMS_verify.html", "doc/html/man3/CMS_verify_receipt.html", @@ -16637,7 +16528,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_encapsulate.html", "doc/html/man3/EVP_PKEY_encrypt.html", "doc/html/man3/EVP_PKEY_fromdata.html", - "doc/html/man3/EVP_PKEY_get_attr.html", "doc/html/man3/EVP_PKEY_get_default_digest_nid.html", "doc/html/man3/EVP_PKEY_get_field_type.html", "doc/html/man3/EVP_PKEY_get_group_name.html", @@ -16894,7 +16784,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -16993,7 +16882,6 @@ our %unified_info = ( "doc/html/man3/X509V3_get_d2i.html", "doc/html/man3/X509V3_set_ctx.html", "doc/html/man3/X509_ALGOR_dup.html", - "doc/html/man3/X509_ATTRIBUTE.html", "doc/html/man3/X509_CRL_get0_by_serial.html", "doc/html/man3/X509_EXTENSION_set_object.html", "doc/html/man3/X509_LOOKUP.html", @@ -17005,8 +16893,6 @@ our %unified_info = ( "doc/html/man3/X509_NAME_get_index_by_NID.html", "doc/html/man3/X509_NAME_print_ex.html", "doc/html/man3/X509_PUBKEY_new.html", - "doc/html/man3/X509_REQ_get_attr.html", - "doc/html/man3/X509_REQ_get_extensions.html", "doc/html/man3/X509_SIG_get0.html", "doc/html/man3/X509_STORE_CTX_get_error.html", "doc/html/man3/X509_STORE_CTX_new.html", @@ -18304,10 +18190,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/asn1_stable_parse_test" => [ - "include", - "apps/include" - ], "test/asn1_string_table_test" => [ "include", "apps/include" @@ -18515,9 +18397,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -18777,9 +18656,7 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "include", - "apps/include", - "providers/common/include", - "providers/implementations/include" + "apps/include" ], "test/evp_extra_test2" => [ "include", @@ -19036,10 +18913,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/p_minimal" => [ - "include", - "." - ], "test/p_test" => [ "include", "." @@ -19529,7 +19402,6 @@ our %unified_info = ( "doc/man/man3/CMS_get1_ReceiptRequest.3", "doc/man/man3/CMS_sign.3", "doc/man/man3/CMS_sign_receipt.3", - "doc/man/man3/CMS_signed_get_attr.3", "doc/man/man3/CMS_uncompress.3", "doc/man/man3/CMS_verify.3", "doc/man/man3/CMS_verify_receipt.3", @@ -19629,7 +19501,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_encapsulate.3", "doc/man/man3/EVP_PKEY_encrypt.3", "doc/man/man3/EVP_PKEY_fromdata.3", - "doc/man/man3/EVP_PKEY_get_attr.3", "doc/man/man3/EVP_PKEY_get_default_digest_nid.3", "doc/man/man3/EVP_PKEY_get_field_type.3", "doc/man/man3/EVP_PKEY_get_group_name.3", @@ -19886,7 +19757,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -19985,7 +19855,6 @@ our %unified_info = ( "doc/man/man3/X509V3_get_d2i.3", "doc/man/man3/X509V3_set_ctx.3", "doc/man/man3/X509_ALGOR_dup.3", - "doc/man/man3/X509_ATTRIBUTE.3", "doc/man/man3/X509_CRL_get0_by_serial.3", "doc/man/man3/X509_EXTENSION_set_object.3", "doc/man/man3/X509_LOOKUP.3", @@ -19997,8 +19866,6 @@ our %unified_info = ( "doc/man/man3/X509_NAME_get_index_by_NID.3", "doc/man/man3/X509_NAME_print_ex.3", "doc/man/man3/X509_PUBKEY_new.3", - "doc/man/man3/X509_REQ_get_attr.3", - "doc/man/man3/X509_REQ_get_extensions.3", "doc/man/man3/X509_SIG_get0.3", "doc/man/man3/X509_STORE_CTX_get_error.3", "doc/man/man3/X509_STORE_CTX_new.3", @@ -20182,7 +20049,6 @@ our %unified_info = ( "modules" => [ "providers/fips", "providers/legacy", - "test/p_minimal", "test/p_test" ], "programs" => [ @@ -20208,7 +20074,6 @@ our %unified_info = ( "test/asn1_dsa_internal_test", "test/asn1_encode_test", "test/asn1_internal_test", - "test/asn1_stable_parse_test", "test/asn1_string_table_test", "test/asn1_time_test", "test/asynciotest", @@ -20272,7 +20137,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24532,7 +24396,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24559,7 +24422,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -24661,9 +24523,6 @@ our %unified_info = ( "providers/common/libfips-lib-securitycheck_fips.o" => [ "providers/common/securitycheck_fips.c" ], - "providers/evp_extra_test-bin-legacyprov.o" => [ - "providers/legacyprov.c" - ], "providers/fips" => [ "providers/fips.ld", "providers/fips/fips-dso-fips_entry.o" @@ -25817,9 +25676,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25901,9 +25757,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25961,12 +25814,6 @@ our %unified_info = ( "test/asn1_internal_test-bin-asn1_internal_test.o" => [ "test/asn1_internal_test.c" ], - "test/asn1_stable_parse_test" => [ - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" - ], - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" => [ - "test/asn1_stable_parse_test.c" - ], "test/asn1_string_table_test" => [ "test/asn1_string_table_test-bin-asn1_string_table_test.o" ], @@ -26346,12 +26193,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -26750,7 +26591,6 @@ our %unified_info = ( "test/errtest.c" ], "test/evp_extra_test" => [ - "providers/evp_extra_test-bin-legacyprov.o", "test/evp_extra_test-bin-evp_extra_test.o" ], "test/evp_extra_test-bin-evp_extra_test.o" => [ @@ -27041,13 +26881,6 @@ our %unified_info = ( "test/ossl_store_test-bin-ossl_store_test.o" => [ "test/ossl_store_test.c" ], - "test/p_minimal" => [ - "test/p_minimal-dso-p_minimal.o", - "test/p_minimal.ld" - ], - "test/p_minimal-dso-p_minimal.o" => [ - "test/p_minimal.c" - ], "test/p_test" => [ "test/p_test-dso-p_test.o", "test/p_test.ld" @@ -27734,8 +27567,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27762,7 +27595,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27779,8 +27612,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux-ppc64le/asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-ppc64le/asm/crypto/buildinf.h index f868966a0..42700109e 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-ppc64le/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-ppc64le" -#define DATE "built on: Wed Jan 31 13:03:19 2024 UTC" +#define DATE "built on: Tue Aug 6 12:26:02 2024 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-ppc64le/asm/include/openssl/bio.h b/deps/openssl/config/archs/linux-ppc64le/asm/include/openssl/bio.h index f9aa74731..e16cf622c 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/linux-ppc64le/asm/include/openssl/bio.h @@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, - int (*ossl_gets) (BIO *, char *, int)); + int (*gets) (BIO *, char *, int)); long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); diff --git a/deps/openssl/config/archs/linux-ppc64le/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux-ppc64le/asm/include/openssl/opensslv.h index 65f3bfa05..5bb97d596 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux-ppc64le/asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 13 +# define OPENSSL_VERSION_PATCH 9 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.13" -# define OPENSSL_FULL_VERSION_STR "3.0.13+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "30 Jan 2024" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13+quic 30 Jan 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux-ppc64le/asm/include/openssl/pkcs7.h b/deps/openssl/config/archs/linux-ppc64le/asm/include/openssl/pkcs7.h index 0ce79bf4f..557a0a726 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm/include/openssl/pkcs7.h +++ b/deps/openssl/config/archs/linux-ppc64le/asm/include/openssl/pkcs7.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/pkcs7.h.in * - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -56,8 +56,8 @@ typedef struct pkcs7_signer_info_st { PKCS7_ISSUER_AND_SERIAL *issuer_and_serial; X509_ALGOR *digest_alg; STACK_OF(X509_ATTRIBUTE) *auth_attr; /* [ 0 ] */ - X509_ALGOR *digest_enc_alg; /* confusing name, actually used for signing */ - ASN1_OCTET_STRING *enc_digest; /* confusing name, actually signature */ + X509_ALGOR *digest_enc_alg; + ASN1_OCTET_STRING *enc_digest; STACK_OF(X509_ATTRIBUTE) *unauth_attr; /* [ 1 ] */ /* The private key to sign with */ EVP_PKEY *pkey; diff --git a/deps/openssl/config/archs/linux-ppc64le/asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux-ppc64le/asm/include/openssl/ssl.h index 0f1915755..3df725c56 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux-ppc64le/asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/linux-ppc64le/asm/openssl.gypi b/deps/openssl/config/archs/linux-ppc64le/asm/openssl.gypi index a7479e90f..391c727e3 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm/openssl.gypi +++ b/deps/openssl/config/archs/linux-ppc64le/asm/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cbc.c', 'openssl/crypto/aes/aes_cfb.c', diff --git a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/configdata.pm b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/configdata.pm index dcc417e8d..dde006068 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/configdata.pm @@ -142,7 +142,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -159,7 +159,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.13+quic", + "full_version" => "3.0.9", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -207,7 +207,7 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "13", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "30 Jan 2024", - "shlib_version" => "81.3", + "release_date" => "30 May 2023", + "shlib_version" => "3", "sourcedir" => ".", "target" => "linux-ppc64le", - "version" => "3.0.13" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -394,7 +394,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -790,9 +789,6 @@ our %unified_info = ( "providers/fips" => { "fips" => "1" }, - "test/p_minimal" => { - "noinst" => "1" - }, "test/p_test" => { "noinst" => "1" } @@ -861,9 +857,6 @@ our %unified_info = ( "test/asn1_internal_test" => { "noinst" => "1" }, - "test/asn1_stable_parse_test" => { - "noinst" => "1" - }, "test/asn1_string_table_test" => { "noinst" => "1" }, @@ -1053,9 +1046,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -1641,9 +1631,6 @@ our %unified_info = ( "VPAES_ASM", "X25519_ASM" ], - "test/evp_extra_test" => [ - "STATIC_LEGACY" - ], "test/provider_internal_test" => [ "PROVIDER_INIT_FUNCTION_NAME=p_test_init" ], @@ -2397,9 +2384,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -2697,9 +2681,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -3468,9 +3449,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -3765,9 +3743,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -3801,12 +3776,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -4791,9 +4760,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -5091,9 +5057,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -5862,9 +5825,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -6159,9 +6119,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -6195,12 +6152,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -7198,10 +7149,6 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], - "test/asn1_stable_parse_test" => [ - "libcrypto", - "test/libtestutil.a" - ], "test/asn1_string_table_test" => [ "libcrypto", "test/libtestutil.a" @@ -7455,10 +7402,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -7724,8 +7667,6 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "libcrypto.a", - "providers/libcommon.a", - "providers/liblegacy.a", "test/libtestutil.a" ], "test/evp_extra_test2" => [ @@ -9827,7 +9768,6 @@ our %unified_info = ( }, "providers" => { "deps" => [ - "providers/evp_extra_test-bin-legacyprov.o", "providers/libcrypto-lib-baseprov.o", "providers/libcrypto-lib-defltprov.o", "providers/libcrypto-lib-nullprov.o", @@ -9835,9 +9775,6 @@ our %unified_info = ( "providers/libdefault.a" ], "products" => { - "bin" => [ - "test/evp_extra_test" - ], "dso" => [ "providers/fips", "providers/legacy" @@ -10274,7 +10211,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10325,7 +10261,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -11457,9 +11392,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -11757,9 +11689,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -12528,9 +12457,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -12825,9 +12751,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -12861,12 +12784,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -13851,9 +13768,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -14151,9 +14065,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -14922,9 +14833,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -15219,9 +15127,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -15255,12 +15160,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -16289,10 +16188,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16369,9 +16264,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "whrlpool" ], - "test/p_minimal.ld" => [ - "util/providers.num" - ], "test/p_test.ld" => [ "util/providers.num" ], @@ -16537,7 +16429,6 @@ our %unified_info = ( "doc/html/man3/CMS_get1_ReceiptRequest.html", "doc/html/man3/CMS_sign.html", "doc/html/man3/CMS_sign_receipt.html", - "doc/html/man3/CMS_signed_get_attr.html", "doc/html/man3/CMS_uncompress.html", "doc/html/man3/CMS_verify.html", "doc/html/man3/CMS_verify_receipt.html", @@ -16637,7 +16528,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_encapsulate.html", "doc/html/man3/EVP_PKEY_encrypt.html", "doc/html/man3/EVP_PKEY_fromdata.html", - "doc/html/man3/EVP_PKEY_get_attr.html", "doc/html/man3/EVP_PKEY_get_default_digest_nid.html", "doc/html/man3/EVP_PKEY_get_field_type.html", "doc/html/man3/EVP_PKEY_get_group_name.html", @@ -16894,7 +16784,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -16993,7 +16882,6 @@ our %unified_info = ( "doc/html/man3/X509V3_get_d2i.html", "doc/html/man3/X509V3_set_ctx.html", "doc/html/man3/X509_ALGOR_dup.html", - "doc/html/man3/X509_ATTRIBUTE.html", "doc/html/man3/X509_CRL_get0_by_serial.html", "doc/html/man3/X509_EXTENSION_set_object.html", "doc/html/man3/X509_LOOKUP.html", @@ -17005,8 +16893,6 @@ our %unified_info = ( "doc/html/man3/X509_NAME_get_index_by_NID.html", "doc/html/man3/X509_NAME_print_ex.html", "doc/html/man3/X509_PUBKEY_new.html", - "doc/html/man3/X509_REQ_get_attr.html", - "doc/html/man3/X509_REQ_get_extensions.html", "doc/html/man3/X509_SIG_get0.html", "doc/html/man3/X509_STORE_CTX_get_error.html", "doc/html/man3/X509_STORE_CTX_new.html", @@ -18304,10 +18190,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/asn1_stable_parse_test" => [ - "include", - "apps/include" - ], "test/asn1_string_table_test" => [ "include", "apps/include" @@ -18515,9 +18397,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -18777,9 +18656,7 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "include", - "apps/include", - "providers/common/include", - "providers/implementations/include" + "apps/include" ], "test/evp_extra_test2" => [ "include", @@ -19036,10 +18913,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/p_minimal" => [ - "include", - "." - ], "test/p_test" => [ "include", "." @@ -19529,7 +19402,6 @@ our %unified_info = ( "doc/man/man3/CMS_get1_ReceiptRequest.3", "doc/man/man3/CMS_sign.3", "doc/man/man3/CMS_sign_receipt.3", - "doc/man/man3/CMS_signed_get_attr.3", "doc/man/man3/CMS_uncompress.3", "doc/man/man3/CMS_verify.3", "doc/man/man3/CMS_verify_receipt.3", @@ -19629,7 +19501,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_encapsulate.3", "doc/man/man3/EVP_PKEY_encrypt.3", "doc/man/man3/EVP_PKEY_fromdata.3", - "doc/man/man3/EVP_PKEY_get_attr.3", "doc/man/man3/EVP_PKEY_get_default_digest_nid.3", "doc/man/man3/EVP_PKEY_get_field_type.3", "doc/man/man3/EVP_PKEY_get_group_name.3", @@ -19886,7 +19757,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -19985,7 +19855,6 @@ our %unified_info = ( "doc/man/man3/X509V3_get_d2i.3", "doc/man/man3/X509V3_set_ctx.3", "doc/man/man3/X509_ALGOR_dup.3", - "doc/man/man3/X509_ATTRIBUTE.3", "doc/man/man3/X509_CRL_get0_by_serial.3", "doc/man/man3/X509_EXTENSION_set_object.3", "doc/man/man3/X509_LOOKUP.3", @@ -19997,8 +19866,6 @@ our %unified_info = ( "doc/man/man3/X509_NAME_get_index_by_NID.3", "doc/man/man3/X509_NAME_print_ex.3", "doc/man/man3/X509_PUBKEY_new.3", - "doc/man/man3/X509_REQ_get_attr.3", - "doc/man/man3/X509_REQ_get_extensions.3", "doc/man/man3/X509_SIG_get0.3", "doc/man/man3/X509_STORE_CTX_get_error.3", "doc/man/man3/X509_STORE_CTX_new.3", @@ -20182,7 +20049,6 @@ our %unified_info = ( "modules" => [ "providers/fips", "providers/legacy", - "test/p_minimal", "test/p_test" ], "programs" => [ @@ -20208,7 +20074,6 @@ our %unified_info = ( "test/asn1_dsa_internal_test", "test/asn1_encode_test", "test/asn1_internal_test", - "test/asn1_stable_parse_test", "test/asn1_string_table_test", "test/asn1_time_test", "test/asynciotest", @@ -20272,7 +20137,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24532,7 +24396,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24559,7 +24422,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -24661,9 +24523,6 @@ our %unified_info = ( "providers/common/libfips-lib-securitycheck_fips.o" => [ "providers/common/securitycheck_fips.c" ], - "providers/evp_extra_test-bin-legacyprov.o" => [ - "providers/legacyprov.c" - ], "providers/fips" => [ "providers/fips.ld", "providers/fips/fips-dso-fips_entry.o" @@ -25817,9 +25676,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25901,9 +25757,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25961,12 +25814,6 @@ our %unified_info = ( "test/asn1_internal_test-bin-asn1_internal_test.o" => [ "test/asn1_internal_test.c" ], - "test/asn1_stable_parse_test" => [ - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" - ], - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" => [ - "test/asn1_stable_parse_test.c" - ], "test/asn1_string_table_test" => [ "test/asn1_string_table_test-bin-asn1_string_table_test.o" ], @@ -26346,12 +26193,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -26750,7 +26591,6 @@ our %unified_info = ( "test/errtest.c" ], "test/evp_extra_test" => [ - "providers/evp_extra_test-bin-legacyprov.o", "test/evp_extra_test-bin-evp_extra_test.o" ], "test/evp_extra_test-bin-evp_extra_test.o" => [ @@ -27041,13 +26881,6 @@ our %unified_info = ( "test/ossl_store_test-bin-ossl_store_test.o" => [ "test/ossl_store_test.c" ], - "test/p_minimal" => [ - "test/p_minimal-dso-p_minimal.o", - "test/p_minimal.ld" - ], - "test/p_minimal-dso-p_minimal.o" => [ - "test/p_minimal.c" - ], "test/p_test" => [ "test/p_test-dso-p_test.o", "test/p_test.ld" @@ -27734,8 +27567,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27762,7 +27595,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27779,8 +27612,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/crypto/buildinf.h index af79fca6c..3943c063d 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-ppc64le" -#define DATE "built on: Wed Jan 31 13:03:31 2024 UTC" +#define DATE "built on: Tue Aug 6 12:26:13 2024 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/openssl/bio.h b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/openssl/bio.h index f9aa74731..e16cf622c 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/openssl/bio.h +++ b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/openssl/bio.h @@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, - int (*ossl_gets) (BIO *, char *, int)); + int (*gets) (BIO *, char *, int)); long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); diff --git a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/openssl/opensslv.h index 65f3bfa05..5bb97d596 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 13 +# define OPENSSL_VERSION_PATCH 9 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.13" -# define OPENSSL_FULL_VERSION_STR "3.0.13+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "30 Jan 2024" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13+quic 30 Jan 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/openssl/pkcs7.h b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/openssl/pkcs7.h index 0ce79bf4f..557a0a726 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/openssl/pkcs7.h +++ b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/openssl/pkcs7.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/pkcs7.h.in * - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -56,8 +56,8 @@ typedef struct pkcs7_signer_info_st { PKCS7_ISSUER_AND_SERIAL *issuer_and_serial; X509_ALGOR *digest_alg; STACK_OF(X509_ATTRIBUTE) *auth_attr; /* [ 0 ] */ - X509_ALGOR *digest_enc_alg; /* confusing name, actually used for signing */ - ASN1_OCTET_STRING *enc_digest; /* confusing name, actually signature */ + X509_ALGOR *digest_enc_alg; + ASN1_OCTET_STRING *enc_digest; STACK_OF(X509_ATTRIBUTE) *unauth_attr; /* [ 1 ] */ /* The private key to sign with */ EVP_PKEY *pkey; diff --git a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/openssl/ssl.h index 0f1915755..3df725c56 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/openssl.gypi b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/openssl.gypi index f07a1c9c6..df4018f96 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cbc.c', 'openssl/crypto/aes/aes_cfb.c', diff --git a/deps/openssl/config/archs/linux-ppc64le/no-asm/configdata.pm b/deps/openssl/config/archs/linux-ppc64le/no-asm/configdata.pm index 65bbbec12..9bd8839bf 100644 --- a/deps/openssl/config/archs/linux-ppc64le/no-asm/configdata.pm +++ b/deps/openssl/config/archs/linux-ppc64le/no-asm/configdata.pm @@ -142,7 +142,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [], @@ -157,7 +157,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.13+quic", + "full_version" => "3.0.9", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,7 +206,7 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "13", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "30 Jan 2024", - "shlib_version" => "81.3", + "release_date" => "30 May 2023", + "shlib_version" => "3", "sourcedir" => ".", "target" => "linux-ppc64le", - "version" => "3.0.13" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -394,7 +394,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -791,9 +790,6 @@ our %unified_info = ( "providers/fips" => { "fips" => "1" }, - "test/p_minimal" => { - "noinst" => "1" - }, "test/p_test" => { "noinst" => "1" } @@ -862,9 +858,6 @@ our %unified_info = ( "test/asn1_internal_test" => { "noinst" => "1" }, - "test/asn1_stable_parse_test" => { - "noinst" => "1" - }, "test/asn1_string_table_test" => { "noinst" => "1" }, @@ -1054,9 +1047,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -1604,9 +1594,6 @@ our %unified_info = ( "providers/libfips.a" => [ "FIPS_MODULE" ], - "test/evp_extra_test" => [ - "STATIC_LEGACY" - ], "test/provider_internal_test" => [ "PROVIDER_INIT_FUNCTION_NAME=p_test_init" ], @@ -2360,9 +2347,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -2660,9 +2644,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -3431,9 +3412,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -3728,9 +3706,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -3764,12 +3739,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -4754,9 +4723,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -5054,9 +5020,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -5825,9 +5788,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -6122,9 +6082,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -6158,12 +6115,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -7161,10 +7112,6 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], - "test/asn1_stable_parse_test" => [ - "libcrypto", - "test/libtestutil.a" - ], "test/asn1_string_table_test" => [ "libcrypto", "test/libtestutil.a" @@ -7418,10 +7365,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -7687,8 +7630,6 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "libcrypto.a", - "providers/libcommon.a", - "providers/liblegacy.a", "test/libtestutil.a" ], "test/evp_extra_test2" => [ @@ -9752,7 +9693,6 @@ our %unified_info = ( }, "providers" => { "deps" => [ - "providers/evp_extra_test-bin-legacyprov.o", "providers/libcrypto-lib-baseprov.o", "providers/libcrypto-lib-defltprov.o", "providers/libcrypto-lib-nullprov.o", @@ -9760,9 +9700,6 @@ our %unified_info = ( "providers/libdefault.a" ], "products" => { - "bin" => [ - "test/evp_extra_test" - ], "dso" => [ "providers/fips", "providers/legacy" @@ -10199,7 +10136,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10250,7 +10186,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -11382,9 +11317,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -11682,9 +11614,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -12453,9 +12382,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -12750,9 +12676,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -12786,12 +12709,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -13776,9 +13693,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -14076,9 +13990,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -14847,9 +14758,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -15144,9 +15052,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -15180,12 +15085,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -16214,10 +16113,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16294,9 +16189,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "whrlpool" ], - "test/p_minimal.ld" => [ - "util/providers.num" - ], "test/p_test.ld" => [ "util/providers.num" ], @@ -16462,7 +16354,6 @@ our %unified_info = ( "doc/html/man3/CMS_get1_ReceiptRequest.html", "doc/html/man3/CMS_sign.html", "doc/html/man3/CMS_sign_receipt.html", - "doc/html/man3/CMS_signed_get_attr.html", "doc/html/man3/CMS_uncompress.html", "doc/html/man3/CMS_verify.html", "doc/html/man3/CMS_verify_receipt.html", @@ -16562,7 +16453,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_encapsulate.html", "doc/html/man3/EVP_PKEY_encrypt.html", "doc/html/man3/EVP_PKEY_fromdata.html", - "doc/html/man3/EVP_PKEY_get_attr.html", "doc/html/man3/EVP_PKEY_get_default_digest_nid.html", "doc/html/man3/EVP_PKEY_get_field_type.html", "doc/html/man3/EVP_PKEY_get_group_name.html", @@ -16819,7 +16709,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -16918,7 +16807,6 @@ our %unified_info = ( "doc/html/man3/X509V3_get_d2i.html", "doc/html/man3/X509V3_set_ctx.html", "doc/html/man3/X509_ALGOR_dup.html", - "doc/html/man3/X509_ATTRIBUTE.html", "doc/html/man3/X509_CRL_get0_by_serial.html", "doc/html/man3/X509_EXTENSION_set_object.html", "doc/html/man3/X509_LOOKUP.html", @@ -16930,8 +16818,6 @@ our %unified_info = ( "doc/html/man3/X509_NAME_get_index_by_NID.html", "doc/html/man3/X509_NAME_print_ex.html", "doc/html/man3/X509_PUBKEY_new.html", - "doc/html/man3/X509_REQ_get_attr.html", - "doc/html/man3/X509_REQ_get_extensions.html", "doc/html/man3/X509_SIG_get0.html", "doc/html/man3/X509_STORE_CTX_get_error.html", "doc/html/man3/X509_STORE_CTX_new.html", @@ -18229,10 +18115,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/asn1_stable_parse_test" => [ - "include", - "apps/include" - ], "test/asn1_string_table_test" => [ "include", "apps/include" @@ -18440,9 +18322,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -18702,9 +18581,7 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "include", - "apps/include", - "providers/common/include", - "providers/implementations/include" + "apps/include" ], "test/evp_extra_test2" => [ "include", @@ -18961,10 +18838,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/p_minimal" => [ - "include", - "." - ], "test/p_test" => [ "include", "." @@ -19454,7 +19327,6 @@ our %unified_info = ( "doc/man/man3/CMS_get1_ReceiptRequest.3", "doc/man/man3/CMS_sign.3", "doc/man/man3/CMS_sign_receipt.3", - "doc/man/man3/CMS_signed_get_attr.3", "doc/man/man3/CMS_uncompress.3", "doc/man/man3/CMS_verify.3", "doc/man/man3/CMS_verify_receipt.3", @@ -19554,7 +19426,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_encapsulate.3", "doc/man/man3/EVP_PKEY_encrypt.3", "doc/man/man3/EVP_PKEY_fromdata.3", - "doc/man/man3/EVP_PKEY_get_attr.3", "doc/man/man3/EVP_PKEY_get_default_digest_nid.3", "doc/man/man3/EVP_PKEY_get_field_type.3", "doc/man/man3/EVP_PKEY_get_group_name.3", @@ -19811,7 +19682,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -19910,7 +19780,6 @@ our %unified_info = ( "doc/man/man3/X509V3_get_d2i.3", "doc/man/man3/X509V3_set_ctx.3", "doc/man/man3/X509_ALGOR_dup.3", - "doc/man/man3/X509_ATTRIBUTE.3", "doc/man/man3/X509_CRL_get0_by_serial.3", "doc/man/man3/X509_EXTENSION_set_object.3", "doc/man/man3/X509_LOOKUP.3", @@ -19922,8 +19791,6 @@ our %unified_info = ( "doc/man/man3/X509_NAME_get_index_by_NID.3", "doc/man/man3/X509_NAME_print_ex.3", "doc/man/man3/X509_PUBKEY_new.3", - "doc/man/man3/X509_REQ_get_attr.3", - "doc/man/man3/X509_REQ_get_extensions.3", "doc/man/man3/X509_SIG_get0.3", "doc/man/man3/X509_STORE_CTX_get_error.3", "doc/man/man3/X509_STORE_CTX_new.3", @@ -20107,7 +19974,6 @@ our %unified_info = ( "modules" => [ "providers/fips", "providers/legacy", - "test/p_minimal", "test/p_test" ], "programs" => [ @@ -20133,7 +19999,6 @@ our %unified_info = ( "test/asn1_dsa_internal_test", "test/asn1_encode_test", "test/asn1_internal_test", - "test/asn1_stable_parse_test", "test/asn1_string_table_test", "test/asn1_time_test", "test/asynciotest", @@ -20197,7 +20062,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24322,7 +24186,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24349,7 +24212,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -24451,9 +24313,6 @@ our %unified_info = ( "providers/common/libfips-lib-securitycheck_fips.o" => [ "providers/common/securitycheck_fips.c" ], - "providers/evp_extra_test-bin-legacyprov.o" => [ - "providers/legacyprov.c" - ], "providers/fips" => [ "providers/fips.ld", "providers/fips/fips-dso-fips_entry.o" @@ -25590,9 +25449,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25674,9 +25530,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25734,12 +25587,6 @@ our %unified_info = ( "test/asn1_internal_test-bin-asn1_internal_test.o" => [ "test/asn1_internal_test.c" ], - "test/asn1_stable_parse_test" => [ - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" - ], - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" => [ - "test/asn1_stable_parse_test.c" - ], "test/asn1_string_table_test" => [ "test/asn1_string_table_test-bin-asn1_string_table_test.o" ], @@ -26119,12 +25966,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -26523,7 +26364,6 @@ our %unified_info = ( "test/errtest.c" ], "test/evp_extra_test" => [ - "providers/evp_extra_test-bin-legacyprov.o", "test/evp_extra_test-bin-evp_extra_test.o" ], "test/evp_extra_test-bin-evp_extra_test.o" => [ @@ -26814,13 +26654,6 @@ our %unified_info = ( "test/ossl_store_test-bin-ossl_store_test.o" => [ "test/ossl_store_test.c" ], - "test/p_minimal" => [ - "test/p_minimal-dso-p_minimal.o", - "test/p_minimal.ld" - ], - "test/p_minimal-dso-p_minimal.o" => [ - "test/p_minimal.c" - ], "test/p_test" => [ "test/p_test-dso-p_test.o", "test/p_test.ld" @@ -27510,8 +27343,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27538,7 +27371,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27555,8 +27388,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux-ppc64le/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-ppc64le/no-asm/crypto/buildinf.h index c7183f844..265f8fdc8 100644 --- a/deps/openssl/config/archs/linux-ppc64le/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-ppc64le/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-ppc64le" -#define DATE "built on: Wed Jan 31 13:03:44 2024 UTC" +#define DATE "built on: Tue Aug 6 12:26:25 2024 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-ppc64le/no-asm/include/openssl/bio.h b/deps/openssl/config/archs/linux-ppc64le/no-asm/include/openssl/bio.h index f9aa74731..e16cf622c 100644 --- a/deps/openssl/config/archs/linux-ppc64le/no-asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/linux-ppc64le/no-asm/include/openssl/bio.h @@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, - int (*ossl_gets) (BIO *, char *, int)); + int (*gets) (BIO *, char *, int)); long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); diff --git a/deps/openssl/config/archs/linux-ppc64le/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux-ppc64le/no-asm/include/openssl/opensslv.h index 65f3bfa05..5bb97d596 100644 --- a/deps/openssl/config/archs/linux-ppc64le/no-asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux-ppc64le/no-asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 13 +# define OPENSSL_VERSION_PATCH 9 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.13" -# define OPENSSL_FULL_VERSION_STR "3.0.13+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "30 Jan 2024" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13+quic 30 Jan 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux-ppc64le/no-asm/include/openssl/pkcs7.h b/deps/openssl/config/archs/linux-ppc64le/no-asm/include/openssl/pkcs7.h index 0ce79bf4f..557a0a726 100644 --- a/deps/openssl/config/archs/linux-ppc64le/no-asm/include/openssl/pkcs7.h +++ b/deps/openssl/config/archs/linux-ppc64le/no-asm/include/openssl/pkcs7.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/pkcs7.h.in * - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -56,8 +56,8 @@ typedef struct pkcs7_signer_info_st { PKCS7_ISSUER_AND_SERIAL *issuer_and_serial; X509_ALGOR *digest_alg; STACK_OF(X509_ATTRIBUTE) *auth_attr; /* [ 0 ] */ - X509_ALGOR *digest_enc_alg; /* confusing name, actually used for signing */ - ASN1_OCTET_STRING *enc_digest; /* confusing name, actually signature */ + X509_ALGOR *digest_enc_alg; + ASN1_OCTET_STRING *enc_digest; STACK_OF(X509_ATTRIBUTE) *unauth_attr; /* [ 1 ] */ /* The private key to sign with */ EVP_PKEY *pkey; diff --git a/deps/openssl/config/archs/linux-ppc64le/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux-ppc64le/no-asm/include/openssl/ssl.h index 0f1915755..3df725c56 100644 --- a/deps/openssl/config/archs/linux-ppc64le/no-asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux-ppc64le/no-asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/linux-ppc64le/no-asm/openssl.gypi b/deps/openssl/config/archs/linux-ppc64le/no-asm/openssl.gypi index 046ec44ce..59a593c03 100644 --- a/deps/openssl/config/archs/linux-ppc64le/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/linux-ppc64le/no-asm/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cbc.c', 'openssl/crypto/aes/aes_cfb.c', diff --git a/deps/openssl/config/archs/linux-x86_64/asm/configdata.pm b/deps/openssl/config/archs/linux-x86_64/asm/configdata.pm index 1f87af83a..ba0fd433b 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm/configdata.pm +++ b/deps/openssl/config/archs/linux-x86_64/asm/configdata.pm @@ -142,7 +142,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -159,7 +159,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.13+quic", + "full_version" => "3.0.9", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -207,7 +207,7 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "13", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "30 Jan 2024", - "shlib_version" => "81.3", + "release_date" => "30 May 2023", + "shlib_version" => "3", "sourcedir" => ".", "target" => "linux-x86_64", - "version" => "3.0.13" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -395,7 +395,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -791,9 +790,6 @@ our %unified_info = ( "providers/fips" => { "fips" => "1" }, - "test/p_minimal" => { - "noinst" => "1" - }, "test/p_test" => { "noinst" => "1" } @@ -862,9 +858,6 @@ our %unified_info = ( "test/asn1_internal_test" => { "noinst" => "1" }, - "test/asn1_stable_parse_test" => { - "noinst" => "1" - }, "test/asn1_string_table_test" => { "noinst" => "1" }, @@ -1054,9 +1047,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -1613,7 +1603,6 @@ our %unified_info = ( "OPENSSL_IA32_SSE2", "PADLOCK_ASM", "POLY1305_ASM", - "RC4_ASM", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", @@ -1665,11 +1654,7 @@ our %unified_info = ( "X25519_ASM" ], "providers/liblegacy.a" => [ - "MD5_ASM", - "RC4_ASM" - ], - "test/evp_extra_test" => [ - "STATIC_LEGACY" + "MD5_ASM" ], "test/provider_internal_test" => [ "PROVIDER_INIT_FUNCTION_NAME=p_test_init" @@ -2424,9 +2409,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -2724,9 +2706,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -3495,9 +3474,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -3792,9 +3768,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -3828,12 +3801,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -4818,9 +4785,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -5118,9 +5082,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -5889,9 +5850,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -6186,9 +6144,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -6222,12 +6177,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -7225,10 +7174,6 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], - "test/asn1_stable_parse_test" => [ - "libcrypto", - "test/libtestutil.a" - ], "test/asn1_string_table_test" => [ "libcrypto", "test/libtestutil.a" @@ -7482,10 +7427,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -7751,8 +7692,6 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "libcrypto.a", - "providers/libcommon.a", - "providers/liblegacy.a", "test/libtestutil.a" ], "test/evp_extra_test2" => [ @@ -9874,7 +9813,6 @@ our %unified_info = ( }, "providers" => { "deps" => [ - "providers/evp_extra_test-bin-legacyprov.o", "providers/libcrypto-lib-baseprov.o", "providers/libcrypto-lib-defltprov.o", "providers/libcrypto-lib-nullprov.o", @@ -9882,9 +9820,6 @@ our %unified_info = ( "providers/libdefault.a" ], "products" => { - "bin" => [ - "test/evp_extra_test" - ], "dso" => [ "providers/fips", "providers/legacy" @@ -10321,7 +10256,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10372,7 +10306,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -11504,9 +11437,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -11804,9 +11734,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -12575,9 +12502,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -12872,9 +12796,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -12908,12 +12829,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -13898,9 +13813,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -14198,9 +14110,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -14969,9 +14878,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -15266,9 +15172,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -15302,12 +15205,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -16336,10 +16233,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16416,9 +16309,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "whrlpool" ], - "test/p_minimal.ld" => [ - "util/providers.num" - ], "test/p_test.ld" => [ "util/providers.num" ], @@ -16584,7 +16474,6 @@ our %unified_info = ( "doc/html/man3/CMS_get1_ReceiptRequest.html", "doc/html/man3/CMS_sign.html", "doc/html/man3/CMS_sign_receipt.html", - "doc/html/man3/CMS_signed_get_attr.html", "doc/html/man3/CMS_uncompress.html", "doc/html/man3/CMS_verify.html", "doc/html/man3/CMS_verify_receipt.html", @@ -16684,7 +16573,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_encapsulate.html", "doc/html/man3/EVP_PKEY_encrypt.html", "doc/html/man3/EVP_PKEY_fromdata.html", - "doc/html/man3/EVP_PKEY_get_attr.html", "doc/html/man3/EVP_PKEY_get_default_digest_nid.html", "doc/html/man3/EVP_PKEY_get_field_type.html", "doc/html/man3/EVP_PKEY_get_group_name.html", @@ -16941,7 +16829,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -17040,7 +16927,6 @@ our %unified_info = ( "doc/html/man3/X509V3_get_d2i.html", "doc/html/man3/X509V3_set_ctx.html", "doc/html/man3/X509_ALGOR_dup.html", - "doc/html/man3/X509_ATTRIBUTE.html", "doc/html/man3/X509_CRL_get0_by_serial.html", "doc/html/man3/X509_EXTENSION_set_object.html", "doc/html/man3/X509_LOOKUP.html", @@ -17052,8 +16938,6 @@ our %unified_info = ( "doc/html/man3/X509_NAME_get_index_by_NID.html", "doc/html/man3/X509_NAME_print_ex.html", "doc/html/man3/X509_PUBKEY_new.html", - "doc/html/man3/X509_REQ_get_attr.html", - "doc/html/man3/X509_REQ_get_extensions.html", "doc/html/man3/X509_SIG_get0.html", "doc/html/man3/X509_STORE_CTX_get_error.html", "doc/html/man3/X509_STORE_CTX_new.html", @@ -18351,10 +18235,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/asn1_stable_parse_test" => [ - "include", - "apps/include" - ], "test/asn1_string_table_test" => [ "include", "apps/include" @@ -18562,9 +18442,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -18824,9 +18701,7 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "include", - "apps/include", - "providers/common/include", - "providers/implementations/include" + "apps/include" ], "test/evp_extra_test2" => [ "include", @@ -19083,10 +18958,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/p_minimal" => [ - "include", - "." - ], "test/p_test" => [ "include", "." @@ -19576,7 +19447,6 @@ our %unified_info = ( "doc/man/man3/CMS_get1_ReceiptRequest.3", "doc/man/man3/CMS_sign.3", "doc/man/man3/CMS_sign_receipt.3", - "doc/man/man3/CMS_signed_get_attr.3", "doc/man/man3/CMS_uncompress.3", "doc/man/man3/CMS_verify.3", "doc/man/man3/CMS_verify_receipt.3", @@ -19676,7 +19546,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_encapsulate.3", "doc/man/man3/EVP_PKEY_encrypt.3", "doc/man/man3/EVP_PKEY_fromdata.3", - "doc/man/man3/EVP_PKEY_get_attr.3", "doc/man/man3/EVP_PKEY_get_default_digest_nid.3", "doc/man/man3/EVP_PKEY_get_field_type.3", "doc/man/man3/EVP_PKEY_get_group_name.3", @@ -19933,7 +19802,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20032,7 +19900,6 @@ our %unified_info = ( "doc/man/man3/X509V3_get_d2i.3", "doc/man/man3/X509V3_set_ctx.3", "doc/man/man3/X509_ALGOR_dup.3", - "doc/man/man3/X509_ATTRIBUTE.3", "doc/man/man3/X509_CRL_get0_by_serial.3", "doc/man/man3/X509_EXTENSION_set_object.3", "doc/man/man3/X509_LOOKUP.3", @@ -20044,8 +19911,6 @@ our %unified_info = ( "doc/man/man3/X509_NAME_get_index_by_NID.3", "doc/man/man3/X509_NAME_print_ex.3", "doc/man/man3/X509_PUBKEY_new.3", - "doc/man/man3/X509_REQ_get_attr.3", - "doc/man/man3/X509_REQ_get_extensions.3", "doc/man/man3/X509_SIG_get0.3", "doc/man/man3/X509_STORE_CTX_get_error.3", "doc/man/man3/X509_STORE_CTX_new.3", @@ -20229,7 +20094,6 @@ our %unified_info = ( "modules" => [ "providers/fips", "providers/legacy", - "test/p_minimal", "test/p_test" ], "programs" => [ @@ -20255,7 +20119,6 @@ our %unified_info = ( "test/asn1_dsa_internal_test", "test/asn1_encode_test", "test/asn1_internal_test", - "test/asn1_stable_parse_test", "test/asn1_string_table_test", "test/asn1_time_test", "test/asynciotest", @@ -20319,7 +20182,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24613,7 +24475,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24640,7 +24501,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -24742,9 +24602,6 @@ our %unified_info = ( "providers/common/libfips-lib-securitycheck_fips.o" => [ "providers/common/securitycheck_fips.c" ], - "providers/evp_extra_test-bin-legacyprov.o" => [ - "providers/legacyprov.c" - ], "providers/fips" => [ "providers/fips.ld", "providers/fips/fips-dso-fips_entry.o" @@ -25904,9 +25761,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25988,9 +25842,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -26048,12 +25899,6 @@ our %unified_info = ( "test/asn1_internal_test-bin-asn1_internal_test.o" => [ "test/asn1_internal_test.c" ], - "test/asn1_stable_parse_test" => [ - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" - ], - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" => [ - "test/asn1_stable_parse_test.c" - ], "test/asn1_string_table_test" => [ "test/asn1_string_table_test-bin-asn1_string_table_test.o" ], @@ -26433,12 +26278,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -26837,7 +26676,6 @@ our %unified_info = ( "test/errtest.c" ], "test/evp_extra_test" => [ - "providers/evp_extra_test-bin-legacyprov.o", "test/evp_extra_test-bin-evp_extra_test.o" ], "test/evp_extra_test-bin-evp_extra_test.o" => [ @@ -27128,13 +26966,6 @@ our %unified_info = ( "test/ossl_store_test-bin-ossl_store_test.o" => [ "test/ossl_store_test.c" ], - "test/p_minimal" => [ - "test/p_minimal-dso-p_minimal.o", - "test/p_minimal.ld" - ], - "test/p_minimal-dso-p_minimal.o" => [ - "test/p_minimal.c" - ], "test/p_test" => [ "test/p_test-dso-p_test.o", "test/p_test.ld" @@ -27821,8 +27652,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27849,7 +27680,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27866,8 +27697,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux-x86_64/asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-x86_64/asm/crypto/buildinf.h index 699fafe5c..2780da247 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-x86_64/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-x86_64" -#define DATE "built on: Wed Jan 31 13:02:36 2024 UTC" +#define DATE "built on: Tue Aug 6 12:25:23 2024 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-x86_64/asm/include/openssl/bio.h b/deps/openssl/config/archs/linux-x86_64/asm/include/openssl/bio.h index f9aa74731..e16cf622c 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/linux-x86_64/asm/include/openssl/bio.h @@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, - int (*ossl_gets) (BIO *, char *, int)); + int (*gets) (BIO *, char *, int)); long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); diff --git a/deps/openssl/config/archs/linux-x86_64/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux-x86_64/asm/include/openssl/opensslv.h index 65f3bfa05..5bb97d596 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux-x86_64/asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 13 +# define OPENSSL_VERSION_PATCH 9 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.13" -# define OPENSSL_FULL_VERSION_STR "3.0.13+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "30 Jan 2024" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13+quic 30 Jan 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux-x86_64/asm/include/openssl/pkcs7.h b/deps/openssl/config/archs/linux-x86_64/asm/include/openssl/pkcs7.h index 0ce79bf4f..557a0a726 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm/include/openssl/pkcs7.h +++ b/deps/openssl/config/archs/linux-x86_64/asm/include/openssl/pkcs7.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/pkcs7.h.in * - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -56,8 +56,8 @@ typedef struct pkcs7_signer_info_st { PKCS7_ISSUER_AND_SERIAL *issuer_and_serial; X509_ALGOR *digest_alg; STACK_OF(X509_ATTRIBUTE) *auth_attr; /* [ 0 ] */ - X509_ALGOR *digest_enc_alg; /* confusing name, actually used for signing */ - ASN1_OCTET_STRING *enc_digest; /* confusing name, actually signature */ + X509_ALGOR *digest_enc_alg; + ASN1_OCTET_STRING *enc_digest; STACK_OF(X509_ATTRIBUTE) *unauth_attr; /* [ 1 ] */ /* The private key to sign with */ EVP_PKEY *pkey; diff --git a/deps/openssl/config/archs/linux-x86_64/asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux-x86_64/asm/include/openssl/ssl.h index 0f1915755..3df725c56 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux-x86_64/asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/linux-x86_64/asm/openssl-cl.gypi b/deps/openssl/config/archs/linux-x86_64/asm/openssl-cl.gypi index cae54ea43..f2859f81d 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm/openssl-cl.gypi +++ b/deps/openssl/config/archs/linux-x86_64/asm/openssl-cl.gypi @@ -19,7 +19,6 @@ 'OPENSSL_IA32_SSE2', 'PADLOCK_ASM', 'POLY1305_ASM', - 'RC4_ASM', 'SHA1_ASM', 'SHA256_ASM', 'SHA512_ASM', diff --git a/deps/openssl/config/archs/linux-x86_64/asm/openssl.gypi b/deps/openssl/config/archs/linux-x86_64/asm/openssl.gypi index 14bcd8e7f..d5c6f1001 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm/openssl.gypi +++ b/deps/openssl/config/archs/linux-x86_64/asm/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cfb.c', 'openssl/crypto/aes/aes_ecb.c', @@ -1007,7 +1005,6 @@ 'OPENSSL_IA32_SSE2', 'PADLOCK_ASM', 'POLY1305_ASM', - 'RC4_ASM', 'SHA1_ASM', 'SHA256_ASM', 'SHA512_ASM', diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/configdata.pm b/deps/openssl/config/archs/linux-x86_64/asm_avx2/configdata.pm index f5f1bbec0..9a894f8ba 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/configdata.pm @@ -142,7 +142,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -159,7 +159,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.13+quic", + "full_version" => "3.0.9", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -207,7 +207,7 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "13", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "30 Jan 2024", - "shlib_version" => "81.3", + "release_date" => "30 May 2023", + "shlib_version" => "3", "sourcedir" => ".", "target" => "linux-x86_64", - "version" => "3.0.13" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -395,7 +395,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -791,9 +790,6 @@ our %unified_info = ( "providers/fips" => { "fips" => "1" }, - "test/p_minimal" => { - "noinst" => "1" - }, "test/p_test" => { "noinst" => "1" } @@ -862,9 +858,6 @@ our %unified_info = ( "test/asn1_internal_test" => { "noinst" => "1" }, - "test/asn1_stable_parse_test" => { - "noinst" => "1" - }, "test/asn1_string_table_test" => { "noinst" => "1" }, @@ -1054,9 +1047,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -1613,7 +1603,6 @@ our %unified_info = ( "OPENSSL_IA32_SSE2", "PADLOCK_ASM", "POLY1305_ASM", - "RC4_ASM", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", @@ -1665,11 +1654,7 @@ our %unified_info = ( "X25519_ASM" ], "providers/liblegacy.a" => [ - "MD5_ASM", - "RC4_ASM" - ], - "test/evp_extra_test" => [ - "STATIC_LEGACY" + "MD5_ASM" ], "test/provider_internal_test" => [ "PROVIDER_INIT_FUNCTION_NAME=p_test_init" @@ -2424,9 +2409,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -2724,9 +2706,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -3495,9 +3474,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -3792,9 +3768,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -3828,12 +3801,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -4818,9 +4785,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -5118,9 +5082,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -5889,9 +5850,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -6186,9 +6144,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -6222,12 +6177,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -7225,10 +7174,6 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], - "test/asn1_stable_parse_test" => [ - "libcrypto", - "test/libtestutil.a" - ], "test/asn1_string_table_test" => [ "libcrypto", "test/libtestutil.a" @@ -7482,10 +7427,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -7751,8 +7692,6 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "libcrypto.a", - "providers/libcommon.a", - "providers/liblegacy.a", "test/libtestutil.a" ], "test/evp_extra_test2" => [ @@ -9874,7 +9813,6 @@ our %unified_info = ( }, "providers" => { "deps" => [ - "providers/evp_extra_test-bin-legacyprov.o", "providers/libcrypto-lib-baseprov.o", "providers/libcrypto-lib-defltprov.o", "providers/libcrypto-lib-nullprov.o", @@ -9882,9 +9820,6 @@ our %unified_info = ( "providers/libdefault.a" ], "products" => { - "bin" => [ - "test/evp_extra_test" - ], "dso" => [ "providers/fips", "providers/legacy" @@ -10321,7 +10256,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10372,7 +10306,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -11504,9 +11437,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -11804,9 +11734,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -12575,9 +12502,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -12872,9 +12796,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -12908,12 +12829,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -13898,9 +13813,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -14198,9 +14110,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -14969,9 +14878,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -15266,9 +15172,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -15302,12 +15205,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -16336,10 +16233,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16416,9 +16309,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "whrlpool" ], - "test/p_minimal.ld" => [ - "util/providers.num" - ], "test/p_test.ld" => [ "util/providers.num" ], @@ -16584,7 +16474,6 @@ our %unified_info = ( "doc/html/man3/CMS_get1_ReceiptRequest.html", "doc/html/man3/CMS_sign.html", "doc/html/man3/CMS_sign_receipt.html", - "doc/html/man3/CMS_signed_get_attr.html", "doc/html/man3/CMS_uncompress.html", "doc/html/man3/CMS_verify.html", "doc/html/man3/CMS_verify_receipt.html", @@ -16684,7 +16573,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_encapsulate.html", "doc/html/man3/EVP_PKEY_encrypt.html", "doc/html/man3/EVP_PKEY_fromdata.html", - "doc/html/man3/EVP_PKEY_get_attr.html", "doc/html/man3/EVP_PKEY_get_default_digest_nid.html", "doc/html/man3/EVP_PKEY_get_field_type.html", "doc/html/man3/EVP_PKEY_get_group_name.html", @@ -16941,7 +16829,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -17040,7 +16927,6 @@ our %unified_info = ( "doc/html/man3/X509V3_get_d2i.html", "doc/html/man3/X509V3_set_ctx.html", "doc/html/man3/X509_ALGOR_dup.html", - "doc/html/man3/X509_ATTRIBUTE.html", "doc/html/man3/X509_CRL_get0_by_serial.html", "doc/html/man3/X509_EXTENSION_set_object.html", "doc/html/man3/X509_LOOKUP.html", @@ -17052,8 +16938,6 @@ our %unified_info = ( "doc/html/man3/X509_NAME_get_index_by_NID.html", "doc/html/man3/X509_NAME_print_ex.html", "doc/html/man3/X509_PUBKEY_new.html", - "doc/html/man3/X509_REQ_get_attr.html", - "doc/html/man3/X509_REQ_get_extensions.html", "doc/html/man3/X509_SIG_get0.html", "doc/html/man3/X509_STORE_CTX_get_error.html", "doc/html/man3/X509_STORE_CTX_new.html", @@ -18351,10 +18235,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/asn1_stable_parse_test" => [ - "include", - "apps/include" - ], "test/asn1_string_table_test" => [ "include", "apps/include" @@ -18562,9 +18442,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -18824,9 +18701,7 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "include", - "apps/include", - "providers/common/include", - "providers/implementations/include" + "apps/include" ], "test/evp_extra_test2" => [ "include", @@ -19083,10 +18958,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/p_minimal" => [ - "include", - "." - ], "test/p_test" => [ "include", "." @@ -19576,7 +19447,6 @@ our %unified_info = ( "doc/man/man3/CMS_get1_ReceiptRequest.3", "doc/man/man3/CMS_sign.3", "doc/man/man3/CMS_sign_receipt.3", - "doc/man/man3/CMS_signed_get_attr.3", "doc/man/man3/CMS_uncompress.3", "doc/man/man3/CMS_verify.3", "doc/man/man3/CMS_verify_receipt.3", @@ -19676,7 +19546,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_encapsulate.3", "doc/man/man3/EVP_PKEY_encrypt.3", "doc/man/man3/EVP_PKEY_fromdata.3", - "doc/man/man3/EVP_PKEY_get_attr.3", "doc/man/man3/EVP_PKEY_get_default_digest_nid.3", "doc/man/man3/EVP_PKEY_get_field_type.3", "doc/man/man3/EVP_PKEY_get_group_name.3", @@ -19933,7 +19802,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20032,7 +19900,6 @@ our %unified_info = ( "doc/man/man3/X509V3_get_d2i.3", "doc/man/man3/X509V3_set_ctx.3", "doc/man/man3/X509_ALGOR_dup.3", - "doc/man/man3/X509_ATTRIBUTE.3", "doc/man/man3/X509_CRL_get0_by_serial.3", "doc/man/man3/X509_EXTENSION_set_object.3", "doc/man/man3/X509_LOOKUP.3", @@ -20044,8 +19911,6 @@ our %unified_info = ( "doc/man/man3/X509_NAME_get_index_by_NID.3", "doc/man/man3/X509_NAME_print_ex.3", "doc/man/man3/X509_PUBKEY_new.3", - "doc/man/man3/X509_REQ_get_attr.3", - "doc/man/man3/X509_REQ_get_extensions.3", "doc/man/man3/X509_SIG_get0.3", "doc/man/man3/X509_STORE_CTX_get_error.3", "doc/man/man3/X509_STORE_CTX_new.3", @@ -20229,7 +20094,6 @@ our %unified_info = ( "modules" => [ "providers/fips", "providers/legacy", - "test/p_minimal", "test/p_test" ], "programs" => [ @@ -20255,7 +20119,6 @@ our %unified_info = ( "test/asn1_dsa_internal_test", "test/asn1_encode_test", "test/asn1_internal_test", - "test/asn1_stable_parse_test", "test/asn1_string_table_test", "test/asn1_time_test", "test/asynciotest", @@ -20319,7 +20182,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24613,7 +24475,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24640,7 +24501,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -24742,9 +24602,6 @@ our %unified_info = ( "providers/common/libfips-lib-securitycheck_fips.o" => [ "providers/common/securitycheck_fips.c" ], - "providers/evp_extra_test-bin-legacyprov.o" => [ - "providers/legacyprov.c" - ], "providers/fips" => [ "providers/fips.ld", "providers/fips/fips-dso-fips_entry.o" @@ -25904,9 +25761,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25988,9 +25842,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -26048,12 +25899,6 @@ our %unified_info = ( "test/asn1_internal_test-bin-asn1_internal_test.o" => [ "test/asn1_internal_test.c" ], - "test/asn1_stable_parse_test" => [ - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" - ], - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" => [ - "test/asn1_stable_parse_test.c" - ], "test/asn1_string_table_test" => [ "test/asn1_string_table_test-bin-asn1_string_table_test.o" ], @@ -26433,12 +26278,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -26837,7 +26676,6 @@ our %unified_info = ( "test/errtest.c" ], "test/evp_extra_test" => [ - "providers/evp_extra_test-bin-legacyprov.o", "test/evp_extra_test-bin-evp_extra_test.o" ], "test/evp_extra_test-bin-evp_extra_test.o" => [ @@ -27128,13 +26966,6 @@ our %unified_info = ( "test/ossl_store_test-bin-ossl_store_test.o" => [ "test/ossl_store_test.c" ], - "test/p_minimal" => [ - "test/p_minimal-dso-p_minimal.o", - "test/p_minimal.ld" - ], - "test/p_minimal-dso-p_minimal.o" => [ - "test/p_minimal.c" - ], "test/p_test" => [ "test/p_test-dso-p_test.o", "test/p_test.ld" @@ -27821,8 +27652,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27849,7 +27680,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27866,8 +27697,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/buildinf.h index 5804b20f5..9d57177bf 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-x86_64" -#define DATE "built on: Wed Jan 31 13:02:51 2024 UTC" +#define DATE "built on: Tue Aug 6 12:25:37 2024 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/openssl/bio.h b/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/openssl/bio.h index f9aa74731..e16cf622c 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/openssl/bio.h +++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/openssl/bio.h @@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, - int (*ossl_gets) (BIO *, char *, int)); + int (*gets) (BIO *, char *, int)); long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/openssl/opensslv.h index 65f3bfa05..5bb97d596 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 13 +# define OPENSSL_VERSION_PATCH 9 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.13" -# define OPENSSL_FULL_VERSION_STR "3.0.13+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "30 Jan 2024" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13+quic 30 Jan 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/openssl/pkcs7.h b/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/openssl/pkcs7.h index 0ce79bf4f..557a0a726 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/openssl/pkcs7.h +++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/openssl/pkcs7.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/pkcs7.h.in * - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -56,8 +56,8 @@ typedef struct pkcs7_signer_info_st { PKCS7_ISSUER_AND_SERIAL *issuer_and_serial; X509_ALGOR *digest_alg; STACK_OF(X509_ATTRIBUTE) *auth_attr; /* [ 0 ] */ - X509_ALGOR *digest_enc_alg; /* confusing name, actually used for signing */ - ASN1_OCTET_STRING *enc_digest; /* confusing name, actually signature */ + X509_ALGOR *digest_enc_alg; + ASN1_OCTET_STRING *enc_digest; STACK_OF(X509_ATTRIBUTE) *unauth_attr; /* [ 1 ] */ /* The private key to sign with */ EVP_PKEY *pkey; diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/openssl/ssl.h index 0f1915755..3df725c56 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/openssl-cl.gypi b/deps/openssl/config/archs/linux-x86_64/asm_avx2/openssl-cl.gypi index e6e8d9052..b69ffe3bc 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/openssl-cl.gypi +++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/openssl-cl.gypi @@ -19,7 +19,6 @@ 'OPENSSL_IA32_SSE2', 'PADLOCK_ASM', 'POLY1305_ASM', - 'RC4_ASM', 'SHA1_ASM', 'SHA256_ASM', 'SHA512_ASM', diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/openssl.gypi b/deps/openssl/config/archs/linux-x86_64/asm_avx2/openssl.gypi index 20c248d53..fdcb3d09b 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cfb.c', 'openssl/crypto/aes/aes_ecb.c', @@ -1007,7 +1005,6 @@ 'OPENSSL_IA32_SSE2', 'PADLOCK_ASM', 'POLY1305_ASM', - 'RC4_ASM', 'SHA1_ASM', 'SHA256_ASM', 'SHA512_ASM', diff --git a/deps/openssl/config/archs/linux-x86_64/no-asm/configdata.pm b/deps/openssl/config/archs/linux-x86_64/no-asm/configdata.pm index 973e1e126..797069dbb 100644 --- a/deps/openssl/config/archs/linux-x86_64/no-asm/configdata.pm +++ b/deps/openssl/config/archs/linux-x86_64/no-asm/configdata.pm @@ -142,7 +142,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [], @@ -157,7 +157,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.13+quic", + "full_version" => "3.0.9", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,7 +206,7 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "13", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "30 Jan 2024", - "shlib_version" => "81.3", + "release_date" => "30 May 2023", + "shlib_version" => "3", "sourcedir" => ".", "target" => "linux-x86_64", - "version" => "3.0.13" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -395,7 +395,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -792,9 +791,6 @@ our %unified_info = ( "providers/fips" => { "fips" => "1" }, - "test/p_minimal" => { - "noinst" => "1" - }, "test/p_test" => { "noinst" => "1" } @@ -863,9 +859,6 @@ our %unified_info = ( "test/asn1_internal_test" => { "noinst" => "1" }, - "test/asn1_stable_parse_test" => { - "noinst" => "1" - }, "test/asn1_string_table_test" => { "noinst" => "1" }, @@ -1055,9 +1048,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -1605,9 +1595,6 @@ our %unified_info = ( "providers/libfips.a" => [ "FIPS_MODULE" ], - "test/evp_extra_test" => [ - "STATIC_LEGACY" - ], "test/provider_internal_test" => [ "PROVIDER_INIT_FUNCTION_NAME=p_test_init" ], @@ -2361,9 +2348,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -2661,9 +2645,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -3432,9 +3413,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -3729,9 +3707,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -3765,12 +3740,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -4755,9 +4724,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -5055,9 +5021,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -5826,9 +5789,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -6123,9 +6083,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -6159,12 +6116,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -7162,10 +7113,6 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], - "test/asn1_stable_parse_test" => [ - "libcrypto", - "test/libtestutil.a" - ], "test/asn1_string_table_test" => [ "libcrypto", "test/libtestutil.a" @@ -7419,10 +7366,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -7688,8 +7631,6 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "libcrypto.a", - "providers/libcommon.a", - "providers/liblegacy.a", "test/libtestutil.a" ], "test/evp_extra_test2" => [ @@ -9753,7 +9694,6 @@ our %unified_info = ( }, "providers" => { "deps" => [ - "providers/evp_extra_test-bin-legacyprov.o", "providers/libcrypto-lib-baseprov.o", "providers/libcrypto-lib-defltprov.o", "providers/libcrypto-lib-nullprov.o", @@ -9761,9 +9701,6 @@ our %unified_info = ( "providers/libdefault.a" ], "products" => { - "bin" => [ - "test/evp_extra_test" - ], "dso" => [ "providers/fips", "providers/legacy" @@ -10200,7 +10137,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10251,7 +10187,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -11383,9 +11318,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -11683,9 +11615,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -12454,9 +12383,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -12751,9 +12677,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -12787,12 +12710,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -13777,9 +13694,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -14077,9 +13991,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -14848,9 +14759,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -15145,9 +15053,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -15181,12 +15086,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -16215,10 +16114,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16295,9 +16190,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "whrlpool" ], - "test/p_minimal.ld" => [ - "util/providers.num" - ], "test/p_test.ld" => [ "util/providers.num" ], @@ -16463,7 +16355,6 @@ our %unified_info = ( "doc/html/man3/CMS_get1_ReceiptRequest.html", "doc/html/man3/CMS_sign.html", "doc/html/man3/CMS_sign_receipt.html", - "doc/html/man3/CMS_signed_get_attr.html", "doc/html/man3/CMS_uncompress.html", "doc/html/man3/CMS_verify.html", "doc/html/man3/CMS_verify_receipt.html", @@ -16563,7 +16454,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_encapsulate.html", "doc/html/man3/EVP_PKEY_encrypt.html", "doc/html/man3/EVP_PKEY_fromdata.html", - "doc/html/man3/EVP_PKEY_get_attr.html", "doc/html/man3/EVP_PKEY_get_default_digest_nid.html", "doc/html/man3/EVP_PKEY_get_field_type.html", "doc/html/man3/EVP_PKEY_get_group_name.html", @@ -16820,7 +16710,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -16919,7 +16808,6 @@ our %unified_info = ( "doc/html/man3/X509V3_get_d2i.html", "doc/html/man3/X509V3_set_ctx.html", "doc/html/man3/X509_ALGOR_dup.html", - "doc/html/man3/X509_ATTRIBUTE.html", "doc/html/man3/X509_CRL_get0_by_serial.html", "doc/html/man3/X509_EXTENSION_set_object.html", "doc/html/man3/X509_LOOKUP.html", @@ -16931,8 +16819,6 @@ our %unified_info = ( "doc/html/man3/X509_NAME_get_index_by_NID.html", "doc/html/man3/X509_NAME_print_ex.html", "doc/html/man3/X509_PUBKEY_new.html", - "doc/html/man3/X509_REQ_get_attr.html", - "doc/html/man3/X509_REQ_get_extensions.html", "doc/html/man3/X509_SIG_get0.html", "doc/html/man3/X509_STORE_CTX_get_error.html", "doc/html/man3/X509_STORE_CTX_new.html", @@ -18230,10 +18116,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/asn1_stable_parse_test" => [ - "include", - "apps/include" - ], "test/asn1_string_table_test" => [ "include", "apps/include" @@ -18441,9 +18323,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -18703,9 +18582,7 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "include", - "apps/include", - "providers/common/include", - "providers/implementations/include" + "apps/include" ], "test/evp_extra_test2" => [ "include", @@ -18962,10 +18839,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/p_minimal" => [ - "include", - "." - ], "test/p_test" => [ "include", "." @@ -19455,7 +19328,6 @@ our %unified_info = ( "doc/man/man3/CMS_get1_ReceiptRequest.3", "doc/man/man3/CMS_sign.3", "doc/man/man3/CMS_sign_receipt.3", - "doc/man/man3/CMS_signed_get_attr.3", "doc/man/man3/CMS_uncompress.3", "doc/man/man3/CMS_verify.3", "doc/man/man3/CMS_verify_receipt.3", @@ -19555,7 +19427,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_encapsulate.3", "doc/man/man3/EVP_PKEY_encrypt.3", "doc/man/man3/EVP_PKEY_fromdata.3", - "doc/man/man3/EVP_PKEY_get_attr.3", "doc/man/man3/EVP_PKEY_get_default_digest_nid.3", "doc/man/man3/EVP_PKEY_get_field_type.3", "doc/man/man3/EVP_PKEY_get_group_name.3", @@ -19812,7 +19683,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -19911,7 +19781,6 @@ our %unified_info = ( "doc/man/man3/X509V3_get_d2i.3", "doc/man/man3/X509V3_set_ctx.3", "doc/man/man3/X509_ALGOR_dup.3", - "doc/man/man3/X509_ATTRIBUTE.3", "doc/man/man3/X509_CRL_get0_by_serial.3", "doc/man/man3/X509_EXTENSION_set_object.3", "doc/man/man3/X509_LOOKUP.3", @@ -19923,8 +19792,6 @@ our %unified_info = ( "doc/man/man3/X509_NAME_get_index_by_NID.3", "doc/man/man3/X509_NAME_print_ex.3", "doc/man/man3/X509_PUBKEY_new.3", - "doc/man/man3/X509_REQ_get_attr.3", - "doc/man/man3/X509_REQ_get_extensions.3", "doc/man/man3/X509_SIG_get0.3", "doc/man/man3/X509_STORE_CTX_get_error.3", "doc/man/man3/X509_STORE_CTX_new.3", @@ -20108,7 +19975,6 @@ our %unified_info = ( "modules" => [ "providers/fips", "providers/legacy", - "test/p_minimal", "test/p_test" ], "programs" => [ @@ -20134,7 +20000,6 @@ our %unified_info = ( "test/asn1_dsa_internal_test", "test/asn1_encode_test", "test/asn1_internal_test", - "test/asn1_stable_parse_test", "test/asn1_string_table_test", "test/asn1_time_test", "test/asynciotest", @@ -20198,7 +20063,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24323,7 +24187,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24350,7 +24213,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -24452,9 +24314,6 @@ our %unified_info = ( "providers/common/libfips-lib-securitycheck_fips.o" => [ "providers/common/securitycheck_fips.c" ], - "providers/evp_extra_test-bin-legacyprov.o" => [ - "providers/legacyprov.c" - ], "providers/fips" => [ "providers/fips.ld", "providers/fips/fips-dso-fips_entry.o" @@ -25591,9 +25450,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25675,9 +25531,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25735,12 +25588,6 @@ our %unified_info = ( "test/asn1_internal_test-bin-asn1_internal_test.o" => [ "test/asn1_internal_test.c" ], - "test/asn1_stable_parse_test" => [ - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" - ], - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" => [ - "test/asn1_stable_parse_test.c" - ], "test/asn1_string_table_test" => [ "test/asn1_string_table_test-bin-asn1_string_table_test.o" ], @@ -26120,12 +25967,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -26524,7 +26365,6 @@ our %unified_info = ( "test/errtest.c" ], "test/evp_extra_test" => [ - "providers/evp_extra_test-bin-legacyprov.o", "test/evp_extra_test-bin-evp_extra_test.o" ], "test/evp_extra_test-bin-evp_extra_test.o" => [ @@ -26815,13 +26655,6 @@ our %unified_info = ( "test/ossl_store_test-bin-ossl_store_test.o" => [ "test/ossl_store_test.c" ], - "test/p_minimal" => [ - "test/p_minimal-dso-p_minimal.o", - "test/p_minimal.ld" - ], - "test/p_minimal-dso-p_minimal.o" => [ - "test/p_minimal.c" - ], "test/p_test" => [ "test/p_test-dso-p_test.o", "test/p_test.ld" @@ -27511,8 +27344,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27539,7 +27372,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27556,8 +27389,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux-x86_64/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-x86_64/no-asm/crypto/buildinf.h index cc6654b94..824fc7c4c 100644 --- a/deps/openssl/config/archs/linux-x86_64/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-x86_64/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-x86_64" -#define DATE "built on: Wed Jan 31 13:03:07 2024 UTC" +#define DATE "built on: Tue Aug 6 12:25:51 2024 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-x86_64/no-asm/include/openssl/bio.h b/deps/openssl/config/archs/linux-x86_64/no-asm/include/openssl/bio.h index f9aa74731..e16cf622c 100644 --- a/deps/openssl/config/archs/linux-x86_64/no-asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/linux-x86_64/no-asm/include/openssl/bio.h @@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, - int (*ossl_gets) (BIO *, char *, int)); + int (*gets) (BIO *, char *, int)); long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); diff --git a/deps/openssl/config/archs/linux-x86_64/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux-x86_64/no-asm/include/openssl/opensslv.h index 65f3bfa05..5bb97d596 100644 --- a/deps/openssl/config/archs/linux-x86_64/no-asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux-x86_64/no-asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 13 +# define OPENSSL_VERSION_PATCH 9 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.13" -# define OPENSSL_FULL_VERSION_STR "3.0.13+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "30 Jan 2024" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13+quic 30 Jan 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux-x86_64/no-asm/include/openssl/pkcs7.h b/deps/openssl/config/archs/linux-x86_64/no-asm/include/openssl/pkcs7.h index 0ce79bf4f..557a0a726 100644 --- a/deps/openssl/config/archs/linux-x86_64/no-asm/include/openssl/pkcs7.h +++ b/deps/openssl/config/archs/linux-x86_64/no-asm/include/openssl/pkcs7.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/pkcs7.h.in * - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -56,8 +56,8 @@ typedef struct pkcs7_signer_info_st { PKCS7_ISSUER_AND_SERIAL *issuer_and_serial; X509_ALGOR *digest_alg; STACK_OF(X509_ATTRIBUTE) *auth_attr; /* [ 0 ] */ - X509_ALGOR *digest_enc_alg; /* confusing name, actually used for signing */ - ASN1_OCTET_STRING *enc_digest; /* confusing name, actually signature */ + X509_ALGOR *digest_enc_alg; + ASN1_OCTET_STRING *enc_digest; STACK_OF(X509_ATTRIBUTE) *unauth_attr; /* [ 1 ] */ /* The private key to sign with */ EVP_PKEY *pkey; diff --git a/deps/openssl/config/archs/linux-x86_64/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux-x86_64/no-asm/include/openssl/ssl.h index 0f1915755..3df725c56 100644 --- a/deps/openssl/config/archs/linux-x86_64/no-asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux-x86_64/no-asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/linux-x86_64/no-asm/openssl.gypi b/deps/openssl/config/archs/linux-x86_64/no-asm/openssl.gypi index f9ab8cd8a..0eae103bf 100644 --- a/deps/openssl/config/archs/linux-x86_64/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/linux-x86_64/no-asm/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cbc.c', 'openssl/crypto/aes/aes_cfb.c', diff --git a/deps/openssl/config/archs/linux32-s390x/asm/configdata.pm b/deps/openssl/config/archs/linux32-s390x/asm/configdata.pm index f03243a0e..b8e90b166 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm/configdata.pm +++ b/deps/openssl/config/archs/linux32-s390x/asm/configdata.pm @@ -142,7 +142,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -159,7 +159,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.13+quic", + "full_version" => "3.0.9", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -207,7 +207,7 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "13", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "30 Jan 2024", - "shlib_version" => "81.3", + "release_date" => "30 May 2023", + "shlib_version" => "3", "sourcedir" => ".", "target" => "linux32-s390x", - "version" => "3.0.13" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -394,7 +394,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -790,9 +789,6 @@ our %unified_info = ( "providers/fips" => { "fips" => "1" }, - "test/p_minimal" => { - "noinst" => "1" - }, "test/p_test" => { "noinst" => "1" } @@ -861,9 +857,6 @@ our %unified_info = ( "test/asn1_internal_test" => { "noinst" => "1" }, - "test/asn1_stable_parse_test" => { - "noinst" => "1" - }, "test/asn1_string_table_test" => { "noinst" => "1" }, @@ -1053,9 +1046,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -1607,7 +1597,6 @@ our %unified_info = ( "OPENSSL_BN_ASM_MONT", "OPENSSL_CPUID_OBJ", "POLY1305_ASM", - "RC4_ASM", "S390X_EC_ASM", "SHA1_ASM", "SHA256_ASM", @@ -1647,12 +1636,6 @@ our %unified_info = ( "SHA256_ASM", "SHA512_ASM" ], - "providers/liblegacy.a" => [ - "RC4_ASM" - ], - "test/evp_extra_test" => [ - "STATIC_LEGACY" - ], "test/provider_internal_test" => [ "PROVIDER_INIT_FUNCTION_NAME=p_test_init" ], @@ -2406,9 +2389,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -2706,9 +2686,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -3477,9 +3454,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -3774,9 +3748,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -3810,12 +3781,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -4800,9 +4765,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -5100,9 +5062,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -5871,9 +5830,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -6168,9 +6124,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -6204,12 +6157,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -7207,10 +7154,6 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], - "test/asn1_stable_parse_test" => [ - "libcrypto", - "test/libtestutil.a" - ], "test/asn1_string_table_test" => [ "libcrypto", "test/libtestutil.a" @@ -7464,10 +7407,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -7733,8 +7672,6 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "libcrypto.a", - "providers/libcommon.a", - "providers/liblegacy.a", "test/libtestutil.a" ], "test/evp_extra_test2" => [ @@ -9814,7 +9751,6 @@ our %unified_info = ( }, "providers" => { "deps" => [ - "providers/evp_extra_test-bin-legacyprov.o", "providers/libcrypto-lib-baseprov.o", "providers/libcrypto-lib-defltprov.o", "providers/libcrypto-lib-nullprov.o", @@ -9822,9 +9758,6 @@ our %unified_info = ( "providers/libdefault.a" ], "products" => { - "bin" => [ - "test/evp_extra_test" - ], "dso" => [ "providers/fips", "providers/legacy" @@ -10261,7 +10194,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10312,7 +10244,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -11444,9 +11375,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -11744,9 +11672,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -12515,9 +12440,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -12812,9 +12734,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -12848,12 +12767,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -13838,9 +13751,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -14138,9 +14048,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -14909,9 +14816,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -15206,9 +15110,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -15242,12 +15143,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -16276,10 +16171,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16356,9 +16247,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "whrlpool" ], - "test/p_minimal.ld" => [ - "util/providers.num" - ], "test/p_test.ld" => [ "util/providers.num" ], @@ -16524,7 +16412,6 @@ our %unified_info = ( "doc/html/man3/CMS_get1_ReceiptRequest.html", "doc/html/man3/CMS_sign.html", "doc/html/man3/CMS_sign_receipt.html", - "doc/html/man3/CMS_signed_get_attr.html", "doc/html/man3/CMS_uncompress.html", "doc/html/man3/CMS_verify.html", "doc/html/man3/CMS_verify_receipt.html", @@ -16624,7 +16511,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_encapsulate.html", "doc/html/man3/EVP_PKEY_encrypt.html", "doc/html/man3/EVP_PKEY_fromdata.html", - "doc/html/man3/EVP_PKEY_get_attr.html", "doc/html/man3/EVP_PKEY_get_default_digest_nid.html", "doc/html/man3/EVP_PKEY_get_field_type.html", "doc/html/man3/EVP_PKEY_get_group_name.html", @@ -16881,7 +16767,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -16980,7 +16865,6 @@ our %unified_info = ( "doc/html/man3/X509V3_get_d2i.html", "doc/html/man3/X509V3_set_ctx.html", "doc/html/man3/X509_ALGOR_dup.html", - "doc/html/man3/X509_ATTRIBUTE.html", "doc/html/man3/X509_CRL_get0_by_serial.html", "doc/html/man3/X509_EXTENSION_set_object.html", "doc/html/man3/X509_LOOKUP.html", @@ -16992,8 +16876,6 @@ our %unified_info = ( "doc/html/man3/X509_NAME_get_index_by_NID.html", "doc/html/man3/X509_NAME_print_ex.html", "doc/html/man3/X509_PUBKEY_new.html", - "doc/html/man3/X509_REQ_get_attr.html", - "doc/html/man3/X509_REQ_get_extensions.html", "doc/html/man3/X509_SIG_get0.html", "doc/html/man3/X509_STORE_CTX_get_error.html", "doc/html/man3/X509_STORE_CTX_new.html", @@ -18345,10 +18227,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/asn1_stable_parse_test" => [ - "include", - "apps/include" - ], "test/asn1_string_table_test" => [ "include", "apps/include" @@ -18556,9 +18434,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -18818,9 +18693,7 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "include", - "apps/include", - "providers/common/include", - "providers/implementations/include" + "apps/include" ], "test/evp_extra_test2" => [ "include", @@ -19077,10 +18950,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/p_minimal" => [ - "include", - "." - ], "test/p_test" => [ "include", "." @@ -19570,7 +19439,6 @@ our %unified_info = ( "doc/man/man3/CMS_get1_ReceiptRequest.3", "doc/man/man3/CMS_sign.3", "doc/man/man3/CMS_sign_receipt.3", - "doc/man/man3/CMS_signed_get_attr.3", "doc/man/man3/CMS_uncompress.3", "doc/man/man3/CMS_verify.3", "doc/man/man3/CMS_verify_receipt.3", @@ -19670,7 +19538,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_encapsulate.3", "doc/man/man3/EVP_PKEY_encrypt.3", "doc/man/man3/EVP_PKEY_fromdata.3", - "doc/man/man3/EVP_PKEY_get_attr.3", "doc/man/man3/EVP_PKEY_get_default_digest_nid.3", "doc/man/man3/EVP_PKEY_get_field_type.3", "doc/man/man3/EVP_PKEY_get_group_name.3", @@ -19927,7 +19794,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20026,7 +19892,6 @@ our %unified_info = ( "doc/man/man3/X509V3_get_d2i.3", "doc/man/man3/X509V3_set_ctx.3", "doc/man/man3/X509_ALGOR_dup.3", - "doc/man/man3/X509_ATTRIBUTE.3", "doc/man/man3/X509_CRL_get0_by_serial.3", "doc/man/man3/X509_EXTENSION_set_object.3", "doc/man/man3/X509_LOOKUP.3", @@ -20038,8 +19903,6 @@ our %unified_info = ( "doc/man/man3/X509_NAME_get_index_by_NID.3", "doc/man/man3/X509_NAME_print_ex.3", "doc/man/man3/X509_PUBKEY_new.3", - "doc/man/man3/X509_REQ_get_attr.3", - "doc/man/man3/X509_REQ_get_extensions.3", "doc/man/man3/X509_SIG_get0.3", "doc/man/man3/X509_STORE_CTX_get_error.3", "doc/man/man3/X509_STORE_CTX_new.3", @@ -20223,7 +20086,6 @@ our %unified_info = ( "modules" => [ "providers/fips", "providers/legacy", - "test/p_minimal", "test/p_test" ], "programs" => [ @@ -20249,7 +20111,6 @@ our %unified_info = ( "test/asn1_dsa_internal_test", "test/asn1_encode_test", "test/asn1_internal_test", - "test/asn1_stable_parse_test", "test/asn1_string_table_test", "test/asn1_time_test", "test/asynciotest", @@ -20313,7 +20174,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24494,7 +24354,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24521,7 +24380,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -24623,9 +24481,6 @@ our %unified_info = ( "providers/common/libfips-lib-securitycheck_fips.o" => [ "providers/common/securitycheck_fips.c" ], - "providers/evp_extra_test-bin-legacyprov.o" => [ - "providers/legacyprov.c" - ], "providers/fips" => [ "providers/fips.ld", "providers/fips/fips-dso-fips_entry.o" @@ -25770,9 +25625,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25854,9 +25706,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25914,12 +25763,6 @@ our %unified_info = ( "test/asn1_internal_test-bin-asn1_internal_test.o" => [ "test/asn1_internal_test.c" ], - "test/asn1_stable_parse_test" => [ - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" - ], - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" => [ - "test/asn1_stable_parse_test.c" - ], "test/asn1_string_table_test" => [ "test/asn1_string_table_test-bin-asn1_string_table_test.o" ], @@ -26299,12 +26142,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -26703,7 +26540,6 @@ our %unified_info = ( "test/errtest.c" ], "test/evp_extra_test" => [ - "providers/evp_extra_test-bin-legacyprov.o", "test/evp_extra_test-bin-evp_extra_test.o" ], "test/evp_extra_test-bin-evp_extra_test.o" => [ @@ -26994,13 +26830,6 @@ our %unified_info = ( "test/ossl_store_test-bin-ossl_store_test.o" => [ "test/ossl_store_test.c" ], - "test/p_minimal" => [ - "test/p_minimal-dso-p_minimal.o", - "test/p_minimal.ld" - ], - "test/p_minimal-dso-p_minimal.o" => [ - "test/p_minimal.c" - ], "test/p_test" => [ "test/p_test-dso-p_test.o", "test/p_test.ld" @@ -27687,8 +27516,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27715,7 +27544,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27732,8 +27561,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux32-s390x/asm/crypto/buildinf.h b/deps/openssl/config/archs/linux32-s390x/asm/crypto/buildinf.h index 0f0b2de4f..575ffa95a 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux32-s390x/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux32-s390x" -#define DATE "built on: Wed Jan 31 13:03:56 2024 UTC" +#define DATE "built on: Tue Aug 6 12:26:35 2024 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/bio.h b/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/bio.h index f9aa74731..e16cf622c 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/bio.h @@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, - int (*ossl_gets) (BIO *, char *, int)); + int (*gets) (BIO *, char *, int)); long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); diff --git a/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/opensslv.h index 65f3bfa05..5bb97d596 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 13 +# define OPENSSL_VERSION_PATCH 9 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.13" -# define OPENSSL_FULL_VERSION_STR "3.0.13+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "30 Jan 2024" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13+quic 30 Jan 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/pkcs7.h b/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/pkcs7.h index 0ce79bf4f..557a0a726 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/pkcs7.h +++ b/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/pkcs7.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/pkcs7.h.in * - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -56,8 +56,8 @@ typedef struct pkcs7_signer_info_st { PKCS7_ISSUER_AND_SERIAL *issuer_and_serial; X509_ALGOR *digest_alg; STACK_OF(X509_ATTRIBUTE) *auth_attr; /* [ 0 ] */ - X509_ALGOR *digest_enc_alg; /* confusing name, actually used for signing */ - ASN1_OCTET_STRING *enc_digest; /* confusing name, actually signature */ + X509_ALGOR *digest_enc_alg; + ASN1_OCTET_STRING *enc_digest; STACK_OF(X509_ATTRIBUTE) *unauth_attr; /* [ 1 ] */ /* The private key to sign with */ EVP_PKEY *pkey; diff --git a/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/ssl.h index 0f1915755..3df725c56 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/linux32-s390x/asm/openssl-cl.gypi b/deps/openssl/config/archs/linux32-s390x/asm/openssl-cl.gypi index 0333449e3..bc25c5dff 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm/openssl-cl.gypi +++ b/deps/openssl/config/archs/linux32-s390x/asm/openssl-cl.gypi @@ -14,7 +14,6 @@ 'OPENSSL_BN_ASM_MONT', 'OPENSSL_CPUID_OBJ', 'POLY1305_ASM', - 'RC4_ASM', 'S390X_EC_ASM', 'SHA1_ASM', 'SHA256_ASM', diff --git a/deps/openssl/config/archs/linux32-s390x/asm/openssl.gypi b/deps/openssl/config/archs/linux32-s390x/asm/openssl.gypi index 5815f2891..af84af6ee 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm/openssl.gypi +++ b/deps/openssl/config/archs/linux32-s390x/asm/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cfb.c', 'openssl/crypto/aes/aes_ecb.c', @@ -986,7 +984,6 @@ 'OPENSSL_BN_ASM_MONT', 'OPENSSL_CPUID_OBJ', 'POLY1305_ASM', - 'RC4_ASM', 'S390X_EC_ASM', 'SHA1_ASM', 'SHA256_ASM', diff --git a/deps/openssl/config/archs/linux32-s390x/asm_avx2/configdata.pm b/deps/openssl/config/archs/linux32-s390x/asm_avx2/configdata.pm index 3c7006cb9..c757d61da 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/linux32-s390x/asm_avx2/configdata.pm @@ -142,7 +142,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -159,7 +159,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.13+quic", + "full_version" => "3.0.9", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -207,7 +207,7 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "13", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "30 Jan 2024", - "shlib_version" => "81.3", + "release_date" => "30 May 2023", + "shlib_version" => "3", "sourcedir" => ".", "target" => "linux32-s390x", - "version" => "3.0.13" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -394,7 +394,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -790,9 +789,6 @@ our %unified_info = ( "providers/fips" => { "fips" => "1" }, - "test/p_minimal" => { - "noinst" => "1" - }, "test/p_test" => { "noinst" => "1" } @@ -861,9 +857,6 @@ our %unified_info = ( "test/asn1_internal_test" => { "noinst" => "1" }, - "test/asn1_stable_parse_test" => { - "noinst" => "1" - }, "test/asn1_string_table_test" => { "noinst" => "1" }, @@ -1053,9 +1046,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -1607,7 +1597,6 @@ our %unified_info = ( "OPENSSL_BN_ASM_MONT", "OPENSSL_CPUID_OBJ", "POLY1305_ASM", - "RC4_ASM", "S390X_EC_ASM", "SHA1_ASM", "SHA256_ASM", @@ -1647,12 +1636,6 @@ our %unified_info = ( "SHA256_ASM", "SHA512_ASM" ], - "providers/liblegacy.a" => [ - "RC4_ASM" - ], - "test/evp_extra_test" => [ - "STATIC_LEGACY" - ], "test/provider_internal_test" => [ "PROVIDER_INIT_FUNCTION_NAME=p_test_init" ], @@ -2406,9 +2389,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -2706,9 +2686,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -3477,9 +3454,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -3774,9 +3748,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -3810,12 +3781,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -4800,9 +4765,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -5100,9 +5062,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -5871,9 +5830,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -6168,9 +6124,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -6204,12 +6157,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -7207,10 +7154,6 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], - "test/asn1_stable_parse_test" => [ - "libcrypto", - "test/libtestutil.a" - ], "test/asn1_string_table_test" => [ "libcrypto", "test/libtestutil.a" @@ -7464,10 +7407,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -7733,8 +7672,6 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "libcrypto.a", - "providers/libcommon.a", - "providers/liblegacy.a", "test/libtestutil.a" ], "test/evp_extra_test2" => [ @@ -9814,7 +9751,6 @@ our %unified_info = ( }, "providers" => { "deps" => [ - "providers/evp_extra_test-bin-legacyprov.o", "providers/libcrypto-lib-baseprov.o", "providers/libcrypto-lib-defltprov.o", "providers/libcrypto-lib-nullprov.o", @@ -9822,9 +9758,6 @@ our %unified_info = ( "providers/libdefault.a" ], "products" => { - "bin" => [ - "test/evp_extra_test" - ], "dso" => [ "providers/fips", "providers/legacy" @@ -10261,7 +10194,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10312,7 +10244,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -11444,9 +11375,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -11744,9 +11672,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -12515,9 +12440,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -12812,9 +12734,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -12848,12 +12767,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -13838,9 +13751,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -14138,9 +14048,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -14909,9 +14816,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -15206,9 +15110,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -15242,12 +15143,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -16276,10 +16171,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16356,9 +16247,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "whrlpool" ], - "test/p_minimal.ld" => [ - "util/providers.num" - ], "test/p_test.ld" => [ "util/providers.num" ], @@ -16524,7 +16412,6 @@ our %unified_info = ( "doc/html/man3/CMS_get1_ReceiptRequest.html", "doc/html/man3/CMS_sign.html", "doc/html/man3/CMS_sign_receipt.html", - "doc/html/man3/CMS_signed_get_attr.html", "doc/html/man3/CMS_uncompress.html", "doc/html/man3/CMS_verify.html", "doc/html/man3/CMS_verify_receipt.html", @@ -16624,7 +16511,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_encapsulate.html", "doc/html/man3/EVP_PKEY_encrypt.html", "doc/html/man3/EVP_PKEY_fromdata.html", - "doc/html/man3/EVP_PKEY_get_attr.html", "doc/html/man3/EVP_PKEY_get_default_digest_nid.html", "doc/html/man3/EVP_PKEY_get_field_type.html", "doc/html/man3/EVP_PKEY_get_group_name.html", @@ -16881,7 +16767,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -16980,7 +16865,6 @@ our %unified_info = ( "doc/html/man3/X509V3_get_d2i.html", "doc/html/man3/X509V3_set_ctx.html", "doc/html/man3/X509_ALGOR_dup.html", - "doc/html/man3/X509_ATTRIBUTE.html", "doc/html/man3/X509_CRL_get0_by_serial.html", "doc/html/man3/X509_EXTENSION_set_object.html", "doc/html/man3/X509_LOOKUP.html", @@ -16992,8 +16876,6 @@ our %unified_info = ( "doc/html/man3/X509_NAME_get_index_by_NID.html", "doc/html/man3/X509_NAME_print_ex.html", "doc/html/man3/X509_PUBKEY_new.html", - "doc/html/man3/X509_REQ_get_attr.html", - "doc/html/man3/X509_REQ_get_extensions.html", "doc/html/man3/X509_SIG_get0.html", "doc/html/man3/X509_STORE_CTX_get_error.html", "doc/html/man3/X509_STORE_CTX_new.html", @@ -18345,10 +18227,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/asn1_stable_parse_test" => [ - "include", - "apps/include" - ], "test/asn1_string_table_test" => [ "include", "apps/include" @@ -18556,9 +18434,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -18818,9 +18693,7 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "include", - "apps/include", - "providers/common/include", - "providers/implementations/include" + "apps/include" ], "test/evp_extra_test2" => [ "include", @@ -19077,10 +18950,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/p_minimal" => [ - "include", - "." - ], "test/p_test" => [ "include", "." @@ -19570,7 +19439,6 @@ our %unified_info = ( "doc/man/man3/CMS_get1_ReceiptRequest.3", "doc/man/man3/CMS_sign.3", "doc/man/man3/CMS_sign_receipt.3", - "doc/man/man3/CMS_signed_get_attr.3", "doc/man/man3/CMS_uncompress.3", "doc/man/man3/CMS_verify.3", "doc/man/man3/CMS_verify_receipt.3", @@ -19670,7 +19538,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_encapsulate.3", "doc/man/man3/EVP_PKEY_encrypt.3", "doc/man/man3/EVP_PKEY_fromdata.3", - "doc/man/man3/EVP_PKEY_get_attr.3", "doc/man/man3/EVP_PKEY_get_default_digest_nid.3", "doc/man/man3/EVP_PKEY_get_field_type.3", "doc/man/man3/EVP_PKEY_get_group_name.3", @@ -19927,7 +19794,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20026,7 +19892,6 @@ our %unified_info = ( "doc/man/man3/X509V3_get_d2i.3", "doc/man/man3/X509V3_set_ctx.3", "doc/man/man3/X509_ALGOR_dup.3", - "doc/man/man3/X509_ATTRIBUTE.3", "doc/man/man3/X509_CRL_get0_by_serial.3", "doc/man/man3/X509_EXTENSION_set_object.3", "doc/man/man3/X509_LOOKUP.3", @@ -20038,8 +19903,6 @@ our %unified_info = ( "doc/man/man3/X509_NAME_get_index_by_NID.3", "doc/man/man3/X509_NAME_print_ex.3", "doc/man/man3/X509_PUBKEY_new.3", - "doc/man/man3/X509_REQ_get_attr.3", - "doc/man/man3/X509_REQ_get_extensions.3", "doc/man/man3/X509_SIG_get0.3", "doc/man/man3/X509_STORE_CTX_get_error.3", "doc/man/man3/X509_STORE_CTX_new.3", @@ -20223,7 +20086,6 @@ our %unified_info = ( "modules" => [ "providers/fips", "providers/legacy", - "test/p_minimal", "test/p_test" ], "programs" => [ @@ -20249,7 +20111,6 @@ our %unified_info = ( "test/asn1_dsa_internal_test", "test/asn1_encode_test", "test/asn1_internal_test", - "test/asn1_stable_parse_test", "test/asn1_string_table_test", "test/asn1_time_test", "test/asynciotest", @@ -20313,7 +20174,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24494,7 +24354,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24521,7 +24380,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -24623,9 +24481,6 @@ our %unified_info = ( "providers/common/libfips-lib-securitycheck_fips.o" => [ "providers/common/securitycheck_fips.c" ], - "providers/evp_extra_test-bin-legacyprov.o" => [ - "providers/legacyprov.c" - ], "providers/fips" => [ "providers/fips.ld", "providers/fips/fips-dso-fips_entry.o" @@ -25770,9 +25625,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25854,9 +25706,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25914,12 +25763,6 @@ our %unified_info = ( "test/asn1_internal_test-bin-asn1_internal_test.o" => [ "test/asn1_internal_test.c" ], - "test/asn1_stable_parse_test" => [ - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" - ], - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" => [ - "test/asn1_stable_parse_test.c" - ], "test/asn1_string_table_test" => [ "test/asn1_string_table_test-bin-asn1_string_table_test.o" ], @@ -26299,12 +26142,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -26703,7 +26540,6 @@ our %unified_info = ( "test/errtest.c" ], "test/evp_extra_test" => [ - "providers/evp_extra_test-bin-legacyprov.o", "test/evp_extra_test-bin-evp_extra_test.o" ], "test/evp_extra_test-bin-evp_extra_test.o" => [ @@ -26994,13 +26830,6 @@ our %unified_info = ( "test/ossl_store_test-bin-ossl_store_test.o" => [ "test/ossl_store_test.c" ], - "test/p_minimal" => [ - "test/p_minimal-dso-p_minimal.o", - "test/p_minimal.ld" - ], - "test/p_minimal-dso-p_minimal.o" => [ - "test/p_minimal.c" - ], "test/p_test" => [ "test/p_test-dso-p_test.o", "test/p_test.ld" @@ -27687,8 +27516,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27715,7 +27544,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27732,8 +27561,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux32-s390x/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/linux32-s390x/asm_avx2/crypto/buildinf.h index e8782c94c..900afc083 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux32-s390x/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux32-s390x" -#define DATE "built on: Wed Jan 31 13:04:09 2024 UTC" +#define DATE "built on: Tue Aug 6 12:26:47 2024 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/openssl/bio.h b/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/openssl/bio.h index f9aa74731..e16cf622c 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/openssl/bio.h +++ b/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/openssl/bio.h @@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, - int (*ossl_gets) (BIO *, char *, int)); + int (*gets) (BIO *, char *, int)); long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); diff --git a/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/openssl/opensslv.h index 65f3bfa05..5bb97d596 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 13 +# define OPENSSL_VERSION_PATCH 9 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.13" -# define OPENSSL_FULL_VERSION_STR "3.0.13+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "30 Jan 2024" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13+quic 30 Jan 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/openssl/pkcs7.h b/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/openssl/pkcs7.h index 0ce79bf4f..557a0a726 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/openssl/pkcs7.h +++ b/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/openssl/pkcs7.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/pkcs7.h.in * - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -56,8 +56,8 @@ typedef struct pkcs7_signer_info_st { PKCS7_ISSUER_AND_SERIAL *issuer_and_serial; X509_ALGOR *digest_alg; STACK_OF(X509_ATTRIBUTE) *auth_attr; /* [ 0 ] */ - X509_ALGOR *digest_enc_alg; /* confusing name, actually used for signing */ - ASN1_OCTET_STRING *enc_digest; /* confusing name, actually signature */ + X509_ALGOR *digest_enc_alg; + ASN1_OCTET_STRING *enc_digest; STACK_OF(X509_ATTRIBUTE) *unauth_attr; /* [ 1 ] */ /* The private key to sign with */ EVP_PKEY *pkey; diff --git a/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/openssl/ssl.h index 0f1915755..3df725c56 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/linux32-s390x/asm_avx2/openssl-cl.gypi b/deps/openssl/config/archs/linux32-s390x/asm_avx2/openssl-cl.gypi index ea32a6d1e..37d3f6b82 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm_avx2/openssl-cl.gypi +++ b/deps/openssl/config/archs/linux32-s390x/asm_avx2/openssl-cl.gypi @@ -14,7 +14,6 @@ 'OPENSSL_BN_ASM_MONT', 'OPENSSL_CPUID_OBJ', 'POLY1305_ASM', - 'RC4_ASM', 'S390X_EC_ASM', 'SHA1_ASM', 'SHA256_ASM', diff --git a/deps/openssl/config/archs/linux32-s390x/asm_avx2/openssl.gypi b/deps/openssl/config/archs/linux32-s390x/asm_avx2/openssl.gypi index 9cebf7a2e..200971ba3 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/linux32-s390x/asm_avx2/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cfb.c', 'openssl/crypto/aes/aes_ecb.c', @@ -986,7 +984,6 @@ 'OPENSSL_BN_ASM_MONT', 'OPENSSL_CPUID_OBJ', 'POLY1305_ASM', - 'RC4_ASM', 'S390X_EC_ASM', 'SHA1_ASM', 'SHA256_ASM', diff --git a/deps/openssl/config/archs/linux32-s390x/no-asm/configdata.pm b/deps/openssl/config/archs/linux32-s390x/no-asm/configdata.pm index f363125e2..c9166133a 100644 --- a/deps/openssl/config/archs/linux32-s390x/no-asm/configdata.pm +++ b/deps/openssl/config/archs/linux32-s390x/no-asm/configdata.pm @@ -142,7 +142,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [], @@ -157,7 +157,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.13+quic", + "full_version" => "3.0.9", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,7 +206,7 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "13", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "30 Jan 2024", - "shlib_version" => "81.3", + "release_date" => "30 May 2023", + "shlib_version" => "3", "sourcedir" => ".", "target" => "linux32-s390x", - "version" => "3.0.13" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -394,7 +394,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -791,9 +790,6 @@ our %unified_info = ( "providers/fips" => { "fips" => "1" }, - "test/p_minimal" => { - "noinst" => "1" - }, "test/p_test" => { "noinst" => "1" } @@ -862,9 +858,6 @@ our %unified_info = ( "test/asn1_internal_test" => { "noinst" => "1" }, - "test/asn1_stable_parse_test" => { - "noinst" => "1" - }, "test/asn1_string_table_test" => { "noinst" => "1" }, @@ -1054,9 +1047,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -1604,9 +1594,6 @@ our %unified_info = ( "providers/libfips.a" => [ "FIPS_MODULE" ], - "test/evp_extra_test" => [ - "STATIC_LEGACY" - ], "test/provider_internal_test" => [ "PROVIDER_INIT_FUNCTION_NAME=p_test_init" ], @@ -2360,9 +2347,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -2660,9 +2644,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -3431,9 +3412,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -3728,9 +3706,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -3764,12 +3739,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -4754,9 +4723,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -5054,9 +5020,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -5825,9 +5788,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -6122,9 +6082,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -6158,12 +6115,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -7161,10 +7112,6 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], - "test/asn1_stable_parse_test" => [ - "libcrypto", - "test/libtestutil.a" - ], "test/asn1_string_table_test" => [ "libcrypto", "test/libtestutil.a" @@ -7418,10 +7365,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -7687,8 +7630,6 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "libcrypto.a", - "providers/libcommon.a", - "providers/liblegacy.a", "test/libtestutil.a" ], "test/evp_extra_test2" => [ @@ -9752,7 +9693,6 @@ our %unified_info = ( }, "providers" => { "deps" => [ - "providers/evp_extra_test-bin-legacyprov.o", "providers/libcrypto-lib-baseprov.o", "providers/libcrypto-lib-defltprov.o", "providers/libcrypto-lib-nullprov.o", @@ -9760,9 +9700,6 @@ our %unified_info = ( "providers/libdefault.a" ], "products" => { - "bin" => [ - "test/evp_extra_test" - ], "dso" => [ "providers/fips", "providers/legacy" @@ -10199,7 +10136,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10250,7 +10186,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -11382,9 +11317,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -11682,9 +11614,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -12453,9 +12382,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -12750,9 +12676,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -12786,12 +12709,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -13776,9 +13693,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -14076,9 +13990,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -14847,9 +14758,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -15144,9 +15052,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -15180,12 +15085,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -16214,10 +16113,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16294,9 +16189,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "whrlpool" ], - "test/p_minimal.ld" => [ - "util/providers.num" - ], "test/p_test.ld" => [ "util/providers.num" ], @@ -16462,7 +16354,6 @@ our %unified_info = ( "doc/html/man3/CMS_get1_ReceiptRequest.html", "doc/html/man3/CMS_sign.html", "doc/html/man3/CMS_sign_receipt.html", - "doc/html/man3/CMS_signed_get_attr.html", "doc/html/man3/CMS_uncompress.html", "doc/html/man3/CMS_verify.html", "doc/html/man3/CMS_verify_receipt.html", @@ -16562,7 +16453,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_encapsulate.html", "doc/html/man3/EVP_PKEY_encrypt.html", "doc/html/man3/EVP_PKEY_fromdata.html", - "doc/html/man3/EVP_PKEY_get_attr.html", "doc/html/man3/EVP_PKEY_get_default_digest_nid.html", "doc/html/man3/EVP_PKEY_get_field_type.html", "doc/html/man3/EVP_PKEY_get_group_name.html", @@ -16819,7 +16709,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -16918,7 +16807,6 @@ our %unified_info = ( "doc/html/man3/X509V3_get_d2i.html", "doc/html/man3/X509V3_set_ctx.html", "doc/html/man3/X509_ALGOR_dup.html", - "doc/html/man3/X509_ATTRIBUTE.html", "doc/html/man3/X509_CRL_get0_by_serial.html", "doc/html/man3/X509_EXTENSION_set_object.html", "doc/html/man3/X509_LOOKUP.html", @@ -16930,8 +16818,6 @@ our %unified_info = ( "doc/html/man3/X509_NAME_get_index_by_NID.html", "doc/html/man3/X509_NAME_print_ex.html", "doc/html/man3/X509_PUBKEY_new.html", - "doc/html/man3/X509_REQ_get_attr.html", - "doc/html/man3/X509_REQ_get_extensions.html", "doc/html/man3/X509_SIG_get0.html", "doc/html/man3/X509_STORE_CTX_get_error.html", "doc/html/man3/X509_STORE_CTX_new.html", @@ -18229,10 +18115,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/asn1_stable_parse_test" => [ - "include", - "apps/include" - ], "test/asn1_string_table_test" => [ "include", "apps/include" @@ -18440,9 +18322,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -18702,9 +18581,7 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "include", - "apps/include", - "providers/common/include", - "providers/implementations/include" + "apps/include" ], "test/evp_extra_test2" => [ "include", @@ -18961,10 +18838,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/p_minimal" => [ - "include", - "." - ], "test/p_test" => [ "include", "." @@ -19454,7 +19327,6 @@ our %unified_info = ( "doc/man/man3/CMS_get1_ReceiptRequest.3", "doc/man/man3/CMS_sign.3", "doc/man/man3/CMS_sign_receipt.3", - "doc/man/man3/CMS_signed_get_attr.3", "doc/man/man3/CMS_uncompress.3", "doc/man/man3/CMS_verify.3", "doc/man/man3/CMS_verify_receipt.3", @@ -19554,7 +19426,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_encapsulate.3", "doc/man/man3/EVP_PKEY_encrypt.3", "doc/man/man3/EVP_PKEY_fromdata.3", - "doc/man/man3/EVP_PKEY_get_attr.3", "doc/man/man3/EVP_PKEY_get_default_digest_nid.3", "doc/man/man3/EVP_PKEY_get_field_type.3", "doc/man/man3/EVP_PKEY_get_group_name.3", @@ -19811,7 +19682,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -19910,7 +19780,6 @@ our %unified_info = ( "doc/man/man3/X509V3_get_d2i.3", "doc/man/man3/X509V3_set_ctx.3", "doc/man/man3/X509_ALGOR_dup.3", - "doc/man/man3/X509_ATTRIBUTE.3", "doc/man/man3/X509_CRL_get0_by_serial.3", "doc/man/man3/X509_EXTENSION_set_object.3", "doc/man/man3/X509_LOOKUP.3", @@ -19922,8 +19791,6 @@ our %unified_info = ( "doc/man/man3/X509_NAME_get_index_by_NID.3", "doc/man/man3/X509_NAME_print_ex.3", "doc/man/man3/X509_PUBKEY_new.3", - "doc/man/man3/X509_REQ_get_attr.3", - "doc/man/man3/X509_REQ_get_extensions.3", "doc/man/man3/X509_SIG_get0.3", "doc/man/man3/X509_STORE_CTX_get_error.3", "doc/man/man3/X509_STORE_CTX_new.3", @@ -20107,7 +19974,6 @@ our %unified_info = ( "modules" => [ "providers/fips", "providers/legacy", - "test/p_minimal", "test/p_test" ], "programs" => [ @@ -20133,7 +19999,6 @@ our %unified_info = ( "test/asn1_dsa_internal_test", "test/asn1_encode_test", "test/asn1_internal_test", - "test/asn1_stable_parse_test", "test/asn1_string_table_test", "test/asn1_time_test", "test/asynciotest", @@ -20197,7 +20062,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24322,7 +24186,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24349,7 +24212,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -24451,9 +24313,6 @@ our %unified_info = ( "providers/common/libfips-lib-securitycheck_fips.o" => [ "providers/common/securitycheck_fips.c" ], - "providers/evp_extra_test-bin-legacyprov.o" => [ - "providers/legacyprov.c" - ], "providers/fips" => [ "providers/fips.ld", "providers/fips/fips-dso-fips_entry.o" @@ -25590,9 +25449,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25674,9 +25530,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25734,12 +25587,6 @@ our %unified_info = ( "test/asn1_internal_test-bin-asn1_internal_test.o" => [ "test/asn1_internal_test.c" ], - "test/asn1_stable_parse_test" => [ - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" - ], - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" => [ - "test/asn1_stable_parse_test.c" - ], "test/asn1_string_table_test" => [ "test/asn1_string_table_test-bin-asn1_string_table_test.o" ], @@ -26119,12 +25966,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -26523,7 +26364,6 @@ our %unified_info = ( "test/errtest.c" ], "test/evp_extra_test" => [ - "providers/evp_extra_test-bin-legacyprov.o", "test/evp_extra_test-bin-evp_extra_test.o" ], "test/evp_extra_test-bin-evp_extra_test.o" => [ @@ -26814,13 +26654,6 @@ our %unified_info = ( "test/ossl_store_test-bin-ossl_store_test.o" => [ "test/ossl_store_test.c" ], - "test/p_minimal" => [ - "test/p_minimal-dso-p_minimal.o", - "test/p_minimal.ld" - ], - "test/p_minimal-dso-p_minimal.o" => [ - "test/p_minimal.c" - ], "test/p_test" => [ "test/p_test-dso-p_test.o", "test/p_test.ld" @@ -27510,8 +27343,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27538,7 +27371,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27555,8 +27388,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux32-s390x/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/linux32-s390x/no-asm/crypto/buildinf.h index c597c4d38..d2237d9cb 100644 --- a/deps/openssl/config/archs/linux32-s390x/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux32-s390x/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux32-s390x" -#define DATE "built on: Wed Jan 31 13:04:22 2024 UTC" +#define DATE "built on: Tue Aug 6 12:26:58 2024 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux32-s390x/no-asm/include/openssl/bio.h b/deps/openssl/config/archs/linux32-s390x/no-asm/include/openssl/bio.h index f9aa74731..e16cf622c 100644 --- a/deps/openssl/config/archs/linux32-s390x/no-asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/linux32-s390x/no-asm/include/openssl/bio.h @@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, - int (*ossl_gets) (BIO *, char *, int)); + int (*gets) (BIO *, char *, int)); long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); diff --git a/deps/openssl/config/archs/linux32-s390x/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux32-s390x/no-asm/include/openssl/opensslv.h index 65f3bfa05..5bb97d596 100644 --- a/deps/openssl/config/archs/linux32-s390x/no-asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux32-s390x/no-asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 13 +# define OPENSSL_VERSION_PATCH 9 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.13" -# define OPENSSL_FULL_VERSION_STR "3.0.13+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "30 Jan 2024" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13+quic 30 Jan 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux32-s390x/no-asm/include/openssl/pkcs7.h b/deps/openssl/config/archs/linux32-s390x/no-asm/include/openssl/pkcs7.h index 0ce79bf4f..557a0a726 100644 --- a/deps/openssl/config/archs/linux32-s390x/no-asm/include/openssl/pkcs7.h +++ b/deps/openssl/config/archs/linux32-s390x/no-asm/include/openssl/pkcs7.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/pkcs7.h.in * - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -56,8 +56,8 @@ typedef struct pkcs7_signer_info_st { PKCS7_ISSUER_AND_SERIAL *issuer_and_serial; X509_ALGOR *digest_alg; STACK_OF(X509_ATTRIBUTE) *auth_attr; /* [ 0 ] */ - X509_ALGOR *digest_enc_alg; /* confusing name, actually used for signing */ - ASN1_OCTET_STRING *enc_digest; /* confusing name, actually signature */ + X509_ALGOR *digest_enc_alg; + ASN1_OCTET_STRING *enc_digest; STACK_OF(X509_ATTRIBUTE) *unauth_attr; /* [ 1 ] */ /* The private key to sign with */ EVP_PKEY *pkey; diff --git a/deps/openssl/config/archs/linux32-s390x/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux32-s390x/no-asm/include/openssl/ssl.h index 0f1915755..3df725c56 100644 --- a/deps/openssl/config/archs/linux32-s390x/no-asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux32-s390x/no-asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/linux32-s390x/no-asm/openssl.gypi b/deps/openssl/config/archs/linux32-s390x/no-asm/openssl.gypi index 1b3c2428a..7dc0d96b5 100644 --- a/deps/openssl/config/archs/linux32-s390x/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/linux32-s390x/no-asm/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cbc.c', 'openssl/crypto/aes/aes_cfb.c', diff --git a/deps/openssl/config/archs/linux64-loongarch64/no-asm/configdata.pm b/deps/openssl/config/archs/linux64-loongarch64/no-asm/configdata.pm index c254f9376..95a7f8625 100644 --- a/deps/openssl/config/archs/linux64-loongarch64/no-asm/configdata.pm +++ b/deps/openssl/config/archs/linux64-loongarch64/no-asm/configdata.pm @@ -142,7 +142,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [], @@ -157,7 +157,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.13+quic", + "full_version" => "3.0.9", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,7 +206,7 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "13", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "30 Jan 2024", - "shlib_version" => "81.3", + "release_date" => "30 May 2023", + "shlib_version" => "3", "sourcedir" => ".", "target" => "linux64-loongarch64", - "version" => "3.0.13" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -393,7 +393,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -790,9 +789,6 @@ our %unified_info = ( "providers/fips" => { "fips" => "1" }, - "test/p_minimal" => { - "noinst" => "1" - }, "test/p_test" => { "noinst" => "1" } @@ -861,9 +857,6 @@ our %unified_info = ( "test/asn1_internal_test" => { "noinst" => "1" }, - "test/asn1_stable_parse_test" => { - "noinst" => "1" - }, "test/asn1_string_table_test" => { "noinst" => "1" }, @@ -1053,9 +1046,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -1603,9 +1593,6 @@ our %unified_info = ( "providers/libfips.a" => [ "FIPS_MODULE" ], - "test/evp_extra_test" => [ - "STATIC_LEGACY" - ], "test/provider_internal_test" => [ "PROVIDER_INIT_FUNCTION_NAME=p_test_init" ], @@ -2359,9 +2346,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -2659,9 +2643,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -3430,9 +3411,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -3727,9 +3705,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -3763,12 +3738,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -4753,9 +4722,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -5053,9 +5019,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -5824,9 +5787,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -6121,9 +6081,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -6157,12 +6114,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -7160,10 +7111,6 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], - "test/asn1_stable_parse_test" => [ - "libcrypto", - "test/libtestutil.a" - ], "test/asn1_string_table_test" => [ "libcrypto", "test/libtestutil.a" @@ -7417,10 +7364,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -7686,8 +7629,6 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "libcrypto.a", - "providers/libcommon.a", - "providers/liblegacy.a", "test/libtestutil.a" ], "test/evp_extra_test2" => [ @@ -9751,7 +9692,6 @@ our %unified_info = ( }, "providers" => { "deps" => [ - "providers/evp_extra_test-bin-legacyprov.o", "providers/libcrypto-lib-baseprov.o", "providers/libcrypto-lib-defltprov.o", "providers/libcrypto-lib-nullprov.o", @@ -9759,9 +9699,6 @@ our %unified_info = ( "providers/libdefault.a" ], "products" => { - "bin" => [ - "test/evp_extra_test" - ], "dso" => [ "providers/fips", "providers/legacy" @@ -10198,7 +10135,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10249,7 +10185,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -11381,9 +11316,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -11681,9 +11613,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -12452,9 +12381,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -12749,9 +12675,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -12785,12 +12708,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -13775,9 +13692,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -14075,9 +13989,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -14846,9 +14757,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -15143,9 +15051,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -15179,12 +15084,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -16213,10 +16112,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16293,9 +16188,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "whrlpool" ], - "test/p_minimal.ld" => [ - "util/providers.num" - ], "test/p_test.ld" => [ "util/providers.num" ], @@ -16461,7 +16353,6 @@ our %unified_info = ( "doc/html/man3/CMS_get1_ReceiptRequest.html", "doc/html/man3/CMS_sign.html", "doc/html/man3/CMS_sign_receipt.html", - "doc/html/man3/CMS_signed_get_attr.html", "doc/html/man3/CMS_uncompress.html", "doc/html/man3/CMS_verify.html", "doc/html/man3/CMS_verify_receipt.html", @@ -16561,7 +16452,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_encapsulate.html", "doc/html/man3/EVP_PKEY_encrypt.html", "doc/html/man3/EVP_PKEY_fromdata.html", - "doc/html/man3/EVP_PKEY_get_attr.html", "doc/html/man3/EVP_PKEY_get_default_digest_nid.html", "doc/html/man3/EVP_PKEY_get_field_type.html", "doc/html/man3/EVP_PKEY_get_group_name.html", @@ -16818,7 +16708,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -16917,7 +16806,6 @@ our %unified_info = ( "doc/html/man3/X509V3_get_d2i.html", "doc/html/man3/X509V3_set_ctx.html", "doc/html/man3/X509_ALGOR_dup.html", - "doc/html/man3/X509_ATTRIBUTE.html", "doc/html/man3/X509_CRL_get0_by_serial.html", "doc/html/man3/X509_EXTENSION_set_object.html", "doc/html/man3/X509_LOOKUP.html", @@ -16929,8 +16817,6 @@ our %unified_info = ( "doc/html/man3/X509_NAME_get_index_by_NID.html", "doc/html/man3/X509_NAME_print_ex.html", "doc/html/man3/X509_PUBKEY_new.html", - "doc/html/man3/X509_REQ_get_attr.html", - "doc/html/man3/X509_REQ_get_extensions.html", "doc/html/man3/X509_SIG_get0.html", "doc/html/man3/X509_STORE_CTX_get_error.html", "doc/html/man3/X509_STORE_CTX_new.html", @@ -18228,10 +18114,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/asn1_stable_parse_test" => [ - "include", - "apps/include" - ], "test/asn1_string_table_test" => [ "include", "apps/include" @@ -18439,9 +18321,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -18701,9 +18580,7 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "include", - "apps/include", - "providers/common/include", - "providers/implementations/include" + "apps/include" ], "test/evp_extra_test2" => [ "include", @@ -18960,10 +18837,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/p_minimal" => [ - "include", - "." - ], "test/p_test" => [ "include", "." @@ -19453,7 +19326,6 @@ our %unified_info = ( "doc/man/man3/CMS_get1_ReceiptRequest.3", "doc/man/man3/CMS_sign.3", "doc/man/man3/CMS_sign_receipt.3", - "doc/man/man3/CMS_signed_get_attr.3", "doc/man/man3/CMS_uncompress.3", "doc/man/man3/CMS_verify.3", "doc/man/man3/CMS_verify_receipt.3", @@ -19553,7 +19425,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_encapsulate.3", "doc/man/man3/EVP_PKEY_encrypt.3", "doc/man/man3/EVP_PKEY_fromdata.3", - "doc/man/man3/EVP_PKEY_get_attr.3", "doc/man/man3/EVP_PKEY_get_default_digest_nid.3", "doc/man/man3/EVP_PKEY_get_field_type.3", "doc/man/man3/EVP_PKEY_get_group_name.3", @@ -19810,7 +19681,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -19909,7 +19779,6 @@ our %unified_info = ( "doc/man/man3/X509V3_get_d2i.3", "doc/man/man3/X509V3_set_ctx.3", "doc/man/man3/X509_ALGOR_dup.3", - "doc/man/man3/X509_ATTRIBUTE.3", "doc/man/man3/X509_CRL_get0_by_serial.3", "doc/man/man3/X509_EXTENSION_set_object.3", "doc/man/man3/X509_LOOKUP.3", @@ -19921,8 +19790,6 @@ our %unified_info = ( "doc/man/man3/X509_NAME_get_index_by_NID.3", "doc/man/man3/X509_NAME_print_ex.3", "doc/man/man3/X509_PUBKEY_new.3", - "doc/man/man3/X509_REQ_get_attr.3", - "doc/man/man3/X509_REQ_get_extensions.3", "doc/man/man3/X509_SIG_get0.3", "doc/man/man3/X509_STORE_CTX_get_error.3", "doc/man/man3/X509_STORE_CTX_new.3", @@ -20106,7 +19973,6 @@ our %unified_info = ( "modules" => [ "providers/fips", "providers/legacy", - "test/p_minimal", "test/p_test" ], "programs" => [ @@ -20132,7 +19998,6 @@ our %unified_info = ( "test/asn1_dsa_internal_test", "test/asn1_encode_test", "test/asn1_internal_test", - "test/asn1_stable_parse_test", "test/asn1_string_table_test", "test/asn1_time_test", "test/asynciotest", @@ -20196,7 +20061,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24321,7 +24185,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24348,7 +24211,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -24450,9 +24312,6 @@ our %unified_info = ( "providers/common/libfips-lib-securitycheck_fips.o" => [ "providers/common/securitycheck_fips.c" ], - "providers/evp_extra_test-bin-legacyprov.o" => [ - "providers/legacyprov.c" - ], "providers/fips" => [ "providers/fips.ld", "providers/fips/fips-dso-fips_entry.o" @@ -25589,9 +25448,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25673,9 +25529,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25733,12 +25586,6 @@ our %unified_info = ( "test/asn1_internal_test-bin-asn1_internal_test.o" => [ "test/asn1_internal_test.c" ], - "test/asn1_stable_parse_test" => [ - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" - ], - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" => [ - "test/asn1_stable_parse_test.c" - ], "test/asn1_string_table_test" => [ "test/asn1_string_table_test-bin-asn1_string_table_test.o" ], @@ -26118,12 +25965,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -26522,7 +26363,6 @@ our %unified_info = ( "test/errtest.c" ], "test/evp_extra_test" => [ - "providers/evp_extra_test-bin-legacyprov.o", "test/evp_extra_test-bin-evp_extra_test.o" ], "test/evp_extra_test-bin-evp_extra_test.o" => [ @@ -26813,13 +26653,6 @@ our %unified_info = ( "test/ossl_store_test-bin-ossl_store_test.o" => [ "test/ossl_store_test.c" ], - "test/p_minimal" => [ - "test/p_minimal-dso-p_minimal.o", - "test/p_minimal.ld" - ], - "test/p_minimal-dso-p_minimal.o" => [ - "test/p_minimal.c" - ], "test/p_test" => [ "test/p_test-dso-p_test.o", "test/p_test.ld" @@ -27509,8 +27342,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27537,7 +27370,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27554,8 +27387,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux64-loongarch64/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/linux64-loongarch64/no-asm/crypto/buildinf.h index 2d29318d8..9d1b38838 100644 --- a/deps/openssl/config/archs/linux64-loongarch64/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux64-loongarch64/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux64-loongarch64" -#define DATE "built on: Wed Jan 31 13:08:49 2024 UTC" +#define DATE "built on: Tue Aug 6 12:30:59 2024 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux64-loongarch64/no-asm/include/openssl/bio.h b/deps/openssl/config/archs/linux64-loongarch64/no-asm/include/openssl/bio.h index f9aa74731..e16cf622c 100644 --- a/deps/openssl/config/archs/linux64-loongarch64/no-asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/linux64-loongarch64/no-asm/include/openssl/bio.h @@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, - int (*ossl_gets) (BIO *, char *, int)); + int (*gets) (BIO *, char *, int)); long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); diff --git a/deps/openssl/config/archs/linux64-loongarch64/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux64-loongarch64/no-asm/include/openssl/opensslv.h index 65f3bfa05..5bb97d596 100644 --- a/deps/openssl/config/archs/linux64-loongarch64/no-asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux64-loongarch64/no-asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 13 +# define OPENSSL_VERSION_PATCH 9 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.13" -# define OPENSSL_FULL_VERSION_STR "3.0.13+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "30 Jan 2024" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13+quic 30 Jan 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux64-loongarch64/no-asm/include/openssl/pkcs7.h b/deps/openssl/config/archs/linux64-loongarch64/no-asm/include/openssl/pkcs7.h index 0ce79bf4f..557a0a726 100644 --- a/deps/openssl/config/archs/linux64-loongarch64/no-asm/include/openssl/pkcs7.h +++ b/deps/openssl/config/archs/linux64-loongarch64/no-asm/include/openssl/pkcs7.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/pkcs7.h.in * - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -56,8 +56,8 @@ typedef struct pkcs7_signer_info_st { PKCS7_ISSUER_AND_SERIAL *issuer_and_serial; X509_ALGOR *digest_alg; STACK_OF(X509_ATTRIBUTE) *auth_attr; /* [ 0 ] */ - X509_ALGOR *digest_enc_alg; /* confusing name, actually used for signing */ - ASN1_OCTET_STRING *enc_digest; /* confusing name, actually signature */ + X509_ALGOR *digest_enc_alg; + ASN1_OCTET_STRING *enc_digest; STACK_OF(X509_ATTRIBUTE) *unauth_attr; /* [ 1 ] */ /* The private key to sign with */ EVP_PKEY *pkey; diff --git a/deps/openssl/config/archs/linux64-loongarch64/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux64-loongarch64/no-asm/include/openssl/ssl.h index 0f1915755..3df725c56 100644 --- a/deps/openssl/config/archs/linux64-loongarch64/no-asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux64-loongarch64/no-asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/linux64-loongarch64/no-asm/openssl.gypi b/deps/openssl/config/archs/linux64-loongarch64/no-asm/openssl.gypi index 7646500a7..530fb2b99 100644 --- a/deps/openssl/config/archs/linux64-loongarch64/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/linux64-loongarch64/no-asm/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cbc.c', 'openssl/crypto/aes/aes_cfb.c', diff --git a/deps/openssl/config/archs/linux64-mips64/asm/configdata.pm b/deps/openssl/config/archs/linux64-mips64/asm/configdata.pm index 33f877abf..95d42b03e 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm/configdata.pm +++ b/deps/openssl/config/archs/linux64-mips64/asm/configdata.pm @@ -142,7 +142,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -162,7 +162,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.13+quic", + "full_version" => "3.0.9", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -210,7 +210,7 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "13", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -262,11 +262,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "30 Jan 2024", - "shlib_version" => "81.3", + "release_date" => "30 May 2023", + "shlib_version" => "3", "sourcedir" => ".", "target" => "linux64-mips64", - "version" => "3.0.13" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -398,7 +398,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -794,9 +793,6 @@ our %unified_info = ( "providers/fips" => { "fips" => "1" }, - "test/p_minimal" => { - "noinst" => "1" - }, "test/p_test" => { "noinst" => "1" } @@ -865,9 +861,6 @@ our %unified_info = ( "test/asn1_internal_test" => { "noinst" => "1" }, - "test/asn1_stable_parse_test" => { - "noinst" => "1" - }, "test/asn1_string_table_test" => { "noinst" => "1" }, @@ -1057,9 +1050,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -1629,9 +1619,6 @@ our %unified_info = ( "SHA256_ASM", "SHA512_ASM" ], - "test/evp_extra_test" => [ - "STATIC_LEGACY" - ], "test/provider_internal_test" => [ "PROVIDER_INIT_FUNCTION_NAME=p_test_init" ], @@ -2385,9 +2372,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -2685,9 +2669,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -3456,9 +3437,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -3753,9 +3731,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -3789,12 +3764,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -4779,9 +4748,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -5079,9 +5045,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -5850,9 +5813,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -6147,9 +6107,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -6183,12 +6140,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -7186,10 +7137,6 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], - "test/asn1_stable_parse_test" => [ - "libcrypto", - "test/libtestutil.a" - ], "test/asn1_string_table_test" => [ "libcrypto", "test/libtestutil.a" @@ -7443,10 +7390,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -7712,8 +7655,6 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "libcrypto.a", - "providers/libcommon.a", - "providers/liblegacy.a", "test/libtestutil.a" ], "test/evp_extra_test2" => [ @@ -9786,7 +9727,6 @@ our %unified_info = ( }, "providers" => { "deps" => [ - "providers/evp_extra_test-bin-legacyprov.o", "providers/libcrypto-lib-baseprov.o", "providers/libcrypto-lib-defltprov.o", "providers/libcrypto-lib-nullprov.o", @@ -9794,9 +9734,6 @@ our %unified_info = ( "providers/libdefault.a" ], "products" => { - "bin" => [ - "test/evp_extra_test" - ], "dso" => [ "providers/fips", "providers/legacy" @@ -10233,7 +10170,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10284,7 +10220,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -11416,9 +11351,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -11716,9 +11648,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -12487,9 +12416,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -12784,9 +12710,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -12820,12 +12743,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -13810,9 +13727,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -14110,9 +14024,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -14881,9 +14792,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -15178,9 +15086,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -15214,12 +15119,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -16248,10 +16147,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16328,9 +16223,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "whrlpool" ], - "test/p_minimal.ld" => [ - "util/providers.num" - ], "test/p_test.ld" => [ "util/providers.num" ], @@ -16496,7 +16388,6 @@ our %unified_info = ( "doc/html/man3/CMS_get1_ReceiptRequest.html", "doc/html/man3/CMS_sign.html", "doc/html/man3/CMS_sign_receipt.html", - "doc/html/man3/CMS_signed_get_attr.html", "doc/html/man3/CMS_uncompress.html", "doc/html/man3/CMS_verify.html", "doc/html/man3/CMS_verify_receipt.html", @@ -16596,7 +16487,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_encapsulate.html", "doc/html/man3/EVP_PKEY_encrypt.html", "doc/html/man3/EVP_PKEY_fromdata.html", - "doc/html/man3/EVP_PKEY_get_attr.html", "doc/html/man3/EVP_PKEY_get_default_digest_nid.html", "doc/html/man3/EVP_PKEY_get_field_type.html", "doc/html/man3/EVP_PKEY_get_group_name.html", @@ -16853,7 +16743,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -16952,7 +16841,6 @@ our %unified_info = ( "doc/html/man3/X509V3_get_d2i.html", "doc/html/man3/X509V3_set_ctx.html", "doc/html/man3/X509_ALGOR_dup.html", - "doc/html/man3/X509_ATTRIBUTE.html", "doc/html/man3/X509_CRL_get0_by_serial.html", "doc/html/man3/X509_EXTENSION_set_object.html", "doc/html/man3/X509_LOOKUP.html", @@ -16964,8 +16852,6 @@ our %unified_info = ( "doc/html/man3/X509_NAME_get_index_by_NID.html", "doc/html/man3/X509_NAME_print_ex.html", "doc/html/man3/X509_PUBKEY_new.html", - "doc/html/man3/X509_REQ_get_attr.html", - "doc/html/man3/X509_REQ_get_extensions.html", "doc/html/man3/X509_SIG_get0.html", "doc/html/man3/X509_STORE_CTX_get_error.html", "doc/html/man3/X509_STORE_CTX_new.html", @@ -18302,10 +18188,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/asn1_stable_parse_test" => [ - "include", - "apps/include" - ], "test/asn1_string_table_test" => [ "include", "apps/include" @@ -18513,9 +18395,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -18775,9 +18654,7 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "include", - "apps/include", - "providers/common/include", - "providers/implementations/include" + "apps/include" ], "test/evp_extra_test2" => [ "include", @@ -19034,10 +18911,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/p_minimal" => [ - "include", - "." - ], "test/p_test" => [ "include", "." @@ -19527,7 +19400,6 @@ our %unified_info = ( "doc/man/man3/CMS_get1_ReceiptRequest.3", "doc/man/man3/CMS_sign.3", "doc/man/man3/CMS_sign_receipt.3", - "doc/man/man3/CMS_signed_get_attr.3", "doc/man/man3/CMS_uncompress.3", "doc/man/man3/CMS_verify.3", "doc/man/man3/CMS_verify_receipt.3", @@ -19627,7 +19499,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_encapsulate.3", "doc/man/man3/EVP_PKEY_encrypt.3", "doc/man/man3/EVP_PKEY_fromdata.3", - "doc/man/man3/EVP_PKEY_get_attr.3", "doc/man/man3/EVP_PKEY_get_default_digest_nid.3", "doc/man/man3/EVP_PKEY_get_field_type.3", "doc/man/man3/EVP_PKEY_get_group_name.3", @@ -19884,7 +19755,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -19983,7 +19853,6 @@ our %unified_info = ( "doc/man/man3/X509V3_get_d2i.3", "doc/man/man3/X509V3_set_ctx.3", "doc/man/man3/X509_ALGOR_dup.3", - "doc/man/man3/X509_ATTRIBUTE.3", "doc/man/man3/X509_CRL_get0_by_serial.3", "doc/man/man3/X509_EXTENSION_set_object.3", "doc/man/man3/X509_LOOKUP.3", @@ -19995,8 +19864,6 @@ our %unified_info = ( "doc/man/man3/X509_NAME_get_index_by_NID.3", "doc/man/man3/X509_NAME_print_ex.3", "doc/man/man3/X509_PUBKEY_new.3", - "doc/man/man3/X509_REQ_get_attr.3", - "doc/man/man3/X509_REQ_get_extensions.3", "doc/man/man3/X509_SIG_get0.3", "doc/man/man3/X509_STORE_CTX_get_error.3", "doc/man/man3/X509_STORE_CTX_new.3", @@ -20180,7 +20047,6 @@ our %unified_info = ( "modules" => [ "providers/fips", "providers/legacy", - "test/p_minimal", "test/p_test" ], "programs" => [ @@ -20206,7 +20072,6 @@ our %unified_info = ( "test/asn1_dsa_internal_test", "test/asn1_encode_test", "test/asn1_internal_test", - "test/asn1_stable_parse_test", "test/asn1_string_table_test", "test/asn1_time_test", "test/asynciotest", @@ -20270,7 +20135,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24427,7 +24291,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24454,7 +24317,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -24556,9 +24418,6 @@ our %unified_info = ( "providers/common/libfips-lib-securitycheck_fips.o" => [ "providers/common/securitycheck_fips.c" ], - "providers/evp_extra_test-bin-legacyprov.o" => [ - "providers/legacyprov.c" - ], "providers/fips" => [ "providers/fips.ld", "providers/fips/fips-dso-fips_entry.o" @@ -25699,9 +25558,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25783,9 +25639,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25843,12 +25696,6 @@ our %unified_info = ( "test/asn1_internal_test-bin-asn1_internal_test.o" => [ "test/asn1_internal_test.c" ], - "test/asn1_stable_parse_test" => [ - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" - ], - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" => [ - "test/asn1_stable_parse_test.c" - ], "test/asn1_string_table_test" => [ "test/asn1_string_table_test-bin-asn1_string_table_test.o" ], @@ -26228,12 +26075,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -26632,7 +26473,6 @@ our %unified_info = ( "test/errtest.c" ], "test/evp_extra_test" => [ - "providers/evp_extra_test-bin-legacyprov.o", "test/evp_extra_test-bin-evp_extra_test.o" ], "test/evp_extra_test-bin-evp_extra_test.o" => [ @@ -26923,13 +26763,6 @@ our %unified_info = ( "test/ossl_store_test-bin-ossl_store_test.o" => [ "test/ossl_store_test.c" ], - "test/p_minimal" => [ - "test/p_minimal-dso-p_minimal.o", - "test/p_minimal.ld" - ], - "test/p_minimal-dso-p_minimal.o" => [ - "test/p_minimal.c" - ], "test/p_test" => [ "test/p_test-dso-p_test.o", "test/p_test.ld" @@ -27616,8 +27449,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27644,7 +27477,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27661,8 +27494,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux64-mips64/asm/crypto/buildinf.h b/deps/openssl/config/archs/linux64-mips64/asm/crypto/buildinf.h index 0ecfd9b31..8e5a06744 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux64-mips64/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux64-mips64" -#define DATE "built on: Wed Jan 31 13:05:11 2024 UTC" +#define DATE "built on: Tue Aug 6 12:27:42 2024 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux64-mips64/asm/include/openssl/bio.h b/deps/openssl/config/archs/linux64-mips64/asm/include/openssl/bio.h index f9aa74731..e16cf622c 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/linux64-mips64/asm/include/openssl/bio.h @@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, - int (*ossl_gets) (BIO *, char *, int)); + int (*gets) (BIO *, char *, int)); long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); diff --git a/deps/openssl/config/archs/linux64-mips64/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux64-mips64/asm/include/openssl/opensslv.h index 65f3bfa05..5bb97d596 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux64-mips64/asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 13 +# define OPENSSL_VERSION_PATCH 9 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.13" -# define OPENSSL_FULL_VERSION_STR "3.0.13+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "30 Jan 2024" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13+quic 30 Jan 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux64-mips64/asm/include/openssl/pkcs7.h b/deps/openssl/config/archs/linux64-mips64/asm/include/openssl/pkcs7.h index 0ce79bf4f..557a0a726 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm/include/openssl/pkcs7.h +++ b/deps/openssl/config/archs/linux64-mips64/asm/include/openssl/pkcs7.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/pkcs7.h.in * - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -56,8 +56,8 @@ typedef struct pkcs7_signer_info_st { PKCS7_ISSUER_AND_SERIAL *issuer_and_serial; X509_ALGOR *digest_alg; STACK_OF(X509_ATTRIBUTE) *auth_attr; /* [ 0 ] */ - X509_ALGOR *digest_enc_alg; /* confusing name, actually used for signing */ - ASN1_OCTET_STRING *enc_digest; /* confusing name, actually signature */ + X509_ALGOR *digest_enc_alg; + ASN1_OCTET_STRING *enc_digest; STACK_OF(X509_ATTRIBUTE) *unauth_attr; /* [ 1 ] */ /* The private key to sign with */ EVP_PKEY *pkey; diff --git a/deps/openssl/config/archs/linux64-mips64/asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux64-mips64/asm/include/openssl/ssl.h index 0f1915755..3df725c56 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux64-mips64/asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/linux64-mips64/asm/openssl.gypi b/deps/openssl/config/archs/linux64-mips64/asm/openssl.gypi index 530cea8a7..2766034c0 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm/openssl.gypi +++ b/deps/openssl/config/archs/linux64-mips64/asm/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cbc.c', 'openssl/crypto/aes/aes_cfb.c', diff --git a/deps/openssl/config/archs/linux64-mips64/asm_avx2/configdata.pm b/deps/openssl/config/archs/linux64-mips64/asm_avx2/configdata.pm index 78289801b..2a5759b56 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/linux64-mips64/asm_avx2/configdata.pm @@ -142,7 +142,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -162,7 +162,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.13+quic", + "full_version" => "3.0.9", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -210,7 +210,7 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "13", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -262,11 +262,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "30 Jan 2024", - "shlib_version" => "81.3", + "release_date" => "30 May 2023", + "shlib_version" => "3", "sourcedir" => ".", "target" => "linux64-mips64", - "version" => "3.0.13" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -398,7 +398,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -794,9 +793,6 @@ our %unified_info = ( "providers/fips" => { "fips" => "1" }, - "test/p_minimal" => { - "noinst" => "1" - }, "test/p_test" => { "noinst" => "1" } @@ -865,9 +861,6 @@ our %unified_info = ( "test/asn1_internal_test" => { "noinst" => "1" }, - "test/asn1_stable_parse_test" => { - "noinst" => "1" - }, "test/asn1_string_table_test" => { "noinst" => "1" }, @@ -1057,9 +1050,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -1629,9 +1619,6 @@ our %unified_info = ( "SHA256_ASM", "SHA512_ASM" ], - "test/evp_extra_test" => [ - "STATIC_LEGACY" - ], "test/provider_internal_test" => [ "PROVIDER_INIT_FUNCTION_NAME=p_test_init" ], @@ -2385,9 +2372,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -2685,9 +2669,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -3456,9 +3437,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -3753,9 +3731,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -3789,12 +3764,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -4779,9 +4748,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -5079,9 +5045,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -5850,9 +5813,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -6147,9 +6107,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -6183,12 +6140,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -7186,10 +7137,6 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], - "test/asn1_stable_parse_test" => [ - "libcrypto", - "test/libtestutil.a" - ], "test/asn1_string_table_test" => [ "libcrypto", "test/libtestutil.a" @@ -7443,10 +7390,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -7712,8 +7655,6 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "libcrypto.a", - "providers/libcommon.a", - "providers/liblegacy.a", "test/libtestutil.a" ], "test/evp_extra_test2" => [ @@ -9786,7 +9727,6 @@ our %unified_info = ( }, "providers" => { "deps" => [ - "providers/evp_extra_test-bin-legacyprov.o", "providers/libcrypto-lib-baseprov.o", "providers/libcrypto-lib-defltprov.o", "providers/libcrypto-lib-nullprov.o", @@ -9794,9 +9734,6 @@ our %unified_info = ( "providers/libdefault.a" ], "products" => { - "bin" => [ - "test/evp_extra_test" - ], "dso" => [ "providers/fips", "providers/legacy" @@ -10233,7 +10170,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10284,7 +10220,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -11416,9 +11351,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -11716,9 +11648,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -12487,9 +12416,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -12784,9 +12710,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -12820,12 +12743,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -13810,9 +13727,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -14110,9 +14024,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -14881,9 +14792,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -15178,9 +15086,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -15214,12 +15119,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -16248,10 +16147,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16328,9 +16223,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "whrlpool" ], - "test/p_minimal.ld" => [ - "util/providers.num" - ], "test/p_test.ld" => [ "util/providers.num" ], @@ -16496,7 +16388,6 @@ our %unified_info = ( "doc/html/man3/CMS_get1_ReceiptRequest.html", "doc/html/man3/CMS_sign.html", "doc/html/man3/CMS_sign_receipt.html", - "doc/html/man3/CMS_signed_get_attr.html", "doc/html/man3/CMS_uncompress.html", "doc/html/man3/CMS_verify.html", "doc/html/man3/CMS_verify_receipt.html", @@ -16596,7 +16487,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_encapsulate.html", "doc/html/man3/EVP_PKEY_encrypt.html", "doc/html/man3/EVP_PKEY_fromdata.html", - "doc/html/man3/EVP_PKEY_get_attr.html", "doc/html/man3/EVP_PKEY_get_default_digest_nid.html", "doc/html/man3/EVP_PKEY_get_field_type.html", "doc/html/man3/EVP_PKEY_get_group_name.html", @@ -16853,7 +16743,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -16952,7 +16841,6 @@ our %unified_info = ( "doc/html/man3/X509V3_get_d2i.html", "doc/html/man3/X509V3_set_ctx.html", "doc/html/man3/X509_ALGOR_dup.html", - "doc/html/man3/X509_ATTRIBUTE.html", "doc/html/man3/X509_CRL_get0_by_serial.html", "doc/html/man3/X509_EXTENSION_set_object.html", "doc/html/man3/X509_LOOKUP.html", @@ -16964,8 +16852,6 @@ our %unified_info = ( "doc/html/man3/X509_NAME_get_index_by_NID.html", "doc/html/man3/X509_NAME_print_ex.html", "doc/html/man3/X509_PUBKEY_new.html", - "doc/html/man3/X509_REQ_get_attr.html", - "doc/html/man3/X509_REQ_get_extensions.html", "doc/html/man3/X509_SIG_get0.html", "doc/html/man3/X509_STORE_CTX_get_error.html", "doc/html/man3/X509_STORE_CTX_new.html", @@ -18302,10 +18188,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/asn1_stable_parse_test" => [ - "include", - "apps/include" - ], "test/asn1_string_table_test" => [ "include", "apps/include" @@ -18513,9 +18395,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -18775,9 +18654,7 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "include", - "apps/include", - "providers/common/include", - "providers/implementations/include" + "apps/include" ], "test/evp_extra_test2" => [ "include", @@ -19034,10 +18911,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/p_minimal" => [ - "include", - "." - ], "test/p_test" => [ "include", "." @@ -19527,7 +19400,6 @@ our %unified_info = ( "doc/man/man3/CMS_get1_ReceiptRequest.3", "doc/man/man3/CMS_sign.3", "doc/man/man3/CMS_sign_receipt.3", - "doc/man/man3/CMS_signed_get_attr.3", "doc/man/man3/CMS_uncompress.3", "doc/man/man3/CMS_verify.3", "doc/man/man3/CMS_verify_receipt.3", @@ -19627,7 +19499,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_encapsulate.3", "doc/man/man3/EVP_PKEY_encrypt.3", "doc/man/man3/EVP_PKEY_fromdata.3", - "doc/man/man3/EVP_PKEY_get_attr.3", "doc/man/man3/EVP_PKEY_get_default_digest_nid.3", "doc/man/man3/EVP_PKEY_get_field_type.3", "doc/man/man3/EVP_PKEY_get_group_name.3", @@ -19884,7 +19755,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -19983,7 +19853,6 @@ our %unified_info = ( "doc/man/man3/X509V3_get_d2i.3", "doc/man/man3/X509V3_set_ctx.3", "doc/man/man3/X509_ALGOR_dup.3", - "doc/man/man3/X509_ATTRIBUTE.3", "doc/man/man3/X509_CRL_get0_by_serial.3", "doc/man/man3/X509_EXTENSION_set_object.3", "doc/man/man3/X509_LOOKUP.3", @@ -19995,8 +19864,6 @@ our %unified_info = ( "doc/man/man3/X509_NAME_get_index_by_NID.3", "doc/man/man3/X509_NAME_print_ex.3", "doc/man/man3/X509_PUBKEY_new.3", - "doc/man/man3/X509_REQ_get_attr.3", - "doc/man/man3/X509_REQ_get_extensions.3", "doc/man/man3/X509_SIG_get0.3", "doc/man/man3/X509_STORE_CTX_get_error.3", "doc/man/man3/X509_STORE_CTX_new.3", @@ -20180,7 +20047,6 @@ our %unified_info = ( "modules" => [ "providers/fips", "providers/legacy", - "test/p_minimal", "test/p_test" ], "programs" => [ @@ -20206,7 +20072,6 @@ our %unified_info = ( "test/asn1_dsa_internal_test", "test/asn1_encode_test", "test/asn1_internal_test", - "test/asn1_stable_parse_test", "test/asn1_string_table_test", "test/asn1_time_test", "test/asynciotest", @@ -20270,7 +20135,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24427,7 +24291,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24454,7 +24317,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -24556,9 +24418,6 @@ our %unified_info = ( "providers/common/libfips-lib-securitycheck_fips.o" => [ "providers/common/securitycheck_fips.c" ], - "providers/evp_extra_test-bin-legacyprov.o" => [ - "providers/legacyprov.c" - ], "providers/fips" => [ "providers/fips.ld", "providers/fips/fips-dso-fips_entry.o" @@ -25699,9 +25558,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25783,9 +25639,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25843,12 +25696,6 @@ our %unified_info = ( "test/asn1_internal_test-bin-asn1_internal_test.o" => [ "test/asn1_internal_test.c" ], - "test/asn1_stable_parse_test" => [ - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" - ], - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" => [ - "test/asn1_stable_parse_test.c" - ], "test/asn1_string_table_test" => [ "test/asn1_string_table_test-bin-asn1_string_table_test.o" ], @@ -26228,12 +26075,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -26632,7 +26473,6 @@ our %unified_info = ( "test/errtest.c" ], "test/evp_extra_test" => [ - "providers/evp_extra_test-bin-legacyprov.o", "test/evp_extra_test-bin-evp_extra_test.o" ], "test/evp_extra_test-bin-evp_extra_test.o" => [ @@ -26923,13 +26763,6 @@ our %unified_info = ( "test/ossl_store_test-bin-ossl_store_test.o" => [ "test/ossl_store_test.c" ], - "test/p_minimal" => [ - "test/p_minimal-dso-p_minimal.o", - "test/p_minimal.ld" - ], - "test/p_minimal-dso-p_minimal.o" => [ - "test/p_minimal.c" - ], "test/p_test" => [ "test/p_test-dso-p_test.o", "test/p_test.ld" @@ -27616,8 +27449,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27644,7 +27477,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27661,8 +27494,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux64-mips64/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/linux64-mips64/asm_avx2/crypto/buildinf.h index a45ecc65c..068a8c93b 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux64-mips64/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux64-mips64" -#define DATE "built on: Wed Jan 31 13:05:23 2024 UTC" +#define DATE "built on: Tue Aug 6 12:27:53 2024 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/openssl/bio.h b/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/openssl/bio.h index f9aa74731..e16cf622c 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/openssl/bio.h +++ b/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/openssl/bio.h @@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, - int (*ossl_gets) (BIO *, char *, int)); + int (*gets) (BIO *, char *, int)); long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); diff --git a/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/openssl/opensslv.h index 65f3bfa05..5bb97d596 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 13 +# define OPENSSL_VERSION_PATCH 9 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.13" -# define OPENSSL_FULL_VERSION_STR "3.0.13+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "30 Jan 2024" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13+quic 30 Jan 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/openssl/pkcs7.h b/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/openssl/pkcs7.h index 0ce79bf4f..557a0a726 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/openssl/pkcs7.h +++ b/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/openssl/pkcs7.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/pkcs7.h.in * - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -56,8 +56,8 @@ typedef struct pkcs7_signer_info_st { PKCS7_ISSUER_AND_SERIAL *issuer_and_serial; X509_ALGOR *digest_alg; STACK_OF(X509_ATTRIBUTE) *auth_attr; /* [ 0 ] */ - X509_ALGOR *digest_enc_alg; /* confusing name, actually used for signing */ - ASN1_OCTET_STRING *enc_digest; /* confusing name, actually signature */ + X509_ALGOR *digest_enc_alg; + ASN1_OCTET_STRING *enc_digest; STACK_OF(X509_ATTRIBUTE) *unauth_attr; /* [ 1 ] */ /* The private key to sign with */ EVP_PKEY *pkey; diff --git a/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/openssl/ssl.h index 0f1915755..3df725c56 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/linux64-mips64/asm_avx2/openssl.gypi b/deps/openssl/config/archs/linux64-mips64/asm_avx2/openssl.gypi index 04841c765..94f3c87ec 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/linux64-mips64/asm_avx2/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cbc.c', 'openssl/crypto/aes/aes_cfb.c', diff --git a/deps/openssl/config/archs/linux64-mips64/no-asm/configdata.pm b/deps/openssl/config/archs/linux64-mips64/no-asm/configdata.pm index 07632e82e..47f8b2bb7 100644 --- a/deps/openssl/config/archs/linux64-mips64/no-asm/configdata.pm +++ b/deps/openssl/config/archs/linux64-mips64/no-asm/configdata.pm @@ -142,7 +142,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [], @@ -157,7 +157,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.13+quic", + "full_version" => "3.0.9", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,7 +206,7 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "13", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "30 Jan 2024", - "shlib_version" => "81.3", + "release_date" => "30 May 2023", + "shlib_version" => "3", "sourcedir" => ".", "target" => "linux64-mips64", - "version" => "3.0.13" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -395,7 +395,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -792,9 +791,6 @@ our %unified_info = ( "providers/fips" => { "fips" => "1" }, - "test/p_minimal" => { - "noinst" => "1" - }, "test/p_test" => { "noinst" => "1" } @@ -863,9 +859,6 @@ our %unified_info = ( "test/asn1_internal_test" => { "noinst" => "1" }, - "test/asn1_stable_parse_test" => { - "noinst" => "1" - }, "test/asn1_string_table_test" => { "noinst" => "1" }, @@ -1055,9 +1048,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -1605,9 +1595,6 @@ our %unified_info = ( "providers/libfips.a" => [ "FIPS_MODULE" ], - "test/evp_extra_test" => [ - "STATIC_LEGACY" - ], "test/provider_internal_test" => [ "PROVIDER_INIT_FUNCTION_NAME=p_test_init" ], @@ -2361,9 +2348,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -2661,9 +2645,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -3432,9 +3413,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -3729,9 +3707,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -3765,12 +3740,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -4755,9 +4724,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -5055,9 +5021,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -5826,9 +5789,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -6123,9 +6083,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -6159,12 +6116,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -7162,10 +7113,6 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], - "test/asn1_stable_parse_test" => [ - "libcrypto", - "test/libtestutil.a" - ], "test/asn1_string_table_test" => [ "libcrypto", "test/libtestutil.a" @@ -7419,10 +7366,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -7688,8 +7631,6 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "libcrypto.a", - "providers/libcommon.a", - "providers/liblegacy.a", "test/libtestutil.a" ], "test/evp_extra_test2" => [ @@ -9753,7 +9694,6 @@ our %unified_info = ( }, "providers" => { "deps" => [ - "providers/evp_extra_test-bin-legacyprov.o", "providers/libcrypto-lib-baseprov.o", "providers/libcrypto-lib-defltprov.o", "providers/libcrypto-lib-nullprov.o", @@ -9761,9 +9701,6 @@ our %unified_info = ( "providers/libdefault.a" ], "products" => { - "bin" => [ - "test/evp_extra_test" - ], "dso" => [ "providers/fips", "providers/legacy" @@ -10200,7 +10137,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10251,7 +10187,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -11383,9 +11318,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -11683,9 +11615,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -12454,9 +12383,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -12751,9 +12677,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -12787,12 +12710,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -13777,9 +13694,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -14077,9 +13991,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -14848,9 +14759,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -15145,9 +15053,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -15181,12 +15086,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -16215,10 +16114,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16295,9 +16190,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "whrlpool" ], - "test/p_minimal.ld" => [ - "util/providers.num" - ], "test/p_test.ld" => [ "util/providers.num" ], @@ -16463,7 +16355,6 @@ our %unified_info = ( "doc/html/man3/CMS_get1_ReceiptRequest.html", "doc/html/man3/CMS_sign.html", "doc/html/man3/CMS_sign_receipt.html", - "doc/html/man3/CMS_signed_get_attr.html", "doc/html/man3/CMS_uncompress.html", "doc/html/man3/CMS_verify.html", "doc/html/man3/CMS_verify_receipt.html", @@ -16563,7 +16454,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_encapsulate.html", "doc/html/man3/EVP_PKEY_encrypt.html", "doc/html/man3/EVP_PKEY_fromdata.html", - "doc/html/man3/EVP_PKEY_get_attr.html", "doc/html/man3/EVP_PKEY_get_default_digest_nid.html", "doc/html/man3/EVP_PKEY_get_field_type.html", "doc/html/man3/EVP_PKEY_get_group_name.html", @@ -16820,7 +16710,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -16919,7 +16808,6 @@ our %unified_info = ( "doc/html/man3/X509V3_get_d2i.html", "doc/html/man3/X509V3_set_ctx.html", "doc/html/man3/X509_ALGOR_dup.html", - "doc/html/man3/X509_ATTRIBUTE.html", "doc/html/man3/X509_CRL_get0_by_serial.html", "doc/html/man3/X509_EXTENSION_set_object.html", "doc/html/man3/X509_LOOKUP.html", @@ -16931,8 +16819,6 @@ our %unified_info = ( "doc/html/man3/X509_NAME_get_index_by_NID.html", "doc/html/man3/X509_NAME_print_ex.html", "doc/html/man3/X509_PUBKEY_new.html", - "doc/html/man3/X509_REQ_get_attr.html", - "doc/html/man3/X509_REQ_get_extensions.html", "doc/html/man3/X509_SIG_get0.html", "doc/html/man3/X509_STORE_CTX_get_error.html", "doc/html/man3/X509_STORE_CTX_new.html", @@ -18230,10 +18116,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/asn1_stable_parse_test" => [ - "include", - "apps/include" - ], "test/asn1_string_table_test" => [ "include", "apps/include" @@ -18441,9 +18323,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -18703,9 +18582,7 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "include", - "apps/include", - "providers/common/include", - "providers/implementations/include" + "apps/include" ], "test/evp_extra_test2" => [ "include", @@ -18962,10 +18839,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/p_minimal" => [ - "include", - "." - ], "test/p_test" => [ "include", "." @@ -19455,7 +19328,6 @@ our %unified_info = ( "doc/man/man3/CMS_get1_ReceiptRequest.3", "doc/man/man3/CMS_sign.3", "doc/man/man3/CMS_sign_receipt.3", - "doc/man/man3/CMS_signed_get_attr.3", "doc/man/man3/CMS_uncompress.3", "doc/man/man3/CMS_verify.3", "doc/man/man3/CMS_verify_receipt.3", @@ -19555,7 +19427,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_encapsulate.3", "doc/man/man3/EVP_PKEY_encrypt.3", "doc/man/man3/EVP_PKEY_fromdata.3", - "doc/man/man3/EVP_PKEY_get_attr.3", "doc/man/man3/EVP_PKEY_get_default_digest_nid.3", "doc/man/man3/EVP_PKEY_get_field_type.3", "doc/man/man3/EVP_PKEY_get_group_name.3", @@ -19812,7 +19683,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -19911,7 +19781,6 @@ our %unified_info = ( "doc/man/man3/X509V3_get_d2i.3", "doc/man/man3/X509V3_set_ctx.3", "doc/man/man3/X509_ALGOR_dup.3", - "doc/man/man3/X509_ATTRIBUTE.3", "doc/man/man3/X509_CRL_get0_by_serial.3", "doc/man/man3/X509_EXTENSION_set_object.3", "doc/man/man3/X509_LOOKUP.3", @@ -19923,8 +19792,6 @@ our %unified_info = ( "doc/man/man3/X509_NAME_get_index_by_NID.3", "doc/man/man3/X509_NAME_print_ex.3", "doc/man/man3/X509_PUBKEY_new.3", - "doc/man/man3/X509_REQ_get_attr.3", - "doc/man/man3/X509_REQ_get_extensions.3", "doc/man/man3/X509_SIG_get0.3", "doc/man/man3/X509_STORE_CTX_get_error.3", "doc/man/man3/X509_STORE_CTX_new.3", @@ -20108,7 +19975,6 @@ our %unified_info = ( "modules" => [ "providers/fips", "providers/legacy", - "test/p_minimal", "test/p_test" ], "programs" => [ @@ -20134,7 +20000,6 @@ our %unified_info = ( "test/asn1_dsa_internal_test", "test/asn1_encode_test", "test/asn1_internal_test", - "test/asn1_stable_parse_test", "test/asn1_string_table_test", "test/asn1_time_test", "test/asynciotest", @@ -20198,7 +20063,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24323,7 +24187,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24350,7 +24213,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -24452,9 +24314,6 @@ our %unified_info = ( "providers/common/libfips-lib-securitycheck_fips.o" => [ "providers/common/securitycheck_fips.c" ], - "providers/evp_extra_test-bin-legacyprov.o" => [ - "providers/legacyprov.c" - ], "providers/fips" => [ "providers/fips.ld", "providers/fips/fips-dso-fips_entry.o" @@ -25591,9 +25450,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25675,9 +25531,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25735,12 +25588,6 @@ our %unified_info = ( "test/asn1_internal_test-bin-asn1_internal_test.o" => [ "test/asn1_internal_test.c" ], - "test/asn1_stable_parse_test" => [ - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" - ], - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" => [ - "test/asn1_stable_parse_test.c" - ], "test/asn1_string_table_test" => [ "test/asn1_string_table_test-bin-asn1_string_table_test.o" ], @@ -26120,12 +25967,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -26524,7 +26365,6 @@ our %unified_info = ( "test/errtest.c" ], "test/evp_extra_test" => [ - "providers/evp_extra_test-bin-legacyprov.o", "test/evp_extra_test-bin-evp_extra_test.o" ], "test/evp_extra_test-bin-evp_extra_test.o" => [ @@ -26815,13 +26655,6 @@ our %unified_info = ( "test/ossl_store_test-bin-ossl_store_test.o" => [ "test/ossl_store_test.c" ], - "test/p_minimal" => [ - "test/p_minimal-dso-p_minimal.o", - "test/p_minimal.ld" - ], - "test/p_minimal-dso-p_minimal.o" => [ - "test/p_minimal.c" - ], "test/p_test" => [ "test/p_test-dso-p_test.o", "test/p_test.ld" @@ -27511,8 +27344,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27539,7 +27372,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27556,8 +27389,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux64-mips64/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/linux64-mips64/no-asm/crypto/buildinf.h index 2780a78e9..37e76d667 100644 --- a/deps/openssl/config/archs/linux64-mips64/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux64-mips64/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux64-mips64" -#define DATE "built on: Wed Jan 31 13:05:35 2024 UTC" +#define DATE "built on: Tue Aug 6 12:28:04 2024 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux64-mips64/no-asm/include/openssl/bio.h b/deps/openssl/config/archs/linux64-mips64/no-asm/include/openssl/bio.h index f9aa74731..e16cf622c 100644 --- a/deps/openssl/config/archs/linux64-mips64/no-asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/linux64-mips64/no-asm/include/openssl/bio.h @@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, - int (*ossl_gets) (BIO *, char *, int)); + int (*gets) (BIO *, char *, int)); long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); diff --git a/deps/openssl/config/archs/linux64-mips64/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux64-mips64/no-asm/include/openssl/opensslv.h index 65f3bfa05..5bb97d596 100644 --- a/deps/openssl/config/archs/linux64-mips64/no-asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux64-mips64/no-asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 13 +# define OPENSSL_VERSION_PATCH 9 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.13" -# define OPENSSL_FULL_VERSION_STR "3.0.13+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "30 Jan 2024" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13+quic 30 Jan 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux64-mips64/no-asm/include/openssl/pkcs7.h b/deps/openssl/config/archs/linux64-mips64/no-asm/include/openssl/pkcs7.h index 0ce79bf4f..557a0a726 100644 --- a/deps/openssl/config/archs/linux64-mips64/no-asm/include/openssl/pkcs7.h +++ b/deps/openssl/config/archs/linux64-mips64/no-asm/include/openssl/pkcs7.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/pkcs7.h.in * - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -56,8 +56,8 @@ typedef struct pkcs7_signer_info_st { PKCS7_ISSUER_AND_SERIAL *issuer_and_serial; X509_ALGOR *digest_alg; STACK_OF(X509_ATTRIBUTE) *auth_attr; /* [ 0 ] */ - X509_ALGOR *digest_enc_alg; /* confusing name, actually used for signing */ - ASN1_OCTET_STRING *enc_digest; /* confusing name, actually signature */ + X509_ALGOR *digest_enc_alg; + ASN1_OCTET_STRING *enc_digest; STACK_OF(X509_ATTRIBUTE) *unauth_attr; /* [ 1 ] */ /* The private key to sign with */ EVP_PKEY *pkey; diff --git a/deps/openssl/config/archs/linux64-mips64/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux64-mips64/no-asm/include/openssl/ssl.h index 0f1915755..3df725c56 100644 --- a/deps/openssl/config/archs/linux64-mips64/no-asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux64-mips64/no-asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/linux64-mips64/no-asm/openssl.gypi b/deps/openssl/config/archs/linux64-mips64/no-asm/openssl.gypi index 0051a0728..d668c5608 100644 --- a/deps/openssl/config/archs/linux64-mips64/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/linux64-mips64/no-asm/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cbc.c', 'openssl/crypto/aes/aes_cfb.c', diff --git a/deps/openssl/config/archs/linux64-riscv64/no-asm/configdata.pm b/deps/openssl/config/archs/linux64-riscv64/no-asm/configdata.pm index eb98331a6..a801c1213 100644 --- a/deps/openssl/config/archs/linux64-riscv64/no-asm/configdata.pm +++ b/deps/openssl/config/archs/linux64-riscv64/no-asm/configdata.pm @@ -142,7 +142,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [], @@ -157,7 +157,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.13+quic", + "full_version" => "3.0.9", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,7 +206,7 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "13", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "30 Jan 2024", - "shlib_version" => "81.3", + "release_date" => "30 May 2023", + "shlib_version" => "3", "sourcedir" => ".", "target" => "linux64-riscv64", - "version" => "3.0.13" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -393,7 +393,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -790,9 +789,6 @@ our %unified_info = ( "providers/fips" => { "fips" => "1" }, - "test/p_minimal" => { - "noinst" => "1" - }, "test/p_test" => { "noinst" => "1" } @@ -861,9 +857,6 @@ our %unified_info = ( "test/asn1_internal_test" => { "noinst" => "1" }, - "test/asn1_stable_parse_test" => { - "noinst" => "1" - }, "test/asn1_string_table_test" => { "noinst" => "1" }, @@ -1053,9 +1046,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -1603,9 +1593,6 @@ our %unified_info = ( "providers/libfips.a" => [ "FIPS_MODULE" ], - "test/evp_extra_test" => [ - "STATIC_LEGACY" - ], "test/provider_internal_test" => [ "PROVIDER_INIT_FUNCTION_NAME=p_test_init" ], @@ -2359,9 +2346,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -2659,9 +2643,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -3430,9 +3411,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -3727,9 +3705,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -3763,12 +3738,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -4753,9 +4722,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -5053,9 +5019,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -5824,9 +5787,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -6121,9 +6081,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -6157,12 +6114,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -7160,10 +7111,6 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], - "test/asn1_stable_parse_test" => [ - "libcrypto", - "test/libtestutil.a" - ], "test/asn1_string_table_test" => [ "libcrypto", "test/libtestutil.a" @@ -7417,10 +7364,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -7686,8 +7629,6 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "libcrypto.a", - "providers/libcommon.a", - "providers/liblegacy.a", "test/libtestutil.a" ], "test/evp_extra_test2" => [ @@ -9751,7 +9692,6 @@ our %unified_info = ( }, "providers" => { "deps" => [ - "providers/evp_extra_test-bin-legacyprov.o", "providers/libcrypto-lib-baseprov.o", "providers/libcrypto-lib-defltprov.o", "providers/libcrypto-lib-nullprov.o", @@ -9759,9 +9699,6 @@ our %unified_info = ( "providers/libdefault.a" ], "products" => { - "bin" => [ - "test/evp_extra_test" - ], "dso" => [ "providers/fips", "providers/legacy" @@ -10198,7 +10135,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10249,7 +10185,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -11381,9 +11316,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -11681,9 +11613,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -12452,9 +12381,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -12749,9 +12675,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -12785,12 +12708,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -13775,9 +13692,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -14075,9 +13989,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -14846,9 +14757,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -15143,9 +15051,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -15179,12 +15084,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -16213,10 +16112,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16293,9 +16188,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "whrlpool" ], - "test/p_minimal.ld" => [ - "util/providers.num" - ], "test/p_test.ld" => [ "util/providers.num" ], @@ -16461,7 +16353,6 @@ our %unified_info = ( "doc/html/man3/CMS_get1_ReceiptRequest.html", "doc/html/man3/CMS_sign.html", "doc/html/man3/CMS_sign_receipt.html", - "doc/html/man3/CMS_signed_get_attr.html", "doc/html/man3/CMS_uncompress.html", "doc/html/man3/CMS_verify.html", "doc/html/man3/CMS_verify_receipt.html", @@ -16561,7 +16452,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_encapsulate.html", "doc/html/man3/EVP_PKEY_encrypt.html", "doc/html/man3/EVP_PKEY_fromdata.html", - "doc/html/man3/EVP_PKEY_get_attr.html", "doc/html/man3/EVP_PKEY_get_default_digest_nid.html", "doc/html/man3/EVP_PKEY_get_field_type.html", "doc/html/man3/EVP_PKEY_get_group_name.html", @@ -16818,7 +16708,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -16917,7 +16806,6 @@ our %unified_info = ( "doc/html/man3/X509V3_get_d2i.html", "doc/html/man3/X509V3_set_ctx.html", "doc/html/man3/X509_ALGOR_dup.html", - "doc/html/man3/X509_ATTRIBUTE.html", "doc/html/man3/X509_CRL_get0_by_serial.html", "doc/html/man3/X509_EXTENSION_set_object.html", "doc/html/man3/X509_LOOKUP.html", @@ -16929,8 +16817,6 @@ our %unified_info = ( "doc/html/man3/X509_NAME_get_index_by_NID.html", "doc/html/man3/X509_NAME_print_ex.html", "doc/html/man3/X509_PUBKEY_new.html", - "doc/html/man3/X509_REQ_get_attr.html", - "doc/html/man3/X509_REQ_get_extensions.html", "doc/html/man3/X509_SIG_get0.html", "doc/html/man3/X509_STORE_CTX_get_error.html", "doc/html/man3/X509_STORE_CTX_new.html", @@ -18228,10 +18114,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/asn1_stable_parse_test" => [ - "include", - "apps/include" - ], "test/asn1_string_table_test" => [ "include", "apps/include" @@ -18439,9 +18321,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -18701,9 +18580,7 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "include", - "apps/include", - "providers/common/include", - "providers/implementations/include" + "apps/include" ], "test/evp_extra_test2" => [ "include", @@ -18960,10 +18837,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/p_minimal" => [ - "include", - "." - ], "test/p_test" => [ "include", "." @@ -19453,7 +19326,6 @@ our %unified_info = ( "doc/man/man3/CMS_get1_ReceiptRequest.3", "doc/man/man3/CMS_sign.3", "doc/man/man3/CMS_sign_receipt.3", - "doc/man/man3/CMS_signed_get_attr.3", "doc/man/man3/CMS_uncompress.3", "doc/man/man3/CMS_verify.3", "doc/man/man3/CMS_verify_receipt.3", @@ -19553,7 +19425,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_encapsulate.3", "doc/man/man3/EVP_PKEY_encrypt.3", "doc/man/man3/EVP_PKEY_fromdata.3", - "doc/man/man3/EVP_PKEY_get_attr.3", "doc/man/man3/EVP_PKEY_get_default_digest_nid.3", "doc/man/man3/EVP_PKEY_get_field_type.3", "doc/man/man3/EVP_PKEY_get_group_name.3", @@ -19810,7 +19681,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -19909,7 +19779,6 @@ our %unified_info = ( "doc/man/man3/X509V3_get_d2i.3", "doc/man/man3/X509V3_set_ctx.3", "doc/man/man3/X509_ALGOR_dup.3", - "doc/man/man3/X509_ATTRIBUTE.3", "doc/man/man3/X509_CRL_get0_by_serial.3", "doc/man/man3/X509_EXTENSION_set_object.3", "doc/man/man3/X509_LOOKUP.3", @@ -19921,8 +19790,6 @@ our %unified_info = ( "doc/man/man3/X509_NAME_get_index_by_NID.3", "doc/man/man3/X509_NAME_print_ex.3", "doc/man/man3/X509_PUBKEY_new.3", - "doc/man/man3/X509_REQ_get_attr.3", - "doc/man/man3/X509_REQ_get_extensions.3", "doc/man/man3/X509_SIG_get0.3", "doc/man/man3/X509_STORE_CTX_get_error.3", "doc/man/man3/X509_STORE_CTX_new.3", @@ -20106,7 +19973,6 @@ our %unified_info = ( "modules" => [ "providers/fips", "providers/legacy", - "test/p_minimal", "test/p_test" ], "programs" => [ @@ -20132,7 +19998,6 @@ our %unified_info = ( "test/asn1_dsa_internal_test", "test/asn1_encode_test", "test/asn1_internal_test", - "test/asn1_stable_parse_test", "test/asn1_string_table_test", "test/asn1_time_test", "test/asynciotest", @@ -20196,7 +20061,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24321,7 +24185,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24348,7 +24211,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -24450,9 +24312,6 @@ our %unified_info = ( "providers/common/libfips-lib-securitycheck_fips.o" => [ "providers/common/securitycheck_fips.c" ], - "providers/evp_extra_test-bin-legacyprov.o" => [ - "providers/legacyprov.c" - ], "providers/fips" => [ "providers/fips.ld", "providers/fips/fips-dso-fips_entry.o" @@ -25589,9 +25448,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25673,9 +25529,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25733,12 +25586,6 @@ our %unified_info = ( "test/asn1_internal_test-bin-asn1_internal_test.o" => [ "test/asn1_internal_test.c" ], - "test/asn1_stable_parse_test" => [ - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" - ], - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" => [ - "test/asn1_stable_parse_test.c" - ], "test/asn1_string_table_test" => [ "test/asn1_string_table_test-bin-asn1_string_table_test.o" ], @@ -26118,12 +25965,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -26522,7 +26363,6 @@ our %unified_info = ( "test/errtest.c" ], "test/evp_extra_test" => [ - "providers/evp_extra_test-bin-legacyprov.o", "test/evp_extra_test-bin-evp_extra_test.o" ], "test/evp_extra_test-bin-evp_extra_test.o" => [ @@ -26813,13 +26653,6 @@ our %unified_info = ( "test/ossl_store_test-bin-ossl_store_test.o" => [ "test/ossl_store_test.c" ], - "test/p_minimal" => [ - "test/p_minimal-dso-p_minimal.o", - "test/p_minimal.ld" - ], - "test/p_minimal-dso-p_minimal.o" => [ - "test/p_minimal.c" - ], "test/p_test" => [ "test/p_test-dso-p_test.o", "test/p_test.ld" @@ -27509,8 +27342,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27537,7 +27370,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27554,8 +27387,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux64-riscv64/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/linux64-riscv64/no-asm/crypto/buildinf.h index 0ca3c0b6e..230613ee0 100644 --- a/deps/openssl/config/archs/linux64-riscv64/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux64-riscv64/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux64-riscv64" -#define DATE "built on: Wed Jan 31 13:08:37 2024 UTC" +#define DATE "built on: Tue Aug 6 12:30:49 2024 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux64-riscv64/no-asm/include/openssl/bio.h b/deps/openssl/config/archs/linux64-riscv64/no-asm/include/openssl/bio.h index f9aa74731..e16cf622c 100644 --- a/deps/openssl/config/archs/linux64-riscv64/no-asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/linux64-riscv64/no-asm/include/openssl/bio.h @@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, - int (*ossl_gets) (BIO *, char *, int)); + int (*gets) (BIO *, char *, int)); long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); diff --git a/deps/openssl/config/archs/linux64-riscv64/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux64-riscv64/no-asm/include/openssl/opensslv.h index 65f3bfa05..5bb97d596 100644 --- a/deps/openssl/config/archs/linux64-riscv64/no-asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux64-riscv64/no-asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 13 +# define OPENSSL_VERSION_PATCH 9 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.13" -# define OPENSSL_FULL_VERSION_STR "3.0.13+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "30 Jan 2024" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13+quic 30 Jan 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux64-riscv64/no-asm/include/openssl/pkcs7.h b/deps/openssl/config/archs/linux64-riscv64/no-asm/include/openssl/pkcs7.h index 0ce79bf4f..557a0a726 100644 --- a/deps/openssl/config/archs/linux64-riscv64/no-asm/include/openssl/pkcs7.h +++ b/deps/openssl/config/archs/linux64-riscv64/no-asm/include/openssl/pkcs7.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/pkcs7.h.in * - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -56,8 +56,8 @@ typedef struct pkcs7_signer_info_st { PKCS7_ISSUER_AND_SERIAL *issuer_and_serial; X509_ALGOR *digest_alg; STACK_OF(X509_ATTRIBUTE) *auth_attr; /* [ 0 ] */ - X509_ALGOR *digest_enc_alg; /* confusing name, actually used for signing */ - ASN1_OCTET_STRING *enc_digest; /* confusing name, actually signature */ + X509_ALGOR *digest_enc_alg; + ASN1_OCTET_STRING *enc_digest; STACK_OF(X509_ATTRIBUTE) *unauth_attr; /* [ 1 ] */ /* The private key to sign with */ EVP_PKEY *pkey; diff --git a/deps/openssl/config/archs/linux64-riscv64/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux64-riscv64/no-asm/include/openssl/ssl.h index 0f1915755..3df725c56 100644 --- a/deps/openssl/config/archs/linux64-riscv64/no-asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux64-riscv64/no-asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/linux64-riscv64/no-asm/openssl.gypi b/deps/openssl/config/archs/linux64-riscv64/no-asm/openssl.gypi index b4549cc91..28788f4b8 100644 --- a/deps/openssl/config/archs/linux64-riscv64/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/linux64-riscv64/no-asm/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cbc.c', 'openssl/crypto/aes/aes_cfb.c', diff --git a/deps/openssl/config/archs/linux64-s390x/asm/configdata.pm b/deps/openssl/config/archs/linux64-s390x/asm/configdata.pm index d615c028d..1cfa5178d 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm/configdata.pm +++ b/deps/openssl/config/archs/linux64-s390x/asm/configdata.pm @@ -142,7 +142,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -159,7 +159,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.13+quic", + "full_version" => "3.0.9", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -207,7 +207,7 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "13", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "30 Jan 2024", - "shlib_version" => "81.3", + "release_date" => "30 May 2023", + "shlib_version" => "3", "sourcedir" => ".", "target" => "linux64-s390x", - "version" => "3.0.13" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -395,7 +395,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -791,9 +790,6 @@ our %unified_info = ( "providers/fips" => { "fips" => "1" }, - "test/p_minimal" => { - "noinst" => "1" - }, "test/p_test" => { "noinst" => "1" } @@ -862,9 +858,6 @@ our %unified_info = ( "test/asn1_internal_test" => { "noinst" => "1" }, - "test/asn1_stable_parse_test" => { - "noinst" => "1" - }, "test/asn1_string_table_test" => { "noinst" => "1" }, @@ -1054,9 +1047,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -1608,7 +1598,6 @@ our %unified_info = ( "OPENSSL_BN_ASM_MONT", "OPENSSL_CPUID_OBJ", "POLY1305_ASM", - "RC4_ASM", "S390X_EC_ASM", "SHA1_ASM", "SHA256_ASM", @@ -1648,12 +1637,6 @@ our %unified_info = ( "SHA256_ASM", "SHA512_ASM" ], - "providers/liblegacy.a" => [ - "RC4_ASM" - ], - "test/evp_extra_test" => [ - "STATIC_LEGACY" - ], "test/provider_internal_test" => [ "PROVIDER_INIT_FUNCTION_NAME=p_test_init" ], @@ -2407,9 +2390,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -2707,9 +2687,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -3478,9 +3455,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -3775,9 +3749,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -3811,12 +3782,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -4801,9 +4766,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -5101,9 +5063,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -5872,9 +5831,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -6169,9 +6125,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -6205,12 +6158,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -7208,10 +7155,6 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], - "test/asn1_stable_parse_test" => [ - "libcrypto", - "test/libtestutil.a" - ], "test/asn1_string_table_test" => [ "libcrypto", "test/libtestutil.a" @@ -7465,10 +7408,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -7734,8 +7673,6 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "libcrypto.a", - "providers/libcommon.a", - "providers/liblegacy.a", "test/libtestutil.a" ], "test/evp_extra_test2" => [ @@ -9825,7 +9762,6 @@ our %unified_info = ( }, "providers" => { "deps" => [ - "providers/evp_extra_test-bin-legacyprov.o", "providers/libcrypto-lib-baseprov.o", "providers/libcrypto-lib-defltprov.o", "providers/libcrypto-lib-nullprov.o", @@ -9833,9 +9769,6 @@ our %unified_info = ( "providers/libdefault.a" ], "products" => { - "bin" => [ - "test/evp_extra_test" - ], "dso" => [ "providers/fips", "providers/legacy" @@ -10272,7 +10205,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10323,7 +10255,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -11455,9 +11386,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -11755,9 +11683,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -12526,9 +12451,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -12823,9 +12745,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -12859,12 +12778,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -13849,9 +13762,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -14149,9 +14059,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -14920,9 +14827,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -15217,9 +15121,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -15253,12 +15154,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -16287,10 +16182,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16367,9 +16258,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "whrlpool" ], - "test/p_minimal.ld" => [ - "util/providers.num" - ], "test/p_test.ld" => [ "util/providers.num" ], @@ -16535,7 +16423,6 @@ our %unified_info = ( "doc/html/man3/CMS_get1_ReceiptRequest.html", "doc/html/man3/CMS_sign.html", "doc/html/man3/CMS_sign_receipt.html", - "doc/html/man3/CMS_signed_get_attr.html", "doc/html/man3/CMS_uncompress.html", "doc/html/man3/CMS_verify.html", "doc/html/man3/CMS_verify_receipt.html", @@ -16635,7 +16522,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_encapsulate.html", "doc/html/man3/EVP_PKEY_encrypt.html", "doc/html/man3/EVP_PKEY_fromdata.html", - "doc/html/man3/EVP_PKEY_get_attr.html", "doc/html/man3/EVP_PKEY_get_default_digest_nid.html", "doc/html/man3/EVP_PKEY_get_field_type.html", "doc/html/man3/EVP_PKEY_get_group_name.html", @@ -16892,7 +16778,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -16991,7 +16876,6 @@ our %unified_info = ( "doc/html/man3/X509V3_get_d2i.html", "doc/html/man3/X509V3_set_ctx.html", "doc/html/man3/X509_ALGOR_dup.html", - "doc/html/man3/X509_ATTRIBUTE.html", "doc/html/man3/X509_CRL_get0_by_serial.html", "doc/html/man3/X509_EXTENSION_set_object.html", "doc/html/man3/X509_LOOKUP.html", @@ -17003,8 +16887,6 @@ our %unified_info = ( "doc/html/man3/X509_NAME_get_index_by_NID.html", "doc/html/man3/X509_NAME_print_ex.html", "doc/html/man3/X509_PUBKEY_new.html", - "doc/html/man3/X509_REQ_get_attr.html", - "doc/html/man3/X509_REQ_get_extensions.html", "doc/html/man3/X509_SIG_get0.html", "doc/html/man3/X509_STORE_CTX_get_error.html", "doc/html/man3/X509_STORE_CTX_new.html", @@ -18356,10 +18238,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/asn1_stable_parse_test" => [ - "include", - "apps/include" - ], "test/asn1_string_table_test" => [ "include", "apps/include" @@ -18567,9 +18445,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -18829,9 +18704,7 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "include", - "apps/include", - "providers/common/include", - "providers/implementations/include" + "apps/include" ], "test/evp_extra_test2" => [ "include", @@ -19088,10 +18961,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/p_minimal" => [ - "include", - "." - ], "test/p_test" => [ "include", "." @@ -19581,7 +19450,6 @@ our %unified_info = ( "doc/man/man3/CMS_get1_ReceiptRequest.3", "doc/man/man3/CMS_sign.3", "doc/man/man3/CMS_sign_receipt.3", - "doc/man/man3/CMS_signed_get_attr.3", "doc/man/man3/CMS_uncompress.3", "doc/man/man3/CMS_verify.3", "doc/man/man3/CMS_verify_receipt.3", @@ -19681,7 +19549,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_encapsulate.3", "doc/man/man3/EVP_PKEY_encrypt.3", "doc/man/man3/EVP_PKEY_fromdata.3", - "doc/man/man3/EVP_PKEY_get_attr.3", "doc/man/man3/EVP_PKEY_get_default_digest_nid.3", "doc/man/man3/EVP_PKEY_get_field_type.3", "doc/man/man3/EVP_PKEY_get_group_name.3", @@ -19938,7 +19805,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20037,7 +19903,6 @@ our %unified_info = ( "doc/man/man3/X509V3_get_d2i.3", "doc/man/man3/X509V3_set_ctx.3", "doc/man/man3/X509_ALGOR_dup.3", - "doc/man/man3/X509_ATTRIBUTE.3", "doc/man/man3/X509_CRL_get0_by_serial.3", "doc/man/man3/X509_EXTENSION_set_object.3", "doc/man/man3/X509_LOOKUP.3", @@ -20049,8 +19914,6 @@ our %unified_info = ( "doc/man/man3/X509_NAME_get_index_by_NID.3", "doc/man/man3/X509_NAME_print_ex.3", "doc/man/man3/X509_PUBKEY_new.3", - "doc/man/man3/X509_REQ_get_attr.3", - "doc/man/man3/X509_REQ_get_extensions.3", "doc/man/man3/X509_SIG_get0.3", "doc/man/man3/X509_STORE_CTX_get_error.3", "doc/man/man3/X509_STORE_CTX_new.3", @@ -20234,7 +20097,6 @@ our %unified_info = ( "modules" => [ "providers/fips", "providers/legacy", - "test/p_minimal", "test/p_test" ], "programs" => [ @@ -20260,7 +20122,6 @@ our %unified_info = ( "test/asn1_dsa_internal_test", "test/asn1_encode_test", "test/asn1_internal_test", - "test/asn1_stable_parse_test", "test/asn1_string_table_test", "test/asn1_time_test", "test/asynciotest", @@ -20324,7 +20185,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24505,7 +24365,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24532,7 +24391,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -24634,9 +24492,6 @@ our %unified_info = ( "providers/common/libfips-lib-securitycheck_fips.o" => [ "providers/common/securitycheck_fips.c" ], - "providers/evp_extra_test-bin-legacyprov.o" => [ - "providers/legacyprov.c" - ], "providers/fips" => [ "providers/fips.ld", "providers/fips/fips-dso-fips_entry.o" @@ -25781,9 +25636,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25865,9 +25717,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25925,12 +25774,6 @@ our %unified_info = ( "test/asn1_internal_test-bin-asn1_internal_test.o" => [ "test/asn1_internal_test.c" ], - "test/asn1_stable_parse_test" => [ - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" - ], - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" => [ - "test/asn1_stable_parse_test.c" - ], "test/asn1_string_table_test" => [ "test/asn1_string_table_test-bin-asn1_string_table_test.o" ], @@ -26310,12 +26153,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -26714,7 +26551,6 @@ our %unified_info = ( "test/errtest.c" ], "test/evp_extra_test" => [ - "providers/evp_extra_test-bin-legacyprov.o", "test/evp_extra_test-bin-evp_extra_test.o" ], "test/evp_extra_test-bin-evp_extra_test.o" => [ @@ -27005,13 +26841,6 @@ our %unified_info = ( "test/ossl_store_test-bin-ossl_store_test.o" => [ "test/ossl_store_test.c" ], - "test/p_minimal" => [ - "test/p_minimal-dso-p_minimal.o", - "test/p_minimal.ld" - ], - "test/p_minimal-dso-p_minimal.o" => [ - "test/p_minimal.c" - ], "test/p_test" => [ "test/p_test-dso-p_test.o", "test/p_test.ld" @@ -27698,8 +27527,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27726,7 +27555,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27743,8 +27572,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux64-s390x/asm/crypto/buildinf.h b/deps/openssl/config/archs/linux64-s390x/asm/crypto/buildinf.h index 3c794e9cc..e48b693ba 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux64-s390x/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux64-s390x" -#define DATE "built on: Wed Jan 31 13:04:34 2024 UTC" +#define DATE "built on: Tue Aug 6 12:27:09 2024 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux64-s390x/asm/include/openssl/bio.h b/deps/openssl/config/archs/linux64-s390x/asm/include/openssl/bio.h index f9aa74731..e16cf622c 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/linux64-s390x/asm/include/openssl/bio.h @@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, - int (*ossl_gets) (BIO *, char *, int)); + int (*gets) (BIO *, char *, int)); long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); diff --git a/deps/openssl/config/archs/linux64-s390x/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux64-s390x/asm/include/openssl/opensslv.h index 65f3bfa05..5bb97d596 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux64-s390x/asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 13 +# define OPENSSL_VERSION_PATCH 9 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.13" -# define OPENSSL_FULL_VERSION_STR "3.0.13+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "30 Jan 2024" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13+quic 30 Jan 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux64-s390x/asm/include/openssl/pkcs7.h b/deps/openssl/config/archs/linux64-s390x/asm/include/openssl/pkcs7.h index 0ce79bf4f..557a0a726 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm/include/openssl/pkcs7.h +++ b/deps/openssl/config/archs/linux64-s390x/asm/include/openssl/pkcs7.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/pkcs7.h.in * - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -56,8 +56,8 @@ typedef struct pkcs7_signer_info_st { PKCS7_ISSUER_AND_SERIAL *issuer_and_serial; X509_ALGOR *digest_alg; STACK_OF(X509_ATTRIBUTE) *auth_attr; /* [ 0 ] */ - X509_ALGOR *digest_enc_alg; /* confusing name, actually used for signing */ - ASN1_OCTET_STRING *enc_digest; /* confusing name, actually signature */ + X509_ALGOR *digest_enc_alg; + ASN1_OCTET_STRING *enc_digest; STACK_OF(X509_ATTRIBUTE) *unauth_attr; /* [ 1 ] */ /* The private key to sign with */ EVP_PKEY *pkey; diff --git a/deps/openssl/config/archs/linux64-s390x/asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux64-s390x/asm/include/openssl/ssl.h index 0f1915755..3df725c56 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux64-s390x/asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/linux64-s390x/asm/openssl-cl.gypi b/deps/openssl/config/archs/linux64-s390x/asm/openssl-cl.gypi index 37cfcb1c4..944f5b6c7 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm/openssl-cl.gypi +++ b/deps/openssl/config/archs/linux64-s390x/asm/openssl-cl.gypi @@ -14,7 +14,6 @@ 'OPENSSL_BN_ASM_MONT', 'OPENSSL_CPUID_OBJ', 'POLY1305_ASM', - 'RC4_ASM', 'S390X_EC_ASM', 'SHA1_ASM', 'SHA256_ASM', diff --git a/deps/openssl/config/archs/linux64-s390x/asm/openssl.gypi b/deps/openssl/config/archs/linux64-s390x/asm/openssl.gypi index 0e033968b..e8d7a1844 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm/openssl.gypi +++ b/deps/openssl/config/archs/linux64-s390x/asm/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cfb.c', 'openssl/crypto/aes/aes_ecb.c', @@ -985,7 +983,6 @@ 'OPENSSL_BN_ASM_MONT', 'OPENSSL_CPUID_OBJ', 'POLY1305_ASM', - 'RC4_ASM', 'S390X_EC_ASM', 'SHA1_ASM', 'SHA256_ASM', diff --git a/deps/openssl/config/archs/linux64-s390x/asm_avx2/configdata.pm b/deps/openssl/config/archs/linux64-s390x/asm_avx2/configdata.pm index 64f0a78c6..cefe584e0 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/linux64-s390x/asm_avx2/configdata.pm @@ -142,7 +142,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -159,7 +159,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.13+quic", + "full_version" => "3.0.9", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -207,7 +207,7 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "13", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "30 Jan 2024", - "shlib_version" => "81.3", + "release_date" => "30 May 2023", + "shlib_version" => "3", "sourcedir" => ".", "target" => "linux64-s390x", - "version" => "3.0.13" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -395,7 +395,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -791,9 +790,6 @@ our %unified_info = ( "providers/fips" => { "fips" => "1" }, - "test/p_minimal" => { - "noinst" => "1" - }, "test/p_test" => { "noinst" => "1" } @@ -862,9 +858,6 @@ our %unified_info = ( "test/asn1_internal_test" => { "noinst" => "1" }, - "test/asn1_stable_parse_test" => { - "noinst" => "1" - }, "test/asn1_string_table_test" => { "noinst" => "1" }, @@ -1054,9 +1047,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -1608,7 +1598,6 @@ our %unified_info = ( "OPENSSL_BN_ASM_MONT", "OPENSSL_CPUID_OBJ", "POLY1305_ASM", - "RC4_ASM", "S390X_EC_ASM", "SHA1_ASM", "SHA256_ASM", @@ -1648,12 +1637,6 @@ our %unified_info = ( "SHA256_ASM", "SHA512_ASM" ], - "providers/liblegacy.a" => [ - "RC4_ASM" - ], - "test/evp_extra_test" => [ - "STATIC_LEGACY" - ], "test/provider_internal_test" => [ "PROVIDER_INIT_FUNCTION_NAME=p_test_init" ], @@ -2407,9 +2390,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -2707,9 +2687,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -3478,9 +3455,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -3775,9 +3749,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -3811,12 +3782,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -4801,9 +4766,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -5101,9 +5063,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -5872,9 +5831,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -6169,9 +6125,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -6205,12 +6158,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -7208,10 +7155,6 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], - "test/asn1_stable_parse_test" => [ - "libcrypto", - "test/libtestutil.a" - ], "test/asn1_string_table_test" => [ "libcrypto", "test/libtestutil.a" @@ -7465,10 +7408,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -7734,8 +7673,6 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "libcrypto.a", - "providers/libcommon.a", - "providers/liblegacy.a", "test/libtestutil.a" ], "test/evp_extra_test2" => [ @@ -9825,7 +9762,6 @@ our %unified_info = ( }, "providers" => { "deps" => [ - "providers/evp_extra_test-bin-legacyprov.o", "providers/libcrypto-lib-baseprov.o", "providers/libcrypto-lib-defltprov.o", "providers/libcrypto-lib-nullprov.o", @@ -9833,9 +9769,6 @@ our %unified_info = ( "providers/libdefault.a" ], "products" => { - "bin" => [ - "test/evp_extra_test" - ], "dso" => [ "providers/fips", "providers/legacy" @@ -10272,7 +10205,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10323,7 +10255,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -11455,9 +11386,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -11755,9 +11683,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -12526,9 +12451,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -12823,9 +12745,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -12859,12 +12778,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -13849,9 +13762,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -14149,9 +14059,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -14920,9 +14827,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -15217,9 +15121,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -15253,12 +15154,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -16287,10 +16182,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16367,9 +16258,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "whrlpool" ], - "test/p_minimal.ld" => [ - "util/providers.num" - ], "test/p_test.ld" => [ "util/providers.num" ], @@ -16535,7 +16423,6 @@ our %unified_info = ( "doc/html/man3/CMS_get1_ReceiptRequest.html", "doc/html/man3/CMS_sign.html", "doc/html/man3/CMS_sign_receipt.html", - "doc/html/man3/CMS_signed_get_attr.html", "doc/html/man3/CMS_uncompress.html", "doc/html/man3/CMS_verify.html", "doc/html/man3/CMS_verify_receipt.html", @@ -16635,7 +16522,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_encapsulate.html", "doc/html/man3/EVP_PKEY_encrypt.html", "doc/html/man3/EVP_PKEY_fromdata.html", - "doc/html/man3/EVP_PKEY_get_attr.html", "doc/html/man3/EVP_PKEY_get_default_digest_nid.html", "doc/html/man3/EVP_PKEY_get_field_type.html", "doc/html/man3/EVP_PKEY_get_group_name.html", @@ -16892,7 +16778,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -16991,7 +16876,6 @@ our %unified_info = ( "doc/html/man3/X509V3_get_d2i.html", "doc/html/man3/X509V3_set_ctx.html", "doc/html/man3/X509_ALGOR_dup.html", - "doc/html/man3/X509_ATTRIBUTE.html", "doc/html/man3/X509_CRL_get0_by_serial.html", "doc/html/man3/X509_EXTENSION_set_object.html", "doc/html/man3/X509_LOOKUP.html", @@ -17003,8 +16887,6 @@ our %unified_info = ( "doc/html/man3/X509_NAME_get_index_by_NID.html", "doc/html/man3/X509_NAME_print_ex.html", "doc/html/man3/X509_PUBKEY_new.html", - "doc/html/man3/X509_REQ_get_attr.html", - "doc/html/man3/X509_REQ_get_extensions.html", "doc/html/man3/X509_SIG_get0.html", "doc/html/man3/X509_STORE_CTX_get_error.html", "doc/html/man3/X509_STORE_CTX_new.html", @@ -18356,10 +18238,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/asn1_stable_parse_test" => [ - "include", - "apps/include" - ], "test/asn1_string_table_test" => [ "include", "apps/include" @@ -18567,9 +18445,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -18829,9 +18704,7 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "include", - "apps/include", - "providers/common/include", - "providers/implementations/include" + "apps/include" ], "test/evp_extra_test2" => [ "include", @@ -19088,10 +18961,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/p_minimal" => [ - "include", - "." - ], "test/p_test" => [ "include", "." @@ -19581,7 +19450,6 @@ our %unified_info = ( "doc/man/man3/CMS_get1_ReceiptRequest.3", "doc/man/man3/CMS_sign.3", "doc/man/man3/CMS_sign_receipt.3", - "doc/man/man3/CMS_signed_get_attr.3", "doc/man/man3/CMS_uncompress.3", "doc/man/man3/CMS_verify.3", "doc/man/man3/CMS_verify_receipt.3", @@ -19681,7 +19549,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_encapsulate.3", "doc/man/man3/EVP_PKEY_encrypt.3", "doc/man/man3/EVP_PKEY_fromdata.3", - "doc/man/man3/EVP_PKEY_get_attr.3", "doc/man/man3/EVP_PKEY_get_default_digest_nid.3", "doc/man/man3/EVP_PKEY_get_field_type.3", "doc/man/man3/EVP_PKEY_get_group_name.3", @@ -19938,7 +19805,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20037,7 +19903,6 @@ our %unified_info = ( "doc/man/man3/X509V3_get_d2i.3", "doc/man/man3/X509V3_set_ctx.3", "doc/man/man3/X509_ALGOR_dup.3", - "doc/man/man3/X509_ATTRIBUTE.3", "doc/man/man3/X509_CRL_get0_by_serial.3", "doc/man/man3/X509_EXTENSION_set_object.3", "doc/man/man3/X509_LOOKUP.3", @@ -20049,8 +19914,6 @@ our %unified_info = ( "doc/man/man3/X509_NAME_get_index_by_NID.3", "doc/man/man3/X509_NAME_print_ex.3", "doc/man/man3/X509_PUBKEY_new.3", - "doc/man/man3/X509_REQ_get_attr.3", - "doc/man/man3/X509_REQ_get_extensions.3", "doc/man/man3/X509_SIG_get0.3", "doc/man/man3/X509_STORE_CTX_get_error.3", "doc/man/man3/X509_STORE_CTX_new.3", @@ -20234,7 +20097,6 @@ our %unified_info = ( "modules" => [ "providers/fips", "providers/legacy", - "test/p_minimal", "test/p_test" ], "programs" => [ @@ -20260,7 +20122,6 @@ our %unified_info = ( "test/asn1_dsa_internal_test", "test/asn1_encode_test", "test/asn1_internal_test", - "test/asn1_stable_parse_test", "test/asn1_string_table_test", "test/asn1_time_test", "test/asynciotest", @@ -20324,7 +20185,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24505,7 +24365,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24532,7 +24391,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -24634,9 +24492,6 @@ our %unified_info = ( "providers/common/libfips-lib-securitycheck_fips.o" => [ "providers/common/securitycheck_fips.c" ], - "providers/evp_extra_test-bin-legacyprov.o" => [ - "providers/legacyprov.c" - ], "providers/fips" => [ "providers/fips.ld", "providers/fips/fips-dso-fips_entry.o" @@ -25781,9 +25636,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25865,9 +25717,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25925,12 +25774,6 @@ our %unified_info = ( "test/asn1_internal_test-bin-asn1_internal_test.o" => [ "test/asn1_internal_test.c" ], - "test/asn1_stable_parse_test" => [ - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" - ], - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" => [ - "test/asn1_stable_parse_test.c" - ], "test/asn1_string_table_test" => [ "test/asn1_string_table_test-bin-asn1_string_table_test.o" ], @@ -26310,12 +26153,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -26714,7 +26551,6 @@ our %unified_info = ( "test/errtest.c" ], "test/evp_extra_test" => [ - "providers/evp_extra_test-bin-legacyprov.o", "test/evp_extra_test-bin-evp_extra_test.o" ], "test/evp_extra_test-bin-evp_extra_test.o" => [ @@ -27005,13 +26841,6 @@ our %unified_info = ( "test/ossl_store_test-bin-ossl_store_test.o" => [ "test/ossl_store_test.c" ], - "test/p_minimal" => [ - "test/p_minimal-dso-p_minimal.o", - "test/p_minimal.ld" - ], - "test/p_minimal-dso-p_minimal.o" => [ - "test/p_minimal.c" - ], "test/p_test" => [ "test/p_test-dso-p_test.o", "test/p_test.ld" @@ -27698,8 +27527,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27726,7 +27555,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27743,8 +27572,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux64-s390x/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/linux64-s390x/asm_avx2/crypto/buildinf.h index 3d0c483c5..37a595a70 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux64-s390x/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux64-s390x" -#define DATE "built on: Wed Jan 31 13:04:46 2024 UTC" +#define DATE "built on: Tue Aug 6 12:27:20 2024 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/openssl/bio.h b/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/openssl/bio.h index f9aa74731..e16cf622c 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/openssl/bio.h +++ b/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/openssl/bio.h @@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, - int (*ossl_gets) (BIO *, char *, int)); + int (*gets) (BIO *, char *, int)); long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); diff --git a/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/openssl/opensslv.h index 65f3bfa05..5bb97d596 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 13 +# define OPENSSL_VERSION_PATCH 9 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.13" -# define OPENSSL_FULL_VERSION_STR "3.0.13+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "30 Jan 2024" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13+quic 30 Jan 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/openssl/pkcs7.h b/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/openssl/pkcs7.h index 0ce79bf4f..557a0a726 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/openssl/pkcs7.h +++ b/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/openssl/pkcs7.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/pkcs7.h.in * - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -56,8 +56,8 @@ typedef struct pkcs7_signer_info_st { PKCS7_ISSUER_AND_SERIAL *issuer_and_serial; X509_ALGOR *digest_alg; STACK_OF(X509_ATTRIBUTE) *auth_attr; /* [ 0 ] */ - X509_ALGOR *digest_enc_alg; /* confusing name, actually used for signing */ - ASN1_OCTET_STRING *enc_digest; /* confusing name, actually signature */ + X509_ALGOR *digest_enc_alg; + ASN1_OCTET_STRING *enc_digest; STACK_OF(X509_ATTRIBUTE) *unauth_attr; /* [ 1 ] */ /* The private key to sign with */ EVP_PKEY *pkey; diff --git a/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/openssl/ssl.h index 0f1915755..3df725c56 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/linux64-s390x/asm_avx2/openssl-cl.gypi b/deps/openssl/config/archs/linux64-s390x/asm_avx2/openssl-cl.gypi index 0ef49ef3c..670ed2d6e 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm_avx2/openssl-cl.gypi +++ b/deps/openssl/config/archs/linux64-s390x/asm_avx2/openssl-cl.gypi @@ -14,7 +14,6 @@ 'OPENSSL_BN_ASM_MONT', 'OPENSSL_CPUID_OBJ', 'POLY1305_ASM', - 'RC4_ASM', 'S390X_EC_ASM', 'SHA1_ASM', 'SHA256_ASM', diff --git a/deps/openssl/config/archs/linux64-s390x/asm_avx2/openssl.gypi b/deps/openssl/config/archs/linux64-s390x/asm_avx2/openssl.gypi index d3994ecfa..550579045 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/linux64-s390x/asm_avx2/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cfb.c', 'openssl/crypto/aes/aes_ecb.c', @@ -985,7 +983,6 @@ 'OPENSSL_BN_ASM_MONT', 'OPENSSL_CPUID_OBJ', 'POLY1305_ASM', - 'RC4_ASM', 'S390X_EC_ASM', 'SHA1_ASM', 'SHA256_ASM', diff --git a/deps/openssl/config/archs/linux64-s390x/no-asm/configdata.pm b/deps/openssl/config/archs/linux64-s390x/no-asm/configdata.pm index 69bc1c797..f6af76e26 100644 --- a/deps/openssl/config/archs/linux64-s390x/no-asm/configdata.pm +++ b/deps/openssl/config/archs/linux64-s390x/no-asm/configdata.pm @@ -142,7 +142,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [], @@ -157,7 +157,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.13+quic", + "full_version" => "3.0.9", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,7 +206,7 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "13", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "30 Jan 2024", - "shlib_version" => "81.3", + "release_date" => "30 May 2023", + "shlib_version" => "3", "sourcedir" => ".", "target" => "linux64-s390x", - "version" => "3.0.13" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -395,7 +395,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -792,9 +791,6 @@ our %unified_info = ( "providers/fips" => { "fips" => "1" }, - "test/p_minimal" => { - "noinst" => "1" - }, "test/p_test" => { "noinst" => "1" } @@ -863,9 +859,6 @@ our %unified_info = ( "test/asn1_internal_test" => { "noinst" => "1" }, - "test/asn1_stable_parse_test" => { - "noinst" => "1" - }, "test/asn1_string_table_test" => { "noinst" => "1" }, @@ -1055,9 +1048,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -1605,9 +1595,6 @@ our %unified_info = ( "providers/libfips.a" => [ "FIPS_MODULE" ], - "test/evp_extra_test" => [ - "STATIC_LEGACY" - ], "test/provider_internal_test" => [ "PROVIDER_INIT_FUNCTION_NAME=p_test_init" ], @@ -2361,9 +2348,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -2661,9 +2645,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -3432,9 +3413,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -3729,9 +3707,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -3765,12 +3740,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -4755,9 +4724,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -5055,9 +5021,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -5826,9 +5789,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -6123,9 +6083,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -6159,12 +6116,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -7162,10 +7113,6 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], - "test/asn1_stable_parse_test" => [ - "libcrypto", - "test/libtestutil.a" - ], "test/asn1_string_table_test" => [ "libcrypto", "test/libtestutil.a" @@ -7419,10 +7366,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -7688,8 +7631,6 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "libcrypto.a", - "providers/libcommon.a", - "providers/liblegacy.a", "test/libtestutil.a" ], "test/evp_extra_test2" => [ @@ -9753,7 +9694,6 @@ our %unified_info = ( }, "providers" => { "deps" => [ - "providers/evp_extra_test-bin-legacyprov.o", "providers/libcrypto-lib-baseprov.o", "providers/libcrypto-lib-defltprov.o", "providers/libcrypto-lib-nullprov.o", @@ -9761,9 +9701,6 @@ our %unified_info = ( "providers/libdefault.a" ], "products" => { - "bin" => [ - "test/evp_extra_test" - ], "dso" => [ "providers/fips", "providers/legacy" @@ -10200,7 +10137,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10251,7 +10187,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -11383,9 +11318,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -11683,9 +11615,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -12454,9 +12383,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -12751,9 +12677,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -12787,12 +12710,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -13777,9 +13694,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -14077,9 +13991,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -14848,9 +14759,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -15145,9 +15053,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -15181,12 +15086,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -16215,10 +16114,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16295,9 +16190,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "whrlpool" ], - "test/p_minimal.ld" => [ - "util/providers.num" - ], "test/p_test.ld" => [ "util/providers.num" ], @@ -16463,7 +16355,6 @@ our %unified_info = ( "doc/html/man3/CMS_get1_ReceiptRequest.html", "doc/html/man3/CMS_sign.html", "doc/html/man3/CMS_sign_receipt.html", - "doc/html/man3/CMS_signed_get_attr.html", "doc/html/man3/CMS_uncompress.html", "doc/html/man3/CMS_verify.html", "doc/html/man3/CMS_verify_receipt.html", @@ -16563,7 +16454,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_encapsulate.html", "doc/html/man3/EVP_PKEY_encrypt.html", "doc/html/man3/EVP_PKEY_fromdata.html", - "doc/html/man3/EVP_PKEY_get_attr.html", "doc/html/man3/EVP_PKEY_get_default_digest_nid.html", "doc/html/man3/EVP_PKEY_get_field_type.html", "doc/html/man3/EVP_PKEY_get_group_name.html", @@ -16820,7 +16710,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -16919,7 +16808,6 @@ our %unified_info = ( "doc/html/man3/X509V3_get_d2i.html", "doc/html/man3/X509V3_set_ctx.html", "doc/html/man3/X509_ALGOR_dup.html", - "doc/html/man3/X509_ATTRIBUTE.html", "doc/html/man3/X509_CRL_get0_by_serial.html", "doc/html/man3/X509_EXTENSION_set_object.html", "doc/html/man3/X509_LOOKUP.html", @@ -16931,8 +16819,6 @@ our %unified_info = ( "doc/html/man3/X509_NAME_get_index_by_NID.html", "doc/html/man3/X509_NAME_print_ex.html", "doc/html/man3/X509_PUBKEY_new.html", - "doc/html/man3/X509_REQ_get_attr.html", - "doc/html/man3/X509_REQ_get_extensions.html", "doc/html/man3/X509_SIG_get0.html", "doc/html/man3/X509_STORE_CTX_get_error.html", "doc/html/man3/X509_STORE_CTX_new.html", @@ -18230,10 +18116,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/asn1_stable_parse_test" => [ - "include", - "apps/include" - ], "test/asn1_string_table_test" => [ "include", "apps/include" @@ -18441,9 +18323,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -18703,9 +18582,7 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "include", - "apps/include", - "providers/common/include", - "providers/implementations/include" + "apps/include" ], "test/evp_extra_test2" => [ "include", @@ -18962,10 +18839,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/p_minimal" => [ - "include", - "." - ], "test/p_test" => [ "include", "." @@ -19455,7 +19328,6 @@ our %unified_info = ( "doc/man/man3/CMS_get1_ReceiptRequest.3", "doc/man/man3/CMS_sign.3", "doc/man/man3/CMS_sign_receipt.3", - "doc/man/man3/CMS_signed_get_attr.3", "doc/man/man3/CMS_uncompress.3", "doc/man/man3/CMS_verify.3", "doc/man/man3/CMS_verify_receipt.3", @@ -19555,7 +19427,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_encapsulate.3", "doc/man/man3/EVP_PKEY_encrypt.3", "doc/man/man3/EVP_PKEY_fromdata.3", - "doc/man/man3/EVP_PKEY_get_attr.3", "doc/man/man3/EVP_PKEY_get_default_digest_nid.3", "doc/man/man3/EVP_PKEY_get_field_type.3", "doc/man/man3/EVP_PKEY_get_group_name.3", @@ -19812,7 +19683,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -19911,7 +19781,6 @@ our %unified_info = ( "doc/man/man3/X509V3_get_d2i.3", "doc/man/man3/X509V3_set_ctx.3", "doc/man/man3/X509_ALGOR_dup.3", - "doc/man/man3/X509_ATTRIBUTE.3", "doc/man/man3/X509_CRL_get0_by_serial.3", "doc/man/man3/X509_EXTENSION_set_object.3", "doc/man/man3/X509_LOOKUP.3", @@ -19923,8 +19792,6 @@ our %unified_info = ( "doc/man/man3/X509_NAME_get_index_by_NID.3", "doc/man/man3/X509_NAME_print_ex.3", "doc/man/man3/X509_PUBKEY_new.3", - "doc/man/man3/X509_REQ_get_attr.3", - "doc/man/man3/X509_REQ_get_extensions.3", "doc/man/man3/X509_SIG_get0.3", "doc/man/man3/X509_STORE_CTX_get_error.3", "doc/man/man3/X509_STORE_CTX_new.3", @@ -20108,7 +19975,6 @@ our %unified_info = ( "modules" => [ "providers/fips", "providers/legacy", - "test/p_minimal", "test/p_test" ], "programs" => [ @@ -20134,7 +20000,6 @@ our %unified_info = ( "test/asn1_dsa_internal_test", "test/asn1_encode_test", "test/asn1_internal_test", - "test/asn1_stable_parse_test", "test/asn1_string_table_test", "test/asn1_time_test", "test/asynciotest", @@ -20198,7 +20063,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24323,7 +24187,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24350,7 +24213,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -24452,9 +24314,6 @@ our %unified_info = ( "providers/common/libfips-lib-securitycheck_fips.o" => [ "providers/common/securitycheck_fips.c" ], - "providers/evp_extra_test-bin-legacyprov.o" => [ - "providers/legacyprov.c" - ], "providers/fips" => [ "providers/fips.ld", "providers/fips/fips-dso-fips_entry.o" @@ -25591,9 +25450,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25675,9 +25531,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25735,12 +25588,6 @@ our %unified_info = ( "test/asn1_internal_test-bin-asn1_internal_test.o" => [ "test/asn1_internal_test.c" ], - "test/asn1_stable_parse_test" => [ - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" - ], - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" => [ - "test/asn1_stable_parse_test.c" - ], "test/asn1_string_table_test" => [ "test/asn1_string_table_test-bin-asn1_string_table_test.o" ], @@ -26120,12 +25967,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -26524,7 +26365,6 @@ our %unified_info = ( "test/errtest.c" ], "test/evp_extra_test" => [ - "providers/evp_extra_test-bin-legacyprov.o", "test/evp_extra_test-bin-evp_extra_test.o" ], "test/evp_extra_test-bin-evp_extra_test.o" => [ @@ -26815,13 +26655,6 @@ our %unified_info = ( "test/ossl_store_test-bin-ossl_store_test.o" => [ "test/ossl_store_test.c" ], - "test/p_minimal" => [ - "test/p_minimal-dso-p_minimal.o", - "test/p_minimal.ld" - ], - "test/p_minimal-dso-p_minimal.o" => [ - "test/p_minimal.c" - ], "test/p_test" => [ "test/p_test-dso-p_test.o", "test/p_test.ld" @@ -27511,8 +27344,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27539,7 +27372,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27556,8 +27389,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux64-s390x/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/linux64-s390x/no-asm/crypto/buildinf.h index 26a9eee8e..05438c21c 100644 --- a/deps/openssl/config/archs/linux64-s390x/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux64-s390x/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux64-s390x" -#define DATE "built on: Wed Jan 31 13:04:59 2024 UTC" +#define DATE "built on: Tue Aug 6 12:27:32 2024 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux64-s390x/no-asm/include/openssl/bio.h b/deps/openssl/config/archs/linux64-s390x/no-asm/include/openssl/bio.h index f9aa74731..e16cf622c 100644 --- a/deps/openssl/config/archs/linux64-s390x/no-asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/linux64-s390x/no-asm/include/openssl/bio.h @@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, - int (*ossl_gets) (BIO *, char *, int)); + int (*gets) (BIO *, char *, int)); long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); diff --git a/deps/openssl/config/archs/linux64-s390x/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux64-s390x/no-asm/include/openssl/opensslv.h index 65f3bfa05..5bb97d596 100644 --- a/deps/openssl/config/archs/linux64-s390x/no-asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux64-s390x/no-asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 13 +# define OPENSSL_VERSION_PATCH 9 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.13" -# define OPENSSL_FULL_VERSION_STR "3.0.13+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "30 Jan 2024" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13+quic 30 Jan 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux64-s390x/no-asm/include/openssl/pkcs7.h b/deps/openssl/config/archs/linux64-s390x/no-asm/include/openssl/pkcs7.h index 0ce79bf4f..557a0a726 100644 --- a/deps/openssl/config/archs/linux64-s390x/no-asm/include/openssl/pkcs7.h +++ b/deps/openssl/config/archs/linux64-s390x/no-asm/include/openssl/pkcs7.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/pkcs7.h.in * - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -56,8 +56,8 @@ typedef struct pkcs7_signer_info_st { PKCS7_ISSUER_AND_SERIAL *issuer_and_serial; X509_ALGOR *digest_alg; STACK_OF(X509_ATTRIBUTE) *auth_attr; /* [ 0 ] */ - X509_ALGOR *digest_enc_alg; /* confusing name, actually used for signing */ - ASN1_OCTET_STRING *enc_digest; /* confusing name, actually signature */ + X509_ALGOR *digest_enc_alg; + ASN1_OCTET_STRING *enc_digest; STACK_OF(X509_ATTRIBUTE) *unauth_attr; /* [ 1 ] */ /* The private key to sign with */ EVP_PKEY *pkey; diff --git a/deps/openssl/config/archs/linux64-s390x/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux64-s390x/no-asm/include/openssl/ssl.h index 0f1915755..3df725c56 100644 --- a/deps/openssl/config/archs/linux64-s390x/no-asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux64-s390x/no-asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/linux64-s390x/no-asm/openssl.gypi b/deps/openssl/config/archs/linux64-s390x/no-asm/openssl.gypi index c1c132a13..1fdc4dfb0 100644 --- a/deps/openssl/config/archs/linux64-s390x/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/linux64-s390x/no-asm/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cbc.c', 'openssl/crypto/aes/aes_cfb.c', diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/configdata.pm b/deps/openssl/config/archs/solaris-x86-gcc/asm/configdata.pm index ef7cd1e1c..d8b26698d 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/configdata.pm +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/configdata.pm @@ -139,7 +139,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -156,7 +156,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.13+quic", + "full_version" => "3.0.9", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -204,7 +204,7 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "13", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -256,11 +256,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "30 Jan 2024", - "shlib_version" => "81.3", + "release_date" => "30 May 2023", + "shlib_version" => "3", "sourcedir" => ".", "target" => "solaris-x86-gcc", - "version" => "3.0.13" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -386,7 +386,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -782,9 +781,6 @@ our %unified_info = ( "providers/fips" => { "fips" => "1" }, - "test/p_minimal" => { - "noinst" => "1" - }, "test/p_test" => { "noinst" => "1" } @@ -853,9 +849,6 @@ our %unified_info = ( "test/asn1_internal_test" => { "noinst" => "1" }, - "test/asn1_stable_parse_test" => { - "noinst" => "1" - }, "test/asn1_string_table_test" => { "noinst" => "1" }, @@ -1045,9 +1038,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -1603,7 +1593,6 @@ our %unified_info = ( "OPENSSL_IA32_SSE2", "PADLOCK_ASM", "POLY1305_ASM", - "RC4_ASM", "RMD160_ASM", "SHA1_ASM", "SHA256_ASM", @@ -1651,11 +1640,7 @@ our %unified_info = ( "VPAES_ASM" ], "providers/liblegacy.a" => [ - "MD5_ASM", - "RC4_ASM" - ], - "test/evp_extra_test" => [ - "STATIC_LEGACY" + "MD5_ASM" ], "test/provider_internal_test" => [ "PROVIDER_INIT_FUNCTION_NAME=p_test_init" @@ -2410,9 +2395,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -2710,9 +2692,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -3481,9 +3460,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -3778,9 +3754,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -3814,12 +3787,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -4804,9 +4771,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -5104,9 +5068,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -5875,9 +5836,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -6172,9 +6130,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -6208,12 +6163,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -7211,10 +7160,6 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], - "test/asn1_stable_parse_test" => [ - "libcrypto", - "test/libtestutil.a" - ], "test/asn1_string_table_test" => [ "libcrypto", "test/libtestutil.a" @@ -7468,10 +7413,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -7737,8 +7678,6 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "libcrypto.a", - "providers/libcommon.a", - "providers/liblegacy.a", "test/libtestutil.a" ], "test/evp_extra_test2" => [ @@ -9824,7 +9763,6 @@ our %unified_info = ( }, "providers" => { "deps" => [ - "providers/evp_extra_test-bin-legacyprov.o", "providers/libcrypto-lib-baseprov.o", "providers/libcrypto-lib-defltprov.o", "providers/libcrypto-lib-nullprov.o", @@ -9832,9 +9770,6 @@ our %unified_info = ( "providers/libdefault.a" ], "products" => { - "bin" => [ - "test/evp_extra_test" - ], "dso" => [ "providers/fips", "providers/legacy" @@ -10271,7 +10206,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10322,7 +10256,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -11454,9 +11387,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -11754,9 +11684,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -12525,9 +12452,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -12822,9 +12746,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -12858,12 +12779,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -13848,9 +13763,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -14148,9 +14060,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -14919,9 +14828,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -15216,9 +15122,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -15252,12 +15155,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -16286,10 +16183,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16366,9 +16259,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "whrlpool" ], - "test/p_minimal.ld" => [ - "util/providers.num" - ], "test/p_test.ld" => [ "util/providers.num" ], @@ -16534,7 +16424,6 @@ our %unified_info = ( "doc/html/man3/CMS_get1_ReceiptRequest.html", "doc/html/man3/CMS_sign.html", "doc/html/man3/CMS_sign_receipt.html", - "doc/html/man3/CMS_signed_get_attr.html", "doc/html/man3/CMS_uncompress.html", "doc/html/man3/CMS_verify.html", "doc/html/man3/CMS_verify_receipt.html", @@ -16634,7 +16523,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_encapsulate.html", "doc/html/man3/EVP_PKEY_encrypt.html", "doc/html/man3/EVP_PKEY_fromdata.html", - "doc/html/man3/EVP_PKEY_get_attr.html", "doc/html/man3/EVP_PKEY_get_default_digest_nid.html", "doc/html/man3/EVP_PKEY_get_field_type.html", "doc/html/man3/EVP_PKEY_get_group_name.html", @@ -16891,7 +16779,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -16990,7 +16877,6 @@ our %unified_info = ( "doc/html/man3/X509V3_get_d2i.html", "doc/html/man3/X509V3_set_ctx.html", "doc/html/man3/X509_ALGOR_dup.html", - "doc/html/man3/X509_ATTRIBUTE.html", "doc/html/man3/X509_CRL_get0_by_serial.html", "doc/html/man3/X509_EXTENSION_set_object.html", "doc/html/man3/X509_LOOKUP.html", @@ -17002,8 +16888,6 @@ our %unified_info = ( "doc/html/man3/X509_NAME_get_index_by_NID.html", "doc/html/man3/X509_NAME_print_ex.html", "doc/html/man3/X509_PUBKEY_new.html", - "doc/html/man3/X509_REQ_get_attr.html", - "doc/html/man3/X509_REQ_get_extensions.html", "doc/html/man3/X509_SIG_get0.html", "doc/html/man3/X509_STORE_CTX_get_error.html", "doc/html/man3/X509_STORE_CTX_new.html", @@ -18301,10 +18185,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/asn1_stable_parse_test" => [ - "include", - "apps/include" - ], "test/asn1_string_table_test" => [ "include", "apps/include" @@ -18512,9 +18392,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -18774,9 +18651,7 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "include", - "apps/include", - "providers/common/include", - "providers/implementations/include" + "apps/include" ], "test/evp_extra_test2" => [ "include", @@ -19033,10 +18908,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/p_minimal" => [ - "include", - "." - ], "test/p_test" => [ "include", "." @@ -19526,7 +19397,6 @@ our %unified_info = ( "doc/man/man3/CMS_get1_ReceiptRequest.3", "doc/man/man3/CMS_sign.3", "doc/man/man3/CMS_sign_receipt.3", - "doc/man/man3/CMS_signed_get_attr.3", "doc/man/man3/CMS_uncompress.3", "doc/man/man3/CMS_verify.3", "doc/man/man3/CMS_verify_receipt.3", @@ -19626,7 +19496,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_encapsulate.3", "doc/man/man3/EVP_PKEY_encrypt.3", "doc/man/man3/EVP_PKEY_fromdata.3", - "doc/man/man3/EVP_PKEY_get_attr.3", "doc/man/man3/EVP_PKEY_get_default_digest_nid.3", "doc/man/man3/EVP_PKEY_get_field_type.3", "doc/man/man3/EVP_PKEY_get_group_name.3", @@ -19883,7 +19752,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -19982,7 +19850,6 @@ our %unified_info = ( "doc/man/man3/X509V3_get_d2i.3", "doc/man/man3/X509V3_set_ctx.3", "doc/man/man3/X509_ALGOR_dup.3", - "doc/man/man3/X509_ATTRIBUTE.3", "doc/man/man3/X509_CRL_get0_by_serial.3", "doc/man/man3/X509_EXTENSION_set_object.3", "doc/man/man3/X509_LOOKUP.3", @@ -19994,8 +19861,6 @@ our %unified_info = ( "doc/man/man3/X509_NAME_get_index_by_NID.3", "doc/man/man3/X509_NAME_print_ex.3", "doc/man/man3/X509_PUBKEY_new.3", - "doc/man/man3/X509_REQ_get_attr.3", - "doc/man/man3/X509_REQ_get_extensions.3", "doc/man/man3/X509_SIG_get0.3", "doc/man/man3/X509_STORE_CTX_get_error.3", "doc/man/man3/X509_STORE_CTX_new.3", @@ -20179,7 +20044,6 @@ our %unified_info = ( "modules" => [ "providers/fips", "providers/legacy", - "test/p_minimal", "test/p_test" ], "programs" => [ @@ -20205,7 +20069,6 @@ our %unified_info = ( "test/asn1_dsa_internal_test", "test/asn1_encode_test", "test/asn1_internal_test", - "test/asn1_stable_parse_test", "test/asn1_string_table_test", "test/asn1_time_test", "test/asynciotest", @@ -20269,7 +20132,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24472,7 +24334,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24499,7 +24360,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -24601,9 +24461,6 @@ our %unified_info = ( "providers/common/libfips-lib-securitycheck_fips.o" => [ "providers/common/securitycheck_fips.c" ], - "providers/evp_extra_test-bin-legacyprov.o" => [ - "providers/legacyprov.c" - ], "providers/fips" => [ "providers/fips.ld", "providers/fips/fips-dso-fips_entry.o" @@ -25750,9 +25607,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25834,9 +25688,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25894,12 +25745,6 @@ our %unified_info = ( "test/asn1_internal_test-bin-asn1_internal_test.o" => [ "test/asn1_internal_test.c" ], - "test/asn1_stable_parse_test" => [ - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" - ], - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" => [ - "test/asn1_stable_parse_test.c" - ], "test/asn1_string_table_test" => [ "test/asn1_string_table_test-bin-asn1_string_table_test.o" ], @@ -26279,12 +26124,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -26683,7 +26522,6 @@ our %unified_info = ( "test/errtest.c" ], "test/evp_extra_test" => [ - "providers/evp_extra_test-bin-legacyprov.o", "test/evp_extra_test-bin-evp_extra_test.o" ], "test/evp_extra_test-bin-evp_extra_test.o" => [ @@ -26974,13 +26812,6 @@ our %unified_info = ( "test/ossl_store_test-bin-ossl_store_test.o" => [ "test/ossl_store_test.c" ], - "test/p_minimal" => [ - "test/p_minimal-dso-p_minimal.o", - "test/p_minimal.ld" - ], - "test/p_minimal-dso-p_minimal.o" => [ - "test/p_minimal.c" - ], "test/p_test" => [ "test/p_test-dso-p_test.o", "test/p_test.ld" @@ -27667,8 +27498,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27695,7 +27526,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27712,8 +27543,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/aes/aes-586.S b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/aes/aes-586.S index 628a3b633..9ee3fc9a5 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/aes/aes-586.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/aes/aes-586.S @@ -2,10 +2,10 @@ .type _x86_AES_encrypt_compact,@function .align 16 _x86_AES_encrypt_compact: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl %edi,20(%esp) xorl (%edi),%eax @@ -274,10 +274,10 @@ _x86_AES_encrypt_compact: .type _sse_AES_encrypt_compact,@function .align 16 _sse_AES_encrypt_compact: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pxor (%edi),%mm0 pxor 8(%edi),%mm4 @@ -436,10 +436,10 @@ _sse_AES_encrypt_compact: .type _x86_AES_encrypt,@function .align 16 _x86_AES_encrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl %edi,20(%esp) xorl (%edi),%eax @@ -995,10 +995,10 @@ _x86_AES_encrypt: .align 16 AES_encrypt: .L_AES_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1063,10 +1063,10 @@ AES_encrypt: .type _x86_AES_decrypt_compact,@function .align 16 _x86_AES_decrypt_compact: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl %edi,20(%esp) xorl (%edi),%eax @@ -1423,10 +1423,10 @@ _x86_AES_decrypt_compact: .type _sse_AES_decrypt_compact,@function .align 16 _sse_AES_decrypt_compact: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pxor (%edi),%mm0 pxor 8(%edi),%mm4 @@ -1644,10 +1644,10 @@ _sse_AES_decrypt_compact: .type _x86_AES_decrypt,@function .align 16 _x86_AES_decrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl %edi,20(%esp) xorl (%edi),%eax @@ -2207,10 +2207,10 @@ _x86_AES_decrypt: .align 16 AES_decrypt: .L_AES_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2277,10 +2277,10 @@ AES_decrypt: .align 16 AES_cbc_encrypt: .L_AES_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2813,10 +2813,10 @@ AES_cbc_encrypt: .type _x86_AES_set_encrypt_key,@function .align 16 _x86_AES_set_encrypt_key: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3050,10 +3050,10 @@ _x86_AES_set_encrypt_key: .align 16 AES_set_encrypt_key: .L_AES_set_encrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call _x86_AES_set_encrypt_key ret @@ -3063,10 +3063,10 @@ AES_set_encrypt_key: .align 16 AES_set_decrypt_key: .L_AES_set_decrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call _x86_AES_set_encrypt_key cmpl $0,%eax diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/aes/aesni-x86.S b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/aes/aesni-x86.S index 9191466ee..eb2d01b16 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/aes/aesni-x86.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/aes/aesni-x86.S @@ -4,10 +4,10 @@ .align 16 aesni_encrypt: .L_aesni_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 12(%esp),%edx @@ -36,10 +36,10 @@ aesni_encrypt: .align 16 aesni_decrypt: .L_aesni_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 12(%esp),%edx @@ -66,10 +66,10 @@ aesni_decrypt: .type _aesni_encrypt2,@function .align 16 _aesni_encrypt2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -98,10 +98,10 @@ _aesni_encrypt2: .type _aesni_decrypt2,@function .align 16 _aesni_decrypt2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -130,10 +130,10 @@ _aesni_decrypt2: .type _aesni_encrypt3,@function .align 16 _aesni_encrypt3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -167,10 +167,10 @@ _aesni_encrypt3: .type _aesni_decrypt3,@function .align 16 _aesni_decrypt3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -204,10 +204,10 @@ _aesni_decrypt3: .type _aesni_encrypt4,@function .align 16 _aesni_encrypt4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 movups 16(%edx),%xmm1 @@ -247,10 +247,10 @@ _aesni_encrypt4: .type _aesni_decrypt4,@function .align 16 _aesni_decrypt4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 movups 16(%edx),%xmm1 @@ -290,10 +290,10 @@ _aesni_decrypt4: .type _aesni_encrypt6,@function .align 16 _aesni_encrypt6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -349,10 +349,10 @@ _aesni_encrypt6: .type _aesni_decrypt6,@function .align 16 _aesni_decrypt6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -410,10 +410,10 @@ _aesni_decrypt6: .align 16 aesni_ecb_encrypt: .L_aesni_ecb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -650,10 +650,10 @@ aesni_ecb_encrypt: .align 16 aesni_ccm64_encrypt_blocks: .L_aesni_ccm64_encrypt_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -743,10 +743,10 @@ aesni_ccm64_encrypt_blocks: .align 16 aesni_ccm64_decrypt_blocks: .L_aesni_ccm64_decrypt_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -871,10 +871,10 @@ aesni_ccm64_decrypt_blocks: .align 16 aesni_ctr32_encrypt_blocks: .L_aesni_ctr32_encrypt_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1114,10 +1114,10 @@ aesni_ctr32_encrypt_blocks: .align 16 aesni_xts_encrypt: .L_aesni_xts_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1479,10 +1479,10 @@ aesni_xts_encrypt: .align 16 aesni_xts_decrypt: .L_aesni_xts_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1874,10 +1874,10 @@ aesni_xts_decrypt: .align 16 aesni_ocb_encrypt: .L_aesni_ocb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2274,10 +2274,10 @@ aesni_ocb_encrypt: .align 16 aesni_ocb_decrypt: .L_aesni_ocb_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2674,10 +2674,10 @@ aesni_ocb_decrypt: .align 16 aesni_cbc_encrypt: .L_aesni_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2938,10 +2938,10 @@ aesni_cbc_encrypt: .type _aesni_set_encrypt_key,@function .align 16 _aesni_set_encrypt_key: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3278,10 +3278,10 @@ _aesni_set_encrypt_key: .align 16 aesni_set_encrypt_key: .L_aesni_set_encrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 8(%esp),%ecx @@ -3294,10 +3294,10 @@ aesni_set_encrypt_key: .align 16 aesni_set_decrypt_key: .L_aesni_set_decrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 8(%esp),%ecx diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/aes/vpaes-x86.S b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/aes/vpaes-x86.S index 39d00e772..f3adb7054 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/aes/vpaes-x86.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/aes/vpaes-x86.S @@ -59,10 +59,10 @@ .type _vpaes_preheat,@function .align 16 _vpaes_preheat: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif addl (%esp),%ebp movdqa -48(%ebp),%xmm7 @@ -72,10 +72,10 @@ _vpaes_preheat: .type _vpaes_encrypt_core,@function .align 16 _vpaes_encrypt_core: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl $16,%ecx movl 240(%edx),%eax @@ -154,10 +154,10 @@ _vpaes_encrypt_core: .type _vpaes_decrypt_core,@function .align 16 _vpaes_decrypt_core: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif leal 608(%ebp),%ebx movl 240(%edx),%eax @@ -247,10 +247,10 @@ _vpaes_decrypt_core: .type _vpaes_schedule_core,@function .align 16 _vpaes_schedule_core: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif addl (%esp),%ebp movdqu (%esi),%xmm0 @@ -346,10 +346,10 @@ _vpaes_schedule_core: .type _vpaes_schedule_192_smear,@function .align 16 _vpaes_schedule_192_smear: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pshufd $128,%xmm6,%xmm1 pshufd $254,%xmm7,%xmm0 @@ -363,10 +363,10 @@ _vpaes_schedule_192_smear: .type _vpaes_schedule_round,@function .align 16 _vpaes_schedule_round: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movdqa 8(%esp),%xmm2 pxor %xmm1,%xmm1 @@ -417,10 +417,10 @@ _vpaes_schedule_round: .type _vpaes_schedule_transform,@function .align 16 _vpaes_schedule_transform: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movdqa -16(%ebp),%xmm2 movdqa %xmm2,%xmm1 @@ -437,10 +437,10 @@ _vpaes_schedule_transform: .type _vpaes_schedule_mangle,@function .align 16 _vpaes_schedule_mangle: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movdqa %xmm0,%xmm4 movdqa 128(%ebp),%xmm5 @@ -503,10 +503,10 @@ _vpaes_schedule_mangle: .align 16 vpaes_set_encrypt_key: .L_vpaes_set_encrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -541,10 +541,10 @@ vpaes_set_encrypt_key: .align 16 vpaes_set_decrypt_key: .L_vpaes_set_decrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -584,10 +584,10 @@ vpaes_set_decrypt_key: .align 16 vpaes_encrypt: .L_vpaes_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -618,10 +618,10 @@ vpaes_encrypt: .align 16 vpaes_decrypt: .L_vpaes_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -652,10 +652,10 @@ vpaes_decrypt: .align 16 vpaes_cbc_encrypt: .L_vpaes_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/bf/bf-586.S b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/bf/bf-586.S index a3ff8edf8..801b28d56 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/bf/bf-586.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/bf/bf-586.S @@ -4,10 +4,10 @@ .align 16 BF_encrypt: .L_BF_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -359,10 +359,10 @@ BF_encrypt: .align 16 BF_decrypt: .L_BF_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -714,10 +714,10 @@ BF_decrypt: .align 16 BF_cbc_encrypt: .L_BF_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -782,55 +782,55 @@ BF_cbc_encrypt: xorl %edx,%edx jmp *%ebp .L006ej7: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 6(%esi),%dh shll $8,%edx .L007ej6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 5(%esi),%dh .L008ej5: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 4(%esi),%dl .L009ej4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%ecx jmp .L010ejend .L011ej3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 2(%esi),%ch shll $8,%ecx .L012ej2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 1(%esi),%ch .L013ej1: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb (%esi),%cl .L010ejend: diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/bn/bn-586.S b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/bn/bn-586.S index 2495ae694..a74e6470b 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/bn/bn-586.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/bn/bn-586.S @@ -4,10 +4,10 @@ .align 16 bn_mul_add_words: .L_bn_mul_add_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call .L000PIC_me_up .L000PIC_me_up: @@ -292,10 +292,10 @@ bn_mul_add_words: .align 16 bn_mul_words: .L_bn_mul_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call .L010PIC_me_up .L010PIC_me_up: @@ -479,10 +479,10 @@ bn_mul_words: .align 16 bn_sqr_words: .L_bn_sqr_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call .L017PIC_me_up .L017PIC_me_up: @@ -625,10 +625,10 @@ bn_sqr_words: .align 16 bn_div_words: .L_bn_div_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%eax @@ -641,10 +641,10 @@ bn_div_words: .align 16 bn_add_words: .L_bn_add_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -828,10 +828,10 @@ bn_add_words: .align 16 bn_sub_words: .L_bn_sub_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1015,10 +1015,10 @@ bn_sub_words: .align 16 bn_sub_part_words: .L_bn_sub_part_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/bn/co-586.S b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/bn/co-586.S index 9a9045539..bc8cd2888 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/bn/co-586.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/bn/co-586.S @@ -4,10 +4,10 @@ .align 16 bn_mul_comba8: .L_bn_mul_comba8_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi movl 12(%esp),%esi @@ -553,10 +553,10 @@ bn_mul_comba8: .align 16 bn_mul_comba4: .L_bn_mul_comba4_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi movl 12(%esp),%esi @@ -726,10 +726,10 @@ bn_mul_comba4: .align 16 bn_sqr_comba8: .L_bn_sqr_comba8_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi @@ -1139,10 +1139,10 @@ bn_sqr_comba8: .align 16 bn_sqr_comba4: .L_bn_sqr_comba4_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/bn/x86-gf2m.S b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/bn/x86-gf2m.S index fcb54e967..b784b7cbe 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/bn/x86-gf2m.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/bn/x86-gf2m.S @@ -2,10 +2,10 @@ .type _mul_1x1_mmx,@function .align 16 _mul_1x1_mmx: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif subl $36,%esp movl %eax,%ecx @@ -110,10 +110,10 @@ _mul_1x1_mmx: .type _mul_1x1_ialu,@function .align 16 _mul_1x1_ialu: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif subl $36,%esp movl %eax,%ecx @@ -249,10 +249,10 @@ _mul_1x1_ialu: .align 16 bn_GF2m_mul_2x2: .L_bn_GF2m_mul_2x2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call .L000PIC_me_up .L000PIC_me_up: diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/bn/x86-mont.S b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/bn/x86-mont.S index 7dddbf7d8..5d8a4c6cb 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/bn/x86-mont.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/bn/x86-mont.S @@ -4,10 +4,10 @@ .align 16 bn_mul_mont: .L_bn_mul_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/buildinf.h b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/buildinf.h index 75a6d54a8..ad130a26f 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: solaris-x86-gcc" -#define DATE "built on: Wed Jan 31 13:05:47 2024 UTC" +#define DATE "built on: Tue Aug 6 12:28:14 2024 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/camellia/cmll-x86.S b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/camellia/cmll-x86.S index bcbaf49e0..f4b77edc3 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/camellia/cmll-x86.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/camellia/cmll-x86.S @@ -4,10 +4,10 @@ .align 16 Camellia_EncryptBlock_Rounds: .L_Camellia_EncryptBlock_Rounds_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -63,10 +63,10 @@ Camellia_EncryptBlock_Rounds: .align 16 Camellia_EncryptBlock: .L_Camellia_EncryptBlock_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl $128,%eax subl 4(%esp),%eax @@ -80,10 +80,10 @@ Camellia_EncryptBlock: .align 16 Camellia_encrypt: .L_Camellia_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -137,10 +137,10 @@ Camellia_encrypt: .type _x86_Camellia_encrypt,@function .align 16 _x86_Camellia_encrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif xorl (%edi),%eax xorl 4(%edi),%ebx @@ -372,10 +372,10 @@ _x86_Camellia_encrypt: .align 16 Camellia_DecryptBlock_Rounds: .L_Camellia_DecryptBlock_Rounds_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -431,10 +431,10 @@ Camellia_DecryptBlock_Rounds: .align 16 Camellia_DecryptBlock: .L_Camellia_DecryptBlock_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl $128,%eax subl 4(%esp),%eax @@ -448,10 +448,10 @@ Camellia_DecryptBlock: .align 16 Camellia_decrypt: .L_Camellia_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -505,10 +505,10 @@ Camellia_decrypt: .type _x86_Camellia_decrypt,@function .align 16 _x86_Camellia_decrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif xorl (%edi),%eax xorl 4(%edi),%ebx @@ -740,10 +740,10 @@ _x86_Camellia_decrypt: .align 16 Camellia_Ekeygen: .L_Camellia_Ekeygen_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1586,10 +1586,10 @@ Camellia_Ekeygen: .align 16 Camellia_set_key: .L_Camellia_set_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebx movl 8(%esp),%ecx @@ -2143,10 +2143,10 @@ Camellia_set_key: .align 16 Camellia_cbc_encrypt: .L_Camellia_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/chacha/chacha-x86.S b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/chacha/chacha-x86.S index 9cc4027c7..ec98cb32f 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/chacha/chacha-x86.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/chacha/chacha-x86.S @@ -4,10 +4,10 @@ .align 16 ChaCha20_ctr32: .L_ChaCha20_ctr32_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -382,10 +382,10 @@ ChaCha20_ctr32: .align 16 ChaCha20_ssse3: .L_ChaCha20_ssse3_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -979,10 +979,10 @@ ChaCha20_ssse3: .align 16 ChaCha20_xop: .L_ChaCha20_xop_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/des/crypt586.S b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/des/crypt586.S index ac4b251ec..29ba0fa70 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/des/crypt586.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/des/crypt586.S @@ -4,10 +4,10 @@ .align 16 fcrypt_body: .L_fcrypt_body_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/des/des-586.S b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/des/des-586.S index 90449e4fa..b3839fa88 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/des/des-586.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/des/des-586.S @@ -3,10 +3,10 @@ .type _x86_DES_encrypt,@function .align 16 _x86_DES_encrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ecx @@ -479,10 +479,10 @@ _x86_DES_encrypt: .type _x86_DES_decrypt,@function .align 16 _x86_DES_decrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ecx @@ -957,10 +957,10 @@ _x86_DES_decrypt: .align 16 DES_encrypt1: .L_DES_encrypt1_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi @@ -1075,10 +1075,10 @@ DES_encrypt1: .align 16 DES_encrypt2: .L_DES_encrypt2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi @@ -1123,10 +1123,10 @@ DES_encrypt2: .align 16 DES_encrypt3: .L_DES_encrypt3_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebx movl 8(%esp),%ebx @@ -1249,10 +1249,10 @@ DES_encrypt3: .align 16 DES_decrypt3: .L_DES_decrypt3_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebx movl 8(%esp),%ebx @@ -1375,10 +1375,10 @@ DES_decrypt3: .align 16 DES_ncbc_encrypt: .L_DES_ncbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -1441,55 +1441,55 @@ DES_ncbc_encrypt: xorl %edx,%edx jmp *%ebp .L012ej7: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 6(%esi),%dh shll $8,%edx .L013ej6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 5(%esi),%dh .L014ej5: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 4(%esi),%dl .L015ej4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%ecx jmp .L016ejend .L017ej3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 2(%esi),%ch shll $8,%ecx .L018ej2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 1(%esi),%ch .L019ej1: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb (%esi),%cl .L016ejend: @@ -1595,10 +1595,10 @@ DES_ncbc_encrypt: .align 16 DES_ede3_cbc_encrypt: .L_DES_ede3_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -1665,55 +1665,55 @@ DES_ede3_cbc_encrypt: xorl %edx,%edx jmp *%ebp .L036ej7: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 6(%esi),%dh shll $8,%edx .L037ej6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 5(%esi),%dh .L038ej5: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 4(%esi),%dl .L039ej4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%ecx jmp .L040ejend .L041ej3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 2(%esi),%ch shll $8,%ecx .L042ej2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 1(%esi),%ch .L043ej1: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb (%esi),%cl .L040ejend: diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/ec/ecp_nistz256-x86.S b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/ec/ecp_nistz256-x86.S index 4e17d5eb8..f822079f8 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/ec/ecp_nistz256-x86.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/ec/ecp_nistz256-x86.S @@ -2387,10 +2387,10 @@ ecp_nistz256_precomputed: .align 16 ecp_nistz256_mul_by_2: .L_ecp_nistz256_mul_by_2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2411,10 +2411,10 @@ ecp_nistz256_mul_by_2: .align 16 ecp_nistz256_mul_by_3: .L_ecp_nistz256_mul_by_3_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2441,10 +2441,10 @@ ecp_nistz256_mul_by_3: .align 16 ecp_nistz256_div_by_2: .L_ecp_nistz256_div_by_2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2462,10 +2462,10 @@ ecp_nistz256_div_by_2: .type _ecp_nistz256_div_by_2,@function .align 16 _ecp_nistz256_div_by_2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%ebp xorl %edx,%edx @@ -2550,10 +2550,10 @@ _ecp_nistz256_div_by_2: .align 16 ecp_nistz256_add: .L_ecp_nistz256_add_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2572,10 +2572,10 @@ ecp_nistz256_add: .type _ecp_nistz256_add,@function .align 16 _ecp_nistz256_add: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%eax movl 4(%esi),%ebx @@ -2654,10 +2654,10 @@ _ecp_nistz256_add: .align 16 ecp_nistz256_sub: .L_ecp_nistz256_sub_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2676,10 +2676,10 @@ ecp_nistz256_sub: .type _ecp_nistz256_sub,@function .align 16 _ecp_nistz256_sub: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%eax movl 4(%esi),%ebx @@ -2739,10 +2739,10 @@ _ecp_nistz256_sub: .align 16 ecp_nistz256_neg: .L_ecp_nistz256_neg_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2772,10 +2772,10 @@ ecp_nistz256_neg: .type _picup_eax,@function .align 16 _picup_eax: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esp),%eax ret @@ -2785,10 +2785,10 @@ _picup_eax: .align 16 ecp_nistz256_to_mont: .L_ecp_nistz256_to_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2813,10 +2813,10 @@ ecp_nistz256_to_mont: .align 16 ecp_nistz256_from_mont: .L_ecp_nistz256_from_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2841,10 +2841,10 @@ ecp_nistz256_from_mont: .align 16 ecp_nistz256_mul_mont: .L_ecp_nistz256_mul_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2869,10 +2869,10 @@ ecp_nistz256_mul_mont: .align 16 ecp_nistz256_sqr_mont: .L_ecp_nistz256_sqr_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2895,10 +2895,10 @@ ecp_nistz256_sqr_mont: .type _ecp_nistz256_mul_mont,@function .align 16 _ecp_nistz256_mul_mont: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif andl $83886080,%eax cmpl $83886080,%eax @@ -3797,10 +3797,10 @@ _ecp_nistz256_mul_mont: .align 16 ecp_nistz256_scatter_w5: .L_ecp_nistz256_scatter_w5_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3835,10 +3835,10 @@ ecp_nistz256_scatter_w5: .align 16 ecp_nistz256_gather_w5: .L_ecp_nistz256_gather_w5_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3934,10 +3934,10 @@ ecp_nistz256_gather_w5: .align 16 ecp_nistz256_scatter_w7: .L_ecp_nistz256_scatter_w7_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3970,10 +3970,10 @@ ecp_nistz256_scatter_w7: .align 16 ecp_nistz256_gather_w7: .L_ecp_nistz256_gather_w7_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -4189,10 +4189,10 @@ ecp_nistz256_gather_w7: .align 16 ecp_nistz256_point_double: .L_ecp_nistz256_point_double_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -4320,10 +4320,10 @@ ecp_nistz256_point_double: .align 16 ecp_nistz256_point_add: .L_ecp_nistz256_point_add_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -4838,10 +4838,10 @@ ecp_nistz256_point_add: .align 16 ecp_nistz256_point_add_affine: .L_ecp_nistz256_point_add_affine_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/md5/md5-586.S b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/md5/md5-586.S index 33c01af67..7e96dc647 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/md5/md5-586.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/md5/md5-586.S @@ -4,10 +4,10 @@ .align 16 ossl_md5_block_asm_data_order: .L_ossl_md5_block_asm_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/modes/ghash-x86.S b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/modes/ghash-x86.S index dd80e32c5..9b3361acd 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/modes/ghash-x86.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/modes/ghash-x86.S @@ -4,10 +4,10 @@ .align 16 gcm_gmult_4bit_x86: .L_gcm_gmult_4bit_x86_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -103,10 +103,10 @@ gcm_gmult_4bit_x86: .align 16 gcm_ghash_4bit_x86: .L_gcm_ghash_4bit_x86_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -217,10 +217,10 @@ gcm_ghash_4bit_x86: .align 16 gcm_gmult_4bit_mmx: .L_gcm_gmult_4bit_mmx_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -321,10 +321,10 @@ gcm_gmult_4bit_mmx: .align 16 gcm_ghash_4bit_mmx: .L_gcm_ghash_4bit_mmx_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -930,10 +930,10 @@ gcm_ghash_4bit_mmx: .align 16 gcm_init_clmul: .L_gcm_init_clmul_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%eax @@ -1004,10 +1004,10 @@ gcm_init_clmul: .align 16 gcm_gmult_clmul: .L_gcm_gmult_clmul_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 8(%esp),%edx @@ -1062,10 +1062,10 @@ gcm_gmult_clmul: .align 16 gcm_ghash_clmul: .L_gcm_ghash_clmul_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/poly1305/poly1305-x86.S b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/poly1305/poly1305-x86.S index f95649fae..e76632cd1 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/poly1305/poly1305-x86.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/poly1305/poly1305-x86.S @@ -5,10 +5,10 @@ .align 16 poly1305_init: .L_poly1305_init_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -71,10 +71,10 @@ poly1305_init: .align 16 poly1305_blocks: .L_poly1305_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -244,10 +244,10 @@ poly1305_blocks: .align 16 poly1305_emit: .L_poly1305_emit_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -308,10 +308,10 @@ poly1305_emit: .type _poly1305_init_sse2,@function .align 16 _poly1305_init_sse2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movdqu 24(%edi),%xmm4 leal 48(%edi),%edi @@ -515,10 +515,10 @@ _poly1305_init_sse2: .type _poly1305_blocks_sse2,@function .align 16 _poly1305_blocks_sse2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1281,10 +1281,10 @@ _poly1305_blocks_sse2: .type _poly1305_emit_sse2,@function .align 16 _poly1305_emit_sse2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1379,10 +1379,10 @@ _poly1305_emit_sse2: .type _poly1305_init_avx2,@function .align 16 _poly1305_init_avx2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif vmovdqu 24(%edi),%xmm4 leal 48(%edi),%edi @@ -1555,10 +1555,10 @@ _poly1305_init_avx2: .type _poly1305_blocks_avx2,@function .align 16 _poly1305_blocks_avx2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/rc4/rc4-586.S b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/rc4/rc4-586.S index da909a31e..a10b047a7 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/rc4/rc4-586.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/rc4/rc4-586.S @@ -4,10 +4,10 @@ .align 16 RC4: .L_RC4_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -275,10 +275,10 @@ RC4: .align 16 RC4_set_key: .L_RC4_set_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -358,10 +358,10 @@ RC4_set_key: .align 16 RC4_options: .L_RC4_options_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call .L018pic_point .L018pic_point: diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/ripemd/rmd-586.S b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/ripemd/rmd-586.S index 57b95af6d..4f3ea459c 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/ripemd/rmd-586.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/ripemd/rmd-586.S @@ -4,10 +4,10 @@ .align 16 ripemd160_block_asm_data_order: .L_ripemd160_block_asm_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%eax diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/sha/sha1-586.S b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/sha/sha1-586.S index ddc85b3d8..4b60a71ee 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/sha/sha1-586.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/sha/sha1-586.S @@ -4,10 +4,10 @@ .align 16 sha1_block_data_order: .L_sha1_block_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1403,10 +1403,10 @@ sha1_block_data_order: .type _sha1_block_data_order_shaext,@function .align 16 _sha1_block_data_order_shaext: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1578,10 +1578,10 @@ _sha1_block_data_order_shaext: .type _sha1_block_data_order_ssse3,@function .align 16 _sha1_block_data_order_ssse3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2802,10 +2802,10 @@ _sha1_block_data_order_ssse3: .type _sha1_block_data_order_avx,@function .align 16 _sha1_block_data_order_avx: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/sha/sha256-586.S b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/sha/sha256-586.S index 9436ca5e1..c8599bd58 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/sha/sha256-586.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/sha/sha256-586.S @@ -4,10 +4,10 @@ .align 16 sha256_block_data_order: .L_sha256_block_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/sha/sha512-586.S b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/sha/sha512-586.S index c7cf815b4..99d198dd9 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/sha/sha512-586.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/sha/sha512-586.S @@ -4,10 +4,10 @@ .align 16 sha512_block_data_order: .L_sha512_block_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/whrlpool/wp-mmx.S b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/whrlpool/wp-mmx.S index 9fb9ca1e4..ee571f645 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/whrlpool/wp-mmx.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/whrlpool/wp-mmx.S @@ -4,10 +4,10 @@ .align 16 whirlpool_block_mmx: .L_whirlpool_block_mmx_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/x86cpuid.S b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/x86cpuid.S index eedacacfe..d4f2ec09e 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/x86cpuid.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/x86cpuid.S @@ -4,10 +4,10 @@ .align 16 OPENSSL_ia32_cpuid: .L_OPENSSL_ia32_cpuid_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -153,10 +153,10 @@ OPENSSL_ia32_cpuid: .align 16 OPENSSL_rdtsc: .L_OPENSSL_rdtsc_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif xorl %eax,%eax xorl %edx,%edx @@ -175,10 +175,10 @@ OPENSSL_rdtsc: .align 16 OPENSSL_instrument_halt: .L_OPENSSL_instrument_halt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call .L011PIC_me_up .L011PIC_me_up: @@ -212,10 +212,10 @@ OPENSSL_instrument_halt: .align 16 OPENSSL_far_spin: .L_OPENSSL_far_spin_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushfl popl %eax @@ -244,10 +244,10 @@ OPENSSL_far_spin: .align 16 OPENSSL_wipe_cpu: .L_OPENSSL_wipe_cpu_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif xorl %eax,%eax xorl %edx,%edx @@ -280,10 +280,10 @@ OPENSSL_wipe_cpu: .align 16 OPENSSL_atomic_add: .L_OPENSSL_atomic_add_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%ecx @@ -304,10 +304,10 @@ OPENSSL_atomic_add: .align 16 OPENSSL_cleanse: .L_OPENSSL_cleanse_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%ecx @@ -346,10 +346,10 @@ OPENSSL_cleanse: .align 16 CRYPTO_memcmp: .L_CRYPTO_memcmp_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi @@ -380,10 +380,10 @@ CRYPTO_memcmp: .align 16 OPENSSL_instrument_bus: .L_OPENSSL_instrument_bus_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -433,10 +433,10 @@ OPENSSL_instrument_bus: .align 16 OPENSSL_instrument_bus2: .L_OPENSSL_instrument_bus2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -499,10 +499,10 @@ OPENSSL_instrument_bus2: .align 16 OPENSSL_ia32_rdrand_bytes: .L_OPENSSL_ia32_rdrand_bytes_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %ebx @@ -547,10 +547,10 @@ OPENSSL_ia32_rdrand_bytes: .align 16 OPENSSL_ia32_rdseed_bytes: .L_OPENSSL_ia32_rdseed_bytes_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %ebx diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/engines/e_padlock-x86.S b/deps/openssl/config/archs/solaris-x86-gcc/asm/engines/e_padlock-x86.S index 81e4ec050..cea65eba3 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/engines/e_padlock-x86.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/engines/e_padlock-x86.S @@ -4,10 +4,10 @@ .align 16 padlock_capability: .L_padlock_capability_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebx pushfl @@ -69,10 +69,10 @@ padlock_capability: .align 16 padlock_key_bswap: .L_padlock_key_bswap_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 240(%edx),%ecx @@ -92,10 +92,10 @@ padlock_key_bswap: .align 16 padlock_verify_context: .L_padlock_verify_context_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx leal .Lpadlock_saved_context-.L004verify_pic_point,%eax @@ -108,10 +108,10 @@ padlock_verify_context: .type _padlock_verify_ctx,@function .align 16 _padlock_verify_ctx: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif addl (%esp),%eax btl $30,4(%esp) @@ -129,10 +129,10 @@ _padlock_verify_ctx: .align 16 padlock_reload_key: .L_padlock_reload_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushfl popfl @@ -143,10 +143,10 @@ padlock_reload_key: .align 16 padlock_aes_block: .L_padlock_aes_block_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -168,10 +168,10 @@ padlock_aes_block: .align 16 padlock_ecb_encrypt: .L_padlock_ecb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -352,10 +352,10 @@ padlock_ecb_encrypt: .align 16 padlock_cbc_encrypt: .L_padlock_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -540,10 +540,10 @@ padlock_cbc_encrypt: .align 16 padlock_cfb_encrypt: .L_padlock_cfb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -667,10 +667,10 @@ padlock_cfb_encrypt: .align 16 padlock_ofb_encrypt: .L_padlock_ofb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -794,10 +794,10 @@ padlock_ofb_encrypt: .align 16 padlock_ctr32_encrypt: .L_padlock_ctr32_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -906,10 +906,10 @@ padlock_ctr32_encrypt: .align 16 padlock_xstore: .L_padlock_xstore_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi movl 8(%esp),%edi @@ -921,10 +921,10 @@ padlock_xstore: .type _win32_segv_handler,@function .align 16 _win32_segv_handler: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl $1,%eax movl 4(%esp),%edx @@ -941,10 +941,10 @@ _win32_segv_handler: .align 16 padlock_sha1_oneshot: .L_padlock_sha1_oneshot_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -977,10 +977,10 @@ padlock_sha1_oneshot: .align 16 padlock_sha1_blocks: .L_padlock_sha1_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -1012,10 +1012,10 @@ padlock_sha1_blocks: .align 16 padlock_sha256_oneshot: .L_padlock_sha256_oneshot_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -1048,10 +1048,10 @@ padlock_sha256_oneshot: .align 16 padlock_sha256_blocks: .L_padlock_sha256_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -1083,10 +1083,10 @@ padlock_sha256_blocks: .align 16 padlock_sha512_blocks: .L_padlock_sha512_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/include/openssl/bio.h b/deps/openssl/config/archs/solaris-x86-gcc/asm/include/openssl/bio.h index f9aa74731..e16cf622c 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/include/openssl/bio.h @@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, - int (*ossl_gets) (BIO *, char *, int)); + int (*gets) (BIO *, char *, int)); long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/solaris-x86-gcc/asm/include/openssl/opensslv.h index 65f3bfa05..5bb97d596 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 13 +# define OPENSSL_VERSION_PATCH 9 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.13" -# define OPENSSL_FULL_VERSION_STR "3.0.13+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "30 Jan 2024" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13+quic 30 Jan 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/include/openssl/pkcs7.h b/deps/openssl/config/archs/solaris-x86-gcc/asm/include/openssl/pkcs7.h index 0ce79bf4f..557a0a726 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/include/openssl/pkcs7.h +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/include/openssl/pkcs7.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/pkcs7.h.in * - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -56,8 +56,8 @@ typedef struct pkcs7_signer_info_st { PKCS7_ISSUER_AND_SERIAL *issuer_and_serial; X509_ALGOR *digest_alg; STACK_OF(X509_ATTRIBUTE) *auth_attr; /* [ 0 ] */ - X509_ALGOR *digest_enc_alg; /* confusing name, actually used for signing */ - ASN1_OCTET_STRING *enc_digest; /* confusing name, actually signature */ + X509_ALGOR *digest_enc_alg; + ASN1_OCTET_STRING *enc_digest; STACK_OF(X509_ATTRIBUTE) *unauth_attr; /* [ 1 ] */ /* The private key to sign with */ EVP_PKEY *pkey; diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/include/openssl/ssl.h b/deps/openssl/config/archs/solaris-x86-gcc/asm/include/openssl/ssl.h index 0f1915755..3df725c56 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/openssl-cl.gypi b/deps/openssl/config/archs/solaris-x86-gcc/asm/openssl-cl.gypi index 1c53ac3e1..92ea04165 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/openssl-cl.gypi +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/openssl-cl.gypi @@ -18,7 +18,6 @@ 'OPENSSL_IA32_SSE2', 'PADLOCK_ASM', 'POLY1305_ASM', - 'RC4_ASM', 'RMD160_ASM', 'SHA1_ASM', 'SHA256_ASM', diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/openssl.gypi b/deps/openssl/config/archs/solaris-x86-gcc/asm/openssl.gypi index 2037cbe79..7c0ee1619 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/openssl.gypi +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cfb.c', 'openssl/crypto/aes/aes_ecb.c', @@ -993,7 +991,6 @@ 'OPENSSL_IA32_SSE2', 'PADLOCK_ASM', 'POLY1305_ASM', - 'RC4_ASM', 'RMD160_ASM', 'SHA1_ASM', 'SHA256_ASM', diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/configdata.pm b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/configdata.pm index 0fc41abe7..600d53b6e 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/configdata.pm @@ -139,7 +139,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -156,7 +156,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.13+quic", + "full_version" => "3.0.9", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -204,7 +204,7 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "13", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -256,11 +256,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "30 Jan 2024", - "shlib_version" => "81.3", + "release_date" => "30 May 2023", + "shlib_version" => "3", "sourcedir" => ".", "target" => "solaris-x86-gcc", - "version" => "3.0.13" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -386,7 +386,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -782,9 +781,6 @@ our %unified_info = ( "providers/fips" => { "fips" => "1" }, - "test/p_minimal" => { - "noinst" => "1" - }, "test/p_test" => { "noinst" => "1" } @@ -853,9 +849,6 @@ our %unified_info = ( "test/asn1_internal_test" => { "noinst" => "1" }, - "test/asn1_stable_parse_test" => { - "noinst" => "1" - }, "test/asn1_string_table_test" => { "noinst" => "1" }, @@ -1045,9 +1038,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -1603,7 +1593,6 @@ our %unified_info = ( "OPENSSL_IA32_SSE2", "PADLOCK_ASM", "POLY1305_ASM", - "RC4_ASM", "RMD160_ASM", "SHA1_ASM", "SHA256_ASM", @@ -1651,11 +1640,7 @@ our %unified_info = ( "VPAES_ASM" ], "providers/liblegacy.a" => [ - "MD5_ASM", - "RC4_ASM" - ], - "test/evp_extra_test" => [ - "STATIC_LEGACY" + "MD5_ASM" ], "test/provider_internal_test" => [ "PROVIDER_INIT_FUNCTION_NAME=p_test_init" @@ -2410,9 +2395,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -2710,9 +2692,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -3481,9 +3460,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -3778,9 +3754,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -3814,12 +3787,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -4804,9 +4771,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -5104,9 +5068,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -5875,9 +5836,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -6172,9 +6130,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -6208,12 +6163,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -7211,10 +7160,6 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], - "test/asn1_stable_parse_test" => [ - "libcrypto", - "test/libtestutil.a" - ], "test/asn1_string_table_test" => [ "libcrypto", "test/libtestutil.a" @@ -7468,10 +7413,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -7737,8 +7678,6 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "libcrypto.a", - "providers/libcommon.a", - "providers/liblegacy.a", "test/libtestutil.a" ], "test/evp_extra_test2" => [ @@ -9824,7 +9763,6 @@ our %unified_info = ( }, "providers" => { "deps" => [ - "providers/evp_extra_test-bin-legacyprov.o", "providers/libcrypto-lib-baseprov.o", "providers/libcrypto-lib-defltprov.o", "providers/libcrypto-lib-nullprov.o", @@ -9832,9 +9770,6 @@ our %unified_info = ( "providers/libdefault.a" ], "products" => { - "bin" => [ - "test/evp_extra_test" - ], "dso" => [ "providers/fips", "providers/legacy" @@ -10271,7 +10206,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10322,7 +10256,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -11454,9 +11387,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -11754,9 +11684,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -12525,9 +12452,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -12822,9 +12746,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -12858,12 +12779,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -13848,9 +13763,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -14148,9 +14060,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -14919,9 +14828,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -15216,9 +15122,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -15252,12 +15155,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -16286,10 +16183,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16366,9 +16259,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "whrlpool" ], - "test/p_minimal.ld" => [ - "util/providers.num" - ], "test/p_test.ld" => [ "util/providers.num" ], @@ -16534,7 +16424,6 @@ our %unified_info = ( "doc/html/man3/CMS_get1_ReceiptRequest.html", "doc/html/man3/CMS_sign.html", "doc/html/man3/CMS_sign_receipt.html", - "doc/html/man3/CMS_signed_get_attr.html", "doc/html/man3/CMS_uncompress.html", "doc/html/man3/CMS_verify.html", "doc/html/man3/CMS_verify_receipt.html", @@ -16634,7 +16523,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_encapsulate.html", "doc/html/man3/EVP_PKEY_encrypt.html", "doc/html/man3/EVP_PKEY_fromdata.html", - "doc/html/man3/EVP_PKEY_get_attr.html", "doc/html/man3/EVP_PKEY_get_default_digest_nid.html", "doc/html/man3/EVP_PKEY_get_field_type.html", "doc/html/man3/EVP_PKEY_get_group_name.html", @@ -16891,7 +16779,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -16990,7 +16877,6 @@ our %unified_info = ( "doc/html/man3/X509V3_get_d2i.html", "doc/html/man3/X509V3_set_ctx.html", "doc/html/man3/X509_ALGOR_dup.html", - "doc/html/man3/X509_ATTRIBUTE.html", "doc/html/man3/X509_CRL_get0_by_serial.html", "doc/html/man3/X509_EXTENSION_set_object.html", "doc/html/man3/X509_LOOKUP.html", @@ -17002,8 +16888,6 @@ our %unified_info = ( "doc/html/man3/X509_NAME_get_index_by_NID.html", "doc/html/man3/X509_NAME_print_ex.html", "doc/html/man3/X509_PUBKEY_new.html", - "doc/html/man3/X509_REQ_get_attr.html", - "doc/html/man3/X509_REQ_get_extensions.html", "doc/html/man3/X509_SIG_get0.html", "doc/html/man3/X509_STORE_CTX_get_error.html", "doc/html/man3/X509_STORE_CTX_new.html", @@ -18301,10 +18185,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/asn1_stable_parse_test" => [ - "include", - "apps/include" - ], "test/asn1_string_table_test" => [ "include", "apps/include" @@ -18512,9 +18392,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -18774,9 +18651,7 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "include", - "apps/include", - "providers/common/include", - "providers/implementations/include" + "apps/include" ], "test/evp_extra_test2" => [ "include", @@ -19033,10 +18908,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/p_minimal" => [ - "include", - "." - ], "test/p_test" => [ "include", "." @@ -19526,7 +19397,6 @@ our %unified_info = ( "doc/man/man3/CMS_get1_ReceiptRequest.3", "doc/man/man3/CMS_sign.3", "doc/man/man3/CMS_sign_receipt.3", - "doc/man/man3/CMS_signed_get_attr.3", "doc/man/man3/CMS_uncompress.3", "doc/man/man3/CMS_verify.3", "doc/man/man3/CMS_verify_receipt.3", @@ -19626,7 +19496,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_encapsulate.3", "doc/man/man3/EVP_PKEY_encrypt.3", "doc/man/man3/EVP_PKEY_fromdata.3", - "doc/man/man3/EVP_PKEY_get_attr.3", "doc/man/man3/EVP_PKEY_get_default_digest_nid.3", "doc/man/man3/EVP_PKEY_get_field_type.3", "doc/man/man3/EVP_PKEY_get_group_name.3", @@ -19883,7 +19752,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -19982,7 +19850,6 @@ our %unified_info = ( "doc/man/man3/X509V3_get_d2i.3", "doc/man/man3/X509V3_set_ctx.3", "doc/man/man3/X509_ALGOR_dup.3", - "doc/man/man3/X509_ATTRIBUTE.3", "doc/man/man3/X509_CRL_get0_by_serial.3", "doc/man/man3/X509_EXTENSION_set_object.3", "doc/man/man3/X509_LOOKUP.3", @@ -19994,8 +19861,6 @@ our %unified_info = ( "doc/man/man3/X509_NAME_get_index_by_NID.3", "doc/man/man3/X509_NAME_print_ex.3", "doc/man/man3/X509_PUBKEY_new.3", - "doc/man/man3/X509_REQ_get_attr.3", - "doc/man/man3/X509_REQ_get_extensions.3", "doc/man/man3/X509_SIG_get0.3", "doc/man/man3/X509_STORE_CTX_get_error.3", "doc/man/man3/X509_STORE_CTX_new.3", @@ -20179,7 +20044,6 @@ our %unified_info = ( "modules" => [ "providers/fips", "providers/legacy", - "test/p_minimal", "test/p_test" ], "programs" => [ @@ -20205,7 +20069,6 @@ our %unified_info = ( "test/asn1_dsa_internal_test", "test/asn1_encode_test", "test/asn1_internal_test", - "test/asn1_stable_parse_test", "test/asn1_string_table_test", "test/asn1_time_test", "test/asynciotest", @@ -20269,7 +20132,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24472,7 +24334,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24499,7 +24360,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -24601,9 +24461,6 @@ our %unified_info = ( "providers/common/libfips-lib-securitycheck_fips.o" => [ "providers/common/securitycheck_fips.c" ], - "providers/evp_extra_test-bin-legacyprov.o" => [ - "providers/legacyprov.c" - ], "providers/fips" => [ "providers/fips.ld", "providers/fips/fips-dso-fips_entry.o" @@ -25750,9 +25607,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25834,9 +25688,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25894,12 +25745,6 @@ our %unified_info = ( "test/asn1_internal_test-bin-asn1_internal_test.o" => [ "test/asn1_internal_test.c" ], - "test/asn1_stable_parse_test" => [ - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" - ], - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" => [ - "test/asn1_stable_parse_test.c" - ], "test/asn1_string_table_test" => [ "test/asn1_string_table_test-bin-asn1_string_table_test.o" ], @@ -26279,12 +26124,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -26683,7 +26522,6 @@ our %unified_info = ( "test/errtest.c" ], "test/evp_extra_test" => [ - "providers/evp_extra_test-bin-legacyprov.o", "test/evp_extra_test-bin-evp_extra_test.o" ], "test/evp_extra_test-bin-evp_extra_test.o" => [ @@ -26974,13 +26812,6 @@ our %unified_info = ( "test/ossl_store_test-bin-ossl_store_test.o" => [ "test/ossl_store_test.c" ], - "test/p_minimal" => [ - "test/p_minimal-dso-p_minimal.o", - "test/p_minimal.ld" - ], - "test/p_minimal-dso-p_minimal.o" => [ - "test/p_minimal.c" - ], "test/p_test" => [ "test/p_test-dso-p_test.o", "test/p_test.ld" @@ -27667,8 +27498,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27695,7 +27526,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27712,8 +27543,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/aes/aes-586.S b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/aes/aes-586.S index 628a3b633..9ee3fc9a5 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/aes/aes-586.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/aes/aes-586.S @@ -2,10 +2,10 @@ .type _x86_AES_encrypt_compact,@function .align 16 _x86_AES_encrypt_compact: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl %edi,20(%esp) xorl (%edi),%eax @@ -274,10 +274,10 @@ _x86_AES_encrypt_compact: .type _sse_AES_encrypt_compact,@function .align 16 _sse_AES_encrypt_compact: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pxor (%edi),%mm0 pxor 8(%edi),%mm4 @@ -436,10 +436,10 @@ _sse_AES_encrypt_compact: .type _x86_AES_encrypt,@function .align 16 _x86_AES_encrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl %edi,20(%esp) xorl (%edi),%eax @@ -995,10 +995,10 @@ _x86_AES_encrypt: .align 16 AES_encrypt: .L_AES_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1063,10 +1063,10 @@ AES_encrypt: .type _x86_AES_decrypt_compact,@function .align 16 _x86_AES_decrypt_compact: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl %edi,20(%esp) xorl (%edi),%eax @@ -1423,10 +1423,10 @@ _x86_AES_decrypt_compact: .type _sse_AES_decrypt_compact,@function .align 16 _sse_AES_decrypt_compact: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pxor (%edi),%mm0 pxor 8(%edi),%mm4 @@ -1644,10 +1644,10 @@ _sse_AES_decrypt_compact: .type _x86_AES_decrypt,@function .align 16 _x86_AES_decrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl %edi,20(%esp) xorl (%edi),%eax @@ -2207,10 +2207,10 @@ _x86_AES_decrypt: .align 16 AES_decrypt: .L_AES_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2277,10 +2277,10 @@ AES_decrypt: .align 16 AES_cbc_encrypt: .L_AES_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2813,10 +2813,10 @@ AES_cbc_encrypt: .type _x86_AES_set_encrypt_key,@function .align 16 _x86_AES_set_encrypt_key: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3050,10 +3050,10 @@ _x86_AES_set_encrypt_key: .align 16 AES_set_encrypt_key: .L_AES_set_encrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call _x86_AES_set_encrypt_key ret @@ -3063,10 +3063,10 @@ AES_set_encrypt_key: .align 16 AES_set_decrypt_key: .L_AES_set_decrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call _x86_AES_set_encrypt_key cmpl $0,%eax diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/aes/aesni-x86.S b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/aes/aesni-x86.S index 9191466ee..eb2d01b16 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/aes/aesni-x86.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/aes/aesni-x86.S @@ -4,10 +4,10 @@ .align 16 aesni_encrypt: .L_aesni_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 12(%esp),%edx @@ -36,10 +36,10 @@ aesni_encrypt: .align 16 aesni_decrypt: .L_aesni_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 12(%esp),%edx @@ -66,10 +66,10 @@ aesni_decrypt: .type _aesni_encrypt2,@function .align 16 _aesni_encrypt2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -98,10 +98,10 @@ _aesni_encrypt2: .type _aesni_decrypt2,@function .align 16 _aesni_decrypt2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -130,10 +130,10 @@ _aesni_decrypt2: .type _aesni_encrypt3,@function .align 16 _aesni_encrypt3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -167,10 +167,10 @@ _aesni_encrypt3: .type _aesni_decrypt3,@function .align 16 _aesni_decrypt3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -204,10 +204,10 @@ _aesni_decrypt3: .type _aesni_encrypt4,@function .align 16 _aesni_encrypt4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 movups 16(%edx),%xmm1 @@ -247,10 +247,10 @@ _aesni_encrypt4: .type _aesni_decrypt4,@function .align 16 _aesni_decrypt4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 movups 16(%edx),%xmm1 @@ -290,10 +290,10 @@ _aesni_decrypt4: .type _aesni_encrypt6,@function .align 16 _aesni_encrypt6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -349,10 +349,10 @@ _aesni_encrypt6: .type _aesni_decrypt6,@function .align 16 _aesni_decrypt6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -410,10 +410,10 @@ _aesni_decrypt6: .align 16 aesni_ecb_encrypt: .L_aesni_ecb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -650,10 +650,10 @@ aesni_ecb_encrypt: .align 16 aesni_ccm64_encrypt_blocks: .L_aesni_ccm64_encrypt_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -743,10 +743,10 @@ aesni_ccm64_encrypt_blocks: .align 16 aesni_ccm64_decrypt_blocks: .L_aesni_ccm64_decrypt_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -871,10 +871,10 @@ aesni_ccm64_decrypt_blocks: .align 16 aesni_ctr32_encrypt_blocks: .L_aesni_ctr32_encrypt_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1114,10 +1114,10 @@ aesni_ctr32_encrypt_blocks: .align 16 aesni_xts_encrypt: .L_aesni_xts_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1479,10 +1479,10 @@ aesni_xts_encrypt: .align 16 aesni_xts_decrypt: .L_aesni_xts_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1874,10 +1874,10 @@ aesni_xts_decrypt: .align 16 aesni_ocb_encrypt: .L_aesni_ocb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2274,10 +2274,10 @@ aesni_ocb_encrypt: .align 16 aesni_ocb_decrypt: .L_aesni_ocb_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2674,10 +2674,10 @@ aesni_ocb_decrypt: .align 16 aesni_cbc_encrypt: .L_aesni_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2938,10 +2938,10 @@ aesni_cbc_encrypt: .type _aesni_set_encrypt_key,@function .align 16 _aesni_set_encrypt_key: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3278,10 +3278,10 @@ _aesni_set_encrypt_key: .align 16 aesni_set_encrypt_key: .L_aesni_set_encrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 8(%esp),%ecx @@ -3294,10 +3294,10 @@ aesni_set_encrypt_key: .align 16 aesni_set_decrypt_key: .L_aesni_set_decrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 8(%esp),%ecx diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/aes/vpaes-x86.S b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/aes/vpaes-x86.S index 39d00e772..f3adb7054 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/aes/vpaes-x86.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/aes/vpaes-x86.S @@ -59,10 +59,10 @@ .type _vpaes_preheat,@function .align 16 _vpaes_preheat: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif addl (%esp),%ebp movdqa -48(%ebp),%xmm7 @@ -72,10 +72,10 @@ _vpaes_preheat: .type _vpaes_encrypt_core,@function .align 16 _vpaes_encrypt_core: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl $16,%ecx movl 240(%edx),%eax @@ -154,10 +154,10 @@ _vpaes_encrypt_core: .type _vpaes_decrypt_core,@function .align 16 _vpaes_decrypt_core: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif leal 608(%ebp),%ebx movl 240(%edx),%eax @@ -247,10 +247,10 @@ _vpaes_decrypt_core: .type _vpaes_schedule_core,@function .align 16 _vpaes_schedule_core: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif addl (%esp),%ebp movdqu (%esi),%xmm0 @@ -346,10 +346,10 @@ _vpaes_schedule_core: .type _vpaes_schedule_192_smear,@function .align 16 _vpaes_schedule_192_smear: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pshufd $128,%xmm6,%xmm1 pshufd $254,%xmm7,%xmm0 @@ -363,10 +363,10 @@ _vpaes_schedule_192_smear: .type _vpaes_schedule_round,@function .align 16 _vpaes_schedule_round: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movdqa 8(%esp),%xmm2 pxor %xmm1,%xmm1 @@ -417,10 +417,10 @@ _vpaes_schedule_round: .type _vpaes_schedule_transform,@function .align 16 _vpaes_schedule_transform: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movdqa -16(%ebp),%xmm2 movdqa %xmm2,%xmm1 @@ -437,10 +437,10 @@ _vpaes_schedule_transform: .type _vpaes_schedule_mangle,@function .align 16 _vpaes_schedule_mangle: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movdqa %xmm0,%xmm4 movdqa 128(%ebp),%xmm5 @@ -503,10 +503,10 @@ _vpaes_schedule_mangle: .align 16 vpaes_set_encrypt_key: .L_vpaes_set_encrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -541,10 +541,10 @@ vpaes_set_encrypt_key: .align 16 vpaes_set_decrypt_key: .L_vpaes_set_decrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -584,10 +584,10 @@ vpaes_set_decrypt_key: .align 16 vpaes_encrypt: .L_vpaes_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -618,10 +618,10 @@ vpaes_encrypt: .align 16 vpaes_decrypt: .L_vpaes_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -652,10 +652,10 @@ vpaes_decrypt: .align 16 vpaes_cbc_encrypt: .L_vpaes_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/bf/bf-586.S b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/bf/bf-586.S index a3ff8edf8..801b28d56 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/bf/bf-586.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/bf/bf-586.S @@ -4,10 +4,10 @@ .align 16 BF_encrypt: .L_BF_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -359,10 +359,10 @@ BF_encrypt: .align 16 BF_decrypt: .L_BF_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -714,10 +714,10 @@ BF_decrypt: .align 16 BF_cbc_encrypt: .L_BF_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -782,55 +782,55 @@ BF_cbc_encrypt: xorl %edx,%edx jmp *%ebp .L006ej7: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 6(%esi),%dh shll $8,%edx .L007ej6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 5(%esi),%dh .L008ej5: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 4(%esi),%dl .L009ej4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%ecx jmp .L010ejend .L011ej3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 2(%esi),%ch shll $8,%ecx .L012ej2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 1(%esi),%ch .L013ej1: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb (%esi),%cl .L010ejend: diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/bn/bn-586.S b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/bn/bn-586.S index 2495ae694..a74e6470b 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/bn/bn-586.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/bn/bn-586.S @@ -4,10 +4,10 @@ .align 16 bn_mul_add_words: .L_bn_mul_add_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call .L000PIC_me_up .L000PIC_me_up: @@ -292,10 +292,10 @@ bn_mul_add_words: .align 16 bn_mul_words: .L_bn_mul_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call .L010PIC_me_up .L010PIC_me_up: @@ -479,10 +479,10 @@ bn_mul_words: .align 16 bn_sqr_words: .L_bn_sqr_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call .L017PIC_me_up .L017PIC_me_up: @@ -625,10 +625,10 @@ bn_sqr_words: .align 16 bn_div_words: .L_bn_div_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%eax @@ -641,10 +641,10 @@ bn_div_words: .align 16 bn_add_words: .L_bn_add_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -828,10 +828,10 @@ bn_add_words: .align 16 bn_sub_words: .L_bn_sub_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1015,10 +1015,10 @@ bn_sub_words: .align 16 bn_sub_part_words: .L_bn_sub_part_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/bn/co-586.S b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/bn/co-586.S index 9a9045539..bc8cd2888 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/bn/co-586.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/bn/co-586.S @@ -4,10 +4,10 @@ .align 16 bn_mul_comba8: .L_bn_mul_comba8_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi movl 12(%esp),%esi @@ -553,10 +553,10 @@ bn_mul_comba8: .align 16 bn_mul_comba4: .L_bn_mul_comba4_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi movl 12(%esp),%esi @@ -726,10 +726,10 @@ bn_mul_comba4: .align 16 bn_sqr_comba8: .L_bn_sqr_comba8_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi @@ -1139,10 +1139,10 @@ bn_sqr_comba8: .align 16 bn_sqr_comba4: .L_bn_sqr_comba4_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/bn/x86-gf2m.S b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/bn/x86-gf2m.S index fcb54e967..b784b7cbe 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/bn/x86-gf2m.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/bn/x86-gf2m.S @@ -2,10 +2,10 @@ .type _mul_1x1_mmx,@function .align 16 _mul_1x1_mmx: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif subl $36,%esp movl %eax,%ecx @@ -110,10 +110,10 @@ _mul_1x1_mmx: .type _mul_1x1_ialu,@function .align 16 _mul_1x1_ialu: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif subl $36,%esp movl %eax,%ecx @@ -249,10 +249,10 @@ _mul_1x1_ialu: .align 16 bn_GF2m_mul_2x2: .L_bn_GF2m_mul_2x2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call .L000PIC_me_up .L000PIC_me_up: diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/bn/x86-mont.S b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/bn/x86-mont.S index 7dddbf7d8..5d8a4c6cb 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/bn/x86-mont.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/bn/x86-mont.S @@ -4,10 +4,10 @@ .align 16 bn_mul_mont: .L_bn_mul_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/buildinf.h index 58695dce1..32e0d971b 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: solaris-x86-gcc" -#define DATE "built on: Wed Jan 31 13:06:00 2024 UTC" +#define DATE "built on: Tue Aug 6 12:28:26 2024 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/camellia/cmll-x86.S b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/camellia/cmll-x86.S index bcbaf49e0..f4b77edc3 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/camellia/cmll-x86.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/camellia/cmll-x86.S @@ -4,10 +4,10 @@ .align 16 Camellia_EncryptBlock_Rounds: .L_Camellia_EncryptBlock_Rounds_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -63,10 +63,10 @@ Camellia_EncryptBlock_Rounds: .align 16 Camellia_EncryptBlock: .L_Camellia_EncryptBlock_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl $128,%eax subl 4(%esp),%eax @@ -80,10 +80,10 @@ Camellia_EncryptBlock: .align 16 Camellia_encrypt: .L_Camellia_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -137,10 +137,10 @@ Camellia_encrypt: .type _x86_Camellia_encrypt,@function .align 16 _x86_Camellia_encrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif xorl (%edi),%eax xorl 4(%edi),%ebx @@ -372,10 +372,10 @@ _x86_Camellia_encrypt: .align 16 Camellia_DecryptBlock_Rounds: .L_Camellia_DecryptBlock_Rounds_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -431,10 +431,10 @@ Camellia_DecryptBlock_Rounds: .align 16 Camellia_DecryptBlock: .L_Camellia_DecryptBlock_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl $128,%eax subl 4(%esp),%eax @@ -448,10 +448,10 @@ Camellia_DecryptBlock: .align 16 Camellia_decrypt: .L_Camellia_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -505,10 +505,10 @@ Camellia_decrypt: .type _x86_Camellia_decrypt,@function .align 16 _x86_Camellia_decrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif xorl (%edi),%eax xorl 4(%edi),%ebx @@ -740,10 +740,10 @@ _x86_Camellia_decrypt: .align 16 Camellia_Ekeygen: .L_Camellia_Ekeygen_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1586,10 +1586,10 @@ Camellia_Ekeygen: .align 16 Camellia_set_key: .L_Camellia_set_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebx movl 8(%esp),%ecx @@ -2143,10 +2143,10 @@ Camellia_set_key: .align 16 Camellia_cbc_encrypt: .L_Camellia_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/chacha/chacha-x86.S b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/chacha/chacha-x86.S index 9cc4027c7..ec98cb32f 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/chacha/chacha-x86.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/chacha/chacha-x86.S @@ -4,10 +4,10 @@ .align 16 ChaCha20_ctr32: .L_ChaCha20_ctr32_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -382,10 +382,10 @@ ChaCha20_ctr32: .align 16 ChaCha20_ssse3: .L_ChaCha20_ssse3_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -979,10 +979,10 @@ ChaCha20_ssse3: .align 16 ChaCha20_xop: .L_ChaCha20_xop_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/des/crypt586.S b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/des/crypt586.S index ac4b251ec..29ba0fa70 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/des/crypt586.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/des/crypt586.S @@ -4,10 +4,10 @@ .align 16 fcrypt_body: .L_fcrypt_body_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/des/des-586.S b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/des/des-586.S index 90449e4fa..b3839fa88 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/des/des-586.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/des/des-586.S @@ -3,10 +3,10 @@ .type _x86_DES_encrypt,@function .align 16 _x86_DES_encrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ecx @@ -479,10 +479,10 @@ _x86_DES_encrypt: .type _x86_DES_decrypt,@function .align 16 _x86_DES_decrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ecx @@ -957,10 +957,10 @@ _x86_DES_decrypt: .align 16 DES_encrypt1: .L_DES_encrypt1_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi @@ -1075,10 +1075,10 @@ DES_encrypt1: .align 16 DES_encrypt2: .L_DES_encrypt2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi @@ -1123,10 +1123,10 @@ DES_encrypt2: .align 16 DES_encrypt3: .L_DES_encrypt3_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebx movl 8(%esp),%ebx @@ -1249,10 +1249,10 @@ DES_encrypt3: .align 16 DES_decrypt3: .L_DES_decrypt3_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebx movl 8(%esp),%ebx @@ -1375,10 +1375,10 @@ DES_decrypt3: .align 16 DES_ncbc_encrypt: .L_DES_ncbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -1441,55 +1441,55 @@ DES_ncbc_encrypt: xorl %edx,%edx jmp *%ebp .L012ej7: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 6(%esi),%dh shll $8,%edx .L013ej6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 5(%esi),%dh .L014ej5: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 4(%esi),%dl .L015ej4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%ecx jmp .L016ejend .L017ej3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 2(%esi),%ch shll $8,%ecx .L018ej2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 1(%esi),%ch .L019ej1: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb (%esi),%cl .L016ejend: @@ -1595,10 +1595,10 @@ DES_ncbc_encrypt: .align 16 DES_ede3_cbc_encrypt: .L_DES_ede3_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -1665,55 +1665,55 @@ DES_ede3_cbc_encrypt: xorl %edx,%edx jmp *%ebp .L036ej7: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 6(%esi),%dh shll $8,%edx .L037ej6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 5(%esi),%dh .L038ej5: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 4(%esi),%dl .L039ej4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%ecx jmp .L040ejend .L041ej3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 2(%esi),%ch shll $8,%ecx .L042ej2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 1(%esi),%ch .L043ej1: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb (%esi),%cl .L040ejend: diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/ec/ecp_nistz256-x86.S b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/ec/ecp_nistz256-x86.S index 4e17d5eb8..f822079f8 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/ec/ecp_nistz256-x86.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/ec/ecp_nistz256-x86.S @@ -2387,10 +2387,10 @@ ecp_nistz256_precomputed: .align 16 ecp_nistz256_mul_by_2: .L_ecp_nistz256_mul_by_2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2411,10 +2411,10 @@ ecp_nistz256_mul_by_2: .align 16 ecp_nistz256_mul_by_3: .L_ecp_nistz256_mul_by_3_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2441,10 +2441,10 @@ ecp_nistz256_mul_by_3: .align 16 ecp_nistz256_div_by_2: .L_ecp_nistz256_div_by_2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2462,10 +2462,10 @@ ecp_nistz256_div_by_2: .type _ecp_nistz256_div_by_2,@function .align 16 _ecp_nistz256_div_by_2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%ebp xorl %edx,%edx @@ -2550,10 +2550,10 @@ _ecp_nistz256_div_by_2: .align 16 ecp_nistz256_add: .L_ecp_nistz256_add_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2572,10 +2572,10 @@ ecp_nistz256_add: .type _ecp_nistz256_add,@function .align 16 _ecp_nistz256_add: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%eax movl 4(%esi),%ebx @@ -2654,10 +2654,10 @@ _ecp_nistz256_add: .align 16 ecp_nistz256_sub: .L_ecp_nistz256_sub_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2676,10 +2676,10 @@ ecp_nistz256_sub: .type _ecp_nistz256_sub,@function .align 16 _ecp_nistz256_sub: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%eax movl 4(%esi),%ebx @@ -2739,10 +2739,10 @@ _ecp_nistz256_sub: .align 16 ecp_nistz256_neg: .L_ecp_nistz256_neg_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2772,10 +2772,10 @@ ecp_nistz256_neg: .type _picup_eax,@function .align 16 _picup_eax: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esp),%eax ret @@ -2785,10 +2785,10 @@ _picup_eax: .align 16 ecp_nistz256_to_mont: .L_ecp_nistz256_to_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2813,10 +2813,10 @@ ecp_nistz256_to_mont: .align 16 ecp_nistz256_from_mont: .L_ecp_nistz256_from_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2841,10 +2841,10 @@ ecp_nistz256_from_mont: .align 16 ecp_nistz256_mul_mont: .L_ecp_nistz256_mul_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2869,10 +2869,10 @@ ecp_nistz256_mul_mont: .align 16 ecp_nistz256_sqr_mont: .L_ecp_nistz256_sqr_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2895,10 +2895,10 @@ ecp_nistz256_sqr_mont: .type _ecp_nistz256_mul_mont,@function .align 16 _ecp_nistz256_mul_mont: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif andl $83886080,%eax cmpl $83886080,%eax @@ -3797,10 +3797,10 @@ _ecp_nistz256_mul_mont: .align 16 ecp_nistz256_scatter_w5: .L_ecp_nistz256_scatter_w5_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3835,10 +3835,10 @@ ecp_nistz256_scatter_w5: .align 16 ecp_nistz256_gather_w5: .L_ecp_nistz256_gather_w5_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3934,10 +3934,10 @@ ecp_nistz256_gather_w5: .align 16 ecp_nistz256_scatter_w7: .L_ecp_nistz256_scatter_w7_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3970,10 +3970,10 @@ ecp_nistz256_scatter_w7: .align 16 ecp_nistz256_gather_w7: .L_ecp_nistz256_gather_w7_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -4189,10 +4189,10 @@ ecp_nistz256_gather_w7: .align 16 ecp_nistz256_point_double: .L_ecp_nistz256_point_double_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -4320,10 +4320,10 @@ ecp_nistz256_point_double: .align 16 ecp_nistz256_point_add: .L_ecp_nistz256_point_add_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -4838,10 +4838,10 @@ ecp_nistz256_point_add: .align 16 ecp_nistz256_point_add_affine: .L_ecp_nistz256_point_add_affine_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/md5/md5-586.S b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/md5/md5-586.S index 33c01af67..7e96dc647 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/md5/md5-586.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/md5/md5-586.S @@ -4,10 +4,10 @@ .align 16 ossl_md5_block_asm_data_order: .L_ossl_md5_block_asm_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/modes/ghash-x86.S b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/modes/ghash-x86.S index dd80e32c5..9b3361acd 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/modes/ghash-x86.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/modes/ghash-x86.S @@ -4,10 +4,10 @@ .align 16 gcm_gmult_4bit_x86: .L_gcm_gmult_4bit_x86_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -103,10 +103,10 @@ gcm_gmult_4bit_x86: .align 16 gcm_ghash_4bit_x86: .L_gcm_ghash_4bit_x86_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -217,10 +217,10 @@ gcm_ghash_4bit_x86: .align 16 gcm_gmult_4bit_mmx: .L_gcm_gmult_4bit_mmx_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -321,10 +321,10 @@ gcm_gmult_4bit_mmx: .align 16 gcm_ghash_4bit_mmx: .L_gcm_ghash_4bit_mmx_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -930,10 +930,10 @@ gcm_ghash_4bit_mmx: .align 16 gcm_init_clmul: .L_gcm_init_clmul_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%eax @@ -1004,10 +1004,10 @@ gcm_init_clmul: .align 16 gcm_gmult_clmul: .L_gcm_gmult_clmul_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 8(%esp),%edx @@ -1062,10 +1062,10 @@ gcm_gmult_clmul: .align 16 gcm_ghash_clmul: .L_gcm_ghash_clmul_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/poly1305/poly1305-x86.S b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/poly1305/poly1305-x86.S index f95649fae..e76632cd1 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/poly1305/poly1305-x86.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/poly1305/poly1305-x86.S @@ -5,10 +5,10 @@ .align 16 poly1305_init: .L_poly1305_init_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -71,10 +71,10 @@ poly1305_init: .align 16 poly1305_blocks: .L_poly1305_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -244,10 +244,10 @@ poly1305_blocks: .align 16 poly1305_emit: .L_poly1305_emit_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -308,10 +308,10 @@ poly1305_emit: .type _poly1305_init_sse2,@function .align 16 _poly1305_init_sse2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movdqu 24(%edi),%xmm4 leal 48(%edi),%edi @@ -515,10 +515,10 @@ _poly1305_init_sse2: .type _poly1305_blocks_sse2,@function .align 16 _poly1305_blocks_sse2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1281,10 +1281,10 @@ _poly1305_blocks_sse2: .type _poly1305_emit_sse2,@function .align 16 _poly1305_emit_sse2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1379,10 +1379,10 @@ _poly1305_emit_sse2: .type _poly1305_init_avx2,@function .align 16 _poly1305_init_avx2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif vmovdqu 24(%edi),%xmm4 leal 48(%edi),%edi @@ -1555,10 +1555,10 @@ _poly1305_init_avx2: .type _poly1305_blocks_avx2,@function .align 16 _poly1305_blocks_avx2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/rc4/rc4-586.S b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/rc4/rc4-586.S index da909a31e..a10b047a7 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/rc4/rc4-586.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/rc4/rc4-586.S @@ -4,10 +4,10 @@ .align 16 RC4: .L_RC4_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -275,10 +275,10 @@ RC4: .align 16 RC4_set_key: .L_RC4_set_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -358,10 +358,10 @@ RC4_set_key: .align 16 RC4_options: .L_RC4_options_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call .L018pic_point .L018pic_point: diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/ripemd/rmd-586.S b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/ripemd/rmd-586.S index 57b95af6d..4f3ea459c 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/ripemd/rmd-586.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/ripemd/rmd-586.S @@ -4,10 +4,10 @@ .align 16 ripemd160_block_asm_data_order: .L_ripemd160_block_asm_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%eax diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/sha/sha1-586.S b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/sha/sha1-586.S index ddc85b3d8..4b60a71ee 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/sha/sha1-586.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/sha/sha1-586.S @@ -4,10 +4,10 @@ .align 16 sha1_block_data_order: .L_sha1_block_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1403,10 +1403,10 @@ sha1_block_data_order: .type _sha1_block_data_order_shaext,@function .align 16 _sha1_block_data_order_shaext: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1578,10 +1578,10 @@ _sha1_block_data_order_shaext: .type _sha1_block_data_order_ssse3,@function .align 16 _sha1_block_data_order_ssse3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2802,10 +2802,10 @@ _sha1_block_data_order_ssse3: .type _sha1_block_data_order_avx,@function .align 16 _sha1_block_data_order_avx: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/sha/sha256-586.S b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/sha/sha256-586.S index 9436ca5e1..c8599bd58 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/sha/sha256-586.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/sha/sha256-586.S @@ -4,10 +4,10 @@ .align 16 sha256_block_data_order: .L_sha256_block_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/sha/sha512-586.S b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/sha/sha512-586.S index c7cf815b4..99d198dd9 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/sha/sha512-586.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/sha/sha512-586.S @@ -4,10 +4,10 @@ .align 16 sha512_block_data_order: .L_sha512_block_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/whrlpool/wp-mmx.S b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/whrlpool/wp-mmx.S index 9fb9ca1e4..ee571f645 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/whrlpool/wp-mmx.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/whrlpool/wp-mmx.S @@ -4,10 +4,10 @@ .align 16 whirlpool_block_mmx: .L_whirlpool_block_mmx_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/x86cpuid.S b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/x86cpuid.S index eedacacfe..d4f2ec09e 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/x86cpuid.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/x86cpuid.S @@ -4,10 +4,10 @@ .align 16 OPENSSL_ia32_cpuid: .L_OPENSSL_ia32_cpuid_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -153,10 +153,10 @@ OPENSSL_ia32_cpuid: .align 16 OPENSSL_rdtsc: .L_OPENSSL_rdtsc_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif xorl %eax,%eax xorl %edx,%edx @@ -175,10 +175,10 @@ OPENSSL_rdtsc: .align 16 OPENSSL_instrument_halt: .L_OPENSSL_instrument_halt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call .L011PIC_me_up .L011PIC_me_up: @@ -212,10 +212,10 @@ OPENSSL_instrument_halt: .align 16 OPENSSL_far_spin: .L_OPENSSL_far_spin_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushfl popl %eax @@ -244,10 +244,10 @@ OPENSSL_far_spin: .align 16 OPENSSL_wipe_cpu: .L_OPENSSL_wipe_cpu_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif xorl %eax,%eax xorl %edx,%edx @@ -280,10 +280,10 @@ OPENSSL_wipe_cpu: .align 16 OPENSSL_atomic_add: .L_OPENSSL_atomic_add_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%ecx @@ -304,10 +304,10 @@ OPENSSL_atomic_add: .align 16 OPENSSL_cleanse: .L_OPENSSL_cleanse_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%ecx @@ -346,10 +346,10 @@ OPENSSL_cleanse: .align 16 CRYPTO_memcmp: .L_CRYPTO_memcmp_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi @@ -380,10 +380,10 @@ CRYPTO_memcmp: .align 16 OPENSSL_instrument_bus: .L_OPENSSL_instrument_bus_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -433,10 +433,10 @@ OPENSSL_instrument_bus: .align 16 OPENSSL_instrument_bus2: .L_OPENSSL_instrument_bus2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -499,10 +499,10 @@ OPENSSL_instrument_bus2: .align 16 OPENSSL_ia32_rdrand_bytes: .L_OPENSSL_ia32_rdrand_bytes_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %ebx @@ -547,10 +547,10 @@ OPENSSL_ia32_rdrand_bytes: .align 16 OPENSSL_ia32_rdseed_bytes: .L_OPENSSL_ia32_rdseed_bytes_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %ebx diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/engines/e_padlock-x86.S b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/engines/e_padlock-x86.S index 81e4ec050..cea65eba3 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/engines/e_padlock-x86.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/engines/e_padlock-x86.S @@ -4,10 +4,10 @@ .align 16 padlock_capability: .L_padlock_capability_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebx pushfl @@ -69,10 +69,10 @@ padlock_capability: .align 16 padlock_key_bswap: .L_padlock_key_bswap_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 240(%edx),%ecx @@ -92,10 +92,10 @@ padlock_key_bswap: .align 16 padlock_verify_context: .L_padlock_verify_context_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx leal .Lpadlock_saved_context-.L004verify_pic_point,%eax @@ -108,10 +108,10 @@ padlock_verify_context: .type _padlock_verify_ctx,@function .align 16 _padlock_verify_ctx: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif addl (%esp),%eax btl $30,4(%esp) @@ -129,10 +129,10 @@ _padlock_verify_ctx: .align 16 padlock_reload_key: .L_padlock_reload_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushfl popfl @@ -143,10 +143,10 @@ padlock_reload_key: .align 16 padlock_aes_block: .L_padlock_aes_block_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -168,10 +168,10 @@ padlock_aes_block: .align 16 padlock_ecb_encrypt: .L_padlock_ecb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -352,10 +352,10 @@ padlock_ecb_encrypt: .align 16 padlock_cbc_encrypt: .L_padlock_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -540,10 +540,10 @@ padlock_cbc_encrypt: .align 16 padlock_cfb_encrypt: .L_padlock_cfb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -667,10 +667,10 @@ padlock_cfb_encrypt: .align 16 padlock_ofb_encrypt: .L_padlock_ofb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -794,10 +794,10 @@ padlock_ofb_encrypt: .align 16 padlock_ctr32_encrypt: .L_padlock_ctr32_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -906,10 +906,10 @@ padlock_ctr32_encrypt: .align 16 padlock_xstore: .L_padlock_xstore_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi movl 8(%esp),%edi @@ -921,10 +921,10 @@ padlock_xstore: .type _win32_segv_handler,@function .align 16 _win32_segv_handler: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl $1,%eax movl 4(%esp),%edx @@ -941,10 +941,10 @@ _win32_segv_handler: .align 16 padlock_sha1_oneshot: .L_padlock_sha1_oneshot_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -977,10 +977,10 @@ padlock_sha1_oneshot: .align 16 padlock_sha1_blocks: .L_padlock_sha1_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -1012,10 +1012,10 @@ padlock_sha1_blocks: .align 16 padlock_sha256_oneshot: .L_padlock_sha256_oneshot_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -1048,10 +1048,10 @@ padlock_sha256_oneshot: .align 16 padlock_sha256_blocks: .L_padlock_sha256_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -1083,10 +1083,10 @@ padlock_sha256_blocks: .align 16 padlock_sha512_blocks: .L_padlock_sha512_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/include/openssl/bio.h b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/include/openssl/bio.h index f9aa74731..e16cf622c 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/include/openssl/bio.h +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/include/openssl/bio.h @@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, - int (*ossl_gets) (BIO *, char *, int)); + int (*gets) (BIO *, char *, int)); long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/include/openssl/opensslv.h index 65f3bfa05..5bb97d596 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 13 +# define OPENSSL_VERSION_PATCH 9 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.13" -# define OPENSSL_FULL_VERSION_STR "3.0.13+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "30 Jan 2024" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13+quic 30 Jan 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/include/openssl/pkcs7.h b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/include/openssl/pkcs7.h index 0ce79bf4f..557a0a726 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/include/openssl/pkcs7.h +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/include/openssl/pkcs7.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/pkcs7.h.in * - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -56,8 +56,8 @@ typedef struct pkcs7_signer_info_st { PKCS7_ISSUER_AND_SERIAL *issuer_and_serial; X509_ALGOR *digest_alg; STACK_OF(X509_ATTRIBUTE) *auth_attr; /* [ 0 ] */ - X509_ALGOR *digest_enc_alg; /* confusing name, actually used for signing */ - ASN1_OCTET_STRING *enc_digest; /* confusing name, actually signature */ + X509_ALGOR *digest_enc_alg; + ASN1_OCTET_STRING *enc_digest; STACK_OF(X509_ATTRIBUTE) *unauth_attr; /* [ 1 ] */ /* The private key to sign with */ EVP_PKEY *pkey; diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/include/openssl/ssl.h index 0f1915755..3df725c56 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/include/openssl/ssl.h +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/openssl-cl.gypi b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/openssl-cl.gypi index eb4c8f67d..2e8a0bb6f 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/openssl-cl.gypi +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/openssl-cl.gypi @@ -18,7 +18,6 @@ 'OPENSSL_IA32_SSE2', 'PADLOCK_ASM', 'POLY1305_ASM', - 'RC4_ASM', 'RMD160_ASM', 'SHA1_ASM', 'SHA256_ASM', diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/openssl.gypi b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/openssl.gypi index 2f0dea41e..944824038 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cfb.c', 'openssl/crypto/aes/aes_ecb.c', @@ -993,7 +991,6 @@ 'OPENSSL_IA32_SSE2', 'PADLOCK_ASM', 'POLY1305_ASM', - 'RC4_ASM', 'RMD160_ASM', 'SHA1_ASM', 'SHA256_ASM', diff --git a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/configdata.pm b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/configdata.pm index be79bd091..c3f7dd4cc 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/configdata.pm +++ b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/configdata.pm @@ -139,7 +139,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [], @@ -154,7 +154,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.13+quic", + "full_version" => "3.0.9", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -203,7 +203,7 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "13", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -256,11 +256,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "30 Jan 2024", - "shlib_version" => "81.3", + "release_date" => "30 May 2023", + "shlib_version" => "3", "sourcedir" => ".", "target" => "solaris-x86-gcc", - "version" => "3.0.13" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -386,7 +386,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -783,9 +782,6 @@ our %unified_info = ( "providers/fips" => { "fips" => "1" }, - "test/p_minimal" => { - "noinst" => "1" - }, "test/p_test" => { "noinst" => "1" } @@ -854,9 +850,6 @@ our %unified_info = ( "test/asn1_internal_test" => { "noinst" => "1" }, - "test/asn1_stable_parse_test" => { - "noinst" => "1" - }, "test/asn1_string_table_test" => { "noinst" => "1" }, @@ -1046,9 +1039,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -1596,9 +1586,6 @@ our %unified_info = ( "providers/libfips.a" => [ "FIPS_MODULE" ], - "test/evp_extra_test" => [ - "STATIC_LEGACY" - ], "test/provider_internal_test" => [ "PROVIDER_INIT_FUNCTION_NAME=p_test_init" ], @@ -2352,9 +2339,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -2652,9 +2636,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -3423,9 +3404,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -3720,9 +3698,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -3756,12 +3731,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -4746,9 +4715,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -5046,9 +5012,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -5817,9 +5780,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -6114,9 +6074,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -6150,12 +6107,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -7153,10 +7104,6 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], - "test/asn1_stable_parse_test" => [ - "libcrypto", - "test/libtestutil.a" - ], "test/asn1_string_table_test" => [ "libcrypto", "test/libtestutil.a" @@ -7410,10 +7357,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -7679,8 +7622,6 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "libcrypto.a", - "providers/libcommon.a", - "providers/liblegacy.a", "test/libtestutil.a" ], "test/evp_extra_test2" => [ @@ -9744,7 +9685,6 @@ our %unified_info = ( }, "providers" => { "deps" => [ - "providers/evp_extra_test-bin-legacyprov.o", "providers/libcrypto-lib-baseprov.o", "providers/libcrypto-lib-defltprov.o", "providers/libcrypto-lib-nullprov.o", @@ -9752,9 +9692,6 @@ our %unified_info = ( "providers/libdefault.a" ], "products" => { - "bin" => [ - "test/evp_extra_test" - ], "dso" => [ "providers/fips", "providers/legacy" @@ -10191,7 +10128,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10242,7 +10178,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -11374,9 +11309,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -11674,9 +11606,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -12445,9 +12374,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -12742,9 +12668,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -12778,12 +12701,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -13768,9 +13685,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -14068,9 +13982,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -14839,9 +14750,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -15136,9 +15044,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -15172,12 +15077,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -16206,10 +16105,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16286,9 +16181,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "whrlpool" ], - "test/p_minimal.ld" => [ - "util/providers.num" - ], "test/p_test.ld" => [ "util/providers.num" ], @@ -16454,7 +16346,6 @@ our %unified_info = ( "doc/html/man3/CMS_get1_ReceiptRequest.html", "doc/html/man3/CMS_sign.html", "doc/html/man3/CMS_sign_receipt.html", - "doc/html/man3/CMS_signed_get_attr.html", "doc/html/man3/CMS_uncompress.html", "doc/html/man3/CMS_verify.html", "doc/html/man3/CMS_verify_receipt.html", @@ -16554,7 +16445,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_encapsulate.html", "doc/html/man3/EVP_PKEY_encrypt.html", "doc/html/man3/EVP_PKEY_fromdata.html", - "doc/html/man3/EVP_PKEY_get_attr.html", "doc/html/man3/EVP_PKEY_get_default_digest_nid.html", "doc/html/man3/EVP_PKEY_get_field_type.html", "doc/html/man3/EVP_PKEY_get_group_name.html", @@ -16811,7 +16701,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -16910,7 +16799,6 @@ our %unified_info = ( "doc/html/man3/X509V3_get_d2i.html", "doc/html/man3/X509V3_set_ctx.html", "doc/html/man3/X509_ALGOR_dup.html", - "doc/html/man3/X509_ATTRIBUTE.html", "doc/html/man3/X509_CRL_get0_by_serial.html", "doc/html/man3/X509_EXTENSION_set_object.html", "doc/html/man3/X509_LOOKUP.html", @@ -16922,8 +16810,6 @@ our %unified_info = ( "doc/html/man3/X509_NAME_get_index_by_NID.html", "doc/html/man3/X509_NAME_print_ex.html", "doc/html/man3/X509_PUBKEY_new.html", - "doc/html/man3/X509_REQ_get_attr.html", - "doc/html/man3/X509_REQ_get_extensions.html", "doc/html/man3/X509_SIG_get0.html", "doc/html/man3/X509_STORE_CTX_get_error.html", "doc/html/man3/X509_STORE_CTX_new.html", @@ -18221,10 +18107,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/asn1_stable_parse_test" => [ - "include", - "apps/include" - ], "test/asn1_string_table_test" => [ "include", "apps/include" @@ -18432,9 +18314,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -18694,9 +18573,7 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "include", - "apps/include", - "providers/common/include", - "providers/implementations/include" + "apps/include" ], "test/evp_extra_test2" => [ "include", @@ -18953,10 +18830,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/p_minimal" => [ - "include", - "." - ], "test/p_test" => [ "include", "." @@ -19446,7 +19319,6 @@ our %unified_info = ( "doc/man/man3/CMS_get1_ReceiptRequest.3", "doc/man/man3/CMS_sign.3", "doc/man/man3/CMS_sign_receipt.3", - "doc/man/man3/CMS_signed_get_attr.3", "doc/man/man3/CMS_uncompress.3", "doc/man/man3/CMS_verify.3", "doc/man/man3/CMS_verify_receipt.3", @@ -19546,7 +19418,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_encapsulate.3", "doc/man/man3/EVP_PKEY_encrypt.3", "doc/man/man3/EVP_PKEY_fromdata.3", - "doc/man/man3/EVP_PKEY_get_attr.3", "doc/man/man3/EVP_PKEY_get_default_digest_nid.3", "doc/man/man3/EVP_PKEY_get_field_type.3", "doc/man/man3/EVP_PKEY_get_group_name.3", @@ -19803,7 +19674,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -19902,7 +19772,6 @@ our %unified_info = ( "doc/man/man3/X509V3_get_d2i.3", "doc/man/man3/X509V3_set_ctx.3", "doc/man/man3/X509_ALGOR_dup.3", - "doc/man/man3/X509_ATTRIBUTE.3", "doc/man/man3/X509_CRL_get0_by_serial.3", "doc/man/man3/X509_EXTENSION_set_object.3", "doc/man/man3/X509_LOOKUP.3", @@ -19914,8 +19783,6 @@ our %unified_info = ( "doc/man/man3/X509_NAME_get_index_by_NID.3", "doc/man/man3/X509_NAME_print_ex.3", "doc/man/man3/X509_PUBKEY_new.3", - "doc/man/man3/X509_REQ_get_attr.3", - "doc/man/man3/X509_REQ_get_extensions.3", "doc/man/man3/X509_SIG_get0.3", "doc/man/man3/X509_STORE_CTX_get_error.3", "doc/man/man3/X509_STORE_CTX_new.3", @@ -20099,7 +19966,6 @@ our %unified_info = ( "modules" => [ "providers/fips", "providers/legacy", - "test/p_minimal", "test/p_test" ], "programs" => [ @@ -20125,7 +19991,6 @@ our %unified_info = ( "test/asn1_dsa_internal_test", "test/asn1_encode_test", "test/asn1_internal_test", - "test/asn1_stable_parse_test", "test/asn1_string_table_test", "test/asn1_time_test", "test/asynciotest", @@ -20189,7 +20054,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24314,7 +24178,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24341,7 +24204,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -24443,9 +24305,6 @@ our %unified_info = ( "providers/common/libfips-lib-securitycheck_fips.o" => [ "providers/common/securitycheck_fips.c" ], - "providers/evp_extra_test-bin-legacyprov.o" => [ - "providers/legacyprov.c" - ], "providers/fips" => [ "providers/fips.ld", "providers/fips/fips-dso-fips_entry.o" @@ -25582,9 +25441,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25666,9 +25522,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25726,12 +25579,6 @@ our %unified_info = ( "test/asn1_internal_test-bin-asn1_internal_test.o" => [ "test/asn1_internal_test.c" ], - "test/asn1_stable_parse_test" => [ - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" - ], - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" => [ - "test/asn1_stable_parse_test.c" - ], "test/asn1_string_table_test" => [ "test/asn1_string_table_test-bin-asn1_string_table_test.o" ], @@ -26111,12 +25958,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -26515,7 +26356,6 @@ our %unified_info = ( "test/errtest.c" ], "test/evp_extra_test" => [ - "providers/evp_extra_test-bin-legacyprov.o", "test/evp_extra_test-bin-evp_extra_test.o" ], "test/evp_extra_test-bin-evp_extra_test.o" => [ @@ -26806,13 +26646,6 @@ our %unified_info = ( "test/ossl_store_test-bin-ossl_store_test.o" => [ "test/ossl_store_test.c" ], - "test/p_minimal" => [ - "test/p_minimal-dso-p_minimal.o", - "test/p_minimal.ld" - ], - "test/p_minimal-dso-p_minimal.o" => [ - "test/p_minimal.c" - ], "test/p_test" => [ "test/p_test-dso-p_test.o", "test/p_test.ld" @@ -27502,8 +27335,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27530,7 +27363,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27547,8 +27380,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/crypto/buildinf.h index 0b4b1b3b6..b4d09efca 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: solaris-x86-gcc" -#define DATE "built on: Wed Jan 31 13:06:14 2024 UTC" +#define DATE "built on: Tue Aug 6 12:28:38 2024 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/openssl/bio.h b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/openssl/bio.h index f9aa74731..e16cf622c 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/openssl/bio.h @@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, - int (*ossl_gets) (BIO *, char *, int)); + int (*gets) (BIO *, char *, int)); long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); diff --git a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/openssl/opensslv.h index 65f3bfa05..5bb97d596 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 13 +# define OPENSSL_VERSION_PATCH 9 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.13" -# define OPENSSL_FULL_VERSION_STR "3.0.13+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "30 Jan 2024" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13+quic 30 Jan 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/openssl/pkcs7.h b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/openssl/pkcs7.h index 0ce79bf4f..557a0a726 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/openssl/pkcs7.h +++ b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/openssl/pkcs7.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/pkcs7.h.in * - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -56,8 +56,8 @@ typedef struct pkcs7_signer_info_st { PKCS7_ISSUER_AND_SERIAL *issuer_and_serial; X509_ALGOR *digest_alg; STACK_OF(X509_ATTRIBUTE) *auth_attr; /* [ 0 ] */ - X509_ALGOR *digest_enc_alg; /* confusing name, actually used for signing */ - ASN1_OCTET_STRING *enc_digest; /* confusing name, actually signature */ + X509_ALGOR *digest_enc_alg; + ASN1_OCTET_STRING *enc_digest; STACK_OF(X509_ATTRIBUTE) *unauth_attr; /* [ 1 ] */ /* The private key to sign with */ EVP_PKEY *pkey; diff --git a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/openssl/ssl.h index 0f1915755..3df725c56 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/openssl.gypi b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/openssl.gypi index 5af311edc..65b9565d3 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cbc.c', 'openssl/crypto/aes/aes_cfb.c', diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/configdata.pm b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/configdata.pm index 6ca22d6bc..ed8c3e68f 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/configdata.pm +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/configdata.pm @@ -139,7 +139,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -156,7 +156,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.13+quic", + "full_version" => "3.0.9", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -204,7 +204,7 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "13", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -256,11 +256,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "30 Jan 2024", - "shlib_version" => "81.3", + "release_date" => "30 May 2023", + "shlib_version" => "3", "sourcedir" => ".", "target" => "solaris64-x86_64-gcc", - "version" => "3.0.13" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -387,7 +387,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -783,9 +782,6 @@ our %unified_info = ( "providers/fips" => { "fips" => "1" }, - "test/p_minimal" => { - "noinst" => "1" - }, "test/p_test" => { "noinst" => "1" } @@ -854,9 +850,6 @@ our %unified_info = ( "test/asn1_internal_test" => { "noinst" => "1" }, - "test/asn1_stable_parse_test" => { - "noinst" => "1" - }, "test/asn1_string_table_test" => { "noinst" => "1" }, @@ -1046,9 +1039,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -1605,7 +1595,6 @@ our %unified_info = ( "OPENSSL_IA32_SSE2", "PADLOCK_ASM", "POLY1305_ASM", - "RC4_ASM", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", @@ -1657,11 +1646,7 @@ our %unified_info = ( "X25519_ASM" ], "providers/liblegacy.a" => [ - "MD5_ASM", - "RC4_ASM" - ], - "test/evp_extra_test" => [ - "STATIC_LEGACY" + "MD5_ASM" ], "test/provider_internal_test" => [ "PROVIDER_INIT_FUNCTION_NAME=p_test_init" @@ -2416,9 +2401,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -2716,9 +2698,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -3487,9 +3466,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -3784,9 +3760,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -3820,12 +3793,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -4810,9 +4777,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -5110,9 +5074,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -5881,9 +5842,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -6178,9 +6136,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -6214,12 +6169,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -7217,10 +7166,6 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], - "test/asn1_stable_parse_test" => [ - "libcrypto", - "test/libtestutil.a" - ], "test/asn1_string_table_test" => [ "libcrypto", "test/libtestutil.a" @@ -7474,10 +7419,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -7743,8 +7684,6 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "libcrypto.a", - "providers/libcommon.a", - "providers/liblegacy.a", "test/libtestutil.a" ], "test/evp_extra_test2" => [ @@ -9866,7 +9805,6 @@ our %unified_info = ( }, "providers" => { "deps" => [ - "providers/evp_extra_test-bin-legacyprov.o", "providers/libcrypto-lib-baseprov.o", "providers/libcrypto-lib-defltprov.o", "providers/libcrypto-lib-nullprov.o", @@ -9874,9 +9812,6 @@ our %unified_info = ( "providers/libdefault.a" ], "products" => { - "bin" => [ - "test/evp_extra_test" - ], "dso" => [ "providers/fips", "providers/legacy" @@ -10313,7 +10248,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10364,7 +10298,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -11496,9 +11429,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -11796,9 +11726,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -12567,9 +12494,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -12864,9 +12788,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -12900,12 +12821,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -13890,9 +13805,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -14190,9 +14102,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -14961,9 +14870,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -15258,9 +15164,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -15294,12 +15197,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -16328,10 +16225,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16408,9 +16301,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "whrlpool" ], - "test/p_minimal.ld" => [ - "util/providers.num" - ], "test/p_test.ld" => [ "util/providers.num" ], @@ -16576,7 +16466,6 @@ our %unified_info = ( "doc/html/man3/CMS_get1_ReceiptRequest.html", "doc/html/man3/CMS_sign.html", "doc/html/man3/CMS_sign_receipt.html", - "doc/html/man3/CMS_signed_get_attr.html", "doc/html/man3/CMS_uncompress.html", "doc/html/man3/CMS_verify.html", "doc/html/man3/CMS_verify_receipt.html", @@ -16676,7 +16565,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_encapsulate.html", "doc/html/man3/EVP_PKEY_encrypt.html", "doc/html/man3/EVP_PKEY_fromdata.html", - "doc/html/man3/EVP_PKEY_get_attr.html", "doc/html/man3/EVP_PKEY_get_default_digest_nid.html", "doc/html/man3/EVP_PKEY_get_field_type.html", "doc/html/man3/EVP_PKEY_get_group_name.html", @@ -16933,7 +16821,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -17032,7 +16919,6 @@ our %unified_info = ( "doc/html/man3/X509V3_get_d2i.html", "doc/html/man3/X509V3_set_ctx.html", "doc/html/man3/X509_ALGOR_dup.html", - "doc/html/man3/X509_ATTRIBUTE.html", "doc/html/man3/X509_CRL_get0_by_serial.html", "doc/html/man3/X509_EXTENSION_set_object.html", "doc/html/man3/X509_LOOKUP.html", @@ -17044,8 +16930,6 @@ our %unified_info = ( "doc/html/man3/X509_NAME_get_index_by_NID.html", "doc/html/man3/X509_NAME_print_ex.html", "doc/html/man3/X509_PUBKEY_new.html", - "doc/html/man3/X509_REQ_get_attr.html", - "doc/html/man3/X509_REQ_get_extensions.html", "doc/html/man3/X509_SIG_get0.html", "doc/html/man3/X509_STORE_CTX_get_error.html", "doc/html/man3/X509_STORE_CTX_new.html", @@ -18343,10 +18227,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/asn1_stable_parse_test" => [ - "include", - "apps/include" - ], "test/asn1_string_table_test" => [ "include", "apps/include" @@ -18554,9 +18434,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -18816,9 +18693,7 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "include", - "apps/include", - "providers/common/include", - "providers/implementations/include" + "apps/include" ], "test/evp_extra_test2" => [ "include", @@ -19075,10 +18950,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/p_minimal" => [ - "include", - "." - ], "test/p_test" => [ "include", "." @@ -19568,7 +19439,6 @@ our %unified_info = ( "doc/man/man3/CMS_get1_ReceiptRequest.3", "doc/man/man3/CMS_sign.3", "doc/man/man3/CMS_sign_receipt.3", - "doc/man/man3/CMS_signed_get_attr.3", "doc/man/man3/CMS_uncompress.3", "doc/man/man3/CMS_verify.3", "doc/man/man3/CMS_verify_receipt.3", @@ -19668,7 +19538,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_encapsulate.3", "doc/man/man3/EVP_PKEY_encrypt.3", "doc/man/man3/EVP_PKEY_fromdata.3", - "doc/man/man3/EVP_PKEY_get_attr.3", "doc/man/man3/EVP_PKEY_get_default_digest_nid.3", "doc/man/man3/EVP_PKEY_get_field_type.3", "doc/man/man3/EVP_PKEY_get_group_name.3", @@ -19925,7 +19794,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20024,7 +19892,6 @@ our %unified_info = ( "doc/man/man3/X509V3_get_d2i.3", "doc/man/man3/X509V3_set_ctx.3", "doc/man/man3/X509_ALGOR_dup.3", - "doc/man/man3/X509_ATTRIBUTE.3", "doc/man/man3/X509_CRL_get0_by_serial.3", "doc/man/man3/X509_EXTENSION_set_object.3", "doc/man/man3/X509_LOOKUP.3", @@ -20036,8 +19903,6 @@ our %unified_info = ( "doc/man/man3/X509_NAME_get_index_by_NID.3", "doc/man/man3/X509_NAME_print_ex.3", "doc/man/man3/X509_PUBKEY_new.3", - "doc/man/man3/X509_REQ_get_attr.3", - "doc/man/man3/X509_REQ_get_extensions.3", "doc/man/man3/X509_SIG_get0.3", "doc/man/man3/X509_STORE_CTX_get_error.3", "doc/man/man3/X509_STORE_CTX_new.3", @@ -20221,7 +20086,6 @@ our %unified_info = ( "modules" => [ "providers/fips", "providers/legacy", - "test/p_minimal", "test/p_test" ], "programs" => [ @@ -20247,7 +20111,6 @@ our %unified_info = ( "test/asn1_dsa_internal_test", "test/asn1_encode_test", "test/asn1_internal_test", - "test/asn1_stable_parse_test", "test/asn1_string_table_test", "test/asn1_time_test", "test/asynciotest", @@ -20311,7 +20174,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24605,7 +24467,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24632,7 +24493,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -24734,9 +24594,6 @@ our %unified_info = ( "providers/common/libfips-lib-securitycheck_fips.o" => [ "providers/common/securitycheck_fips.c" ], - "providers/evp_extra_test-bin-legacyprov.o" => [ - "providers/legacyprov.c" - ], "providers/fips" => [ "providers/fips.ld", "providers/fips/fips-dso-fips_entry.o" @@ -25896,9 +25753,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25980,9 +25834,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -26040,12 +25891,6 @@ our %unified_info = ( "test/asn1_internal_test-bin-asn1_internal_test.o" => [ "test/asn1_internal_test.c" ], - "test/asn1_stable_parse_test" => [ - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" - ], - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" => [ - "test/asn1_stable_parse_test.c" - ], "test/asn1_string_table_test" => [ "test/asn1_string_table_test-bin-asn1_string_table_test.o" ], @@ -26425,12 +26270,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -26829,7 +26668,6 @@ our %unified_info = ( "test/errtest.c" ], "test/evp_extra_test" => [ - "providers/evp_extra_test-bin-legacyprov.o", "test/evp_extra_test-bin-evp_extra_test.o" ], "test/evp_extra_test-bin-evp_extra_test.o" => [ @@ -27120,13 +26958,6 @@ our %unified_info = ( "test/ossl_store_test-bin-ossl_store_test.o" => [ "test/ossl_store_test.c" ], - "test/p_minimal" => [ - "test/p_minimal-dso-p_minimal.o", - "test/p_minimal.ld" - ], - "test/p_minimal-dso-p_minimal.o" => [ - "test/p_minimal.c" - ], "test/p_test" => [ "test/p_test-dso-p_test.o", "test/p_test.ld" @@ -27813,8 +27644,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27841,7 +27672,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27858,8 +27689,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/buildinf.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/buildinf.h index 4936c63ba..e74321bf0 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: solaris64-x86_64-gcc" -#define DATE "built on: Wed Jan 31 13:06:25 2024 UTC" +#define DATE "built on: Tue Aug 6 12:28:49 2024 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/openssl/bio.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/openssl/bio.h index f9aa74731..e16cf622c 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/openssl/bio.h @@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, - int (*ossl_gets) (BIO *, char *, int)); + int (*gets) (BIO *, char *, int)); long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/openssl/opensslv.h index 65f3bfa05..5bb97d596 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 13 +# define OPENSSL_VERSION_PATCH 9 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.13" -# define OPENSSL_FULL_VERSION_STR "3.0.13+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "30 Jan 2024" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13+quic 30 Jan 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/openssl/pkcs7.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/openssl/pkcs7.h index 0ce79bf4f..557a0a726 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/openssl/pkcs7.h +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/openssl/pkcs7.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/pkcs7.h.in * - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -56,8 +56,8 @@ typedef struct pkcs7_signer_info_st { PKCS7_ISSUER_AND_SERIAL *issuer_and_serial; X509_ALGOR *digest_alg; STACK_OF(X509_ATTRIBUTE) *auth_attr; /* [ 0 ] */ - X509_ALGOR *digest_enc_alg; /* confusing name, actually used for signing */ - ASN1_OCTET_STRING *enc_digest; /* confusing name, actually signature */ + X509_ALGOR *digest_enc_alg; + ASN1_OCTET_STRING *enc_digest; STACK_OF(X509_ATTRIBUTE) *unauth_attr; /* [ 1 ] */ /* The private key to sign with */ EVP_PKEY *pkey; diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/openssl/ssl.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/openssl/ssl.h index 0f1915755..3df725c56 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/openssl-cl.gypi b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/openssl-cl.gypi index aad5fc68f..73d5bf11b 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/openssl-cl.gypi +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/openssl-cl.gypi @@ -19,7 +19,6 @@ 'OPENSSL_IA32_SSE2', 'PADLOCK_ASM', 'POLY1305_ASM', - 'RC4_ASM', 'SHA1_ASM', 'SHA256_ASM', 'SHA512_ASM', diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/openssl.gypi b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/openssl.gypi index 24d9ad0e5..f1429932f 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/openssl.gypi +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cfb.c', 'openssl/crypto/aes/aes_ecb.c', @@ -1007,7 +1005,6 @@ 'OPENSSL_IA32_SSE2', 'PADLOCK_ASM', 'POLY1305_ASM', - 'RC4_ASM', 'SHA1_ASM', 'SHA256_ASM', 'SHA512_ASM', diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/configdata.pm b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/configdata.pm index cce6080a4..52ce682c5 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/configdata.pm @@ -139,7 +139,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -156,7 +156,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.13+quic", + "full_version" => "3.0.9", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -204,7 +204,7 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "13", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -256,11 +256,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "30 Jan 2024", - "shlib_version" => "81.3", + "release_date" => "30 May 2023", + "shlib_version" => "3", "sourcedir" => ".", "target" => "solaris64-x86_64-gcc", - "version" => "3.0.13" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -387,7 +387,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -783,9 +782,6 @@ our %unified_info = ( "providers/fips" => { "fips" => "1" }, - "test/p_minimal" => { - "noinst" => "1" - }, "test/p_test" => { "noinst" => "1" } @@ -854,9 +850,6 @@ our %unified_info = ( "test/asn1_internal_test" => { "noinst" => "1" }, - "test/asn1_stable_parse_test" => { - "noinst" => "1" - }, "test/asn1_string_table_test" => { "noinst" => "1" }, @@ -1046,9 +1039,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -1605,7 +1595,6 @@ our %unified_info = ( "OPENSSL_IA32_SSE2", "PADLOCK_ASM", "POLY1305_ASM", - "RC4_ASM", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", @@ -1657,11 +1646,7 @@ our %unified_info = ( "X25519_ASM" ], "providers/liblegacy.a" => [ - "MD5_ASM", - "RC4_ASM" - ], - "test/evp_extra_test" => [ - "STATIC_LEGACY" + "MD5_ASM" ], "test/provider_internal_test" => [ "PROVIDER_INIT_FUNCTION_NAME=p_test_init" @@ -2416,9 +2401,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -2716,9 +2698,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -3487,9 +3466,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -3784,9 +3760,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -3820,12 +3793,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -4810,9 +4777,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -5110,9 +5074,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -5881,9 +5842,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -6178,9 +6136,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -6214,12 +6169,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -7217,10 +7166,6 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], - "test/asn1_stable_parse_test" => [ - "libcrypto", - "test/libtestutil.a" - ], "test/asn1_string_table_test" => [ "libcrypto", "test/libtestutil.a" @@ -7474,10 +7419,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -7743,8 +7684,6 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "libcrypto.a", - "providers/libcommon.a", - "providers/liblegacy.a", "test/libtestutil.a" ], "test/evp_extra_test2" => [ @@ -9866,7 +9805,6 @@ our %unified_info = ( }, "providers" => { "deps" => [ - "providers/evp_extra_test-bin-legacyprov.o", "providers/libcrypto-lib-baseprov.o", "providers/libcrypto-lib-defltprov.o", "providers/libcrypto-lib-nullprov.o", @@ -9874,9 +9812,6 @@ our %unified_info = ( "providers/libdefault.a" ], "products" => { - "bin" => [ - "test/evp_extra_test" - ], "dso" => [ "providers/fips", "providers/legacy" @@ -10313,7 +10248,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10364,7 +10298,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -11496,9 +11429,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -11796,9 +11726,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -12567,9 +12494,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -12864,9 +12788,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -12900,12 +12821,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -13890,9 +13805,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -14190,9 +14102,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -14961,9 +14870,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -15258,9 +15164,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -15294,12 +15197,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -16328,10 +16225,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16408,9 +16301,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "whrlpool" ], - "test/p_minimal.ld" => [ - "util/providers.num" - ], "test/p_test.ld" => [ "util/providers.num" ], @@ -16576,7 +16466,6 @@ our %unified_info = ( "doc/html/man3/CMS_get1_ReceiptRequest.html", "doc/html/man3/CMS_sign.html", "doc/html/man3/CMS_sign_receipt.html", - "doc/html/man3/CMS_signed_get_attr.html", "doc/html/man3/CMS_uncompress.html", "doc/html/man3/CMS_verify.html", "doc/html/man3/CMS_verify_receipt.html", @@ -16676,7 +16565,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_encapsulate.html", "doc/html/man3/EVP_PKEY_encrypt.html", "doc/html/man3/EVP_PKEY_fromdata.html", - "doc/html/man3/EVP_PKEY_get_attr.html", "doc/html/man3/EVP_PKEY_get_default_digest_nid.html", "doc/html/man3/EVP_PKEY_get_field_type.html", "doc/html/man3/EVP_PKEY_get_group_name.html", @@ -16933,7 +16821,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -17032,7 +16919,6 @@ our %unified_info = ( "doc/html/man3/X509V3_get_d2i.html", "doc/html/man3/X509V3_set_ctx.html", "doc/html/man3/X509_ALGOR_dup.html", - "doc/html/man3/X509_ATTRIBUTE.html", "doc/html/man3/X509_CRL_get0_by_serial.html", "doc/html/man3/X509_EXTENSION_set_object.html", "doc/html/man3/X509_LOOKUP.html", @@ -17044,8 +16930,6 @@ our %unified_info = ( "doc/html/man3/X509_NAME_get_index_by_NID.html", "doc/html/man3/X509_NAME_print_ex.html", "doc/html/man3/X509_PUBKEY_new.html", - "doc/html/man3/X509_REQ_get_attr.html", - "doc/html/man3/X509_REQ_get_extensions.html", "doc/html/man3/X509_SIG_get0.html", "doc/html/man3/X509_STORE_CTX_get_error.html", "doc/html/man3/X509_STORE_CTX_new.html", @@ -18343,10 +18227,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/asn1_stable_parse_test" => [ - "include", - "apps/include" - ], "test/asn1_string_table_test" => [ "include", "apps/include" @@ -18554,9 +18434,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -18816,9 +18693,7 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "include", - "apps/include", - "providers/common/include", - "providers/implementations/include" + "apps/include" ], "test/evp_extra_test2" => [ "include", @@ -19075,10 +18950,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/p_minimal" => [ - "include", - "." - ], "test/p_test" => [ "include", "." @@ -19568,7 +19439,6 @@ our %unified_info = ( "doc/man/man3/CMS_get1_ReceiptRequest.3", "doc/man/man3/CMS_sign.3", "doc/man/man3/CMS_sign_receipt.3", - "doc/man/man3/CMS_signed_get_attr.3", "doc/man/man3/CMS_uncompress.3", "doc/man/man3/CMS_verify.3", "doc/man/man3/CMS_verify_receipt.3", @@ -19668,7 +19538,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_encapsulate.3", "doc/man/man3/EVP_PKEY_encrypt.3", "doc/man/man3/EVP_PKEY_fromdata.3", - "doc/man/man3/EVP_PKEY_get_attr.3", "doc/man/man3/EVP_PKEY_get_default_digest_nid.3", "doc/man/man3/EVP_PKEY_get_field_type.3", "doc/man/man3/EVP_PKEY_get_group_name.3", @@ -19925,7 +19794,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20024,7 +19892,6 @@ our %unified_info = ( "doc/man/man3/X509V3_get_d2i.3", "doc/man/man3/X509V3_set_ctx.3", "doc/man/man3/X509_ALGOR_dup.3", - "doc/man/man3/X509_ATTRIBUTE.3", "doc/man/man3/X509_CRL_get0_by_serial.3", "doc/man/man3/X509_EXTENSION_set_object.3", "doc/man/man3/X509_LOOKUP.3", @@ -20036,8 +19903,6 @@ our %unified_info = ( "doc/man/man3/X509_NAME_get_index_by_NID.3", "doc/man/man3/X509_NAME_print_ex.3", "doc/man/man3/X509_PUBKEY_new.3", - "doc/man/man3/X509_REQ_get_attr.3", - "doc/man/man3/X509_REQ_get_extensions.3", "doc/man/man3/X509_SIG_get0.3", "doc/man/man3/X509_STORE_CTX_get_error.3", "doc/man/man3/X509_STORE_CTX_new.3", @@ -20221,7 +20086,6 @@ our %unified_info = ( "modules" => [ "providers/fips", "providers/legacy", - "test/p_minimal", "test/p_test" ], "programs" => [ @@ -20247,7 +20111,6 @@ our %unified_info = ( "test/asn1_dsa_internal_test", "test/asn1_encode_test", "test/asn1_internal_test", - "test/asn1_stable_parse_test", "test/asn1_string_table_test", "test/asn1_time_test", "test/asynciotest", @@ -20311,7 +20174,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24605,7 +24467,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24632,7 +24493,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -24734,9 +24594,6 @@ our %unified_info = ( "providers/common/libfips-lib-securitycheck_fips.o" => [ "providers/common/securitycheck_fips.c" ], - "providers/evp_extra_test-bin-legacyprov.o" => [ - "providers/legacyprov.c" - ], "providers/fips" => [ "providers/fips.ld", "providers/fips/fips-dso-fips_entry.o" @@ -25896,9 +25753,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25980,9 +25834,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -26040,12 +25891,6 @@ our %unified_info = ( "test/asn1_internal_test-bin-asn1_internal_test.o" => [ "test/asn1_internal_test.c" ], - "test/asn1_stable_parse_test" => [ - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" - ], - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" => [ - "test/asn1_stable_parse_test.c" - ], "test/asn1_string_table_test" => [ "test/asn1_string_table_test-bin-asn1_string_table_test.o" ], @@ -26425,12 +26270,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -26829,7 +26668,6 @@ our %unified_info = ( "test/errtest.c" ], "test/evp_extra_test" => [ - "providers/evp_extra_test-bin-legacyprov.o", "test/evp_extra_test-bin-evp_extra_test.o" ], "test/evp_extra_test-bin-evp_extra_test.o" => [ @@ -27120,13 +26958,6 @@ our %unified_info = ( "test/ossl_store_test-bin-ossl_store_test.o" => [ "test/ossl_store_test.c" ], - "test/p_minimal" => [ - "test/p_minimal-dso-p_minimal.o", - "test/p_minimal.ld" - ], - "test/p_minimal-dso-p_minimal.o" => [ - "test/p_minimal.c" - ], "test/p_test" => [ "test/p_test-dso-p_test.o", "test/p_test.ld" @@ -27813,8 +27644,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27841,7 +27672,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27858,8 +27689,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/buildinf.h index f14127004..56f8f5a7b 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: solaris64-x86_64-gcc" -#define DATE "built on: Wed Jan 31 13:06:41 2024 UTC" +#define DATE "built on: Tue Aug 6 12:29:03 2024 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/bio.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/bio.h index f9aa74731..e16cf622c 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/bio.h +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/bio.h @@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, - int (*ossl_gets) (BIO *, char *, int)); + int (*gets) (BIO *, char *, int)); long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/opensslv.h index 65f3bfa05..5bb97d596 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 13 +# define OPENSSL_VERSION_PATCH 9 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.13" -# define OPENSSL_FULL_VERSION_STR "3.0.13+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "30 Jan 2024" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13+quic 30 Jan 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/pkcs7.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/pkcs7.h index 0ce79bf4f..557a0a726 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/pkcs7.h +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/pkcs7.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/pkcs7.h.in * - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -56,8 +56,8 @@ typedef struct pkcs7_signer_info_st { PKCS7_ISSUER_AND_SERIAL *issuer_and_serial; X509_ALGOR *digest_alg; STACK_OF(X509_ATTRIBUTE) *auth_attr; /* [ 0 ] */ - X509_ALGOR *digest_enc_alg; /* confusing name, actually used for signing */ - ASN1_OCTET_STRING *enc_digest; /* confusing name, actually signature */ + X509_ALGOR *digest_enc_alg; + ASN1_OCTET_STRING *enc_digest; STACK_OF(X509_ATTRIBUTE) *unauth_attr; /* [ 1 ] */ /* The private key to sign with */ EVP_PKEY *pkey; diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/ssl.h index 0f1915755..3df725c56 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/ssl.h +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/openssl-cl.gypi b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/openssl-cl.gypi index 5e955a3c5..b11daee66 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/openssl-cl.gypi +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/openssl-cl.gypi @@ -19,7 +19,6 @@ 'OPENSSL_IA32_SSE2', 'PADLOCK_ASM', 'POLY1305_ASM', - 'RC4_ASM', 'SHA1_ASM', 'SHA256_ASM', 'SHA512_ASM', diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/openssl.gypi b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/openssl.gypi index 5bab94f70..885cda75b 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cfb.c', 'openssl/crypto/aes/aes_ecb.c', @@ -1007,7 +1005,6 @@ 'OPENSSL_IA32_SSE2', 'PADLOCK_ASM', 'POLY1305_ASM', - 'RC4_ASM', 'SHA1_ASM', 'SHA256_ASM', 'SHA512_ASM', diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/configdata.pm b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/configdata.pm index 1790bd78c..d7964bc20 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/configdata.pm +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/configdata.pm @@ -139,7 +139,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [], @@ -154,7 +154,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.13+quic", + "full_version" => "3.0.9", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -203,7 +203,7 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "13", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -256,11 +256,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "30 Jan 2024", - "shlib_version" => "81.3", + "release_date" => "30 May 2023", + "shlib_version" => "3", "sourcedir" => ".", "target" => "solaris64-x86_64-gcc", - "version" => "3.0.13" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -387,7 +387,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -784,9 +783,6 @@ our %unified_info = ( "providers/fips" => { "fips" => "1" }, - "test/p_minimal" => { - "noinst" => "1" - }, "test/p_test" => { "noinst" => "1" } @@ -855,9 +851,6 @@ our %unified_info = ( "test/asn1_internal_test" => { "noinst" => "1" }, - "test/asn1_stable_parse_test" => { - "noinst" => "1" - }, "test/asn1_string_table_test" => { "noinst" => "1" }, @@ -1047,9 +1040,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -1597,9 +1587,6 @@ our %unified_info = ( "providers/libfips.a" => [ "FIPS_MODULE" ], - "test/evp_extra_test" => [ - "STATIC_LEGACY" - ], "test/provider_internal_test" => [ "PROVIDER_INIT_FUNCTION_NAME=p_test_init" ], @@ -2353,9 +2340,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -2653,9 +2637,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -3424,9 +3405,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -3721,9 +3699,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -3757,12 +3732,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -4747,9 +4716,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -5047,9 +5013,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -5818,9 +5781,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -6115,9 +6075,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -6151,12 +6108,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -7154,10 +7105,6 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], - "test/asn1_stable_parse_test" => [ - "libcrypto", - "test/libtestutil.a" - ], "test/asn1_string_table_test" => [ "libcrypto", "test/libtestutil.a" @@ -7411,10 +7358,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -7680,8 +7623,6 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "libcrypto.a", - "providers/libcommon.a", - "providers/liblegacy.a", "test/libtestutil.a" ], "test/evp_extra_test2" => [ @@ -9745,7 +9686,6 @@ our %unified_info = ( }, "providers" => { "deps" => [ - "providers/evp_extra_test-bin-legacyprov.o", "providers/libcrypto-lib-baseprov.o", "providers/libcrypto-lib-defltprov.o", "providers/libcrypto-lib-nullprov.o", @@ -9753,9 +9693,6 @@ our %unified_info = ( "providers/libdefault.a" ], "products" => { - "bin" => [ - "test/evp_extra_test" - ], "dso" => [ "providers/fips", "providers/legacy" @@ -10192,7 +10129,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10243,7 +10179,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -11375,9 +11310,6 @@ our %unified_info = ( "doc/html/man3/CMS_sign_receipt.html" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/html/man3/CMS_signed_get_attr.html" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/html/man3/CMS_uncompress.html" => [ "doc/man3/CMS_uncompress.pod" ], @@ -11675,9 +11607,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_fromdata.html" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/html/man3/EVP_PKEY_get_attr.html" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/html/man3/EVP_PKEY_get_default_digest_nid.html" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -12446,9 +12375,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -12743,9 +12669,6 @@ our %unified_info = ( "doc/html/man3/X509_ALGOR_dup.html" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/html/man3/X509_ATTRIBUTE.html" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/html/man3/X509_CRL_get0_by_serial.html" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -12779,12 +12702,6 @@ our %unified_info = ( "doc/html/man3/X509_PUBKEY_new.html" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/html/man3/X509_REQ_get_attr.html" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/html/man3/X509_REQ_get_extensions.html" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/html/man3/X509_SIG_get0.html" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -13769,9 +13686,6 @@ our %unified_info = ( "doc/man/man3/CMS_sign_receipt.3" => [ "doc/man3/CMS_sign_receipt.pod" ], - "doc/man/man3/CMS_signed_get_attr.3" => [ - "doc/man3/CMS_signed_get_attr.pod" - ], "doc/man/man3/CMS_uncompress.3" => [ "doc/man3/CMS_uncompress.pod" ], @@ -14069,9 +13983,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_fromdata.3" => [ "doc/man3/EVP_PKEY_fromdata.pod" ], - "doc/man/man3/EVP_PKEY_get_attr.3" => [ - "doc/man3/EVP_PKEY_get_attr.pod" - ], "doc/man/man3/EVP_PKEY_get_default_digest_nid.3" => [ "doc/man3/EVP_PKEY_get_default_digest_nid.pod" ], @@ -14840,9 +14751,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -15137,9 +15045,6 @@ our %unified_info = ( "doc/man/man3/X509_ALGOR_dup.3" => [ "doc/man3/X509_ALGOR_dup.pod" ], - "doc/man/man3/X509_ATTRIBUTE.3" => [ - "doc/man3/X509_ATTRIBUTE.pod" - ], "doc/man/man3/X509_CRL_get0_by_serial.3" => [ "doc/man3/X509_CRL_get0_by_serial.pod" ], @@ -15173,12 +15078,6 @@ our %unified_info = ( "doc/man/man3/X509_PUBKEY_new.3" => [ "doc/man3/X509_PUBKEY_new.pod" ], - "doc/man/man3/X509_REQ_get_attr.3" => [ - "doc/man3/X509_REQ_get_attr.pod" - ], - "doc/man/man3/X509_REQ_get_extensions.3" => [ - "doc/man3/X509_REQ_get_extensions.pod" - ], "doc/man/man3/X509_SIG_get0.3" => [ "doc/man3/X509_SIG_get0.pod" ], @@ -16207,10 +16106,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16287,9 +16182,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "whrlpool" ], - "test/p_minimal.ld" => [ - "util/providers.num" - ], "test/p_test.ld" => [ "util/providers.num" ], @@ -16455,7 +16347,6 @@ our %unified_info = ( "doc/html/man3/CMS_get1_ReceiptRequest.html", "doc/html/man3/CMS_sign.html", "doc/html/man3/CMS_sign_receipt.html", - "doc/html/man3/CMS_signed_get_attr.html", "doc/html/man3/CMS_uncompress.html", "doc/html/man3/CMS_verify.html", "doc/html/man3/CMS_verify_receipt.html", @@ -16555,7 +16446,6 @@ our %unified_info = ( "doc/html/man3/EVP_PKEY_encapsulate.html", "doc/html/man3/EVP_PKEY_encrypt.html", "doc/html/man3/EVP_PKEY_fromdata.html", - "doc/html/man3/EVP_PKEY_get_attr.html", "doc/html/man3/EVP_PKEY_get_default_digest_nid.html", "doc/html/man3/EVP_PKEY_get_field_type.html", "doc/html/man3/EVP_PKEY_get_group_name.html", @@ -16812,7 +16702,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -16911,7 +16800,6 @@ our %unified_info = ( "doc/html/man3/X509V3_get_d2i.html", "doc/html/man3/X509V3_set_ctx.html", "doc/html/man3/X509_ALGOR_dup.html", - "doc/html/man3/X509_ATTRIBUTE.html", "doc/html/man3/X509_CRL_get0_by_serial.html", "doc/html/man3/X509_EXTENSION_set_object.html", "doc/html/man3/X509_LOOKUP.html", @@ -16923,8 +16811,6 @@ our %unified_info = ( "doc/html/man3/X509_NAME_get_index_by_NID.html", "doc/html/man3/X509_NAME_print_ex.html", "doc/html/man3/X509_PUBKEY_new.html", - "doc/html/man3/X509_REQ_get_attr.html", - "doc/html/man3/X509_REQ_get_extensions.html", "doc/html/man3/X509_SIG_get0.html", "doc/html/man3/X509_STORE_CTX_get_error.html", "doc/html/man3/X509_STORE_CTX_new.html", @@ -18222,10 +18108,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/asn1_stable_parse_test" => [ - "include", - "apps/include" - ], "test/asn1_string_table_test" => [ "include", "apps/include" @@ -18433,9 +18315,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -18695,9 +18574,7 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "include", - "apps/include", - "providers/common/include", - "providers/implementations/include" + "apps/include" ], "test/evp_extra_test2" => [ "include", @@ -18954,10 +18831,6 @@ our %unified_info = ( "include", "apps/include" ], - "test/p_minimal" => [ - "include", - "." - ], "test/p_test" => [ "include", "." @@ -19447,7 +19320,6 @@ our %unified_info = ( "doc/man/man3/CMS_get1_ReceiptRequest.3", "doc/man/man3/CMS_sign.3", "doc/man/man3/CMS_sign_receipt.3", - "doc/man/man3/CMS_signed_get_attr.3", "doc/man/man3/CMS_uncompress.3", "doc/man/man3/CMS_verify.3", "doc/man/man3/CMS_verify_receipt.3", @@ -19547,7 +19419,6 @@ our %unified_info = ( "doc/man/man3/EVP_PKEY_encapsulate.3", "doc/man/man3/EVP_PKEY_encrypt.3", "doc/man/man3/EVP_PKEY_fromdata.3", - "doc/man/man3/EVP_PKEY_get_attr.3", "doc/man/man3/EVP_PKEY_get_default_digest_nid.3", "doc/man/man3/EVP_PKEY_get_field_type.3", "doc/man/man3/EVP_PKEY_get_group_name.3", @@ -19804,7 +19675,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -19903,7 +19773,6 @@ our %unified_info = ( "doc/man/man3/X509V3_get_d2i.3", "doc/man/man3/X509V3_set_ctx.3", "doc/man/man3/X509_ALGOR_dup.3", - "doc/man/man3/X509_ATTRIBUTE.3", "doc/man/man3/X509_CRL_get0_by_serial.3", "doc/man/man3/X509_EXTENSION_set_object.3", "doc/man/man3/X509_LOOKUP.3", @@ -19915,8 +19784,6 @@ our %unified_info = ( "doc/man/man3/X509_NAME_get_index_by_NID.3", "doc/man/man3/X509_NAME_print_ex.3", "doc/man/man3/X509_PUBKEY_new.3", - "doc/man/man3/X509_REQ_get_attr.3", - "doc/man/man3/X509_REQ_get_extensions.3", "doc/man/man3/X509_SIG_get0.3", "doc/man/man3/X509_STORE_CTX_get_error.3", "doc/man/man3/X509_STORE_CTX_new.3", @@ -20100,7 +19967,6 @@ our %unified_info = ( "modules" => [ "providers/fips", "providers/legacy", - "test/p_minimal", "test/p_test" ], "programs" => [ @@ -20126,7 +19992,6 @@ our %unified_info = ( "test/asn1_dsa_internal_test", "test/asn1_encode_test", "test/asn1_internal_test", - "test/asn1_stable_parse_test", "test/asn1_string_table_test", "test/asn1_time_test", "test/asynciotest", @@ -20190,7 +20055,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24315,7 +24179,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24342,7 +24205,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -24444,9 +24306,6 @@ our %unified_info = ( "providers/common/libfips-lib-securitycheck_fips.o" => [ "providers/common/securitycheck_fips.c" ], - "providers/evp_extra_test-bin-legacyprov.o" => [ - "providers/legacyprov.c" - ], "providers/fips" => [ "providers/fips.ld", "providers/fips/fips-dso-fips_entry.o" @@ -25583,9 +25442,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25667,9 +25523,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25727,12 +25580,6 @@ our %unified_info = ( "test/asn1_internal_test-bin-asn1_internal_test.o" => [ "test/asn1_internal_test.c" ], - "test/asn1_stable_parse_test" => [ - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" - ], - "test/asn1_stable_parse_test-bin-asn1_stable_parse_test.o" => [ - "test/asn1_stable_parse_test.c" - ], "test/asn1_string_table_test" => [ "test/asn1_string_table_test-bin-asn1_string_table_test.o" ], @@ -26112,12 +25959,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -26516,7 +26357,6 @@ our %unified_info = ( "test/errtest.c" ], "test/evp_extra_test" => [ - "providers/evp_extra_test-bin-legacyprov.o", "test/evp_extra_test-bin-evp_extra_test.o" ], "test/evp_extra_test-bin-evp_extra_test.o" => [ @@ -26807,13 +26647,6 @@ our %unified_info = ( "test/ossl_store_test-bin-ossl_store_test.o" => [ "test/ossl_store_test.c" ], - "test/p_minimal" => [ - "test/p_minimal-dso-p_minimal.o", - "test/p_minimal.ld" - ], - "test/p_minimal-dso-p_minimal.o" => [ - "test/p_minimal.c" - ], "test/p_test" => [ "test/p_test-dso-p_test.o", "test/p_test.ld" @@ -27503,8 +27336,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27531,7 +27364,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27548,8 +27381,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/util/perl'; +use lib '/home/chen/workspace/openharmony/master/third_party/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/crypto/buildinf.h index bcc7cb428..4f83e6e61 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: solaris64-x86_64-gcc" -#define DATE "built on: Wed Jan 31 13:06:57 2024 UTC" +#define DATE "built on: Tue Aug 6 12:29:17 2024 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/openssl/bio.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/openssl/bio.h index f9aa74731..e16cf622c 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/openssl/bio.h @@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, - int (*ossl_gets) (BIO *, char *, int)); + int (*gets) (BIO *, char *, int)); long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/openssl/opensslv.h index 65f3bfa05..5bb97d596 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 13 +# define OPENSSL_VERSION_PATCH 9 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.13" -# define OPENSSL_FULL_VERSION_STR "3.0.13+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "30 Jan 2024" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13+quic 30 Jan 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/openssl/pkcs7.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/openssl/pkcs7.h index 0ce79bf4f..557a0a726 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/openssl/pkcs7.h +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/openssl/pkcs7.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/pkcs7.h.in * - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -56,8 +56,8 @@ typedef struct pkcs7_signer_info_st { PKCS7_ISSUER_AND_SERIAL *issuer_and_serial; X509_ALGOR *digest_alg; STACK_OF(X509_ATTRIBUTE) *auth_attr; /* [ 0 ] */ - X509_ALGOR *digest_enc_alg; /* confusing name, actually used for signing */ - ASN1_OCTET_STRING *enc_digest; /* confusing name, actually signature */ + X509_ALGOR *digest_enc_alg; + ASN1_OCTET_STRING *enc_digest; STACK_OF(X509_ATTRIBUTE) *unauth_attr; /* [ 1 ] */ /* The private key to sign with */ EVP_PKEY *pkey; diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/openssl/ssl.h index 0f1915755..3df725c56 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/openssl.gypi b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/openssl.gypi index 18879acfa..44ff54ede 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cbc.c', 'openssl/crypto/aes/aes_cfb.c', diff --git a/deps/openssl/config/generate_gypi.pl b/deps/openssl/config/generate_gypi.pl index be7d357f6..679e87293 100755 --- a/deps/openssl/config/generate_gypi.pl +++ b/deps/openssl/config/generate_gypi.pl @@ -363,7 +363,7 @@ close(CLGYPI); # Clean Up my $cmd2 ="cd $src_dir; make -f $makefile clean; make -f $makefile distclean;" . - "git clean -f $src_dir/crypto"; + "git clean -f crypto"; system($cmd2) == 0 or die "Error in system($cmd2)"; diff --git a/deps/openssl/openssl/BUILD.gn b/deps/openssl/openssl/BUILD.gn new file mode 100644 index 000000000..7f1da2aff --- /dev/null +++ b/deps/openssl/openssl/BUILD.gn @@ -0,0 +1,1910 @@ +# Copyright (c) 2020-2022 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import("//build/config/config.gni") +import("//build/ohos.gni") + +print("openssl detecting os now...") +print("current_cpu = ${current_cpu}") +print("current_os = ${current_os}") +print("host_os = ${host_os}") +openssl_selected_platform = "" +print("is_mingw = ${is_mingw}") +if (current_cpu == "arm" && !(current_os == "linux" || host_os == "mac")) { + print("openssl selected linux-armv4") + openssl_selected_platform = "linux-armv4" +} else if (current_cpu == "arm64" && + (!(current_os == "linux" || host_os == "mac") || + current_os == "ohos")) { + print("openssl selected linux-aarch64") + openssl_selected_platform = "linux-aarch64" +} else if ((current_cpu == "x64" || current_cpu == "x86_64") && + (current_os == "mac" || current_os == "ios")) { + # compilation for ios depends the platform + print("openssl selected darwin64-x86_64-cc") + openssl_selected_platform = "darwin64-x86_64-cc" +} else if (current_cpu == "arm64" && + (current_os == "mac" || current_os == "ios")) { + # ios and macos both use the platform + print("openssl selected darwin64-arm64-cc") + openssl_selected_platform = "darwin64-arm64-cc" +} else if ((current_cpu == "x64" || current_cpu == "x86_64") && + current_os != "mingw") { + print("openssl selected linux-x86_64") + openssl_selected_platform = "linux-x86_64" +} else if (is_mingw) { + print("openssl selected mingw64") + openssl_selected_platform = "mingw64" +} else if (current_cpu == "arm" && current_os == "android") { + print("openssl selected linux-armv4") + openssl_selected_platform = "linux-armv4" +} else if (current_cpu == "arm64" && current_os == "android") { + print("openssl selected linux-aarch64") + openssl_selected_platform = "linux-aarch64" +} +print( + "openssl detecting os done. openssl_selected_platform = ${openssl_selected_platform}") + +openssl_selected_platform_full_path = + "${target_out_dir}/build_all_generated/${openssl_selected_platform}" + +# å‡çº§ä¿®æ”¹é€‚é…检查点1 libcrypto ä¸åŒå¹³å°æ±‡ç¼–ä»£ç  +libcrypto_build_all_generated_linux_armv4_sources = [ + "${openssl_selected_platform_full_path}/crypto/aes/aes-armv4.S", + "${openssl_selected_platform_full_path}/crypto/aes/aesv8-armx.S", + "${openssl_selected_platform_full_path}/crypto/aes/bsaes-armv7.S", + "${openssl_selected_platform_full_path}/crypto/armv4cpuid.S", + "${openssl_selected_platform_full_path}/crypto/bn/armv4-gf2m.S", + "${openssl_selected_platform_full_path}/crypto/bn/armv4-mont.S", + "${openssl_selected_platform_full_path}/crypto/chacha/chacha-armv4.S", + "${openssl_selected_platform_full_path}/crypto/ec/ecp_nistz256-armv4.S", + "${openssl_selected_platform_full_path}/crypto/modes/ghash-armv4.S", + "${openssl_selected_platform_full_path}/crypto/modes/ghashv8-armx.S", + "${openssl_selected_platform_full_path}/crypto/poly1305/poly1305-armv4.S", + "${openssl_selected_platform_full_path}/crypto/sha/keccak1600-armv4.S", + "${openssl_selected_platform_full_path}/crypto/sha/sha1-armv4-large.S", + "${openssl_selected_platform_full_path}/crypto/sha/sha256-armv4.S", + "${openssl_selected_platform_full_path}/crypto/sha/sha512-armv4.S", +] + +# å‡çº§ä¿®æ”¹é€‚é…检查点2 libcrypto ä¸åŒå¹³å°æ±‡ç¼–ä»£ç  +libcrypto_build_all_generated_linux_aarch64_sources = [ + "${openssl_selected_platform_full_path}/crypto/aes/aesv8-armx.S", + "${openssl_selected_platform_full_path}/crypto/aes/vpaes-armv8.S", + "${openssl_selected_platform_full_path}/crypto/arm64cpuid.S", + "${openssl_selected_platform_full_path}/crypto/bn/armv8-mont.S", + "${openssl_selected_platform_full_path}/crypto/chacha/chacha-armv8.S", + "${openssl_selected_platform_full_path}/crypto/ec/ecp_nistz256-armv8.S", + "${openssl_selected_platform_full_path}/crypto/modes/aes-gcm-armv8_64.S", + "${openssl_selected_platform_full_path}/crypto/modes/ghashv8-armx.S", + "${openssl_selected_platform_full_path}/crypto/poly1305/poly1305-armv8.S", + "${openssl_selected_platform_full_path}/crypto/sha/keccak1600-armv8.S", + "${openssl_selected_platform_full_path}/crypto/sha/sha1-armv8.S", + "${openssl_selected_platform_full_path}/crypto/sha/sha256-armv8.S", + "${openssl_selected_platform_full_path}/crypto/sha/sha512-armv8.S", +] + +# å‡çº§ä¿®æ”¹é€‚é…检查点3 libcrypto ä¸åŒå¹³å°æ±‡ç¼–ä»£ç  +libcrypto_build_all_generated_darwin64_x86_64_cc_sources = [ + "${openssl_selected_platform_full_path}/crypto/aes/aes-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/aes/aesni-mb-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/aes/aesni-sha1-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/aes/aesni-sha256-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/aes/aesni-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/aes/bsaes-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/aes/vpaes-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/bn/rsaz-avx2.s", + "${openssl_selected_platform_full_path}/crypto/bn/rsaz-avx512.s", + "${openssl_selected_platform_full_path}/crypto/bn/rsaz-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/bn/x86_64-gf2m.s", + "${openssl_selected_platform_full_path}/crypto/bn/x86_64-mont.s", + "${openssl_selected_platform_full_path}/crypto/bn/x86_64-mont5.s", + "${openssl_selected_platform_full_path}/crypto/camellia/cmll-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/chacha/chacha-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/ec/ecp_nistz256-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/ec/x25519-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/md5/md5-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/modes/aesni-gcm-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/modes/ghash-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/poly1305/poly1305-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/rc4/rc4-md5-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/rc4/rc4-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/sha/keccak1600-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/sha/sha1-mb-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/sha/sha1-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/sha/sha256-mb-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/sha/sha256-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/sha/sha512-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/whrlpool/wp-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/x86_64cpuid.s", + "${openssl_selected_platform_full_path}/engines/e_padlock-x86_64.s", +] + +# å‡çº§ä¿®æ”¹é€‚é…检查点4 libcrypto ä¸åŒå¹³å°æ±‡ç¼–ä»£ç  +libcrypto_build_all_generated_darwin64_arm64_cc_sources = [ + "${openssl_selected_platform_full_path}/crypto/aes/aesv8-armx.S", + "${openssl_selected_platform_full_path}/crypto/aes/vpaes-armv8.S", + "${openssl_selected_platform_full_path}/crypto/arm64cpuid.S", + "${openssl_selected_platform_full_path}/crypto/bn/armv8-mont.S", + "${openssl_selected_platform_full_path}/crypto/chacha/chacha-armv8.S", + "${openssl_selected_platform_full_path}/crypto/ec/ecp_nistz256-armv8.S", + "${openssl_selected_platform_full_path}/crypto/modes/aes-gcm-armv8_64.S", + "${openssl_selected_platform_full_path}/crypto/modes/ghashv8-armx.S", + "${openssl_selected_platform_full_path}/crypto/poly1305/poly1305-armv8.S", + "${openssl_selected_platform_full_path}/crypto/sha/keccak1600-armv8.S", + "${openssl_selected_platform_full_path}/crypto/sha/sha1-armv8.S", + "${openssl_selected_platform_full_path}/crypto/sha/sha256-armv8.S", + "${openssl_selected_platform_full_path}/crypto/sha/sha512-armv8.S", +] + +# å‡çº§ä¿®æ”¹é€‚é…检查点5 libcrypto ä¸åŒå¹³å°æ±‡ç¼–ä»£ç  +libcrypto_build_all_generated_linux_x86_64_sources = [ + "${openssl_selected_platform_full_path}/crypto/aes/aes-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/aes/aesni-mb-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/aes/aesni-sha1-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/aes/aesni-sha256-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/aes/aesni-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/aes/bsaes-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/aes/vpaes-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/bn/rsaz-avx2.s", + "${openssl_selected_platform_full_path}/crypto/bn/rsaz-avx512.s", + "${openssl_selected_platform_full_path}/crypto/bn/rsaz-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/bn/x86_64-gf2m.s", + "${openssl_selected_platform_full_path}/crypto/bn/x86_64-mont.s", + "${openssl_selected_platform_full_path}/crypto/bn/x86_64-mont5.s", + "${openssl_selected_platform_full_path}/crypto/camellia/cmll-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/chacha/chacha-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/ec/ecp_nistz256-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/ec/x25519-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/md5/md5-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/modes/aesni-gcm-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/modes/ghash-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/poly1305/poly1305-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/rc4/rc4-md5-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/rc4/rc4-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/sha/keccak1600-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/sha/sha1-mb-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/sha/sha1-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/sha/sha256-mb-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/sha/sha256-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/sha/sha512-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/whrlpool/wp-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/x86_64cpuid.s", + "${openssl_selected_platform_full_path}/engines/e_padlock-x86_64.s", +] + +# å‡çº§ä¿®æ”¹é€‚é…检查点6 libcrypto ä¸åŒå¹³å°æ±‡ç¼–ä»£ç  +libcrypto_build_all_generated_mingw64_sources = [ + "${openssl_selected_platform_full_path}/crypto/aes/aes-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/aes/aesni-mb-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/aes/aesni-sha1-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/aes/aesni-sha256-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/aes/aesni-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/aes/bsaes-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/aes/vpaes-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/bn/rsaz-avx2.s", + "${openssl_selected_platform_full_path}/crypto/bn/rsaz-avx512.s", + "${openssl_selected_platform_full_path}/crypto/bn/rsaz-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/bn/x86_64-gf2m.s", + "${openssl_selected_platform_full_path}/crypto/bn/x86_64-mont.s", + "${openssl_selected_platform_full_path}/crypto/bn/x86_64-mont5.s", + "${openssl_selected_platform_full_path}/crypto/camellia/cmll-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/chacha/chacha-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/ec/ecp_nistz256-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/ec/x25519-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/md5/md5-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/modes/aesni-gcm-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/modes/ghash-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/poly1305/poly1305-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/rc4/rc4-md5-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/rc4/rc4-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/sha/keccak1600-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/sha/sha1-mb-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/sha/sha1-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/sha/sha256-mb-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/sha/sha256-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/sha/sha512-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/whrlpool/wp-x86_64.s", + "${openssl_selected_platform_full_path}/crypto/x86_64cpuid.s", + "${openssl_selected_platform_full_path}/engines/e_padlock-x86_64.s", +] + +libcrypto_build_all_generated_selected_platform_sources = [] +if (openssl_selected_platform == "linux-armv4") { + libcrypto_build_all_generated_selected_platform_sources += + libcrypto_build_all_generated_linux_armv4_sources +} else if (openssl_selected_platform == "linux-aarch64") { + libcrypto_build_all_generated_selected_platform_sources += + libcrypto_build_all_generated_linux_aarch64_sources +} else if (openssl_selected_platform == "darwin64-x86_64-cc") { + libcrypto_build_all_generated_selected_platform_sources += + libcrypto_build_all_generated_darwin64_x86_64_cc_sources +} else if (openssl_selected_platform == "darwin64-arm64-cc") { + libcrypto_build_all_generated_selected_platform_sources += + libcrypto_build_all_generated_darwin64_arm64_cc_sources +} else if (openssl_selected_platform == "linux-x86_64") { + libcrypto_build_all_generated_selected_platform_sources += + libcrypto_build_all_generated_linux_x86_64_sources +} else if (openssl_selected_platform == "mingw64") { + libcrypto_build_all_generated_selected_platform_sources += + libcrypto_build_all_generated_mingw64_sources +} + +# å‡çº§ä¿®æ”¹é€‚é…检查点7 libcommon 生æˆçš„æºç åˆ—表 +libcommon_build_all_generated_selected_platform_sources = [ + "${openssl_selected_platform_full_path}/providers/common/der/der_digests_gen.c", + "${openssl_selected_platform_full_path}/providers/common/der/der_dsa_gen.c", + "${openssl_selected_platform_full_path}/providers/common/der/der_ec_gen.c", + "${openssl_selected_platform_full_path}/providers/common/der/der_ecx_gen.c", + "${openssl_selected_platform_full_path}/providers/common/der/der_rsa_gen.c", + "${openssl_selected_platform_full_path}/providers/common/der/der_wrap_gen.c", +] + +# å‡çº§ä¿®æ”¹é€‚é…检查点8 libdefault 生æˆçš„æºç åˆ—表 +libdefault_build_all_generated_selected_platform_sources = [ + "${openssl_selected_platform_full_path}/providers/common/der/der_sm2_gen.c", +] + +# We make use of both exec_script and action to build openssl build_all_generated items. +# +# Some modules use openssl in an incorrect way, leading to the confusing building sequences, +# so the user modules building fail because openssl headers have not been generated at the building time. +# The exec_script in the global area will be executed before ninja command, +# and it ensures that the headers is generated properly before the building of any modules. +# +# Openssl generate some assembly codes before it is building. +# The sources list in BUILD.gn include the assembly codes. +# The gn build system requires that all items in sources list should be the output of another build item. +# So we use an empty action to generate the assembly codes. +# Actually we generate the assembly codes in exec_script, not in action. +# +# The gn build system requires the script in exec_script and action should be python script, +# so we invoke the shell script in python script +print(exec_script( + rebase_path("//third_party/openssl/run_command.py"), + [ + rebase_path( + "//third_party/openssl/make_openssl_build_all_generated.sh"), + rebase_path("//third_party/openssl"), + rebase_path("${target_out_dir}/build_all_generated"), + openssl_selected_platform, + ], + "string", + [])) +action("openssl_build_all_generated") { + script = rebase_path("//third_party/openssl/empty.py") + outputs = [] + outputs += libcommon_build_all_generated_selected_platform_sources + outputs += libdefault_build_all_generated_selected_platform_sources + outputs += libcrypto_build_all_generated_selected_platform_sources + outputs += [ "${openssl_selected_platform_full_path}/apps/progs.c" ] + if (openssl_selected_platform == "mingw64") { + outputs += [ "${openssl_selected_platform_full_path}/apps/openssl.rc" ] + } +} + +openssl_internal_cflags = [ + "-Wall", + + # ../../third_party/openssl/crypto/o_str.c:309:9: error: incompatible integer to pointer conversion assigning to 'char *' from 'int' [-Werror,-Wint-conversion] + # err = strerror_r(errnum, buf, buflen); + # ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + "-Wno-error=int-conversion", + + # ../../third_party/openssl/crypto/bn/bn_conv.c:92:34: error: implicit conversion from 'unsigned long long' to 'unsigned long' changes value from 10000000000000000000 to 2313682944 [-Werror,-Wconstant-conversion] + # *lp = BN_div_word(t, BN_DEC_CONV); + # ~~~~~~~~~~~ ^~~~~~~~~~~ + "-Wno-error=constant-conversion", + + # ../../third_party/openssl/crypto/bn/bn_exp.c:382:38: error: shift count >= width of type [-Werror,-Wshift-count-overflow] + # if (m->d[j - 1] & (((BN_ULONG)1) << (BN_BITS2 - 1))) { + # ^ ~~~~~~~~~~~~~~ + "-Wno-error=shift-count-overflow", + + # ../../third_party/openssl/crypto/conf/conf_def.c:31:11: error: 'stat' macro redefined [-Werror,-Wmacro-redefined] + # # define stat _stat + # ^ + # ../../prebuilts/mingw-w64/ohos/linux-x86_64/clang-mingw/x86_64-w64-mingw32/include/sys/stat.h:279:9: note: previous definition is here + # #define stat _stat64 + # ^ + # 1 error generated. + "-Wno-error=macro-redefined", + + "-Wno-error=implicit-fallthrough", + "-Wno-error=sign-compare", + + # Fix llvm-15 build error + "-Wno-unused-but-set-variable", +] + +# å‡çº§ä¿®æ”¹é€‚é…检查点9 内部公共头文件目录列表 +crypto_config_common_private_include_dirs = [ + # -I args from Makefile + ".", + "crypto", + "include", + "providers/common/include", + "providers/implementations/include", + + # internal include dirs + "apps/include", + "crypto/bn", + "crypto/ec", + "crypto/ec/curve448", + "crypto/modes", + "crypto/rsa", + "providers/common/include/prov", + + "${openssl_selected_platform_full_path}/apps", + "${openssl_selected_platform_full_path}/crypto", + "${openssl_selected_platform_full_path}/include", + "${openssl_selected_platform_full_path}/include/crypto", + "${openssl_selected_platform_full_path}/include/openssl", + "${openssl_selected_platform_full_path}/providers/common/include", + "${openssl_selected_platform_full_path}/providers/common/include/prov", +] +crypto_config_common_public_include_dirs = [ + "include", + "${openssl_selected_platform_full_path}/include", +] + +# located at /system/etc/ +ohos_prebuilt_etc("openssl.cnf") { + source = "open_harmony_openssl_config/openssl.cnf" + subsystem_name = "thirdparty" + part_name = "openssl" +} + +# å‡çº§ä¿®æ”¹é€‚é…检查点10 内部公共编译选项å®åˆ—表 +crypto_config_common_cflags = [ + "-Wa,--noexecstack", + "-DNDEBUG", + "-DOPENSSL_BUILDING_OPENSSL", + "-DOPENSSL_CPUID_OBJ", + "-DOPENSSL_PIC", + + # use `openssl version -a` cmd to see runtime OPENSSLDIR, ENGINESDIR, MODULESDIR value + + # the origin value generated by Configure + # linux-armv4, linux-aarch64, darwin64-x86_64-cc, darwin64-arm64-cc + # /usr/local/lib/engines-3 + # linux-x86_64, mingw64 + # /usr/local/lib64/engines-3 + "-DENGINESDIR=\"\"", + + # the origin value generated by Configure + # linux-armv4, linux-aarch64, darwin64-x86_64-cc, darwin64-arm64-cc + # /usr/local/lib/ossl-modules + # linux-x86_64, mingw64 + # /usr/local/lib64/ossl-modules + "-DMODULESDIR=\"\"", + + # the origin value generated by Configure + # /usr/local/ssl + # we set the variable as the following to locate openssl.cnf + "-DOPENSSLDIR=\"/system/etc\"", + + "-DSTATIC_LEGACY", +] + +# å‡çº§ä¿®æ”¹é€‚é…检查点11 内部ä¸åŒå¹³å°ç¼–译选项列表 +crypto_config_linux_armv4_cflags = [ + "-DOPENSSL_USE_NODELETE", + "-fPIC", + "-pthread", + + "-DAES_ASM", + "-DBSAES_ASM", + "-DECP_NISTZ256_ASM", + "-DGHASH_ASM", + "-DKECCAK1600_ASM", + "-DOPENSSL_BN_ASM_GF2m", + "-DOPENSSL_BN_ASM_MONT", + "-DPOLY1305_ASM", + "-DSHA1_ASM", + "-DSHA256_ASM", + "-DSHA512_ASM", +] + +# å‡çº§ä¿®æ”¹é€‚é…检查点12 内部ä¸åŒå¹³å°ç¼–译选项列表 +crypto_config_linux_aarch64_cflags = [ + "-DOPENSSL_USE_NODELETE", + "-fPIC", + "-pthread", + + "-DECP_NISTZ256_ASM", + "-DKECCAK1600_ASM", + "-DOPENSSL_BN_ASM_MONT", + "-DPOLY1305_ASM", + "-DSHA1_ASM", + "-DSHA256_ASM", + "-DSHA512_ASM", + "-DVPAES_ASM", +] + +# å‡çº§ä¿®æ”¹é€‚é…检查点13 内部ä¸åŒå¹³å°ç¼–译选项列表 +crypto_config_darwin64_x86_64_cc_cflags = [ + "-fPIC", + "-DL_ENDIAN", + "-D_REENTRANT", + "-DOPENSSL_IA32_SSE2", + + "-DAES_ASM", + "-DBSAES_ASM", + "-DCMLL_ASM", + "-DECP_NISTZ256_ASM", + "-DGHASH_ASM", + "-DKECCAK1600_ASM", + "-DMD5_ASM", + "-DOPENSSL_BN_ASM_GF2m", + "-DOPENSSL_BN_ASM_MONT", + "-DOPENSSL_BN_ASM_MONT5", + "-DPADLOCK_ASM", + "-DPOLY1305_ASM", + "-DSHA1_ASM", + "-DSHA256_ASM", + "-DSHA512_ASM", + "-DVPAES_ASM", + "-DWHIRLPOOL_ASM", + "-DX25519_ASM", +] + +# å‡çº§ä¿®æ”¹é€‚é…检查点14 内部ä¸åŒå¹³å°ç¼–译选项列表 +crypto_config_darwin64_arm64_cc_cflags = [ + "-DL_ENDIAN", + "-D_REENTRANT", + "-fPIC", + + "-DECP_NISTZ256_ASM", + "-DKECCAK1600_ASM", + "-DOPENSSL_BN_ASM_MONT", + "-DPOLY1305_ASM", + "-DSHA1_ASM", + "-DSHA256_ASM", + "-DSHA512_ASM", + "-DVPAES_ASM", +] + +# å‡çº§ä¿®æ”¹é€‚é…检查点15 内部ä¸åŒå¹³å°ç¼–译选项列表 +crypto_config_linux_x86_64_cflags = [ + "-DL_ENDIAN", + "-DOPENSSL_IA32_SSE2", + "-DOPENSSL_USE_NODELETE", + "-fPIC", + "-m64", + "-pthread", + + "-DAES_ASM", + "-DBSAES_ASM", + "-DCMLL_ASM", + "-DECP_NISTZ256_ASM", + "-DGHASH_ASM", + "-DKECCAK1600_ASM", + "-DMD5_ASM", + "-DOPENSSL_BN_ASM_GF2m", + "-DOPENSSL_BN_ASM_MONT", + "-DOPENSSL_BN_ASM_MONT5", + "-DPADLOCK_ASM", + "-DPOLY1305_ASM", + "-DSHA1_ASM", + "-DSHA256_ASM", + "-DSHA512_ASM", + "-DVPAES_ASM", + "-DWHIRLPOOL_ASM", + "-DX25519_ASM", +] + +# å‡çº§ä¿®æ”¹é€‚é…检查点16 内部ä¸åŒå¹³å°ç¼–译选项列表 +crypto_config_mingw64_cflags = [ + "-D_MT", + "-D_UNICODE", + "-DL_ENDIAN", + "-DOPENSSL_IA32_SSE2", + "-DUNICODE", + "-DWIN32_LEAN_AND_MEAN", + "-m64", + + "-DAES_ASM", + "-DBSAES_ASM", + "-DCMLL_ASM", + "-DECP_NISTZ256_ASM", + "-DGHASH_ASM", + "-DKECCAK1600_ASM", + "-DMD5_ASM", + "-DOPENSSL_BN_ASM_GF2m", + "-DOPENSSL_BN_ASM_MONT", + "-DOPENSSL_BN_ASM_MONT5", + "-DPADLOCK_ASM", + "-DPOLY1305_ASM", + "-DSHA1_ASM", + "-DSHA256_ASM", + "-DSHA512_ASM", + "-DVPAES_ASM", + "-DWHIRLPOOL_ASM", + "-DX25519_ASM", +] + +crypto_config_current_platform_cflags = [] +if (openssl_selected_platform == "linux-armv4") { + crypto_config_current_platform_cflags += crypto_config_linux_armv4_cflags +} else if (openssl_selected_platform == "linux-aarch64") { + crypto_config_current_platform_cflags += crypto_config_linux_aarch64_cflags +} else if (openssl_selected_platform == "darwin64-x86_64-cc") { + crypto_config_current_platform_cflags += + crypto_config_darwin64_x86_64_cc_cflags +} else if (openssl_selected_platform == "darwin64-arm64-cc") { + crypto_config_current_platform_cflags += + crypto_config_darwin64_arm64_cc_cflags +} else if (openssl_selected_platform == "linux-x86_64") { + crypto_config_current_platform_cflags += crypto_config_linux_x86_64_cflags +} else if (openssl_selected_platform == "mingw64") { + crypto_config_current_platform_cflags += crypto_config_mingw64_cflags +} + +mingw32_libs_path = [] +mingw32_libs = [] +if (is_mingw || is_win) { + mingw32_libs_path += [ "//prebuilts/mingw-w64/ohos/linux-x86_64/clang-mingw/x86_64-w64-mingw32/lib" ] + mingw32_libs += [ + "ws2_32", + "crypt32", + ] +} + +config("crypto_config_private") { + include_dirs = crypto_config_common_private_include_dirs + cflags = crypto_config_common_cflags + crypto_config_current_platform_cflags + + openssl_internal_cflags + lib_dirs = mingw32_libs_path + libs = mingw32_libs +} + +config("crypto_config_public") { + include_dirs = crypto_config_common_public_include_dirs + libs = mingw32_libs +} + +# å‡çº§ä¿®æ”¹é€‚é…检查点17 libcommon 原目录æºç åˆ—表 +libcommon_common_sources = [ + "providers/common/der/der_dsa_key.c", + "providers/common/der/der_dsa_sig.c", + "providers/common/der/der_ec_key.c", + "providers/common/der/der_ec_sig.c", + "providers/common/der/der_ecx_key.c", + "providers/common/der/der_rsa_key.c", + "providers/common/provider_ctx.c", + "providers/common/provider_err.c", + "providers/implementations/ciphers/ciphercommon.c", + "providers/implementations/ciphers/ciphercommon_block.c", + "providers/implementations/ciphers/ciphercommon_ccm.c", + "providers/implementations/ciphers/ciphercommon_ccm_hw.c", + "providers/implementations/ciphers/ciphercommon_gcm.c", + "providers/implementations/ciphers/ciphercommon_gcm_hw.c", + "providers/implementations/ciphers/ciphercommon_hw.c", + "providers/implementations/digests/digestcommon.c", + "ssl/record/tls_pad.c", +] + +# å‡çº§ä¿®æ”¹é€‚é…检查点18 libdefault 原目录æºç åˆ—表 +libdefault_common_sources = [ + "providers/common/bio_prov.c", + "providers/common/capabilities.c", + "providers/common/der/der_rsa_sig.c", + "providers/common/der/der_sm2_key.c", + "providers/common/der/der_sm2_sig.c", + "providers/common/digest_to_nid.c", + "providers/common/provider_seeding.c", + "providers/common/provider_util.c", + "providers/common/securitycheck.c", + "providers/common/securitycheck_default.c", + "providers/implementations/asymciphers/rsa_enc.c", + "providers/implementations/asymciphers/sm2_enc.c", + "providers/implementations/ciphers/cipher_aes.c", + "providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.c", + "providers/implementations/ciphers/cipher_aes_cbc_hmac_sha1_hw.c", + "providers/implementations/ciphers/cipher_aes_cbc_hmac_sha256_hw.c", + "providers/implementations/ciphers/cipher_aes_ccm.c", + "providers/implementations/ciphers/cipher_aes_ccm_hw.c", + "providers/implementations/ciphers/cipher_aes_gcm.c", + "providers/implementations/ciphers/cipher_aes_gcm_hw.c", + "providers/implementations/ciphers/cipher_aes_hw.c", + "providers/implementations/ciphers/cipher_aes_ocb.c", + "providers/implementations/ciphers/cipher_aes_ocb_hw.c", + "providers/implementations/ciphers/cipher_aes_siv.c", + "providers/implementations/ciphers/cipher_aes_siv_hw.c", + "providers/implementations/ciphers/cipher_aes_wrp.c", + "providers/implementations/ciphers/cipher_aes_xts.c", + "providers/implementations/ciphers/cipher_aes_xts_fips.c", + "providers/implementations/ciphers/cipher_aes_xts_hw.c", + "providers/implementations/ciphers/cipher_aria.c", + "providers/implementations/ciphers/cipher_aria_ccm.c", + "providers/implementations/ciphers/cipher_aria_ccm_hw.c", + "providers/implementations/ciphers/cipher_aria_gcm.c", + "providers/implementations/ciphers/cipher_aria_gcm_hw.c", + "providers/implementations/ciphers/cipher_aria_hw.c", + "providers/implementations/ciphers/cipher_camellia.c", + "providers/implementations/ciphers/cipher_camellia_hw.c", + "providers/implementations/ciphers/cipher_chacha20.c", + "providers/implementations/ciphers/cipher_chacha20_hw.c", + "providers/implementations/ciphers/cipher_chacha20_poly1305.c", + "providers/implementations/ciphers/cipher_chacha20_poly1305_hw.c", + "providers/implementations/ciphers/cipher_cts.c", + "providers/implementations/ciphers/cipher_null.c", + "providers/implementations/ciphers/cipher_sm4.c", + "providers/implementations/ciphers/cipher_sm4_hw.c", + "providers/implementations/ciphers/cipher_tdes.c", + "providers/implementations/ciphers/cipher_tdes_common.c", + "providers/implementations/ciphers/cipher_tdes_default.c", + "providers/implementations/ciphers/cipher_tdes_default_hw.c", + "providers/implementations/ciphers/cipher_tdes_hw.c", + "providers/implementations/ciphers/cipher_tdes_wrap.c", + "providers/implementations/ciphers/cipher_tdes_wrap_hw.c", + "providers/implementations/digests/blake2_prov.c", + "providers/implementations/digests/blake2b_prov.c", + "providers/implementations/digests/blake2s_prov.c", + "providers/implementations/digests/md5_prov.c", + "providers/implementations/digests/md5_sha1_prov.c", + "providers/implementations/digests/null_prov.c", + "providers/implementations/digests/ripemd_prov.c", + "providers/implementations/digests/sha2_prov.c", + "providers/implementations/digests/sha3_prov.c", + "providers/implementations/digests/sm3_prov.c", + "providers/implementations/encode_decode/decode_der2key.c", + "providers/implementations/encode_decode/decode_epki2pki.c", + "providers/implementations/encode_decode/decode_msblob2key.c", + "providers/implementations/encode_decode/decode_pem2der.c", + "providers/implementations/encode_decode/decode_pvk2key.c", + "providers/implementations/encode_decode/decode_spki2typespki.c", + "providers/implementations/encode_decode/encode_key2any.c", + "providers/implementations/encode_decode/encode_key2blob.c", + "providers/implementations/encode_decode/encode_key2ms.c", + "providers/implementations/encode_decode/encode_key2text.c", + "providers/implementations/encode_decode/endecoder_common.c", + "providers/implementations/exchange/dh_exch.c", + "providers/implementations/exchange/ecdh_exch.c", + "providers/implementations/exchange/ecx_exch.c", + "providers/implementations/exchange/kdf_exch.c", + "providers/implementations/kdfs/hkdf.c", + "providers/implementations/kdfs/kbkdf.c", + "providers/implementations/kdfs/krb5kdf.c", + "providers/implementations/kdfs/pbkdf2.c", + "providers/implementations/kdfs/pbkdf2_fips.c", + "providers/implementations/kdfs/pkcs12kdf.c", + "providers/implementations/kdfs/scrypt.c", + "providers/implementations/kdfs/sshkdf.c", + "providers/implementations/kdfs/sskdf.c", + "providers/implementations/kdfs/tls1_prf.c", + "providers/implementations/kdfs/x942kdf.c", + "providers/implementations/kem/rsa_kem.c", + "providers/implementations/keymgmt/dh_kmgmt.c", + "providers/implementations/keymgmt/dsa_kmgmt.c", + "providers/implementations/keymgmt/ec_kmgmt.c", + "providers/implementations/keymgmt/ecx_kmgmt.c", + "providers/implementations/keymgmt/kdf_legacy_kmgmt.c", + "providers/implementations/keymgmt/mac_legacy_kmgmt.c", + "providers/implementations/keymgmt/rsa_kmgmt.c", + "providers/implementations/macs/blake2b_mac.c", + "providers/implementations/macs/blake2s_mac.c", + "providers/implementations/macs/cmac_prov.c", + "providers/implementations/macs/gmac_prov.c", + "providers/implementations/macs/hmac_prov.c", + "providers/implementations/macs/kmac_prov.c", + "providers/implementations/macs/poly1305_prov.c", + "providers/implementations/macs/siphash_prov.c", + "providers/implementations/rands/crngt.c", + "providers/implementations/rands/drbg.c", + "providers/implementations/rands/drbg_ctr.c", + "providers/implementations/rands/drbg_hash.c", + "providers/implementations/rands/drbg_hmac.c", + "providers/implementations/rands/seed_src.c", + "providers/implementations/rands/seeding/rand_cpu_x86.c", + "providers/implementations/rands/seeding/rand_tsc.c", + "providers/implementations/rands/seeding/rand_unix.c", + "providers/implementations/rands/seeding/rand_win.c", + "providers/implementations/rands/test_rng.c", + "providers/implementations/signature/dsa_sig.c", + "providers/implementations/signature/ecdsa_sig.c", + "providers/implementations/signature/eddsa_sig.c", + "providers/implementations/signature/mac_legacy_sig.c", + "providers/implementations/signature/rsa_sig.c", + "providers/implementations/signature/sm2_sig.c", + "providers/implementations/storemgmt/file_store.c", + "providers/implementations/storemgmt/file_store_any2obj.c", + "ssl/s3_cbc.c", +] + +# å‡çº§ä¿®æ”¹é€‚é…检查点19 liblegacy æºç åˆ—表 +liblegacy_sources = [ + "providers/implementations/ciphers/cipher_blowfish.c", + "providers/implementations/ciphers/cipher_blowfish_hw.c", + "providers/implementations/ciphers/cipher_cast5.c", + "providers/implementations/ciphers/cipher_cast5_hw.c", + "providers/implementations/ciphers/cipher_des.c", + "providers/implementations/ciphers/cipher_des_hw.c", + "providers/implementations/ciphers/cipher_desx.c", + "providers/implementations/ciphers/cipher_desx_hw.c", + "providers/implementations/ciphers/cipher_idea.c", + "providers/implementations/ciphers/cipher_idea_hw.c", + "providers/implementations/ciphers/cipher_rc2.c", + "providers/implementations/ciphers/cipher_rc2_hw.c", + "providers/implementations/ciphers/cipher_rc4.c", + "providers/implementations/ciphers/cipher_rc4_hmac_md5.c", + "providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c", + "providers/implementations/ciphers/cipher_rc4_hw.c", + "providers/implementations/ciphers/cipher_seed.c", + "providers/implementations/ciphers/cipher_seed_hw.c", + "providers/implementations/digests/md4_prov.c", + "providers/implementations/digests/mdc2_prov.c", + "providers/implementations/digests/wp_prov.c", + "providers/implementations/kdfs/pbkdf1.c", +] + +ohos_source_set("crypto_source") { + subsystem_name = "thirdparty" + part_name = "openssl" + + # å‡çº§ä¿®æ”¹é€‚é…检查点20 libcrypto 原目录æºç åˆ—表 + sources = [ + "crypto/aes/aes_cfb.c", + "crypto/aes/aes_ecb.c", + "crypto/aes/aes_ige.c", + "crypto/aes/aes_misc.c", + "crypto/aes/aes_ofb.c", + "crypto/aes/aes_wrap.c", + "crypto/aria/aria.c", + "crypto/asn1/a_bitstr.c", + "crypto/asn1/a_d2i_fp.c", + "crypto/asn1/a_digest.c", + "crypto/asn1/a_dup.c", + "crypto/asn1/a_gentm.c", + "crypto/asn1/a_i2d_fp.c", + "crypto/asn1/a_int.c", + "crypto/asn1/a_mbstr.c", + "crypto/asn1/a_object.c", + "crypto/asn1/a_octet.c", + "crypto/asn1/a_print.c", + "crypto/asn1/a_sign.c", + "crypto/asn1/a_strex.c", + "crypto/asn1/a_strnid.c", + "crypto/asn1/a_time.c", + "crypto/asn1/a_type.c", + "crypto/asn1/a_utctm.c", + "crypto/asn1/a_utf8.c", + "crypto/asn1/a_verify.c", + "crypto/asn1/ameth_lib.c", + "crypto/asn1/asn1_err.c", + "crypto/asn1/asn1_gen.c", + "crypto/asn1/asn1_item_list.c", + "crypto/asn1/asn1_lib.c", + "crypto/asn1/asn1_parse.c", + "crypto/asn1/asn_mime.c", + "crypto/asn1/asn_moid.c", + "crypto/asn1/asn_mstbl.c", + "crypto/asn1/asn_pack.c", + "crypto/asn1/bio_asn1.c", + "crypto/asn1/bio_ndef.c", + "crypto/asn1/d2i_param.c", + "crypto/asn1/d2i_pr.c", + "crypto/asn1/d2i_pu.c", + "crypto/asn1/evp_asn1.c", + "crypto/asn1/f_int.c", + "crypto/asn1/f_string.c", + "crypto/asn1/i2d_evp.c", + "crypto/asn1/n_pkey.c", + "crypto/asn1/nsseq.c", + "crypto/asn1/p5_pbe.c", + "crypto/asn1/p5_pbev2.c", + "crypto/asn1/p5_scrypt.c", + "crypto/asn1/p8_pkey.c", + "crypto/asn1/t_bitst.c", + "crypto/asn1/t_pkey.c", + "crypto/asn1/t_spki.c", + "crypto/asn1/tasn_dec.c", + "crypto/asn1/tasn_enc.c", + "crypto/asn1/tasn_fre.c", + "crypto/asn1/tasn_new.c", + "crypto/asn1/tasn_prn.c", + "crypto/asn1/tasn_scn.c", + "crypto/asn1/tasn_typ.c", + "crypto/asn1/tasn_utl.c", + "crypto/asn1/x_algor.c", + "crypto/asn1/x_bignum.c", + "crypto/asn1/x_info.c", + "crypto/asn1/x_int64.c", + "crypto/asn1/x_long.c", + "crypto/asn1/x_pkey.c", + "crypto/asn1/x_sig.c", + "crypto/asn1/x_spki.c", + "crypto/asn1/x_val.c", + "crypto/asn1_dsa.c", + "crypto/async/arch/async_null.c", + "crypto/async/arch/async_posix.c", + "crypto/async/arch/async_win.c", + "crypto/async/async.c", + "crypto/async/async_err.c", + "crypto/async/async_wait.c", + "crypto/bf/bf_cfb64.c", + "crypto/bf/bf_ecb.c", + "crypto/bf/bf_enc.c", + "crypto/bf/bf_ofb64.c", + "crypto/bf/bf_skey.c", + "crypto/bio/bf_buff.c", + "crypto/bio/bf_lbuf.c", + "crypto/bio/bf_nbio.c", + "crypto/bio/bf_null.c", + "crypto/bio/bf_prefix.c", + "crypto/bio/bf_readbuff.c", + "crypto/bio/bio_addr.c", + "crypto/bio/bio_cb.c", + "crypto/bio/bio_dump.c", + "crypto/bio/bio_err.c", + "crypto/bio/bio_lib.c", + "crypto/bio/bio_meth.c", + "crypto/bio/bio_print.c", + "crypto/bio/bio_sock.c", + "crypto/bio/bio_sock2.c", + "crypto/bio/bss_acpt.c", + "crypto/bio/bss_bio.c", + "crypto/bio/bss_conn.c", + "crypto/bio/bss_core.c", + "crypto/bio/bss_dgram.c", + "crypto/bio/bss_fd.c", + "crypto/bio/bss_file.c", + "crypto/bio/bss_log.c", + "crypto/bio/bss_mem.c", + "crypto/bio/bss_null.c", + "crypto/bio/bss_sock.c", + "crypto/bio/ossl_core_bio.c", + "crypto/bn/bn_add.c", + "crypto/bn/bn_blind.c", + "crypto/bn/bn_const.c", + "crypto/bn/bn_conv.c", + "crypto/bn/bn_ctx.c", + "crypto/bn/bn_depr.c", + "crypto/bn/bn_dh.c", + "crypto/bn/bn_div.c", + "crypto/bn/bn_err.c", + "crypto/bn/bn_exp.c", + "crypto/bn/bn_exp2.c", + "crypto/bn/bn_gcd.c", + "crypto/bn/bn_gf2m.c", + "crypto/bn/bn_intern.c", + "crypto/bn/bn_kron.c", + "crypto/bn/bn_lib.c", + "crypto/bn/bn_mod.c", + "crypto/bn/bn_mont.c", + "crypto/bn/bn_mpi.c", + "crypto/bn/bn_mul.c", + "crypto/bn/bn_nist.c", + "crypto/bn/bn_prime.c", + "crypto/bn/bn_print.c", + "crypto/bn/bn_rand.c", + "crypto/bn/bn_recp.c", + "crypto/bn/bn_rsa_fips186_4.c", + "crypto/bn/bn_shift.c", + "crypto/bn/bn_sqr.c", + "crypto/bn/bn_sqrt.c", + "crypto/bn/bn_srp.c", + "crypto/bn/bn_word.c", + "crypto/bn/bn_x931p.c", + "crypto/bsearch.c", + "crypto/buffer/buf_err.c", + "crypto/buffer/buffer.c", + "crypto/camellia/cmll_cfb.c", + "crypto/camellia/cmll_ctr.c", + "crypto/camellia/cmll_ecb.c", + "crypto/camellia/cmll_misc.c", + "crypto/camellia/cmll_ofb.c", + "crypto/cast/c_cfb64.c", + "crypto/cast/c_ecb.c", + "crypto/cast/c_enc.c", + "crypto/cast/c_ofb64.c", + "crypto/cast/c_skey.c", + "crypto/cmac/cmac.c", + "crypto/cmp/cmp_asn.c", + "crypto/cmp/cmp_client.c", + "crypto/cmp/cmp_ctx.c", + "crypto/cmp/cmp_err.c", + "crypto/cmp/cmp_hdr.c", + "crypto/cmp/cmp_http.c", + "crypto/cmp/cmp_msg.c", + "crypto/cmp/cmp_protect.c", + "crypto/cmp/cmp_server.c", + "crypto/cmp/cmp_status.c", + "crypto/cmp/cmp_util.c", + "crypto/cmp/cmp_vfy.c", + "crypto/cms/cms_asn1.c", + "crypto/cms/cms_att.c", + "crypto/cms/cms_cd.c", + "crypto/cms/cms_dd.c", + "crypto/cms/cms_dh.c", + "crypto/cms/cms_ec.c", + "crypto/cms/cms_enc.c", + "crypto/cms/cms_env.c", + "crypto/cms/cms_err.c", + "crypto/cms/cms_ess.c", + "crypto/cms/cms_io.c", + "crypto/cms/cms_kari.c", + "crypto/cms/cms_lib.c", + "crypto/cms/cms_pwri.c", + "crypto/cms/cms_rsa.c", + "crypto/cms/cms_sd.c", + "crypto/cms/cms_smime.c", + "crypto/comp/c_zlib.c", + "crypto/comp/comp_err.c", + "crypto/comp/comp_lib.c", + "crypto/conf/conf_api.c", + "crypto/conf/conf_def.c", + "crypto/conf/conf_err.c", + "crypto/conf/conf_lib.c", + "crypto/conf/conf_mall.c", + "crypto/conf/conf_mod.c", + "crypto/conf/conf_sap.c", + "crypto/conf/conf_ssl.c", + "crypto/context.c", + "crypto/core_algorithm.c", + "crypto/core_fetch.c", + "crypto/core_namemap.c", + "crypto/cpt_err.c", + "crypto/cpuid.c", + "crypto/crmf/crmf_asn.c", + "crypto/crmf/crmf_err.c", + "crypto/crmf/crmf_lib.c", + "crypto/crmf/crmf_pbm.c", + "crypto/cryptlib.c", + "crypto/ct/ct_b64.c", + "crypto/ct/ct_err.c", + "crypto/ct/ct_log.c", + "crypto/ct/ct_oct.c", + "crypto/ct/ct_policy.c", + "crypto/ct/ct_prn.c", + "crypto/ct/ct_sct.c", + "crypto/ct/ct_sct_ctx.c", + "crypto/ct/ct_vfy.c", + "crypto/ct/ct_x509v3.c", + "crypto/ctype.c", + "crypto/cversion.c", + "crypto/der_writer.c", + "crypto/des/cbc_cksm.c", + "crypto/des/cbc_enc.c", + "crypto/des/cfb64ede.c", + "crypto/des/cfb64enc.c", + "crypto/des/cfb_enc.c", + "crypto/des/des_enc.c", + "crypto/des/ecb3_enc.c", + "crypto/des/ecb_enc.c", + "crypto/des/fcrypt.c", + "crypto/des/fcrypt_b.c", + "crypto/des/ofb64ede.c", + "crypto/des/ofb64enc.c", + "crypto/des/ofb_enc.c", + "crypto/des/pcbc_enc.c", + "crypto/des/qud_cksm.c", + "crypto/des/rand_key.c", + "crypto/des/set_key.c", + "crypto/des/str2key.c", + "crypto/des/xcbc_enc.c", + "crypto/dh/dh_ameth.c", + "crypto/dh/dh_asn1.c", + "crypto/dh/dh_backend.c", + "crypto/dh/dh_check.c", + "crypto/dh/dh_depr.c", + "crypto/dh/dh_err.c", + "crypto/dh/dh_gen.c", + "crypto/dh/dh_group_params.c", + "crypto/dh/dh_kdf.c", + "crypto/dh/dh_key.c", + "crypto/dh/dh_lib.c", + "crypto/dh/dh_meth.c", + "crypto/dh/dh_pmeth.c", + "crypto/dh/dh_prn.c", + "crypto/dh/dh_rfc5114.c", + "crypto/dsa/dsa_ameth.c", + "crypto/dsa/dsa_asn1.c", + "crypto/dsa/dsa_backend.c", + "crypto/dsa/dsa_check.c", + "crypto/dsa/dsa_depr.c", + "crypto/dsa/dsa_err.c", + "crypto/dsa/dsa_gen.c", + "crypto/dsa/dsa_key.c", + "crypto/dsa/dsa_lib.c", + "crypto/dsa/dsa_meth.c", + "crypto/dsa/dsa_ossl.c", + "crypto/dsa/dsa_pmeth.c", + "crypto/dsa/dsa_prn.c", + "crypto/dsa/dsa_sign.c", + "crypto/dsa/dsa_vrf.c", + "crypto/dso/dso_dl.c", + "crypto/dso/dso_dlfcn.c", + "crypto/dso/dso_err.c", + "crypto/dso/dso_lib.c", + "crypto/dso/dso_openssl.c", + "crypto/dso/dso_vms.c", + "crypto/dso/dso_win32.c", + "crypto/ebcdic.c", + "crypto/ec/curve25519.c", + "crypto/ec/curve448/arch_32/f_impl32.c", + "crypto/ec/curve448/arch_64/f_impl64.c", + "crypto/ec/curve448/curve448.c", + "crypto/ec/curve448/curve448_tables.c", + "crypto/ec/curve448/eddsa.c", + "crypto/ec/curve448/f_generic.c", + "crypto/ec/curve448/scalar.c", + "crypto/ec/ec2_oct.c", + "crypto/ec/ec2_smpl.c", + "crypto/ec/ec_ameth.c", + "crypto/ec/ec_asn1.c", + "crypto/ec/ec_backend.c", + "crypto/ec/ec_check.c", + "crypto/ec/ec_curve.c", + "crypto/ec/ec_cvt.c", + "crypto/ec/ec_deprecated.c", + "crypto/ec/ec_err.c", + "crypto/ec/ec_key.c", + "crypto/ec/ec_kmeth.c", + "crypto/ec/ec_lib.c", + "crypto/ec/ec_mult.c", + "crypto/ec/ec_oct.c", + "crypto/ec/ec_pmeth.c", + "crypto/ec/ec_print.c", + "crypto/ec/ecdh_kdf.c", + "crypto/ec/ecdh_ossl.c", + "crypto/ec/ecdsa_ossl.c", + "crypto/ec/ecdsa_sign.c", + "crypto/ec/ecdsa_vrf.c", + "crypto/ec/eck_prn.c", + "crypto/ec/ecp_mont.c", + "crypto/ec/ecp_nist.c", + "crypto/ec/ecp_nistz256.c", + "crypto/ec/ecp_oct.c", + "crypto/ec/ecp_smpl.c", + "crypto/ec/ecx_backend.c", + "crypto/ec/ecx_key.c", + "crypto/ec/ecx_meth.c", + "crypto/encode_decode/decoder_err.c", + "crypto/encode_decode/decoder_lib.c", + "crypto/encode_decode/decoder_meth.c", + "crypto/encode_decode/decoder_pkey.c", + "crypto/encode_decode/encoder_err.c", + "crypto/encode_decode/encoder_lib.c", + "crypto/encode_decode/encoder_meth.c", + "crypto/encode_decode/encoder_pkey.c", + "crypto/engine/eng_all.c", + "crypto/engine/eng_cnf.c", + "crypto/engine/eng_ctrl.c", + "crypto/engine/eng_dyn.c", + "crypto/engine/eng_err.c", + "crypto/engine/eng_fat.c", + "crypto/engine/eng_init.c", + "crypto/engine/eng_lib.c", + "crypto/engine/eng_list.c", + "crypto/engine/eng_openssl.c", + "crypto/engine/eng_pkey.c", + "crypto/engine/eng_rdrand.c", + "crypto/engine/eng_table.c", + "crypto/engine/tb_asnmth.c", + "crypto/engine/tb_cipher.c", + "crypto/engine/tb_dh.c", + "crypto/engine/tb_digest.c", + "crypto/engine/tb_dsa.c", + "crypto/engine/tb_eckey.c", + "crypto/engine/tb_pkmeth.c", + "crypto/engine/tb_rand.c", + "crypto/engine/tb_rsa.c", + "crypto/err/err.c", + "crypto/err/err_all.c", + "crypto/err/err_all_legacy.c", + "crypto/err/err_blocks.c", + "crypto/err/err_prn.c", + "crypto/ess/ess_asn1.c", + "crypto/ess/ess_err.c", + "crypto/ess/ess_lib.c", + "crypto/evp/asymcipher.c", + "crypto/evp/bio_b64.c", + "crypto/evp/bio_enc.c", + "crypto/evp/bio_md.c", + "crypto/evp/bio_ok.c", + "crypto/evp/c_allc.c", + "crypto/evp/c_alld.c", + "crypto/evp/cmeth_lib.c", + "crypto/evp/ctrl_params_translate.c", + "crypto/evp/dh_ctrl.c", + "crypto/evp/dh_support.c", + "crypto/evp/digest.c", + "crypto/evp/dsa_ctrl.c", + "crypto/evp/e_aes.c", + "crypto/evp/e_aes_cbc_hmac_sha1.c", + "crypto/evp/e_aes_cbc_hmac_sha256.c", + "crypto/evp/e_aria.c", + "crypto/evp/e_bf.c", + "crypto/evp/e_camellia.c", + "crypto/evp/e_cast.c", + "crypto/evp/e_chacha20_poly1305.c", + "crypto/evp/e_des.c", + "crypto/evp/e_des3.c", + "crypto/evp/e_idea.c", + "crypto/evp/e_null.c", + "crypto/evp/e_old.c", + "crypto/evp/e_rc2.c", + "crypto/evp/e_rc4.c", + "crypto/evp/e_rc4_hmac_md5.c", + "crypto/evp/e_rc5.c", + "crypto/evp/e_seed.c", + "crypto/evp/e_sm4.c", + "crypto/evp/e_xcbc_d.c", + "crypto/evp/ec_ctrl.c", + "crypto/evp/ec_support.c", + "crypto/evp/encode.c", + "crypto/evp/evp_cnf.c", + "crypto/evp/evp_enc.c", + "crypto/evp/evp_err.c", + "crypto/evp/evp_fetch.c", + "crypto/evp/evp_key.c", + "crypto/evp/evp_lib.c", + "crypto/evp/evp_pbe.c", + "crypto/evp/evp_pkey.c", + "crypto/evp/evp_rand.c", + "crypto/evp/evp_utils.c", + "crypto/evp/exchange.c", + "crypto/evp/kdf_lib.c", + "crypto/evp/kdf_meth.c", + "crypto/evp/kem.c", + "crypto/evp/keymgmt_lib.c", + "crypto/evp/keymgmt_meth.c", + "crypto/evp/legacy_blake2.c", + "crypto/evp/legacy_md4.c", + "crypto/evp/legacy_md5.c", + "crypto/evp/legacy_md5_sha1.c", + "crypto/evp/legacy_mdc2.c", + "crypto/evp/legacy_ripemd.c", + "crypto/evp/legacy_sha.c", + "crypto/evp/legacy_wp.c", + "crypto/evp/m_null.c", + "crypto/evp/m_sigver.c", + "crypto/evp/mac_lib.c", + "crypto/evp/mac_meth.c", + "crypto/evp/names.c", + "crypto/evp/p5_crpt.c", + "crypto/evp/p5_crpt2.c", + "crypto/evp/p_dec.c", + "crypto/evp/p_enc.c", + "crypto/evp/p_legacy.c", + "crypto/evp/p_lib.c", + "crypto/evp/p_open.c", + "crypto/evp/p_seal.c", + "crypto/evp/p_sign.c", + "crypto/evp/p_verify.c", + "crypto/evp/pbe_scrypt.c", + "crypto/evp/pmeth_check.c", + "crypto/evp/pmeth_gn.c", + "crypto/evp/pmeth_lib.c", + "crypto/evp/signature.c", + "crypto/ex_data.c", + "crypto/ffc/ffc_backend.c", + "crypto/ffc/ffc_dh.c", + "crypto/ffc/ffc_key_generate.c", + "crypto/ffc/ffc_key_validate.c", + "crypto/ffc/ffc_params.c", + "crypto/ffc/ffc_params_generate.c", + "crypto/ffc/ffc_params_validate.c", + "crypto/getenv.c", + "crypto/hmac/hmac.c", + "crypto/http/http_client.c", + "crypto/http/http_err.c", + "crypto/http/http_lib.c", + "crypto/idea/i_cbc.c", + "crypto/idea/i_cfb64.c", + "crypto/idea/i_ecb.c", + "crypto/idea/i_ofb64.c", + "crypto/idea/i_skey.c", + "crypto/info.c", + "crypto/init.c", + "crypto/initthread.c", + "crypto/kdf/kdf_err.c", + "crypto/lhash/lh_stats.c", + "crypto/lhash/lhash.c", + "crypto/md4/md4_dgst.c", + "crypto/md4/md4_one.c", + "crypto/md5/md5_dgst.c", + "crypto/md5/md5_one.c", + "crypto/md5/md5_sha1.c", + "crypto/mdc2/mdc2_one.c", + "crypto/mdc2/mdc2dgst.c", + "crypto/mem.c", + "crypto/mem_sec.c", + "crypto/modes/cbc128.c", + "crypto/modes/ccm128.c", + "crypto/modes/cfb128.c", + "crypto/modes/ctr128.c", + "crypto/modes/cts128.c", + "crypto/modes/gcm128.c", + "crypto/modes/ocb128.c", + "crypto/modes/ofb128.c", + "crypto/modes/siv128.c", + "crypto/modes/wrap128.c", + "crypto/modes/xts128.c", + "crypto/o_dir.c", + "crypto/o_fopen.c", + "crypto/o_init.c", + "crypto/o_str.c", + "crypto/o_time.c", + "crypto/objects/o_names.c", + "crypto/objects/obj_dat.c", + "crypto/objects/obj_err.c", + "crypto/objects/obj_lib.c", + "crypto/objects/obj_xref.c", + "crypto/ocsp/ocsp_asn.c", + "crypto/ocsp/ocsp_cl.c", + "crypto/ocsp/ocsp_err.c", + "crypto/ocsp/ocsp_ext.c", + "crypto/ocsp/ocsp_http.c", + "crypto/ocsp/ocsp_lib.c", + "crypto/ocsp/ocsp_prn.c", + "crypto/ocsp/ocsp_srv.c", + "crypto/ocsp/ocsp_vfy.c", + "crypto/ocsp/v3_ocsp.c", + "crypto/packet.c", + "crypto/param_build.c", + "crypto/param_build_set.c", + "crypto/params.c", + "crypto/params_dup.c", + "crypto/params_from_text.c", + "crypto/passphrase.c", + "crypto/pem/pem_all.c", + "crypto/pem/pem_err.c", + "crypto/pem/pem_info.c", + "crypto/pem/pem_lib.c", + "crypto/pem/pem_oth.c", + "crypto/pem/pem_pk8.c", + "crypto/pem/pem_pkey.c", + "crypto/pem/pem_sign.c", + "crypto/pem/pem_x509.c", + "crypto/pem/pem_xaux.c", + "crypto/pem/pvkfmt.c", + "crypto/pkcs12/p12_add.c", + "crypto/pkcs12/p12_asn.c", + "crypto/pkcs12/p12_attr.c", + "crypto/pkcs12/p12_crpt.c", + "crypto/pkcs12/p12_crt.c", + "crypto/pkcs12/p12_decr.c", + "crypto/pkcs12/p12_init.c", + "crypto/pkcs12/p12_key.c", + "crypto/pkcs12/p12_kiss.c", + "crypto/pkcs12/p12_mutl.c", + "crypto/pkcs12/p12_npas.c", + "crypto/pkcs12/p12_p8d.c", + "crypto/pkcs12/p12_p8e.c", + "crypto/pkcs12/p12_sbag.c", + "crypto/pkcs12/p12_utl.c", + "crypto/pkcs12/pk12err.c", + "crypto/pkcs7/bio_pk7.c", + "crypto/pkcs7/pk7_asn1.c", + "crypto/pkcs7/pk7_attr.c", + "crypto/pkcs7/pk7_doit.c", + "crypto/pkcs7/pk7_lib.c", + "crypto/pkcs7/pk7_mime.c", + "crypto/pkcs7/pk7_smime.c", + "crypto/pkcs7/pkcs7err.c", + "crypto/poly1305/poly1305.c", + "crypto/property/defn_cache.c", + "crypto/property/property.c", + "crypto/property/property_err.c", + "crypto/property/property_parse.c", + "crypto/property/property_query.c", + "crypto/property/property_string.c", + "crypto/provider.c", + "crypto/provider_child.c", + "crypto/provider_conf.c", + "crypto/provider_core.c", + "crypto/provider_predefined.c", + "crypto/punycode.c", + "crypto/rand/prov_seed.c", + "crypto/rand/rand_deprecated.c", + "crypto/rand/rand_err.c", + "crypto/rand/rand_lib.c", + "crypto/rand/rand_meth.c", + "crypto/rand/rand_pool.c", + "crypto/rand/randfile.c", + "crypto/rc2/rc2_cbc.c", + "crypto/rc2/rc2_ecb.c", + "crypto/rc2/rc2_skey.c", + "crypto/rc2/rc2cfb64.c", + "crypto/rc2/rc2ofb64.c", + "crypto/ripemd/rmd_dgst.c", + "crypto/ripemd/rmd_one.c", + "crypto/rsa/rsa_ameth.c", + "crypto/rsa/rsa_asn1.c", + "crypto/rsa/rsa_backend.c", + "crypto/rsa/rsa_chk.c", + "crypto/rsa/rsa_crpt.c", + "crypto/rsa/rsa_depr.c", + "crypto/rsa/rsa_err.c", + "crypto/rsa/rsa_gen.c", + "crypto/rsa/rsa_lib.c", + "crypto/rsa/rsa_meth.c", + "crypto/rsa/rsa_mp.c", + "crypto/rsa/rsa_mp_names.c", + "crypto/rsa/rsa_none.c", + "crypto/rsa/rsa_oaep.c", + "crypto/rsa/rsa_ossl.c", + "crypto/rsa/rsa_pk1.c", + "crypto/rsa/rsa_pmeth.c", + "crypto/rsa/rsa_prn.c", + "crypto/rsa/rsa_pss.c", + "crypto/rsa/rsa_saos.c", + "crypto/rsa/rsa_schemes.c", + "crypto/rsa/rsa_sign.c", + "crypto/rsa/rsa_sp800_56b_check.c", + "crypto/rsa/rsa_sp800_56b_gen.c", + "crypto/rsa/rsa_x931.c", + "crypto/rsa/rsa_x931g.c", + "crypto/seed/seed.c", + "crypto/seed/seed_cbc.c", + "crypto/seed/seed_cfb.c", + "crypto/seed/seed_ecb.c", + "crypto/seed/seed_ofb.c", + "crypto/self_test_core.c", + "crypto/sha/sha1_one.c", + "crypto/sha/sha1dgst.c", + "crypto/sha/sha256.c", + "crypto/sha/sha3.c", + "crypto/sha/sha512.c", + "crypto/siphash/siphash.c", + "crypto/sm2/sm2_crypt.c", + "crypto/sm2/sm2_err.c", + "crypto/sm2/sm2_key.c", + "crypto/sm2/sm2_sign.c", + "crypto/sm3/legacy_sm3.c", + "crypto/sm3/sm3.c", + "crypto/sm4/sm4.c", + "crypto/sparse_array.c", + "crypto/srp/srp_lib.c", + "crypto/srp/srp_vfy.c", + "crypto/stack/stack.c", + "crypto/store/store_err.c", + "crypto/store/store_init.c", + "crypto/store/store_lib.c", + "crypto/store/store_meth.c", + "crypto/store/store_register.c", + "crypto/store/store_result.c", + "crypto/store/store_strings.c", + "crypto/threads_lib.c", + "crypto/threads_none.c", + "crypto/threads_pthread.c", + "crypto/threads_win.c", + "crypto/trace.c", + "crypto/ts/ts_asn1.c", + "crypto/ts/ts_conf.c", + "crypto/ts/ts_err.c", + "crypto/ts/ts_lib.c", + "crypto/ts/ts_req_print.c", + "crypto/ts/ts_req_utils.c", + "crypto/ts/ts_rsp_print.c", + "crypto/ts/ts_rsp_sign.c", + "crypto/ts/ts_rsp_utils.c", + "crypto/ts/ts_rsp_verify.c", + "crypto/ts/ts_verify_ctx.c", + "crypto/txt_db/txt_db.c", + "crypto/ui/ui_err.c", + "crypto/ui/ui_lib.c", + "crypto/ui/ui_null.c", + "crypto/ui/ui_openssl.c", + "crypto/ui/ui_util.c", + "crypto/uid.c", + "crypto/whrlpool/wp_dgst.c", + "crypto/x509/by_dir.c", + "crypto/x509/by_file.c", + "crypto/x509/by_store.c", + "crypto/x509/pcy_cache.c", + "crypto/x509/pcy_data.c", + "crypto/x509/pcy_lib.c", + "crypto/x509/pcy_map.c", + "crypto/x509/pcy_node.c", + "crypto/x509/pcy_tree.c", + "crypto/x509/t_crl.c", + "crypto/x509/t_req.c", + "crypto/x509/t_x509.c", + "crypto/x509/v3_addr.c", + "crypto/x509/v3_admis.c", + "crypto/x509/v3_akeya.c", + "crypto/x509/v3_akid.c", + "crypto/x509/v3_asid.c", + "crypto/x509/v3_bcons.c", + "crypto/x509/v3_bitst.c", + "crypto/x509/v3_conf.c", + "crypto/x509/v3_cpols.c", + "crypto/x509/v3_crld.c", + "crypto/x509/v3_enum.c", + "crypto/x509/v3_extku.c", + "crypto/x509/v3_genn.c", + "crypto/x509/v3_ia5.c", + "crypto/x509/v3_info.c", + "crypto/x509/v3_int.c", + "crypto/x509/v3_ist.c", + "crypto/x509/v3_lib.c", + "crypto/x509/v3_ncons.c", + "crypto/x509/v3_pci.c", + "crypto/x509/v3_pcia.c", + "crypto/x509/v3_pcons.c", + "crypto/x509/v3_pku.c", + "crypto/x509/v3_pmaps.c", + "crypto/x509/v3_prn.c", + "crypto/x509/v3_purp.c", + "crypto/x509/v3_san.c", + "crypto/x509/v3_skid.c", + "crypto/x509/v3_sxnet.c", + "crypto/x509/v3_tlsf.c", + "crypto/x509/v3_utf8.c", + "crypto/x509/v3_utl.c", + "crypto/x509/v3err.c", + "crypto/x509/x509_att.c", + "crypto/x509/x509_cmp.c", + "crypto/x509/x509_d2.c", + "crypto/x509/x509_def.c", + "crypto/x509/x509_err.c", + "crypto/x509/x509_ext.c", + "crypto/x509/x509_lu.c", + "crypto/x509/x509_meth.c", + "crypto/x509/x509_obj.c", + "crypto/x509/x509_r2x.c", + "crypto/x509/x509_req.c", + "crypto/x509/x509_set.c", + "crypto/x509/x509_trust.c", + "crypto/x509/x509_txt.c", + "crypto/x509/x509_v3.c", + "crypto/x509/x509_vfy.c", + "crypto/x509/x509_vpm.c", + "crypto/x509/x509cset.c", + "crypto/x509/x509name.c", + "crypto/x509/x509rset.c", + "crypto/x509/x509spki.c", + "crypto/x509/x509type.c", + "crypto/x509/x_all.c", + "crypto/x509/x_attrib.c", + "crypto/x509/x_crl.c", + "crypto/x509/x_exten.c", + "crypto/x509/x_name.c", + "crypto/x509/x_pubkey.c", + "crypto/x509/x_req.c", + "crypto/x509/x_x509.c", + "crypto/x509/x_x509a.c", + "engines/e_capi.c", + "engines/e_padlock.c", + "providers/baseprov.c", + "providers/defltprov.c", + "providers/legacyprov.c", + "providers/nullprov.c", + "providers/prov_running.c", + ] + sources += libcommon_common_sources + sources += libcommon_build_all_generated_selected_platform_sources + sources += libdefault_common_sources + sources += libdefault_build_all_generated_selected_platform_sources + sources += libcrypto_build_all_generated_selected_platform_sources + sources += liblegacy_sources + + if (openssl_selected_platform == "linux-armv4") { + # å‡çº§ä¿®æ”¹é€‚é…检查点21 libcrypto ä¸åŒå¹³å°cæºç åˆ—表 + sources += [ + "crypto/aes/aes_cbc.c", + "crypto/armcap.c", + "crypto/bn/bn_asm.c", + "crypto/camellia/camellia.c", + "crypto/camellia/cmll_cbc.c", + "crypto/rc4/rc4_enc.c", + "crypto/rc4/rc4_skey.c", + "crypto/whrlpool/wp_block.c", + "engines/e_afalg.c", + ] + } else if (openssl_selected_platform == "linux-aarch64") { + # å‡çº§ä¿®æ”¹é€‚é…检查点22 libcrypto ä¸åŒå¹³å°cæºç åˆ—表 + sources += [ + "crypto/aes/aes_cbc.c", + "crypto/aes/aes_core.c", + "crypto/armcap.c", + "crypto/bn/bn_asm.c", + "crypto/camellia/camellia.c", + "crypto/camellia/cmll_cbc.c", + "crypto/rc4/rc4_enc.c", + "crypto/rc4/rc4_skey.c", + "crypto/whrlpool/wp_block.c", + "engines/e_afalg.c", + ] + } else if (openssl_selected_platform == "darwin64-x86_64-cc") { + # å‡çº§ä¿®æ”¹é€‚é…检查点23 libcrypto ä¸åŒå¹³å°cæºç åˆ—表 + sources += [ + "crypto/bn/asm/x86_64-gcc.c", + "crypto/bn/rsaz_exp.c", + "crypto/bn/rsaz_exp_x2.c", + ] + } else if (openssl_selected_platform == "darwin64-arm64-cc") { + # å‡çº§ä¿®æ”¹é€‚é…检查点24 libcrypto ä¸åŒå¹³å°cæºç åˆ—表 + sources += [ + "crypto/aes/aes_cbc.c", + "crypto/aes/aes_core.c", + "crypto/armcap.c", + "crypto/bn/bn_asm.c", + "crypto/camellia/camellia.c", + "crypto/camellia/cmll_cbc.c", + "crypto/rc4/rc4_enc.c", + "crypto/rc4/rc4_skey.c", + "crypto/whrlpool/wp_block.c", + ] + } else if (openssl_selected_platform == "linux-x86_64") { + # å‡çº§ä¿®æ”¹é€‚é…检查点25 libcrypto ä¸åŒå¹³å°cæºç åˆ—表 + sources += [ + "crypto/bn/asm/x86_64-gcc.c", + "crypto/bn/rsaz_exp.c", + "crypto/bn/rsaz_exp_x2.c", + "engines/e_afalg.c", + ] + } else if (openssl_selected_platform == "mingw64") { + # å‡çº§ä¿®æ”¹é€‚é…检查点26 libcrypto ä¸åŒå¹³å°cæºç åˆ—表 + sources += [ + "crypto/bn/asm/x86_64-gcc.c", + "crypto/bn/rsaz_exp.c", + "crypto/bn/rsaz_exp_x2.c", + ] + } + + configs = [ ":crypto_config_private" ] + public_configs = [ ":crypto_config_public" ] + deps = [ ":openssl_build_all_generated" ] +} + +ohos_static_library("libcrypto_static") { + subsystem_name = "thirdparty" + part_name = "openssl" + deps = [ ":crypto_source" ] + public_configs = [ ":crypto_config_public" ] + complete_static_lib = true +} + +if (is_mingw || is_mac) { + ohos_shared_library("libcrypto_restool") { + sources = [] + configs = [] + deps = [ ":crypto_source" ] + if (openssl_selected_platform == "mingw64") { + sources += [ "crypto/dllmain.c" ] + configs += [ ":crypto_config_private" ] + } + subsystem_name = "thirdparty" + part_name = "openssl" + public_configs = [ ":crypto_config_public" ] + install_images = [ + "system", + "updater", + ] + } +} + +ohos_shared_library("libcrypto_shared") { + sources = [] + configs = [] + deps = [ + ":crypto_source", + ":openssl.cnf", + ] + if (openssl_selected_platform == "mingw64") { + sources += [ "crypto/dllmain.c" ] + configs += [ ":crypto_config_private" ] + } + if (current_os == "ios") { + ldflags = [ + "-Wl", + "-install_name", + "@rpath/libcrypto_openssl.framework/libcrypto_openssl", + ] + output_name = "crypto_openssl" + } else { + output_name = "libcrypto_openssl" + } + subsystem_name = "thirdparty" + part_name = "openssl" + innerapi_tags = [ + "platformsdk", + "chipsetsdk", + ] + public_configs = [ ":crypto_config_public" ] + install_images = [ + "system", + "updater", + ] +} + +if (current_os == "ios") { + ohos_combine_darwin_framework("libcrypto_openssl") { + deps = [ ":libcrypto_shared" ] + subsystem_name = "thirdparty" + part_name = "openssl" + } +} + +unused_variables = [] +unused_variables += unused_variables +unused_variables += crypto_config_common_private_include_dirs +unused_variables += crypto_config_common_public_include_dirs +unused_variables += crypto_config_common_cflags +unused_variables += crypto_config_linux_armv4_cflags +unused_variables += crypto_config_linux_aarch64_cflags +unused_variables += crypto_config_darwin64_x86_64_cc_cflags +unused_variables += crypto_config_darwin64_arm64_cc_cflags +unused_variables += crypto_config_linux_x86_64_cflags +unused_variables += crypto_config_mingw64_cflags +unused_variables += libcommon_common_sources +unused_variables += libdefault_common_sources +unused_variables += libcrypto_build_all_generated_linux_armv4_sources +unused_variables += libcrypto_build_all_generated_linux_aarch64_sources +unused_variables += libcrypto_build_all_generated_darwin64_x86_64_cc_sources +unused_variables += libcrypto_build_all_generated_darwin64_arm64_cc_sources +unused_variables += libcrypto_build_all_generated_linux_x86_64_sources +unused_variables += libcrypto_build_all_generated_mingw64_sources + +config("ssl_config_private") { + include_dirs = crypto_config_common_private_include_dirs + cflags = crypto_config_common_cflags + crypto_config_current_platform_cflags + + openssl_internal_cflags +} + +config("ssl_config_public") { + include_dirs = crypto_config_common_public_include_dirs +} + +ohos_source_set("ssl_source") { + subsystem_name = "thirdparty" + part_name = "openssl" + + # å‡çº§ä¿®æ”¹é€‚é…检查点27 libssl æºç åˆ—表 + sources = [ + "ssl/bio_ssl.c", + "ssl/d1_lib.c", + "ssl/d1_msg.c", + "ssl/d1_srtp.c", + "ssl/methods.c", + "ssl/pqueue.c", + "ssl/record/dtls1_bitmap.c", + "ssl/record/rec_layer_d1.c", + "ssl/record/rec_layer_s3.c", + "ssl/record/ssl3_buffer.c", + "ssl/record/ssl3_record.c", + "ssl/record/ssl3_record_tls13.c", + "ssl/s3_enc.c", + "ssl/s3_lib.c", + "ssl/s3_msg.c", + "ssl/ssl_asn1.c", + "ssl/ssl_cert.c", + "ssl/ssl_ciph.c", + "ssl/ssl_conf.c", + "ssl/ssl_err.c", + "ssl/ssl_err_legacy.c", + "ssl/ssl_init.c", + "ssl/ssl_lib.c", + "ssl/ssl_mcnf.c", + "ssl/ssl_rsa.c", + "ssl/ssl_rsa_legacy.c", + "ssl/ssl_sess.c", + "ssl/ssl_stat.c", + "ssl/ssl_txt.c", + "ssl/ssl_utst.c", + "ssl/statem/extensions.c", + "ssl/statem/extensions_clnt.c", + "ssl/statem/extensions_cust.c", + "ssl/statem/extensions_srvr.c", + "ssl/statem/statem.c", + "ssl/statem/statem_clnt.c", + "ssl/statem/statem_dtls.c", + "ssl/statem/statem_lib.c", + "ssl/statem/statem_srvr.c", + "ssl/t1_enc.c", + "ssl/t1_lib.c", + "ssl/t1_trce.c", + "ssl/tls13_enc.c", + "ssl/tls_depr.c", + "ssl/tls_srp.c", + ] + + configs = [ ":ssl_config_private" ] + public_configs = [ ":ssl_config_public" ] + deps = [ ":openssl_build_all_generated" ] +} + +ohos_static_library("libssl_static") { + subsystem_name = "thirdparty" + part_name = "openssl" + deps = [ ":ssl_source" ] + public_configs = [ ":ssl_config_public" ] + complete_static_lib = true +} + +ohos_shared_library("libssl_shared") { + deps = [ + ":libcrypto_shared", + ":openssl.cnf", + ":ssl_source", + ] + if (current_os == "ios") { + ldflags = [ + "-Wl", + "-install_name", + "@rpath/libssl_openssl.framework/libssl_openssl", + ] + output_name = "ssl_openssl" + } else { + output_name = "libssl_openssl" + } + subsystem_name = "thirdparty" + part_name = "openssl" + + innerapi_tags = [ + "platformsdk", + "chipsetsdk", + ] + public_configs = [ + ":crypto_config_public", + ":ssl_config_public", + ] + + install_images = [ + "system", + + # compile libssl_openssl.z.so to the updater image for wpa to use + "updater", + ] +} + +if (current_os == "ios") { + ohos_combine_darwin_framework("libssl_openssl") { + deps = [ ":libssl_shared" ] + subsystem_name = "thirdparty" + part_name = "openssl" + } +} + +ohos_static_library("libapps") { + # å‡çº§ä¿®æ”¹é€‚é…检查点28 libapps æºç åˆ—表 + sources = [ + "apps/lib/app_libctx.c", + "apps/lib/app_params.c", + "apps/lib/app_provider.c", + "apps/lib/app_rand.c", + "apps/lib/app_x509.c", + "apps/lib/apps.c", + "apps/lib/apps_ui.c", + "apps/lib/columns.c", + "apps/lib/engine.c", + "apps/lib/engine_loader.c", + "apps/lib/fmt.c", + "apps/lib/http_server.c", + "apps/lib/names.c", + "apps/lib/opt.c", + "apps/lib/s_cb.c", + "apps/lib/s_socket.c", + "apps/lib/tlssrp_depr.c", + ] + if (openssl_selected_platform == "mingw64") { + sources += [ "apps/lib/win32_init.c" ] + } + subsystem_name = "thirdparty" + part_name = "openssl" + configs = [ ":crypto_config_private" ] +} + +ohos_executable("openssl") { + # å‡çº§ä¿®æ”¹é€‚é…检查点29 apps/openssl æºç åˆ—表 + sources = [ + "${openssl_selected_platform_full_path}/apps/progs.c", + "apps/asn1parse.c", + "apps/ca.c", + "apps/ciphers.c", + "apps/cmp.c", + "apps/cms.c", + "apps/crl.c", + "apps/crl2pkcs7.c", + "apps/dgst.c", + "apps/dhparam.c", + "apps/dsa.c", + "apps/dsaparam.c", + "apps/ec.c", + "apps/ecparam.c", + "apps/enc.c", + "apps/engine.c", + "apps/errstr.c", + "apps/fipsinstall.c", + "apps/gendsa.c", + "apps/genpkey.c", + "apps/genrsa.c", + "apps/info.c", + "apps/kdf.c", + "apps/lib/cmp_mock_srv.c", + "apps/list.c", + "apps/mac.c", + "apps/nseq.c", + "apps/ocsp.c", + "apps/openssl.c", + "apps/passwd.c", + "apps/pkcs12.c", + "apps/pkcs7.c", + "apps/pkcs8.c", + "apps/pkey.c", + "apps/pkeyparam.c", + "apps/pkeyutl.c", + "apps/prime.c", + "apps/rand.c", + "apps/rehash.c", + "apps/req.c", + "apps/rsa.c", + "apps/rsautl.c", + "apps/s_client.c", + "apps/s_server.c", + "apps/s_time.c", + "apps/sess_id.c", + "apps/smime.c", + "apps/speed.c", + "apps/spkac.c", + "apps/srp.c", + "apps/storeutl.c", + "apps/ts.c", + "apps/verify.c", + "apps/version.c", + "apps/x509.c", + ] + if (openssl_selected_platform == "mingw64") { + sources += [ "${openssl_selected_platform_full_path}/apps/openssl.rc" ] + } + deps = [ + ":libapps", + ":libcrypto_shared", + ":libssl_shared", + ":openssl.cnf", + ":openssl_build_all_generated", + ] + subsystem_name = "thirdparty" + part_name = "openssl" + configs = [ ":crypto_config_private" ] +} +# å‡çº§ä¿®æ”¹é€‚é…检查点 汇总 +# +# libcommon = +# libcommon 生æˆçš„æºç åˆ—表(7) + +# libcommon 原目录æºç åˆ—表(17) +# +# libdefault = +# libdefault 生æˆçš„æºç åˆ—表(8) + +# libdefault 原目录æºç åˆ—表(18) +# +# liblegacy = +# liblegacy æºç åˆ—表(19) +# +# libcrypto = +# libcrypto ä¸åŒå¹³å°æ±‡ç¼–代ç (1,2,3,4,5,6) + +# libcrypto ä¸åŒå¹³å°cæºç åˆ—表(21,22,23,24,25,26) + +# libcrypto 原目录æºç åˆ—表(20) + +# libcommon + +# libdefault + +# liblegacy +# +# libssl = +# libssl æºç åˆ—表(27) +# +# libapps = +# libapps æºç åˆ—表(28) +# +# apps/openssl = +# apps/openssl æºç åˆ—表(29) + +# libapps +# +# 编译选项 = +# 内部公共头文件目录列表(9) + +# 内部公共编译选项å®åˆ—表(10) + +# 内部ä¸åŒå¹³å°ç¼–译选项列表(11,12,13,14,15,16) diff --git a/deps/openssl/openssl/CHANGES.md b/deps/openssl/openssl/CHANGES.md index 6f6e73db9..0fb1eb1f6 100644 --- a/deps/openssl/openssl/CHANGES.md +++ b/deps/openssl/openssl/CHANGES.md @@ -28,186 +28,6 @@ breaking changes, and mappings for the large list of deprecated functions. [Migration guide]: https://github.com/openssl/openssl/tree/master/doc/man7/migration_guide.pod -### Changes between 3.0.13 and 3.0.13+quic [30 Jan 2024] - -* Add QUIC API support from BoringSSL - - *Todd Short* - -### Changes between 3.0.12 and 3.0.13 [30 Jan 2024] - - * A file in PKCS12 format can contain certificates and keys and may come from - an untrusted source. The PKCS12 specification allows certain fields to be - NULL, but OpenSSL did not correctly check for this case. A fix has been - applied to prevent a NULL pointer dereference that results in OpenSSL - crashing. If an application processes PKCS12 files from an untrusted source - using the OpenSSL APIs then that application will be vulnerable to this - issue prior to this fix. - - OpenSSL APIs that were vulnerable to this are: PKCS12_parse(), - PKCS12_unpack_p7data(), PKCS12_unpack_p7encdata(), PKCS12_unpack_authsafes() - and PKCS12_newpass(). - - We have also fixed a similar issue in SMIME_write_PKCS7(). However since this - function is related to writing data we do not consider it security - significant. - - ([CVE-2024-0727]) - - *Matt Caswell* - - * When function EVP_PKEY_public_check() is called on RSA public keys, - a computation is done to confirm that the RSA modulus, n, is composite. - For valid RSA keys, n is a product of two or more large primes and this - computation completes quickly. However, if n is an overly large prime, - then this computation would take a long time. - - An application that calls EVP_PKEY_public_check() and supplies an RSA key - obtained from an untrusted source could be vulnerable to a Denial of Service - attack. - - The function EVP_PKEY_public_check() is not called from other OpenSSL - functions however it is called from the OpenSSL pkey command line - application. For that reason that application is also vulnerable if used - with the "-pubin" and "-check" options on untrusted data. - - To resolve this issue RSA keys larger than OPENSSL_RSA_MAX_MODULUS_BITS will - now fail the check immediately with an RSA_R_MODULUS_TOO_LARGE error reason. - - ([CVE-2023-6237]) - - *Tomáš Mráz* - - * Restore the encoding of SM2 PrivateKeyInfo and SubjectPublicKeyInfo to - have the contained AlgorithmIdentifier.algorithm set to id-ecPublicKey - rather than SM2. - - *Richard Levitte* - - * The POLY1305 MAC (message authentication code) implementation in OpenSSL - for PowerPC CPUs saves the contents of vector registers in different - order than they are restored. Thus the contents of some of these vector - registers is corrupted when returning to the caller. The vulnerable code is - used only on newer PowerPC processors supporting the PowerISA 2.07 - instructions. - - The consequences of this kind of internal application state corruption can - be various - from no consequences, if the calling application does not - depend on the contents of non-volatile XMM registers at all, to the worst - consequences, where the attacker could get complete control of the - application process. However unless the compiler uses the vector registers - for storing pointers, the most likely consequence, if any, would be an - incorrect result of some application dependent calculations or a crash - leading to a denial of service. - - ([CVE-2023-6129]) - - *Rohan McLure* - - * Fix excessive time spent in DH check / generation with large Q parameter - value. - - Applications that use the functions DH_generate_key() to generate an - X9.42 DH key may experience long delays. Likewise, applications that use - DH_check_pub_key(), DH_check_pub_key_ex() or EVP_PKEY_public_check() - to check an X9.42 DH key or X9.42 DH parameters may experience long delays. - Where the key or parameters that are being checked have been obtained from - an untrusted source this may lead to a Denial of Service. - - ([CVE-2023-5678]) - - *Richard Levitte* - -### Changes between 3.0.11 and 3.0.12 [24 Oct 2023] - - * Fix incorrect key and IV resizing issues when calling EVP_EncryptInit_ex2(), - EVP_DecryptInit_ex2() or EVP_CipherInit_ex2() with OSSL_PARAM parameters - that alter the key or IV length ([CVE-2023-5363]). - - *Paul Dale* - -### Changes between 3.0.10 and 3.0.11 [19 Sep 2023] - - * Fix POLY1305 MAC implementation corrupting XMM registers on Windows. - - The POLY1305 MAC (message authentication code) implementation in OpenSSL - does not save the contents of non-volatile XMM registers on Windows 64 - platform when calculating the MAC of data larger than 64 bytes. Before - returning to the caller all the XMM registers are set to zero rather than - restoring their previous content. The vulnerable code is used only on newer - x86_64 processors supporting the AVX512-IFMA instructions. - - The consequences of this kind of internal application state corruption can - be various - from no consequences, if the calling application does not - depend on the contents of non-volatile XMM registers at all, to the worst - consequences, where the attacker could get complete control of the - application process. However given the contents of the registers are just - zeroized so the attacker cannot put arbitrary values inside, the most likely - consequence, if any, would be an incorrect result of some application - dependent calculations or a crash leading to a denial of service. - - ([CVE-2023-4807]) - - *Bernd Edlinger* - -### Changes between 3.0.9 and 3.0.10 [1 Aug 2023] - - * Fix excessive time spent checking DH q parameter value. - - The function DH_check() performs various checks on DH parameters. After - fixing CVE-2023-3446 it was discovered that a large q parameter value can - also trigger an overly long computation during some of these checks. - A correct q value, if present, cannot be larger than the modulus p - parameter, thus it is unnecessary to perform these checks if q is larger - than p. - - If DH_check() is called with such q parameter value, - DH_CHECK_INVALID_Q_VALUE return flag is set and the computationally - intensive checks are skipped. - - ([CVE-2023-3817]) - - *Tomáš Mráz* - - * Fix DH_check() excessive time with over sized modulus. - - The function DH_check() performs various checks on DH parameters. One of - those checks confirms that the modulus ("p" parameter) is not too large. - Trying to use a very large modulus is slow and OpenSSL will not normally use - a modulus which is over 10,000 bits in length. - - However the DH_check() function checks numerous aspects of the key or - parameters that have been supplied. Some of those checks use the supplied - modulus value even if it has already been found to be too large. - - A new limit has been added to DH_check of 32,768 bits. Supplying a - key/parameters with a modulus over this size will simply cause DH_check() to - fail. - - ([CVE-2023-3446]) - - *Matt Caswell* - - * Do not ignore empty associated data entries with AES-SIV. - - The AES-SIV algorithm allows for authentication of multiple associated - data entries along with the encryption. To authenticate empty data the - application has to call `EVP_EncryptUpdate()` (or `EVP_CipherUpdate()`) - with NULL pointer as the output buffer and 0 as the input buffer length. - The AES-SIV implementation in OpenSSL just returns success for such call - instead of performing the associated data authentication operation. - The empty data thus will not be authenticated. ([CVE-2023-2975]) - - Thanks to Juerg Wullschleger (Google) for discovering the issue. - - The fix changes the authentication tag value and the ciphertext for - applications that use empty associated data entries with AES-SIV. - To decrypt data encrypted with previous versions of OpenSSL the application - has to skip calls to `EVP_DecryptUpdate()` for empty associated data - entries. - - *Tomáš Mráz* - ### Changes between 3.0.8 and 3.0.9 [30 May 2023] * Mitigate for the time it takes for `OBJ_obj2txt` to translate gigantic @@ -222,7 +42,7 @@ breaking changes, and mappings for the large list of deprecated functions. IDENTIFIER to canonical numeric text form if the size of that OBJECT IDENTIFIER is 586 bytes or less, and fail otherwise. - The basis for this restriction is [RFC 2578 (STD 58), section 3.5]. OBJECT + The basis for this restriction is RFC 2578 (STD 58), section 3.5. OBJECT IDENTIFIER values, which stipulates that OBJECT IDENTIFIERS may have at most 128 sub-identifiers, and that the maximum value that each sub- identifier may have is 2^32-1 (4294967295 decimal). @@ -232,6 +52,8 @@ breaking changes, and mappings for the large list of deprecated functions. these restrictions may occupy is 32 * 128 / 7, which is approximately 586 bytes. + Ref: https://datatracker.ietf.org/doc/html/rfc2578#section-3.5 + *Richard Levitte* * Fixed buffer overread in AES-XTS decryption on ARM 64 bit platforms which @@ -19830,16 +19652,6 @@ ndif -[CVE-2024-0727]: https://www.openssl.org/news/vulnerabilities.html#CVE-2024-0727 -[CVE-2023-6237]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-6237 -[CVE-2023-6129]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-6129 -[CVE-2023-5678]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-5678 -[CVE-2023-5363]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-5363 -[CVE-2023-4807]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-4807 -[CVE-2023-3817]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-3817 -[CVE-2023-3446]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-3446 -[CVE-2023-2975]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-2975 -[RFC 2578 (STD 58), section 3.5]: https://datatracker.ietf.org/doc/html/rfc2578#section-3.5 [CVE-2023-2650]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-2650 [CVE-2023-1255]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-1255 [CVE-2023-0466]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-0466 diff --git a/deps/openssl/openssl/CONTRIBUTING.md b/deps/openssl/openssl/CONTRIBUTING.md index 15490fd9f..efb4be871 100644 --- a/deps/openssl/openssl/CONTRIBUTING.md +++ b/deps/openssl/openssl/CONTRIBUTING.md @@ -9,36 +9,22 @@ Development is done on GitHub in the [openssl/openssl] repository. [openssl/openssl]: -To request new a feature, ask a question, or report a bug, -please open an [issue on GitHub](https://github.com/openssl/openssl/issues). +To request new features or report bugs, please open an issue on GitHub -To submit a patch or implement a new feature, please open a -[pull request on GitHub](https://github.com/openssl/openssl/pulls). -If you are thinking of making a large contribution, -open an issue for it before starting work, to get comments from the community. -Someone may be already working on the same thing, -or there may be special reasons why a feature is not implemented. +To submit a patch, please open a pull request on GitHub. If you are thinking +of making a large contribution, open an issue for it before starting work, +to get comments from the community. Someone may be already working on +the same thing or there may be reasons why that feature isn't implemented. To make it easier to review and accept your pull request, please follow these guidelines: 1. Anything other than a trivial contribution requires a [Contributor License Agreement] (CLA), giving us permission to use your code. - If your contribution is too small to require a CLA (e.g., fixing a spelling - mistake), then place the text "`CLA: trivial`" on a line by itself below - the rest of your commit message separated by an empty line, like this: - - ``` - One-line summary of trivial change - - Optional main body of commit message. It might contain a sentence - or two explaining the trivial change. - - CLA: trivial - ``` - - It is not sufficient to only place the text "`CLA: trivial`" in the GitHub - pull request description. + If your contribution is too small to require a CLA (e.g. fixing a spelling + mistake), place the text "`CLA: trivial`" on a line by itself separated by + an empty line from the rest of the commit message. It is not sufficient to + only place the text in the GitHub pull request description. [Contributor License Agreement]: @@ -46,8 +32,8 @@ guidelines: ``` git commit --amend - # add the line, save and quit the editor - git push -f [ []] + [add the line, save and quit the editor] + git push -f ``` 2. All source files should start with the following text (with @@ -67,24 +53,22 @@ guidelines: often. We do not accept merge commits, you will have to remove them (usually by rebasing) before it will be acceptable. - 4. Code provided should follow our [coding style] and compile without warnings. - There is a [Perl tool](util/check-format.pl) that helps - finding code formatting mistakes and other coding style nits. - Where `gcc` or `clang` is available, you should use the + 4. Patches should follow our [coding style] and compile without warnings. + Where `gcc` or `clang` is available you should use the `--strict-warnings` `Configure` option. OpenSSL compiles on many varied - platforms: try to ensure you only use portable features. - Clean builds via GitHub Actions are required. They are started automatically - whenever a PR is created or updated by committers. + platforms: try to ensure you only use portable features. Clean builds via + GitHub Actions and AppVeyor are required, and they are started automatically + whenever a PR is created or updated. [coding style]: https://www.openssl.org/policies/technical/coding-style.html - 5. When at all possible, code contributions should include tests. These can + 5. When at all possible, patches should include tests. These can either be added to an existing test, or completely new. Please see [test/README.md](test/README.md) for information on the test framework. 6. New features or changed functionality must include - documentation. Please look at the `.pod` files in `doc/man[1357]` for - examples of our style. Run `make doc-nits` to make sure that your + documentation. Please look at the "pod" files in doc/man[1357] for + examples of our style. Run "make doc-nits" to make sure that your documentation changes are clean. 7. For user visible changes (API changes, behaviour changes, ...), @@ -94,7 +78,7 @@ guidelines: Have a look through existing entries for inspiration. Please note that this is NOT simply a copy of git-log one-liners. Also note that security fixes get an entry in [CHANGES.md](CHANGES.md). - This file helps users get more in-depth information of what comes + This file helps users get more in depth information of what comes with a specific release without having to sift through the higher noise ratio in git-log. diff --git a/deps/openssl/openssl/COPYRIGHT.OpenSource b/deps/openssl/openssl/COPYRIGHT.OpenSource new file mode 100644 index 000000000..5749e3feb --- /dev/null +++ b/deps/openssl/openssl/COPYRIGHT.OpenSource @@ -0,0 +1,186 @@ +Copyright Patrick Powell 1995 +Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2019-2020 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2019 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2018-2021 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2018-2020 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2018-2019 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2018 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2017-2022 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2017-2021 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2017-2020 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2017-2019 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2017-2018 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2017 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2017 Ribose Inc. All Rights Reserved. +Copyright 2017 BaishanCloud. All rights reserved. +Copyright 2017 [Ribose Inc.](https://www.ribose.com). All Rights Reserved. +Copyright 2016-2022 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2016-2021 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2016-2017 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2016-2016 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2016 VMS Software, Inc. All Rights Reserved. +Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2016 Cryptography Research, Inc. +Copyright 2015-2022 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2015-2021 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2015-2020 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2015-2019 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2015-2017 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2015-2016 Cryptography Research, Inc. +Copyright 2015 Cryptography Research, Inc. +Copyright 2014-2021 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2014-2020 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2014-2019 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2014-2018 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2014-2017 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2014-2016 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2014-2016 Cryptography Research, Inc. +Copyright 2014 Cryptography Research, Inc. +Copyright 2013-2021 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2013-2020 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2013-2019 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2013-2018 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2013-2017 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2013-2016 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2013 M. J. Dominus. +Copyright 2012-2022 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2012-2021 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2012-2020 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2012-2019 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2012-2018 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2012-2017 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2012-2016 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2012, Samuel Neves +Copyright 2011-2021 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2011-2020 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2011-2019 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2011-2018 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2011-2017 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2011-2016 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2011 Google Inc. +Copyright 2010-2022 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2010-2021 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2010-2020 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2010-2019 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2010-2018 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2010-2016 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2009-2022 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2009-2021 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2009-2020 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2009-2019 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2009-2018 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2009-2016 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2008-2022 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2008-2021 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2008-2020 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2008-2019 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2008-2018 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2008-2016 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2007-2020 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2007-2018 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2007-2016 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2006-2021 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2006-2020 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2006-2019 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2006-2018 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2006-2017 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2006-2016 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2006 NTT (Nippon Telegraph and Telephone Corporation) . +Copyright 2005-2021 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2005-2020 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2005-2019 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2005-2018 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2005-2017 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2005-2016 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2005 Nokia. All rights reserved. +Copyright 2004-2021 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2004-2020 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2004-2019 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2004-2018 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2004-2017 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2004-2016 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2004-2014, Akamai Technologies. All Rights Reserved. +Copyright 2003-2021 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2003-2020 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2003-2019 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2003-2018 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2003-2017 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2003-2016 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2002-2022 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2002-2021 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2002-2020 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2002-2019 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2002-2018 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2002-2017 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2002-2016 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2001-2022 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2001-2021 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2001-2020 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2001-2019 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2001-2018 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2001-2017 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2001-2016 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2000-2022 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2000-2021 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2000-2020 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2000-2019 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2000-2018 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2000-2017 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved. +Copyright 1999-2022 The OpenSSL Project Authors. All Rights Reserved. +Copyright 1999-2021 The OpenSSL Project Authors. All Rights Reserved. +Copyright 1999-2020 The OpenSSL Project Authors. All Rights Reserved. +Copyright 1999-2019 The OpenSSL Project Authors. All Rights Reserved. +Copyright 1999-2018 The OpenSSL Project Authors. All Rights Reserved. +Copyright 1999-2017 The OpenSSL Project Authors. All Rights Reserved. +Copyright 1999-2016 The OpenSSL Project Authors. All Rights Reserved. +Copyright 1998-2022 The OpenSSL Project Authors. All Rights Reserved. +Copyright 1998-2021 The OpenSSL Project Authors. All Rights Reserved. +Copyright 1998-2020 The OpenSSL Project Authors. All Rights Reserved. +Copyright 1998-2019 The OpenSSL Project Authors. All Rights Reserved. +Copyright 1998-2018 The OpenSSL Project Authors. All Rights Reserved. +Copyright 1998-2017 The OpenSSL Project Authors. All Rights Reserved. +Copyright 1998-2016 The OpenSSL Project Authors. All Rights Reserved. +Copyright 1998-2001 The OpenSSL Project Authors. All Rights Reserved. +Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved. +Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. +Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. +Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. +Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. +Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved. +Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. +Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. +Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved. +Copyright (C) 2017 National Security Research Institute. All Rights Reserved. +Copyright (c) 2017 National Security Research Institute. All rights reserved. +Copyright (c) 2017 National Security Research Institute. All rights reserved. +Copyright (c) 2016 Viktor Dukhovni . +Copyright (c) 2015, CloudFlare, Inc. +Copyright (c) 2014, Intel Corporation. All Rights Reserved. +Copyright (c) 2013-2014 Timo Teräs +Copyright (c) 2012-2016 Jean-Philippe Aumasson +Copyright (c) 2012-2014 Daniel J. Bernstein +Copyright (c) 2012, Intel Corporation. All Rights Reserved. +Copyright (c) 2008 Andy Polyakov +Copyright (c) 2007 KISA(Korea Information Security Agency). All rights reserved. +Copyright (C) 2006, Network Resonance, Inc.Copyright (C) 2011, RTFM, Inc. +Copyright (c) 2004, Richard Levitte +Copyright (c) 2004, EdelKey Project. All Rights Reserved. +Copyright (c) 2004, 2018, Richard Levitte +Copyright (c) 2004 Kungliga Tekniska Högskolan +Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved +Copyright (c) 2002 The OpenTSA Project. All rights reserved. +Copyright (C) 19yy +Copyright (c) 1998-2021 The OpenSSL Project +Copyright (c) 1998-2020 The OpenSSL Project +Copyright (c) 1998-2019 The OpenSSL Project. All rights reserved. +Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) +Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson +Copyright (C) 1989, 1991 Free Software Foundation, Inc. diff --git a/deps/openssl/openssl/Configurations/10-main.conf b/deps/openssl/openssl/Configurations/10-main.conf index ff8af7146..8010087b4 100644 --- a/deps/openssl/openssl/Configurations/10-main.conf +++ b/deps/openssl/openssl/Configurations/10-main.conf @@ -9,22 +9,19 @@ sub vc_win64a_info { $vc_win64a_info = { AS => "nasm", ASFLAGS => "-g", asflags => "-Ox -f win64 -DNEAR", - asoutflag => "-o ", - perlasm_scheme => "nasm" }; + asoutflag => "-o " }; } elsif ($disabled{asm}) { # assembler is still used to compile uplink shim $vc_win64a_info = { AS => "ml64", ASFLAGS => "/nologo /Zi", asflags => "/c /Cp /Cx", - asoutflag => "/Fo", - perlasm_scheme => "masm" }; + asoutflag => "/Fo" }; } else { $die->("NASM not found - make sure it's installed and available on %PATH%\n"); $vc_win64a_info = { AS => "{unknown}", ASFLAGS => "", asflags => "", - asoutflag => "", - perlasm_scheme => "auto" }; + asoutflag => "" }; } } return $vc_win64a_info; @@ -1419,7 +1416,7 @@ my %targets = ( sys_id => "WIN64A", uplink_arch => 'x86_64', asm_arch => 'x86_64', - perlasm_scheme => sub { vc_win64a_info()->{perlasm_scheme} }, + perlasm_scheme => "auto", multilib => "-x64", }, "VC-WIN32" => { @@ -1941,15 +1938,5 @@ my %targets = ( inherit_from => [ "vms-generic" ], bn_ops => "SIXTY_FOUR_BIT", pointer_size => "", - }, - "vms-x86_64-p32" => { - inherit_from => [ "vms-x86_64" ], - cflags => add("/POINTER_SIZE=32"), - pointer_size => "32", - }, - "vms-x86_64-p64" => { - inherit_from => [ "vms-x86_64" ], - cflags => add("/POINTER_SIZE=64=ARGV"), - pointer_size => "64", } ); diff --git a/deps/openssl/openssl/Configurations/README.md b/deps/openssl/openssl/Configurations/README.md index de3d8bad8..be8c394d0 100644 --- a/deps/openssl/openssl/Configurations/README.md +++ b/deps/openssl/openssl/Configurations/README.md @@ -233,14 +233,8 @@ In each table entry, the following keys are significant: is ILP32; RC4_CHAR RC4 key schedule is made up of 'unsigned char's; - Note: should not be used - for new configuration - targets RC4_INT RC4 key schedule is made up of 'unsigned int's; - Note: should not be used - for new configuration - targets [1] as part of the target configuration, one can have a key called `inherit_from` that indicates what other configurations to inherit diff --git a/deps/openssl/openssl/Configurations/descrip.mms.tmpl b/deps/openssl/openssl/Configurations/descrip.mms.tmpl index c722a754b..337fc1e5e 100644 --- a/deps/openssl/openssl/Configurations/descrip.mms.tmpl +++ b/deps/openssl/openssl/Configurations/descrip.mms.tmpl @@ -478,8 +478,7 @@ build_all_generated : $(GENERATED_MANDATORY) $(GENERATED) build_docs all : build_sw build_docs test : tests -{- dependmagic('tests'); -} : build_programs_nodep, build_modules_nodep - $(MMS) $(MMSQUALIFIERS) run_tests +{- dependmagic('tests'); -} : build_programs_nodep, build_modules_nodep run_tests run_tests : @ ! {- output_off() if $disabled{tests}; "" -} DEFINE SRCTOP "$(SRCDIR)" @@ -711,15 +710,13 @@ vmsconfig.pm : configdata.pm WRITE CONFIG " shlib_version => '","{- $config{shlib_version} -}","'," WRITE CONFIG " shlib_major => '","{- $config{shlib_major} -}","'," WRITE CONFIG " shlib_minor => '","{- $config{shlib_minor} -}","'," + WRITE CONFIG " no_shared => '","{- $disabled{shared} -}","'," WRITE CONFIG " INSTALLTOP => '$(INSTALLTOP)'," WRITE CONFIG " OPENSSLDIR => '$(OPENSSLDIR)'," - WRITE CONFIG ");" - WRITE CONFIG "our %target = (" WRITE CONFIG " pointer_size => '","{- $target{pointer_size} -}","'," WRITE CONFIG ");" - WRITE CONFIG "our %disabled = (" - WRITE CONFIG " shared => '","{- $disabled{shared} -}","'," - WRITE CONFIG ");" + WRITE CONFIG "our %target = ();" + WRITE CONFIG "our %disabled = ();" WRITE CONFIG "our %withargs = ();" WRITE CONFIG "our %unified_info = ();" WRITE CONFIG "1;" diff --git a/deps/openssl/openssl/Configurations/unix-Makefile.tmpl b/deps/openssl/openssl/Configurations/unix-Makefile.tmpl index 3754595d3..17e194f1e 100644 --- a/deps/openssl/openssl/Configurations/unix-Makefile.tmpl +++ b/deps/openssl/openssl/Configurations/unix-Makefile.tmpl @@ -526,9 +526,8 @@ build_all_generated: $(GENERATED_MANDATORY) $(GENERATED) build_docs all: build_sw build_docs test: tests -{- dependmagic('tests'); -}: build_programs_nodep build_modules_nodep link-utils - $(MAKE) run_tests -run_tests: FORCE +{- dependmagic('tests'); -}: build_programs_nodep build_modules_nodep link-utils run_tests +run_tests: @ : {- output_off() if $disabled{tests}; "" -} ( SRCTOP=$(SRCDIR) \ BLDTOP=$(BLDDIR) \ @@ -615,28 +614,28 @@ uninstall_sw: uninstall_runtime uninstall_modules uninstall_engines uninstall_de install_docs: install_man_docs install_html_docs uninstall_docs: uninstall_man_docs uninstall_html_docs - $(RM) -r "$(DESTDIR)$(DOCDIR)" + $(RM) -r $(DESTDIR)$(DOCDIR) {- output_off() if $disabled{fips}; "" -} install_fips: build_sw $(INSTALL_FIPSMODULECONF) @[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1) - @$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(MODULESDIR)" - @$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(OPENSSLDIR)" + @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(MODULESDIR) + @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(OPENSSLDIR) @$(ECHO) "*** Installing FIPS module" @$(ECHO) "install $(INSTALL_FIPSMODULE) -> $(DESTDIR)$(MODULESDIR)/$(FIPSMODULENAME)" - @cp "$(INSTALL_FIPSMODULE)" "$(DESTDIR)$(MODULESDIR)/$(FIPSMODULENAME).new" - @chmod 755 "$(DESTDIR)$(MODULESDIR)/$(FIPSMODULENAME).new" - @mv -f "$(DESTDIR)$(MODULESDIR)/$(FIPSMODULENAME).new" \ - "$(DESTDIR)$(MODULESDIR)/$(FIPSMODULENAME)" + @cp "$(INSTALL_FIPSMODULE)" $(DESTDIR)$(MODULESDIR)/$(FIPSMODULENAME).new + @chmod 755 $(DESTDIR)$(MODULESDIR)/$(FIPSMODULENAME).new + @mv -f $(DESTDIR)$(MODULESDIR)/$(FIPSMODULENAME).new \ + $(DESTDIR)$(MODULESDIR)/$(FIPSMODULENAME) @$(ECHO) "*** Installing FIPS module configuration" @$(ECHO) "install $(INSTALL_FIPSMODULECONF) -> $(DESTDIR)$(OPENSSLDIR)/fipsmodule.cnf" - @cp $(INSTALL_FIPSMODULECONF) "$(DESTDIR)$(OPENSSLDIR)/fipsmodule.cnf" + @cp $(INSTALL_FIPSMODULECONF) $(DESTDIR)$(OPENSSLDIR)/fipsmodule.cnf uninstall_fips: @$(ECHO) "*** Uninstalling FIPS module configuration" - $(RM) "$(DESTDIR)$(OPENSSLDIR)/fipsmodule.cnf" + $(RM) $(DESTDIR)$(OPENSSLDIR)/fipsmodule.cnf @$(ECHO) "*** Uninstalling FIPS module" - $(RM) "$(DESTDIR)$(MODULESDIR)/$(FIPSMODULENAME)" + $(RM) $(DESTDIR)$(MODULESDIR)/$(FIPSMODULENAME) {- if ($disabled{fips}) { output_on(); } else { output_off(); } "" -} install_fips: @$(ECHO) "The 'install_fips' target requires the 'enable-fips' option" @@ -647,75 +646,75 @@ uninstall_fips: install_ssldirs: - @$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(OPENSSLDIR)/certs" - @$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(OPENSSLDIR)/private" - @$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(OPENSSLDIR)/misc" + @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(OPENSSLDIR)/certs + @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(OPENSSLDIR)/private + @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(OPENSSLDIR)/misc @set -e; for x in dummy $(MISC_SCRIPTS); do \ if [ "$$x" = "dummy" ]; then continue; fi; \ x1=`echo "$$x" | cut -f1 -d:`; \ x2=`echo "$$x" | cut -f2 -d:`; \ fn=`basename $$x1`; \ $(ECHO) "install $$x1 -> $(DESTDIR)$(OPENSSLDIR)/misc/$$fn"; \ - cp $$x1 "$(DESTDIR)$(OPENSSLDIR)/misc/$$fn.new"; \ - chmod 755 "$(DESTDIR)$(OPENSSLDIR)/misc/$$fn.new"; \ - mv -f "$(DESTDIR)$(OPENSSLDIR)/misc/$$fn.new" \ - "$(DESTDIR)$(OPENSSLDIR)/misc/$$fn"; \ + cp $$x1 $(DESTDIR)$(OPENSSLDIR)/misc/$$fn.new; \ + chmod 755 $(DESTDIR)$(OPENSSLDIR)/misc/$$fn.new; \ + mv -f $(DESTDIR)$(OPENSSLDIR)/misc/$$fn.new \ + $(DESTDIR)$(OPENSSLDIR)/misc/$$fn; \ if [ "$$x1" != "$$x2" ]; then \ ln=`basename "$$x2"`; \ : {- output_off() unless windowsdll(); "" -}; \ $(ECHO) "copy $(DESTDIR)$(OPENSSLDIR)/misc/$$ln -> $(DESTDIR)$(OPENSSLDIR)/misc/$$fn"; \ - cp "$(DESTDIR)$(OPENSSLDIR)/misc/$$fn" "$(DESTDIR)$(OPENSSLDIR)/misc/$$ln"; \ + cp $(DESTDIR)$(OPENSSLDIR)/misc/$$fn $(DESTDIR)$(OPENSSLDIR)/misc/$$ln; \ : {- output_on() unless windowsdll(); output_off() if windowsdll(); "" -}; \ $(ECHO) "link $(DESTDIR)$(OPENSSLDIR)/misc/$$ln -> $(DESTDIR)$(OPENSSLDIR)/misc/$$fn"; \ - ln -sf $$fn "$(DESTDIR)$(OPENSSLDIR)/misc/$$ln"; \ + ln -sf $$fn $(DESTDIR)$(OPENSSLDIR)/misc/$$ln; \ : {- output_on() if windowsdll(); "" -}; \ fi; \ done @$(ECHO) "install $(SRCDIR)/apps/openssl.cnf -> $(DESTDIR)$(OPENSSLDIR)/openssl.cnf.dist" - @cp $(SRCDIR)/apps/openssl.cnf "$(DESTDIR)$(OPENSSLDIR)/openssl.cnf.new" - @chmod 644 "$(DESTDIR)$(OPENSSLDIR)/openssl.cnf.new" - @mv -f "$(DESTDIR)$(OPENSSLDIR)/openssl.cnf.new" "$(DESTDIR)$(OPENSSLDIR)/openssl.cnf.dist" + @cp $(SRCDIR)/apps/openssl.cnf $(DESTDIR)$(OPENSSLDIR)/openssl.cnf.new + @chmod 644 $(DESTDIR)$(OPENSSLDIR)/openssl.cnf.new + @mv -f $(DESTDIR)$(OPENSSLDIR)/openssl.cnf.new $(DESTDIR)$(OPENSSLDIR)/openssl.cnf.dist @if [ ! -f "$(DESTDIR)$(OPENSSLDIR)/openssl.cnf" ]; then \ $(ECHO) "install $(SRCDIR)/apps/openssl.cnf -> $(DESTDIR)$(OPENSSLDIR)/openssl.cnf"; \ - cp $(SRCDIR)/apps/openssl.cnf "$(DESTDIR)$(OPENSSLDIR)/openssl.cnf"; \ - chmod 644 "$(DESTDIR)$(OPENSSLDIR)/openssl.cnf"; \ + cp $(SRCDIR)/apps/openssl.cnf $(DESTDIR)$(OPENSSLDIR)/openssl.cnf; \ + chmod 644 $(DESTDIR)$(OPENSSLDIR)/openssl.cnf; \ fi @$(ECHO) "install $(SRCDIR)/apps/ct_log_list.cnf -> $(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf.dist" - @cp $(SRCDIR)/apps/ct_log_list.cnf "$(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf.new" - @chmod 644 "$(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf.new" - @mv -f "$(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf.new" "$(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf.dist" + @cp $(SRCDIR)/apps/ct_log_list.cnf $(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf.new + @chmod 644 $(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf.new + @mv -f $(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf.new $(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf.dist @if [ ! -f "$(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf" ]; then \ $(ECHO) "install $(SRCDIR)/apps/ct_log_list.cnf -> $(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf"; \ - cp $(SRCDIR)/apps/ct_log_list.cnf "$(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf"; \ - chmod 644 "$(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf"; \ + cp $(SRCDIR)/apps/ct_log_list.cnf $(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf; \ + chmod 644 $(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf; \ fi install_dev: install_runtime_libs @[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1) @$(ECHO) "*** Installing development files" - @$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(INSTALLTOP)/include/openssl" + @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(INSTALLTOP)/include/openssl @ : {- output_off() if $disabled{uplink}; "" -} @$(ECHO) "install $(SRCDIR)/ms/applink.c -> $(DESTDIR)$(INSTALLTOP)/include/openssl/applink.c" - @cp $(SRCDIR)/ms/applink.c "$(DESTDIR)$(INSTALLTOP)/include/openssl/applink.c" - @chmod 644 "$(DESTDIR)$(INSTALLTOP)/include/openssl/applink.c" + @cp $(SRCDIR)/ms/applink.c $(DESTDIR)$(INSTALLTOP)/include/openssl/applink.c + @chmod 644 $(DESTDIR)$(INSTALLTOP)/include/openssl/applink.c @ : {- output_on() if $disabled{uplink}; "" -} @set -e; for i in $(SRCDIR)/include/openssl/*.h \ $(BLDDIR)/include/openssl/*.h; do \ fn=`basename $$i`; \ $(ECHO) "install $$i -> $(DESTDIR)$(INSTALLTOP)/include/openssl/$$fn"; \ - cp $$i "$(DESTDIR)$(INSTALLTOP)/include/openssl/$$fn"; \ - chmod 644 "$(DESTDIR)$(INSTALLTOP)/include/openssl/$$fn"; \ + cp $$i $(DESTDIR)$(INSTALLTOP)/include/openssl/$$fn; \ + chmod 644 $(DESTDIR)$(INSTALLTOP)/include/openssl/$$fn; \ done - @$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(libdir)" + @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(libdir) @set -e; for l in $(INSTALL_LIBS); do \ fn=`basename $$l`; \ $(ECHO) "install $$l -> $(DESTDIR)$(libdir)/$$fn"; \ - cp $$l "$(DESTDIR)$(libdir)/$$fn.new"; \ - $(RANLIB) "$(DESTDIR)$(libdir)/$$fn.new"; \ - chmod 644 "$(DESTDIR)$(libdir)/$$fn.new"; \ - mv -f "$(DESTDIR)$(libdir)/$$fn.new" \ - "$(DESTDIR)$(libdir)/$$fn"; \ + cp $$l $(DESTDIR)$(libdir)/$$fn.new; \ + $(RANLIB) $(DESTDIR)$(libdir)/$$fn.new; \ + chmod 644 $(DESTDIR)$(libdir)/$$fn.new; \ + mv -f $(DESTDIR)$(libdir)/$$fn.new \ + $(DESTDIR)$(libdir)/$$fn; \ done @ : {- output_off() if $disabled{shared}; "" -} @set -e; for s in $(INSTALL_SHLIB_INFO); do \ @@ -728,18 +727,18 @@ install_dev: install_runtime_libs : {- output_off(); output_on() unless windowsdll() or sharedaix(); "" -}; \ if [ "$$fn2" != "" ]; then \ $(ECHO) "link $(DESTDIR)$(libdir)/$$fn2 -> $(DESTDIR)$(libdir)/$$fn1"; \ - ln -sf $$fn1 "$(DESTDIR)$(libdir)/$$fn2"; \ + ln -sf $$fn1 $(DESTDIR)$(libdir)/$$fn2; \ fi; \ : {- output_off() unless windowsdll() or sharedaix(); output_on() if windowsdll(); "" -}; \ if [ "$$fn3" != "" ]; then \ $(ECHO) "install $$s3 -> $(DESTDIR)$(libdir)/$$fn3"; \ - cp $$s3 "$(DESTDIR)$(libdir)/$$fn3.new"; \ - chmod 755 "$(DESTDIR)$(libdir)/$$fn3.new"; \ - mv -f "$(DESTDIR)$(libdir)/$$fn3.new" \ - "$(DESTDIR)$(libdir)/$$fn3"; \ + cp $$s3 $(DESTDIR)$(libdir)/$$fn3.new; \ + chmod 755 $(DESTDIR)$(libdir)/$$fn3.new; \ + mv -f $(DESTDIR)$(libdir)/$$fn3.new \ + $(DESTDIR)$(libdir)/$$fn3; \ fi; \ : {- output_off() if windowsdll(); output_on() if sharedaix(); "" -}; \ - a="$(DESTDIR)$(libdir)/$$fn2"; \ + a=$(DESTDIR)$(libdir)/$$fn2; \ $(ECHO) "install $$s1 -> $$a"; \ if [ -f $$a ]; then ( trap "rm -rf /tmp/ar.$$$$" INT 0; \ mkdir /tmp/ar.$$$$; ( cd /tmp/ar.$$$$; \ @@ -756,35 +755,35 @@ install_dev: install_runtime_libs : {- output_off() if sharedaix(); output_on(); "" -}; \ done @ : {- output_on() if $disabled{shared}; "" -} - @$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(libdir)/pkgconfig" + @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(libdir)/pkgconfig @$(ECHO) "install libcrypto.pc -> $(DESTDIR)$(libdir)/pkgconfig/libcrypto.pc" - @cp libcrypto.pc "$(DESTDIR)$(libdir)/pkgconfig" - @chmod 644 "$(DESTDIR)$(libdir)/pkgconfig/libcrypto.pc" + @cp libcrypto.pc $(DESTDIR)$(libdir)/pkgconfig + @chmod 644 $(DESTDIR)$(libdir)/pkgconfig/libcrypto.pc @$(ECHO) "install libssl.pc -> $(DESTDIR)$(libdir)/pkgconfig/libssl.pc" - @cp libssl.pc "$(DESTDIR)$(libdir)/pkgconfig" - @chmod 644 "$(DESTDIR)$(libdir)/pkgconfig/libssl.pc" + @cp libssl.pc $(DESTDIR)$(libdir)/pkgconfig + @chmod 644 $(DESTDIR)$(libdir)/pkgconfig/libssl.pc @$(ECHO) "install openssl.pc -> $(DESTDIR)$(libdir)/pkgconfig/openssl.pc" - @cp openssl.pc "$(DESTDIR)$(libdir)/pkgconfig" - @chmod 644 "$(DESTDIR)$(libdir)/pkgconfig/openssl.pc" + @cp openssl.pc $(DESTDIR)$(libdir)/pkgconfig + @chmod 644 $(DESTDIR)$(libdir)/pkgconfig/openssl.pc uninstall_dev: uninstall_runtime_libs @$(ECHO) "*** Uninstalling development files" @ : {- output_off() if $disabled{uplink}; "" -} @$(ECHO) "$(RM) $(DESTDIR)$(INSTALLTOP)/include/openssl/applink.c" - @$(RM) "$(DESTDIR)$(INSTALLTOP)/include/openssl/applink.c" + @$(RM) $(DESTDIR)$(INSTALLTOP)/include/openssl/applink.c @ : {- output_on() if $disabled{uplink}; "" -} @set -e; for i in $(SRCDIR)/include/openssl/*.h \ $(BLDDIR)/include/openssl/*.h; do \ fn=`basename $$i`; \ $(ECHO) "$(RM) $(DESTDIR)$(INSTALLTOP)/include/openssl/$$fn"; \ - $(RM) "$(DESTDIR)$(INSTALLTOP)/include/openssl/$$fn"; \ + $(RM) $(DESTDIR)$(INSTALLTOP)/include/openssl/$$fn; \ done - -$(RMDIR) "$(DESTDIR)$(INSTALLTOP)/include/openssl" - -$(RMDIR) "$(DESTDIR)$(INSTALLTOP)/include" + -$(RMDIR) $(DESTDIR)$(INSTALLTOP)/include/openssl + -$(RMDIR) $(DESTDIR)$(INSTALLTOP)/include @set -e; for l in $(INSTALL_LIBS); do \ fn=`basename $$l`; \ $(ECHO) "$(RM) $(DESTDIR)$(libdir)/$$fn"; \ - $(RM) "$(DESTDIR)$(libdir)/$$fn"; \ + $(RM) $(DESTDIR)$(libdir)/$$fn; \ done @ : {- output_off() if $disabled{shared}; "" -} @set -e; for s in $(INSTALL_SHLIB_INFO); do \ @@ -796,39 +795,39 @@ uninstall_dev: uninstall_runtime_libs fn3=`basename "$$s3"`; \ : {- output_off() if windowsdll(); "" -}; \ $(ECHO) "$(RM) $(DESTDIR)$(libdir)/$$fn1"; \ - $(RM) "$(DESTDIR)$(libdir)/$$fn1"; \ + $(RM) $(DESTDIR)$(libdir)/$$fn1; \ if [ -n "$$fn2" ]; then \ $(ECHO) "$(RM) $(DESTDIR)$(libdir)/$$fn2"; \ - $(RM) "$(DESTDIR)$(libdir)/$$fn2"; \ + $(RM) $(DESTDIR)$(libdir)/$$fn2; \ fi; \ : {- output_on() if windowsdll(); "" -}{- output_off() unless windowsdll(); "" -}; \ if [ -n "$$fn3" ]; then \ $(ECHO) "$(RM) $(DESTDIR)$(libdir)/$$fn3"; \ - $(RM) "$(DESTDIR)$(libdir)/$$fn3"; \ + $(RM) $(DESTDIR)$(libdir)/$$fn3; \ fi; \ : {- output_on() unless windowsdll(); "" -}; \ done @ : {- output_on() if $disabled{shared}; "" -} - $(RM) "$(DESTDIR)$(libdir)/pkgconfig/libcrypto.pc" - $(RM) "$(DESTDIR)$(libdir)/pkgconfig/libssl.pc" - $(RM) "$(DESTDIR)$(libdir)/pkgconfig/openssl.pc" - -$(RMDIR) "$(DESTDIR)$(libdir)/pkgconfig" - -$(RMDIR) "$(DESTDIR)$(libdir)" + $(RM) $(DESTDIR)$(libdir)/pkgconfig/libcrypto.pc + $(RM) $(DESTDIR)$(libdir)/pkgconfig/libssl.pc + $(RM) $(DESTDIR)$(libdir)/pkgconfig/openssl.pc + -$(RMDIR) $(DESTDIR)$(libdir)/pkgconfig + -$(RMDIR) $(DESTDIR)$(libdir) _install_modules_deps: install_runtime_libs build_modules install_engines: _install_modules_deps @[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1) - @$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(ENGINESDIR)/" + @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(ENGINESDIR)/ @$(ECHO) "*** Installing engines" @set -e; for e in dummy $(INSTALL_ENGINES); do \ if [ "$$e" = "dummy" ]; then continue; fi; \ fn=`basename $$e`; \ $(ECHO) "install $$e -> $(DESTDIR)$(ENGINESDIR)/$$fn"; \ - cp $$e "$(DESTDIR)$(ENGINESDIR)/$$fn.new"; \ - chmod 755 "$(DESTDIR)$(ENGINESDIR)/$$fn.new"; \ - mv -f "$(DESTDIR)$(ENGINESDIR)/$$fn.new" \ - "$(DESTDIR)$(ENGINESDIR)/$$fn"; \ + cp $$e $(DESTDIR)$(ENGINESDIR)/$$fn.new; \ + chmod 755 $(DESTDIR)$(ENGINESDIR)/$$fn.new; \ + mv -f $(DESTDIR)$(ENGINESDIR)/$$fn.new \ + $(DESTDIR)$(ENGINESDIR)/$$fn; \ done uninstall_engines: @@ -837,22 +836,22 @@ uninstall_engines: if [ "$$e" = "dummy" ]; then continue; fi; \ fn=`basename $$e`; \ $(ECHO) "$(RM) $(DESTDIR)$(ENGINESDIR)/$$fn"; \ - $(RM) "$(DESTDIR)$(ENGINESDIR)/$$fn"; \ + $(RM) $(DESTDIR)$(ENGINESDIR)/$$fn; \ done - -$(RMDIR) "$(DESTDIR)$(ENGINESDIR)" + -$(RMDIR) $(DESTDIR)$(ENGINESDIR) install_modules: _install_modules_deps @[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1) - @$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(MODULESDIR)/" + @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(MODULESDIR)/ @$(ECHO) "*** Installing modules" @set -e; for e in dummy $(INSTALL_MODULES); do \ if [ "$$e" = "dummy" ]; then continue; fi; \ fn=`basename $$e`; \ $(ECHO) "install $$e -> $(DESTDIR)$(MODULESDIR)/$$fn"; \ - cp $$e "$(DESTDIR)$(MODULESDIR)/$$fn.new"; \ - chmod 755 "$(DESTDIR)$(MODULESDIR)/$$fn.new"; \ - mv -f "$(DESTDIR)$(MODULESDIR)/$$fn.new" \ - "$(DESTDIR)$(MODULESDIR)/$$fn"; \ + cp $$e $(DESTDIR)$(MODULESDIR)/$$fn.new; \ + chmod 755 $(DESTDIR)$(MODULESDIR)/$$fn.new; \ + mv -f $(DESTDIR)$(MODULESDIR)/$$fn.new \ + $(DESTDIR)$(MODULESDIR)/$$fn; \ done uninstall_modules: @@ -861,18 +860,18 @@ uninstall_modules: if [ "$$e" = "dummy" ]; then continue; fi; \ fn=`basename $$e`; \ $(ECHO) "$(RM) $(DESTDIR)$(MODULESDIR)/$$fn"; \ - $(RM) "$(DESTDIR)$(MODULESDIR)/$$fn"; \ + $(RM) $(DESTDIR)$(MODULESDIR)/$$fn; \ done - -$(RMDIR) "$(DESTDIR)$(MODULESDIR)" + -$(RMDIR) $(DESTDIR)$(MODULESDIR) install_runtime: install_programs install_runtime_libs: build_libs @[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1) @ : {- output_off() if windowsdll(); "" -} - @$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(libdir)" + @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(libdir) @ : {- output_on() if windowsdll(); output_off() unless windowsdll(); "" -} - @$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(INSTALLTOP)/bin" + @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(INSTALLTOP)/bin @ : {- output_on() unless windowsdll(); "" -} @$(ECHO) "*** Installing runtime libraries" @set -e; for s in dummy $(INSTALL_SHLIBS); do \ @@ -880,40 +879,40 @@ install_runtime_libs: build_libs fn=`basename $$s`; \ : {- output_off() unless windowsdll(); "" -}; \ $(ECHO) "install $$s -> $(DESTDIR)$(INSTALLTOP)/bin/$$fn"; \ - cp $$s "$(DESTDIR)$(INSTALLTOP)/bin/$$fn.new"; \ - chmod 755 "$(DESTDIR)$(INSTALLTOP)/bin/$$fn.new"; \ - mv -f "$(DESTDIR)$(INSTALLTOP)/bin/$$fn.new" \ - "$(DESTDIR)$(INSTALLTOP)/bin/$$fn"; \ + cp $$s $(DESTDIR)$(INSTALLTOP)/bin/$$fn.new; \ + chmod 755 $(DESTDIR)$(INSTALLTOP)/bin/$$fn.new; \ + mv -f $(DESTDIR)$(INSTALLTOP)/bin/$$fn.new \ + $(DESTDIR)$(INSTALLTOP)/bin/$$fn; \ : {- output_on() unless windowsdll(); "" -}{- output_off() if windowsdll(); "" -}; \ $(ECHO) "install $$s -> $(DESTDIR)$(libdir)/$$fn"; \ - cp $$s "$(DESTDIR)$(libdir)/$$fn.new"; \ - chmod 755 "$(DESTDIR)$(libdir)/$$fn.new"; \ - mv -f "$(DESTDIR)$(libdir)/$$fn.new" \ - "$(DESTDIR)$(libdir)/$$fn"; \ + cp $$s $(DESTDIR)$(libdir)/$$fn.new; \ + chmod 755 $(DESTDIR)$(libdir)/$$fn.new; \ + mv -f $(DESTDIR)$(libdir)/$$fn.new \ + $(DESTDIR)$(libdir)/$$fn; \ : {- output_on() if windowsdll(); "" -}; \ done install_programs: install_runtime_libs build_programs @[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1) - @$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(INSTALLTOP)/bin" + @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(INSTALLTOP)/bin @$(ECHO) "*** Installing runtime programs" @set -e; for x in dummy $(INSTALL_PROGRAMS); do \ if [ "$$x" = "dummy" ]; then continue; fi; \ fn=`basename $$x`; \ $(ECHO) "install $$x -> $(DESTDIR)$(INSTALLTOP)/bin/$$fn"; \ - cp $$x "$(DESTDIR)$(INSTALLTOP)/bin/$$fn.new"; \ - chmod 755 "$(DESTDIR)$(INSTALLTOP)/bin/$$fn.new"; \ - mv -f "$(DESTDIR)$(INSTALLTOP)/bin/$$fn.new" \ - "$(DESTDIR)$(INSTALLTOP)/bin/$$fn"; \ + cp $$x $(DESTDIR)$(INSTALLTOP)/bin/$$fn.new; \ + chmod 755 $(DESTDIR)$(INSTALLTOP)/bin/$$fn.new; \ + mv -f $(DESTDIR)$(INSTALLTOP)/bin/$$fn.new \ + $(DESTDIR)$(INSTALLTOP)/bin/$$fn; \ done @set -e; for x in dummy $(BIN_SCRIPTS); do \ if [ "$$x" = "dummy" ]; then continue; fi; \ fn=`basename $$x`; \ $(ECHO) "install $$x -> $(DESTDIR)$(INSTALLTOP)/bin/$$fn"; \ - cp $$x "$(DESTDIR)$(INSTALLTOP)/bin/$$fn.new"; \ - chmod 755 "$(DESTDIR)$(INSTALLTOP)/bin/$$fn.new"; \ - mv -f "$(DESTDIR)$(INSTALLTOP)/bin/$$fn.new" \ - "$(DESTDIR)$(INSTALLTOP)/bin/$$fn"; \ + cp $$x $(DESTDIR)$(INSTALLTOP)/bin/$$fn.new; \ + chmod 755 $(DESTDIR)$(INSTALLTOP)/bin/$$fn.new; \ + mv -f $(DESTDIR)$(INSTALLTOP)/bin/$$fn.new \ + $(DESTDIR)$(INSTALLTOP)/bin/$$fn; \ done uninstall_runtime: uninstall_programs uninstall_runtime_libs @@ -925,16 +924,16 @@ uninstall_programs: if [ "$$x" = "dummy" ]; then continue; fi; \ fn=`basename $$x`; \ $(ECHO) "$(RM) $(DESTDIR)$(INSTALLTOP)/bin/$$fn"; \ - $(RM) "$(DESTDIR)$(INSTALLTOP)/bin/$$fn"; \ + $(RM) $(DESTDIR)$(INSTALLTOP)/bin/$$fn; \ done; @set -e; for x in dummy $(BIN_SCRIPTS); \ do \ if [ "$$x" = "dummy" ]; then continue; fi; \ fn=`basename $$x`; \ $(ECHO) "$(RM) $(DESTDIR)$(INSTALLTOP)/bin/$$fn"; \ - $(RM) "$(DESTDIR)$(INSTALLTOP)/bin/$$fn"; \ + $(RM) $(DESTDIR)$(INSTALLTOP)/bin/$$fn; \ done - -$(RMDIR) "$(DESTDIR)$(INSTALLTOP)/bin" + -$(RMDIR) $(DESTDIR)$(INSTALLTOP)/bin uninstall_runtime_libs: @$(ECHO) "*** Uninstalling runtime libraries" @@ -943,49 +942,49 @@ uninstall_runtime_libs: if [ "$$s" = "dummy" ]; then continue; fi; \ fn=`basename $$s`; \ $(ECHO) "$(RM) $(DESTDIR)$(INSTALLTOP)/bin/$$fn"; \ - $(RM) "$(DESTDIR)$(INSTALLTOP)/bin/$$fn"; \ + $(RM) $(DESTDIR)$(INSTALLTOP)/bin/$$fn; \ done @ : {- output_on() unless windowsdll(); "" -} install_man_docs: build_man_docs @[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1) - @$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(MANDIR)/man1" - @$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(MANDIR)/man3" - @$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(MANDIR)/man5" - @$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(MANDIR)/man7" + @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(MANDIR)/man1 + @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(MANDIR)/man3 + @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(MANDIR)/man5 + @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(MANDIR)/man7 @$(ECHO) "*** Installing manpages" @set -e; for x in dummy $(MANDOCS1); do \ if [ "$$x" = "dummy" ]; then continue; fi; \ fn=`basename $$x`; \ $(ECHO) "install $$x -> $(DESTDIR)$(MANDIR)/man1/$${fn}$(MANSUFFIX)"; \ - cp $$x "$(DESTDIR)$(MANDIR)/man1/$${fn}$(MANSUFFIX)"; \ - chmod 644 "$(DESTDIR)$(MANDIR)/man1/$${fn}$(MANSUFFIX)"; \ - $(PERL) $(SRCDIR)/util/write-man-symlinks install $(SRCDIR)/doc/man1 $(BLDDIR)/doc/man1 $${fn}$(MANSUFFIX) "$(DESTDIR)$(MANDIR)/man1"; \ + cp $$x $(DESTDIR)$(MANDIR)/man1/$${fn}$(MANSUFFIX); \ + chmod 644 $(DESTDIR)$(MANDIR)/man1/$${fn}$(MANSUFFIX); \ + $(PERL) $(SRCDIR)/util/write-man-symlinks install $(SRCDIR)/doc/man1 $(BLDDIR)/doc/man1 $${fn}$(MANSUFFIX) $(DESTDIR)$(MANDIR)/man1; \ done @set -e; for x in dummy $(MANDOCS3); do \ if [ "$$x" = "dummy" ]; then continue; fi; \ fn=`basename $$x`; \ $(ECHO) "install $$x -> $(DESTDIR)$(MANDIR)/man3/$${fn}$(MANSUFFIX)"; \ - cp $$x "$(DESTDIR)$(MANDIR)/man3/$${fn}$(MANSUFFIX)"; \ - chmod 644 "$(DESTDIR)$(MANDIR)/man3/$${fn}$(MANSUFFIX)"; \ - $(PERL) $(SRCDIR)/util/write-man-symlinks install $(SRCDIR)/doc/man3 $(BLDDIR)/doc/man3 $${fn}$(MANSUFFIX) "$(DESTDIR)$(MANDIR)/man3"; \ + cp $$x $(DESTDIR)$(MANDIR)/man3/$${fn}$(MANSUFFIX); \ + chmod 644 $(DESTDIR)$(MANDIR)/man3/$${fn}$(MANSUFFIX); \ + $(PERL) $(SRCDIR)/util/write-man-symlinks install $(SRCDIR)/doc/man3 $(BLDDIR)/doc/man3 $${fn}$(MANSUFFIX) $(DESTDIR)$(MANDIR)/man3; \ done @set -e; for x in dummy $(MANDOCS5); do \ if [ "$$x" = "dummy" ]; then continue; fi; \ fn=`basename $$x`; \ $(ECHO) "install $$x -> $(DESTDIR)$(MANDIR)/man5/$${fn}$(MANSUFFIX)"; \ - cp $$x "$(DESTDIR)$(MANDIR)/man5/$${fn}$(MANSUFFIX)"; \ - chmod 644 "$(DESTDIR)$(MANDIR)/man5/$${fn}$(MANSUFFIX)"; \ - $(PERL) $(SRCDIR)/util/write-man-symlinks install $(SRCDIR)/doc/man5 $(BLDDIR)/doc/man5 $${fn}$(MANSUFFIX) "$(DESTDIR)$(MANDIR)/man5"; \ + cp $$x $(DESTDIR)$(MANDIR)/man5/$${fn}$(MANSUFFIX); \ + chmod 644 $(DESTDIR)$(MANDIR)/man5/$${fn}$(MANSUFFIX); \ + $(PERL) $(SRCDIR)/util/write-man-symlinks install $(SRCDIR)/doc/man5 $(BLDDIR)/doc/man5 $${fn}$(MANSUFFIX) $(DESTDIR)$(MANDIR)/man5; \ done @set -e; for x in dummy $(MANDOCS7); do \ if [ "$$x" = "dummy" ]; then continue; fi; \ fn=`basename $$x`; \ $(ECHO) "install $$x -> $(DESTDIR)$(MANDIR)/man7/$${fn}$(MANSUFFIX)"; \ - cp $$x "$(DESTDIR)$(MANDIR)/man7/$${fn}$(MANSUFFIX)"; \ - chmod 644 "$(DESTDIR)$(MANDIR)/man7/$${fn}$(MANSUFFIX)"; \ - $(PERL) $(SRCDIR)/util/write-man-symlinks install $(SRCDIR)/doc/man7 $(BLDDIR)/doc/man7 $${fn}$(MANSUFFIX) "$(DESTDIR)$(MANDIR)/man7"; \ + cp $$x $(DESTDIR)$(MANDIR)/man7/$${fn}$(MANSUFFIX); \ + chmod 644 $(DESTDIR)$(MANDIR)/man7/$${fn}$(MANSUFFIX); \ + $(PERL) $(SRCDIR)/util/write-man-symlinks install $(SRCDIR)/doc/man7 $(BLDDIR)/doc/man7 $${fn}$(MANSUFFIX) $(DESTDIR)$(MANDIR)/man7; \ done uninstall_man_docs: build_man_docs @@ -994,65 +993,65 @@ uninstall_man_docs: build_man_docs if [ "$$x" = "dummy" ]; then continue; fi; \ fn=`basename $$x`; \ $(ECHO) "$(RM) $(DESTDIR)$(MANDIR)/man1/$${fn}$(MANSUFFIX)"; \ - $(RM) "$(DESTDIR)$(MANDIR)/man1/$${fn}$(MANSUFFIX)"; \ - $(PERL) $(SRCDIR)/util/write-man-symlinks uninstall $(SRCDIR)/doc/man1 $(BLDDIR)/doc/man1 $${fn}$(MANSUFFIX) "$(DESTDIR)$(MANDIR)/man1"; \ + $(RM) $(DESTDIR)$(MANDIR)/man1/$${fn}$(MANSUFFIX); \ + $(PERL) $(SRCDIR)/util/write-man-symlinks uninstall $(SRCDIR)/doc/man1 $(BLDDIR)/doc/man1 $${fn}$(MANSUFFIX) $(DESTDIR)$(MANDIR)/man1; \ done @set -e; for x in dummy $(MANDOCS3); do \ if [ "$$x" = "dummy" ]; then continue; fi; \ fn=`basename $$x`; \ $(ECHO) "$(RM) $(DESTDIR)$(MANDIR)/man3/$${fn}$(MANSUFFIX)"; \ - $(RM) "$(DESTDIR)$(MANDIR)/man3/$${fn}$(MANSUFFIX)"; \ - $(PERL) $(SRCDIR)/util/write-man-symlinks uninstall $(SRCDIR)/doc/man3 $(BLDDIR)/doc/man3 $${fn}$(MANSUFFIX) "$(DESTDIR)$(MANDIR)/man3"; \ + $(RM) $(DESTDIR)$(MANDIR)/man3/$${fn}$(MANSUFFIX); \ + $(PERL) $(SRCDIR)/util/write-man-symlinks uninstall $(SRCDIR)/doc/man3 $(BLDDIR)/doc/man3 $${fn}$(MANSUFFIX) $(DESTDIR)$(MANDIR)/man3; \ done @set -e; for x in dummy $(MANDOCS5); do \ if [ "$$x" = "dummy" ]; then continue; fi; \ fn=`basename $$x`; \ $(ECHO) "$(RM) $(DESTDIR)$(MANDIR)/man5/$${fn}$(MANSUFFIX)"; \ - $(RM) "$(DESTDIR)$(MANDIR)/man5/$${fn}$(MANSUFFIX)"; \ - $(PERL) $(SRCDIR)/util/write-man-symlinks uninstall $(SRCDIR)/doc/man5 $(BLDDIR)/doc/man5 $${fn}$(MANSUFFIX) "$(DESTDIR)$(MANDIR)/man5"; \ + $(RM) $(DESTDIR)$(MANDIR)/man5/$${fn}$(MANSUFFIX); \ + $(PERL) $(SRCDIR)/util/write-man-symlinks uninstall $(SRCDIR)/doc/man5 $(BLDDIR)/doc/man5 $${fn}$(MANSUFFIX) $(DESTDIR)$(MANDIR)/man5; \ done @set -e; for x in dummy $(MANDOCS7); do \ if [ "$$x" = "dummy" ]; then continue; fi; \ fn=`basename $$x`; \ $(ECHO) "$(RM) $(DESTDIR)$(MANDIR)/man7/$${fn}$(MANSUFFIX)"; \ - $(RM) "$(DESTDIR)$(MANDIR)/man7/$${fn}$(MANSUFFIX)"; \ - $(PERL) $(SRCDIR)/util/write-man-symlinks uninstall $(SRCDIR)/doc/man7 $(BLDDIR)/doc/man7 $${fn}$(MANSUFFIX) "$(DESTDIR)$(MANDIR)/man7"; \ + $(RM) $(DESTDIR)$(MANDIR)/man7/$${fn}$(MANSUFFIX); \ + $(PERL) $(SRCDIR)/util/write-man-symlinks uninstall $(SRCDIR)/doc/man7 $(BLDDIR)/doc/man7 $${fn}$(MANSUFFIX) $(DESTDIR)$(MANDIR)/man7; \ done install_html_docs: install_image_docs build_html_docs @[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1) - @$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(HTMLDIR)/man1" - @$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(HTMLDIR)/man3" - @$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(HTMLDIR)/man5" - @$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(HTMLDIR)/man7" + @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(HTMLDIR)/man1 + @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(HTMLDIR)/man3 + @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(HTMLDIR)/man5 + @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(HTMLDIR)/man7 @$(ECHO) "*** Installing HTML manpages" @set -e; for x in dummy $(HTMLDOCS1); do \ if [ "$$x" = "dummy" ]; then continue; fi; \ fn=`basename $$x`; \ $(ECHO) "install $$x -> $(DESTDIR)$(HTMLDIR)/man1/$$fn"; \ - cp $$x "$(DESTDIR)$(HTMLDIR)/man1/$$fn"; \ - chmod 644 "$(DESTDIR)$(HTMLDIR)/man1/$$fn"; \ + cp $$x $(DESTDIR)$(HTMLDIR)/man1/$$fn; \ + chmod 644 $(DESTDIR)$(HTMLDIR)/man1/$$fn; \ done @set -e; for x in dummy $(HTMLDOCS3); do \ if [ "$$x" = "dummy" ]; then continue; fi; \ fn=`basename $$x`; \ $(ECHO) "install $$x -> $(DESTDIR)$(HTMLDIR)/man3/$$fn"; \ - cp $$x "$(DESTDIR)$(HTMLDIR)/man3/$$fn"; \ - chmod 644 "$(DESTDIR)$(HTMLDIR)/man3/$$fn"; \ + cp $$x $(DESTDIR)$(HTMLDIR)/man3/$$fn; \ + chmod 644 $(DESTDIR)$(HTMLDIR)/man3/$$fn; \ done @set -e; for x in dummy $(HTMLDOCS5); do \ if [ "$$x" = "dummy" ]; then continue; fi; \ fn=`basename $$x`; \ $(ECHO) "install $$x -> $(DESTDIR)$(HTMLDIR)/man5/$$fn"; \ - cp $$x "$(DESTDIR)$(HTMLDIR)/man5/$$fn"; \ - chmod 644 "$(DESTDIR)$(HTMLDIR)/man5/$$fn"; \ + cp $$x $(DESTDIR)$(HTMLDIR)/man5/$$fn; \ + chmod 644 $(DESTDIR)$(HTMLDIR)/man5/$$fn; \ done @set -e; for x in dummy $(HTMLDOCS7); do \ if [ "$$x" = "dummy" ]; then continue; fi; \ fn=`basename $$x`; \ $(ECHO) "install $$x -> $(DESTDIR)$(HTMLDIR)/man7/$$fn"; \ - cp $$x "$(DESTDIR)$(HTMLDIR)/man7/$$fn"; \ - chmod 644 "$(DESTDIR)$(HTMLDIR)/man7/$$fn"; \ + cp $$x $(DESTDIR)$(HTMLDIR)/man7/$$fn; \ + chmod 644 $(DESTDIR)$(HTMLDIR)/man7/$$fn; \ done uninstall_html_docs: uninstall_image_docs @@ -1061,35 +1060,35 @@ uninstall_html_docs: uninstall_image_docs if [ "$$x" = "dummy" ]; then continue; fi; \ fn=`basename $$x`; \ $(ECHO) "$(RM) $(DESTDIR)$(HTMLDIR)/man1/$$fn"; \ - $(RM) "$(DESTDIR)$(HTMLDIR)/man1/$$fn"; \ + $(RM) $(DESTDIR)$(HTMLDIR)/man1/$$fn; \ done @set -e; for x in dummy $(HTMLDOCS3); do \ if [ "$$x" = "dummy" ]; then continue; fi; \ fn=`basename $$x`; \ $(ECHO) "$(RM) $(DESTDIR)$(HTMLDIR)/man3/$$fn"; \ - $(RM) "$(DESTDIR)$(HTMLDIR)/man3/$$fn"; \ + $(RM) $(DESTDIR)$(HTMLDIR)/man3/$$fn; \ done @set -e; for x in dummy $(HTMLDOCS5); do \ if [ "$$x" = "dummy" ]; then continue; fi; \ fn=`basename $$x`; \ $(ECHO) "$(RM) $(DESTDIR)$(HTMLDIR)/man5/$$fn"; \ - $(RM) "$(DESTDIR)$(HTMLDIR)/man5/$$fn"; \ + $(RM) $(DESTDIR)$(HTMLDIR)/man5/$$fn; \ done @set -e; for x in dummy $(HTMLDOCS7); do \ if [ "$$x" = "dummy" ]; then continue; fi; \ fn=`basename $$x`; \ $(ECHO) "$(RM) $(DESTDIR)$(HTMLDIR)/man7/$$fn"; \ - $(RM) "$(DESTDIR)$(HTMLDIR)/man7/$$fn"; \ + $(RM) $(DESTDIR)$(HTMLDIR)/man7/$$fn; \ done install_image_docs: - @$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(HTMLDIR)/man7/img" + @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(HTMLDIR)/man7/img @set -e; for x in dummy $(IMAGEDOCS7); do \ if [ "$$x" = "dummy" ]; then continue; fi; \ fn=`basename $$x`; \ $(ECHO) "install $$x -> $(DESTDIR)$(HTMLDIR)/man7/img/$$fn"; \ - cp $(SRCDIR)/$$x "$(DESTDIR)$(HTMLDIR)/man7/img/$$fn"; \ - chmod 644 "$(DESTDIR)$(HTMLDIR)/man7/img/$$fn"; \ + cp $(SRCDIR)/$$x $(DESTDIR)$(HTMLDIR)/man7/img/$$fn; \ + chmod 644 $(DESTDIR)$(HTMLDIR)/man7/img/$$fn; \ done uninstall_image_docs: @@ -1097,7 +1096,7 @@ uninstall_image_docs: if [ "$$x" = "dummy" ]; then continue; fi; \ fn=`basename $$x`; \ $(ECHO) "$(RM) $(DESTDIR)$(HTMLDIR)/man7/img/$$fn"; \ - $(RM) "$(DESTDIR)$(HTMLDIR)/man7/img/$$fn"; \ + $(RM) $(DESTDIR)$(HTMLDIR)/man7/img/$$fn; \ done # Developer targets (note: these are only available on Unix) ######### diff --git a/deps/openssl/openssl/Configurations/windows-makefile.tmpl b/deps/openssl/openssl/Configurations/windows-makefile.tmpl index c36efc7d8..b8a1abc8f 100644 --- a/deps/openssl/openssl/Configurations/windows-makefile.tmpl +++ b/deps/openssl/openssl/Configurations/windows-makefile.tmpl @@ -294,7 +294,7 @@ RCOUTFLAG={- $target{rcoutflag} -}$(OSSL_EMPTY) CNF_ASFLAGS={- join(' ', $target{asflags} || (), @{$config{asflags}}) -} -CNF_CPPFLAGS={- our $cppflags2 = +CNF_CPPFLAGS={- our $cppfags2 = join(' ', $target{cppflags} || (), (map { '-D'.quotify1($_) } @{$target{defines}}, @{$config{defines}}), @@ -440,8 +440,6 @@ all: build_sw build_docs test: tests {- dependmagic('tests'); -}: build_programs_nodep build_modules_nodep copy-utils - $(MAKE) /$(MAKEFLAGS) run_tests -run_tests: @{- output_off() if $disabled{tests}; "\@rem" -} cmd /C "set "SRCTOP=$(SRCDIR)" & set "BLDTOP=$(BLDDIR)" & set "PERL=$(PERL)" & set "FIPSKEY=$(FIPSKEY)" & "$(PERL)" "$(SRCDIR)\test\run_tests.pl" $(TESTS)" @{- if ($disabled{tests}) { output_on(); } else { output_off(); } "" -} diff --git a/deps/openssl/openssl/Configure b/deps/openssl/openssl/Configure index 0d0e229eb..4ddc275f7 100755 --- a/deps/openssl/openssl/Configure +++ b/deps/openssl/openssl/Configure @@ -467,7 +467,6 @@ my @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -578,7 +577,6 @@ my @disable_cascades = ( "sm3", "sm4", "srp", "srtp", "ssl3-method", "ssl-trace", "ts", "ui-console", "whirlpool", - "quic", "fips-securitychecks" ], sub { $config{processor} eq "386" } => [ "sse2" ], @@ -586,7 +584,7 @@ my @disable_cascades = ( "ssl3-method" => [ "ssl3" ], "zlib" => [ "zlib-dynamic" ], "des" => [ "mdc2" ], - "ec" => [ "ec2m", "ecdsa", "ecdh", "sm2", "gost", "quic" ], + "ec" => [ "ec2m", "ecdsa", "ecdh", "sm2", "gost" ], "dgram" => [ "dtls", "sctp" ], "sock" => [ "dgram" ], "dtls" => [ @dtls ], @@ -599,7 +597,8 @@ my @disable_cascades = ( "crypto-mdebug" => [ "crypto-mdebug-backtrace" ], - "module" => [ "dynamic-engine", "fips" ], + # If no modules, then no dynamic engines either + "module" => [ "dynamic-engine" ], # Without shared libraries, dynamic engines aren't possible. # This is due to them having to link with libcrypto and register features @@ -617,6 +616,8 @@ my @disable_cascades = ( # or modules. "pic" => [ "shared", "module" ], + "module" => [ "fips", "dso" ], + "engine" => [ "dynamic-engine", grep(/eng$/, @disablables) ], "dynamic-engine" => [ "loadereng" ], "hw" => [ "padlockeng" ], @@ -637,7 +638,6 @@ my @disable_cascades = ( "legacy" => [ "md2" ], "cmp" => [ "crmf" ], - "tls1_3" => [ "quic" ], "fips" => [ "fips-securitychecks", "acvp-tests" ], @@ -936,6 +936,8 @@ while (@argvcopy) if (/^--prefix=(.*)$/) { $config{prefix}=$1; + die "Directory given with --prefix MUST be absolute\n" + unless file_name_is_absolute($config{prefix}); } elsif (/^--api=(.*)$/) { @@ -1378,11 +1380,6 @@ foreach (keys %useradd) { # At this point, we can forget everything about %user and %useradd, # because it's now all been merged into the corresponding $config entry -if ($config{prefix} && !$config{CROSS_COMPILE}) { - die "Directory given with --prefix MUST be absolute\n" - unless file_name_is_absolute($config{prefix}); -} - if (grep { $_ =~ /(?:^|\s)-static(?:\s|$)/ } @{$config{LDFLAGS}}) { disable('static', 'pic', 'threads'); } @@ -1838,12 +1835,11 @@ if ($builder eq "unified") { my $base = shift; my $dir = shift; my $relativeto = shift || "."; - my $no_mkpath = shift // 0; $dir = catdir($base,$dir) unless isabsolute($dir); # Make sure the directories we're building in exists - mkpath($dir) unless $no_mkpath; + mkpath($dir); my $res = abs2rel(absolutedir($dir), rel2abs($relativeto)); #print STDERR "DEBUG[cleandir]: $dir , $base => $res\n"; @@ -1854,7 +1850,6 @@ if ($builder eq "unified") { my $base = shift; my $file = shift; my $relativeto = shift || "."; - my $no_mkpath = shift // 0; $file = catfile($base,$file) unless isabsolute($file); @@ -1862,7 +1857,7 @@ if ($builder eq "unified") { my $f = basename($file); # Make sure the directories we're building in exists - mkpath($d) unless $no_mkpath; + mkpath($d); my $res = abs2rel(catfile(absolutedir($d), $f), rel2abs($relativeto)); #print STDERR "DEBUG[cleanfile]: $d , $f => $res\n"; @@ -1892,7 +1887,7 @@ if ($builder eq "unified") { } # Then, look in our standard directory push @build_file_templates, - ( map { cleanfile($srcdir, catfile("Configurations", $_), $blddir, 1) } + ( map { cleanfile($srcdir, catfile("Configurations", $_), $blddir) } @build_file_template_names ); my $build_file_template; @@ -1907,7 +1902,7 @@ if ($builder eq "unified") { } $config{build_file_templates} = [ cleanfile($srcdir, catfile("Configurations", "common0.tmpl"), - $blddir, 1), + $blddir), $build_file_template ]; my @build_dirs = ( [ ] ); # current directory @@ -1916,7 +1911,7 @@ if ($builder eq "unified") { # We want to detect configdata.pm in the source tree, so we # don't use it if the build tree is different. - my $src_configdata = cleanfile($srcdir, "configdata.pm", $blddir, 1); + my $src_configdata = cleanfile($srcdir, "configdata.pm", $blddir); # Any source file that we recognise is placed in this hash table, with # the list of its intended destinations as value. When everything has @@ -2269,7 +2264,7 @@ EOF my $dest = $_; my $ddest = cleanfile($buildd, $_, $blddir); foreach (@{$sources{$dest}}) { - my $s = cleanfile($sourced, $_, $blddir, 1); + my $s = cleanfile($sourced, $_, $blddir); # If it's generated or we simply don't find it in the source # tree, we assume it's in the build tree. @@ -2314,7 +2309,7 @@ EOF my $dest = $_; my $ddest = cleanfile($buildd, $_, $blddir); foreach (@{$shared_sources{$dest}}) { - my $s = cleanfile($sourced, $_, $blddir, 1); + my $s = cleanfile($sourced, $_, $blddir); # If it's generated or we simply don't find it in the source # tree, we assume it's in the build tree. @@ -2369,7 +2364,7 @@ EOF if scalar @{$generate{$_}} > 1; my @generator = split /\s+/, $generate{$dest}->[0]; my $gen = $generator[0]; - $generator[0] = cleanfile($sourced, $gen, $blddir, 1); + $generator[0] = cleanfile($sourced, $gen, $blddir); # If the generator is itself generated, it's in the build tree if ($generate{$gen} || ! -f $generator[0]) { @@ -2395,7 +2390,7 @@ EOF } elsif ($dest eq '') { $ddest = ''; } else { - $ddest = cleanfile($sourced, $_, $blddir, 1); + $ddest = cleanfile($sourced, $_, $blddir); # If the destination doesn't exist in source, it can only be # a generated file in the build tree. @@ -2404,7 +2399,7 @@ EOF } } foreach (@{$depends{$dest}}) { - my $d = cleanfile($sourced, $_, $blddir, 1); + my $d = cleanfile($sourced, $_, $blddir); my $d2 = cleanfile($buildd, $_, $blddir); # If we know it's generated, or assume it is because we can't @@ -2427,7 +2422,7 @@ EOF foreach (keys %includes) { my $dest = $_; - my $ddest = cleanfile($sourced, $_, $blddir, 1); + my $ddest = cleanfile($sourced, $_, $blddir); # If the destination doesn't exist in source, it can only be # a generated file in the build tree. @@ -2435,7 +2430,7 @@ EOF $ddest = cleanfile($buildd, $_, $blddir); } foreach (@{$includes{$dest}}) { - my $is = cleandir($sourced, $_, $blddir, 1); + my $is = cleandir($sourced, $_, $blddir); my $ib = cleandir($buildd, $_, $blddir); push @{$unified_info{includes}->{$ddest}->{source}}, $is unless grep { $_ eq $is } @{$unified_info{includes}->{$ddest}->{source}}; @@ -2448,7 +2443,7 @@ EOF my $ddest; if ($dest ne "") { - $ddest = cleanfile($sourced, $dest, $blddir, 1); + $ddest = cleanfile($sourced, $dest, $blddir); # If the destination doesn't exist in source, it can only # be a generated file in the build tree. @@ -2830,7 +2825,7 @@ my %template_vars = ( my $configdata_outname = 'configdata.pm'; open CONFIGDATA, ">$configdata_outname.new" or die "Trying to create $configdata_outname.new: $!"; -my $configdata_tmplname = cleanfile($srcdir, "configdata.pm.in", $blddir, 1); +my $configdata_tmplname = cleanfile($srcdir, "configdata.pm.in", $blddir); my $configdata_tmpl = OpenSSL::Template->new(TYPE => 'FILE', SOURCE => $configdata_tmplname); $configdata_tmpl->fill_in( diff --git a/deps/openssl/openssl/INSTALL.md b/deps/openssl/openssl/INSTALL.md index 87b1faef9..84e8a7d54 100644 --- a/deps/openssl/openssl/INSTALL.md +++ b/deps/openssl/openssl/INSTALL.md @@ -2,8 +2,8 @@ Build and Install ================= This document describes installation on all supported operating -systems: the Unix/Linux family (including macOS), OpenVMS, -and Windows. +systems (the Unix/Linux family, including macOS), OpenVMS, +and Windows). Table of Contents ================= @@ -796,22 +796,14 @@ By default OpenSSL will attempt to stay in memory until the process exits. This is so that libcrypto and libssl can be properly cleaned up automatically via an `atexit()` handler. The handler is registered by libcrypto and cleans up both libraries. On some platforms the `atexit()` handler will run on unload of -libcrypto (if it has been dynamically loaded) rather than at process exit. - -This option can be used to stop OpenSSL from attempting to stay in memory until the +libcrypto (if it has been dynamically loaded) rather than at process exit. This +option can be used to stop OpenSSL from attempting to stay in memory until the process exits. This could lead to crashes if either libcrypto or libssl have already been unloaded at the point that the atexit handler is invoked, e.g. on a platform which calls `atexit()` on unload of the library, and libssl is unloaded -before libcrypto then a crash is likely to happen. - -Note that shared library pinning is not automatically disabled for static builds, -i.e., `no-shared` does not imply `no-pinshared`. This may come as a surprise when -linking libcrypto statically into a shared third-party library, because in this -case the shared library will be pinned. To prevent this behaviour, you need to -configure the static build using `no-shared` and `no-pinshared` together. - -Applications can suppress running of the `atexit()` handler at run time by -using the `OPENSSL_INIT_NO_ATEXIT` option to `OPENSSL_init_crypto()`. +before libcrypto then a crash is likely to happen. Applications can suppress +running of the `atexit()` handler at run time by using the +`OPENSSL_INIT_NO_ATEXIT` option to `OPENSSL_init_crypto()`. See the man page for it for further details. ### no-posix-io @@ -822,10 +814,6 @@ Don't use POSIX IO capabilities. Don't build support for Pre-Shared Key based ciphersuites. -### no-quic - -Don't build support for QUIC API from BoringSSL. - ### no-rdrand Don't use hardware RDRAND capabilities. diff --git a/deps/openssl/openssl/NEWS.md b/deps/openssl/openssl/NEWS.md index d9a48b157..10fbf5c94 100644 --- a/deps/openssl/openssl/NEWS.md +++ b/deps/openssl/openssl/NEWS.md @@ -18,34 +18,6 @@ OpenSSL Releases OpenSSL 3.0 ----------- -### Major changes between OpenSSL 3.0.12 and OpenSSL 3.0.13 [30 Jan 2024] - - * Fixed PKCS12 Decoding crashes - ([CVE-2024-0727]) - * Fixed Excessive time spent checking invalid RSA public keys - ([CVE-2023-6237]) - * Fixed POLY1305 MAC implementation corrupting vector registers on PowerPC - CPUs which support PowerISA 2.07 - ([CVE-2023-6129]) - * Fix excessive time spent in DH check / generation with large Q parameter - value ([CVE-2023-5678]) - -### Major changes between OpenSSL 3.0.11 and OpenSSL 3.0.12 [24 Oct 2023] - - * Mitigate incorrect resize handling for symmetric cipher keys and IVs. - ([CVE-2023-5363]) - -### Major changes between OpenSSL 3.0.10 and OpenSSL 3.0.11 [19 Sep 2023] - - * Fix POLY1305 MAC implementation corrupting XMM registers on Windows - ([CVE-2023-4807]) - -### Major changes between OpenSSL 3.0.9 and OpenSSL 3.0.10 [1 Aug 2023] - - * Fix excessive time spent checking DH q parameter value ([CVE-2023-3817]) - * Fix DH_check() excessive time with over sized modulus ([CVE-2023-3446]) - * Do not ignore empty associated data entries with AES-SIV ([CVE-2023-2975]) - ### Major changes between OpenSSL 3.0.8 and OpenSSL 3.0.9 [30 May 2023] * Mitigate for very slow `OBJ_obj2txt()` performance with gigantic OBJECT @@ -1470,15 +1442,6 @@ OpenSSL 0.9.x -[CVE-2024-0727]: https://www.openssl.org/news/vulnerabilities.html#CVE-2024-0727 -[CVE-2023-6237]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-6237 -[CVE-2023-6129]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-6129 -[CVE-2023-5678]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-5678 -[CVE-2023-5363]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-5363 -[CVE-2023-4807]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-4807 -[CVE-2023-3817]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-3817 -[CVE-2023-3446]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-3446 -[CVE-2023-2975]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-2975 [CVE-2023-2650]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-2650 [CVE-2023-1255]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-1255 [CVE-2023-0466]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-0466 diff --git a/deps/openssl/openssl/OAT.xml b/deps/openssl/openssl/OAT.xml new file mode 100644 index 000000000..e0e557466 --- /dev/null +++ b/deps/openssl/openssl/OAT.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/deps/openssl/openssl/README-FIPS.md b/deps/openssl/openssl/README-FIPS.md index c79552b2d..ba88ff2c4 100644 --- a/deps/openssl/openssl/README-FIPS.md +++ b/deps/openssl/openssl/README-FIPS.md @@ -2,7 +2,7 @@ OpenSSL FIPS support ==================== This release of OpenSSL includes a cryptographic module that can be -FIPS validated. The module is implemented as an OpenSSL provider. +FIPS 140-2 validated. The module is implemented as an OpenSSL provider. A provider is essentially a dynamically loadable module which implements cryptographic algorithms, see the [README-PROVIDERS](README-PROVIDERS.md) file for further details. @@ -28,16 +28,8 @@ resp. `fips.dll` (on Windows). The FIPS provider does not get built and installed automatically. To enable it, you need to configure OpenSSL using the `enable-fips` option. -Installing the FIPS provider -============================ - -In order to be FIPS compliant you must only use FIPS validated source code. -Refer to for information related to -which versions are FIPS validated. The instructions given below build OpenSSL -just using the FIPS validated source code. - -If you want to use a validated FIPS provider, but also want to use the latest -OpenSSL release to build everything else, then refer to the next section. +Installing the FIPS module +========================== The following is only a guide. Please read the Security Policy for up to date installation instructions. @@ -71,12 +63,11 @@ the installation by doing the following two things: - Runs the FIPS module self tests - Generates the so-called FIPS module configuration file containing information - about the module such as the module checksum (and for OpenSSL 3.0 the - self test status). + about the module such as the self test status, and the module checksum. The FIPS module must have the self tests run, and the FIPS module config file -output generated on every machine that it is to be used on. For OpenSSL 3.0, -you must not copy the FIPS module config file output data from one machine to another. +output generated on every machine that it is to be used on. You must not copy +the FIPS module config file output data from one machine to another. On Unix the `openssl fipsinstall` command will be invoked as follows by default: @@ -84,80 +75,7 @@ On Unix the `openssl fipsinstall` command will be invoked as follows by default: If you configured OpenSSL to be installed to a different location, the paths will vary accordingly. In the rare case that you need to install the fipsmodule.cnf -to a non-standard location, you can execute the `openssl fipsinstall` command manually. - -Installing the FIPS provider and using it with the latest release -================================================================= - -This normally requires you to download 2 copies of the OpenSSL source code. - -Download and build a validated FIPS provider --------------------------------------------- - -Refer to for information related to -which versions are FIPS validated. For this example we use OpenSSL 3.0.0. - - $ wget https://www.openssl.org/source/openssl-3.0.0.tar.gz - $ tar -xf openssl-3.0.0.tar.gz - $ cd openssl-3.0.0 - $ ./Configure enable-fips - $ make - $ cd .. - -Download and build the latest release of OpenSSL ------------------------------------------------- - -We use OpenSSL 3.1.0 here, (but you could also use the latest 3.0.X) - - $ wget https://www.openssl.org/source/openssl-3.1.0.tar.gz - $ tar -xf openssl-3.1.0.tar.gz - $ cd openssl-3.1.0 - $ ./Configure enable-fips - $ make - -Use the OpenSSL FIPS provider for testing ------------------------------------------ - -We do this by replacing the artifact for the OpenSSL 3.1.0 FIPS provider. -Note that the OpenSSL 3.1.0 FIPS provider has not been validated -so it must not be used for FIPS purposes. - - $ cp ../openssl-3.0.0/providers/fips.so providers/. - $ cp ../openssl-3.0.0/providers/fipsmodule.cnf providers/. - // Note that for OpenSSL 3.0 that the `fipsmodule.cnf` file should not - // be copied across multiple machines if it contains an entry for - // `install-status`. (Otherwise the self tests would be skipped). - - // Validate the output of the following to make sure we are using the - // OpenSSL 3.0.0 FIPS provider - $ ./util/wrap.pl -fips apps/openssl list -provider-path providers \ - -provider fips -providers - - // Now run the current tests using the OpenSSL 3.0 FIPS provider. - $ make tests - -Copy the FIPS provider artifacts (`fips.so` & `fipsmodule.cnf`) to known locations -------------------------------------------------------------------------------------- - - $ cd ../openssl-3.0.0 - $ sudo make install_fips - -Check that the correct FIPS provider is being used --------------------------------------------------- - - $./util/wrap.pl -fips apps/openssl list -provider-path providers \ - -provider fips -providers - - // This should produce the following output - Providers: - base - name: OpenSSL Base Provider - version: 3.1.0 - status: active - fips - name: OpenSSL FIPS Provider - version: 3.0.0 - status: active +to non-standard location, you can execute the `openssl fipsinstall` command manually. Using the FIPS Module in applications ===================================== diff --git a/deps/openssl/openssl/README-OpenSSL.md b/deps/openssl/openssl/README-OpenSSL.md deleted file mode 100644 index 5184a461b..000000000 --- a/deps/openssl/openssl/README-OpenSSL.md +++ /dev/null @@ -1,224 +0,0 @@ -Welcome to the OpenSSL Project -============================== - -[![openssl logo]][www.openssl.org] - -[![github actions ci badge]][github actions ci] -[![appveyor badge]][appveyor jobs] - -OpenSSL is a robust, commercial-grade, full-featured Open Source Toolkit -for the Transport Layer Security (TLS) protocol formerly known as the -Secure Sockets Layer (SSL) protocol. The protocol implementation is based -on a full-strength general purpose cryptographic library, which can also -be used stand-alone. - -OpenSSL is descended from the SSLeay library developed by Eric A. Young -and Tim J. Hudson. - -The official Home Page of the OpenSSL Project is [www.openssl.org]. - -Table of Contents -================= - - - [Overview](#overview) - - [Download](#download) - - [Build and Install](#build-and-install) - - [Documentation](#documentation) - - [License](#license) - - [Support](#support) - - [Contributing](#contributing) - - [Legalities](#legalities) - -Overview -======== - -The OpenSSL toolkit includes: - -- **libssl** - an implementation of all TLS protocol versions up to TLSv1.3 ([RFC 8446]). - -- **libcrypto** - a full-strength general purpose cryptographic library. It constitutes the - basis of the TLS implementation, but can also be used independently. - -- **openssl** - the OpenSSL command line tool, a swiss army knife for cryptographic tasks, - testing and analyzing. It can be used for - - creation of key parameters - - creation of X.509 certificates, CSRs and CRLs - - calculation of message digests - - encryption and decryption - - SSL/TLS client and server tests - - handling of S/MIME signed or encrypted mail - - and more... - -Download -======== - -For Production Use ------------------- - -Source code tarballs of the official releases can be downloaded from -[www.openssl.org/source](https://www.openssl.org/source). -The OpenSSL project does not distribute the toolkit in binary form. - -However, for a large variety of operating systems precompiled versions -of the OpenSSL toolkit are available. In particular on Linux and other -Unix operating systems it is normally recommended to link against the -precompiled shared libraries provided by the distributor or vendor. - -For Testing and Development ---------------------------- - -Although testing and development could in theory also be done using -the source tarballs, having a local copy of the git repository with -the entire project history gives you much more insight into the -code base. - -The official OpenSSL Git Repository is located at [git.openssl.org]. -There is a GitHub mirror of the repository at [github.com/openssl/openssl], -which is updated automatically from the former on every commit. - -A local copy of the Git Repository can be obtained by cloning it from -the original OpenSSL repository using - - git clone git://git.openssl.org/openssl.git - -or from the GitHub mirror using - - git clone https://github.com/openssl/openssl.git - -If you intend to contribute to OpenSSL, either to fix bugs or contribute -new features, you need to fork the OpenSSL repository openssl/openssl on -GitHub and clone your public fork instead. - - git clone https://github.com/yourname/openssl.git - -This is necessary, because all development of OpenSSL nowadays is done via -GitHub pull requests. For more details, see [Contributing](#contributing). - -Build and Install -================= - -After obtaining the Source, have a look at the [INSTALL](INSTALL.md) file for -detailed instructions about building and installing OpenSSL. For some -platforms, the installation instructions are amended by a platform specific -document. - - * [Notes for UNIX-like platforms](NOTES-UNIX.md) - * [Notes for Android platforms](NOTES-ANDROID.md) - * [Notes for Windows platforms](NOTES-WINDOWS.md) - * [Notes for the DOS platform with DJGPP](NOTES-DJGPP.md) - * [Notes for the OpenVMS platform](NOTES-VMS.md) - * [Notes on Perl](NOTES-PERL.md) - * [Notes on Valgrind](NOTES-VALGRIND.md) - -Specific notes on upgrading to OpenSSL 3.0 from previous versions can be found -in the [migration_guide(7ossl)] manual page. - -Documentation -============= - -Manual Pages ------------- - -The manual pages for the master branch and all current stable releases are -available online. - -- [OpenSSL master](https://www.openssl.org/docs/manmaster) -- [OpenSSL 3.0](https://www.openssl.org/docs/man3.0) -- [OpenSSL 1.1.1](https://www.openssl.org/docs/man1.1.1) - -Wiki ----- - -There is a Wiki at [wiki.openssl.org] which is currently not very active. -It contains a lot of useful information, not all of which is up to date. - -License -======= - -OpenSSL is licensed under the Apache License 2.0, which means that -you are free to get and use it for commercial and non-commercial -purposes as long as you fulfill its conditions. - -See the [LICENSE.txt](LICENSE.txt) file for more details. - -Support -======= - -There are various ways to get in touch. The correct channel depends on -your requirement. see the [SUPPORT](SUPPORT.md) file for more details. - -Contributing -============ - -If you are interested and willing to contribute to the OpenSSL project, -please take a look at the [CONTRIBUTING](CONTRIBUTING.md) file. - -Legalities -========== - -A number of nations restrict the use or export of cryptography. If you are -potentially subject to such restrictions you should seek legal advice before -attempting to develop or distribute cryptographic code. - -Copyright -========= - -Copyright (c) 1998-2024 The OpenSSL Project - -Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson - -All rights reserved. - - - -[www.openssl.org]: - - "OpenSSL Homepage" - -[git.openssl.org]: - - "OpenSSL Git Repository" - -[git.openssl.org]: - - "OpenSSL Git Repository" - -[github.com/openssl/openssl]: - - "OpenSSL GitHub Mirror" - -[wiki.openssl.org]: - - "OpenSSL Wiki" - -[migration_guide(7ossl)]: - - "OpenSSL Migration Guide" - -[RFC 8446]: - - - - -[openssl logo]: - doc/images/openssl.svg - "OpenSSL Logo" - -[github actions ci badge]: - - "GitHub Actions CI Status" - -[github actions ci]: - - "GitHub Actions CI" - -[appveyor badge]: - - "AppVeyor Build Status" - -[appveyor jobs]: - - "AppVeyor Jobs" diff --git a/deps/openssl/openssl/README.OpenSource b/deps/openssl/openssl/README.OpenSource new file mode 100644 index 000000000..2bd605959 --- /dev/null +++ b/deps/openssl/openssl/README.OpenSource @@ -0,0 +1,11 @@ +[ + { + "Name": "OpenSSL", + "License": "Apache License 2.0", + "License File": "LICENSE.txt", + "Version Number": "3.0.9", + "Owner": "wanghaixiang@huawei.com", + "Upstream URL": "https://www.openssl.org/source/openssl-3.0.9.tar.gz", + "Description": "OpenSSL is a robust, commercial-grade, full-featured Open Source Toolkit for the Transport Layer Security (TLS) protocol formerly known as the Secure Sockets Layer (SSL) protocol." + } +] \ No newline at end of file diff --git a/deps/openssl/openssl/README.md b/deps/openssl/openssl/README.md index 9b057e1f2..f2f4fd39a 100644 --- a/deps/openssl/openssl/README.md +++ b/deps/openssl/openssl/README.md @@ -1,113 +1,224 @@ -What This Is -============ +Welcome to the OpenSSL Project +============================== -This is a fork of [OpenSSL](https://www.openssl.org) to enable QUIC. In addition -to the website, the official source distribution is at -. The OpenSSL `README` can be found at -[README-OpenSSL.md](https://github.com/quictls/openssl/blob/openssl-3.0.13%2Bquic/README-OpenSSL.md) +[![openssl logo]][www.openssl.org] -This fork adds APIs that can be used by QUIC implementations for connection -handshakes. Quoting the IETF Working group -[charter](https://datatracker.ietf.org/wg/quic/about/), QUIC is a "UDP-based, -stream-multiplexing, encrypted transport protocol." If you don't need QUIC, you -should use the official OpenSSL distributions. +[![github actions ci badge]][github actions ci] +[![appveyor badge]][appveyor jobs] -The APIs here are used by Microsoft's -[MsQuic](https://github.com/microsoft/msquic) and Google's -[Chromium QUIC](https://chromium.googlesource.com/chromium/src/+/master/net/quic/) +OpenSSL is a robust, commercial-grade, full-featured Open Source Toolkit +for the Transport Layer Security (TLS) protocol formerly known as the +Secure Sockets Layer (SSL) protocol. The protocol implementation is based +on a full-strength general purpose cryptographic library, which can also +be used stand-alone. -We are not in competition with OpenSSL project. We informed them of -our plans to fork the code before we went public. We do not speak for the -OpenSSL project, and can only point to a -[blog post](https://www.openssl.org/blog/blog/2020/02/17/QUIC-and-OpenSSL/) and -[openssl-project email](https://github.com/quictls/openssl/discussions/54) -that provides their view of QUIC support. +OpenSSL is descended from the SSLeay library developed by Eric A. Young +and Tim J. Hudson. -As stated in their blog post, the OpenSSL team is focused on their 3.0 release -(released 2021-09-07), and does not intend to add QUIC functionality to 1.1.x. -There is a community need for a QUIC-capable TLS library. This fork is intended -as stopgap solution to enable higher level frameworks and runtimes to use QUIC -with the proven and reliable TLS functionality from OpenSSL. This fork will be -maintained until OpenSSL officially provides reasonable support for QUIC -implementations. +The official Home Page of the OpenSSL Project is [www.openssl.org]. -This fork can be considered a supported version of -[OpenSSL PR 8797](https://github.com/openssl/openssl/pull/8797). -We will endeavor to track OpenSSL releases within a day or so, and there is an -item below about how we'll follow their tagging. +Table of Contents +================= -On to the questions and answers. + - [Overview](#overview) + - [Download](#download) + - [Build and Install](#build-and-install) + - [Documentation](#documentation) + - [License](#license) + - [Support](#support) + - [Contributing](#contributing) + - [Legalities](#legalities) -What about branches? --------------------- +Overview +======== -We don't want to conflict with OpenSSL branch names. Our current plan is to append -`+quic`. Release tags are likely to be the QUIC branch with `-releaseX` appended. -For example, the OpenSSL tag `openssl-3.0.0` would have a branch named -`openssl-3.0.0+quic` and a release tag of `openssl-3.0.0+quic-release1`. +The OpenSSL toolkit includes: -How are you keeping current with OpenSSL? ------------------------------------------ +- **libssl** + an implementation of all TLS protocol versions up to TLSv1.3 ([RFC 8446]). -(In other words, "What about rebasing?") +- **libcrypto** + a full-strength general purpose cryptographic library. It constitutes the + basis of the TLS implementation, but can also be used independently. -Our plan is to always rebase on top of an upstream release tag. In particular: +- **openssl** + the OpenSSL command line tool, a swiss army knife for cryptographic tasks, + testing and analyzing. It can be used for + - creation of key parameters + - creation of X.509 certificates, CSRs and CRLs + - calculation of message digests + - encryption and decryption + - SSL/TLS client and server tests + - handling of S/MIME signed or encrypted mail + - and more... -- The changes for QUIC will always be at the tip of the branch -- you will know what - is from the original OpenSSL and what is for QUIC. -- New versions are quickly created once upstream creates a new tag. -- The use of git commands (such as `cherry`) can be used to ensure that all changes - have moved forward with minimal or no changes. You will be able to see - "QUIC: Add X" on all branches and the commit itself will be nearly identical on - all branches, and any changes to that can be easily identified. +Download +======== -What about library names? -------------------------- +For Production Use +------------------ -Library names will be the same, but will use a different version number. The version -numbers for the current OpenSSL libraries are `1.1` (for the 1.1.0 and 1.1.1 branches) -and `3` (for the 3.0 branch). We will be prefixing `81` (ASCII for 'Q') to -the version numbers to generate a unique version number. +Source code tarballs of the official releases can be downloaded from +[www.openssl.org/source](https://www.openssl.org/source). +The OpenSSL project does not distribute the toolkit in binary form. -- `libcrypto.so.81.3` vs `libcrypto.so.3` -- `libcrypto.so.81.1.1` vs `libcrypto.so.1.1` -- `libssl.so.81.3` vs `libssl.so.3` -- `libssl.so.81.1.1` vs `libssl.so.1.1` +However, for a large variety of operating systems precompiled versions +of the OpenSSL toolkit are available. In particular on Linux and other +Unix operating systems it is normally recommended to link against the +precompiled shared libraries provided by the distributor or vendor. -The SONAME of these libraries are all different, guaranteeing the correct library -will be used. +For Testing and Development +--------------------------- -...and the executable? ----------------------- +Although testing and development could in theory also be done using +the source tarballs, having a local copy of the git repository with +the entire project history gives you much more insight into the +code base. -We currently do not have any plans to change the name, mainly because we -haven't made any changes there. If you see a need, please open an issue. +The official OpenSSL Git Repository is located at [git.openssl.org]. +There is a GitHub mirror of the repository at [github.com/openssl/openssl], +which is updated automatically from the former on every commit. -The `openssl version` command will report that it is `+quic` enabled. +A local copy of the Git Repository can be obtained by cloning it from +the original OpenSSL repository using -...and FIPS? ------------- + git clone git://git.openssl.org/openssl.git + +or from the GitHub mirror using + + git clone https://github.com/openssl/openssl.git + +If you intend to contribute to OpenSSL, either to fix bugs or contribute +new features, you need to fork the OpenSSL repository openssl/openssl on +GitHub and clone your public fork instead. + + git clone https://github.com/yourname/openssl.git + +This is necessary, because all development of OpenSSL nowadays is done via +GitHub pull requests. For more details, see [Contributing](#contributing). + +Build and Install +================= + +After obtaining the Source, have a look at the [INSTALL](INSTALL.md) file for +detailed instructions about building and installing OpenSSL. For some +platforms, the installation instructions are amended by a platform specific +document. + + * [Notes for UNIX-like platforms](NOTES-UNIX.md) + * [Notes for Android platforms](NOTES-ANDROID.md) + * [Notes for Windows platforms](NOTES-WINDOWS.md) + * [Notes for the DOS platform with DJGPP](NOTES-DJGPP.md) + * [Notes for the OpenVMS platform](NOTES-VMS.md) + * [Notes on Perl](NOTES-PERL.md) + * [Notes on Valgrind](NOTES-VALGRIND.md) + +Specific notes on upgrading to OpenSSL 3.0 from previous versions can be found +in the [migration_guide(7ossl)] manual page. -We are not doing anything with FIPS. This is actually good news: you should -be able to load the OpenSSL 3.0 FIPS module into an application built against -this fork and everything should Just Work™. - -How can I contribute? ---------------------- - -We want any code here to be acceptable to OpenSSL. This means that all contributors -must have signed the appropriate -[contributor license agreements](https://www.openssl.org/policies/cla.html). We -will not ask for copies of any paperwork, you just need to tell us that you've -done so (and we might verify with OpenSSL). We are only interested in making it -easier and better for at least the mentioned QUIC implementations to use a variant -of OpenSSL. If you have a pull request that changes the TLS protocol, or adds -assembly support for a new CPU, or otherwise is not specific to enabling QUIC, -please contribute that to OpenSSL. This fork is intended to be a clean extension -to OpenSSL, with the deltas being specific to QUIC. - -Who are you? +Documentation +============= + +Manual Pages ------------ -This is a collaborative effort between [Akamai](https://www.akamai.com) and -[Microsoft](https://www.microsoft.com). We welcome anyone to contribute! +The manual pages for the master branch and all current stable releases are +available online. + +- [OpenSSL master](https://www.openssl.org/docs/manmaster) +- [OpenSSL 3.0](https://www.openssl.org/docs/man3.0) +- [OpenSSL 1.1.1](https://www.openssl.org/docs/man1.1.1) + +Wiki +---- + +There is a Wiki at [wiki.openssl.org] which is currently not very active. +It contains a lot of useful information, not all of which is up to date. + +License +======= + +OpenSSL is licensed under the Apache License 2.0, which means that +you are free to get and use it for commercial and non-commercial +purposes as long as you fulfill its conditions. + +See the [LICENSE.txt](LICENSE.txt) file for more details. + +Support +======= + +There are various ways to get in touch. The correct channel depends on +your requirement. see the [SUPPORT](SUPPORT.md) file for more details. + +Contributing +============ + +If you are interested and willing to contribute to the OpenSSL project, +please take a look at the [CONTRIBUTING](CONTRIBUTING.md) file. + +Legalities +========== + +A number of nations restrict the use or export of cryptography. If you are +potentially subject to such restrictions you should seek legal advice before +attempting to develop or distribute cryptographic code. + +Copyright +========= + +Copyright (c) 1998-2022 The OpenSSL Project + +Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson + +All rights reserved. + + + +[www.openssl.org]: + + "OpenSSL Homepage" + +[git.openssl.org]: + + "OpenSSL Git Repository" + +[git.openssl.org]: + + "OpenSSL Git Repository" + +[github.com/openssl/openssl]: + + "OpenSSL GitHub Mirror" + +[wiki.openssl.org]: + + "OpenSSL Wiki" + +[migration_guide(7ossl)]: + + "OpenSSL Migration Guide" + +[RFC 8446]: + + + + +[openssl logo]: + doc/images/openssl.svg + "OpenSSL Logo" + +[github actions ci badge]: + + "GitHub Actions CI Status" + +[github actions ci]: + + "GitHub Actions CI" + +[appveyor badge]: + + "AppVeyor Build Status" + +[appveyor jobs]: + + "AppVeyor Jobs" diff --git a/deps/openssl/openssl/VERSION.dat b/deps/openssl/openssl/VERSION.dat index e11fb41dd..be1c292b2 100644 --- a/deps/openssl/openssl/VERSION.dat +++ b/deps/openssl/openssl/VERSION.dat @@ -1,7 +1,7 @@ MAJOR=3 MINOR=0 -PATCH=13 +PATCH=9 PRE_RELEASE_TAG= -BUILD_METADATA=quic -RELEASE_DATE="30 Jan 2024" -SHLIB_VERSION=81.3 +BUILD_METADATA= +RELEASE_DATE="30 May 2023" +SHLIB_VERSION=3 diff --git a/deps/openssl/openssl/VMS/openssl_ivp.com.in b/deps/openssl/openssl/VMS/openssl_ivp.com.in index 582e1fe1a..6810792b3 100644 --- a/deps/openssl/openssl/VMS/openssl_ivp.com.in +++ b/deps/openssl/openssl/VMS/openssl_ivp.com.in @@ -21,9 +21,9 @@ $ @'INSTALLTOP_'SYS$STARTUP]openssl_startup'v' $ @'INSTALLTOP_'SYS$STARTUP]openssl_utils'v' $ $ IF F$SEARCH("OSSL$LIBCRYPTO''pz'") .EQS. "" - - .OR. F$SEARCH("OSSL$LIBSSL''pz'") .EQS. "" {- output_off() if $disabled{shared}; "" -}- + .OR. F$SEARCH("OSSL$LIBSSL''pz'") .EQS. "" {- output_off() if $config{no_shared}; "" -}- .OR. F$SEARCH("OSSL$LIBCRYPTO_SHR''pz'") .EQS. "" - - .OR. F$SEARCH("OSSL$LIBSSL_SHR''pz'") .EQS. "" {- output_on() if $disabled{shared}; "" -}- + .OR. F$SEARCH("OSSL$LIBSSL_SHR''pz'") .EQS. "" {- output_on() if $config{no_shared}; "" -}- .OR. F$SEARCH("OSSL$INCLUDE:[OPENSSL]crypto.h") .EQS. "" - .OR. F$SEARCH("OPENSSL:crypto.h") .EQS. "" - .OR. F$SEARCH("OSSL$EXE:OPENSSL''v'.EXE") .EQS. "" diff --git a/deps/openssl/openssl/VMS/openssl_shutdown.com.in b/deps/openssl/openssl/VMS/openssl_shutdown.com.in index c2b9cf6c7..4193c900f 100644 --- a/deps/openssl/openssl/VMS/openssl_shutdown.com.in +++ b/deps/openssl/openssl/VMS/openssl_shutdown.com.in @@ -39,19 +39,19 @@ $ DEAS OSSL$MODULES'pz' $ DEAS OSSL$EXE $ DEAS OSSL$LIBCRYPTO'pz' $ DEAS OSSL$LIBSSL'pz' -${- output_off() if $disabled{shared}; "" -} +${- output_off() if $config{no_shared}; "" -} $ DEAS OSSL$LIBCRYPTO'sv'_SHR'pz' $ DEAS OSSL$LIBSSL'sv'_SHR'pz' -${- output_on() if $disabled{shared}; "" -} +${- output_on() if $config{no_shared}; "" -} $ DEAS OPENSSL $ $ IF P2 .NES. "NOALIASES" $ THEN $ DEAS OSSL$ENGINES'pz' -${- output_off() if $disabled{shared}; "" -} +${- output_off() if $config{no_shared}; "" -} $ DEAS OSSL$LIBCRYPTO_SHR'pz' $ DEAS OSSL$LIBSSL_SHR'pz' -${- output_on() if $disabled{shared}; "" -} +${- output_on() if $config{no_shared}; "" -} $ ENDIF $ $ EXIT 'status' diff --git a/deps/openssl/openssl/VMS/openssl_startup.com.in b/deps/openssl/openssl/VMS/openssl_startup.com.in index 738f508d5..bbf3e3b4e 100644 --- a/deps/openssl/openssl/VMS/openssl_startup.com.in +++ b/deps/openssl/openssl/VMS/openssl_startup.com.in @@ -103,19 +103,19 @@ $ DEF OSSL$EXE OSSL$INSTROOT:[EXE.'arch'],- OSSL$INSTROOT:[EXE] $ DEF OSSL$LIBCRYPTO'pz' OSSL$LIB:OSSL$LIBCRYPTO'pz'.OLB $ DEF OSSL$LIBSSL'pz' OSSL$LIB:OSSL$LIBSSL'pz'.OLB -${- output_off() if $disabled{shared}; "" -} +${- output_off() if $config{no_shared}; "" -} $ DEF OSSL$LIBCRYPTO'sv'_SHR'pz' OSSL$SHARE:OSSL$LIBCRYPTO'sv'_SHR'pz'.EXE $ DEF OSSL$LIBSSL'sv'_SHR'pz' OSSL$SHARE:OSSL$LIBSSL'sv'_SHR'pz'.EXE -${- output_on() if $disabled{shared}; "" -} +${- output_on() if $config{no_shared}; "" -} $ DEF OPENSSL OSSL$INCLUDE:[OPENSSL] $ $ IF P2 .NES. "NOALIASES" $ THEN $ DEF OSSL$ENGINES'pz' OSSL$ENGINES'sv''pz' -${- output_off() if $disabled{shared}; "" -} +${- output_off() if $config{no_shared}; "" -} $ DEF OSSL$LIBCRYPTO_SHR'pz' OSSL$LIBCRYPTO'sv'_SHR'pz' $ DEF OSSL$LIBSSL_SHR'pz' OSSL$LIBSSL'sv'_SHR'pz' -${- output_on() if $disabled{shared}; "" -} +${- output_on() if $config{no_shared}; "" -} $ ENDIF $ $ bailout: diff --git a/deps/openssl/openssl/apps/ca.c b/deps/openssl/openssl/apps/ca.c index a7a5ab1ec..e14a5cff7 100644 --- a/deps/openssl/openssl/apps/ca.c +++ b/deps/openssl/openssl/apps/ca.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -628,8 +628,6 @@ end_of_options: f = NCONF_get_string(conf, section, ENV_NAMEOPT); - if (f == NULL) - ERR_clear_error(); if (f != NULL) { if (!set_nameopt(f)) { BIO_printf(bio_err, "Invalid name options: \"%s\"\n", f); @@ -787,10 +785,8 @@ end_of_options: /* We can have sections in the ext file */ if (extensions == NULL) { extensions = NCONF_get_string(extfile_conf, "default", "extensions"); - if (extensions == NULL) { - ERR_clear_error(); + if (extensions == NULL) extensions = "default"; - } } } @@ -806,20 +802,15 @@ end_of_options: /* * EVP_PKEY_get_default_digest_name() returns 2 if the digest is * mandatory for this algorithm. - * - * That call may give back the name "UNDEF", which has these meanings: - * - * when def_ret == 2: the user MUST leave the digest unspecified - * when def_ret == 1: the user MAY leave the digest unspecified */ if (def_ret == 2 && strcmp(def_dgst, "UNDEF") == 0) { + /* The signing algorithm requires there to be no digest */ dgst = NULL; } else if (dgst == NULL - && (dgst = lookup_conf(conf, section, ENV_DEFAULT_MD)) == NULL - && strcmp(def_dgst, "UNDEF") != 0) { + && (dgst = lookup_conf(conf, section, ENV_DEFAULT_MD)) == NULL) { goto end; } else { - if (strcmp(dgst, "default") == 0 || strcmp(def_dgst, "UNDEF") == 0) { + if (strcmp(dgst, "default") == 0) { if (def_ret <= 0) { BIO_puts(bio_err, "no default digest\n"); goto end; @@ -833,8 +824,6 @@ end_of_options: char *tmp_email_dn = NULL; tmp_email_dn = NCONF_get_string(conf, section, ENV_DEFAULT_EMAIL_DN); - if (tmp_email_dn == NULL) - ERR_clear_error(); if (tmp_email_dn != NULL && strcmp(tmp_email_dn, "no") == 0) email_dn = 0; } @@ -850,7 +839,6 @@ end_of_options: if (NCONF_get_string(conf, section, ENV_RAND_SERIAL) != NULL) { rand_ser = 1; } else { - ERR_clear_error(); serialfile = lookup_conf(conf, section, ENV_SERIAL); if (serialfile == NULL) goto end; @@ -920,10 +908,8 @@ end_of_options: } if (days == 0) { - if (!NCONF_get_number(conf, section, ENV_DEFAULT_DAYS, &days)) { - ERR_clear_error(); + if (!NCONF_get_number(conf, section, ENV_DEFAULT_DAYS, &days)) days = 0; - } } if (enddate == NULL && days == 0) { BIO_printf(bio_err, "cannot lookup how many days to certify for\n"); @@ -1048,7 +1034,7 @@ end_of_options: } } /* - * we have a stack of newly certified certificates and a database + * we have a stack of newly certified certificates and a data base * and serial number that need updating */ @@ -1149,7 +1135,7 @@ end_of_options: if (!rotate_index(dbfile, "new", "old")) goto end; - BIO_printf(bio_err, "Database updated\n"); + BIO_printf(bio_err, "Data Base Updated\n"); } } @@ -1175,28 +1161,22 @@ end_of_options: } } - crlnumberfile = NCONF_get_string(conf, section, ENV_CRLNUMBER); - if (crlnumberfile != NULL) { + if ((crlnumberfile = NCONF_get_string(conf, section, ENV_CRLNUMBER)) + != NULL) if ((crlnumber = load_serial(crlnumberfile, NULL, 0, NULL)) == NULL) { BIO_printf(bio_err, "error while loading CRL number\n"); goto end; } - } else { - ERR_clear_error(); - } if (!crldays && !crlhours && !crlsec) { if (!NCONF_get_number(conf, section, - ENV_DEFAULT_CRL_DAYS, &crldays)) { - ERR_clear_error(); + ENV_DEFAULT_CRL_DAYS, &crldays)) crldays = 0; - } if (!NCONF_get_number(conf, section, - ENV_DEFAULT_CRL_HOURS, &crlhours)) { - ERR_clear_error(); + ENV_DEFAULT_CRL_HOURS, &crlhours)) crlhours = 0; - } + ERR_clear_error(); } if ((crl_nextupdate == NULL) && (crldays == 0) && (crlhours == 0) && (crlsec == 0)) { @@ -1336,7 +1316,7 @@ end_of_options: if (!rotate_index(dbfile, "new", "old")) goto end; - BIO_printf(bio_err, "Database updated\n"); + BIO_printf(bio_err, "Data Base Updated\n"); } } ret = 0; @@ -1778,7 +1758,7 @@ static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509, if (verbose) BIO_printf(bio_err, - "The subject name appears to be ok, checking database for clashes\n"); + "The subject name appears to be ok, checking data base for clashes\n"); /* Build the correct Subject if no e-mail is wanted in the subject. */ if (!email_dn) { @@ -1867,7 +1847,7 @@ static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509, else if (rrow[DB_type][0] == DB_TYPE_VAL) p = "Valid"; else - p = "\ninvalid type, Database error\n"; + p = "\ninvalid type, Data base error\n"; BIO_printf(bio_err, "Type :%s\n", p);; if (rrow[DB_type][0] == DB_TYPE_REV) { p = rrow[DB_exp_date]; diff --git a/deps/openssl/openssl/apps/cmp.c b/deps/openssl/openssl/apps/cmp.c index c479b1549..3463579c2 100644 --- a/deps/openssl/openssl/apps/cmp.c +++ b/deps/openssl/openssl/apps/cmp.c @@ -2115,7 +2115,7 @@ static const char *prev_item(const char *opt, const char *end) beg = end; while (beg > opt) { --beg; - if (beg[0] == ',' || isspace(_UC(beg[0]))) { + if (beg[0] == ',' || isspace(beg[0])) { ++beg; break; } @@ -2130,7 +2130,7 @@ static const char *prev_item(const char *opt, const char *end) opt_item[len] = '\0'; while (beg > opt) { --beg; - if (beg[0] != ',' && !isspace(_UC(beg[0]))) { + if (beg[0] != ',' && !isspace(beg[0])) { ++beg; break; } @@ -2148,7 +2148,6 @@ static char *conf_get_string(const CONF *src_conf, const char *groups, while ((end = prev_item(groups, end)) != NULL) { if ((res = NCONF_get_string(src_conf, opt_item, name)) != NULL) return res; - ERR_clear_error(); } return res; } @@ -2512,7 +2511,7 @@ static int get_opts(int argc, char **argv) } break; case OPT_CSR: - opt_csr = opt_str(); + opt_csr = opt_arg(); break; case OPT_OUT_TRUSTED: opt_out_trusted = opt_str(); diff --git a/deps/openssl/openssl/apps/cms.c b/deps/openssl/openssl/apps/cms.c index 3994cb0fc..76c789671 100644 --- a/deps/openssl/openssl/apps/cms.c +++ b/deps/openssl/openssl/apps/cms.c @@ -1,5 +1,5 @@ /* - * Copyright 2008-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2008-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -620,8 +620,7 @@ int cms_main(int argc, char **argv) "recipient certificate file"); if (cert == NULL) goto end; - if (!sk_X509_push(encerts, cert)) - goto end; + sk_X509_push(encerts, cert); cert = NULL; } else { recipfile = opt_arg(); @@ -797,9 +796,6 @@ int cms_main(int argc, char **argv) if ((operation & SMIME_IP) == 0 && contfile != NULL) BIO_printf(bio_err, "Warning: -contfile option is ignored for the given operation\n"); - if (operation != SMIME_ENCRYPT && *argv != NULL) - BIO_printf(bio_err, - "Warning: recipient certificate file parameters ignored for operation other than -encrypt\n"); if ((flags & CMS_BINARY) != 0) { if (!(operation & SMIME_OP)) @@ -827,14 +823,19 @@ int cms_main(int argc, char **argv) goto end; } - for (; *argv != NULL; argv++) { - cert = load_cert(*argv, FORMAT_UNDEF, - "recipient certificate file"); - if (cert == NULL) - goto end; - if (!sk_X509_push(encerts, cert)) - goto end; - cert = NULL; + if (*argv != NULL) { + if (operation == SMIME_ENCRYPT) { + for (; *argv != NULL; argv++) { + cert = load_cert(*argv, FORMAT_UNDEF, + "recipient certificate file"); + if (cert == NULL) + goto end; + sk_X509_push(encerts, cert); + cert = NULL; + } + } else { + BIO_printf(bio_err, "Warning: recipient certificate file parameters ignored for operation other than -encrypt\n"); + } } } @@ -1415,7 +1416,6 @@ static CMS_ReceiptRequest STACK_OF(OPENSSL_STRING) *rr_from) { STACK_OF(GENERAL_NAMES) *rct_to = NULL, *rct_from = NULL; - CMS_ReceiptRequest *rr; rct_to = make_names_stack(rr_to); if (rct_to == NULL) @@ -1427,14 +1427,10 @@ static CMS_ReceiptRequest } else { rct_from = NULL; } - rr = CMS_ReceiptRequest_create0_ex(NULL, -1, rr_allorfirst, rct_from, - rct_to, app_get0_libctx()); - if (rr == NULL) - goto err; - return rr; + return CMS_ReceiptRequest_create0_ex(NULL, -1, rr_allorfirst, rct_from, + rct_to, app_get0_libctx()); err: sk_GENERAL_NAMES_pop_free(rct_to, GENERAL_NAMES_free); - sk_GENERAL_NAMES_pop_free(rct_from, GENERAL_NAMES_free); return NULL; } diff --git a/deps/openssl/openssl/apps/dgst.c b/deps/openssl/openssl/apps/dgst.c index 3f02af0d5..e12389197 100644 --- a/deps/openssl/openssl/apps/dgst.c +++ b/deps/openssl/openssl/apps/dgst.c @@ -320,8 +320,6 @@ int dgst_main(int argc, char **argv) sigkey = app_keygen(mac_ctx, mac_name, 0, 0 /* not verbose */); /* Verbose output would make external-tests gost-engine fail */ EVP_PKEY_CTX_free(mac_ctx); - if (sigkey == NULL) - goto end; } if (hmac_key != NULL) { diff --git a/deps/openssl/openssl/apps/dhparam.c b/deps/openssl/openssl/apps/dhparam.c index 2a54dca9d..43906cea5 100644 --- a/deps/openssl/openssl/apps/dhparam.c +++ b/deps/openssl/openssl/apps/dhparam.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -222,8 +222,6 @@ int dhparam_main(int argc, char **argv) } tmppkey = app_paramgen(ctx, alg); - if (tmppkey == NULL) - goto end; EVP_PKEY_CTX_free(ctx); ctx = NULL; if (dsaparam) { diff --git a/deps/openssl/openssl/apps/dsaparam.c b/deps/openssl/openssl/apps/dsaparam.c index ca91beb5b..b5555282b 100644 --- a/deps/openssl/openssl/apps/dsaparam.c +++ b/deps/openssl/openssl/apps/dsaparam.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -218,8 +218,6 @@ int dsaparam_main(int argc, char **argv) goto end; } pkey = app_keygen(ctx, "DSA", numbits, verbose); - if (pkey == NULL) - goto end; assert(private); if (outformat == FORMAT_ASN1) i = i2d_PrivateKey_bio(out, pkey); diff --git a/deps/openssl/openssl/apps/enc.c b/deps/openssl/openssl/apps/enc.c index c275046cf..b3bf4cc25 100644 --- a/deps/openssl/openssl/apps/enc.c +++ b/deps/openssl/openssl/apps/enc.c @@ -624,10 +624,7 @@ int enc_main(int argc, char **argv) } } if (!BIO_flush(wbio)) { - if (enc) - BIO_printf(bio_err, "bad encrypt\n"); - else - BIO_printf(bio_err, "bad decrypt\n"); + BIO_printf(bio_err, "bad decrypt\n"); goto end; } diff --git a/deps/openssl/openssl/apps/errstr.c b/deps/openssl/openssl/apps/errstr.c index 21349d21c..782705a78 100644 --- a/deps/openssl/openssl/apps/errstr.c +++ b/deps/openssl/openssl/apps/errstr.c @@ -62,7 +62,7 @@ int errstr_main(int argc, char **argv) /* All remaining arg are error code. */ ret = 0; for (argv = opt_rest(); *argv != NULL; argv++) { - if (sscanf(*argv, "%lx", &l) <= 0) { + if (sscanf(*argv, "%lx", &l) == 0) { ret++; } else { ERR_error_string_n(l, buf, sizeof(buf)); diff --git a/deps/openssl/openssl/apps/gendsa.c b/deps/openssl/openssl/apps/gendsa.c index 8aefca655..27feb793f 100644 --- a/deps/openssl/openssl/apps/gendsa.c +++ b/deps/openssl/openssl/apps/gendsa.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -146,8 +146,6 @@ int gendsa_main(int argc, char **argv) goto end; } pkey = app_keygen(ctx, "DSA", nbits, verbose); - if (pkey == NULL) - goto end; assert(private); if (!PEM_write_bio_PrivateKey(out, pkey, enc, NULL, 0, NULL, passout)) { diff --git a/deps/openssl/openssl/apps/genpkey.c b/deps/openssl/openssl/apps/genpkey.c index 705e5c76b..d00754eea 100644 --- a/deps/openssl/openssl/apps/genpkey.c +++ b/deps/openssl/openssl/apps/genpkey.c @@ -1,5 +1,5 @@ /* - * Copyright 2006-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2006-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -183,8 +183,6 @@ int genpkey_main(int argc, char **argv) pkey = do_param ? app_paramgen(ctx, algname) : app_keygen(ctx, algname, 0, 0 /* not verbose */); - if (pkey == NULL) - goto end; if (do_param) { rv = PEM_write_bio_Parameters(out, pkey); diff --git a/deps/openssl/openssl/apps/genrsa.c b/deps/openssl/openssl/apps/genrsa.c index 6a683517a..4436b7fa1 100644 --- a/deps/openssl/openssl/apps/genrsa.c +++ b/deps/openssl/openssl/apps/genrsa.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -203,8 +203,6 @@ opthelp: goto end; } pkey = app_keygen(ctx, "RSA", num, verbose); - if (pkey == NULL) - goto end; if (verbose) { BIGNUM *e = NULL; diff --git a/deps/openssl/openssl/apps/info.c b/deps/openssl/openssl/apps/info.c index 66f3ef258..c68603652 100644 --- a/deps/openssl/openssl/apps/info.c +++ b/deps/openssl/openssl/apps/info.c @@ -10,15 +10,11 @@ #include #include "apps.h" #include "progs.h" -#include typedef enum OPTION_choice { OPT_COMMON, OPT_CONFIGDIR, OPT_ENGINESDIR, OPT_MODULESDIR, OPT_DSOEXT, OPT_DIRNAMESEP, OPT_LISTSEP, OPT_SEEDS, OPT_CPUSETTINGS -#ifndef OPENSSL_NO_QUIC - , OPT_QUIC -#endif } OPTION_CHOICE; const OPTIONS info_options[] = { @@ -36,9 +32,6 @@ const OPTIONS info_options[] = { {"listsep", OPT_LISTSEP, '-', "List separator character"}, {"seeds", OPT_SEEDS, '-', "Seed sources"}, {"cpusettings", OPT_CPUSETTINGS, '-', "CPU settings info"}, -#ifndef OPENSSL_NO_QUIC - {"quic", OPT_QUIC, '-', "QUIC info"}, -#endif {NULL} }; @@ -91,12 +84,6 @@ opthelp: type = OPENSSL_INFO_CPU_SETTINGS; dirty++; break; -#ifndef OPENSSL_NO_QUIC - case OPT_QUIC: - type = OPENSSL_INFO_QUIC; - dirty++; - break; -#endif } } if (opt_num_rest() != 0) diff --git a/deps/openssl/openssl/apps/lib/apps.c b/deps/openssl/openssl/apps/lib/apps.c index a632b0cff..79afa1dea 100644 --- a/deps/openssl/openssl/apps/lib/apps.c +++ b/deps/openssl/openssl/apps/lib/apps.c @@ -638,13 +638,13 @@ void *app_malloc(size_t sz, const char *what) char *next_item(char *opt) /* in list separated by comma and/or space */ { /* advance to separator (comma or whitespace), if any */ - while (*opt != ',' && !isspace(_UC(*opt)) && *opt != '\0') + while (*opt != ',' && !isspace(*opt) && *opt != '\0') opt++; if (*opt != '\0') { /* terminate current item */ *opt++ = '\0'; /* skip over any whitespace after separator */ - while (isspace(_UC(*opt))) + while (isspace(*opt)) opt++; } return *opt == '\0' ? NULL : opt; /* NULL indicates end of input */ @@ -944,7 +944,7 @@ int load_key_certs_crls_suppress(const char *uri, int format, int maybe_stdin, BIO *bio; if (!maybe_stdin) { - BIO_printf(bio_err, "No filename or uri specified for loading\n"); + BIO_printf(bio_err, "No filename or uri specified for loading"); goto end; } uri = ""; @@ -964,10 +964,8 @@ int load_key_certs_crls_suppress(const char *uri, int format, int maybe_stdin, BIO_printf(bio_err, "Could not open file or uri for loading"); goto end; } - if (expect > 0 && !OSSL_STORE_expect(ctx, expect)) { - BIO_printf(bio_err, "Internal error trying to load"); + if (expect > 0 && !OSSL_STORE_expect(ctx, expect)) goto end; - } failed = NULL; while (cnt_expectations > 0 && !OSSL_STORE_eof(ctx)) { @@ -1681,10 +1679,7 @@ CA_DB *load_index(const char *dbfile, DB_ATTR *db_attr) char *p = NCONF_get_string(dbattr_conf, NULL, "unique_subject"); if (p) { retdb->attributes.unique_subject = parse_yesno(p, 1); - } else { - ERR_clear_error(); } - } retdb->dbfname = OPENSSL_strdup(dbfile); @@ -1950,17 +1945,16 @@ X509_NAME *parse_name(const char *cp, int chtype, int canmulti, nid = OBJ_txt2nid(typestr); if (nid == NID_undef) { BIO_printf(bio_err, - "%s warning: Skipping unknown %s name attribute \"%s\"\n", + "%s: Skipping unknown %s name attribute \"%s\"\n", opt_getprog(), desc, typestr); if (ismulti) BIO_printf(bio_err, - "%s hint: a '+' in a value string needs be escaped using '\\' else a new member of a multi-valued RDN is expected\n", - opt_getprog()); + "Hint: a '+' in a value string needs be escaped using '\\' else a new member of a multi-valued RDN is expected\n"); continue; } if (*valstr == '\0') { BIO_printf(bio_err, - "%s warning: No value provided for %s name attribute \"%s\", skipped\n", + "%s: No value provided for %s name attribute \"%s\", skipped\n", opt_getprog(), desc, typestr); continue; } @@ -2014,8 +2008,7 @@ int bio_to_mem(unsigned char **out, int maxlen, BIO *in) BIO_free(mem); return -1; } - if (maxlen != -1) - maxlen -= len; + maxlen -= len; if (maxlen == 0) break; @@ -3363,8 +3356,8 @@ EVP_PKEY *app_keygen(EVP_PKEY_CTX *ctx, const char *alg, int bits, int verbose) BIO_printf(bio_err, "Warning: generating random key material may take a long time\n" "if the system has a poor entropy source\n"); if (EVP_PKEY_keygen(ctx, &res) <= 0) - BIO_printf(bio_err, "%s: Error generating %s key\n", opt_getprog(), - alg != NULL ? alg : "asymmetric"); + app_bail_out("%s: Error generating %s key\n", opt_getprog(), + alg != NULL ? alg : "asymmetric"); return res; } @@ -3376,8 +3369,8 @@ EVP_PKEY *app_paramgen(EVP_PKEY_CTX *ctx, const char *alg) BIO_printf(bio_err, "Warning: generating random key parameters may take a long time\n" "if the system has a poor entropy source\n"); if (EVP_PKEY_paramgen(ctx, &res) <= 0) - BIO_printf(bio_err, "%s: Generating %s key parameters failed\n", - opt_getprog(), alg != NULL ? alg : "asymmetric"); + app_bail_out("%s: Generating %s key parameters failed\n", + opt_getprog(), alg != NULL ? alg : "asymmetric"); return res; } diff --git a/deps/openssl/openssl/apps/lib/opt.c b/deps/openssl/openssl/apps/lib/opt.c index d56964dbe..157367982 100644 --- a/deps/openssl/openssl/apps/lib/opt.c +++ b/deps/openssl/openssl/apps/lib/opt.c @@ -696,12 +696,7 @@ int opt_verify(int opt, X509_VERIFY_PARAM *vpm) opt_printf_stderr("%s: Invalid Policy %s\n", prog, opt_arg()); return 0; } - if (!X509_VERIFY_PARAM_add0_policy(vpm, otmp)) { - ASN1_OBJECT_free(otmp); - opt_printf_stderr("%s: Internal error adding Policy %s\n", - prog, opt_arg()); - return 0; - } + X509_VERIFY_PARAM_add0_policy(vpm, otmp); break; case OPT_V_PURPOSE: /* purpose name -> purpose index */ diff --git a/deps/openssl/openssl/apps/list.c b/deps/openssl/openssl/apps/list.c index 0fcbcbb08..514abacfc 100644 --- a/deps/openssl/openssl/apps/list.c +++ b/deps/openssl/openssl/apps/list.c @@ -1209,11 +1209,9 @@ static int provider_cmp(const OSSL_PROVIDER * const *a, static int collect_providers(OSSL_PROVIDER *provider, void *stack) { STACK_OF(OSSL_PROVIDER) *provider_stack = stack; - /* - * If OK - result is the index of inserted data - * Error - result is -1 or 0 - */ - return sk_OSSL_PROVIDER_push(provider_stack, provider) > 0 ? 1 : 0; + + sk_OSSL_PROVIDER_push(provider_stack, provider); + return 1; } static void list_provider_info(void) @@ -1228,19 +1226,11 @@ static void list_provider_info(void) BIO_printf(bio_err, "ERROR: Memory allocation\n"); return; } - - if (OSSL_PROVIDER_do_all(NULL, &collect_providers, providers) != 1) { - BIO_printf(bio_err, "ERROR: Memory allocation\n"); - return; - } - BIO_printf(bio_out, "Providers:\n"); + OSSL_PROVIDER_do_all(NULL, &collect_providers, providers); sk_OSSL_PROVIDER_sort(providers); for (i = 0; i < sk_OSSL_PROVIDER_num(providers); i++) { const OSSL_PROVIDER *prov = sk_OSSL_PROVIDER_value(providers, i); - const char *provname = OSSL_PROVIDER_get0_name(prov); - - BIO_printf(bio_out, " %s\n", provname); /* Query the "known" information parameters, the order matches below */ params[0] = OSSL_PARAM_construct_utf8_ptr(OSSL_PROV_PARAM_NAME, @@ -1253,23 +1243,23 @@ static void list_provider_info(void) params[4] = OSSL_PARAM_construct_end(); OSSL_PARAM_set_all_unmodified(params); if (!OSSL_PROVIDER_get_params(prov, params)) { - BIO_printf(bio_err, - "WARNING: Unable to query provider parameters for %s\n", - provname); - } else { - /* Print out the provider information, the params order matches above */ - if (OSSL_PARAM_modified(params)) - BIO_printf(bio_out, " name: %s\n", name); - if (OSSL_PARAM_modified(params + 1)) - BIO_printf(bio_out, " version: %s\n", version); - if (OSSL_PARAM_modified(params + 2)) - BIO_printf(bio_out, " status: %sactive\n", status ? "" : "in"); - if (verbose) { - if (OSSL_PARAM_modified(params + 3)) - BIO_printf(bio_out, " build info: %s\n", buildinfo); - print_param_types("gettable provider parameters", - OSSL_PROVIDER_gettable_params(prov), 4); - } + BIO_printf(bio_err, "ERROR: Unable to query provider parameters\n"); + return; + } + + /* Print out the provider information, the params order matches above */ + BIO_printf(bio_out, " %s\n", OSSL_PROVIDER_get0_name(prov)); + if (OSSL_PARAM_modified(params)) + BIO_printf(bio_out, " name: %s\n", name); + if (OSSL_PARAM_modified(params + 1)) + BIO_printf(bio_out, " version: %s\n", version); + if (OSSL_PARAM_modified(params + 2)) + BIO_printf(bio_out, " status: %sactive\n", status ? "" : "in"); + if (verbose) { + if (OSSL_PARAM_modified(params + 3)) + BIO_printf(bio_out, " build info: %s\n", buildinfo); + print_param_types("gettable provider parameters", + OSSL_PROVIDER_gettable_params(prov), 4); } } sk_OSSL_PROVIDER_free(providers); diff --git a/deps/openssl/openssl/apps/pkeyutl.c b/deps/openssl/openssl/apps/pkeyutl.c index 3c9f9025a..518a74166 100644 --- a/deps/openssl/openssl/apps/pkeyutl.c +++ b/deps/openssl/openssl/apps/pkeyutl.c @@ -1,5 +1,5 @@ /* - * Copyright 2006-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2006-2022 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -421,7 +421,7 @@ int pkeyutl_main(int argc, char **argv) /* Raw input data is handled elsewhere */ if (in != NULL && !rawin) { /* Read the input data */ - buf_inlen = bio_to_mem(&buf_in, -1, in); + buf_inlen = bio_to_mem(&buf_in, keysize * 10, in); if (buf_inlen < 0) { BIO_printf(bio_err, "Error reading input Data\n"); goto end; diff --git a/deps/openssl/openssl/apps/rehash.c b/deps/openssl/openssl/apps/rehash.c index 85eee3857..5c6d5340b 100644 --- a/deps/openssl/openssl/apps/rehash.c +++ b/deps/openssl/openssl/apps/rehash.c @@ -45,6 +45,9 @@ # ifndef PATH_MAX # define PATH_MAX 4096 # endif +# ifndef NAME_MAX +# define NAME_MAX 255 +# endif # define MAX_COLLISIONS 256 # if defined(OPENSSL_SYS_VXWORKS) @@ -352,22 +355,21 @@ static int do_dir(const char *dirname, enum Hash h) OPENSSL_DIR_CTX *d = NULL; struct stat st; unsigned char idmask[MAX_COLLISIONS / 8]; - int n, numfiles, nextid, dirlen, buflen, errs = 0; - size_t i, fname_max_len = 20; /* maximum length of "%08x.r%d" */ - const char *pathsep = ""; + int n, numfiles, nextid, buflen, errs = 0; + size_t i; + const char *pathsep; const char *filename; - char *buf = NULL, *copy = NULL; + char *buf, *copy = NULL; STACK_OF(OPENSSL_STRING) *files = NULL; if (app_access(dirname, W_OK) < 0) { BIO_printf(bio_err, "Skipping %s, can't write\n", dirname); return 1; } - dirlen = strlen(dirname); - if (dirlen != 0 && !ends_with_dirsep(dirname)) { - pathsep = "/"; - dirlen++; - } + buflen = strlen(dirname); + pathsep = (buflen && !ends_with_dirsep(dirname)) ? "/": ""; + buflen += NAME_MAX + 1 + 1; + buf = app_malloc(buflen, "filename buffer"); if (verbose) BIO_printf(bio_out, "Doing %s\n", dirname); @@ -378,25 +380,17 @@ static int do_dir(const char *dirname, enum Hash h) goto err; } while ((filename = OPENSSL_DIR_read(&d, dirname)) != NULL) { - size_t fname_len = strlen(filename); - if ((copy = OPENSSL_strdup(filename)) == NULL || sk_OPENSSL_STRING_push(files, copy) == 0) { OPENSSL_free(copy); - OPENSSL_DIR_end(&d); BIO_puts(bio_err, "out of memory\n"); errs = 1; goto err; } - if (fname_len > fname_max_len) - fname_max_len = fname_len; } OPENSSL_DIR_end(&d); sk_OPENSSL_STRING_sort(files); - buflen = dirlen + fname_max_len + 1; - buf = app_malloc(buflen, "filename buffer"); - numfiles = sk_OPENSSL_STRING_num(files); for (n = 0; n < numfiles; ++n) { filename = sk_OPENSSL_STRING_value(files, n); @@ -433,12 +427,12 @@ static int do_dir(const char *dirname, enum Hash h) while (bit_isset(idmask, nextid)) nextid++; - BIO_snprintf(buf, buflen, "%s%s%08x.%s%d", - dirname, pathsep, bp->hash, + BIO_snprintf(buf, buflen, "%s%s%n%08x.%s%d", + dirname, pathsep, &n, bp->hash, suffixes[bp->type], nextid); if (verbose) BIO_printf(bio_out, "link %s -> %s\n", - ep->filename, &buf[dirlen]); + ep->filename, &buf[n]); if (unlink(buf) < 0 && errno != ENOENT) { BIO_printf(bio_err, "%s: Can't unlink %s, %s\n", @@ -455,12 +449,12 @@ static int do_dir(const char *dirname, enum Hash h) bit_set(idmask, nextid); } else if (remove_links) { /* Link to be deleted */ - BIO_snprintf(buf, buflen, "%s%s%08x.%s%d", - dirname, pathsep, bp->hash, + BIO_snprintf(buf, buflen, "%s%s%n%08x.%s%d", + dirname, pathsep, &n, bp->hash, suffixes[bp->type], ep->old_id); if (verbose) BIO_printf(bio_out, "unlink %s\n", - &buf[dirlen]); + &buf[n]); if (unlink(buf) < 0 && errno != ENOENT) { BIO_printf(bio_err, "%s: Can't unlink %s, %s\n", diff --git a/deps/openssl/openssl/apps/req.c b/deps/openssl/openssl/apps/req.c index c7d4c7822..23757044a 100644 --- a/deps/openssl/openssl/apps/req.c +++ b/deps/openssl/openssl/apps/req.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -199,7 +199,7 @@ static int duplicated(LHASH_OF(OPENSSL_STRING) *addexts, char *kv) /* Check syntax. */ /* Skip leading whitespace, make a copy. */ - while (*kv && isspace(_UC(*kv))) + while (*kv && isspace(*kv)) if (*++kv == '\0') return 1; if ((p = strchr(kv, '=')) == NULL) @@ -210,7 +210,7 @@ static int duplicated(LHASH_OF(OPENSSL_STRING) *addexts, char *kv) /* Skip trailing space before the equal sign. */ for (p = kv + off; p > kv; --p) - if (!isspace(_UC(p[-1]))) + if (!isspace(p[-1])) break; if (p == kv) { OPENSSL_free(kv); @@ -635,10 +635,8 @@ int req_main(int argc, char **argv) if (newreq && pkey == NULL) { app_RAND_load_conf(req_conf, section); - if (!NCONF_get_number(req_conf, section, BITS, &newkey_len)) { - ERR_clear_error(); + if (!NCONF_get_number(req_conf, section, BITS, &newkey_len)) newkey_len = DEFAULT_KEY_LENGTH; - } genctx = set_keygen_ctx(keyalg, &keyalgstr, &newkey_len, gen_eng); if (genctx == NULL) @@ -685,8 +683,6 @@ int req_main(int argc, char **argv) EVP_PKEY_CTX_set_app_data(genctx, bio_err); pkey = app_keygen(genctx, keyalgstr, newkey_len, verbose); - if (pkey == NULL) - goto end; EVP_PKEY_CTX_free(genctx); genctx = NULL; @@ -733,7 +729,7 @@ int req_main(int argc, char **argv) } goto end; } - BIO_free_all(out); + BIO_free(out); out = NULL; BIO_printf(bio_err, "-----\n"); } @@ -992,10 +988,10 @@ int req_main(int argc, char **argv) else tpubkey = X509_REQ_get0_pubkey(req); if (tpubkey == NULL) { - BIO_puts(bio_err, "Modulus is unavailable\n"); + fprintf(stdout, "Modulus is unavailable\n"); goto end; } - BIO_puts(out, "Modulus="); + fprintf(stdout, "Modulus="); if (EVP_PKEY_is_a(tpubkey, "RSA") || EVP_PKEY_is_a(tpubkey, "RSA-PSS")) { BIGNUM *n = NULL; @@ -1004,9 +1000,9 @@ int req_main(int argc, char **argv) BN_print(out, n); BN_free(n); } else { - BIO_puts(out, "Wrong Algorithm type"); + fprintf(stdout, "Wrong Algorithm type"); } - BIO_puts(out, "\n"); + fprintf(stdout, "\n"); } if (!noout && !gen_x509) { diff --git a/deps/openssl/openssl/apps/s_client.c b/deps/openssl/openssl/apps/s_client.c index efa2879ca..a91423864 100644 --- a/deps/openssl/openssl/apps/s_client.c +++ b/deps/openssl/openssl/apps/s_client.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved. * Copyright 2005 Nokia. All rights reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use @@ -2271,7 +2271,7 @@ int s_client_main(int argc, char **argv) do { mbuf_len = BIO_gets(fbio, mbuf, BUFSIZZ); } - while (mbuf_len > 3 && (!isdigit((unsigned char)mbuf[0]) || !isdigit((unsigned char)mbuf[1]) || !isdigit((unsigned char)mbuf[2]) || mbuf[3] != ' ')); + while (mbuf_len > 3 && (!isdigit(mbuf[0]) || !isdigit(mbuf[1]) || !isdigit(mbuf[2]) || mbuf[3] != ' ')); (void)BIO_flush(fbio); BIO_pop(fbio); BIO_free(fbio); diff --git a/deps/openssl/openssl/apps/s_server.c b/deps/openssl/openssl/apps/s_server.c index 3c3b209d6..a203d6a09 100644 --- a/deps/openssl/openssl/apps/s_server.c +++ b/deps/openssl/openssl/apps/s_server.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved * Copyright 2005 Nokia. All rights reserved. * @@ -789,7 +789,7 @@ const OPTIONS s_server_options[] = { "second server certificate chain file in PEM format"}, {"dkey", OPT_DKEY, '<', "Second private key file to use (usually for DSA)"}, - {"dkeyform", OPT_DKEYFORM, 'f', + {"dkeyform", OPT_DKEYFORM, 'F', "Second key file format (ENGINE, other values ignored)"}, {"dpass", OPT_DPASS, 's', "Second private key and cert file pass phrase source"}, @@ -1670,11 +1670,6 @@ int s_server_main(int argc, char *argv[]) BIO_printf(bio_err, "Can only use -listen with DTLS\n"); goto end; } - - if (rev && socket_type == SOCK_DGRAM) { - BIO_printf(bio_err, "Can't use -rev with DTLS\n"); - goto end; - } #endif if (stateless && socket_type != SOCK_STREAM) { diff --git a/deps/openssl/openssl/apps/smime.c b/deps/openssl/openssl/apps/smime.c index 52b4a01c2..a2ff0b5be 100644 --- a/deps/openssl/openssl/apps/smime.c +++ b/deps/openssl/openssl/apps/smime.c @@ -453,8 +453,7 @@ int smime_main(int argc, char **argv) "recipient certificate file"); if (cert == NULL) goto end; - if (!sk_X509_push(encerts, cert)) - goto end; + sk_X509_push(encerts, cert); cert = NULL; argv++; } diff --git a/deps/openssl/openssl/apps/speed.c b/deps/openssl/openssl/apps/speed.c index 1113d775b..addf7e321 100644 --- a/deps/openssl/openssl/apps/speed.c +++ b/deps/openssl/openssl/apps/speed.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved. * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved * * Licensed under the Apache License 2.0 (the "License"). You may not use @@ -1005,13 +1005,6 @@ static int EdDSA_sign_loop(void *args) int ret, count; for (count = 0; COND(eddsa_c[testnum][0]); count++) { - ret = EVP_DigestSignInit(edctx[testnum], NULL, NULL, NULL, NULL); - if (ret == 0) { - BIO_printf(bio_err, "EdDSA sign init failure\n"); - ERR_print_errors(bio_err); - count = -1; - break; - } ret = EVP_DigestSign(edctx[testnum], eddsasig, eddsasigsize, buf, 20); if (ret == 0) { BIO_printf(bio_err, "EdDSA sign failure\n"); @@ -1033,13 +1026,6 @@ static int EdDSA_verify_loop(void *args) int ret, count; for (count = 0; COND(eddsa_c[testnum][1]); count++) { - ret = EVP_DigestVerifyInit(edctx[testnum], NULL, NULL, NULL, NULL); - if (ret == 0) { - BIO_printf(bio_err, "EdDSA verify init failure\n"); - ERR_print_errors(bio_err); - count = -1; - break; - } ret = EVP_DigestVerify(edctx[testnum], eddsasig, eddsasigsize, buf, 20); if (ret != 1) { BIO_printf(bio_err, "EdDSA verify failure\n"); @@ -3147,22 +3133,12 @@ skip_hmac: } for (k = 0; k < ALGOR_NUM; k++) { - const char *alg_name = names[k]; - if (!doit[k]) continue; - - if (k == D_EVP) { - if (evp_cipher == NULL) - alg_name = evp_md_name; - else if ((alg_name = EVP_CIPHER_get0_name(evp_cipher)) == NULL) - app_bail_out("failed to get name of cipher '%s'\n", evp_cipher); - } - if (mr) - printf("+F:%u:%s", k, alg_name); + printf("+F:%u:%s", k, names[k]); else - printf("%-13s", alg_name); + printf("%-13s", names[k]); for (testnum = 0; testnum < size_num; testnum++) { if (results[k][testnum] > 10000 && !mr) printf(" %11.2fk", results[k][testnum] / 1e3); @@ -3700,8 +3676,7 @@ static void multiblock_speed(const EVP_CIPHER *evp_cipher, int lengths_single, } else { int pad; - if (RAND_bytes(inp, 16) <= 0) - app_bail_out("error setting random bytes\n"); + RAND_bytes(out, 16); len += 16; aad[11] = (unsigned char)(len >> 8); aad[12] = (unsigned char)(len); diff --git a/deps/openssl/openssl/appveyor.yml b/deps/openssl/openssl/appveyor.yml new file mode 100644 index 000000000..9bb6f04e0 --- /dev/null +++ b/deps/openssl/openssl/appveyor.yml @@ -0,0 +1,82 @@ +image: + - Visual Studio 2017 + +platform: + - x64 + - x86 + +environment: + fast_finish: true + matrix: + - VSVER: 15 + +configuration: + - shared + - minimal + +for: + - + branches: + only: + - master + configuration: + - shared + - plain + - minimal + +before_build: + - ps: >- + Install-Module VSSetup -Scope CurrentUser + - ps: >- + Get-VSSetupInstance -All + - ps: >- + If ($env:Platform -Match "x86") { + $env:VCVARS_PLATFORM="x86" + $env:TARGET="VC-WIN32 no-asm --strict-warnings" + } Else { + $env:VCVARS_PLATFORM="amd64" + $env:TARGET="VC-WIN64A-masm" + } + - ps: >- + If ($env:Configuration -Match "shared") { + $env:CONFIG_OPTS="enable-fips" + } ElseIf ($env:Configuration -Match "minimal") { + $env:CONFIG_OPTS="no-bulk no-asm -DOPENSSL_SMALL_FOOTPRINT" + } Else { + $env:CONFIG_OPTS="no-fips no-shared" + } + - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" %VCVARS_PLATFORM% + - mkdir _build + - cd _build + - perl ..\Configure %TARGET% no-makedepend %CONFIG_OPTS% + - perl configdata.pm --dump + - cd .. + - ps: >- + If ($env:BUILDONLY -or $env:MAKEVERBOSE) { + $env:NMAKE="nmake" + } Else { + $env:NMAKE="nmake /S" + } + - ps: >- + gci env:* | sort-object name + +build_script: + - cd _build + - "%NMAKE% build_all_generated" + - "%NMAKE% PERL=no-perl" + - cd .. + +test_script: + - cd _build + - ps: >- + if ($env:Configuration -Match "plain") { + cmd /c "%NMAKE% test VERBOSE_FAILURE=yes 2>&1" + } Else { + cmd /c "%NMAKE% test VERBOSE_FAILURE=yes TESTS=-test_fuzz 2>&1" + } + - ps: >- + if ($env:Configuration -Match "shared") { + mkdir ..\_install + cmd /c "%NMAKE% install DESTDIR=..\_install 2>&1" + } + - cd .. diff --git a/deps/openssl/openssl/bundle.json b/deps/openssl/openssl/bundle.json new file mode 100644 index 000000000..a2fe18435 --- /dev/null +++ b/deps/openssl/openssl/bundle.json @@ -0,0 +1,37 @@ +{ + "name": "@ohos/openssl", + "description": "OpenSSL is a robust, commercial-grade, full-featured Open Source Toolkit for the Transport Layer Security (TLS) protocol formerly known as the Secure Sockets Layer (SSL) protocol.", + "version": "4.0", + "license": "Apache License 2.0", + "publishAs": "code-segment", + "segment": { + "destPath": "third_party/openssl" + }, + "dirs": {}, + "scripts": {}, + "readmePath": { + "en": "README.md" + }, + "component": { + "name": "openssl", + "subsystem": "thirdparty", + "syscap": [], + "features": [], + "adapted_system_type": [ + "standard" + ], + "rom": "", + "ram": "", + "deps": { + "components": [], + "third_party": [] + }, + "build": { + "sub_component": [ + "//third_party/openssl:openssl" + ], + "inner_kits": [], + "test": [] + } + } +} diff --git a/deps/openssl/openssl/crypto/LPdir_unix.c b/deps/openssl/openssl/crypto/LPdir_unix.c index b6dda7bce..bc0e924e4 100644 --- a/deps/openssl/openssl/crypto/LPdir_unix.c +++ b/deps/openssl/openssl/crypto/LPdir_unix.c @@ -1,5 +1,5 @@ /* - * Copyright 2004-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2004-2022 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -137,7 +137,7 @@ const char *LP_find_file(LP_DIR_CTX **ctx, const char *directory) if ((*ctx)->expect_file_generations) { char *p = (*ctx)->entry_name + strlen((*ctx)->entry_name); - while (p > (*ctx)->entry_name && isdigit((unsigned char)p[-1])) + while(p > (*ctx)->entry_name && isdigit(p[-1])) p--; if (p > (*ctx)->entry_name && p[-1] == ';') p[-1] = '\0'; diff --git a/deps/openssl/openssl/crypto/aes/asm/aesv8-armx.pl b/deps/openssl/openssl/crypto/aes/asm/aesv8-armx.pl index d0e0be618..544dc7e8e 100755 --- a/deps/openssl/openssl/crypto/aes/asm/aesv8-armx.pl +++ b/deps/openssl/openssl/crypto/aes/asm/aesv8-armx.pl @@ -3661,9 +3661,6 @@ if ($flavour =~ /64/) { ######## 64-bit code s/\.[ui]?64//o and s/\.16b/\.2d/go; s/\.[42]([sd])\[([0-3])\]/\.$1\[$2\]/o; - # Switch preprocessor checks to aarch64 versions. - s/__ARME([BL])__/__AARCH64E$1__/go; - print $_,"\n"; } } else { ######## 32-bit code diff --git a/deps/openssl/openssl/crypto/arm_arch.h b/deps/openssl/openssl/crypto/arm_arch.h index ec4a087fe..45d7e1556 100644 --- a/deps/openssl/openssl/crypto/arm_arch.h +++ b/deps/openssl/openssl/crypto/arm_arch.h @@ -1,5 +1,5 @@ /* - * Copyright 2011-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2011-2022 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -21,6 +21,11 @@ # elif defined(__GNUC__) # if defined(__aarch64__) # define __ARM_ARCH__ 8 +# if __BYTE_ORDER__==__ORDER_BIG_ENDIAN__ +# define __ARMEB__ +# else +# define __ARMEL__ +# endif /* * Why doesn't gcc define __ARM_ARCH__? Instead it defines * bunch of below macros. See all_architectures[] table in diff --git a/deps/openssl/openssl/crypto/asn1/a_strnid.c b/deps/openssl/openssl/crypto/asn1/a_strnid.c index d05293566..9e54db929 100644 --- a/deps/openssl/openssl/crypto/asn1/a_strnid.c +++ b/deps/openssl/openssl/crypto/asn1/a_strnid.c @@ -1,5 +1,5 @@ /* - * Copyright 1999-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1999-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -129,10 +129,8 @@ ASN1_STRING_TABLE *ASN1_STRING_TABLE_get(int nid) int idx; ASN1_STRING_TABLE fnd; -#ifndef OPENSSL_NO_AUTOLOAD_CONFIG /* "stable" can be impacted by config, so load the config file first */ OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CONFIG, NULL); -#endif fnd.nid = nid; if (stable) { diff --git a/deps/openssl/openssl/crypto/asn1/asn1_gen.c b/deps/openssl/openssl/crypto/asn1/asn1_gen.c index 402ab34e6..64620a4f2 100644 --- a/deps/openssl/openssl/crypto/asn1/asn1_gen.c +++ b/deps/openssl/openssl/crypto/asn1/asn1_gen.c @@ -1,5 +1,5 @@ /* - * Copyright 2002-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2002-2022 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -698,12 +698,9 @@ static ASN1_TYPE *asn1_str2type(const char *str, int format, int utype) atmp->value.asn1_string->data = rdata; atmp->value.asn1_string->length = rdlen; atmp->value.asn1_string->type = utype; - } else if (format == ASN1_GEN_FORMAT_ASCII) { - if (!ASN1_STRING_set(atmp->value.asn1_string, str, -1)) { - ERR_raise(ERR_LIB_ASN1, ERR_R_MALLOC_FAILURE); - goto bad_str; - } - } else if ((format == ASN1_GEN_FORMAT_BITLIST) + } else if (format == ASN1_GEN_FORMAT_ASCII) + ASN1_STRING_set(atmp->value.asn1_string, str, -1); + else if ((format == ASN1_GEN_FORMAT_BITLIST) && (utype == V_ASN1_BIT_STRING)) { if (!CONF_parse_list (str, ',', 1, bitstr_cb, atmp->value.bit_string)) { diff --git a/deps/openssl/openssl/crypto/asn1/asn_mime.c b/deps/openssl/openssl/crypto/asn1/asn_mime.c index 9fc52d047..b44b0f368 100644 --- a/deps/openssl/openssl/crypto/asn1/asn_mime.c +++ b/deps/openssl/openssl/crypto/asn1/asn_mime.c @@ -1,5 +1,5 @@ /* - * Copyright 2008-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2008-2022 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -516,12 +516,6 @@ int SMIME_crlf_copy(BIO *in, BIO *out, int flags) int len; char linebuf[MAX_SMLEN]; int ret; - - if (in == NULL || out == NULL) { - ERR_raise(ERR_LIB_ASN1, ERR_R_PASSED_NULL_PARAMETER); - return 0; - } - /* * Buffer output so we don't write one line at a time. This is useful * when streaming as we don't end up with one OCTET STRING per line. diff --git a/deps/openssl/openssl/crypto/asn1/asn_moid.c b/deps/openssl/openssl/crypto/asn1/asn_moid.c index 9aaab8a26..526219c1a 100644 --- a/deps/openssl/openssl/crypto/asn1/asn_moid.c +++ b/deps/openssl/openssl/crypto/asn1/asn_moid.c @@ -67,10 +67,6 @@ static int do_create(const char *value, const char *name) if (p == NULL) { ln = name; ostr = value; - } else if (p == value) { - /* we started with a leading comma */ - ln = name; - ostr = p + 1; } else { ln = value; ostr = p + 1; diff --git a/deps/openssl/openssl/crypto/asn1/asn_mstbl.c b/deps/openssl/openssl/crypto/asn1/asn_mstbl.c index 1208d5663..3543cd225 100644 --- a/deps/openssl/openssl/crypto/asn1/asn_mstbl.c +++ b/deps/openssl/openssl/crypto/asn1/asn_mstbl.c @@ -1,5 +1,5 @@ /* - * Copyright 2012-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2012-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -72,8 +72,6 @@ static int do_tcreate(const char *value, const char *name) goto err; for (i = 0; i < sk_CONF_VALUE_num(lst); i++) { cnf = sk_CONF_VALUE_value(lst, i); - if (cnf->value == NULL) - goto err; if (strcmp(cnf->name, "min") == 0) { tbl_min = strtoul(cnf->value, &eptr, 0); if (*eptr) @@ -100,9 +98,7 @@ static int do_tcreate(const char *value, const char *name) if (rv == 0) { if (cnf) ERR_raise_data(ERR_LIB_ASN1, ASN1_R_INVALID_STRING_TABLE_VALUE, - "field=%s, value=%s", cnf->name, - cnf->value != NULL ? cnf->value - : value); + "field=%s, value=%s", cnf->name, cnf->value); else ERR_raise_data(ERR_LIB_ASN1, ASN1_R_INVALID_STRING_TABLE_VALUE, "name=%s, value=%s", name, value); diff --git a/deps/openssl/openssl/crypto/asn1/x_algor.c b/deps/openssl/openssl/crypto/asn1/x_algor.c index 2c4a8d4b4..c0a5f7680 100644 --- a/deps/openssl/openssl/crypto/asn1/x_algor.c +++ b/deps/openssl/openssl/crypto/asn1/x_algor.c @@ -179,11 +179,7 @@ int ossl_x509_algor_md_to_mgf1(X509_ALGOR **palg, const EVP_MD *mgf1md) *palg = X509_ALGOR_new(); if (*palg == NULL) goto err; - if (!X509_ALGOR_set0(*palg, OBJ_nid2obj(NID_mgf1), V_ASN1_SEQUENCE, stmp)) { - X509_ALGOR_free(*palg); - *palg = NULL; - goto err; - } + X509_ALGOR_set0(*palg, OBJ_nid2obj(NID_mgf1), V_ASN1_SEQUENCE, stmp); stmp = NULL; err: ASN1_STRING_free(stmp); diff --git a/deps/openssl/openssl/crypto/bn/bn_exp.c b/deps/openssl/openssl/crypto/bn/bn_exp.c index 598a592ca..4e169ae1f 100644 --- a/deps/openssl/openssl/crypto/bn/bn_exp.c +++ b/deps/openssl/openssl/crypto/bn/bn_exp.c @@ -243,14 +243,6 @@ int BN_mod_exp_recp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, wstart = bits - 1; /* The top bit of the window */ wend = 0; /* The bottom bit of the window */ - if (r == p) { - BIGNUM *p_dup = BN_CTX_get(ctx); - - if (p_dup == NULL || BN_copy(p_dup, p) == NULL) - goto err; - p = p_dup; - } - if (!BN_one(r)) goto err; @@ -1325,11 +1317,6 @@ int BN_mod_exp_simple(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, return 0; } - if (r == m) { - ERR_raise(ERR_LIB_BN, ERR_R_PASSED_INVALID_ARGUMENT); - return 0; - } - bits = BN_num_bits(p); if (bits == 0) { /* x**0 mod 1, or x**0 mod -1 is still zero. */ @@ -1375,14 +1362,6 @@ int BN_mod_exp_simple(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, wstart = bits - 1; /* The top bit of the window */ wend = 0; /* The bottom bit of the window */ - if (r == p) { - BIGNUM *p_dup = BN_CTX_get(ctx); - - if (p_dup == NULL || BN_copy(p_dup, p) == NULL) - goto err; - p = p_dup; - } - if (!BN_one(r)) goto err; diff --git a/deps/openssl/openssl/crypto/bn/bn_gcd.c b/deps/openssl/openssl/crypto/bn/bn_gcd.c index cd0b0151e..59d024f67 100644 --- a/deps/openssl/openssl/crypto/bn/bn_gcd.c +++ b/deps/openssl/openssl/crypto/bn/bn_gcd.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -611,9 +611,9 @@ int BN_gcd(BIGNUM *r, const BIGNUM *in_a, const BIGNUM *in_b, BN_CTX *ctx) for (i = 0; i < m; i++) { /* conditionally flip signs if delta is positive and g is odd */ - cond = ((unsigned int)-delta >> (8 * sizeof(delta) - 1)) & g->d[0] & 1 + cond = (-delta >> (8 * sizeof(delta) - 1)) & g->d[0] & 1 /* make sure g->top > 0 (i.e. if top == 0 then g == 0 always) */ - & (~((unsigned int)(g->top - 1) >> (sizeof(g->top) * 8 - 1))); + & (~((g->top - 1) >> (sizeof(g->top) * 8 - 1))); delta = (-cond & -delta) | ((cond - 1) & delta); r->neg ^= cond; /* swap */ @@ -625,7 +625,7 @@ int BN_gcd(BIGNUM *r, const BIGNUM *in_a, const BIGNUM *in_b, BN_CTX *ctx) goto err; BN_consttime_swap(g->d[0] & 1 /* g is odd */ /* make sure g->top > 0 (i.e. if top == 0 then g == 0 always) */ - & (~((unsigned int)(g->top - 1) >> (sizeof(g->top) * 8 - 1))), + & (~((g->top - 1) >> (sizeof(g->top) * 8 - 1))), g, temp, top); if (!BN_rshift1(g, g)) goto err; diff --git a/deps/openssl/openssl/crypto/bn/bn_gf2m.c b/deps/openssl/openssl/crypto/bn/bn_gf2m.c index c811ae82d..304c2ea08 100644 --- a/deps/openssl/openssl/crypto/bn/bn_gf2m.c +++ b/deps/openssl/openssl/crypto/bn/bn_gf2m.c @@ -734,20 +734,14 @@ int BN_GF2m_mod_inv(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx) { BIGNUM *b = NULL; int ret = 0; - int numbits; BN_CTX_start(ctx); if ((b = BN_CTX_get(ctx)) == NULL) goto err; - /* Fail on a non-sensical input p value */ - numbits = BN_num_bits(p); - if (numbits <= 1) - goto err; - /* generate blinding value */ do { - if (!BN_priv_rand_ex(b, numbits - 1, + if (!BN_priv_rand_ex(b, BN_num_bits(p) - 1, BN_RAND_TOP_ANY, BN_RAND_BOTTOM_ANY, 0, ctx)) goto err; } while (BN_is_zero(b)); diff --git a/deps/openssl/openssl/crypto/bn/bn_mod.c b/deps/openssl/openssl/crypto/bn/bn_mod.c index 2dda2e344..7f5afa25e 100644 --- a/deps/openssl/openssl/crypto/bn/bn_mod.c +++ b/deps/openssl/openssl/crypto/bn/bn_mod.c @@ -17,11 +17,6 @@ int BN_nnmod(BIGNUM *r, const BIGNUM *m, const BIGNUM *d, BN_CTX *ctx) * always holds) */ - if (r == d) { - ERR_raise(ERR_LIB_BN, ERR_R_PASSED_INVALID_ARGUMENT); - return 0; - } - if (!(BN_mod(r, m, d, ctx))) return 0; if (!r->neg) @@ -191,11 +186,6 @@ int bn_mod_sub_fixed_top(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, int BN_mod_sub_quick(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m) { - if (r == m) { - ERR_raise(ERR_LIB_BN, ERR_R_PASSED_INVALID_ARGUMENT); - return 0; - } - if (!BN_sub(r, a, b)) return 0; if (r->neg) diff --git a/deps/openssl/openssl/crypto/bn/bn_nist.c b/deps/openssl/openssl/crypto/bn/bn_nist.c index d761e5702..3d4d9a2fb 100644 --- a/deps/openssl/openssl/crypto/bn/bn_nist.c +++ b/deps/openssl/openssl/crypto/bn/bn_nist.c @@ -319,28 +319,6 @@ static void nist_cp_bn(BN_ULONG *dst, const BN_ULONG *src, int top) # endif #endif /* BN_BITS2 != 64 */ -#ifdef NIST_INT64 -/* Helpers to load/store a 32-bit word (uint32_t) from/into a memory - * location and avoid potential aliasing issue. */ -static ossl_inline uint32_t load_u32(const void *ptr) -{ - uint32_t tmp; - - memcpy(&tmp, ptr, sizeof(tmp)); - return tmp; -} - -static ossl_inline void store_lo32(void *ptr, NIST_INT64 val) -{ - /* A cast is needed for big-endian system: on a 32-bit BE system - * NIST_INT64 may be defined as well if the compiler supports 64-bit - * long long. */ - uint32_t tmp = (uint32_t)val; - - memcpy(ptr, &tmp, sizeof(tmp)); -} -#endif /* NIST_INT64 */ - #define nist_set_192(to, from, a1, a2, a3) \ { \ bn_cp_64(to, 0, from, (a3) - 3) \ @@ -396,42 +374,42 @@ int BN_nist_mod_192(BIGNUM *r, const BIGNUM *a, const BIGNUM *field, unsigned int *rp = (unsigned int *)r_d; const unsigned int *bp = (const unsigned int *)buf.ui; - acc = load_u32(&rp[0]); + acc = rp[0]; acc += bp[3 * 2 - 6]; acc += bp[5 * 2 - 6]; - store_lo32(&rp[0], acc); + rp[0] = (unsigned int)acc; acc >>= 32; - acc += load_u32(&rp[1]); + acc += rp[1]; acc += bp[3 * 2 - 5]; acc += bp[5 * 2 - 5]; - store_lo32(&rp[1], acc); + rp[1] = (unsigned int)acc; acc >>= 32; - acc += load_u32(&rp[2]); + acc += rp[2]; acc += bp[3 * 2 - 6]; acc += bp[4 * 2 - 6]; acc += bp[5 * 2 - 6]; - store_lo32(&rp[2], acc); + rp[2] = (unsigned int)acc; acc >>= 32; - acc += load_u32(&rp[3]); + acc += rp[3]; acc += bp[3 * 2 - 5]; acc += bp[4 * 2 - 5]; acc += bp[5 * 2 - 5]; - store_lo32(&rp[3], acc); + rp[3] = (unsigned int)acc; acc >>= 32; - acc += load_u32(&rp[4]); + acc += rp[4]; acc += bp[4 * 2 - 6]; acc += bp[5 * 2 - 6]; - store_lo32(&rp[4], acc); + rp[4] = (unsigned int)acc; acc >>= 32; - acc += load_u32(&rp[5]); + acc += rp[5]; acc += bp[4 * 2 - 5]; acc += bp[5 * 2 - 5]; - store_lo32(&rp[5], acc); + rp[5] = (unsigned int)acc; carry = (int)(acc >> 32); } @@ -705,36 +683,36 @@ int BN_nist_mod_256(BIGNUM *r, const BIGNUM *a, const BIGNUM *field, unsigned int *rp = (unsigned int *)r_d; const unsigned int *bp = (const unsigned int *)buf.ui; - acc = load_u32(&rp[0]); + acc = rp[0]; acc += bp[8 - 8]; acc += bp[9 - 8]; acc -= bp[11 - 8]; acc -= bp[12 - 8]; acc -= bp[13 - 8]; acc -= bp[14 - 8]; - store_lo32(&rp[0], acc); + rp[0] = (unsigned int)acc; acc >>= 32; - acc += load_u32(&rp[1]); + acc += rp[1]; acc += bp[9 - 8]; acc += bp[10 - 8]; acc -= bp[12 - 8]; acc -= bp[13 - 8]; acc -= bp[14 - 8]; acc -= bp[15 - 8]; - store_lo32(&rp[1], acc); + rp[1] = (unsigned int)acc; acc >>= 32; - acc += load_u32(&rp[2]); + acc += rp[2]; acc += bp[10 - 8]; acc += bp[11 - 8]; acc -= bp[13 - 8]; acc -= bp[14 - 8]; acc -= bp[15 - 8]; - store_lo32(&rp[2], acc); + rp[2] = (unsigned int)acc; acc >>= 32; - acc += load_u32(&rp[3]); + acc += rp[3]; acc += bp[11 - 8]; acc += bp[11 - 8]; acc += bp[12 - 8]; @@ -743,10 +721,10 @@ int BN_nist_mod_256(BIGNUM *r, const BIGNUM *a, const BIGNUM *field, acc -= bp[15 - 8]; acc -= bp[8 - 8]; acc -= bp[9 - 8]; - store_lo32(&rp[3], acc); + rp[3] = (unsigned int)acc; acc >>= 32; - acc += load_u32(&rp[4]); + acc += rp[4]; acc += bp[12 - 8]; acc += bp[12 - 8]; acc += bp[13 - 8]; @@ -754,10 +732,10 @@ int BN_nist_mod_256(BIGNUM *r, const BIGNUM *a, const BIGNUM *field, acc += bp[14 - 8]; acc -= bp[9 - 8]; acc -= bp[10 - 8]; - store_lo32(&rp[4], acc); + rp[4] = (unsigned int)acc; acc >>= 32; - acc += load_u32(&rp[5]); + acc += rp[5]; acc += bp[13 - 8]; acc += bp[13 - 8]; acc += bp[14 - 8]; @@ -765,10 +743,10 @@ int BN_nist_mod_256(BIGNUM *r, const BIGNUM *a, const BIGNUM *field, acc += bp[15 - 8]; acc -= bp[10 - 8]; acc -= bp[11 - 8]; - store_lo32(&rp[5], acc); + rp[5] = (unsigned int)acc; acc >>= 32; - acc += load_u32(&rp[6]); + acc += rp[6]; acc += bp[14 - 8]; acc += bp[14 - 8]; acc += bp[15 - 8]; @@ -777,10 +755,10 @@ int BN_nist_mod_256(BIGNUM *r, const BIGNUM *a, const BIGNUM *field, acc += bp[13 - 8]; acc -= bp[8 - 8]; acc -= bp[9 - 8]; - store_lo32(&rp[6], acc); + rp[6] = (unsigned int)acc; acc >>= 32; - acc += load_u32(&rp[7]); + acc += rp[7]; acc += bp[15 - 8]; acc += bp[15 - 8]; acc += bp[15 - 8]; @@ -789,7 +767,7 @@ int BN_nist_mod_256(BIGNUM *r, const BIGNUM *a, const BIGNUM *field, acc -= bp[11 - 8]; acc -= bp[12 - 8]; acc -= bp[13 - 8]; - store_lo32(&rp[7], acc); + rp[7] = (unsigned int)acc; carry = (int)(acc >> 32); } @@ -942,32 +920,32 @@ int BN_nist_mod_384(BIGNUM *r, const BIGNUM *a, const BIGNUM *field, unsigned int *rp = (unsigned int *)r_d; const unsigned int *bp = (const unsigned int *)buf.ui; - acc = load_u32(&rp[0]); + acc = rp[0]; acc += bp[12 - 12]; acc += bp[21 - 12]; acc += bp[20 - 12]; acc -= bp[23 - 12]; - store_lo32(&rp[0], acc); + rp[0] = (unsigned int)acc; acc >>= 32; - acc += load_u32(&rp[1]); + acc += rp[1]; acc += bp[13 - 12]; acc += bp[22 - 12]; acc += bp[23 - 12]; acc -= bp[12 - 12]; acc -= bp[20 - 12]; - store_lo32(&rp[1], acc); + rp[1] = (unsigned int)acc; acc >>= 32; - acc += load_u32(&rp[2]); + acc += rp[2]; acc += bp[14 - 12]; acc += bp[23 - 12]; acc -= bp[13 - 12]; acc -= bp[21 - 12]; - store_lo32(&rp[2], acc); + rp[2] = (unsigned int)acc; acc >>= 32; - acc += load_u32(&rp[3]); + acc += rp[3]; acc += bp[15 - 12]; acc += bp[12 - 12]; acc += bp[20 - 12]; @@ -975,10 +953,10 @@ int BN_nist_mod_384(BIGNUM *r, const BIGNUM *a, const BIGNUM *field, acc -= bp[14 - 12]; acc -= bp[22 - 12]; acc -= bp[23 - 12]; - store_lo32(&rp[3], acc); + rp[3] = (unsigned int)acc; acc >>= 32; - acc += load_u32(&rp[4]); + acc += rp[4]; acc += bp[21 - 12]; acc += bp[21 - 12]; acc += bp[16 - 12]; @@ -989,10 +967,10 @@ int BN_nist_mod_384(BIGNUM *r, const BIGNUM *a, const BIGNUM *field, acc -= bp[15 - 12]; acc -= bp[23 - 12]; acc -= bp[23 - 12]; - store_lo32(&rp[4], acc); + rp[4] = (unsigned int)acc; acc >>= 32; - acc += load_u32(&rp[5]); + acc += rp[5]; acc += bp[22 - 12]; acc += bp[22 - 12]; acc += bp[17 - 12]; @@ -1001,10 +979,10 @@ int BN_nist_mod_384(BIGNUM *r, const BIGNUM *a, const BIGNUM *field, acc += bp[21 - 12]; acc += bp[23 - 12]; acc -= bp[16 - 12]; - store_lo32(&rp[5], acc); + rp[5] = (unsigned int)acc; acc >>= 32; - acc += load_u32(&rp[6]); + acc += rp[6]; acc += bp[23 - 12]; acc += bp[23 - 12]; acc += bp[18 - 12]; @@ -1012,48 +990,48 @@ int BN_nist_mod_384(BIGNUM *r, const BIGNUM *a, const BIGNUM *field, acc += bp[14 - 12]; acc += bp[22 - 12]; acc -= bp[17 - 12]; - store_lo32(&rp[6], acc); + rp[6] = (unsigned int)acc; acc >>= 32; - acc += load_u32(&rp[7]); + acc += rp[7]; acc += bp[19 - 12]; acc += bp[16 - 12]; acc += bp[15 - 12]; acc += bp[23 - 12]; acc -= bp[18 - 12]; - store_lo32(&rp[7], acc); + rp[7] = (unsigned int)acc; acc >>= 32; - acc += load_u32(&rp[8]); + acc += rp[8]; acc += bp[20 - 12]; acc += bp[17 - 12]; acc += bp[16 - 12]; acc -= bp[19 - 12]; - store_lo32(&rp[8], acc); + rp[8] = (unsigned int)acc; acc >>= 32; - acc += load_u32(&rp[9]); + acc += rp[9]; acc += bp[21 - 12]; acc += bp[18 - 12]; acc += bp[17 - 12]; acc -= bp[20 - 12]; - store_lo32(&rp[9], acc); + rp[9] = (unsigned int)acc; acc >>= 32; - acc += load_u32(&rp[10]); + acc += rp[10]; acc += bp[22 - 12]; acc += bp[19 - 12]; acc += bp[18 - 12]; acc -= bp[21 - 12]; - store_lo32(&rp[10], acc); + rp[10] = (unsigned int)acc; acc >>= 32; - acc += load_u32(&rp[11]); + acc += rp[11]; acc += bp[23 - 12]; acc += bp[20 - 12]; acc += bp[19 - 12]; acc -= bp[22 - 12]; - store_lo32(&rp[11], acc); + rp[11] = (unsigned int)acc; carry = (int)(acc >> 32); } diff --git a/deps/openssl/openssl/crypto/bn/bn_recp.c b/deps/openssl/openssl/crypto/bn/bn_recp.c index 3a2c812ac..96a6b19ab 100644 --- a/deps/openssl/openssl/crypto/bn/bn_recp.c +++ b/deps/openssl/openssl/crypto/bn/bn_recp.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -44,7 +44,7 @@ void BN_RECP_CTX_free(BN_RECP_CTX *recp) int BN_RECP_CTX_set(BN_RECP_CTX *recp, const BIGNUM *d, BN_CTX *ctx) { - if (BN_is_zero(d) || !BN_copy(&(recp->N), d)) + if (!BN_copy(&(recp->N), d)) return 0; BN_zero(&(recp->Nr)); recp->num_bits = BN_num_bits(d); diff --git a/deps/openssl/openssl/crypto/build.info b/deps/openssl/openssl/crypto/build.info index a45bf8dee..b90390ae8 100644 --- a/deps/openssl/openssl/crypto/build.info +++ b/deps/openssl/openssl/crypto/build.info @@ -74,8 +74,8 @@ DEFINE[../providers/libfips.a]=$CPUIDDEF # already gets everything that the static libcrypto.a has, and doesn't need it # added again. IF[{- !$disabled{module} && !$disabled{shared} -}] - SOURCE[../providers/legacy]=$CPUID_COMMON - DEFINE[../providers/legacy]=$CPUIDDEF + SOURCE[../providers/liblegacy.a]=$CPUID_COMMON + DEFINE[../providers/liblegacy.a]=$CPUIDDEF ENDIF # Implementations are now spread across several libraries, so the CPUID define @@ -97,6 +97,8 @@ $UTIL_COMMON=\ context.c sparse_array.c asn1_dsa.c packet.c param_build.c \ param_build_set.c der_writer.c threads_lib.c params_dup.c +SHARED_SOURCE[../libssl]=sparse_array.c + SOURCE[../libcrypto]=$UTIL_COMMON \ mem.c mem_sec.c \ cversion.c info.c cpt_err.c ebcdic.c uid.c o_time.c o_dir.c \ diff --git a/deps/openssl/openssl/crypto/chacha/asm/chacha-ia64.pl b/deps/openssl/openssl/crypto/chacha/asm/chacha-ia64.pl index 78201649d..b13d97285 100644 --- a/deps/openssl/openssl/crypto/chacha/asm/chacha-ia64.pl +++ b/deps/openssl/openssl/crypto/chacha/asm/chacha-ia64.pl @@ -46,8 +46,6 @@ ChaCha20_ctr32: ADDP @k[11]=4,$key .save ar.lc,r3 mov r3=ar.lc } -{ .mmi; ADDP $out=0,$out - ADDP $inp=0,$inp } { .mmi; ADDP $key=0,$key ADDP $counter=0,$counter .save pr,r14 diff --git a/deps/openssl/openssl/crypto/cmp/cmp_asn.c b/deps/openssl/openssl/crypto/cmp/cmp_asn.c index a8de73ad9..0ca107554 100644 --- a/deps/openssl/openssl/crypto/cmp/cmp_asn.c +++ b/deps/openssl/openssl/crypto/cmp/cmp_asn.c @@ -1,5 +1,5 @@ /* - * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved. * Copyright Nokia 2007-2019 * Copyright Siemens AG 2015-2019 * @@ -188,22 +188,22 @@ int OSSL_CMP_ITAV_push0_stack_item(STACK_OF(OSSL_CMP_ITAV) **itav_sk_p, return 0; } -/* get ASN.1 encoded integer, return -2 on error; -1 is valid for certReqId */ +/* get ASN.1 encoded integer, return -1 on error */ int ossl_cmp_asn1_get_int(const ASN1_INTEGER *a) { int64_t res; if (!ASN1_INTEGER_get_int64(&res, a)) { ERR_raise(ERR_LIB_CMP, ASN1_R_INVALID_NUMBER); - return -2; + return -1; } if (res < INT_MIN) { ERR_raise(ERR_LIB_CMP, ASN1_R_TOO_SMALL); - return -2; + return -1; } if (res > INT_MAX) { ERR_raise(ERR_LIB_CMP, ASN1_R_TOO_LARGE); - return -2; + return -1; } return (int)res; } diff --git a/deps/openssl/openssl/crypto/cmp/cmp_client.c b/deps/openssl/openssl/crypto/cmp/cmp_client.c index df334cc00..dc41f4c3b 100644 --- a/deps/openssl/openssl/crypto/cmp/cmp_client.c +++ b/deps/openssl/openssl/crypto/cmp/cmp_client.c @@ -584,7 +584,7 @@ static int cert_response(OSSL_CMP_CTX *ctx, int sleep, int rid, return 0; if (rid == OSSL_CMP_CERTREQID_NONE) { /* used for OSSL_CMP_PKIBODY_P10CR */ rid = ossl_cmp_asn1_get_int(crep->certReqId); - if (rid < OSSL_CMP_CERTREQID_NONE) { + if (rid != OSSL_CMP_CERTREQID_NONE) { ERR_raise(ERR_LIB_CMP, CMP_R_BAD_REQUEST_ID); return 0; } diff --git a/deps/openssl/openssl/crypto/cmp/cmp_status.c b/deps/openssl/openssl/crypto/cmp/cmp_status.c index 68144aa4f..bfe6cd990 100644 --- a/deps/openssl/openssl/crypto/cmp/cmp_status.c +++ b/deps/openssl/openssl/crypto/cmp/cmp_status.c @@ -1,5 +1,5 @@ /* - * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved. * Copyright Nokia 2007-2019 * Copyright Siemens AG 2015-2019 * @@ -30,12 +30,9 @@ int ossl_cmp_pkisi_get_status(const OSSL_CMP_PKISI *si) { - int res ; - if (!ossl_assert(si != NULL && si->status != NULL)) return -1; - res = ossl_cmp_asn1_get_int(si->status); - return res == -2 ? -1 : res; + return ossl_cmp_asn1_get_int(si->status); } const char *ossl_cmp_PKIStatus_to_string(int status) diff --git a/deps/openssl/openssl/crypto/cms/cms_att.c b/deps/openssl/openssl/crypto/cms/cms_att.c index 64acda726..5b99516b2 100644 --- a/deps/openssl/openssl/crypto/cms/cms_att.c +++ b/deps/openssl/openssl/crypto/cms/cms_att.c @@ -1,5 +1,5 @@ /* - * Copyright 2008-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2008-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -12,9 +12,8 @@ #include #include #include -#include "internal/nelem.h" -#include "crypto/x509.h" #include "cms_local.h" +#include "internal/nelem.h" /*- * Attribute flags. @@ -95,7 +94,7 @@ X509_ATTRIBUTE *CMS_signed_delete_attr(CMS_SignerInfo *si, int loc) int CMS_signed_add1_attr(CMS_SignerInfo *si, X509_ATTRIBUTE *attr) { - if (ossl_x509at_add1_attr(&si->signedAttrs, attr)) + if (X509at_add1_attr(&si->signedAttrs, attr)) return 1; return 0; } @@ -104,7 +103,7 @@ int CMS_signed_add1_attr_by_OBJ(CMS_SignerInfo *si, const ASN1_OBJECT *obj, int type, const void *bytes, int len) { - if (ossl_x509at_add1_attr_by_OBJ(&si->signedAttrs, obj, type, bytes, len)) + if (X509at_add1_attr_by_OBJ(&si->signedAttrs, obj, type, bytes, len)) return 1; return 0; } @@ -112,7 +111,7 @@ int CMS_signed_add1_attr_by_OBJ(CMS_SignerInfo *si, int CMS_signed_add1_attr_by_NID(CMS_SignerInfo *si, int nid, int type, const void *bytes, int len) { - if (ossl_x509at_add1_attr_by_NID(&si->signedAttrs, nid, type, bytes, len)) + if (X509at_add1_attr_by_NID(&si->signedAttrs, nid, type, bytes, len)) return 1; return 0; } @@ -121,8 +120,7 @@ int CMS_signed_add1_attr_by_txt(CMS_SignerInfo *si, const char *attrname, int type, const void *bytes, int len) { - if (ossl_x509at_add1_attr_by_txt(&si->signedAttrs, attrname, type, bytes, - len)) + if (X509at_add1_attr_by_txt(&si->signedAttrs, attrname, type, bytes, len)) return 1; return 0; } @@ -163,7 +161,7 @@ X509_ATTRIBUTE *CMS_unsigned_delete_attr(CMS_SignerInfo *si, int loc) int CMS_unsigned_add1_attr(CMS_SignerInfo *si, X509_ATTRIBUTE *attr) { - if (ossl_x509at_add1_attr(&si->unsignedAttrs, attr)) + if (X509at_add1_attr(&si->unsignedAttrs, attr)) return 1; return 0; } @@ -172,7 +170,7 @@ int CMS_unsigned_add1_attr_by_OBJ(CMS_SignerInfo *si, const ASN1_OBJECT *obj, int type, const void *bytes, int len) { - if (ossl_x509at_add1_attr_by_OBJ(&si->unsignedAttrs, obj, type, bytes, len)) + if (X509at_add1_attr_by_OBJ(&si->unsignedAttrs, obj, type, bytes, len)) return 1; return 0; } @@ -181,7 +179,7 @@ int CMS_unsigned_add1_attr_by_NID(CMS_SignerInfo *si, int nid, int type, const void *bytes, int len) { - if (ossl_x509at_add1_attr_by_NID(&si->unsignedAttrs, nid, type, bytes, len)) + if (X509at_add1_attr_by_NID(&si->unsignedAttrs, nid, type, bytes, len)) return 1; return 0; } @@ -190,8 +188,8 @@ int CMS_unsigned_add1_attr_by_txt(CMS_SignerInfo *si, const char *attrname, int type, const void *bytes, int len) { - if (ossl_x509at_add1_attr_by_txt(&si->unsignedAttrs, attrname, - type, bytes, len)) + if (X509at_add1_attr_by_txt(&si->unsignedAttrs, attrname, + type, bytes, len)) return 1; return 0; } diff --git a/deps/openssl/openssl/crypto/cms/cms_dh.c b/deps/openssl/openssl/crypto/cms/cms_dh.c index 2f54ed267..950979631 100644 --- a/deps/openssl/openssl/crypto/cms/cms_dh.c +++ b/deps/openssl/openssl/crypto/cms/cms_dh.c @@ -316,10 +316,10 @@ static int dh_cms_encrypt(CMS_RecipientInfo *ri) goto err; ASN1_STRING_set0(wrap_str, penc, penclen); penc = NULL; - rv = X509_ALGOR_set0(talg, OBJ_nid2obj(NID_id_smime_alg_ESDH), - V_ASN1_SEQUENCE, wrap_str); - if (!rv) - ASN1_STRING_free(wrap_str); + X509_ALGOR_set0(talg, OBJ_nid2obj(NID_id_smime_alg_ESDH), + V_ASN1_SEQUENCE, wrap_str); + + rv = 1; err: OPENSSL_free(penc); diff --git a/deps/openssl/openssl/crypto/cms/cms_enc.c b/deps/openssl/openssl/crypto/cms/cms_enc.c index ae88df33a..f7007c123 100644 --- a/deps/openssl/openssl/crypto/cms/cms_enc.c +++ b/deps/openssl/openssl/crypto/cms/cms_enc.c @@ -1,5 +1,5 @@ /* - * Copyright 2008-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2008-2022 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -15,7 +15,6 @@ #include #include #include "crypto/evp.h" -#include "crypto/asn1.h" #include "cms_local.h" /* CMS EncryptedData Utilities */ @@ -82,7 +81,7 @@ BIO *ossl_cms_EncryptedContent_init_bio(CMS_EncryptedContentInfo *ec, if (enc) { calg->algorithm = OBJ_nid2obj(EVP_CIPHER_CTX_get_type(ctx)); - if (calg->algorithm == NULL || calg->algorithm->nid == NID_undef) { + if (calg->algorithm == NULL) { ERR_raise(ERR_LIB_CMS, CMS_R_UNSUPPORTED_CONTENT_ENCRYPTION_ALGORITHM); goto err; } diff --git a/deps/openssl/openssl/crypto/cms/cms_env.c b/deps/openssl/openssl/crypto/cms/cms_env.c index 99cf1dcb3..3105d3772 100644 --- a/deps/openssl/openssl/crypto/cms/cms_env.c +++ b/deps/openssl/openssl/crypto/cms/cms_env.c @@ -26,7 +26,7 @@ static void cms_env_set_version(CMS_EnvelopedData *env); #define CMS_ENVELOPED_STANDARD 1 #define CMS_ENVELOPED_AUTH 2 -static int cms_get_enveloped_type_simple(const CMS_ContentInfo *cms) +static int cms_get_enveloped_type(const CMS_ContentInfo *cms) { int nid = OBJ_obj2nid(cms->contentType); @@ -38,25 +38,8 @@ static int cms_get_enveloped_type_simple(const CMS_ContentInfo *cms) return CMS_ENVELOPED_AUTH; default: - return 0; - } -} - -static int cms_get_enveloped_type(const CMS_ContentInfo *cms) -{ - int ret = cms_get_enveloped_type_simple(cms); - - if (ret == 0) ERR_raise(ERR_LIB_CMS, CMS_R_CONTENT_TYPE_NOT_ENVELOPED_DATA); - return ret; -} - -void ossl_cms_env_enc_content_free(const CMS_ContentInfo *cinf) -{ - if (cms_get_enveloped_type_simple(cinf) != 0) { - CMS_EncryptedContentInfo *ec = ossl_cms_get0_env_enc_content(cinf); - if (ec != NULL) - OPENSSL_clear_free(ec->key, ec->keylen); + return 0; } } @@ -159,12 +142,10 @@ CMS_EncryptedContentInfo *ossl_cms_get0_env_enc_content(const CMS_ContentInfo *c { switch (cms_get_enveloped_type(cms)) { case CMS_ENVELOPED_STANDARD: - return cms->d.envelopedData == NULL ? NULL - : cms->d.envelopedData->encryptedContentInfo; + return cms->d.envelopedData->encryptedContentInfo; case CMS_ENVELOPED_AUTH: - return cms->d.authEnvelopedData == NULL ? NULL - : cms->d.authEnvelopedData->authEncryptedContentInfo; + return cms->d.authEnvelopedData->authEncryptedContentInfo; default: return NULL; diff --git a/deps/openssl/openssl/crypto/cms/cms_err.c b/deps/openssl/openssl/crypto/cms/cms_err.c index 4bd6a0dc1..dcbea201c 100644 --- a/deps/openssl/openssl/crypto/cms/cms_err.c +++ b/deps/openssl/openssl/crypto/cms/cms_err.c @@ -1,6 +1,6 @@ /* * Generated by util/mkerr.pl DO NOT EDIT - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -154,8 +154,6 @@ static const ERR_STRING_DATA CMS_str_reasons[] = { "unsupported recipientinfo type"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNSUPPORTED_RECIPIENT_TYPE), "unsupported recipient type"}, - {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNSUPPORTED_SIGNATURE_ALGORITHM), - "unsupported signature algorithm"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNSUPPORTED_TYPE), "unsupported type"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNWRAP_ERROR), "unwrap error"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNWRAP_FAILURE), "unwrap failure"}, diff --git a/deps/openssl/openssl/crypto/cms/cms_lib.c b/deps/openssl/openssl/crypto/cms/cms_lib.c index 8b135e95a..0738da3da 100644 --- a/deps/openssl/openssl/crypto/cms/cms_lib.c +++ b/deps/openssl/openssl/crypto/cms/cms_lib.c @@ -76,7 +76,6 @@ CMS_ContentInfo *CMS_ContentInfo_new(void) void CMS_ContentInfo_free(CMS_ContentInfo *cms) { if (cms != NULL) { - ossl_cms_env_enc_content_free(cms); OPENSSL_free(cms->ctx.propq); ASN1_item_free((ASN1_VALUE *)cms, ASN1_ITEM_rptr(CMS_ContentInfo)); } diff --git a/deps/openssl/openssl/crypto/cms/cms_local.h b/deps/openssl/openssl/crypto/cms/cms_local.h index 253f6819e..15b4a29ce 100644 --- a/deps/openssl/openssl/crypto/cms/cms_local.h +++ b/deps/openssl/openssl/crypto/cms/cms_local.h @@ -1,5 +1,5 @@ /* - * Copyright 2008-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2008-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -444,7 +444,6 @@ BIO *ossl_cms_EnvelopedData_init_bio(CMS_ContentInfo *cms); int ossl_cms_EnvelopedData_final(CMS_ContentInfo *cms, BIO *chain); BIO *ossl_cms_AuthEnvelopedData_init_bio(CMS_ContentInfo *cms); int ossl_cms_AuthEnvelopedData_final(CMS_ContentInfo *cms, BIO *cmsbio); -void ossl_cms_env_enc_content_free(const CMS_ContentInfo *cinf); CMS_EnvelopedData *ossl_cms_get0_enveloped(CMS_ContentInfo *cms); CMS_AuthEnvelopedData *ossl_cms_get0_auth_enveloped(CMS_ContentInfo *cms); CMS_EncryptedContentInfo *ossl_cms_get0_env_enc_content(const CMS_ContentInfo *cms); diff --git a/deps/openssl/openssl/crypto/cms/cms_rsa.c b/deps/openssl/openssl/crypto/cms/cms_rsa.c index 12bc81843..997567fdb 100644 --- a/deps/openssl/openssl/crypto/cms/cms_rsa.c +++ b/deps/openssl/openssl/crypto/cms/cms_rsa.c @@ -1,5 +1,5 @@ /* - * Copyright 2006-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2006-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -13,7 +13,6 @@ #include #include "crypto/asn1.h" #include "crypto/rsa.h" -#include "crypto/evp.h" #include "cms_local.h" static RSA_OAEP_PARAMS *rsa_oaep_decode(const X509_ALGOR *alg) @@ -99,10 +98,8 @@ static int rsa_cms_decrypt(CMS_RecipientInfo *ri) if (EVP_PKEY_CTX_set_rsa_mgf1_md(pkctx, mgf1md) <= 0) goto err; if (label != NULL - && EVP_PKEY_CTX_set0_rsa_oaep_label(pkctx, label, labellen) <= 0) { - OPENSSL_free(label); + && EVP_PKEY_CTX_set0_rsa_oaep_label(pkctx, label, labellen) <= 0) goto err; - } /* Carry on */ rv = 1; @@ -116,7 +113,6 @@ static int rsa_cms_encrypt(CMS_RecipientInfo *ri) const EVP_MD *md, *mgf1md; RSA_OAEP_PARAMS *oaep = NULL; ASN1_STRING *os = NULL; - ASN1_OCTET_STRING *los = NULL; X509_ALGOR *alg; EVP_PKEY_CTX *pkctx = CMS_RecipientInfo_get0_pkey_ctx(ri); int pad_mode = RSA_PKCS1_PADDING, rv = 0, labellen; @@ -128,10 +124,10 @@ static int rsa_cms_encrypt(CMS_RecipientInfo *ri) if (EVP_PKEY_CTX_get_rsa_padding(pkctx, &pad_mode) <= 0) return 0; } - if (pad_mode == RSA_PKCS1_PADDING) - return X509_ALGOR_set0(alg, OBJ_nid2obj(NID_rsaEncryption), - V_ASN1_NULL, NULL); - + if (pad_mode == RSA_PKCS1_PADDING) { + X509_ALGOR_set0(alg, OBJ_nid2obj(NID_rsaEncryption), V_ASN1_NULL, 0); + return 1; + } /* Not supported */ if (pad_mode != RSA_PKCS1_OAEP_PADDING) return 0; @@ -150,32 +146,30 @@ static int rsa_cms_encrypt(CMS_RecipientInfo *ri) if (!ossl_x509_algor_md_to_mgf1(&oaep->maskGenFunc, mgf1md)) goto err; if (labellen > 0) { + ASN1_OCTET_STRING *los; + oaep->pSourceFunc = X509_ALGOR_new(); if (oaep->pSourceFunc == NULL) goto err; los = ASN1_OCTET_STRING_new(); if (los == NULL) goto err; - if (!ASN1_OCTET_STRING_set(los, label, labellen)) - goto err; - - if (!X509_ALGOR_set0(oaep->pSourceFunc, OBJ_nid2obj(NID_pSpecified), - V_ASN1_OCTET_STRING, los)) + if (!ASN1_OCTET_STRING_set(los, label, labellen)) { + ASN1_OCTET_STRING_free(los); goto err; - - los = NULL; + } + X509_ALGOR_set0(oaep->pSourceFunc, OBJ_nid2obj(NID_pSpecified), + V_ASN1_OCTET_STRING, los); } - /* create string with oaep parameter encoding. */ + /* create string with pss parameter encoding. */ if (!ASN1_item_pack(oaep, ASN1_ITEM_rptr(RSA_OAEP_PARAMS), &os)) - goto err; - if (!X509_ALGOR_set0(alg, OBJ_nid2obj(NID_rsaesOaep), V_ASN1_SEQUENCE, os)) - goto err; + goto err; + X509_ALGOR_set0(alg, OBJ_nid2obj(NID_rsaesOaep), V_ASN1_SEQUENCE, os); os = NULL; rv = 1; err: RSA_OAEP_PARAMS_free(oaep); ASN1_STRING_free(os); - ASN1_OCTET_STRING_free(los); return rv; } @@ -216,16 +210,6 @@ static int rsa_cms_sign(CMS_SignerInfo *si) if (pad_mode != RSA_PKCS1_PSS_PADDING) return 0; - if (evp_pkey_ctx_is_legacy(pkctx)) { - /* No provider -> we cannot query it for algorithm ID. */ - ASN1_STRING *os = NULL; - - os = ossl_rsa_ctx_to_pss_string(pkctx); - if (os == NULL) - return 0; - return X509_ALGOR_set0(alg, OBJ_nid2obj(EVP_PKEY_RSA_PSS), V_ASN1_SEQUENCE, os); - } - params[0] = OSSL_PARAM_construct_octet_string( OSSL_SIGNATURE_PARAM_ALGORITHM_ID, aid, sizeof(aid)); params[1] = OSSL_PARAM_construct_end(); diff --git a/deps/openssl/openssl/crypto/cms/cms_sd.c b/deps/openssl/openssl/crypto/cms/cms_sd.c index 3a21664e9..34c021bba 100644 --- a/deps/openssl/openssl/crypto/cms/cms_sd.c +++ b/deps/openssl/openssl/crypto/cms/cms_sd.c @@ -1,5 +1,5 @@ /* - * Copyright 2008-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2008-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -233,9 +233,9 @@ static int cms_sd_asn1_ctrl(CMS_SignerInfo *si, int cmd) int i; if (EVP_PKEY_is_a(pkey, "DSA") || EVP_PKEY_is_a(pkey, "EC")) - return ossl_cms_ecdsa_dsa_sign(si, cmd) > 0; + return ossl_cms_ecdsa_dsa_sign(si, cmd); else if (EVP_PKEY_is_a(pkey, "RSA") || EVP_PKEY_is_a(pkey, "RSA-PSS")) - return ossl_cms_rsa_sign(si, cmd) > 0; + return ossl_cms_rsa_sign(si, cmd); /* Something else? We'll give engines etc a chance to handle this */ if (pkey->ameth == NULL || pkey->ameth->pkey_ctrl == NULL) @@ -354,16 +354,11 @@ CMS_SignerInfo *CMS_add1_signer(CMS_ContentInfo *cms, if (md == NULL) { int def_nid; - - if (EVP_PKEY_get_default_digest_nid(pk, &def_nid) <= 0) { - ERR_raise_data(ERR_LIB_CMS, CMS_R_NO_DEFAULT_DIGEST, - "pkey nid=%d", EVP_PKEY_get_id(pk)); + if (EVP_PKEY_get_default_digest_nid(pk, &def_nid) <= 0) goto err; - } md = EVP_get_digestbynid(def_nid); if (md == NULL) { - ERR_raise_data(ERR_LIB_CMS, CMS_R_NO_DEFAULT_DIGEST, - "default md nid=%d", def_nid); + ERR_raise(ERR_LIB_CMS, CMS_R_NO_DEFAULT_DIGEST); goto err; } } @@ -403,11 +398,8 @@ CMS_SignerInfo *CMS_add1_signer(CMS_ContentInfo *cms, } } - if (!(flags & CMS_KEY_PARAM) && !cms_sd_asn1_ctrl(si, 0)) { - ERR_raise_data(ERR_LIB_CMS, CMS_R_UNSUPPORTED_SIGNATURE_ALGORITHM, - "pkey nid=%d", EVP_PKEY_get_id(pk)); + if (!(flags & CMS_KEY_PARAM) && !cms_sd_asn1_ctrl(si, 0)) goto err; - } if (!(flags & CMS_NOATTR)) { /* * Initialize signed attributes structure so other attributes @@ -1037,32 +1029,31 @@ int CMS_add_smimecap(CMS_SignerInfo *si, STACK_OF(X509_ALGOR) *algs) int CMS_add_simple_smimecap(STACK_OF(X509_ALGOR) **algs, int algnid, int keysize) { - X509_ALGOR *alg = NULL; + X509_ALGOR *alg; ASN1_INTEGER *key = NULL; if (keysize > 0) { key = ASN1_INTEGER_new(); - if (key == NULL || !ASN1_INTEGER_set(key, keysize)) - goto err; + if (key == NULL || !ASN1_INTEGER_set(key, keysize)) { + ASN1_INTEGER_free(key); + return 0; + } } alg = X509_ALGOR_new(); - if (alg == NULL) - goto err; + if (alg == NULL) { + ASN1_INTEGER_free(key); + return 0; + } - if (!X509_ALGOR_set0(alg, OBJ_nid2obj(algnid), - key ? V_ASN1_INTEGER : V_ASN1_UNDEF, key)) - goto err; - key = NULL; + X509_ALGOR_set0(alg, OBJ_nid2obj(algnid), + key ? V_ASN1_INTEGER : V_ASN1_UNDEF, key); if (*algs == NULL) *algs = sk_X509_ALGOR_new_null(); - if (*algs == NULL || !sk_X509_ALGOR_push(*algs, alg)) - goto err; + if (*algs == NULL || !sk_X509_ALGOR_push(*algs, alg)) { + X509_ALGOR_free(alg); + return 0; + } return 1; - - err: - ASN1_INTEGER_free(key); - X509_ALGOR_free(alg); - return 0; } /* Check to see if a cipher exists and if so add S/MIME capabilities */ diff --git a/deps/openssl/openssl/crypto/cms/cms_smime.c b/deps/openssl/openssl/crypto/cms/cms_smime.c index d7719267c..479038d57 100644 --- a/deps/openssl/openssl/crypto/cms/cms_smime.c +++ b/deps/openssl/openssl/crypto/cms/cms_smime.c @@ -558,7 +558,7 @@ CMS_ContentInfo *CMS_sign_receipt(CMS_SignerInfo *si, { CMS_SignerInfo *rct_si; CMS_ContentInfo *cms = NULL; - ASN1_OCTET_STRING **pos, *os = NULL; + ASN1_OCTET_STRING **pos, *os; BIO *rct_cont = NULL; int r = 0; const CMS_CTX *ctx = si->cms_ctx; @@ -620,7 +620,6 @@ CMS_ContentInfo *CMS_sign_receipt(CMS_SignerInfo *si, if (r) return cms; CMS_ContentInfo_free(cms); - ASN1_OCTET_STRING_free(os); return NULL; } diff --git a/deps/openssl/openssl/crypto/conf/conf_err.c b/deps/openssl/openssl/crypto/conf/conf_err.c index fc0eee7d2..68ee90b97 100644 --- a/deps/openssl/openssl/crypto/conf/conf_err.c +++ b/deps/openssl/openssl/crypto/conf/conf_err.c @@ -41,8 +41,6 @@ static const ERR_STRING_DATA CONF_str_reasons[] = { "openssl conf references missing section"}, {ERR_PACK(ERR_LIB_CONF, 0, CONF_R_RECURSIVE_DIRECTORY_INCLUDE), "recursive directory include"}, - {ERR_PACK(ERR_LIB_CONF, 0, CONF_R_RECURSIVE_SECTION_REFERENCE), - "recursive section reference"}, {ERR_PACK(ERR_LIB_CONF, 0, CONF_R_RELATIVE_PATH), "relative path"}, {ERR_PACK(ERR_LIB_CONF, 0, CONF_R_SSL_COMMAND_SECTION_EMPTY), "ssl command section empty"}, diff --git a/deps/openssl/openssl/crypto/conf/conf_mod.c b/deps/openssl/openssl/crypto/conf/conf_mod.c index 1ea32648e..17bbbf7a2 100644 --- a/deps/openssl/openssl/crypto/conf/conf_mod.c +++ b/deps/openssl/openssl/crypto/conf/conf_mod.c @@ -1,5 +1,5 @@ /* - * Copyright 2002-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2002-2022 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -184,21 +184,15 @@ int CONF_modules_load_file_ex(OSSL_LIB_CTX *libctx, const char *filename, CONF *conf = NULL; int ret = 0, diagnostics = 0; - ERR_set_mark(); - if (filename == NULL) { file = CONF_get1_default_config_file(); if (file == NULL) goto err; - if (*file == '\0') { - /* Do not try to load an empty file name but do not error out */ - ret = 1; - goto err; - } } else { file = (char *)filename; } + ERR_set_mark(); conf = NCONF_new_ex(libctx, NULL); if (conf == NULL) goto err; diff --git a/deps/openssl/openssl/crypto/conf/conf_sap.c b/deps/openssl/openssl/crypto/conf/conf_sap.c index 3019bcf31..39efcdbf9 100644 --- a/deps/openssl/openssl/crypto/conf/conf_sap.c +++ b/deps/openssl/openssl/crypto/conf/conf_sap.c @@ -1,5 +1,5 @@ /* - * Copyright 2002-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2002-2022 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -65,10 +65,7 @@ int ossl_config_int(const OPENSSL_INIT_SETTINGS *settings) #endif #ifndef OPENSSL_SYS_UEFI - ret = CONF_modules_load_file_ex(OSSL_LIB_CTX_get0_global_default(), - filename, appname, flags); -#else - ret = 1; + ret = CONF_modules_load_file(filename, appname, flags); #endif openssl_configured = 1; return ret; diff --git a/deps/openssl/openssl/crypto/core_namemap.c b/deps/openssl/openssl/crypto/core_namemap.c index ebf7ed5eb..7e11ab1c8 100644 --- a/deps/openssl/openssl/crypto/core_namemap.c +++ b/deps/openssl/openssl/crypto/core_namemap.c @@ -1,5 +1,5 @@ /* - * Copyright 2019-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -142,9 +142,6 @@ int ossl_namemap_doall_names(const OSSL_NAMEMAP *namemap, int number, cbdata.number = number; cbdata.found = 0; - if (namemap == NULL) - return 0; - /* * We collect all the names first under a read lock. Subsequently we call * the user function, so that we're not holding the read lock when in user diff --git a/deps/openssl/openssl/crypto/dh/dh_check.c b/deps/openssl/openssl/crypto/dh/dh_check.c index e20eb6208..abdccde56 100644 --- a/deps/openssl/openssl/crypto/dh/dh_check.c +++ b/deps/openssl/openssl/crypto/dh/dh_check.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -155,7 +155,6 @@ int DH_check(const DH *dh, int *ret) /* Don't do any checks at all with an excessively large modulus */ if (BN_num_bits(dh->params.p) > OPENSSL_DH_CHECK_MAX_MODULUS_BITS) { ERR_raise(ERR_LIB_DH, DH_R_MODULUS_TOO_LARGE); - *ret = DH_MODULUS_TOO_LARGE | DH_CHECK_P_NOT_PRIME; return 0; } @@ -271,8 +270,7 @@ int DH_check_pub_key(const DH *dh, const BIGNUM *pub_key, int *ret) */ int ossl_dh_check_pub_key_partial(const DH *dh, const BIGNUM *pub_key, int *ret) { - return ossl_ffc_validate_public_key_partial(&dh->params, pub_key, ret) - && *ret == 0; + return ossl_ffc_validate_public_key_partial(&dh->params, pub_key, ret); } int ossl_dh_check_priv_key(const DH *dh, const BIGNUM *priv_key, int *ret) diff --git a/deps/openssl/openssl/crypto/dh/dh_key.c b/deps/openssl/openssl/crypto/dh/dh_key.c index afc49f5cd..982630a0b 100644 --- a/deps/openssl/openssl/crypto/dh/dh_key.c +++ b/deps/openssl/openssl/crypto/dh/dh_key.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -196,6 +196,7 @@ static int dh_bn_mod_exp(const DH *dh, BIGNUM *r, static int dh_init(DH *dh) { dh->flags |= DH_FLAG_CACHE_MONT_P; + ossl_ffc_params_init(&dh->params); dh->dirty_cnt++; return 1; } diff --git a/deps/openssl/openssl/crypto/dh/dh_lib.c b/deps/openssl/openssl/crypto/dh/dh_lib.c index 5577413e1..29cda5d7b 100644 --- a/deps/openssl/openssl/crypto/dh/dh_lib.c +++ b/deps/openssl/openssl/crypto/dh/dh_lib.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -116,8 +116,6 @@ static DH *dh_new_intern(ENGINE *engine, OSSL_LIB_CTX *libctx) goto err; #endif /* FIPS_MODULE */ - ossl_ffc_params_init(&ret->params); - if ((ret->meth->init != NULL) && !ret->meth->init(ret)) { ERR_raise(ERR_LIB_DH, ERR_R_INIT_FAIL); goto err; diff --git a/deps/openssl/openssl/crypto/dsa/dsa_check.c b/deps/openssl/openssl/crypto/dsa/dsa_check.c index fb0e9129a..a3da0cef4 100644 --- a/deps/openssl/openssl/crypto/dsa/dsa_check.c +++ b/deps/openssl/openssl/crypto/dsa/dsa_check.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -19,8 +19,34 @@ #include "dsa_local.h" #include "crypto/dsa.h" +static int dsa_precheck_params(const DSA *dsa, int *ret) +{ + if (dsa->params.p == NULL || dsa->params.q == NULL) { + ERR_raise(ERR_LIB_DSA, DSA_R_BAD_FFC_PARAMETERS); + *ret = FFC_CHECK_INVALID_PQ; + return 0; + } + + if (BN_num_bits(dsa->params.p) > OPENSSL_DSA_MAX_MODULUS_BITS) { + ERR_raise(ERR_LIB_DSA, DSA_R_MODULUS_TOO_LARGE); + *ret = FFC_CHECK_INVALID_PQ; + return 0; + } + + if (BN_num_bits(dsa->params.q) >= BN_num_bits(dsa->params.p)) { + ERR_raise(ERR_LIB_DSA, DSA_R_BAD_Q_VALUE); + *ret = FFC_CHECK_INVALID_PQ; + return 0; + } + + return 1; +} + int ossl_dsa_check_params(const DSA *dsa, int checktype, int *ret) { + if (!dsa_precheck_params(dsa, ret)) + return 0; + if (checktype == OSSL_KEYMGMT_VALIDATE_QUICK_CHECK) return ossl_ffc_params_simple_validate(dsa->libctx, &dsa->params, FFC_PARAM_TYPE_DSA, ret); @@ -39,8 +65,10 @@ int ossl_dsa_check_params(const DSA *dsa, int checktype, int *ret) */ int ossl_dsa_check_pub_key(const DSA *dsa, const BIGNUM *pub_key, int *ret) { - return ossl_ffc_validate_public_key(&dsa->params, pub_key, ret) - && *ret == 0; + if (!dsa_precheck_params(dsa, ret)) + return 0; + + return ossl_ffc_validate_public_key(&dsa->params, pub_key, ret); } /* @@ -50,16 +78,20 @@ int ossl_dsa_check_pub_key(const DSA *dsa, const BIGNUM *pub_key, int *ret) */ int ossl_dsa_check_pub_key_partial(const DSA *dsa, const BIGNUM *pub_key, int *ret) { - return ossl_ffc_validate_public_key_partial(&dsa->params, pub_key, ret) - && *ret == 0; + if (!dsa_precheck_params(dsa, ret)) + return 0; + + return ossl_ffc_validate_public_key_partial(&dsa->params, pub_key, ret); } int ossl_dsa_check_priv_key(const DSA *dsa, const BIGNUM *priv_key, int *ret) { *ret = 0; - return (dsa->params.q != NULL - && ossl_ffc_validate_private_key(dsa->params.q, priv_key, ret)); + if (!dsa_precheck_params(dsa, ret)) + return 0; + + return ossl_ffc_validate_private_key(dsa->params.q, priv_key, ret); } /* @@ -72,8 +104,10 @@ int ossl_dsa_check_pairwise(const DSA *dsa) BN_CTX *ctx = NULL; BIGNUM *pub_key = NULL; - if (dsa->params.p == NULL - || dsa->params.g == NULL + if (!dsa_precheck_params(dsa, &ret)) + return 0; + + if (dsa->params.g == NULL || dsa->priv_key == NULL || dsa->pub_key == NULL) return 0; diff --git a/deps/openssl/openssl/crypto/dsa/dsa_lib.c b/deps/openssl/openssl/crypto/dsa/dsa_lib.c index 2ae3f8e36..ccc701659 100644 --- a/deps/openssl/openssl/crypto/dsa/dsa_lib.c +++ b/deps/openssl/openssl/crypto/dsa/dsa_lib.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -176,8 +176,6 @@ static DSA *dsa_new_intern(ENGINE *engine, OSSL_LIB_CTX *libctx) goto err; #endif - ossl_ffc_params_init(&ret->params); - if ((ret->meth->init != NULL) && !ret->meth->init(ret)) { ERR_raise(ERR_LIB_DSA, ERR_R_INIT_FAIL); goto err; diff --git a/deps/openssl/openssl/crypto/dsa/dsa_ossl.c b/deps/openssl/openssl/crypto/dsa/dsa_ossl.c index 8fd66a950..62f7c7014 100644 --- a/deps/openssl/openssl/crypto/dsa/dsa_ossl.c +++ b/deps/openssl/openssl/crypto/dsa/dsa_ossl.c @@ -441,6 +441,7 @@ static int dsa_do_verify(const unsigned char *dgst, int dgst_len, static int dsa_init(DSA *dsa) { dsa->flags |= DSA_FLAG_CACHE_MONT_P; + ossl_ffc_params_init(&dsa->params); dsa->dirty_cnt++; return 1; } diff --git a/deps/openssl/openssl/crypto/ec/ecx_backend.c b/deps/openssl/openssl/crypto/ec/ecx_backend.c index e42767d6b..2ab7611be 100644 --- a/deps/openssl/openssl/crypto/ec/ecx_backend.c +++ b/deps/openssl/openssl/crypto/ec/ecx_backend.c @@ -1,5 +1,5 @@ /* - * Copyright 2020-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -122,7 +122,7 @@ ECX_KEY *ossl_ecx_key_dup(const ECX_KEY *key, int selection) } ret->libctx = key->libctx; - ret->haspubkey = 0; + ret->haspubkey = key->haspubkey; ret->keylen = key->keylen; ret->type = key->type; ret->references = 1; @@ -133,11 +133,8 @@ ECX_KEY *ossl_ecx_key_dup(const ECX_KEY *key, int selection) goto err; } - if ((selection & OSSL_KEYMGMT_SELECT_PUBLIC_KEY) != 0 - && key->haspubkey == 1) { + if ((selection & OSSL_KEYMGMT_SELECT_PUBLIC_KEY) != 0) memcpy(ret->pubkey, key->pubkey, sizeof(ret->pubkey)); - ret->haspubkey = 1; - } if ((selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY) != 0 && key->privkey != NULL) { diff --git a/deps/openssl/openssl/crypto/encode_decode/decoder_lib.c b/deps/openssl/openssl/crypto/encode_decode/decoder_lib.c index 2e4b7ed60..e24d2c6cd 100644 --- a/deps/openssl/openssl/crypto/encode_decode/decoder_lib.c +++ b/deps/openssl/openssl/crypto/encode_decode/decoder_lib.c @@ -1,5 +1,5 @@ /* - * Copyright 2020-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2020-2022 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -743,11 +743,10 @@ static int decoder_process(const OSSL_PARAM params[], void *arg) (void *)new_data.ctx, LEVEL, rv); } OSSL_TRACE_END(DECODER); + data->flag_construct_called = 1; ok = (rv > 0); - if (ok) { - data->flag_construct_called = 1; + if (ok) goto end; - } } /* The constructor didn't return success */ diff --git a/deps/openssl/openssl/crypto/encode_decode/decoder_pkey.c b/deps/openssl/openssl/crypto/encode_decode/decoder_pkey.c index ad5e28053..ed10bb1ce 100644 --- a/deps/openssl/openssl/crypto/encode_decode/decoder_pkey.c +++ b/deps/openssl/openssl/crypto/encode_decode/decoder_pkey.c @@ -1,5 +1,5 @@ /* - * Copyright 2020-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2020-2022 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -150,11 +150,7 @@ static int decoder_construct_pkey(OSSL_DECODER_INSTANCE *decoder_inst, import_data.keymgmt = keymgmt; import_data.keydata = NULL; - if (data->selection == 0) - /* import/export functions do not tolerate 0 selection */ - import_data.selection = OSSL_KEYMGMT_SELECT_ALL; - else - import_data.selection = data->selection; + import_data.selection = data->selection; /* * No need to check for errors here, the value of diff --git a/deps/openssl/openssl/crypto/engine/eng_lib.c b/deps/openssl/openssl/crypto/engine/eng_lib.c index cfdb5a50f..dfd53a433 100644 --- a/deps/openssl/openssl/crypto/engine/eng_lib.c +++ b/deps/openssl/openssl/crypto/engine/eng_lib.c @@ -133,34 +133,28 @@ static ENGINE_CLEANUP_ITEM *int_cleanup_item(ENGINE_CLEANUP_CB *cb) return item; } -int engine_cleanup_add_first(ENGINE_CLEANUP_CB *cb) +void engine_cleanup_add_first(ENGINE_CLEANUP_CB *cb) { ENGINE_CLEANUP_ITEM *item; if (!int_cleanup_check(1)) - return 0; + return; item = int_cleanup_item(cb); - if (item != NULL) { - if (sk_ENGINE_CLEANUP_ITEM_insert(cleanup_stack, item, 0)) - return 1; - OPENSSL_free(item); - } - return 0; + if (item != NULL) + if (sk_ENGINE_CLEANUP_ITEM_insert(cleanup_stack, item, 0) <= 0) + OPENSSL_free(item); } -int engine_cleanup_add_last(ENGINE_CLEANUP_CB *cb) +void engine_cleanup_add_last(ENGINE_CLEANUP_CB *cb) { ENGINE_CLEANUP_ITEM *item; - if (!int_cleanup_check(1)) - return 0; + return; item = int_cleanup_item(cb); if (item != NULL) { - if (sk_ENGINE_CLEANUP_ITEM_push(cleanup_stack, item) > 0) - return 1; - OPENSSL_free(item); + if (sk_ENGINE_CLEANUP_ITEM_push(cleanup_stack, item) <= 0) + OPENSSL_free(item); } - return 0; } /* The API function that performs all cleanup */ diff --git a/deps/openssl/openssl/crypto/engine/eng_list.c b/deps/openssl/openssl/crypto/engine/eng_list.c index f2eed3b07..04c73c762 100644 --- a/deps/openssl/openssl/crypto/engine/eng_list.c +++ b/deps/openssl/openssl/crypto/engine/eng_list.c @@ -1,5 +1,5 @@ /* - * Copyright 2001-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2001-2021 The OpenSSL Project Authors. All Rights Reserved. * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved * * Licensed under the Apache License 2.0 (the "License"). You may not use @@ -78,15 +78,12 @@ static int engine_list_add(ENGINE *e) ERR_raise(ERR_LIB_ENGINE, ENGINE_R_INTERNAL_LIST_ERROR); return 0; } + engine_list_head = e; + e->prev = NULL; /* * The first time the list allocates, we should register the cleanup. */ - if (!engine_cleanup_add_last(engine_list_cleanup)) { - ERR_raise(ERR_LIB_ENGINE, ENGINE_R_INTERNAL_LIST_ERROR); - return 0; - } - engine_list_head = e; - e->prev = NULL; + engine_cleanup_add_last(engine_list_cleanup); } else { /* We are adding to the tail of an existing list. */ if ((engine_list_tail == NULL) || (engine_list_tail->next != NULL)) { diff --git a/deps/openssl/openssl/crypto/engine/eng_local.h b/deps/openssl/openssl/crypto/engine/eng_local.h index 75bc9e6f1..03a86299c 100644 --- a/deps/openssl/openssl/crypto/engine/eng_local.h +++ b/deps/openssl/openssl/crypto/engine/eng_local.h @@ -1,5 +1,5 @@ /* - * Copyright 2001-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2001-2021 The OpenSSL Project Authors. All Rights Reserved. * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved * * Licensed under the Apache License 2.0 (the "License"). You may not use @@ -46,8 +46,8 @@ typedef struct st_engine_cleanup_item { ENGINE_CLEANUP_CB *cb; } ENGINE_CLEANUP_ITEM; DEFINE_STACK_OF(ENGINE_CLEANUP_ITEM) -int engine_cleanup_add_first(ENGINE_CLEANUP_CB *cb); -int engine_cleanup_add_last(ENGINE_CLEANUP_CB *cb); +void engine_cleanup_add_first(ENGINE_CLEANUP_CB *cb); +void engine_cleanup_add_last(ENGINE_CLEANUP_CB *cb); /* We need stacks of ENGINEs for use in eng_table.c */ DEFINE_STACK_OF(ENGINE) diff --git a/deps/openssl/openssl/crypto/engine/eng_pkey.c b/deps/openssl/openssl/crypto/engine/eng_pkey.c index f84fcde46..6e6d6df35 100644 --- a/deps/openssl/openssl/crypto/engine/eng_pkey.c +++ b/deps/openssl/openssl/crypto/engine/eng_pkey.c @@ -1,5 +1,5 @@ /* - * Copyright 2001-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2001-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -79,48 +79,6 @@ EVP_PKEY *ENGINE_load_private_key(ENGINE *e, const char *key_id, ERR_raise(ERR_LIB_ENGINE, ENGINE_R_FAILED_LOADING_PRIVATE_KEY); return NULL; } - /* We enforce check for legacy key */ - switch (EVP_PKEY_get_id(pkey)) { - case EVP_PKEY_RSA: - { - RSA *rsa = EVP_PKEY_get1_RSA(pkey); - EVP_PKEY_set1_RSA(pkey, rsa); - RSA_free(rsa); - } - break; -# ifndef OPENSSL_NO_EC - case EVP_PKEY_SM2: - case EVP_PKEY_EC: - { - EC_KEY *ec = EVP_PKEY_get1_EC_KEY(pkey); - EVP_PKEY_set1_EC_KEY(pkey, ec); - EC_KEY_free(ec); - } - break; -# endif -# ifndef OPENSSL_NO_DSA - case EVP_PKEY_DSA: - { - DSA *dsa = EVP_PKEY_get1_DSA(pkey); - EVP_PKEY_set1_DSA(pkey, dsa); - DSA_free(dsa); - } - break; -#endif -# ifndef OPENSSL_NO_DH - case EVP_PKEY_DH: - { - DH *dh = EVP_PKEY_get1_DH(pkey); - EVP_PKEY_set1_DH(pkey, dh); - DH_free(dh); - } - break; -#endif - default: - /*Do nothing */ - break; - } - return pkey; } diff --git a/deps/openssl/openssl/crypto/engine/eng_table.c b/deps/openssl/openssl/crypto/engine/eng_table.c index 9dc3144bb..a8209d9e7 100644 --- a/deps/openssl/openssl/crypto/engine/eng_table.c +++ b/deps/openssl/openssl/crypto/engine/eng_table.c @@ -1,5 +1,5 @@ /* - * Copyright 2001-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2001-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -93,12 +93,9 @@ int engine_table_register(ENGINE_TABLE **table, ENGINE_CLEANUP_CB *cleanup, added = 1; if (!int_table_check(table, 1)) goto end; - /* The cleanup callback needs to be added */ - if (added && !engine_cleanup_add_first(cleanup)) { - lh_ENGINE_PILE_free(&(*table)->piles); - *table = NULL; - goto end; - } + if (added) + /* The cleanup callback needs to be added */ + engine_cleanup_add_first(cleanup); while (num_nids--) { tmplate.nid = *nids; fnd = lh_ENGINE_PILE_retrieve(&(*table)->piles, &tmplate); @@ -204,10 +201,8 @@ ENGINE *ossl_engine_table_select(ENGINE_TABLE **table, int nid, ENGINE_PILE tmplate, *fnd = NULL; int initres, loop = 0; -#ifndef OPENSSL_NO_AUTOLOAD_CONFIG /* Load the config before trying to check if engines are available */ OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CONFIG, NULL); -#endif if (!(*table)) { OSSL_TRACE3(ENGINE_TABLE, diff --git a/deps/openssl/openssl/crypto/err/openssl.txt b/deps/openssl/openssl/crypto/err/openssl.txt index 003e29810..354797e78 100644 --- a/deps/openssl/openssl/crypto/err/openssl.txt +++ b/deps/openssl/openssl/crypto/err/openssl.txt @@ -375,7 +375,6 @@ CMS_R_UNSUPPORTED_KEY_ENCRYPTION_ALGORITHM:179:\ CMS_R_UNSUPPORTED_LABEL_SOURCE:193:unsupported label source CMS_R_UNSUPPORTED_RECIPIENTINFO_TYPE:155:unsupported recipientinfo type CMS_R_UNSUPPORTED_RECIPIENT_TYPE:154:unsupported recipient type -CMS_R_UNSUPPORTED_SIGNATURE_ALGORITHM:195:unsupported signature algorithm CMS_R_UNSUPPORTED_TYPE:156:unsupported type CMS_R_UNWRAP_ERROR:157:unwrap error CMS_R_UNWRAP_FAILURE:180:unwrap failure @@ -403,7 +402,6 @@ CONF_R_NUMBER_TOO_LARGE:121:number too large CONF_R_OPENSSL_CONF_REFERENCES_MISSING_SECTION:124:\ openssl conf references missing section CONF_R_RECURSIVE_DIRECTORY_INCLUDE:111:recursive directory include -CONF_R_RECURSIVE_SECTION_REFERENCE:126:recursive section reference CONF_R_RELATIVE_PATH:125:relative path CONF_R_SSL_COMMAND_SECTION_EMPTY:117:ssl command section empty CONF_R_SSL_COMMAND_SECTION_NOT_FOUND:118:ssl command section not found @@ -1388,8 +1386,6 @@ SSL_R_MISSING_ECDSA_SIGNING_CERT:381:missing ecdsa signing cert SSL_R_MISSING_FATAL:256:missing fatal SSL_R_MISSING_PARAMETERS:290:missing parameters SSL_R_MISSING_PSK_KEX_MODES_EXTENSION:310:missing psk kex modes extension -SSL_R_MISSING_QUIC_TRANSPORT_PARAMETERS_EXTENSION:801:\ - missing quic transport parameters extension SSL_R_MISSING_RSA_CERTIFICATE:168:missing rsa certificate SSL_R_MISSING_RSA_ENCRYPTING_CERT:169:missing rsa encrypting cert SSL_R_MISSING_RSA_SIGNING_CERT:170:missing rsa signing cert @@ -1540,7 +1536,6 @@ SSL_R_VERSION_TOO_LOW:396:version too low SSL_R_WRONG_CERTIFICATE_TYPE:383:wrong certificate type SSL_R_WRONG_CIPHER_RETURNED:261:wrong cipher returned SSL_R_WRONG_CURVE:378:wrong curve -SSL_R_WRONG_ENCRYPTION_LEVEL_RECEIVED:800:wrong encryption level received SSL_R_WRONG_SIGNATURE_LENGTH:264:wrong signature length SSL_R_WRONG_SIGNATURE_SIZE:265:wrong signature size SSL_R_WRONG_SIGNATURE_TYPE:370:wrong signature type @@ -1681,7 +1676,6 @@ X509_R_CERTIFICATE_VERIFICATION_FAILED:139:certificate verification failed X509_R_CERT_ALREADY_IN_HASH_TABLE:101:cert already in hash table X509_R_CRL_ALREADY_DELTA:127:crl already delta X509_R_CRL_VERIFY_FAILURE:131:crl verify failure -X509_R_DUPLICATE_ATTRIBUTE:140:duplicate attribute X509_R_ERROR_GETTING_MD_BY_NID:141:error getting md by nid X509_R_ERROR_USING_SIGINF_SET:142:error using siginf set X509_R_IDP_MISMATCH:128:idp mismatch diff --git a/deps/openssl/openssl/crypto/evp/ctrl_params_translate.c b/deps/openssl/openssl/crypto/evp/ctrl_params_translate.c index dcd53b43f..ccafdfddd 100644 --- a/deps/openssl/openssl/crypto/evp/ctrl_params_translate.c +++ b/deps/openssl/openssl/crypto/evp/ctrl_params_translate.c @@ -636,8 +636,8 @@ static int default_fixup_args(enum state state, ctx->p2, ctx->sz); case OSSL_PARAM_OCTET_STRING: return OSSL_PARAM_get_octet_string(ctx->params, - &ctx->p2, ctx->sz, - (size_t *)&ctx->p1); + ctx->p2, ctx->sz, + &ctx->sz); case OSSL_PARAM_OCTET_PTR: return OSSL_PARAM_get_octet_ptr(ctx->params, ctx->p2, &ctx->sz); @@ -685,7 +685,7 @@ static int default_fixup_args(enum state state, return OSSL_PARAM_set_octet_string(ctx->params, ctx->p2, size); case OSSL_PARAM_OCTET_PTR: - return OSSL_PARAM_set_octet_ptr(ctx->params, *(void **)ctx->p2, + return OSSL_PARAM_set_octet_ptr(ctx->params, ctx->p2, size); default: ERR_raise_data(ERR_LIB_EVP, ERR_R_UNSUPPORTED, @@ -695,9 +695,6 @@ static int default_fixup_args(enum state state, translation->param_data_type); return 0; } - } else if (state == PRE_PARAMS_TO_CTRL && ctx->action_type == GET) { - if (translation->param_data_type == OSSL_PARAM_OCTET_PTR) - ctx->p2 = &ctx->bufp; } } /* Any other combination is simply pass-through */ @@ -1786,8 +1783,7 @@ static int get_rsa_payload_n(enum state state, { const BIGNUM *bn = NULL; - if (EVP_PKEY_get_base_id(ctx->p2) != EVP_PKEY_RSA - && EVP_PKEY_get_base_id(ctx->p2) != EVP_PKEY_RSA_PSS) + if (EVP_PKEY_get_base_id(ctx->p2) != EVP_PKEY_RSA) return 0; bn = RSA_get0_n(EVP_PKEY_get0_RSA(ctx->p2)); @@ -1800,8 +1796,7 @@ static int get_rsa_payload_e(enum state state, { const BIGNUM *bn = NULL; - if (EVP_PKEY_get_base_id(ctx->p2) != EVP_PKEY_RSA - && EVP_PKEY_get_base_id(ctx->p2) != EVP_PKEY_RSA_PSS) + if (EVP_PKEY_get_base_id(ctx->p2) != EVP_PKEY_RSA) return 0; bn = RSA_get0_e(EVP_PKEY_get0_RSA(ctx->p2)); @@ -1814,8 +1809,7 @@ static int get_rsa_payload_d(enum state state, { const BIGNUM *bn = NULL; - if (EVP_PKEY_get_base_id(ctx->p2) != EVP_PKEY_RSA - && EVP_PKEY_get_base_id(ctx->p2) != EVP_PKEY_RSA_PSS) + if (EVP_PKEY_get_base_id(ctx->p2) != EVP_PKEY_RSA) return 0; bn = RSA_get0_d(EVP_PKEY_get0_RSA(ctx->p2)); @@ -1915,8 +1909,7 @@ static int get_rsa_payload_coefficient(enum state state, const struct translation_st *translation, \ struct translation_ctx_st *ctx) \ { \ - if (EVP_PKEY_get_base_id(ctx->p2) != EVP_PKEY_RSA \ - && EVP_PKEY_get_base_id(ctx->p2) != EVP_PKEY_RSA_PSS) \ + if (EVP_PKEY_get_base_id(ctx->p2) != EVP_PKEY_RSA) \ return 0; \ return get_rsa_payload_factor(state, translation, ctx, n - 1); \ } @@ -1927,8 +1920,7 @@ static int get_rsa_payload_coefficient(enum state state, const struct translation_st *translation, \ struct translation_ctx_st *ctx) \ { \ - if (EVP_PKEY_get_base_id(ctx->p2) != EVP_PKEY_RSA \ - && EVP_PKEY_get_base_id(ctx->p2) != EVP_PKEY_RSA_PSS) \ + if (EVP_PKEY_get_base_id(ctx->p2) != EVP_PKEY_RSA) \ return 0; \ return get_rsa_payload_exponent(state, translation, ctx, \ n - 1); \ @@ -1940,8 +1932,7 @@ static int get_rsa_payload_coefficient(enum state state, const struct translation_st *translation, \ struct translation_ctx_st *ctx) \ { \ - if (EVP_PKEY_get_base_id(ctx->p2) != EVP_PKEY_RSA \ - && EVP_PKEY_get_base_id(ctx->p2) != EVP_PKEY_RSA_PSS) \ + if (EVP_PKEY_get_base_id(ctx->p2) != EVP_PKEY_RSA) \ return 0; \ return get_rsa_payload_coefficient(state, translation, ctx, \ n - 1); \ @@ -2263,7 +2254,7 @@ static const struct translation_st evp_pkey_ctx_translations[] = { OSSL_ASYM_CIPHER_PARAM_OAEP_LABEL, OSSL_PARAM_OCTET_STRING, NULL }, { GET, EVP_PKEY_RSA, 0, EVP_PKEY_OP_TYPE_CRYPT, EVP_PKEY_CTRL_GET_RSA_OAEP_LABEL, NULL, NULL, - OSSL_ASYM_CIPHER_PARAM_OAEP_LABEL, OSSL_PARAM_OCTET_PTR, NULL }, + OSSL_ASYM_CIPHER_PARAM_OAEP_LABEL, OSSL_PARAM_OCTET_STRING, NULL }, { SET, EVP_PKEY_RSA_PSS, 0, EVP_PKEY_OP_TYPE_GEN, EVP_PKEY_CTRL_MD, "rsa_pss_keygen_md", NULL, @@ -2277,10 +2268,10 @@ static const struct translation_st evp_pkey_ctx_translations[] = { { SET, EVP_PKEY_RSA, EVP_PKEY_RSA_PSS, EVP_PKEY_OP_KEYGEN, EVP_PKEY_CTRL_RSA_KEYGEN_BITS, "rsa_keygen_bits", NULL, OSSL_PKEY_PARAM_RSA_BITS, OSSL_PARAM_UNSIGNED_INTEGER, NULL }, - { SET, EVP_PKEY_RSA, EVP_PKEY_RSA_PSS, EVP_PKEY_OP_KEYGEN, + { SET, EVP_PKEY_RSA, 0, EVP_PKEY_OP_KEYGEN, EVP_PKEY_CTRL_RSA_KEYGEN_PUBEXP, "rsa_keygen_pubexp", NULL, OSSL_PKEY_PARAM_RSA_E, OSSL_PARAM_UNSIGNED_INTEGER, NULL }, - { SET, EVP_PKEY_RSA, EVP_PKEY_RSA_PSS, EVP_PKEY_OP_KEYGEN, + { SET, EVP_PKEY_RSA, 0, EVP_PKEY_OP_KEYGEN, EVP_PKEY_CTRL_RSA_KEYGEN_PRIMES, "rsa_keygen_primes", NULL, OSSL_PKEY_PARAM_RSA_PRIMES, OSSL_PARAM_UNSIGNED_INTEGER, NULL }, diff --git a/deps/openssl/openssl/crypto/evp/e_aes.c b/deps/openssl/openssl/crypto/evp/e_aes.c index 949de6807..52b9e87c1 100644 --- a/deps/openssl/openssl/crypto/evp/e_aes.c +++ b/deps/openssl/openssl/crypto/evp/e_aes.c @@ -1,5 +1,5 @@ /* - * Copyright 2001-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2001-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -831,6 +831,8 @@ typedef struct { /* KMO-AES parameter block - end */ } kmo; unsigned int fc; + + int res; } S390X_AES_OFB_CTX; typedef struct { @@ -847,6 +849,8 @@ typedef struct { /* KMF-AES parameter block - end */ } kmf; unsigned int fc; + + int res; } S390X_AES_CFB_CTX; typedef struct { @@ -998,6 +1002,7 @@ static int s390x_aes_ofb_init_key(EVP_CIPHER_CTX *ctx, memcpy(cctx->kmo.param.cv, iv, ivlen); memcpy(cctx->kmo.param.k, key, keylen); cctx->fc = S390X_AES_FC(keylen); + cctx->res = 0; return 1; } @@ -1007,7 +1012,7 @@ static int s390x_aes_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, S390X_AES_OFB_CTX *cctx = EVP_C_DATA(S390X_AES_OFB_CTX, ctx); const int ivlen = EVP_CIPHER_CTX_get_iv_length(ctx); unsigned char *iv = EVP_CIPHER_CTX_iv_noconst(ctx); - int n = ctx->num; + int n = cctx->res; int rem; memcpy(cctx->kmo.param.cv, iv, ivlen); @@ -1040,7 +1045,7 @@ static int s390x_aes_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, } memcpy(iv, cctx->kmo.param.cv, ivlen); - ctx->num = n; + cctx->res = n; return 1; } @@ -1058,6 +1063,7 @@ static int s390x_aes_cfb_init_key(EVP_CIPHER_CTX *ctx, if (!enc) cctx->fc |= S390X_DECRYPT; + cctx->res = 0; memcpy(cctx->kmf.param.cv, iv, ivlen); memcpy(cctx->kmf.param.k, key, keylen); return 1; @@ -1071,7 +1077,7 @@ static int s390x_aes_cfb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const int enc = EVP_CIPHER_CTX_is_encrypting(ctx); const int ivlen = EVP_CIPHER_CTX_get_iv_length(ctx); unsigned char *iv = EVP_CIPHER_CTX_iv_noconst(ctx); - int n = ctx->num; + int n = cctx->res; int rem; unsigned char tmp; @@ -1109,7 +1115,7 @@ static int s390x_aes_cfb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, } memcpy(iv, cctx->kmf.param.cv, ivlen); - ctx->num = n; + cctx->res = n; return 1; } diff --git a/deps/openssl/openssl/crypto/evp/evp_enc.c b/deps/openssl/openssl/crypto/evp/evp_enc.c index 4e6f83e3d..2dff3e662 100644 --- a/deps/openssl/openssl/crypto/evp/evp_enc.c +++ b/deps/openssl/openssl/crypto/evp/evp_enc.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -192,12 +192,7 @@ static int evp_cipher_init_internal(EVP_CIPHER_CTX *ctx, #endif } - if (!ossl_assert(cipher->prov != NULL)) { - ERR_raise(ERR_LIB_EVP, EVP_R_INITIALIZATION_ERROR); - return 0; - } - - if (cipher != ctx->fetched_cipher) { + if (cipher->prov != NULL) { if (!EVP_CIPHER_up_ref((EVP_CIPHER *)cipher)) { ERR_raise(ERR_LIB_EVP, EVP_R_INITIALIZATION_ERROR); return 0; diff --git a/deps/openssl/openssl/crypto/evp/evp_fetch.c b/deps/openssl/openssl/crypto/evp/evp_fetch.c index 6eeafd948..aafd927e6 100644 --- a/deps/openssl/openssl/crypto/evp/evp_fetch.c +++ b/deps/openssl/openssl/crypto/evp/evp_fetch.c @@ -1,5 +1,5 @@ /* - * Copyright 2019-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -349,26 +349,13 @@ inner_evp_generic_fetch(struct evp_method_data_st *methdata, * there is a correct name_id and meth_id, since those have * already been calculated in get_evp_method_from_store() and * put_evp_method_in_store() above. - * Note that there is a corner case here, in which, if a user - * passes a name of the form name1:name2:..., then the construction - * will create a method against all names, but the lookup will fail - * as ossl_namemap_name2num treats the name string as a single name - * rather than introducing new features where in the EVP__fetch - * parses the string and querys for each, return an error. */ if (name_id == 0) name_id = ossl_namemap_name2num(namemap, name); - if (name_id == 0) { - ERR_raise_data(ERR_LIB_EVP, ERR_R_FETCH_FAILED, - "Algorithm %s cannot be found", name); - free_method(method); - method = NULL; - } else { - meth_id = evp_method_id(name_id, operation_id); - if (meth_id != 0) - ossl_method_store_cache_set(store, prov, meth_id, propq, - method, up_ref_method, free_method); - } + meth_id = evp_method_id(name_id, operation_id); + if (name_id != 0) + ossl_method_store_cache_set(store, prov, meth_id, propq, + method, up_ref_method, free_method); } /* diff --git a/deps/openssl/openssl/crypto/evp/legacy_sha.c b/deps/openssl/openssl/crypto/evp/legacy_sha.c index ca9a32649..3859286ee 100644 --- a/deps/openssl/openssl/crypto/evp/legacy_sha.c +++ b/deps/openssl/openssl/crypto/evp/legacy_sha.c @@ -1,5 +1,5 @@ /* - * Copyright 2019-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -71,11 +71,7 @@ static int sha1_int_ctrl(EVP_MD_CTX *ctx, int cmd, int p1, void *p2) static int shake_ctrl(EVP_MD_CTX *evp_ctx, int cmd, int p1, void *p2) { - KECCAK1600_CTX *ctx; - - if (evp_ctx == NULL) - return 0; - ctx = evp_ctx->md_data; + KECCAK1600_CTX *ctx = evp_ctx->md_data; switch (cmd) { case EVP_MD_CTRL_XOF_LEN: diff --git a/deps/openssl/openssl/crypto/evp/p5_crpt2.c b/deps/openssl/openssl/crypto/evp/p5_crpt2.c index 356173902..b7455be1c 100644 --- a/deps/openssl/openssl/crypto/evp/p5_crpt2.c +++ b/deps/openssl/openssl/crypto/evp/p5_crpt2.c @@ -231,16 +231,13 @@ int PKCS5_v2_PBKDF2_keyivgen_ex(EVP_CIPHER_CTX *ctx, const char *pass, goto err; } - (void)ERR_set_mark(); prfmd = prfmd_fetch = EVP_MD_fetch(libctx, OBJ_nid2sn(hmac_md_nid), propq); if (prfmd == NULL) prfmd = EVP_get_digestbynid(hmac_md_nid); if (prfmd == NULL) { - (void)ERR_clear_last_mark(); ERR_raise(ERR_LIB_EVP, EVP_R_UNSUPPORTED_PRF); goto err; } - (void)ERR_pop_to_mark(); if (kdf->salt->type != V_ASN1_OCTET_STRING) { ERR_raise(ERR_LIB_EVP, EVP_R_UNSUPPORTED_SALT_TYPE); diff --git a/deps/openssl/openssl/crypto/evp/p_lib.c b/deps/openssl/openssl/crypto/evp/p_lib.c index 04b148a91..f6acb5b47 100644 --- a/deps/openssl/openssl/crypto/evp/p_lib.c +++ b/deps/openssl/openssl/crypto/evp/p_lib.c @@ -717,13 +717,11 @@ static void detect_foreign_key(EVP_PKEY *pkey) { switch (pkey->type) { case EVP_PKEY_RSA: - case EVP_PKEY_RSA_PSS: pkey->foreign = pkey->pkey.rsa != NULL && ossl_rsa_is_foreign(pkey->pkey.rsa); break; # ifndef OPENSSL_NO_EC case EVP_PKEY_SM2: - break; case EVP_PKEY_EC: pkey->foreign = pkey->pkey.ec != NULL && ossl_ec_key_is_foreign(pkey->pkey.ec); @@ -1076,7 +1074,6 @@ int EVP_PKEY_can_sign(const EVP_PKEY *pkey) if (pkey->keymgmt == NULL) { switch (EVP_PKEY_get_base_id(pkey)) { case EVP_PKEY_RSA: - case EVP_PKEY_RSA_PSS: return 1; # ifndef OPENSSL_NO_DSA case EVP_PKEY_DSA: @@ -1201,7 +1198,7 @@ int EVP_PKEY_print_public(BIO *out, const EVP_PKEY *pkey, int EVP_PKEY_print_private(BIO *out, const EVP_PKEY *pkey, int indent, ASN1_PCTX *pctx) { - return print_pkey(pkey, out, indent, EVP_PKEY_PRIVATE_KEY, NULL, + return print_pkey(pkey, out, indent, EVP_PKEY_KEYPAIR, NULL, (pkey->ameth != NULL ? pkey->ameth->priv_print : NULL), pctx); } diff --git a/deps/openssl/openssl/crypto/evp/pmeth_lib.c b/deps/openssl/openssl/crypto/evp/pmeth_lib.c index ba1971ce4..ce6e1a1cc 100644 --- a/deps/openssl/openssl/crypto/evp/pmeth_lib.c +++ b/deps/openssl/openssl/crypto/evp/pmeth_lib.c @@ -251,11 +251,10 @@ static EVP_PKEY_CTX *int_ctx_new(OSSL_LIB_CTX *libctx, */ if (e != NULL) pmeth = ENGINE_get_pkey_meth(e, id); - else -# endif /* OPENSSL_NO_ENGINE */ - if (pkey != NULL && pkey->foreign) + else if (pkey != NULL && pkey->foreign) pmeth = EVP_PKEY_meth_find(id); else +# endif app_pmeth = pmeth = evp_pkey_meth_find_added_by_application(id); /* END legacy */ diff --git a/deps/openssl/openssl/crypto/ex_data.c b/deps/openssl/openssl/crypto/ex_data.c index 13b928899..40223f06e 100644 --- a/deps/openssl/openssl/crypto/ex_data.c +++ b/deps/openssl/openssl/crypto/ex_data.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -163,8 +163,6 @@ int ossl_crypto_get_ex_new_index_ex(OSSL_LIB_CTX *ctx, int class_index, * "app_data" routines use ex_data index zero. See RT 3710. */ if (ip->meth == NULL || !sk_EX_CALLBACK_push(ip->meth, NULL)) { - sk_EX_CALLBACK_free(ip->meth); - ip->meth = NULL; ERR_raise(ERR_LIB_CRYPTO, ERR_R_MALLOC_FAILURE); goto err; } diff --git a/deps/openssl/openssl/crypto/ffc/ffc_key_validate.c b/deps/openssl/openssl/crypto/ffc/ffc_key_validate.c index a4a2a58e9..342789621 100644 --- a/deps/openssl/openssl/crypto/ffc/ffc_key_validate.c +++ b/deps/openssl/openssl/crypto/ffc/ffc_key_validate.c @@ -26,7 +26,7 @@ int ossl_ffc_validate_public_key_partial(const FFC_PARAMS *params, *ret = 0; if (params == NULL || pub_key == NULL || params->p == NULL) { *ret = FFC_ERROR_PASSED_NULL_PARAM; - return 1; + return 0; } ctx = BN_CTX_new_ex(NULL); @@ -39,14 +39,18 @@ int ossl_ffc_validate_public_key_partial(const FFC_PARAMS *params, if (tmp == NULL || !BN_set_word(tmp, 1)) goto err; - if (BN_cmp(pub_key, tmp) <= 0) + if (BN_cmp(pub_key, tmp) <= 0) { *ret |= FFC_ERROR_PUBKEY_TOO_SMALL; + goto err; + } /* Step(1): Verify pub_key <= p-2 */ if (BN_copy(tmp, params->p) == NULL || !BN_sub_word(tmp, 1)) goto err; - if (BN_cmp(pub_key, tmp) >= 0) + if (BN_cmp(pub_key, tmp) >= 0) { *ret |= FFC_ERROR_PUBKEY_TOO_LARGE; + goto err; + } ok = 1; err: if (ctx != NULL) { @@ -69,7 +73,7 @@ int ossl_ffc_validate_public_key(const FFC_PARAMS *params, if (!ossl_ffc_validate_public_key_partial(params, pub_key, ret)) return 0; - if (*ret == 0 && params->q != NULL) { + if (params->q != NULL) { ctx = BN_CTX_new_ex(NULL); if (ctx == NULL) goto err; @@ -80,8 +84,10 @@ int ossl_ffc_validate_public_key(const FFC_PARAMS *params, if (tmp == NULL || !BN_mod_exp(tmp, pub_key, params->q, params->p, ctx)) goto err; - if (!BN_is_one(tmp)) + if (!BN_is_one(tmp)) { *ret |= FFC_ERROR_PUBKEY_INVALID; + goto err; + } } ok = 1; diff --git a/deps/openssl/openssl/crypto/http/http_client.c b/deps/openssl/openssl/crypto/http/http_client.c index 4b96a6b9e..ee41c0310 100644 --- a/deps/openssl/openssl/crypto/http/http_client.c +++ b/deps/openssl/openssl/crypto/http/http_client.c @@ -164,8 +164,7 @@ void OSSL_HTTP_REQ_CTX_set_max_response_length(OSSL_HTTP_REQ_CTX *rctx, /* * Create request line using |rctx| and |path| (or "/" in case |path| is NULL). - * Server name (and optional port) must be given if and only if - * a plain HTTP proxy is used and |path| does not begin with 'http://'. + * Server name (and port) must be given if and only if plain HTTP proxy is used. */ int OSSL_HTTP_REQ_CTX_set_request_line(OSSL_HTTP_REQ_CTX *rctx, int method_POST, const char *server, const char *port, @@ -194,17 +193,11 @@ int OSSL_HTTP_REQ_CTX_set_request_line(OSSL_HTTP_REQ_CTX *rctx, int method_POST, return 0; } - /* Make sure path includes a forward slash (abs_path) */ - if (path == NULL) { + /* Make sure path includes a forward slash */ + if (path == NULL) path = "/"; - } else if (HAS_PREFIX(path, "http://")) { /* absoluteURI for proxy use */ - if (server != NULL) { - ERR_raise(ERR_LIB_HTTP, ERR_R_PASSED_INVALID_ARGUMENT); - return 0; - } - } else if (path[0] != '/' && BIO_printf(rctx->mem, "/") <= 0) { + if (path[0] != '/' && BIO_printf(rctx->mem, "/") <= 0) return 0; - } /* * Add (the rest of) the path and the HTTP version, * which is fixed to 1.0 for straightforward implementation of keep-alive @@ -487,17 +480,13 @@ static int parse_http_line1(char *line, int *found_keep_alive) static int check_set_resp_len(OSSL_HTTP_REQ_CTX *rctx, size_t len) { - if (rctx->max_resp_len != 0 && len > rctx->max_resp_len) { + if (rctx->max_resp_len != 0 && len > rctx->max_resp_len) ERR_raise_data(ERR_LIB_HTTP, HTTP_R_MAX_RESP_LEN_EXCEEDED, "length=%zu, max=%zu", len, rctx->max_resp_len); - return 0; - } - if (rctx->resp_len != 0 && rctx->resp_len != len) { + if (rctx->resp_len != 0 && rctx->resp_len != len) ERR_raise_data(ERR_LIB_HTTP, HTTP_R_INCONSISTENT_CONTENT_LENGTH, "ASN.1 length=%zu, Content-Length=%zu", len, rctx->resp_len); - return 0; - } rctx->resp_len = len; return 1; } diff --git a/deps/openssl/openssl/crypto/http/http_lib.c b/deps/openssl/openssl/crypto/http/http_lib.c index 30c1cd04f..ec24e0dc4 100644 --- a/deps/openssl/openssl/crypto/http/http_lib.c +++ b/deps/openssl/openssl/crypto/http/http_lib.c @@ -22,13 +22,6 @@ static void init_pstring(char **pstr) } } -static void init_pint(int *pint) -{ - if (pint != NULL) { - *pint = 0; - } -} - static int copy_substring(char **dest, const char *start, const char *end) { return dest == NULL @@ -61,7 +54,6 @@ int OSSL_parse_url(const char *url, char **pscheme, char **puser, char **phost, init_pstring(puser); init_pstring(phost); init_pstring(pport); - init_pint(pport_num); init_pstring(ppath); init_pstring(pfrag); init_pstring(pquery); @@ -118,7 +110,7 @@ int OSSL_parse_url(const char *url, char **pscheme, char **puser, char **phost, port = ++p; /* remaining port spec handling is also done for the default values */ /* make sure a decimal port number is given */ - if (sscanf(port, "%u", &portnum) <= 0 || portnum > 65535) { + if (!sscanf(port, "%u", &portnum) || portnum > 65535) { ERR_raise_data(ERR_LIB_HTTP, HTTP_R_INVALID_PORT_NUMBER, "%s", port); goto err; } diff --git a/deps/openssl/openssl/crypto/info.c b/deps/openssl/openssl/crypto/info.c index f5fa92e15..a0dc2e801 100644 --- a/deps/openssl/openssl/crypto/info.c +++ b/deps/openssl/openssl/crypto/info.c @@ -14,7 +14,6 @@ #include "internal/cryptlib.h" #include "e_os.h" #include "buildinf.h" -#include #if defined(__arm__) || defined(__arm) || defined(__aarch64__) # include "arm_arch.h" @@ -200,10 +199,6 @@ const char *OPENSSL_info(int t) if (ossl_cpu_info_str[0] != '\0') return ossl_cpu_info_str + strlen(CPUINFO_PREFIX); break; -#ifndef OPENSSL_NO_QUIC - case OPENSSL_INFO_QUIC: - return "QUIC"; -#endif default: break; } diff --git a/deps/openssl/openssl/crypto/lhash/lhash.c b/deps/openssl/openssl/crypto/lhash/lhash.c index a01cfa725..1cd988f01 100644 --- a/deps/openssl/openssl/crypto/lhash/lhash.c +++ b/deps/openssl/openssl/crypto/lhash/lhash.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -266,12 +266,12 @@ static void contract(OPENSSL_LHASH *lh) if (n == NULL) { /* fputs("realloc error in lhash",stderr); */ lh->error++; - } else { - lh->b = n; + return; } lh->num_alloc_nodes /= 2; lh->pmax /= 2; lh->p = lh->pmax - 1; + lh->b = n; } else lh->p--; diff --git a/deps/openssl/openssl/crypto/mem.c b/deps/openssl/openssl/crypto/mem.c index 34128616e..f6cdcf5a4 100644 --- a/deps/openssl/openssl/crypto/mem.c +++ b/deps/openssl/openssl/crypto/mem.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -100,9 +100,6 @@ void CRYPTO_get_alloc_counts(int *mcount, int *rcount, int *fcount) * or 100;100@25;0 * This means 100 mallocs succeed, then next 100 fail 25% of the time, and * all remaining (count is zero) succeed. - * The failure percentge can have 2 digits after the comma. For example: - * 0@0.01 - * This means 0.01% of all allocations will fail. */ static void parseit(void) { @@ -115,27 +112,26 @@ static void parseit(void) /* Get the count (atol will stop at the @ if there), and percentage */ md_count = atol(md_failstring); atsign = strchr(md_failstring, '@'); - md_fail_percent = atsign == NULL ? 0 : (int)(atof(atsign + 1) * 100 + 0.5); + md_fail_percent = atsign == NULL ? 0 : atoi(atsign + 1); if (semi != NULL) md_failstring = semi; } /* - * Windows doesn't have random() and srandom(), but it has rand() and srand(). + * Windows doesn't have random(), but it has rand() * Some rand() implementations aren't good, but we're not * dealing with secure randomness here. */ # ifdef _WIN32 # define random() rand() -# define srandom(seed) srand(seed) # endif /* * See if the current malloc should fail. */ static int shouldfail(void) { - int roll = (int)(random() % 10000); + int roll = (int)(random() % 100); int shoulditfail = roll < md_fail_percent; # ifndef _WIN32 /* suppressed on Windows as POSIX-like file descriptors are non-inheritable */ @@ -169,8 +165,6 @@ void ossl_malloc_setup_failures(void) parseit(); if ((cp = getenv("OPENSSL_MALLOC_FD")) != NULL) md_tracefd = atoi(cp); - if ((cp = getenv("OPENSSL_MALLOC_SEED")) != NULL) - srandom(atoi(cp)); } #endif @@ -201,6 +195,7 @@ void *CRYPTO_zalloc(size_t num, const char *file, int line) void *ret; ret = CRYPTO_malloc(num, file, line); + FAILTEST(); if (ret != NULL) memset(ret, 0, num); @@ -213,6 +208,7 @@ void *CRYPTO_realloc(void *str, size_t num, const char *file, int line) if (realloc_impl != CRYPTO_realloc) return realloc_impl(str, num, file, line); + FAILTEST(); if (str == NULL) return CRYPTO_malloc(num, file, line); @@ -221,7 +217,6 @@ void *CRYPTO_realloc(void *str, size_t num, const char *file, int line) return NULL; } - FAILTEST(); return realloc(str, num); } diff --git a/deps/openssl/openssl/crypto/mem_sec.c b/deps/openssl/openssl/crypto/mem_sec.c index 5cdeedb8d..6ba75486a 100644 --- a/deps/openssl/openssl/crypto/mem_sec.c +++ b/deps/openssl/openssl/crypto/mem_sec.c @@ -238,17 +238,11 @@ int CRYPTO_secure_allocated(const void *ptr) size_t CRYPTO_secure_used(void) { - size_t ret = 0; - #ifndef OPENSSL_NO_SECURE_MEMORY - if (!CRYPTO_THREAD_read_lock(sec_malloc_lock)) - return 0; - - ret = secure_mem_used; - - CRYPTO_THREAD_unlock(sec_malloc_lock); + return secure_mem_used; +#else + return 0; #endif /* OPENSSL_NO_SECURE_MEMORY */ - return ret; } size_t CRYPTO_secure_actual_size(void *ptr) diff --git a/deps/openssl/openssl/crypto/modes/asm/ghashv8-armx.pl b/deps/openssl/openssl/crypto/modes/asm/ghashv8-armx.pl index b3d940417..b1d35d25b 100644 --- a/deps/openssl/openssl/crypto/modes/asm/ghashv8-armx.pl +++ b/deps/openssl/openssl/crypto/modes/asm/ghashv8-armx.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2014-2023 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2014-2020 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the Apache License 2.0 (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -744,9 +744,6 @@ if ($flavour =~ /64/) { ######## 64-bit code s/\.[uisp]?64//o and s/\.16b/\.2d/go; s/\.[42]([sd])\[([0-3])\]/\.$1\[$2\]/o; - # Switch preprocessor checks to aarch64 versions. - s/__ARME([BL])__/__AARCH64E$1__/go; - print $_,"\n"; } } else { ######## 32-bit code diff --git a/deps/openssl/openssl/crypto/objects/obj_dat.c b/deps/openssl/openssl/crypto/objects/obj_dat.c index dc501cbb8..1a52000e6 100644 --- a/deps/openssl/openssl/crypto/objects/obj_dat.c +++ b/deps/openssl/openssl/crypto/objects/obj_dat.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -62,7 +62,7 @@ static unsigned long added_obj_hash(const ADDED_OBJ *ca) a = ca->obj; switch (ca->type) { case ADDED_DATA: - ret = (unsigned long)a->length << 20UL; + ret = a->length << 20L; p = (unsigned char *)a->data; for (i = 0; i < a->length; i++) ret ^= p[i] << ((i * 3) % 24); @@ -642,14 +642,13 @@ const void *OBJ_bsearch_ex_(const void *key, const void *base, int num, if (p == NULL) { const char *base_ = base; int l, h, i = 0, c = 0; - char *p1; for (i = 0; i < num; ++i) { - p1 = &(base_[i * size]); - c = (*cmp) (key, p1); + p = &(base_[i * size]); + c = (*cmp) (key, p); if (c == 0 || (c < 0 && (flags & OBJ_BSEARCH_VALUE_ON_NOMATCH))) - return p1; + return p; } } #endif diff --git a/deps/openssl/openssl/crypto/param_build.c b/deps/openssl/openssl/crypto/param_build.c index 56537e676..51c8681f3 100644 --- a/deps/openssl/openssl/crypto/param_build.c +++ b/deps/openssl/openssl/crypto/param_build.c @@ -239,9 +239,9 @@ int OSSL_PARAM_BLD_push_utf8_string(OSSL_PARAM_BLD *bld, const char *key, OSSL_PARAM_BLD_DEF *pd; int secure; - if (bsize == 0) + if (bsize == 0) { bsize = strlen(buf); - if (bsize > INT_MAX) { + } else if (bsize > INT_MAX) { ERR_raise(ERR_LIB_CRYPTO, CRYPTO_R_STRING_TOO_LONG); return 0; } @@ -258,9 +258,9 @@ int OSSL_PARAM_BLD_push_utf8_ptr(OSSL_PARAM_BLD *bld, const char *key, { OSSL_PARAM_BLD_DEF *pd; - if (bsize == 0) + if (bsize == 0) { bsize = strlen(buf); - if (bsize > INT_MAX) { + } else if (bsize > INT_MAX) { ERR_raise(ERR_LIB_CRYPTO, CRYPTO_R_STRING_TOO_LONG); return 0; } diff --git a/deps/openssl/openssl/crypto/param_build_set.c b/deps/openssl/openssl/crypto/param_build_set.c index 5de06cc7e..8b570ded9 100644 --- a/deps/openssl/openssl/crypto/param_build_set.c +++ b/deps/openssl/openssl/crypto/param_build_set.c @@ -1,5 +1,5 @@ /* - * Copyright 2020-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -99,22 +99,21 @@ int ossl_param_build_set_multi_key_bn(OSSL_PARAM_BLD *bld, OSSL_PARAM *params, { int i, sz = sk_BIGNUM_const_num(stk); OSSL_PARAM *p; - const BIGNUM *bn; + if (bld != NULL) { for (i = 0; i < sz && names[i] != NULL; ++i) { - bn = sk_BIGNUM_const_value(stk, i); - if (bn != NULL && !OSSL_PARAM_BLD_push_BN(bld, names[i], bn)) + if (!OSSL_PARAM_BLD_push_BN(bld, names[i], + sk_BIGNUM_const_value(stk, i))) return 0; } return 1; } for (i = 0; i < sz && names[i] != NULL; ++i) { - bn = sk_BIGNUM_const_value(stk, i); p = OSSL_PARAM_locate(params, names[i]); - if (p != NULL && bn != NULL) { - if (!OSSL_PARAM_set_BN(p, bn)) + if (p != NULL) { + if (!OSSL_PARAM_set_BN(p, sk_BIGNUM_const_value(stk, i))) return 0; } } diff --git a/deps/openssl/openssl/crypto/params.c b/deps/openssl/openssl/crypto/params.c index 4d85b5943..5fd1e0028 100644 --- a/deps/openssl/openssl/crypto/params.c +++ b/deps/openssl/openssl/crypto/params.c @@ -14,7 +14,6 @@ #include "internal/numbers.h" #include "internal/endian.h" -#ifndef OPENSSL_SYS_UEFI /* * Return the number of bits in the mantissa of a double. This is used to * shift a larger integral value to determine if it will exactly fit into a @@ -24,7 +23,6 @@ static unsigned int real_shift(void) { return sizeof(double) == 4 ? 24 : 53; } -#endif OSSL_PARAM *OSSL_PARAM_locate(OSSL_PARAM *p, const char *key) { @@ -344,6 +342,8 @@ OSSL_PARAM OSSL_PARAM_construct_ulong(const char *key, unsigned long int *buf) int OSSL_PARAM_get_int32(const OSSL_PARAM *p, int32_t *val) { + double d; + if (val == NULL || p == NULL ) return 0; @@ -391,9 +391,6 @@ int OSSL_PARAM_get_int32(const OSSL_PARAM *p, int32_t *val) return general_get_int(p, val, sizeof(*val)); } else if (p->data_type == OSSL_PARAM_REAL) { -#ifndef OPENSSL_SYS_UEFI - double d; - switch (p->data_size) { case sizeof(double): d = *(const double *)p->data; @@ -403,7 +400,6 @@ int OSSL_PARAM_get_int32(const OSSL_PARAM *p, int32_t *val) } break; } -#endif } return 0; } @@ -446,7 +442,6 @@ int OSSL_PARAM_set_int32(OSSL_PARAM *p, int32_t val) #endif return general_set_int(p, &val, sizeof(val)); } else if (p->data_type == OSSL_PARAM_REAL) { -#ifndef OPENSSL_SYS_UEFI p->return_size = sizeof(double); if (p->data == NULL) return 1; @@ -455,7 +450,6 @@ int OSSL_PARAM_set_int32(OSSL_PARAM *p, int32_t val) *(double *)p->data = (double)val; return 1; } -#endif } return 0; } @@ -468,6 +462,8 @@ OSSL_PARAM OSSL_PARAM_construct_int32(const char *key, int32_t *buf) int OSSL_PARAM_get_uint32(const OSSL_PARAM *p, uint32_t *val) { + double d; + if (val == NULL || p == NULL) return 0; @@ -513,9 +509,6 @@ int OSSL_PARAM_get_uint32(const OSSL_PARAM *p, uint32_t *val) #endif return general_get_uint(p, val, sizeof(*val)); } else if (p->data_type == OSSL_PARAM_REAL) { -#ifndef OPENSSL_SYS_UEFI - double d; - switch (p->data_size) { case sizeof(double): d = *(const double *)p->data; @@ -525,7 +518,6 @@ int OSSL_PARAM_get_uint32(const OSSL_PARAM *p, uint32_t *val) } break; } -#endif } return 0; } @@ -572,7 +564,6 @@ int OSSL_PARAM_set_uint32(OSSL_PARAM *p, uint32_t val) #endif return general_set_uint(p, &val, sizeof(val)); } else if (p->data_type == OSSL_PARAM_REAL) { -#ifndef OPENSSL_SYS_UEFI p->return_size = sizeof(double); if (p->data == NULL) return 1; @@ -581,7 +572,6 @@ int OSSL_PARAM_set_uint32(OSSL_PARAM *p, uint32_t val) *(double *)p->data = (double)val; return 1; } -#endif } return 0; } @@ -594,6 +584,8 @@ OSSL_PARAM OSSL_PARAM_construct_uint32(const char *key, uint32_t *buf) int OSSL_PARAM_get_int64(const OSSL_PARAM *p, int64_t *val) { + double d; + if (val == NULL || p == NULL ) return 0; @@ -628,9 +620,6 @@ int OSSL_PARAM_get_int64(const OSSL_PARAM *p, int64_t *val) #endif return general_get_int(p, val, sizeof(*val)); } else if (p->data_type == OSSL_PARAM_REAL) { -#ifndef OPENSSL_SYS_UEFI - double d; - switch (p->data_size) { case sizeof(double): d = *(const double *)p->data; @@ -647,13 +636,14 @@ int OSSL_PARAM_get_int64(const OSSL_PARAM *p, int64_t *val) } break; } -#endif } return 0; } int OSSL_PARAM_set_int64(OSSL_PARAM *p, int64_t val) { + uint64_t u64; + if (p == NULL) return 0; p->return_size = 0; @@ -696,9 +686,6 @@ int OSSL_PARAM_set_int64(OSSL_PARAM *p, int64_t val) #endif return general_set_int(p, &val, sizeof(val)); } else if (p->data_type == OSSL_PARAM_REAL) { -#ifndef OPENSSL_SYS_UEFI - uint64_t u64; - p->return_size = sizeof(double); if (p->data == NULL) return 1; @@ -711,7 +698,6 @@ int OSSL_PARAM_set_int64(OSSL_PARAM *p, int64_t val) } break; } -#endif } return 0; } @@ -723,6 +709,8 @@ OSSL_PARAM OSSL_PARAM_construct_int64(const char *key, int64_t *buf) int OSSL_PARAM_get_uint64(const OSSL_PARAM *p, uint64_t *val) { + double d; + if (val == NULL || p == NULL) return 0; @@ -762,9 +750,6 @@ int OSSL_PARAM_get_uint64(const OSSL_PARAM *p, uint64_t *val) #endif return general_get_uint(p, val, sizeof(*val)); } else if (p->data_type == OSSL_PARAM_REAL) { -#ifndef OPENSSL_SYS_UEFI - double d; - switch (p->data_size) { case sizeof(double): d = *(const double *)p->data; @@ -781,7 +766,6 @@ int OSSL_PARAM_get_uint64(const OSSL_PARAM *p, uint64_t *val) } break; } -#endif } return 0; } @@ -834,7 +818,6 @@ int OSSL_PARAM_set_uint64(OSSL_PARAM *p, uint64_t val) #endif return general_set_uint(p, &val, sizeof(val)); } else if (p->data_type == OSSL_PARAM_REAL) { -#ifndef OPENSSL_SYS_UEFI p->return_size = sizeof(double); switch (p->data_size) { case sizeof(double): @@ -844,7 +827,6 @@ int OSSL_PARAM_set_uint64(OSSL_PARAM *p, uint64_t val) } break; } -#endif } return 0; } @@ -971,7 +953,6 @@ OSSL_PARAM OSSL_PARAM_construct_BN(const char *key, unsigned char *buf, buf, bsize); } -#ifndef OPENSSL_SYS_UEFI int OSSL_PARAM_get_double(const OSSL_PARAM *p, double *val) { int64_t i64; @@ -1092,7 +1073,6 @@ OSSL_PARAM OSSL_PARAM_construct_double(const char *key, double *buf) { return ossl_param_construct(key, OSSL_PARAM_REAL, buf, sizeof(double)); } -#endif static int get_string_internal(const OSSL_PARAM *p, void **val, size_t *max_len, size_t *used_len, diff --git a/deps/openssl/openssl/crypto/params_from_text.c b/deps/openssl/openssl/crypto/params_from_text.c index a323bf261..360f8933e 100644 --- a/deps/openssl/openssl/crypto/params_from_text.c +++ b/deps/openssl/openssl/crypto/params_from_text.c @@ -1,5 +1,5 @@ /* - * Copyright 2019-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved. * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use @@ -118,13 +118,7 @@ static int prepare_from_text(const OSSL_PARAM *paramdefs, const char *key, break; case OSSL_PARAM_OCTET_STRING: if (*ishex) { - size_t hexdigits = strlen(value); - if ((hexdigits % 2) != 0) { - /* We don't accept an odd number of hex digits */ - ERR_raise(ERR_LIB_CRYPTO, CRYPTO_R_ODD_NUMBER_OF_DIGITS); - return 0; - } - *buf_n = hexdigits >> 1; + *buf_n = strlen(value) >> 1; } else { *buf_n = value_n; } diff --git a/deps/openssl/openssl/crypto/pem/pem_pkey.c b/deps/openssl/openssl/crypto/pem/pem_pkey.c index 4deee46ce..3e76852c6 100644 --- a/deps/openssl/openssl/crypto/pem/pem_pkey.c +++ b/deps/openssl/openssl/crypto/pem/pem_pkey.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -366,19 +366,10 @@ int PEM_write_bio_PrivateKey_traditional(BIO *bp, const EVP_PKEY *x, return ret; } -static int no_password_cb(char *buf, int num, int rwflag, void *userdata) -{ - return -1; -} - EVP_PKEY *PEM_read_bio_Parameters_ex(BIO *bp, EVP_PKEY **x, OSSL_LIB_CTX *libctx, const char *propq) { - /* - * PEM_read_bio_Parameters(_ex) should never ask for a password. Any attempt - * to get a password just fails. - */ - return pem_read_bio_key(bp, x, no_password_cb, NULL, libctx, propq, + return pem_read_bio_key(bp, x, NULL, NULL, libctx, propq, EVP_PKEY_KEY_PARAMETERS); } diff --git a/deps/openssl/openssl/crypto/perlasm/arm-xlate.pl b/deps/openssl/openssl/crypto/perlasm/arm-xlate.pl index 38d570c79..a90885905 100755 --- a/deps/openssl/openssl/crypto/perlasm/arm-xlate.pl +++ b/deps/openssl/openssl/crypto/perlasm/arm-xlate.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2015-2023 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2015-2020 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the Apache License 2.0 (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -159,8 +159,9 @@ while(my $line=<>) { } { - if ($line =~ s|(^[\.\w]+)\:\s*||) { - my $label = $1; + $line =~ s|(^[\.\w]+)\:\s*||; + my $label = $1; + if ($label) { printf "%s:",($GLOBALS{$label} or $label); } } diff --git a/deps/openssl/openssl/crypto/perlasm/x86_64-xlate.pl b/deps/openssl/openssl/crypto/perlasm/x86_64-xlate.pl index b2bf96cef..1830b2556 100755 --- a/deps/openssl/openssl/crypto/perlasm/x86_64-xlate.pl +++ b/deps/openssl/openssl/crypto/perlasm/x86_64-xlate.pl @@ -111,12 +111,7 @@ elsif (`$ENV{CC} -Wa,-v -c -o /dev/null -x assembler /dev/null 2>&1` $gnuas=1; } elsif (`$ENV{CC} --version 2>/dev/null` - =~ /(clang .*|Intel.*oneAPI .*)/) -{ - $gnuas=1; -} -elsif (`$ENV{CC} -V 2>/dev/null` - =~ /nvc .*/) + =~ /clang .*/) { $gnuas=1; } diff --git a/deps/openssl/openssl/crypto/perlasm/x86asm.pl b/deps/openssl/openssl/crypto/perlasm/x86asm.pl index 98a7159a5..8dcde9eac 100644 --- a/deps/openssl/openssl/crypto/perlasm/x86asm.pl +++ b/deps/openssl/openssl/crypto/perlasm/x86asm.pl @@ -174,9 +174,9 @@ sub ::vprotd sub ::endbranch { - &::generic("%ifdef __CET__\n"); + &::generic("#ifdef __CET__\n"); &::data_byte(0xf3,0x0f,0x1e,0xfb); - &::generic("%endif\n"); + &::generic("#endif\n"); } # label management diff --git a/deps/openssl/openssl/crypto/pkcs12/p12_add.c b/deps/openssl/openssl/crypto/pkcs12/p12_add.c index 66dcf92ca..80ce31b3b 100644 --- a/deps/openssl/openssl/crypto/pkcs12/p12_add.c +++ b/deps/openssl/openssl/crypto/pkcs12/p12_add.c @@ -1,5 +1,5 @@ /* - * Copyright 1999-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1999-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/openssl/crypto/pkcs12/p12_crt.c b/deps/openssl/openssl/crypto/pkcs12/p12_crt.c index 26a444f86..00c712974 100644 --- a/deps/openssl/openssl/crypto/pkcs12/p12_crt.c +++ b/deps/openssl/openssl/crypto/pkcs12/p12_crt.c @@ -1,5 +1,5 @@ /* - * Copyright 1999-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1999-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -14,12 +14,6 @@ static int pkcs12_add_bag(STACK_OF(PKCS12_SAFEBAG) **pbags, PKCS12_SAFEBAG *bag); -static PKCS12_SAFEBAG *pkcs12_add_cert_bag(STACK_OF(PKCS12_SAFEBAG) **pbags, - X509 *cert, - const char *name, - int namelen, - unsigned char *keyid, - int keyidlen); static int copy_bag_attr(PKCS12_SAFEBAG *bag, EVP_PKEY *pkey, int nid) { @@ -46,9 +40,6 @@ PKCS12 *PKCS12_create_ex(const char *pass, const char *name, EVP_PKEY *pkey, int i; unsigned char keyid[EVP_MAX_MD_SIZE]; unsigned int keyidlen = 0; - int namelen = -1; - unsigned char *pkeyid = NULL; - int pkeyidlen = -1; /* Set defaults */ if (nid_cert == NID_undef) @@ -73,16 +64,11 @@ PKCS12 *PKCS12_create_ex(const char *pass, const char *name, EVP_PKEY *pkey, } if (cert) { - if (name == NULL) - name = (char *)X509_alias_get0(cert, &namelen); - if (keyidlen > 0) { - pkeyid = keyid; - pkeyidlen = keyidlen; - } else { - pkeyid = X509_keyid_get0(cert, &pkeyidlen); - } - - bag = pkcs12_add_cert_bag(&bags, cert, name, namelen, pkeyid, pkeyidlen); + bag = PKCS12_add_cert(&bags, cert); + if (name && !PKCS12_add_friendlyname(bag, name, -1)) + goto err; + if (keyidlen && !PKCS12_add_localkeyid(bag, keyid, keyidlen)) + goto err; } /* Add all other certificates */ @@ -153,23 +139,30 @@ PKCS12 *PKCS12_create(const char *pass, const char *name, EVP_PKEY *pkey, X509 * iter, mac_iter, keytype, NULL, NULL); } -static PKCS12_SAFEBAG *pkcs12_add_cert_bag(STACK_OF(PKCS12_SAFEBAG) **pbags, - X509 *cert, - const char *name, - int namelen, - unsigned char *keyid, - int keyidlen) +PKCS12_SAFEBAG *PKCS12_add_cert(STACK_OF(PKCS12_SAFEBAG) **pbags, X509 *cert) { PKCS12_SAFEBAG *bag = NULL; + char *name; + int namelen = -1; + unsigned char *keyid; + int keyidlen = -1; /* Add user certificate */ if ((bag = PKCS12_SAFEBAG_create_cert(cert)) == NULL) goto err; - if (name != NULL && !PKCS12_add_friendlyname(bag, name, namelen)) + /* + * Use friendlyName and localKeyID in certificate. (if present) + */ + + name = (char *)X509_alias_get0(cert, &namelen); + + if (name && !PKCS12_add_friendlyname(bag, name, namelen)) goto err; - if (keyid != NULL && !PKCS12_add_localkeyid(bag, keyid, keyidlen)) + keyid = X509_keyid_get0(cert, &keyidlen); + + if (keyid && !PKCS12_add_localkeyid(bag, keyid, keyidlen)) goto err; if (!pkcs12_add_bag(pbags, bag)) @@ -180,22 +173,7 @@ static PKCS12_SAFEBAG *pkcs12_add_cert_bag(STACK_OF(PKCS12_SAFEBAG) **pbags, err: PKCS12_SAFEBAG_free(bag); return NULL; -} - -PKCS12_SAFEBAG *PKCS12_add_cert(STACK_OF(PKCS12_SAFEBAG) **pbags, X509 *cert) -{ - char *name = NULL; - int namelen = -1; - unsigned char *keyid = NULL; - int keyidlen = -1; - - /* - * Use friendlyName and localKeyID in certificate. (if present) - */ - name = (char *)X509_alias_get0(cert, &namelen); - keyid = X509_keyid_get0(cert, &keyidlen); - return pkcs12_add_cert_bag(pbags, cert, name, namelen, keyid, keyidlen); } PKCS12_SAFEBAG *PKCS12_add_key_ex(STACK_OF(PKCS12_SAFEBAG) **pbags, diff --git a/deps/openssl/openssl/crypto/pkcs12/p12_mutl.c b/deps/openssl/openssl/crypto/pkcs12/p12_mutl.c index f8a6d33dd..67be81ebb 100644 --- a/deps/openssl/openssl/crypto/pkcs12/p12_mutl.c +++ b/deps/openssl/openssl/crypto/pkcs12/p12_mutl.c @@ -1,5 +1,5 @@ /* - * Copyright 1999-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1999-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -113,20 +113,15 @@ static int pkcs12_gen_mac(PKCS12 *p12, const char *pass, int passlen, X509_ALGOR_get0(&macoid, NULL, NULL, macalg); if (OBJ_obj2txt(md_name, sizeof(md_name), macoid, 0) < 0) return 0; - - (void)ERR_set_mark(); md = md_fetch = EVP_MD_fetch(p12->authsafes->ctx.libctx, md_name, p12->authsafes->ctx.propq); if (md == NULL) md = EVP_get_digestbynid(OBJ_obj2nid(macoid)); if (md == NULL) { - (void)ERR_clear_last_mark(); ERR_raise(ERR_LIB_PKCS12, PKCS12_R_UNKNOWN_DIGEST_ALGORITHM); return 0; } - (void)ERR_pop_to_mark(); - md_size = EVP_MD_get_size(md); md_nid = EVP_MD_get_type(md); if (md_size < 0) diff --git a/deps/openssl/openssl/crypto/pkcs12/p12_npas.c b/deps/openssl/openssl/crypto/pkcs12/p12_npas.c index dfcfcf6ae..1e5b54959 100644 --- a/deps/openssl/openssl/crypto/pkcs12/p12_npas.c +++ b/deps/openssl/openssl/crypto/pkcs12/p12_npas.c @@ -1,5 +1,5 @@ /* - * Copyright 1999-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1999-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/openssl/crypto/pkcs7/pk7_attr.c b/deps/openssl/openssl/crypto/pkcs7/pk7_attr.c index 80b128c30..e9904c595 100644 --- a/deps/openssl/openssl/crypto/pkcs7/pk7_attr.c +++ b/deps/openssl/openssl/crypto/pkcs7/pk7_attr.c @@ -28,12 +28,8 @@ int PKCS7_add_attrib_smimecap(PKCS7_SIGNER_INFO *si, } seq->length = ASN1_item_i2d((ASN1_VALUE *)cap, &seq->data, ASN1_ITEM_rptr(X509_ALGORS)); - if (!PKCS7_add_signed_attribute(si, NID_SMIMECapabilities, - V_ASN1_SEQUENCE, seq)) { - ASN1_STRING_free(seq); - return 0; - } - return 1; + return PKCS7_add_signed_attribute(si, NID_SMIMECapabilities, + V_ASN1_SEQUENCE, seq); } STACK_OF(X509_ALGOR) *PKCS7_get_smimecap(PKCS7_SIGNER_INFO *si) @@ -99,18 +95,12 @@ int PKCS7_add_attrib_content_type(PKCS7_SIGNER_INFO *si, ASN1_OBJECT *coid) int PKCS7_add0_attrib_signing_time(PKCS7_SIGNER_INFO *si, ASN1_TIME *t) { - ASN1_TIME *tmp = NULL; - - if (t == NULL && (tmp = t = X509_gmtime_adj(NULL, 0)) == NULL) { + if (t == NULL && (t = X509_gmtime_adj(NULL, 0)) == NULL) { ERR_raise(ERR_LIB_PKCS7, ERR_R_MALLOC_FAILURE); return 0; } - if (!PKCS7_add_signed_attribute(si, NID_pkcs9_signingTime, - V_ASN1_UTCTIME, t)) { - ASN1_TIME_free(tmp); - return 0; - } - return 1; + return PKCS7_add_signed_attribute(si, NID_pkcs9_signingTime, + V_ASN1_UTCTIME, t); } int PKCS7_add1_attrib_digest(PKCS7_SIGNER_INFO *si, diff --git a/deps/openssl/openssl/crypto/pkcs7/pk7_mime.c b/deps/openssl/openssl/crypto/pkcs7/pk7_mime.c index d23f7a869..8228315ee 100644 --- a/deps/openssl/openssl/crypto/pkcs7/pk7_mime.c +++ b/deps/openssl/openssl/crypto/pkcs7/pk7_mime.c @@ -1,5 +1,5 @@ /* - * Copyright 1999-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1999-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/openssl/crypto/poly1305/asm/poly1305-armv8.pl b/deps/openssl/openssl/crypto/poly1305/asm/poly1305-armv8.pl index dc39f4053..113a2151b 100755 --- a/deps/openssl/openssl/crypto/poly1305/asm/poly1305-armv8.pl +++ b/deps/openssl/openssl/crypto/poly1305/asm/poly1305-armv8.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2016-2023 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the Apache License 2.0 (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -85,7 +85,7 @@ poly1305_init: ldp $r0,$r1,[$inp] // load key mov $s1,#0xfffffffc0fffffff movk $s1,#0x0fff,lsl#48 -#ifdef __AARCH64EB__ +#ifdef __ARMEB__ rev $r0,$r0 // flip bytes rev $r1,$r1 #endif @@ -132,7 +132,7 @@ poly1305_blocks: .Loop: ldp $t0,$t1,[$inp],#16 // load input sub $len,$len,#16 -#ifdef __AARCH64EB__ +#ifdef __ARMEB__ rev $t0,$t0 rev $t1,$t1 #endif @@ -197,13 +197,13 @@ poly1305_emit: csel $h0,$h0,$d0,eq csel $h1,$h1,$d1,eq -#ifdef __AARCH64EB__ +#ifdef __ARMEB__ ror $t0,$t0,#32 // flip nonce words ror $t1,$t1,#32 #endif adds $h0,$h0,$t0 // accumulate nonce adc $h1,$h1,$t1 -#ifdef __AARCH64EB__ +#ifdef __ARMEB__ rev $h0,$h0 // flip output bytes rev $h1,$h1 #endif @@ -335,7 +335,7 @@ poly1305_blocks_neon: adcs $h1,$h1,xzr adc $h2,$h2,xzr -#ifdef __AARCH64EB__ +#ifdef __ARMEB__ rev $d0,$d0 rev $d1,$d1 #endif @@ -381,7 +381,7 @@ poly1305_blocks_neon: ldp $d0,$d1,[$inp],#16 // load input sub $len,$len,#16 add $s1,$r1,$r1,lsr#2 // s1 = r1 + (r1 >> 2) -#ifdef __AARCH64EB__ +#ifdef __ARMEB__ rev $d0,$d0 rev $d1,$d1 #endif @@ -466,7 +466,7 @@ poly1305_blocks_neon: lsl $padbit,$padbit,#24 add x15,$ctx,#48 -#ifdef __AARCH64EB__ +#ifdef __ARMEB__ rev x8,x8 rev x12,x12 rev x9,x9 @@ -502,7 +502,7 @@ poly1305_blocks_neon: ld1 {$S2,$R3,$S3,$R4},[x15],#64 ld1 {$S4},[x15] -#ifdef __AARCH64EB__ +#ifdef __ARMEB__ rev x8,x8 rev x12,x12 rev x9,x9 @@ -563,7 +563,7 @@ poly1305_blocks_neon: umull $ACC1,$IN23_0,${R1}[2] ldp x9,x13,[$in2],#48 umull $ACC0,$IN23_0,${R0}[2] -#ifdef __AARCH64EB__ +#ifdef __ARMEB__ rev x8,x8 rev x12,x12 rev x9,x9 @@ -628,7 +628,7 @@ poly1305_blocks_neon: umlal $ACC4,$IN01_2,${R2}[0] umlal $ACC1,$IN01_2,${S4}[0] umlal $ACC2,$IN01_2,${R0}[0] -#ifdef __AARCH64EB__ +#ifdef __ARMEB__ rev x8,x8 rev x12,x12 rev x9,x9 @@ -909,13 +909,13 @@ poly1305_emit_neon: csel $h0,$h0,$d0,eq csel $h1,$h1,$d1,eq -#ifdef __AARCH64EB__ +#ifdef __ARMEB__ ror $t0,$t0,#32 // flip nonce words ror $t1,$t1,#32 #endif adds $h0,$h0,$t0 // accumulate nonce adc $h1,$h1,$t1 -#ifdef __AARCH64EB__ +#ifdef __ARMEB__ rev $h0,$h0 // flip output bytes rev $h1,$h1 #endif diff --git a/deps/openssl/openssl/crypto/poly1305/asm/poly1305-ppc.pl b/deps/openssl/openssl/crypto/poly1305/asm/poly1305-ppc.pl index 9f9b27cac..2e601bb9c 100755 --- a/deps/openssl/openssl/crypto/poly1305/asm/poly1305-ppc.pl +++ b/deps/openssl/openssl/crypto/poly1305/asm/poly1305-ppc.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2016-2024 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the Apache License 2.0 (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/openssl/crypto/poly1305/asm/poly1305-x86_64.pl b/deps/openssl/openssl/crypto/poly1305/asm/poly1305-x86_64.pl index 4cddca1c5..24bab9d0b 100755 --- a/deps/openssl/openssl/crypto/poly1305/asm/poly1305-x86_64.pl +++ b/deps/openssl/openssl/crypto/poly1305/asm/poly1305-x86_64.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2016-2023 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the Apache License 2.0 (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/openssl/crypto/property/property.c b/deps/openssl/openssl/crypto/property/property.c index 602db0f3f..b97861d48 100644 --- a/deps/openssl/openssl/crypto/property/property.c +++ b/deps/openssl/openssl/crypto/property/property.c @@ -129,11 +129,11 @@ static const OSSL_LIB_CTX_METHOD ossl_ctx_global_properties_method = { }; OSSL_PROPERTY_LIST **ossl_ctx_global_properties(OSSL_LIB_CTX *libctx, - ossl_unused int loadconfig) + int loadconfig) { OSSL_GLOBAL_PROPERTIES *globp; -#if !defined(FIPS_MODULE) && !defined(OPENSSL_NO_AUTOLOAD_CONFIG) +#ifndef FIPS_MODULE if (loadconfig && !OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CONFIG, NULL)) return NULL; #endif @@ -513,7 +513,7 @@ int ossl_method_store_fetch(OSSL_METHOD_STORE *store, if (nid <= 0 || method == NULL || store == NULL) return 0; -#if !defined(FIPS_MODULE) && !defined(OPENSSL_NO_AUTOLOAD_CONFIG) +#ifndef FIPS_MODULE if (ossl_lib_ctx_is_default(store->ctx) && !OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CONFIG, NULL)) return 0; diff --git a/deps/openssl/openssl/crypto/property/property_parse.c b/deps/openssl/openssl/crypto/property/property_parse.c index 19ea39a78..ca2bd3338 100644 --- a/deps/openssl/openssl/crypto/property/property_parse.c +++ b/deps/openssl/openssl/crypto/property/property_parse.c @@ -1,5 +1,5 @@ /* - * Copyright 2019-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved. * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use @@ -97,18 +97,9 @@ static int parse_number(const char *t[], OSSL_PROPERTY_DEFINITION *res) const char *s = *t; int64_t v = 0; + if (!ossl_isdigit(*s)) + return 0; do { - if (!ossl_isdigit(*s)) { - ERR_raise_data(ERR_LIB_PROP, PROP_R_NOT_A_DECIMAL_DIGIT, - "HERE-->%s", *t); - return 0; - } - /* overflow check */ - if (v > ((INT64_MAX - (*s - '0')) / 10)) { - ERR_raise_data(ERR_LIB_PROP, PROP_R_PARSE_FAILED, - "Property %s overflows", *t); - return 0; - } v = v * 10 + (*s++ - '0'); } while (ossl_isdigit(*s)); if (!ossl_isspace(*s) && *s != '\0' && *s != ',') { @@ -126,27 +117,15 @@ static int parse_hex(const char *t[], OSSL_PROPERTY_DEFINITION *res) { const char *s = *t; int64_t v = 0; - int sval; + if (!ossl_isxdigit(*s)) + return 0; do { - if (ossl_isdigit(*s)) { - sval = *s - '0'; - } else if (ossl_isxdigit(*s)) { - sval = ossl_tolower(*s) - 'a' + 10; - } else { - ERR_raise_data(ERR_LIB_PROP, PROP_R_NOT_AN_HEXADECIMAL_DIGIT, - "%s", *t); - return 0; - } - - if (v > ((INT64_MAX - sval) / 16)) { - ERR_raise_data(ERR_LIB_PROP, PROP_R_PARSE_FAILED, - "Property %s overflows", *t); - return 0; - } - v <<= 4; - v += sval; + if (ossl_isdigit(*s)) + v += *s - '0'; + else + v += ossl_tolower(*s) - 'a'; } while (ossl_isxdigit(*++s)); if (!ossl_isspace(*s) && *s != '\0' && *s != ',') { ERR_raise_data(ERR_LIB_PROP, PROP_R_NOT_AN_HEXADECIMAL_DIGIT, @@ -164,18 +143,9 @@ static int parse_oct(const char *t[], OSSL_PROPERTY_DEFINITION *res) const char *s = *t; int64_t v = 0; + if (*s == '9' || *s == '8' || !ossl_isdigit(*s)) + return 0; do { - if (*s == '9' || *s == '8' || !ossl_isdigit(*s)) { - ERR_raise_data(ERR_LIB_PROP, PROP_R_NOT_AN_OCTAL_DIGIT, - "HERE-->%s", *t); - return 0; - } - if (v > ((INT64_MAX - (*s - '0')) / 8)) { - ERR_raise_data(ERR_LIB_PROP, PROP_R_PARSE_FAILED, - "Property %s overflows", *t); - return 0; - } - v = (v << 3) + (*s - '0'); } while (ossl_isdigit(*++s) && *s != '9' && *s != '8'); if (!ossl_isspace(*s) && *s != '\0' && *s != ',') { @@ -618,38 +588,15 @@ static void put_char(char ch, char **buf, size_t *remain, size_t *needed) static void put_str(const char *str, char **buf, size_t *remain, size_t *needed) { - size_t olen, len, i; - char quote = '\0'; - int quotes; + size_t olen, len; len = olen = strlen(str); *needed += len; - /* - * Check to see if we need quotes or not. - * Characters that are legal in a PropertyName don't need quoting. - * We simply assume all others require quotes. - */ - for (i = 0; i < len; i++) - if (!ossl_isalnum(str[i]) && str[i] != '.' && str[i] != '_') { - /* Default to single quotes ... */ - if (quote == '\0') - quote = '\''; - /* ... but use double quotes if a single is present */ - if (str[i] == '\'') - quote = '"'; - } - - quotes = quote != '\0'; - if (*remain == 0) { - *needed += 2 * quotes; + if (*remain == 0) return; - } - if (quotes) - put_char(quote, buf, remain, needed); - - if (*remain < len + 1 + quotes) + if (*remain < len + 1) len = *remain - 1; if (len > 0) { @@ -658,9 +605,6 @@ static void put_str(const char *str, char **buf, size_t *remain, size_t *needed) *remain -= len; } - if (quotes) - put_char(quote, buf, remain, needed); - if (len < olen && *remain == 1) { **buf = '\0'; ++*buf; diff --git a/deps/openssl/openssl/crypto/provider_conf.c b/deps/openssl/openssl/crypto/provider_conf.c index 9333b8777..c13c887c3 100644 --- a/deps/openssl/openssl/crypto/provider_conf.c +++ b/deps/openssl/openssl/crypto/provider_conf.c @@ -70,22 +70,13 @@ static const char *skip_dot(const char *name) return name; } -/* - * Parse the provider params section - * Returns: - * 1 for success - * 0 for non-fatal errors - * < 0 for fatal errors - */ -static int provider_conf_params_internal(OSSL_PROVIDER *prov, - OSSL_PROVIDER_INFO *provinfo, - const char *name, const char *value, - const CONF *cnf, - STACK_OF(OPENSSL_CSTRING) *visited) +static int provider_conf_params(OSSL_PROVIDER *prov, + OSSL_PROVIDER_INFO *provinfo, + const char *name, const char *value, + const CONF *cnf) { STACK_OF(CONF_VALUE) *sect; int ok = 1; - int rc = 0; sect = NCONF_get_section(cnf, value); if (sect != NULL) { @@ -95,25 +86,6 @@ static int provider_conf_params_internal(OSSL_PROVIDER *prov, OSSL_TRACE1(CONF, "Provider params: start section %s\n", value); - /* - * Check to see if the provided section value has already - * been visited. If it has, then we have a recursive lookup - * in the configuration which isn't valid. As such we should error - * out - */ - for (i = 0; i < sk_OPENSSL_CSTRING_num(visited); i++) { - if (sk_OPENSSL_CSTRING_value(visited, i) == value) { - ERR_raise(ERR_LIB_CONF, CONF_R_RECURSIVE_SECTION_REFERENCE); - return -1; - } - } - - /* - * We've not visited this node yet, so record it on the stack - */ - if (!sk_OPENSSL_CSTRING_push(visited, value)) - return -1; - if (name != NULL) { OPENSSL_strlcpy(buffer, name, sizeof(buffer)); OPENSSL_strlcat(buffer, ".", sizeof(buffer)); @@ -123,20 +95,14 @@ static int provider_conf_params_internal(OSSL_PROVIDER *prov, for (i = 0; i < sk_CONF_VALUE_num(sect); i++) { CONF_VALUE *sectconf = sk_CONF_VALUE_value(sect, i); - if (buffer_len + strlen(sectconf->name) >= sizeof(buffer)) { - sk_OPENSSL_CSTRING_pop(visited); - return -1; - } + if (buffer_len + strlen(sectconf->name) >= sizeof(buffer)) + return 0; buffer[buffer_len] = '\0'; OPENSSL_strlcat(buffer, sectconf->name, sizeof(buffer)); - rc = provider_conf_params_internal(prov, provinfo, buffer, - sectconf->value, cnf, visited); - if (rc < 0) { - sk_OPENSSL_CSTRING_pop(visited); - return rc; - } + if (!provider_conf_params(prov, provinfo, buffer, sectconf->value, + cnf)) + return 0; } - sk_OPENSSL_CSTRING_pop(visited); OSSL_TRACE1(CONF, "Provider params: finish section %s\n", value); } else { @@ -150,33 +116,6 @@ static int provider_conf_params_internal(OSSL_PROVIDER *prov, return ok; } -/* - * recursively parse the provider configuration section - * of the config file. - * Returns - * 1 on success - * 0 on non-fatal error - * < 0 on fatal errors - */ -static int provider_conf_params(OSSL_PROVIDER *prov, - OSSL_PROVIDER_INFO *provinfo, - const char *name, const char *value, - const CONF *cnf) -{ - int rc; - STACK_OF(OPENSSL_CSTRING) *visited = sk_OPENSSL_CSTRING_new_null(); - - if (visited == NULL) - return -1; - - rc = provider_conf_params_internal(prov, provinfo, name, - value, cnf, visited); - - sk_OPENSSL_CSTRING_free(visited); - - return rc; -} - static int prov_already_activated(const char *name, STACK_OF(OSSL_PROVIDER) *activated) { @@ -207,7 +146,6 @@ static int provider_conf_load(OSSL_LIB_CTX *libctx, const char *name, const char *path = NULL; long activate = 0; int ok = 0; - int added = 0; name = skip_dot(name); OSSL_TRACE1(CONF, "Configuring provider %s\n", name); @@ -280,7 +218,7 @@ static int provider_conf_load(OSSL_LIB_CTX *libctx, const char *name, ok = provider_conf_params(prov, NULL, NULL, value, cnf); - if (ok > 0) { + if (ok) { if (!ossl_provider_activate(prov, 1, 0)) { ok = 0; } else if (!ossl_provider_add_to_store(prov, &actual, 0)) { @@ -304,7 +242,7 @@ static int provider_conf_load(OSSL_LIB_CTX *libctx, const char *name, } } } - if (ok <= 0) + if (!ok) ossl_provider_free(prov); } CRYPTO_THREAD_unlock(pcgbl->lock); @@ -329,23 +267,19 @@ static int provider_conf_load(OSSL_LIB_CTX *libctx, const char *name, } if (ok) ok = provider_conf_params(NULL, &entry, NULL, value, cnf); - if (ok >= 1 && (entry.path != NULL || entry.parameters != NULL)) { + if (ok && (entry.path != NULL || entry.parameters != NULL)) ok = ossl_provider_info_add_to_store(libctx, &entry); - added = 1; - } - if (added == 0) + if (!ok || (entry.path == NULL && entry.parameters == NULL)) { ossl_provider_info_clear(&entry); + } + } /* - * Provider activation returns a tristate: - * 1 for successful activation - * 0 for non-fatal activation failure - * < 0 for fatal activation failure - * We return success (1) for activation, (1) for non-fatal activation - * failure, and (0) for fatal activation failure + * Even if ok is 0, we still return success. Failure to load a provider is + * not fatal. We want to continue to load the rest of the config file. */ - return ok >= 0; + return 1; } static int provider_conf_init(CONF_IMODULE *md, const CONF *cnf) @@ -368,7 +302,7 @@ static int provider_conf_init(CONF_IMODULE *md, const CONF *cnf) for (i = 0; i < sk_CONF_VALUE_num(elist); i++) { cval = sk_CONF_VALUE_value(elist, i); if (!provider_conf_load(NCONF_get0_libctx((CONF *)cnf), - cval->name, cval->value, cnf)) + cval->name, cval->value, cnf)) return 0; } diff --git a/deps/openssl/openssl/crypto/provider_core.c b/deps/openssl/openssl/crypto/provider_core.c index 4cadb6a9f..7a1232812 100644 --- a/deps/openssl/openssl/crypto/provider_core.c +++ b/deps/openssl/openssl/crypto/provider_core.c @@ -1,5 +1,5 @@ /* - * Copyright 2019-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -408,7 +408,7 @@ int ossl_provider_info_add_to_store(OSSL_LIB_CTX *libctx, } OSSL_PROVIDER *ossl_provider_find(OSSL_LIB_CTX *libctx, const char *name, - ossl_unused int noconfig) + int noconfig) { struct provider_store_st *store = NULL; OSSL_PROVIDER *prov = NULL; @@ -417,7 +417,7 @@ OSSL_PROVIDER *ossl_provider_find(OSSL_LIB_CTX *libctx, const char *name, OSSL_PROVIDER tmpl = { 0, }; int i; -#if !defined(FIPS_MODULE) && !defined(OPENSSL_NO_AUTOLOAD_CONFIG) +#ifndef FIPS_MODULE /* * Make sure any providers are loaded from config before we try to find * them. @@ -936,46 +936,44 @@ static int provider_init(OSSL_PROVIDER *prov) prov->provctx = tmp_provctx; prov->dispatch = provider_dispatch; - if (provider_dispatch != NULL) { - for (; provider_dispatch->function_id != 0; provider_dispatch++) { - switch (provider_dispatch->function_id) { - case OSSL_FUNC_PROVIDER_TEARDOWN: - prov->teardown = - OSSL_FUNC_provider_teardown(provider_dispatch); - break; - case OSSL_FUNC_PROVIDER_GETTABLE_PARAMS: - prov->gettable_params = - OSSL_FUNC_provider_gettable_params(provider_dispatch); - break; - case OSSL_FUNC_PROVIDER_GET_PARAMS: - prov->get_params = - OSSL_FUNC_provider_get_params(provider_dispatch); - break; - case OSSL_FUNC_PROVIDER_SELF_TEST: - prov->self_test = - OSSL_FUNC_provider_self_test(provider_dispatch); - break; - case OSSL_FUNC_PROVIDER_GET_CAPABILITIES: - prov->get_capabilities = - OSSL_FUNC_provider_get_capabilities(provider_dispatch); - break; - case OSSL_FUNC_PROVIDER_QUERY_OPERATION: - prov->query_operation = - OSSL_FUNC_provider_query_operation(provider_dispatch); - break; - case OSSL_FUNC_PROVIDER_UNQUERY_OPERATION: - prov->unquery_operation = - OSSL_FUNC_provider_unquery_operation(provider_dispatch); - break; + for (; provider_dispatch->function_id != 0; provider_dispatch++) { + switch (provider_dispatch->function_id) { + case OSSL_FUNC_PROVIDER_TEARDOWN: + prov->teardown = + OSSL_FUNC_provider_teardown(provider_dispatch); + break; + case OSSL_FUNC_PROVIDER_GETTABLE_PARAMS: + prov->gettable_params = + OSSL_FUNC_provider_gettable_params(provider_dispatch); + break; + case OSSL_FUNC_PROVIDER_GET_PARAMS: + prov->get_params = + OSSL_FUNC_provider_get_params(provider_dispatch); + break; + case OSSL_FUNC_PROVIDER_SELF_TEST: + prov->self_test = + OSSL_FUNC_provider_self_test(provider_dispatch); + break; + case OSSL_FUNC_PROVIDER_GET_CAPABILITIES: + prov->get_capabilities = + OSSL_FUNC_provider_get_capabilities(provider_dispatch); + break; + case OSSL_FUNC_PROVIDER_QUERY_OPERATION: + prov->query_operation = + OSSL_FUNC_provider_query_operation(provider_dispatch); + break; + case OSSL_FUNC_PROVIDER_UNQUERY_OPERATION: + prov->unquery_operation = + OSSL_FUNC_provider_unquery_operation(provider_dispatch); + break; #ifndef OPENSSL_NO_ERR # ifndef FIPS_MODULE - case OSSL_FUNC_PROVIDER_GET_REASON_STRINGS: - p_get_reason_strings = - OSSL_FUNC_provider_get_reason_strings(provider_dispatch); - break; + case OSSL_FUNC_PROVIDER_GET_REASON_STRINGS: + p_get_reason_strings = + OSSL_FUNC_provider_get_reason_strings(provider_dispatch); + break; # endif #endif - } } } @@ -1358,7 +1356,7 @@ int ossl_provider_doall_activated(OSSL_LIB_CTX *ctx, struct provider_store_st *store = get_provider_store(ctx); STACK_OF(OSSL_PROVIDER) *provs = NULL; -#if !defined(FIPS_MODULE) && !defined(OPENSSL_NO_AUTOLOAD_CONFIG) +#ifndef FIPS_MODULE /* * Make sure any providers are loaded from config before we try to use * them. diff --git a/deps/openssl/openssl/crypto/rand/rand_lib.c b/deps/openssl/openssl/crypto/rand/rand_lib.c index 5fde21444..0fcf4fe3b 100644 --- a/deps/openssl/openssl/crypto/rand/rand_lib.c +++ b/deps/openssl/openssl/crypto/rand/rand_lib.c @@ -120,8 +120,6 @@ void RAND_keep_random_devices_open(int keep) */ int RAND_poll(void) { - static const char salt[] = "polling"; - # ifndef OPENSSL_NO_DEPRECATED_3_0 const RAND_METHOD *meth = RAND_get_rand_method(); int ret = meth == RAND_OpenSSL(); @@ -150,12 +148,14 @@ int RAND_poll(void) ret = 1; err: ossl_rand_pool_free(pool); - return ret; } -# endif + return ret; +# else + static const char salt[] = "polling"; RAND_seed(salt, sizeof(salt)); return 1; +# endif } # ifndef OPENSSL_NO_DEPRECATED_3_0 diff --git a/deps/openssl/openssl/crypto/rc4/build.info b/deps/openssl/openssl/crypto/rc4/build.info index c9c81f87d..68b3c73f5 100644 --- a/deps/openssl/openssl/crypto/rc4/build.info +++ b/deps/openssl/openssl/crypto/rc4/build.info @@ -21,15 +21,10 @@ SOURCE[../../libcrypto]=$RC4ASM # When all deprecated symbols are removed, libcrypto doesn't export the # rc4 functions, so we must include them directly in liblegacy.a -IF[{- !$disabled{module} && !$disabled{shared} -}] +IF[{- $disabled{'deprecated-3.0'} && !$disabled{module} && !$disabled{shared} -}] SOURCE[../../providers/liblegacy.a]=$RC4ASM ENDIF -# Implementations are now spread across several libraries, so the defines -# need to be applied to all affected libraries and modules. -DEFINE[../../libcrypto]=$RC4DEF -DEFINE[../../providers/liblegacy.a]=$RC4DEF - GENERATE[rc4-586.S]=asm/rc4-586.pl DEPEND[rc4-586.S]=../perlasm/x86asm.pl diff --git a/deps/openssl/openssl/crypto/rsa/rsa_ameth.c b/deps/openssl/openssl/crypto/rsa/rsa_ameth.c index 07734077e..61ec53d42 100644 --- a/deps/openssl/openssl/crypto/rsa/rsa_ameth.c +++ b/deps/openssl/openssl/crypto/rsa/rsa_ameth.c @@ -1,5 +1,5 @@ /* - * Copyright 2006-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2006-2022 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -60,16 +60,13 @@ static int rsa_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey) if (!rsa_param_encode(pkey, &str, &strtype)) return 0; penclen = i2d_RSAPublicKey(pkey->pkey.rsa, &penc); - if (penclen <= 0) { - ASN1_STRING_free(str); + if (penclen <= 0) return 0; - } if (X509_PUBKEY_set0_param(pk, OBJ_nid2obj(pkey->ameth->pkey_id), strtype, str, penc, penclen)) return 1; OPENSSL_free(penc); - ASN1_STRING_free(str); return 0; } @@ -644,36 +641,6 @@ static int rsa_item_sign(EVP_MD_CTX *ctx, const ASN1_ITEM *it, const void *asn, size_t aid_len = 0; OSSL_PARAM params[2]; - if (evp_pkey_ctx_is_legacy(pkctx)) { - /* No provider -> we cannot query it for algorithm ID. */ - ASN1_STRING *os1 = NULL; - - os1 = ossl_rsa_ctx_to_pss_string(pkctx); - if (os1 == NULL) - return 0; - /* Duplicate parameters if we have to */ - if (alg2 != NULL) { - ASN1_STRING *os2 = ASN1_STRING_dup(os1); - - if (os2 == NULL) { - ASN1_STRING_free(os1); - return 0; - } - if (!X509_ALGOR_set0(alg2, OBJ_nid2obj(EVP_PKEY_RSA_PSS), - V_ASN1_SEQUENCE, os2)) { - ASN1_STRING_free(os1); - ASN1_STRING_free(os2); - return 0; - } - } - if (!X509_ALGOR_set0(alg1, OBJ_nid2obj(EVP_PKEY_RSA_PSS), - V_ASN1_SEQUENCE, os1)) { - ASN1_STRING_free(os1); - return 0; - } - return 3; - } - params[0] = OSSL_PARAM_construct_octet_string( OSSL_SIGNATURE_PARAM_ALGORITHM_ID, aid, sizeof(aid)); params[1] = OSSL_PARAM_construct_end(); @@ -685,13 +652,11 @@ static int rsa_item_sign(EVP_MD_CTX *ctx, const ASN1_ITEM *it, const void *asn, if (alg1 != NULL) { const unsigned char *pp = aid; - if (d2i_X509_ALGOR(&alg1, &pp, aid_len) == NULL) return 0; } if (alg2 != NULL) { const unsigned char *pp = aid; - if (d2i_X509_ALGOR(&alg2, &pp, aid_len) == NULL) return 0; } diff --git a/deps/openssl/openssl/crypto/rsa/rsa_backend.c b/deps/openssl/openssl/crypto/rsa/rsa_backend.c index f9d1cb361..58187fa2e 100644 --- a/deps/openssl/openssl/crypto/rsa/rsa_backend.c +++ b/deps/openssl/openssl/crypto/rsa/rsa_backend.c @@ -1,5 +1,5 @@ /* - * Copyright 2020-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2020-2022 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -141,6 +141,18 @@ int ossl_rsa_todata(RSA *rsa, OSSL_PARAM_BLD *bld, OSSL_PARAM params[], /* Check private key data integrity */ if (include_private && rsa_d != NULL) { + int numprimes = sk_BIGNUM_const_num(factors); + int numexps = sk_BIGNUM_const_num(exps); + int numcoeffs = sk_BIGNUM_const_num(coeffs); + + /* + * It's permissible to have zero primes, i.e. no CRT params. + * Otherwise, there must be at least two, as many exponents, + * and one coefficient less. + */ + if (numprimes != 0 + && (numprimes < 2 || numexps < 2 || numcoeffs < 1)) + goto err; if (!ossl_param_build_set_bn(bld, params, OSSL_PKEY_PARAM_RSA_D, rsa_d) diff --git a/deps/openssl/openssl/crypto/rsa/rsa_lib.c b/deps/openssl/openssl/crypto/rsa/rsa_lib.c index c9c661b1e..449097b8b 100644 --- a/deps/openssl/openssl/crypto/rsa/rsa_lib.c +++ b/deps/openssl/openssl/crypto/rsa/rsa_lib.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -753,22 +753,18 @@ int ossl_rsa_set0_all_params(RSA *r, const STACK_OF(BIGNUM) *primes, return 0; pnum = sk_BIGNUM_num(primes); - if (pnum < 2) + if (pnum < 2 + || pnum != sk_BIGNUM_num(exps) + || pnum != sk_BIGNUM_num(coeffs) + 1) return 0; if (!RSA_set0_factors(r, sk_BIGNUM_value(primes, 0), - sk_BIGNUM_value(primes, 1))) + sk_BIGNUM_value(primes, 1)) + || !RSA_set0_crt_params(r, sk_BIGNUM_value(exps, 0), + sk_BIGNUM_value(exps, 1), + sk_BIGNUM_value(coeffs, 0))) return 0; - if (pnum == sk_BIGNUM_num(exps) - && pnum == sk_BIGNUM_num(coeffs) + 1) { - - if (!RSA_set0_crt_params(r, sk_BIGNUM_value(exps, 0), - sk_BIGNUM_value(exps, 1), - sk_BIGNUM_value(coeffs, 0))) - return 0; - } - #ifndef FIPS_MODULE old_infos = r->prime_infos; #endif @@ -999,10 +995,6 @@ int EVP_PKEY_CTX_set_rsa_pss_keygen_md_name(EVP_PKEY_CTX *ctx, */ int EVP_PKEY_CTX_set_rsa_oaep_md(EVP_PKEY_CTX *ctx, const EVP_MD *md) { - /* If key type not RSA return error */ - if (!EVP_PKEY_CTX_is_a(ctx, "RSA")) - return -1; - return EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, EVP_PKEY_OP_TYPE_CRYPT, EVP_PKEY_CTRL_RSA_OAEP_MD, 0, (void *)(md)); } @@ -1030,10 +1022,6 @@ int EVP_PKEY_CTX_get_rsa_oaep_md_name(EVP_PKEY_CTX *ctx, char *name, */ int EVP_PKEY_CTX_get_rsa_oaep_md(EVP_PKEY_CTX *ctx, const EVP_MD **md) { - /* If key type not RSA return error */ - if (!EVP_PKEY_CTX_is_a(ctx, "RSA")) - return -1; - return EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, EVP_PKEY_OP_TYPE_CRYPT, EVP_PKEY_CTRL_GET_RSA_OAEP_MD, 0, (void *)md); } @@ -1096,12 +1084,6 @@ int EVP_PKEY_CTX_get_rsa_mgf1_md(EVP_PKEY_CTX *ctx, const EVP_MD **md) int EVP_PKEY_CTX_set0_rsa_oaep_label(EVP_PKEY_CTX *ctx, void *label, int llen) { OSSL_PARAM rsa_params[2], *p = rsa_params; - const char *empty = ""; - /* - * Needed as we swap label with empty if it is NULL, and label is - * freed at the end of this function. - */ - void *plabel = label; int ret; if (ctx == NULL || !EVP_PKEY_CTX_IS_ASYM_CIPHER_OP(ctx)) { @@ -1114,13 +1096,9 @@ int EVP_PKEY_CTX_set0_rsa_oaep_label(EVP_PKEY_CTX *ctx, void *label, int llen) if (!EVP_PKEY_CTX_is_a(ctx, "RSA")) return -1; - /* Accept NULL for backward compatibility */ - if (label == NULL && llen == 0) - plabel = (void *)empty; - /* Cast away the const. This is read only so should be safe */ *p++ = OSSL_PARAM_construct_octet_string(OSSL_ASYM_CIPHER_PARAM_OAEP_LABEL, - (void *)plabel, (size_t)llen); + (void *)label, (size_t)llen); *p++ = OSSL_PARAM_construct_end(); ret = evp_pkey_ctx_set_params_strict(ctx, rsa_params); diff --git a/deps/openssl/openssl/crypto/rsa/rsa_pmeth.c b/deps/openssl/openssl/crypto/rsa/rsa_pmeth.c index 0bf5ac098..44c819a5c 100644 --- a/deps/openssl/openssl/crypto/rsa/rsa_pmeth.c +++ b/deps/openssl/openssl/crypto/rsa/rsa_pmeth.c @@ -1,5 +1,5 @@ /* - * Copyright 2006-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2006-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -584,10 +584,6 @@ static int pkey_rsa_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2) ERR_raise(ERR_LIB_RSA, RSA_R_INVALID_PADDING_MODE); return -2; } - if (p2 == NULL) { - ERR_raise(ERR_LIB_EVP, ERR_R_PASSED_NULL_PARAMETER); - return 0; - } *(unsigned char **)p2 = rctx->oaep_label; return rctx->oaep_labellen; diff --git a/deps/openssl/openssl/crypto/rsa/rsa_sp800_56b_check.c b/deps/openssl/openssl/crypto/rsa/rsa_sp800_56b_check.c index df81397f5..bcbdd24fb 100644 --- a/deps/openssl/openssl/crypto/rsa/rsa_sp800_56b_check.c +++ b/deps/openssl/openssl/crypto/rsa/rsa_sp800_56b_check.c @@ -1,5 +1,5 @@ /* - * Copyright 2018-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2018-2021 The OpenSSL Project Authors. All Rights Reserved. * Copyright (c) 2018-2019, Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use diff --git a/deps/openssl/openssl/crypto/sha/asm/keccak1600-avx2.pl b/deps/openssl/openssl/crypto/sha/asm/keccak1600-avx2.pl index 864066533..84682289b 100755 --- a/deps/openssl/openssl/crypto/sha/asm/keccak1600-avx2.pl +++ b/deps/openssl/openssl/crypto/sha/asm/keccak1600-avx2.pl @@ -1,5 +1,5 @@ #!/usr/bin/env perl -# Copyright 2017-2023 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2017-2020 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the Apache License 2.0 (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -432,7 +432,6 @@ $code.=<<___; ret .size SHA3_squeeze,.-SHA3_squeeze -.section .rodata .align 64 rhotates_left: .quad 3, 18, 36, 41 # [2][0] [4][0] [1][0] [3][0] diff --git a/deps/openssl/openssl/crypto/sha/asm/keccak1600-avx512.pl b/deps/openssl/openssl/crypto/sha/asm/keccak1600-avx512.pl index efc32545c..85d6e7ffe 100755 --- a/deps/openssl/openssl/crypto/sha/asm/keccak1600-avx512.pl +++ b/deps/openssl/openssl/crypto/sha/asm/keccak1600-avx512.pl @@ -1,5 +1,5 @@ #!/usr/bin/env perl -# Copyright 2017-2023 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2017-2020 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the Apache License 2.0 (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -486,7 +486,6 @@ SHA3_squeeze: ret .size SHA3_squeeze,.-SHA3_squeeze -.section .rodata .align 64 theta_perm: .quad 0, 1, 2, 3, 4, 5, 6, 7 # [not used] diff --git a/deps/openssl/openssl/crypto/sha/asm/keccak1600-avx512vl.pl b/deps/openssl/openssl/crypto/sha/asm/keccak1600-avx512vl.pl index f941556b4..73e75f363 100755 --- a/deps/openssl/openssl/crypto/sha/asm/keccak1600-avx512vl.pl +++ b/deps/openssl/openssl/crypto/sha/asm/keccak1600-avx512vl.pl @@ -1,5 +1,5 @@ #!/usr/bin/env perl -# Copyright 2017-2023 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2017-2020 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the Apache License 2.0 (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -349,7 +349,6 @@ $code.=<<___; ret .size SHA3_squeeze,.-SHA3_squeeze -.section .rodata .align 64 rhotates_left: .quad 3, 18, 36, 41 # [2][0] [4][0] [1][0] [3][0] diff --git a/deps/openssl/openssl/crypto/srp/srp_vfy.c b/deps/openssl/openssl/crypto/srp/srp_vfy.c index 96d511ffe..e8beb60d2 100644 --- a/deps/openssl/openssl/crypto/srp/srp_vfy.c +++ b/deps/openssl/openssl/crypto/srp/srp_vfy.c @@ -1,5 +1,5 @@ /* - * Copyright 2004-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2004-2021 The OpenSSL Project Authors. All Rights Reserved. * Copyright (c) 2004, EdelKey Project. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use @@ -283,7 +283,6 @@ SRP_VBASE *SRP_VBASE_new(char *seed_key) return NULL; if ((vb->users_pwd = sk_SRP_user_pwd_new_null()) == NULL || (vb->gN_cache = sk_SRP_gN_cache_new_null()) == NULL) { - sk_SRP_user_pwd_free(vb->users_pwd); OPENSSL_free(vb); return NULL; } diff --git a/deps/openssl/openssl/crypto/store/store_lib.c b/deps/openssl/openssl/crypto/store/store_lib.c index bc12d8dd1..5ff927862 100644 --- a/deps/openssl/openssl/crypto/store/store_lib.c +++ b/deps/openssl/openssl/crypto/store/store_lib.c @@ -1,5 +1,5 @@ /* - * Copyright 2016-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2016-2022 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -424,14 +424,14 @@ OSSL_STORE_INFO *OSSL_STORE_load(OSSL_STORE_CTX *ctx) load_data.v = NULL; load_data.ctx = ctx; - ctx->error_flag = 0; if (!ctx->fetched_loader->p_load(ctx->loader_ctx, ossl_store_handle_load_result, &load_data, ossl_pw_passphrase_callback_dec, &ctx->pwdata)) { - ctx->error_flag = 1; + if (!OSSL_STORE_eof(ctx)) + ctx->error_flag = 1; return NULL; } v = load_data.v; diff --git a/deps/openssl/openssl/crypto/store/store_result.c b/deps/openssl/openssl/crypto/store/store_result.c index bbc8f6fef..96d311990 100644 --- a/deps/openssl/openssl/crypto/store/store_result.c +++ b/deps/openssl/openssl/crypto/store/store_result.c @@ -1,5 +1,5 @@ /* - * Copyright 2020-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2020-2022 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -553,10 +553,8 @@ static int try_pkcs12(struct extracted_param_data_st *data, OSSL_STORE_INFO **v, ok = 0; /* Assume decryption or parse error */ - if (!PKCS12_mac_present(p12) + if (PKCS12_verify_mac(p12, "", 0) || PKCS12_verify_mac(p12, NULL, 0)) { - pass = NULL; - } else if (PKCS12_verify_mac(p12, "", 0)) { pass = ""; } else { static char prompt_info[] = "PKCS12 import pass phrase"; diff --git a/deps/openssl/openssl/crypto/threads_pthread.c b/deps/openssl/openssl/crypto/threads_pthread.c index 801855c93..bfc05a4e8 100644 --- a/deps/openssl/openssl/crypto/threads_pthread.c +++ b/deps/openssl/openssl/crypto/threads_pthread.c @@ -1,5 +1,5 @@ /* - * Copyright 2016-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2016-2022 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -72,6 +72,8 @@ CRYPTO_RWLOCK *CRYPTO_THREAD_lock_new(void) # if !defined (__TANDEM) && !defined (_SPT_MODEL_) # if !defined(NDEBUG) && !defined(OPENSSL_NO_MUTEX_ERRORCHECK) pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK); +# else + pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_NORMAL); # endif # else /* The SPT Thread Library does not define MUTEX attributes. */ diff --git a/deps/openssl/openssl/crypto/x509/by_dir.c b/deps/openssl/openssl/crypto/x509/by_dir.c index ad871966a..cb40c7737 100644 --- a/deps/openssl/openssl/crypto/x509/by_dir.c +++ b/deps/openssl/openssl/crypto/x509/by_dir.c @@ -348,8 +348,7 @@ static int get_cert_by_subject_ex(X509_LOOKUP *xl, X509_LOOKUP_TYPE type, /* * we have added it to the cache so now pull it out again */ - if (!X509_STORE_lock(xl->store_ctx)) - goto finish; + X509_STORE_lock(xl->store_ctx); j = sk_X509_OBJECT_find(xl->store_ctx->objs, &stmp); tmp = sk_X509_OBJECT_value(xl->store_ctx->objs, j); X509_STORE_unlock(xl->store_ctx); diff --git a/deps/openssl/openssl/crypto/x509/t_req.c b/deps/openssl/openssl/crypto/x509/t_req.c index 63626c0d9..095c16510 100644 --- a/deps/openssl/openssl/crypto/x509/t_req.c +++ b/deps/openssl/openssl/crypto/x509/t_req.c @@ -42,15 +42,15 @@ int X509_REQ_print_ex(BIO *bp, X509_REQ *x, unsigned long nmflags, EVP_PKEY *pkey; STACK_OF(X509_EXTENSION) *exts; char mlch = ' '; - int nmindent = 0, printok = 0; + int nmindent = 0; if ((nmflags & XN_FLAG_SEP_MASK) == XN_FLAG_SEP_MULTILINE) { mlch = '\n'; nmindent = 12; } - if (nmflags == XN_FLAG_COMPAT) - printok = 1; + if (nmflags == X509_FLAG_COMPAT) + nmindent = 16; if (!(cflag & X509_FLAG_NO_HEADER)) { if (BIO_write(bp, "Certificate Request:\n", 21) <= 0) @@ -72,7 +72,7 @@ int X509_REQ_print_ex(BIO *bp, X509_REQ *x, unsigned long nmflags, if (BIO_printf(bp, " Subject:%c", mlch) <= 0) goto err; if (X509_NAME_print_ex(bp, X509_REQ_get_subject_name(x), - nmindent, nmflags) < printok) + nmindent, nmflags) < 0) goto err; if (BIO_write(bp, "\n", 1) <= 0) goto err; diff --git a/deps/openssl/openssl/crypto/x509/t_x509.c b/deps/openssl/openssl/crypto/x509/t_x509.c index 5b0282bc1..95ee5f519 100644 --- a/deps/openssl/openssl/crypto/x509/t_x509.c +++ b/deps/openssl/openssl/crypto/x509/t_x509.c @@ -60,8 +60,10 @@ int X509_print_ex(BIO *bp, X509 *x, unsigned long nmflags, nmindent = 12; } - if (nmflags == XN_FLAG_COMPAT) + if (nmflags == X509_FLAG_COMPAT) { + nmindent = 16; printok = 1; + } if (!(cflag & X509_FLAG_NO_HEADER)) { if (BIO_write(bp, "Certificate:\n", 13) <= 0) diff --git a/deps/openssl/openssl/crypto/x509/v3_addr.c b/deps/openssl/openssl/crypto/x509/v3_addr.c index 4930f3312..db0107207 100644 --- a/deps/openssl/openssl/crypto/x509/v3_addr.c +++ b/deps/openssl/openssl/crypto/x509/v3_addr.c @@ -1,5 +1,5 @@ /* - * Copyright 2006-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2006-2022 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -972,10 +972,6 @@ static void *v2i_IPAddrBlocks(const struct v3_ext_method *method, * the other input values. */ if (safi != NULL) { - if (val->value == NULL) { - ERR_raise(ERR_LIB_X509V3, X509V3_R_MISSING_VALUE); - goto err; - } *safi = strtoul(val->value, &t, 0); t += strspn(t, " \t"); if (*safi > 0xFF || *t++ != ':') { diff --git a/deps/openssl/openssl/crypto/x509/v3_asid.c b/deps/openssl/openssl/crypto/x509/v3_asid.c index c2b6f8a66..86577d6ca 100644 --- a/deps/openssl/openssl/crypto/x509/v3_asid.c +++ b/deps/openssl/openssl/crypto/x509/v3_asid.c @@ -1,5 +1,5 @@ /* - * Copyright 2006-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2006-2022 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -169,11 +169,8 @@ int X509v3_asid_add_inherit(ASIdentifiers *asid, int which) if (*choice == NULL) { if ((*choice = ASIdentifierChoice_new()) == NULL) return 0; - if (((*choice)->u.inherit = ASN1_NULL_new()) == NULL) { - ASIdentifierChoice_free(*choice); - *choice = NULL; + if (((*choice)->u.inherit = ASN1_NULL_new()) == NULL) return 0; - } (*choice)->type = ASIdentifierChoice_inherit; } return (*choice)->type == ASIdentifierChoice_inherit; @@ -199,23 +196,18 @@ int X509v3_asid_add_id_or_range(ASIdentifiers *asid, default: return 0; } - if (*choice != NULL && (*choice)->type != ASIdentifierChoice_asIdsOrRanges) + if (*choice != NULL && (*choice)->type == ASIdentifierChoice_inherit) return 0; if (*choice == NULL) { if ((*choice = ASIdentifierChoice_new()) == NULL) return 0; (*choice)->u.asIdsOrRanges = sk_ASIdOrRange_new(ASIdOrRange_cmp); - if ((*choice)->u.asIdsOrRanges == NULL) { - ASIdentifierChoice_free(*choice); - *choice = NULL; + if ((*choice)->u.asIdsOrRanges == NULL) return 0; - } (*choice)->type = ASIdentifierChoice_asIdsOrRanges; } if ((aor = ASIdOrRange_new()) == NULL) return 0; - if (!sk_ASIdOrRange_reserve((*choice)->u.asIdsOrRanges, 1)) - goto err; if (max == NULL) { aor->type = ASIdOrRange_id; aor->u.id = min; @@ -228,8 +220,7 @@ int X509v3_asid_add_id_or_range(ASIdentifiers *asid, ASN1_INTEGER_free(aor->u.range->max); aor->u.range->max = max; } - /* Cannot fail due to the reservation above */ - if (!ossl_assert(sk_ASIdOrRange_push((*choice)->u.asIdsOrRanges, aor))) + if (!(sk_ASIdOrRange_push((*choice)->u.asIdsOrRanges, aor))) goto err; return 1; @@ -547,11 +538,6 @@ static void *v2i_ASIdentifiers(const struct v3_ext_method *method, goto err; } - if (val->value == NULL) { - ERR_raise(ERR_LIB_X509V3, X509V3_R_EXTENSION_VALUE_ERROR); - goto err; - } - /* * Handle inheritance. */ diff --git a/deps/openssl/openssl/crypto/x509/v3_crld.c b/deps/openssl/openssl/crypto/x509/v3_crld.c index 07c8379d3..0289df4de 100644 --- a/deps/openssl/openssl/crypto/x509/v3_crld.c +++ b/deps/openssl/openssl/crypto/x509/v3_crld.c @@ -1,5 +1,5 @@ /* - * Copyright 1999-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1999-2022 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -70,11 +70,6 @@ static int set_dist_point_name(DIST_POINT_NAME **pdp, X509V3_CTX *ctx, STACK_OF(GENERAL_NAME) *fnm = NULL; STACK_OF(X509_NAME_ENTRY) *rnm = NULL; - if (cnf->value == NULL) { - ERR_raise(ERR_LIB_X509V3, X509V3_R_MISSING_VALUE); - goto err; - } - if (strncmp(cnf->name, "fullname", 9) == 0) { fnm = gnames_from_sectname(ctx, cnf->value); if (!fnm) diff --git a/deps/openssl/openssl/crypto/x509/v3_ist.c b/deps/openssl/openssl/crypto/x509/v3_ist.c index 96c40a396..0de281f66 100644 --- a/deps/openssl/openssl/crypto/x509/v3_ist.c +++ b/deps/openssl/openssl/crypto/x509/v3_ist.c @@ -1,5 +1,5 @@ /* - * Copyright 2020-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -50,46 +50,43 @@ static ISSUER_SIGN_TOOL *v2i_issuer_sign_tool(X509V3_EXT_METHOD *method, X509V3_ } if (strcmp(cnf->name, "signTool") == 0) { ist->signTool = ASN1_UTF8STRING_new(); - if (ist->signTool == NULL - || cnf->value == NULL - || !ASN1_STRING_set(ist->signTool, cnf->value, strlen(cnf->value))) { + if (ist->signTool == NULL) { ERR_raise(ERR_LIB_X509V3, ERR_R_MALLOC_FAILURE); - goto err; + ISSUER_SIGN_TOOL_free(ist); + return NULL; } + ASN1_STRING_set(ist->signTool, cnf->value, strlen(cnf->value)); } else if (strcmp(cnf->name, "cATool") == 0) { ist->cATool = ASN1_UTF8STRING_new(); - if (ist->cATool == NULL - || cnf->value == NULL - || !ASN1_STRING_set(ist->cATool, cnf->value, strlen(cnf->value))) { + if (ist->cATool == NULL) { ERR_raise(ERR_LIB_X509V3, ERR_R_MALLOC_FAILURE); - goto err; + ISSUER_SIGN_TOOL_free(ist); + return NULL; } + ASN1_STRING_set(ist->cATool, cnf->value, strlen(cnf->value)); } else if (strcmp(cnf->name, "signToolCert") == 0) { ist->signToolCert = ASN1_UTF8STRING_new(); - if (ist->signToolCert == NULL - || cnf->value == NULL - || !ASN1_STRING_set(ist->signToolCert, cnf->value, strlen(cnf->value))) { + if (ist->signToolCert == NULL) { ERR_raise(ERR_LIB_X509V3, ERR_R_MALLOC_FAILURE); - goto err; + ISSUER_SIGN_TOOL_free(ist); + return NULL; } + ASN1_STRING_set(ist->signToolCert, cnf->value, strlen(cnf->value)); } else if (strcmp(cnf->name, "cAToolCert") == 0) { ist->cAToolCert = ASN1_UTF8STRING_new(); - if (ist->cAToolCert == NULL - || cnf->value == NULL - || !ASN1_STRING_set(ist->cAToolCert, cnf->value, strlen(cnf->value))) { + if (ist->cAToolCert == NULL) { ERR_raise(ERR_LIB_X509V3, ERR_R_MALLOC_FAILURE); - goto err; + ISSUER_SIGN_TOOL_free(ist); + return NULL; } + ASN1_STRING_set(ist->cAToolCert, cnf->value, strlen(cnf->value)); } else { ERR_raise(ERR_LIB_X509V3, ERR_R_PASSED_INVALID_ARGUMENT); - goto err; + ISSUER_SIGN_TOOL_free(ist); + return NULL; } } return ist; - -err: - ISSUER_SIGN_TOOL_free(ist); - return NULL; } static int i2r_issuer_sign_tool(X509V3_EXT_METHOD *method, diff --git a/deps/openssl/openssl/crypto/x509/v3_purp.c b/deps/openssl/openssl/crypto/x509/v3_purp.c index 646118917..a6ebbd5f9 100644 --- a/deps/openssl/openssl/crypto/x509/v3_purp.c +++ b/deps/openssl/openssl/crypto/x509/v3_purp.c @@ -1,5 +1,5 @@ /* - * Copyright 1999-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1999-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -438,7 +438,7 @@ int ossl_x509v3_cache_extensions(X509 *x) * in case ctx->param->flags & X509_V_FLAG_X509_STRICT */ if (bs->pathlen->type == V_ASN1_NEG_INTEGER) { - ERR_raise(ERR_LIB_X509V3, X509V3_R_NEGATIVE_PATHLEN); + ERR_raise(ERR_LIB_X509, X509V3_R_NEGATIVE_PATHLEN); x->ex_flags |= EXFLAG_INVALID; } else { x->ex_pathlen = ASN1_INTEGER_get(bs->pathlen); @@ -479,7 +479,7 @@ int ossl_x509v3_cache_extensions(X509 *x) ASN1_BIT_STRING_free(usage); /* Check for empty key usage according to RFC 5280 section 4.2.1.3 */ if (x->ex_kusage == 0) { - ERR_raise(ERR_LIB_X509V3, X509V3_R_EMPTY_KEY_USAGE); + ERR_raise(ERR_LIB_X509, X509V3_R_EMPTY_KEY_USAGE); x->ex_flags |= EXFLAG_INVALID; } } else if (i != -1) { @@ -632,7 +632,7 @@ int ossl_x509v3_cache_extensions(X509 *x) return 1; } if ((x->ex_flags & EXFLAG_INVALID) != 0) - ERR_raise(ERR_LIB_X509V3, X509V3_R_INVALID_CERTIFICATE); + ERR_raise(ERR_LIB_X509, X509V3_R_INVALID_CERTIFICATE); /* If computing sha1_hash failed the error queue already reflects this. */ err: diff --git a/deps/openssl/openssl/crypto/x509/v3_san.c b/deps/openssl/openssl/crypto/x509/v3_san.c index 34ca16a6d..c081f02e1 100644 --- a/deps/openssl/openssl/crypto/x509/v3_san.c +++ b/deps/openssl/openssl/crypto/x509/v3_san.c @@ -581,8 +581,6 @@ GENERAL_NAME *a2i_GENERAL_NAME(GENERAL_NAME *out, if ((gen->d.ia5 = ASN1_IA5STRING_new()) == NULL || !ASN1_STRING_set(gen->d.ia5, (unsigned char *)value, strlen(value))) { - ASN1_IA5STRING_free(gen->d.ia5); - gen->d.ia5 = NULL; ERR_raise(ERR_LIB_X509V3, ERR_R_MALLOC_FAILURE); goto err; } @@ -653,21 +651,16 @@ static int do_othername(GENERAL_NAME *gen, const char *value, X509V3_CTX *ctx) */ ASN1_TYPE_free(gen->d.otherName->value); if ((gen->d.otherName->value = ASN1_generate_v3(p + 1, ctx)) == NULL) - goto err; + return 0; objlen = p - value; objtmp = OPENSSL_strndup(value, objlen); if (objtmp == NULL) - goto err; + return 0; gen->d.otherName->type_id = OBJ_txt2obj(objtmp, 0); OPENSSL_free(objtmp); if (!gen->d.otherName->type_id) - goto err; + return 0; return 1; - - err: - OTHERNAME_free(gen->d.otherName); - gen->d.otherName = NULL; - return 0; } static int do_dirname(GENERAL_NAME *gen, const char *value, X509V3_CTX *ctx) diff --git a/deps/openssl/openssl/crypto/x509/v3_sxnet.c b/deps/openssl/openssl/crypto/x509/v3_sxnet.c index 70f5db636..ca46dc1a5 100644 --- a/deps/openssl/openssl/crypto/x509/v3_sxnet.c +++ b/deps/openssl/openssl/crypto/x509/v3_sxnet.c @@ -1,5 +1,5 @@ /* - * Copyright 1999-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1999-2022 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -103,10 +103,8 @@ static SXNET *sxnet_v2i(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, int i; for (i = 0; i < sk_CONF_VALUE_num(nval); i++) { cnf = sk_CONF_VALUE_value(nval, i); - if (!SXNET_add_id_asc(&sx, cnf->name, cnf->value, -1)) { - SXNET_free(sx); + if (!SXNET_add_id_asc(&sx, cnf->name, cnf->value, -1)) return NULL; - } } return sx; } @@ -125,11 +123,7 @@ int SXNET_add_id_asc(SXNET **psx, const char *zone, const char *user, int userle ERR_raise(ERR_LIB_X509V3, X509V3_R_ERROR_CONVERTING_ZONE); return 0; } - if (!SXNET_add_id_INTEGER(psx, izone, user, userlen)) { - ASN1_INTEGER_free(izone); - return 0; - } - return 1; + return SXNET_add_id_INTEGER(psx, izone, user, userlen); } /* Add an id given the zone as an unsigned long */ @@ -145,11 +139,8 @@ int SXNET_add_id_ulong(SXNET **psx, unsigned long lzone, const char *user, ASN1_INTEGER_free(izone); return 0; } - if (!SXNET_add_id_INTEGER(psx, izone, user, userlen)) { - ASN1_INTEGER_free(izone); - return 0; - } - return 1; + return SXNET_add_id_INTEGER(psx, izone, user, userlen); + } /* @@ -196,7 +187,6 @@ int SXNET_add_id_INTEGER(SXNET **psx, ASN1_INTEGER *zone, const char *user, goto err; if (!sk_SXNETID_push(sx->ids, id)) goto err; - ASN1_INTEGER_free(id->zone); id->zone = zone; *psx = sx; return 1; diff --git a/deps/openssl/openssl/crypto/x509/x509_att.c b/deps/openssl/openssl/crypto/x509/x509_att.c index 6a541d798..73ac59454 100644 --- a/deps/openssl/openssl/crypto/x509/x509_att.c +++ b/deps/openssl/openssl/crypto/x509/x509_att.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -71,8 +71,8 @@ X509_ATTRIBUTE *X509at_delete_attr(STACK_OF(X509_ATTRIBUTE) *x, int loc) return ret; } -STACK_OF(X509_ATTRIBUTE) *ossl_x509at_add1_attr(STACK_OF(X509_ATTRIBUTE) **x, - X509_ATTRIBUTE *attr) +STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr(STACK_OF(X509_ATTRIBUTE) **x, + X509_ATTRIBUTE *attr) { X509_ATTRIBUTE *new_attr = NULL; STACK_OF(X509_ATTRIBUTE) *sk = NULL; @@ -105,68 +105,18 @@ STACK_OF(X509_ATTRIBUTE) *ossl_x509at_add1_attr(STACK_OF(X509_ATTRIBUTE) **x, return NULL; } -STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr(STACK_OF(X509_ATTRIBUTE) **x, - X509_ATTRIBUTE *attr) -{ - if (x == NULL || attr == NULL) { - ERR_raise(ERR_LIB_X509, ERR_R_PASSED_NULL_PARAMETER); - return NULL; - } - if (*x != NULL && X509at_get_attr_by_OBJ(*x, attr->object, -1) != -1) { - ERR_raise(ERR_LIB_X509, X509_R_DUPLICATE_ATTRIBUTE); - return NULL; - } - - return ossl_x509at_add1_attr(x, attr); -} - -STACK_OF(X509_ATTRIBUTE) *ossl_x509at_add1_attr_by_OBJ(STACK_OF(X509_ATTRIBUTE) **x, - const ASN1_OBJECT *obj, - int type, - const unsigned char *bytes, - int len) -{ - X509_ATTRIBUTE *attr; - STACK_OF(X509_ATTRIBUTE) *ret; - - attr = X509_ATTRIBUTE_create_by_OBJ(NULL, obj, type, bytes, len); - if (attr == NULL) - return 0; - ret = ossl_x509at_add1_attr(x, attr); - X509_ATTRIBUTE_free(attr); - return ret; -} - STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr_by_OBJ(STACK_OF(X509_ATTRIBUTE) **x, const ASN1_OBJECT *obj, int type, const unsigned char *bytes, int len) -{ - if (x == NULL || obj == NULL) { - ERR_raise(ERR_LIB_X509, ERR_R_PASSED_NULL_PARAMETER); - return NULL; - } - if (*x != NULL && X509at_get_attr_by_OBJ(*x, obj, -1) != -1) { - ERR_raise(ERR_LIB_X509, X509_R_DUPLICATE_ATTRIBUTE); - return NULL; - } - - return ossl_x509at_add1_attr_by_OBJ(x, obj, type, bytes, len); -} - -STACK_OF(X509_ATTRIBUTE) *ossl_x509at_add1_attr_by_NID(STACK_OF(X509_ATTRIBUTE) **x, - int nid, int type, - const unsigned char *bytes, - int len) { X509_ATTRIBUTE *attr; STACK_OF(X509_ATTRIBUTE) *ret; - - attr = X509_ATTRIBUTE_create_by_NID(NULL, nid, type, bytes, len); - if (attr == NULL) + attr = X509_ATTRIBUTE_create_by_OBJ(NULL, obj, type, bytes, len); + if (!attr) return 0; - ret = ossl_x509at_add1_attr(x, attr); + ret = X509at_add1_attr(x, attr); X509_ATTRIBUTE_free(attr); return ret; } @@ -175,32 +125,13 @@ STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr_by_NID(STACK_OF(X509_ATTRIBUTE) **x, int nid, int type, const unsigned char *bytes, int len) -{ - if (x == NULL) { - ERR_raise(ERR_LIB_X509, ERR_R_PASSED_NULL_PARAMETER); - return NULL; - } - if (*x != NULL && X509at_get_attr_by_NID(*x, nid, -1) != -1) { - ERR_raise(ERR_LIB_X509, X509_R_DUPLICATE_ATTRIBUTE); - return NULL; - } - - return ossl_x509at_add1_attr_by_NID(x, nid, type, bytes, len); -} - -STACK_OF(X509_ATTRIBUTE) *ossl_x509at_add1_attr_by_txt(STACK_OF(X509_ATTRIBUTE) **x, - const char *attrname, - int type, - const unsigned char *bytes, - int len) { X509_ATTRIBUTE *attr; STACK_OF(X509_ATTRIBUTE) *ret; - - attr = X509_ATTRIBUTE_create_by_txt(NULL, attrname, type, bytes, len); - if (attr == NULL) + attr = X509_ATTRIBUTE_create_by_NID(NULL, nid, type, bytes, len); + if (!attr) return 0; - ret = ossl_x509at_add1_attr(x, attr); + ret = X509at_add1_attr(x, attr); X509_ATTRIBUTE_free(attr); return ret; } diff --git a/deps/openssl/openssl/crypto/x509/x509_cmp.c b/deps/openssl/openssl/crypto/x509/x509_cmp.c index 989fb8faa..5c9d91f40 100644 --- a/deps/openssl/openssl/crypto/x509/x509_cmp.c +++ b/deps/openssl/openssl/crypto/x509/x509_cmp.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -277,11 +277,11 @@ int X509_NAME_cmp(const X509_NAME *a, const X509_NAME *b) if (ret == 0 && a->canon_enclen == 0) return 0; - if (ret == 0) { - if (a->canon_enc == NULL || b->canon_enc == NULL) - return -2; + if (a->canon_enc == NULL || b->canon_enc == NULL) + return -2; + + if (ret == 0) ret = memcmp(a->canon_enc, b->canon_enc, a->canon_enclen); - } return ret < 0 ? -1 : ret > 0; } @@ -292,13 +292,12 @@ unsigned long X509_NAME_hash_ex(const X509_NAME *x, OSSL_LIB_CTX *libctx, unsigned long ret = 0; unsigned char md[SHA_DIGEST_LENGTH]; EVP_MD *sha1 = EVP_MD_fetch(libctx, "SHA1", propq); - int i2d_ret; /* Make sure X509_NAME structure contains valid cached encoding */ - i2d_ret = i2d_X509_NAME(x, NULL); + i2d_X509_NAME(x, NULL); if (ok != NULL) *ok = 0; - if (i2d_ret >= 0 && sha1 != NULL + if (sha1 != NULL && EVP_Digest(x->canon_enc, x->canon_enclen, md, NULL, sha1, NULL)) { ret = (((unsigned long)md[0]) | ((unsigned long)md[1] << 8L) | ((unsigned long)md[2] << 16L) | ((unsigned long)md[3] << 24L) @@ -326,9 +325,7 @@ unsigned long X509_NAME_hash_old(const X509_NAME *x) goto end; /* Make sure X509_NAME structure contains valid cached encoding */ - if (i2d_X509_NAME(x, NULL) < 0) - goto end; - + i2d_X509_NAME(x, NULL); if (EVP_DigestInit_ex(md_ctx, md5, NULL) && EVP_DigestUpdate(md_ctx, x->bytes->data, x->bytes->length) && EVP_DigestFinal_ex(md_ctx, md, NULL)) diff --git a/deps/openssl/openssl/crypto/x509/x509_err.c b/deps/openssl/openssl/crypto/x509/x509_err.c index 37467935c..a933aeef3 100644 --- a/deps/openssl/openssl/crypto/x509/x509_err.c +++ b/deps/openssl/openssl/crypto/x509/x509_err.c @@ -1,6 +1,6 @@ /* * Generated by util/mkerr.pl DO NOT EDIT - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -28,8 +28,6 @@ static const ERR_STRING_DATA X509_str_reasons[] = { {ERR_PACK(ERR_LIB_X509, 0, X509_R_CRL_ALREADY_DELTA), "crl already delta"}, {ERR_PACK(ERR_LIB_X509, 0, X509_R_CRL_VERIFY_FAILURE), "crl verify failure"}, - {ERR_PACK(ERR_LIB_X509, 0, X509_R_DUPLICATE_ATTRIBUTE), - "duplicate attribute"}, {ERR_PACK(ERR_LIB_X509, 0, X509_R_ERROR_GETTING_MD_BY_NID), "error getting md by nid"}, {ERR_PACK(ERR_LIB_X509, 0, X509_R_ERROR_USING_SIGINF_SET), diff --git a/deps/openssl/openssl/crypto/x509/x509_req.c b/deps/openssl/openssl/crypto/x509/x509_req.c index 0434fbbc6..5428bdaf4 100644 --- a/deps/openssl/openssl/crypto/x509/x509_req.c +++ b/deps/openssl/openssl/crypto/x509/x509_req.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -219,7 +219,7 @@ X509_ATTRIBUTE *X509_REQ_delete_attr(X509_REQ *req, int loc) if (req == NULL) { ERR_raise(ERR_LIB_X509, ERR_R_PASSED_NULL_PARAMETER); - return NULL; + return 0; } attr = X509at_delete_attr(req->req_info.attributes, loc); if (attr != NULL) diff --git a/deps/openssl/openssl/crypto/x509/x509_vpm.c b/deps/openssl/openssl/crypto/x509/x509_vpm.c index 998ce8ac1..b4f4c4599 100644 --- a/deps/openssl/openssl/crypto/x509/x509_vpm.c +++ b/deps/openssl/openssl/crypto/x509/x509_vpm.c @@ -1,5 +1,5 @@ /* - * Copyright 2004-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2004-2022 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -337,10 +337,7 @@ int X509_VERIFY_PARAM_add0_policy(X509_VERIFY_PARAM *param, if (param->policies == NULL) return 0; } - - if (sk_ASN1_OBJECT_push(param->policies, policy) <= 0) - return 0; - return 1; + return sk_ASN1_OBJECT_push(param->policies, policy); } int X509_VERIFY_PARAM_set1_policies(X509_VERIFY_PARAM *param, @@ -595,10 +592,7 @@ int X509_VERIFY_PARAM_add0_table(X509_VERIFY_PARAM *param) X509_VERIFY_PARAM_free(ptmp); } } - - if (sk_X509_VERIFY_PARAM_push(param_table, param) <= 0) - return 0; - return 1; + return sk_X509_VERIFY_PARAM_push(param_table, param); } int X509_VERIFY_PARAM_get_count(void) diff --git a/deps/openssl/openssl/demos/README.txt b/deps/openssl/openssl/demos/README.txt new file mode 100644 index 000000000..e10239173 --- /dev/null +++ b/deps/openssl/openssl/demos/README.txt @@ -0,0 +1,50 @@ +OpenSSL Demonstration Applications + +This folder contains source code that demonstrates the proper use of the OpenSSL +library API. + +bio: Demonstration of a simple TLS client and server + +certs: Demonstration of creating certs, using OCSP + +cipher: +aesgcm.c Demonstration of symmetric cipher GCM mode encrypt/decrypt +aesccm.c Demonstration of symmetric cipher CCM mode encrypt/decrypt +ariacbc.c Demonstration of symmetric cipher CBC mode encrypt/decrypt + +cms: + +digest: +EVP_MD_demo.c Compute a digest from multiple buffers +EVP_MD_stdin.c Compute a digest with data read from stdin +EVP_MD_xof.c Compute a digest using the SHAKE256 XOF +EVP_f_md.c Compute a digest using BIO and EVP_f_md + +kdf: +hkdf.c Demonstration of HMAC based key derivation +pbkdf2.c Demonstration of PBKDF2 password based key derivation +scrypt.c Demonstration of SCRYPT password based key derivation + +mac: +gmac.c Demonstration of GMAC message authentication +poly1305.c Demonstration of Poly1305-AES message authentication +siphash.c Demonstration of SIPHASH message authentication + +pkey: +EVP_PKEY_EC_keygen.c Generate an EC key. +EVP_PKEY_RSA_keygen.c Generate an RSA key. +EVP_PKEY_DSA_keygen.c Generate a DSA key. +EVP_PKEY_DSA_paramgen.c Generate a DSA param key. +EVP_PKEY_DSA_paramvalidate.c Validate a DSA param key. +EVP_PKEY_DSA_paramfromdata.c Load a DSA param key using raw data. + +smime: + +pkcs12: +pkread.c Print out a description of a PKCS12 file. +pkwrite.c Add a password to an existing PKCS12 file. + +signature: +EVP_Signature_demo.c Compute and verify a signature from multiple buffers +rsa_pss_direct.c Compute and verify an RSA-PSS signature from a hash +rsa_pss_hash.c Compute and verify an RSA-PSS signature over a buffer diff --git a/deps/openssl/openssl/demos/bio/Makefile b/deps/openssl/openssl/demos/bio/Makefile new file mode 100644 index 000000000..86f19d4df --- /dev/null +++ b/deps/openssl/openssl/demos/bio/Makefile @@ -0,0 +1,33 @@ +# Quick instruction: +# To build against an OpenSSL built in the source tree, do this: +# +# make OPENSSL_INCS_LOCATION=-I../../include OPENSSL_LIBS_LOCATION=-L../.. +# +# To run the demos when linked with a shared library (default): +# +# LD_LIBRARY_PATH=../.. ./server-arg +# LD_LIBRARY_PATH=../.. ./server-cmod +# LD_LIBRARY_PATH=../.. ./server-conf +# LD_LIBRARY_PATH=../.. ./client-arg +# LD_LIBRARY_PATH=../.. ./client-conf +# LD_LIBRARY_PATH=../.. ./saccept +# LD_LIBRARY_PATH=../.. ./sconnect + +CFLAGS = $(OPENSSL_INCS_LOCATION) +LDFLAGS = $(OPENSSL_LIBS_LOCATION) -lssl -lcrypto $(EX_LIBS) + +all: client-arg client-conf saccept sconnect server-arg server-cmod server-conf + +client-arg: client-arg.o +client-conf: client-conf.o +saccept: saccept.o +sconnect: sconnect.o +server-arg: server-arg.o +server-cmod: server-cmod.o +server-conf: server-conf.o + +client-arg client-conf saccept sconnect server-arg server-cmod server-conf: + $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) + +clean: + $(RM) *.o client-arg client-conf saccept sconnect server-arg server-cmod server-conf diff --git a/deps/openssl/openssl/demos/bio/README.txt b/deps/openssl/openssl/demos/bio/README.txt new file mode 100644 index 000000000..a8467cda6 --- /dev/null +++ b/deps/openssl/openssl/demos/bio/README.txt @@ -0,0 +1,6 @@ +This directory contains some simple examples of the use of BIO's +to simplify socket programming. + +The client-conf, server-conf, client-arg and client-conf include examples +of how to use the SSL_CONF API for configuration file or command line +processing. diff --git a/deps/openssl/openssl/demos/bio/accept.cnf b/deps/openssl/openssl/demos/bio/accept.cnf new file mode 100644 index 000000000..ce36678ee --- /dev/null +++ b/deps/openssl/openssl/demos/bio/accept.cnf @@ -0,0 +1,23 @@ +# Example configuration file + +# Comment out the next line to ignore configuration errors +config_diagnostics = 1 + +# Port to listen on +Port = 4433 + +# Disable TLS v1.2 for test. +# Protocol = ALL, -TLSv1.2 +# Only support 3 curves +Curves = P-521:P-384:P-256 + +# Restricted signature algorithms +SignatureAlgorithms = RSA+SHA512:ECDSA+SHA512 +Certificate=server.pem +PrivateKey=server.pem +ChainCAFile=root.pem +VerifyCAFile=root.pem + +# Request certificate +VerifyMode=Request +ClientCAFile=root.pem diff --git a/deps/openssl/openssl/demos/bio/client-arg.c b/deps/openssl/openssl/demos/bio/client-arg.c new file mode 100644 index 000000000..202afa1ee --- /dev/null +++ b/deps/openssl/openssl/demos/bio/client-arg.c @@ -0,0 +1,108 @@ +/* + * Copyright 2013-2021 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the Apache License 2.0 (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +#include +#include +#include + +int main(int argc, char **argv) +{ + BIO *sbio = NULL, *out = NULL; + int len; + char tmpbuf[1024]; + SSL_CTX *ctx; + SSL_CONF_CTX *cctx; + SSL *ssl; + char **args = argv + 1; + const char *connect_str = "localhost:4433"; + int nargs = argc - 1; + + ctx = SSL_CTX_new(TLS_client_method()); + cctx = SSL_CONF_CTX_new(); + SSL_CONF_CTX_set_flags(cctx, SSL_CONF_FLAG_CLIENT); + SSL_CONF_CTX_set_ssl_ctx(cctx, ctx); + while (*args && **args == '-') { + int rv; + /* Parse standard arguments */ + rv = SSL_CONF_cmd_argv(cctx, &nargs, &args); + if (rv == -3) { + fprintf(stderr, "Missing argument for %s\n", *args); + goto end; + } + if (rv < 0) { + fprintf(stderr, "Error in command %s\n", *args); + ERR_print_errors_fp(stderr); + goto end; + } + /* If rv > 0 we processed something so proceed to next arg */ + if (rv > 0) + continue; + /* Otherwise application specific argument processing */ + if (strcmp(*args, "-connect") == 0) { + connect_str = args[1]; + if (connect_str == NULL) { + fprintf(stderr, "Missing -connect argument\n"); + goto end; + } + args += 2; + nargs -= 2; + continue; + } else { + fprintf(stderr, "Unknown argument %s\n", *args); + goto end; + } + } + + if (!SSL_CONF_CTX_finish(cctx)) { + fprintf(stderr, "Finish error\n"); + ERR_print_errors_fp(stderr); + goto end; + } + + /* + * We'd normally set some stuff like the verify paths and * mode here + * because as things stand this will connect to * any server whose + * certificate is signed by any CA. + */ + + sbio = BIO_new_ssl_connect(ctx); + + BIO_get_ssl(sbio, &ssl); + + if (!ssl) { + fprintf(stderr, "Can't locate SSL pointer\n"); + goto end; + } + + /* We might want to do other things with ssl here */ + + BIO_set_conn_hostname(sbio, connect_str); + + out = BIO_new_fp(stdout, BIO_NOCLOSE); + if (BIO_do_connect(sbio) <= 0) { + fprintf(stderr, "Error connecting to server\n"); + ERR_print_errors_fp(stderr); + goto end; + } + + /* Could examine ssl here to get connection info */ + + BIO_puts(sbio, "GET / HTTP/1.0\n\n"); + for (;;) { + len = BIO_read(sbio, tmpbuf, 1024); + if (len <= 0) + break; + BIO_write(out, tmpbuf, len); + } + end: + SSL_CONF_CTX_free(cctx); + BIO_free_all(sbio); + BIO_free(out); + return 0; +} diff --git a/deps/openssl/openssl/demos/bio/client-conf.c b/deps/openssl/openssl/demos/bio/client-conf.c new file mode 100644 index 000000000..916876bfa --- /dev/null +++ b/deps/openssl/openssl/demos/bio/client-conf.c @@ -0,0 +1,117 @@ +/* + * Copyright 2013-2021 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the Apache License 2.0 (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +#include +#include +#include +#include + +int main(int argc, char **argv) +{ + BIO *sbio = NULL, *out = NULL; + int i, len, rv; + char tmpbuf[1024]; + SSL_CTX *ctx = NULL; + SSL_CONF_CTX *cctx = NULL; + SSL *ssl = NULL; + CONF *conf = NULL; + STACK_OF(CONF_VALUE) *sect = NULL; + CONF_VALUE *cnf; + const char *connect_str = "localhost:4433"; + long errline = -1; + + conf = NCONF_new(NULL); + + if (NCONF_load(conf, "connect.cnf", &errline) <= 0) { + if (errline <= 0) + fprintf(stderr, "Error processing config file\n"); + else + fprintf(stderr, "Error on line %ld\n", errline); + goto end; + } + + sect = NCONF_get_section(conf, "default"); + + if (sect == NULL) { + fprintf(stderr, "Error retrieving default section\n"); + goto end; + } + + ctx = SSL_CTX_new(TLS_client_method()); + cctx = SSL_CONF_CTX_new(); + SSL_CONF_CTX_set_flags(cctx, SSL_CONF_FLAG_CLIENT); + SSL_CONF_CTX_set_flags(cctx, SSL_CONF_FLAG_FILE); + SSL_CONF_CTX_set_ssl_ctx(cctx, ctx); + for (i = 0; i < sk_CONF_VALUE_num(sect); i++) { + cnf = sk_CONF_VALUE_value(sect, i); + rv = SSL_CONF_cmd(cctx, cnf->name, cnf->value); + if (rv > 0) + continue; + if (rv != -2) { + fprintf(stderr, "Error processing %s = %s\n", + cnf->name, cnf->value); + ERR_print_errors_fp(stderr); + goto end; + } + if (strcmp(cnf->name, "Connect") == 0) { + connect_str = cnf->value; + } else { + fprintf(stderr, "Unknown configuration option %s\n", cnf->name); + goto end; + } + } + + if (!SSL_CONF_CTX_finish(cctx)) { + fprintf(stderr, "Finish error\n"); + ERR_print_errors_fp(stderr); + goto end; + } + + /* + * We'd normally set some stuff like the verify paths and * mode here + * because as things stand this will connect to * any server whose + * certificate is signed by any CA. + */ + + sbio = BIO_new_ssl_connect(ctx); + + BIO_get_ssl(sbio, &ssl); + + if (!ssl) { + fprintf(stderr, "Can't locate SSL pointer\n"); + goto end; + } + + /* We might want to do other things with ssl here */ + + BIO_set_conn_hostname(sbio, connect_str); + + out = BIO_new_fp(stdout, BIO_NOCLOSE); + if (BIO_do_connect(sbio) <= 0) { + fprintf(stderr, "Error connecting to server\n"); + ERR_print_errors_fp(stderr); + goto end; + } + + /* Could examine ssl here to get connection info */ + + BIO_puts(sbio, "GET / HTTP/1.0\n\n"); + for (;;) { + len = BIO_read(sbio, tmpbuf, 1024); + if (len <= 0) + break; + BIO_write(out, tmpbuf, len); + } + end: + SSL_CONF_CTX_free(cctx); + BIO_free_all(sbio); + BIO_free(out); + NCONF_free(conf); + return 0; +} diff --git a/deps/openssl/openssl/demos/bio/cmod.cnf b/deps/openssl/openssl/demos/bio/cmod.cnf new file mode 100644 index 000000000..df514dba7 --- /dev/null +++ b/deps/openssl/openssl/demos/bio/cmod.cnf @@ -0,0 +1,27 @@ +# Example config module configuration + +# Name supplied by application to CONF_modules_load_file +# and section containing configuration +testapp = test_sect + +# Comment out the next line to ignore configuration errors +config_diagnostics = 1 + +[test_sect] +# list of configuration modules + +# SSL configuration module +ssl_conf = ssl_sect + +[ssl_sect] +# list of SSL configurations +server = server_sect + +[server_sect] +# Only support 3 curves +Curves = P-521:P-384:P-256 +# Restricted signature algorithms +SignatureAlgorithms = RSA+SHA512:ECDSA+SHA512 +# Certificates and keys +RSA.Certificate=server.pem +ECDSA.Certificate=server-ec.pem diff --git a/deps/openssl/openssl/demos/bio/connect.cnf b/deps/openssl/openssl/demos/bio/connect.cnf new file mode 100644 index 000000000..0049a77b2 --- /dev/null +++ b/deps/openssl/openssl/demos/bio/connect.cnf @@ -0,0 +1,15 @@ +# Example configuration file + +# Comment out the next line to ignore configuration errors +config_diagnostics = 1 + +# Connects to the default port of s_server +Connect = localhost:4433 + +# Disable TLS v1.2 for test. +# Protocol = ALL, -TLSv1.2 +# Only support 3 curves +Curves = P-521:P-384:P-256 + +# Restricted signature algorithms +SignatureAlgorithms = RSA+SHA512:ECDSA+SHA512 diff --git a/deps/openssl/openssl/demos/bio/descrip.mms b/deps/openssl/openssl/demos/bio/descrip.mms new file mode 100644 index 000000000..44ca2febc --- /dev/null +++ b/deps/openssl/openssl/demos/bio/descrip.mms @@ -0,0 +1,47 @@ +# This build description trusts that the following logical names are defined: +# +# For compilation: OPENSSL +# For linking with shared libraries: OSSL$LIBCRYPTO_SHR and OSSL$LIBSSL_SHR +# For linking with static libraries: OSSL$LIBCRYPTO and OSSL$LIBSSL +# +# These are normally defined with the OpenSSL startup procedure + +# By default, we link with the shared libraries +SHARED = TRUE + +# Alternative, for linking with static libraries +#SHARED = FALSE + +.FIRST : + IF "$(SHARED)" .EQS. "TRUE" THEN DEFINE OPT []shared.opt + IF "$(SHARED)" .NES. "TRUE" THEN DEFINE OPT []static.opt + +.LAST : + DEASSIGN OPT + +.DEFAULT : + @ ! + +# Because we use an option file, we need to redefine this +.obj.exe : + $(LINK) $(LINKFLAGS) $<,OPT:/OPT + +all : client-arg.exe client-conf.exe saccept.exe sconnect.exe - + server-arg.exe server-cmod.exe server-conf.exe + +client-arg.exe : client-arg.obj +client-conf.exe : client-conf.obj +saccept.exe : saccept.obj +sconnect.exe : sconnect.obj +server-arg.exe : server-arg.obj +server-cmod.exe : server-cmod.obj +server-conf.exe : server-conf.obj + +# MMS doesn't infer this automatically... +client-arg.obj : client-arg.c +client-conf.obj : client-conf.c +saccept.obj : saccept.c +sconnect.obj : sconnect.c +server-arg.obj : server-arg.c +server-cmod.obj : server-cmod.c +server-conf.obj : server-conf.c diff --git a/deps/openssl/openssl/demos/bio/intca.pem b/deps/openssl/openssl/demos/bio/intca.pem new file mode 100644 index 000000000..9f1cc025c --- /dev/null +++ b/deps/openssl/openssl/demos/bio/intca.pem @@ -0,0 +1,25 @@ +-----BEGIN CERTIFICATE----- +MIIEPzCCAqegAwIBAgIILsaQqJAjK4IwDQYJKoZIhvcNAQELBQAwaDELMAkGA1UE +BhMCVUsxFjAUBgNVBAoMDU9wZW5TU0wgR3JvdXAxIjAgBgNVBAsMGUZPUiBURVNU +SU5HIFBVUlBPU0VTIE9OTFkxHTAbBgNVBAMMFE9wZW5TU0wgVGVzdCBSb290IENB +MCAXDTE4MDYxNDEyNDYyOFoYDzIxMTgwNjE0MTI0NjI4WjBwMQswCQYDVQQGEwJV +SzEWMBQGA1UECgwNT3BlblNTTCBHcm91cDEiMCAGA1UECwwZRk9SIFRFU1RJTkcg +UFVSUE9TRVMgT05MWTElMCMGA1UEAwwcT3BlblNTTCBUZXN0IEludGVybWVkaWF0 +ZSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANIpVng2wNFJp2kF +oJ6Yji25wy1YufnS8NxA82fk5OHdhGWj1CWqnQNotEqEQzcOUszQYrNxd8tEvoWk +Ik4JMBVoEcgBGedchftptTNulFWodWpi1yFaqA/Nz2BsVgcCJW4C+UWDT7VeHtGU +7tYKKr35lxp6io/a4jUDQXvO2nJA9YlrxOktunMqtoZSYqUz35ZXsdkn58o8Fbqm +dEpw6AqAr9aBgY5DSaGxbaX2lwNt9NvB+f9ucOqEnPP8AfTlPYc/ENwJ6u/H8RGw +d1im71mu2lHjcws3aHkbluH860U3vlKWx6Ff1qdQcH98e2HwElqxCK00xya8leu4 +u64nljkCAwEAAaNjMGEwHQYDVR0OBBYEFAoDRKVoOufDXW5Ui7L4ONxANVsFMB8G +A1UdIwQYMBaAFDZjTeLsQUG6KL9xuLhzXVdB4pkKMA8GA1UdEwEB/wQFMAMBAf8w +DgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBCwUAA4IBgQDZQJLA90ewVaS3E3du +gSjPkQ1xsHm8H1am+7zr5oZ81J+R8XYIZgMR+9ShVo38OradiYNqDLso+4iuVdxh +hzoSoQELoDXCficzWKnlAtWvwDDoczyK+/p94g3VKx14n2+GvQzoZ4kwQQgaFH1w +YI6w0oH9zwoklCxvihj8D069QrYyuTT8JGZ2m0FHqVJg6teuQKFahSgwYR2CUoIb +6PrpSUQeCVCH8TPkzlRT6UgtM3ERt7+TlQ+zZ80dSf4YTAsDv9Z/CJXiF/5wZr6/ +lWuFjWmX2HkpEW6Wiv5KF8QP6Ft7Z+RYua7RMtELCYvqYbWDBs7fXWGBkZ5xhB09 +jCxz+F7zOeRbyzacfFq9DhxCWCRbIrdgGGE/Of2ujJtmK/2p4M6E5IsKNAI2SJBW +iJXvIgQgR22ehPqy6er2Gog5LkWUwqB0kHZJJpbp1IW01IGTpD6YAJyVCEAlyMbo +Kto9+wQFLT3Auv/W5h6OwxkNdfAyZBYy0ZSFk4EE8OdWWY4= +-----END CERTIFICATE----- diff --git a/deps/openssl/openssl/demos/bio/root.pem b/deps/openssl/openssl/demos/bio/root.pem new file mode 100644 index 000000000..b1a1c2117 --- /dev/null +++ b/deps/openssl/openssl/demos/bio/root.pem @@ -0,0 +1,28 @@ +-----BEGIN CERTIFICATE----- +MIIEwzCCAyugAwIBAgIUHKKc7fxVgQjWQ7IF6l7m/fHQHH8wDQYJKoZIhvcNAQEL +BQAwaDELMAkGA1UEBhMCVUsxFjAUBgNVBAoMDU9wZW5TU0wgR3JvdXAxIjAgBgNV +BAsMGUZPUiBURVNUSU5HIFBVUlBPU0VTIE9OTFkxHTAbBgNVBAMMFE9wZW5TU0wg +VGVzdCBSb290IENBMCAXDTE4MDYxNDEyNDYyOFoYDzIxMTgwNjE0MTI0NjI4WjBo +MQswCQYDVQQGEwJVSzEWMBQGA1UECgwNT3BlblNTTCBHcm91cDEiMCAGA1UECwwZ +Rk9SIFRFU1RJTkcgUFVSUE9TRVMgT05MWTEdMBsGA1UEAwwUT3BlblNTTCBUZXN0 +IFJvb3QgQ0EwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDaTVriXS5C +6C17OxGwWR4xxdLveLLkAb0+nSiYpzfCcEGX3qiBxHDA+Nj1kkihIJNkXmrKxa3w +1XIVoSUaVULuVxe3vqla+DScGC9MLVsfIwWe8UdGsKst4VvvtNvQUZ5CvLF4jv0V +nabvQhcjY5X7A/t8cZcjOHcaZ9fkThhG/7tJKwp4dLgPcXIimQ0UtP5gRBxnpEYd +l21mPjafqPt02lfOWTgnT5PeVoBDmN7QcrTlI7RzaeDglwFm10rNuYsRxrVsEfiG +Ejup/1eM/69zkV4Lb2RFbIpZ+oKqQ5AEemh6/IP9VwX08DOX3T1EqwthyB+yOZgp +BQ/MZ2M21E03sxlgPGKkRVTU520az84Tyft7T7sJ6BeGSMrdEZVUSJxsS/iFFwL2 +ubmhG6tq0ALIyoS+rUeHUeH2pVnEEcHIXAsLbCXfmsRpWU1fOHcpkTSzbMPhqMa3 +K8aKNHni0UtoD+ddOw0Zrx4uf3zlbPCzy2eQ2d8qb/TSynGxWmN8an8CAwEAAaNj +MGEwHQYDVR0OBBYEFDZjTeLsQUG6KL9xuLhzXVdB4pkKMB8GA1UdIwQYMBaAFDZj +TeLsQUG6KL9xuLhzXVdB4pkKMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQD +AgEGMA0GCSqGSIb3DQEBCwUAA4IBgQCFbQA4yoXhxVQm+tEMpfKf2VEzQVNw0Tzd +Vy+zbscQ04RM4Hx4YbICdX+J7M2fYByU+KawllZJI++mfS9sbnuPIouD5NJLX5EH +//5rySOqA0OkN/Y8f41xp/YF5j96NUCjg3RoerefRSHZfNWJE1faQEHuhwDZK6OQ +GNgt246FZ7ittfe537MHUWY7CjKt6kILN03rVKSgRwwOw5Tv+VyUVyUtRppWl57L +Z+41g0gZ/r7h6ACd+n35nuzgbmqUF2VNYQLo7RzaxPvtkzJ4t96r+5NAr1cx8thr +3rnJWSgpm1ZKdtHMj1jCLxarn8gNz2gB35Tn2NdzHQI0/aEEcfLWpU9mrmhUW+yy +WEN2R8BqGsC++HhlUKKJZgR48SHF5MOBl4KyZPylBuPYcJFQdnEbioBLPlvt5bbt ++o/w3sCR3ZVHMB0n9OcQwd6tdN7aDiept6lJPlOp4dfFjkku8J5nM0oY/Xsg194A +rRK0SBUCVN/2NSHFl9LKEqQiQIUjOQM= +-----END CERTIFICATE----- diff --git a/deps/openssl/openssl/demos/bio/saccept.c b/deps/openssl/openssl/demos/bio/saccept.c new file mode 100644 index 000000000..6da22ea44 --- /dev/null +++ b/deps/openssl/openssl/demos/bio/saccept.c @@ -0,0 +1,121 @@ +/* + * Copyright 1998-2017 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the Apache License 2.0 (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +/*- + * A minimal program to serve an SSL connection. + * It uses blocking. + * saccept host:port + * host is the interface IP to use. If any interface, use *:port + * The default it *:4433 + * + * cc -I../../include saccept.c -L../.. -lssl -lcrypto -ldl + */ + +#include +#include +#include +#include +#include + +#define CERT_FILE "server.pem" + +static volatile int done = 0; + +void interrupt(int sig) +{ + done = 1; +} + +void sigsetup(void) +{ + struct sigaction sa; + + /* + * Catch at most once, and don't restart the accept system call. + */ + sa.sa_flags = SA_RESETHAND; + sa.sa_handler = interrupt; + sigemptyset(&sa.sa_mask); + sigaction(SIGINT, &sa, NULL); +} + +int main(int argc, char *argv[]) +{ + char *port = NULL; + BIO *in = NULL; + BIO *ssl_bio, *tmp; + SSL_CTX *ctx; + char buf[512]; + int ret = EXIT_FAILURE, i; + + if (argc <= 1) + port = "*:4433"; + else + port = argv[1]; + + ctx = SSL_CTX_new(TLS_server_method()); + if (!SSL_CTX_use_certificate_chain_file(ctx, CERT_FILE)) + goto err; + if (!SSL_CTX_use_PrivateKey_file(ctx, CERT_FILE, SSL_FILETYPE_PEM)) + goto err; + if (!SSL_CTX_check_private_key(ctx)) + goto err; + + /* Setup server side SSL bio */ + ssl_bio = BIO_new_ssl(ctx, 0); + + if ((in = BIO_new_accept(port)) == NULL) + goto err; + + /* + * This means that when a new connection is accepted on 'in', The ssl_bio + * will be 'duplicated' and have the new socket BIO push into it. + * Basically it means the SSL BIO will be automatically setup + */ + BIO_set_accept_bios(in, ssl_bio); + + /* Arrange to leave server loop on interrupt */ + sigsetup(); + + again: + /* + * The first call will setup the accept socket, and the second will get a + * socket. In this loop, the first actual accept will occur in the + * BIO_read() function. + */ + + if (BIO_do_accept(in) <= 0) + goto err; + + while (!done) { + i = BIO_read(in, buf, 512); + if (i == 0) { + /* + * If we have finished, remove the underlying BIO stack so the + * next time we call any function for this BIO, it will attempt + * to do an accept + */ + printf("Done\n"); + tmp = BIO_pop(in); + BIO_free_all(tmp); + goto again; + } + if (i < 0) + goto err; + fwrite(buf, 1, i, stdout); + fflush(stdout); + } + + ret = EXIT_SUCCESS; + err: + if (ret != EXIT_SUCCESS) + ERR_print_errors_fp(stderr); + BIO_free(in); + return ret; +} diff --git a/deps/openssl/openssl/demos/bio/sconnect.c b/deps/openssl/openssl/demos/bio/sconnect.c new file mode 100644 index 000000000..18f7007ce --- /dev/null +++ b/deps/openssl/openssl/demos/bio/sconnect.c @@ -0,0 +1,128 @@ +/* + * Copyright 1998-2020 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the Apache License 2.0 (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +/*- + * A minimal program to do SSL to a passed host and port. + * It is actually using non-blocking IO but in a very simple manner + * sconnect host:port - it does a 'GET / HTTP/1.0' + * + * cc -I../../include sconnect.c -L../.. -lssl -lcrypto + */ +#include +#include +#include +#include +#include +#include +#include + +#define HOSTPORT "localhost:4433" +#define CAFILE "root.pem" + +int main(int argc, char *argv[]) +{ + const char *hostport = HOSTPORT; + const char *CAfile = CAFILE; + const char *hostname; + char *cp; + BIO *out = NULL; + char buf[1024 * 10], *p; + SSL_CTX *ssl_ctx = NULL; + SSL *ssl; + BIO *ssl_bio; + int i, len, off, ret = EXIT_FAILURE; + + if (argc > 1) + hostport = argv[1]; + if (argc > 2) + CAfile = argv[2]; + +#ifdef WATT32 + dbug_init(); + sock_init(); +#endif + + ssl_ctx = SSL_CTX_new(TLS_client_method()); + + /* Enable trust chain verification */ + SSL_CTX_set_verify(ssl_ctx, SSL_VERIFY_PEER, NULL); + SSL_CTX_load_verify_locations(ssl_ctx, CAfile, NULL); + + /* Lets make a SSL structure */ + ssl = SSL_new(ssl_ctx); + SSL_set_connect_state(ssl); + + + /* Use it inside an SSL BIO */ + ssl_bio = BIO_new(BIO_f_ssl()); + BIO_set_ssl(ssl_bio, ssl, BIO_CLOSE); + + /* Lets use a connect BIO under the SSL BIO */ + out = BIO_new(BIO_s_connect()); + BIO_set_conn_hostname(out, hostport); + + /* The BIO has parsed the host:port and even IPv6 literals in [] */ + hostname = BIO_get_conn_hostname(out); + if (!hostname || SSL_set1_host(ssl, hostname) <= 0) + goto err; + + BIO_set_nbio(out, 1); + out = BIO_push(ssl_bio, out); + + p = "GET / HTTP/1.0\r\n\r\n"; + len = strlen(p); + + off = 0; + for (;;) { + i = BIO_write(out, &(p[off]), len); + if (i <= 0) { + if (BIO_should_retry(out)) { + fprintf(stderr, "write DELAY\n"); + sleep(1); + continue; + } else { + goto err; + } + } + off += i; + len -= i; + if (len <= 0) + break; + } + + for (;;) { + i = BIO_read(out, buf, sizeof(buf)); + if (i == 0) + break; + if (i < 0) { + if (BIO_should_retry(out)) { + fprintf(stderr, "read DELAY\n"); + sleep(1); + continue; + } + goto err; + } + fwrite(buf, 1, i, stdout); + } + + ret = EXIT_SUCCESS; + goto done; + + err: + if (ERR_peek_error() == 0) { /* system call error */ + fprintf(stderr, "errno=%d ", errno); + perror("error"); + } else { + ERR_print_errors_fp(stderr); + } + done: + BIO_free_all(out); + SSL_CTX_free(ssl_ctx); + return ret; +} diff --git a/deps/openssl/openssl/demos/bio/server-arg.c b/deps/openssl/openssl/demos/bio/server-arg.c new file mode 100644 index 000000000..60a87725a --- /dev/null +++ b/deps/openssl/openssl/demos/bio/server-arg.c @@ -0,0 +1,144 @@ +/* + * Copyright 2013-2017 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the Apache License 2.0 (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +/* + * A minimal program to serve an SSL connection. It uses blocking. It use the + * SSL_CONF API with the command line. cc -I../../include server-arg.c + * -L../.. -lssl -lcrypto -ldl + */ + +#include +#include +#include +#include +#include +#include + +int main(int argc, char *argv[]) +{ + char *port = "*:4433"; + BIO *ssl_bio, *tmp; + SSL_CTX *ctx; + SSL_CONF_CTX *cctx; + char buf[512]; + BIO *in = NULL; + int ret = EXIT_FAILURE, i; + char **args = argv + 1; + int nargs = argc - 1; + + ctx = SSL_CTX_new(TLS_server_method()); + + cctx = SSL_CONF_CTX_new(); + SSL_CONF_CTX_set_flags(cctx, SSL_CONF_FLAG_SERVER); + SSL_CONF_CTX_set_flags(cctx, SSL_CONF_FLAG_CERTIFICATE); + SSL_CONF_CTX_set_ssl_ctx(cctx, ctx); + while (*args && **args == '-') { + int rv; + /* Parse standard arguments */ + rv = SSL_CONF_cmd_argv(cctx, &nargs, &args); + if (rv == -3) { + fprintf(stderr, "Missing argument for %s\n", *args); + goto err; + } + if (rv < 0) { + fprintf(stderr, "Error in command %s\n", *args); + ERR_print_errors_fp(stderr); + goto err; + } + /* If rv > 0 we processed something so proceed to next arg */ + if (rv > 0) + continue; + /* Otherwise application specific argument processing */ + if (strcmp(*args, "-port") == 0) { + port = args[1]; + if (port == NULL) { + fprintf(stderr, "Missing -port argument\n"); + goto err; + } + args += 2; + nargs -= 2; + continue; + } else { + fprintf(stderr, "Unknown argument %s\n", *args); + goto err; + } + } + + if (!SSL_CONF_CTX_finish(cctx)) { + fprintf(stderr, "Finish error\n"); + ERR_print_errors_fp(stderr); + goto err; + } +#ifdef ITERATE_CERTS + /* + * Demo of how to iterate over all certificates in an SSL_CTX structure. + */ + { + X509 *x; + int rv; + rv = SSL_CTX_set_current_cert(ctx, SSL_CERT_SET_FIRST); + while (rv) { + X509 *x = SSL_CTX_get0_certificate(ctx); + X509_NAME_print_ex_fp(stdout, X509_get_subject_name(x), 0, + XN_FLAG_ONELINE); + printf("\n"); + rv = SSL_CTX_set_current_cert(ctx, SSL_CERT_SET_NEXT); + } + fflush(stdout); + } +#endif + /* Setup server side SSL bio */ + ssl_bio = BIO_new_ssl(ctx, 0); + + if ((in = BIO_new_accept(port)) == NULL) + goto err; + + /* + * This means that when a new connection is accepted on 'in', The ssl_bio + * will be 'duplicated' and have the new socket BIO push into it. + * Basically it means the SSL BIO will be automatically setup + */ + BIO_set_accept_bios(in, ssl_bio); + + again: + /* + * The first call will setup the accept socket, and the second will get a + * socket. In this loop, the first actual accept will occur in the + * BIO_read() function. + */ + + if (BIO_do_accept(in) <= 0) + goto err; + + for (;;) { + i = BIO_read(in, buf, 512); + if (i == 0) { + /* + * If we have finished, remove the underlying BIO stack so the + * next time we call any function for this BIO, it will attempt + * to do an accept + */ + printf("Done\n"); + tmp = BIO_pop(in); + BIO_free_all(tmp); + goto again; + } + if (i < 0) + goto err; + fwrite(buf, 1, i, stdout); + fflush(stdout); + } + + ret = EXIT_SUCCESS; + err: + if (ret != EXIT_SUCCESS) + ERR_print_errors_fp(stderr); + BIO_free(in); + return ret; +} diff --git a/deps/openssl/openssl/demos/bio/server-cmod.c b/deps/openssl/openssl/demos/bio/server-cmod.c new file mode 100644 index 000000000..3642fbacf --- /dev/null +++ b/deps/openssl/openssl/demos/bio/server-cmod.c @@ -0,0 +1,94 @@ +/* + * Copyright 2015-2017 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the Apache License 2.0 (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +/* + * A minimal TLS server it ses SSL_CTX_config and a configuration file to + * set most server parameters. + */ + +#include +#include +#include +#include +#include +#include + +int main(int argc, char *argv[]) +{ + unsigned char buf[512]; + char *port = "*:4433"; + BIO *in = NULL; + BIO *ssl_bio, *tmp; + SSL_CTX *ctx; + int ret = EXIT_FAILURE, i; + + ctx = SSL_CTX_new(TLS_server_method()); + + if (CONF_modules_load_file("cmod.cnf", "testapp", 0) <= 0) { + fprintf(stderr, "Error processing config file\n"); + goto err; + } + + if (SSL_CTX_config(ctx, "server") == 0) { + fprintf(stderr, "Error configuring server.\n"); + goto err; + } + + /* Setup server side SSL bio */ + ssl_bio = BIO_new_ssl(ctx, 0); + + if ((in = BIO_new_accept(port)) == NULL) + goto err; + + /* + * This means that when a new connection is accepted on 'in', The ssl_bio + * will be 'duplicated' and have the new socket BIO push into it. + * Basically it means the SSL BIO will be automatically setup + */ + BIO_set_accept_bios(in, ssl_bio); + + again: + /* + * The first call will setup the accept socket, and the second will get a + * socket. In this loop, the first actual accept will occur in the + * BIO_read() function. + */ + + if (BIO_do_accept(in) <= 0) + goto err; + + for (;;) { + i = BIO_read(in, buf, sizeof(buf)); + if (i == 0) { + /* + * If we have finished, remove the underlying BIO stack so the + * next time we call any function for this BIO, it will attempt + * to do an accept + */ + printf("Done\n"); + tmp = BIO_pop(in); + BIO_free_all(tmp); + goto again; + } + if (i < 0) { + if (BIO_should_retry(in)) + continue; + goto err; + } + fwrite(buf, 1, i, stdout); + fflush(stdout); + } + + ret = EXIT_SUCCESS; + err: + if (ret != EXIT_SUCCESS) + ERR_print_errors_fp(stderr); + BIO_free(in); + return ret; +} diff --git a/deps/openssl/openssl/demos/bio/server-conf.c b/deps/openssl/openssl/demos/bio/server-conf.c new file mode 100644 index 000000000..5e07a15e7 --- /dev/null +++ b/deps/openssl/openssl/demos/bio/server-conf.c @@ -0,0 +1,139 @@ +/* + * Copyright 2013-2017 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the Apache License 2.0 (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +/* + * A minimal program to serve an SSL connection. It uses blocking. It uses + * the SSL_CONF API with a configuration file. cc -I../../include saccept.c + * -L../.. -lssl -lcrypto -ldl + */ + +#include +#include +#include +#include +#include +#include +#include + +int main(int argc, char *argv[]) +{ + char *port = "*:4433"; + BIO *in = NULL; + BIO *ssl_bio, *tmp; + SSL_CTX *ctx; + SSL_CONF_CTX *cctx = NULL; + CONF *conf = NULL; + STACK_OF(CONF_VALUE) *sect = NULL; + CONF_VALUE *cnf; + long errline = -1; + char buf[512]; + int ret = EXIT_FAILURE, i; + + ctx = SSL_CTX_new(TLS_server_method()); + + conf = NCONF_new(NULL); + + if (NCONF_load(conf, "accept.cnf", &errline) <= 0) { + if (errline <= 0) + fprintf(stderr, "Error processing config file\n"); + else + fprintf(stderr, "Error on line %ld\n", errline); + goto err; + } + + sect = NCONF_get_section(conf, "default"); + + if (sect == NULL) { + fprintf(stderr, "Error retrieving default section\n"); + goto err; + } + + cctx = SSL_CONF_CTX_new(); + SSL_CONF_CTX_set_flags(cctx, SSL_CONF_FLAG_SERVER); + SSL_CONF_CTX_set_flags(cctx, SSL_CONF_FLAG_CERTIFICATE); + SSL_CONF_CTX_set_flags(cctx, SSL_CONF_FLAG_FILE); + SSL_CONF_CTX_set_ssl_ctx(cctx, ctx); + for (i = 0; i < sk_CONF_VALUE_num(sect); i++) { + int rv; + cnf = sk_CONF_VALUE_value(sect, i); + rv = SSL_CONF_cmd(cctx, cnf->name, cnf->value); + if (rv > 0) + continue; + if (rv != -2) { + fprintf(stderr, "Error processing %s = %s\n", + cnf->name, cnf->value); + ERR_print_errors_fp(stderr); + goto err; + } + if (strcmp(cnf->name, "Port") == 0) { + port = cnf->value; + } else { + fprintf(stderr, "Unknown configuration option %s\n", cnf->name); + goto err; + } + } + + if (!SSL_CONF_CTX_finish(cctx)) { + fprintf(stderr, "Finish error\n"); + ERR_print_errors_fp(stderr); + goto err; + } + + /* Setup server side SSL bio */ + ssl_bio = BIO_new_ssl(ctx, 0); + + if ((in = BIO_new_accept(port)) == NULL) + goto err; + + /* + * This means that when a new connection is accepted on 'in', The ssl_bio + * will be 'duplicated' and have the new socket BIO push into it. + * Basically it means the SSL BIO will be automatically setup + */ + BIO_set_accept_bios(in, ssl_bio); + + again: + /* + * The first call will setup the accept socket, and the second will get a + * socket. In this loop, the first actual accept will occur in the + * BIO_read() function. + */ + + if (BIO_do_accept(in) <= 0) + goto err; + + for (;;) { + i = BIO_read(in, buf, 512); + if (i == 0) { + /* + * If we have finished, remove the underlying BIO stack so the + * next time we call any function for this BIO, it will attempt + * to do an accept + */ + printf("Done\n"); + tmp = BIO_pop(in); + BIO_free_all(tmp); + goto again; + } + if (i < 0) { + if (BIO_should_retry(in)) + continue; + goto err; + } + fwrite(buf, 1, i, stdout); + fflush(stdout); + } + + ret = EXIT_SUCCESS; + err: + if (ret != EXIT_SUCCESS) + ERR_print_errors_fp(stderr); + BIO_free(in); + return ret; +} diff --git a/deps/openssl/openssl/demos/bio/server-ec.pem b/deps/openssl/openssl/demos/bio/server-ec.pem new file mode 100644 index 000000000..ce8dccc9c --- /dev/null +++ b/deps/openssl/openssl/demos/bio/server-ec.pem @@ -0,0 +1,17 @@ +-----BEGIN PRIVATE KEY----- +MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgsoKOpzTm/+VR5xOk +kgwtljzMFYtX4NGdqCkxjitXvLmhRANCAASsxTC21z8mDYAX/RgLK5XGJNmPlHcY +VMql6fSeS+9fTZnn1Ma12932/UBfFTITOuHviJYkQ5KxVSitmgMwnF3V +-----END PRIVATE KEY----- +-----BEGIN CERTIFICATE----- +MIIBvjCCAWSgAwIBAgIURVOfyUojPPQMfDEVhKY4DIdeLY0wCgYIKoZIzj0EAwIw +NTEfMB0GA1UECwwWVGVzdCBFQ0RTQSBDZXJ0aWZpY2F0ZTESMBAGA1UEAwwJbG9j +YWxob3N0MCAXDTE4MDYxNDEyNDYyOFoYDzIxMTgwNjE0MTI0NjI4WjA1MR8wHQYD +VQQLDBZUZXN0IEVDRFNBIENlcnRpZmljYXRlMRIwEAYDVQQDDAlsb2NhbGhvc3Qw +WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASsxTC21z8mDYAX/RgLK5XGJNmPlHcY +VMql6fSeS+9fTZnn1Ma12932/UBfFTITOuHviJYkQ5KxVSitmgMwnF3Vo1AwTjAd +BgNVHQ4EFgQUA0dWehTLHzBYhzfXiTIVUOXDusMwHwYDVR0jBBgwFoAUA0dWehTL +HzBYhzfXiTIVUOXDusMwDAYDVR0TBAUwAwEB/zAKBggqhkjOPQQDAgNIADBFAiEA +8/l8RyihzqlEnLjcyIEaXTZm4HyNgZRQKhNACCW3jd4CIEbMJAf/D0eY38EeP2xY +/BDy/BYXYmyDQeqiE+RDjG5X +-----END CERTIFICATE----- diff --git a/deps/openssl/openssl/demos/bio/server.pem b/deps/openssl/openssl/demos/bio/server.pem new file mode 100644 index 000000000..d4bc3937d --- /dev/null +++ b/deps/openssl/openssl/demos/bio/server.pem @@ -0,0 +1,79 @@ +subject= C = UK, O = OpenSSL Group, OU = FOR TESTING PURPOSES ONLY, CN = Test Server Cert +issuer= C = UK, O = OpenSSL Group, OU = FOR TESTING PURPOSES ONLY, CN = OpenSSL Test Intermediate CA +-----BEGIN CERTIFICATE----- +MIID0DCCArigAwIBAgIIcsOElVeHzfYwDQYJKoZIhvcNAQELBQAwcDELMAkGA1UE +BhMCVUsxFjAUBgNVBAoMDU9wZW5TU0wgR3JvdXAxIjAgBgNVBAsMGUZPUiBURVNU +SU5HIFBVUlBPU0VTIE9OTFkxJTAjBgNVBAMMHE9wZW5TU0wgVGVzdCBJbnRlcm1l +ZGlhdGUgQ0EwIBcNMTgwNjE0MTI0NjI4WhgPMjExODA2MTQxMjQ2MjhaMGQxCzAJ +BgNVBAYTAlVLMRYwFAYDVQQKDA1PcGVuU1NMIEdyb3VwMSIwIAYDVQQLDBlGT1Ig +VEVTVElORyBQVVJQT1NFUyBPTkxZMRkwFwYDVQQDDBBUZXN0IFNlcnZlciBDZXJ0 +MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0jIZ8IZ4dIzBc+ZfdmG5 +n8G3JzRX99QvIqv52s4hFVfdzoa+AciKJpo9zkegWPmfsAVNa4uVceg/ZQt6qJsu +G/pxbQSZVnyjDQGtt7rgaDEbyUP0XJCnzyRdWSUjFS8yNZn4NkmZU01GlHtXdzWy +dEa5PaiTIwW0HI+bjjOEhwJ1hFuFqzlKHVKHA6DBzNcl6ly0E/q2kyslbR+0hq7p +NMqKvvuAxqgc//W8KvLDlKAt9D3t5zgh2+BrMPemrzjEaM97yHTogJo7+SKVDdUw +YQ7Br3xfyki9u2bUYib1BMSvLezxNP0qf/iU91z4xyLmMvOXE6W0D1WHwya1CfE7 +vwIDAQABo3gwdjAdBgNVHQ4EFgQU3ulCbvgfxej6rHnddMpBidwnLIIwHwYDVR0j +BBgwFoAUCgNEpWg658NdblSLsvg43EA1WwUwCQYDVR0TBAIwADATBgNVHSUEDDAK +BggrBgEFBQcDATAUBgNVHREEDTALgglsb2NhbGhvc3QwDQYJKoZIhvcNAQELBQAD +ggEBAENMzaqJtmWED++W4KXFVwNBkQ87errBXe4jVeYKpjNb0JGMm60MS5ty54fb +r27SsR2EEk3EK2rcd85RR7TEKZCn9SvPykVtVf0tru7nOptQJgSbRvxIzyyq1UcE +K+BXDgN/I0f1X6qbk4Stb6uJF7yyAUabacjwKqgVifOOeKF9WJhVA8qJKoVq7HLN +k+uvm0geO1I4LKeULXVnQy8kwB6twcxN8iPyO45ZxbYIVeEKaYtbj/XPoq6KsLIb +5fj+mK1r/LkWk352ksNhf73r3alF8TBcSLqnbMoy1/ZvzlI4ksp9IGWtIU+CzP/f +VUjh00NOwDLd5jJbPoWW0oNp9m4= +-----END CERTIFICATE----- +subject= C = UK, O = OpenSSL Group, OU = FOR TESTING PURPOSES ONLY, CN = OpenSSL Test Intermediate CA +issuer= C = UK, O = OpenSSL Group, OU = FOR TESTING PURPOSES ONLY, CN = OpenSSL Test Root CA +-----BEGIN CERTIFICATE----- +MIIEPzCCAqegAwIBAgIILsaQqJAjK4IwDQYJKoZIhvcNAQELBQAwaDELMAkGA1UE +BhMCVUsxFjAUBgNVBAoMDU9wZW5TU0wgR3JvdXAxIjAgBgNVBAsMGUZPUiBURVNU +SU5HIFBVUlBPU0VTIE9OTFkxHTAbBgNVBAMMFE9wZW5TU0wgVGVzdCBSb290IENB +MCAXDTE4MDYxNDEyNDYyOFoYDzIxMTgwNjE0MTI0NjI4WjBwMQswCQYDVQQGEwJV +SzEWMBQGA1UECgwNT3BlblNTTCBHcm91cDEiMCAGA1UECwwZRk9SIFRFU1RJTkcg +UFVSUE9TRVMgT05MWTElMCMGA1UEAwwcT3BlblNTTCBUZXN0IEludGVybWVkaWF0 +ZSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANIpVng2wNFJp2kF +oJ6Yji25wy1YufnS8NxA82fk5OHdhGWj1CWqnQNotEqEQzcOUszQYrNxd8tEvoWk +Ik4JMBVoEcgBGedchftptTNulFWodWpi1yFaqA/Nz2BsVgcCJW4C+UWDT7VeHtGU +7tYKKr35lxp6io/a4jUDQXvO2nJA9YlrxOktunMqtoZSYqUz35ZXsdkn58o8Fbqm +dEpw6AqAr9aBgY5DSaGxbaX2lwNt9NvB+f9ucOqEnPP8AfTlPYc/ENwJ6u/H8RGw +d1im71mu2lHjcws3aHkbluH860U3vlKWx6Ff1qdQcH98e2HwElqxCK00xya8leu4 +u64nljkCAwEAAaNjMGEwHQYDVR0OBBYEFAoDRKVoOufDXW5Ui7L4ONxANVsFMB8G +A1UdIwQYMBaAFDZjTeLsQUG6KL9xuLhzXVdB4pkKMA8GA1UdEwEB/wQFMAMBAf8w +DgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBCwUAA4IBgQDZQJLA90ewVaS3E3du +gSjPkQ1xsHm8H1am+7zr5oZ81J+R8XYIZgMR+9ShVo38OradiYNqDLso+4iuVdxh +hzoSoQELoDXCficzWKnlAtWvwDDoczyK+/p94g3VKx14n2+GvQzoZ4kwQQgaFH1w +YI6w0oH9zwoklCxvihj8D069QrYyuTT8JGZ2m0FHqVJg6teuQKFahSgwYR2CUoIb +6PrpSUQeCVCH8TPkzlRT6UgtM3ERt7+TlQ+zZ80dSf4YTAsDv9Z/CJXiF/5wZr6/ +lWuFjWmX2HkpEW6Wiv5KF8QP6Ft7Z+RYua7RMtELCYvqYbWDBs7fXWGBkZ5xhB09 +jCxz+F7zOeRbyzacfFq9DhxCWCRbIrdgGGE/Of2ujJtmK/2p4M6E5IsKNAI2SJBW +iJXvIgQgR22ehPqy6er2Gog5LkWUwqB0kHZJJpbp1IW01IGTpD6YAJyVCEAlyMbo +Kto9+wQFLT3Auv/W5h6OwxkNdfAyZBYy0ZSFk4EE8OdWWY4= +-----END CERTIFICATE----- +-----BEGIN RSA PRIVATE KEY----- +MIIEpQIBAAKCAQEA0jIZ8IZ4dIzBc+ZfdmG5n8G3JzRX99QvIqv52s4hFVfdzoa+ +AciKJpo9zkegWPmfsAVNa4uVceg/ZQt6qJsuG/pxbQSZVnyjDQGtt7rgaDEbyUP0 +XJCnzyRdWSUjFS8yNZn4NkmZU01GlHtXdzWydEa5PaiTIwW0HI+bjjOEhwJ1hFuF +qzlKHVKHA6DBzNcl6ly0E/q2kyslbR+0hq7pNMqKvvuAxqgc//W8KvLDlKAt9D3t +5zgh2+BrMPemrzjEaM97yHTogJo7+SKVDdUwYQ7Br3xfyki9u2bUYib1BMSvLezx +NP0qf/iU91z4xyLmMvOXE6W0D1WHwya1CfE7vwIDAQABAoIBAQC2HAo1RYvfDoQc +sh9LJWf5bZANO2Brqz4bP/x9AdHP+AyH/l1oliJ7R2785TmbXMppam6lGo4j3h/u +n39pzOip/NWAqldfgySRBD9Jy3LZUpLMUT/JYtrAsLTfozk+BWHu5rMR9boNXgok +Yqho8/DkpNGhBghUc4CUricLkL7laD3ziAHpx8yALL3tnLGOpgT9hNrA8Dm3yfUS +JEfiG12ILXvq1IP+vUNuaLpTLJZuqUmLpK8v+CBYgKxfd+TDnEjul4PqhhIIFK3A +xEZYQR2D/AXUwng9hP9uCbVm5lOY6vRbi9Fpbt+KRv+m25s1AnuhJFBOsL30h/Tb +iCKWm/nhAoGBAO0bFqMvZHjaT2KiwOwG/Ze9NsjynFPVltiuCqNj8HE5wM6imC5J +SdB+jMkgN6ERXALWrtr8Uf2pqzfeMsi6pekOOVTWLe/8c4bAZRxaCZn/BlZRysZI +vB9Gb7m7Oymw5iDSqrYywgOiUu+oIiCrmPOealhmn7zmHzHaETvdL9zDAoGBAOLy +DVT1csoexnuHVIWqnp7FK7lv6eOGZSdXpfJ3XYjmKJLK2hpVZe+J/mFOL1wsKSt4 +0k/V0dnkHR7V4Pa4ECiCthkWMWrBVIHe7+ZnZ0ocKQSC+EEecavOiZ57S/qnUlT6 +NtQP4cSy4DHzzFZdTZnn+2oymapPZpb2mvSN/GVVAoGADrIlHwwq8Aqn7Pclefuc +8DC8GoxfABs29EslQadKGdp4htYxFH1aY9/UHgsvJ36J82sW/1+wPUas5BOTljlr +WxyUlRuJUVyWVH3MRouWGMNjwynipZOQhWe6OQrPye+688Ha7twKhmsjNNN4+glo +u4DQGpaRxAWHXXGkq88zzj0CgYEAsICEceD7R8srnwMfb13FQ8IhQXWSuAvcO/7k +53CCZGhsgc4WVoi4YNY360G9f7gwxMiQ+NpY/Vd2dnbtIbUBjCAss9IY2OhHa0IR +3mXpZTAFjqa1oR+mVHKrgYBvFSBw3fpEDiXT9wEPcIomD709D0fmty9nZ5edOCfP +WAfdlokCgYEAqXuMuAg3NMMgEv+eBfsf43v3hRwBqPYanE26wcO3GoT/S8BpB6wy +vBoPZOlO5ZfsD2jaTec60GLay+MofxC7qNXIjzHOw50ry4bqHqqoQbn2cONE1k+0 +ov7H2keTcG9FEGgL7dRUq3pRUo/W12WmRuDN17IEgkzAeisJnoiPtaQ= +-----END RSA PRIVATE KEY----- diff --git a/deps/openssl/openssl/demos/bio/shared.opt b/deps/openssl/openssl/demos/bio/shared.opt new file mode 100644 index 000000000..4141b93a5 --- /dev/null +++ b/deps/openssl/openssl/demos/bio/shared.opt @@ -0,0 +1,2 @@ +OSSL$LIBSSL_SHR/SHARE +OSSL$LIBCRYPTO_SHR/SHARE diff --git a/deps/openssl/openssl/demos/bio/static.opt b/deps/openssl/openssl/demos/bio/static.opt new file mode 100644 index 000000000..9ca1588f7 --- /dev/null +++ b/deps/openssl/openssl/demos/bio/static.opt @@ -0,0 +1,2 @@ +OSSL$LIBSSL/LIB +OSSL$LIBCRYPTO/LIB diff --git a/deps/openssl/openssl/demos/certs/README.txt b/deps/openssl/openssl/demos/certs/README.txt new file mode 100644 index 000000000..88cf56b1f --- /dev/null +++ b/deps/openssl/openssl/demos/certs/README.txt @@ -0,0 +1,18 @@ +There is often a need to generate test certificates automatically using +a script. This is often a cause for confusion which can result in incorrect +CA certificates, obsolete V1 certificates or duplicate serial numbers. +The range of command line options can be daunting for a beginner. + +The mkcerts.sh script is an example of how to generate certificates +automatically using scripts. Example creates a root CA, an intermediate CA +signed by the root and several certificates signed by the intermediate CA. + +The script then creates an empty index.txt file and adds entries for the +certificates and generates a CRL. Then one certificate is revoked and a +second CRL generated. + +The script ocsprun.sh runs the test responder on port 8888 covering the +client certificates. + +The script ocspquery.sh queries the status of the certificates using the +test responder. diff --git a/deps/openssl/openssl/demos/certs/apps/apps.cnf b/deps/openssl/openssl/demos/certs/apps/apps.cnf new file mode 100644 index 000000000..72ed70de7 --- /dev/null +++ b/deps/openssl/openssl/demos/certs/apps/apps.cnf @@ -0,0 +1,66 @@ +# +# OpenSSL configuration file to create apps directory certificates +# + +# This definition stops the following lines choking if HOME or CN +# is undefined. +HOME = . +CN = "Not Defined" + +# Comment out the next line to ignore configuration errors +config_diagnostics = 1 + + +#################################################################### +[ req ] +default_bits = 2048 +default_keyfile = privkey.pem +# Don't prompt for fields: use those in section directly +prompt = no +distinguished_name = req_distinguished_name +x509_extensions = v3_ca # The extensions to add to the self signed cert +string_mask = utf8only + +# req_extensions = v3_req # The extensions to add to a certificate request + +[ req_distinguished_name ] +countryName = UK + +organizationName = OpenSSL Group +organizationalUnitName = FOR TESTING PURPOSES ONLY +# Take CN from environment so it can come from a script. +commonName = $ENV::CN + +[ usr_cert ] + +# These extensions are added when 'ca' signs a request for an end entity +# certificate + +basicConstraints=critical, CA:FALSE +keyUsage=critical, nonRepudiation, digitalSignature, keyEncipherment + +[ ec_cert ] + +# These extensions are added when 'ca' signs a request for an end entity +# certificate + +basicConstraints=critical, CA:FALSE +keyUsage=critical, nonRepudiation, digitalSignature, keyAgreement + +# PKIX recommendations harmless if included in all certificates. +subjectKeyIdentifier=hash +authorityKeyIdentifier=keyid + +[ v3_ca ] + + +# Extensions for a typical CA + +# PKIX recommendation. + +subjectKeyIdentifier=hash +authorityKeyIdentifier=keyid:always +basicConstraints = critical,CA:true +keyUsage = critical, cRLSign, keyCertSign + + diff --git a/deps/openssl/openssl/demos/certs/apps/ckey.pem b/deps/openssl/openssl/demos/certs/apps/ckey.pem new file mode 100644 index 000000000..8e9054d29 --- /dev/null +++ b/deps/openssl/openssl/demos/certs/apps/ckey.pem @@ -0,0 +1,27 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIEpQIBAAKCAQEAtK2p2x0S3C1ajftAc3GaWPsji6scw1k9Sw/XltbLQuDc11/f +wwrUiFcje2CB3Ri6yD6+uCA3V12jEc4GdqzirJZhwgIhaTv42vfYBgiUcR9McEGr +agFC3yVR3lIbOzhBjmXNp1on46irxnzU4pT+w58IuvYqUBavaEtfRZocFR5NsIOy +mRhyNag8htOFK3wmTEYrb0vflFYT6SD47ogYtsd/xWSKS+YFyb7xSusR2Ot6Ktmr +MswQE57QYJz+KiRVlnL0cduMBdT52Wm8blaC9mz50PyrzjQ68NyHapCoWDU7pe4x +HLtzpXGSDMPuw4miiSwMym/2wReYJv6cFugLPQIDAQABAoIBAAZOyc9MhIwLSU4L +p4RgQvM4UVVe8/Id+3XTZ8NsXExJbWxXfIhiqGjaIfL8u4vsgRjcl+v1s/jo2/iT +KMab4o4D8gXD7UavQVDjtjb/ta79WL3SjRl2Uc9YjjMkyq6WmDNQeo2NKDdafCTB +1uzSJtLNipB8Z53ELPuHJhxX9QMHrMnuha49riQgXZ7buP9iQrHJFhImBjSzbxJx +L+TI6rkyLSf9Wi0Pd3L27Ob3QWNfNRYNSeTE+08eSRChkur5W0RuXAcuAICdQlCl +LBvWO/LmmvbzCqiDcgy/TliSb6CGGwgiNG7LJZmlkYNj8laGwalNlYZs3UrVv6NO +Br2loAECgYEA2kvCvPGj0Dg/6g7WhXDvAkEbcaL1tSeCxBbNH+6HS2UWMWvyTtCn +/bbD519QIdkvayy1QjEf32GV/UjUVmlULMLBcDy0DGjtL3+XpIhLKWDNxN1v1/ai +1oz23ZJCOgnk6K4qtFtlRS1XtynjA+rBetvYvLP9SKeFrnpzCgaA2r0CgYEA0+KX +1ACXDTNH5ySX3kMjSS9xdINf+OOw4CvPHFwbtc9aqk2HePlEsBTz5I/W3rKwXva3 +NqZ/bRqVVeZB/hHKFywgdUQk2Uc5z/S7Lw70/w1HubNTXGU06Ngb6zOFAo/o/TwZ +zTP1BMIKSOB6PAZPS3l+aLO4FRIRotfFhgRHOoECgYEAmiZbqt8cJaJDB/5YYDzC +mp3tSk6gIb936Q6M5VqkMYp9pIKsxhk0N8aDCnTU+kIK6SzWBpr3/d9Ecmqmfyq7 +5SvWO3KyVf0WWK9KH0abhOm2BKm2HBQvI0DB5u8sUx2/hsvOnjPYDISbZ11t0MtK +u35Zy89yMYcSsIYJjG/ROCUCgYEAgI2P9G5PNxEP5OtMwOsW84Y3Xat/hPAQFlI+ +HES+AzbFGWJkeT8zL2nm95tVkFP1sggZ7Kxjz3w7cpx7GX0NkbWSE9O+T51pNASV +tN1sQ3p5M+/a+cnlqgfEGJVvc7iAcXQPa3LEi5h2yPR49QYXAgG6cifn3dDSpmwn +SUI7PQECgYEApGCIIpSRPLAEHTGmP87RBL1smurhwmy2s/pghkvUkWehtxg0sGHh +kuaqDWcskogv+QC0sVdytiLSz8G0DwcEcsHK1Fkyb8A+ayiw6jWJDo2m9+IF4Fww +1Te6jFPYDESnbhq7+TLGgHGhtwcu5cnb4vSuYXGXKupZGzoLOBbv1Zw= +-----END RSA PRIVATE KEY----- diff --git a/deps/openssl/openssl/demos/certs/apps/intkey.pem b/deps/openssl/openssl/demos/certs/apps/intkey.pem new file mode 100644 index 000000000..d586cb7c6 --- /dev/null +++ b/deps/openssl/openssl/demos/certs/apps/intkey.pem @@ -0,0 +1,27 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIEowIBAAKCAQEAsErw75CmLYD6pkrGW/YhAl/K8L5wJYxDjqu2FghxjD8K308W +3EHq4uBxEwR1OHXaM1+6ZZw7/r2I37VLIdurBEAIEUdbzx0so74FPawgz5EW2CTq +oJnK8F71/vo5Kj1VPwW46CxwxUR3cfvJGNXND2ip0TcyTSPLROXOyQakcVfIGJmd +Sa1wHKi+c2gMA4emADudZUOYLrg80gr2ldePm07ynbVsKKzCcStw8MdmoW9Qt3fL +nPJn2TFUUBNWj+4kvL+88edWCVQXKNdsysD/CDrH4W/hjyPDStVsM6XpiNU0+L2Z +Y6fcj3OP8d0goOx45xotMn9m8hNkCGsrVXx9IwIDAQABAoIBACg3wIV2o2KIJSZg +sqXyHY+0GNEZMO5v9E2NAMo//N941lshaN6wrww5FbK39qH9yNylfxmFLe6sgJhA +fLZprbcXgH+onto+Fpv4UqvCI+4WdHa03U3sJ+70SvxzSy1Gtrbc8FUPJl7qgrFf +Nn5S8CgOwYb4J6KPguTh5G3Z9RPiCKObwOwEM34hrZUlgPS88wmzu9H6L2GM8A1v +YBtEr0msBnlJBJOgStyUEfHW2KspNQ+VllQ6c0cedgFXUpl9EoKTLxP+WXwFI1sx +jFCFzSrMqPcPz1PxU6bXoZE0WH6r+3c8WAW4xR/HVu04BrBDu0CGwn6zAXDy6wCU +pWogDlkCgYEA4o+nIu2CTzqUlgc22pj+hjenfS5lnCtJfAdrXOJHmnuL+J9h8Nzz +9kkL+/Y0Xg9bOM6xXPm+81UNpDvOLbUahSSQsfB+LNVEkthJIL4XIk083LsHjFaJ +9SiCFRbf2OgWrEhe/c1drySwz9u/0f4Q7B6VGqxMnTDjzS5JacZ1pE8CgYEAxzMn +/n/Dpdn+c4rf14BRNKCv1qBXngPNylKJCmiRpKRJAn+B+Msdwtggk/1Ihju21wSo +IGy0Gw7WQd1Iq7V85cB2G5PAFY6ybpSV6G3QrzmzuvjHmKvXgUAuuaN+7Pp1YkMY +rLVjUOcdP5JbXG6XnaCkHYJR8uapPwWPkDt+oO0CgYBI4yZGGlr92j7LNW70TJw1 +2dnMcAzIfTSa7lgf/bxDetPBHKWJs8vYxA9S9BZM3Gvgjr6IxuAjsI0+9O6TzdvG +UckrNc+h5Mq241ZDbmRK6MZXzOPUxlKDyJBw8Hb7dU82BeJpjJRDMG6hsHS5vh77 +l6sodZ4ARCZFcEq1+N8ICQKBgDeBHJLAXO6YmFrvhkGQ4o+senJuSRuhabUHXGIH +ExXyJNnKV5fQWOGSwTkbKRsmBmNRS9uFDoY/kxnVI8ucjUmjYAV9HNek5DkFs+OI +vc4lYNwnN85li23bSWm2kcZMX2ra0URGYn8HdtHg4Q4XTq3ANhp21oi9FsmVrhP9 +T+JdAoGBAK2ebwZ7CXFavDFo4mzLKkGitBjrSi/udFhZECXZWEbNzWlVc3Y3q0cU +drDqUtbVm+/Xb5CMU044Gqq6SKdObAb3JElKmFylFL9fp2rfL/foUr2sdb87Vqdp +2j5jZyvt1DKnNaJ7JaFbUdRxlvHQRiqKlZpafN/SMQ0jCs1bSgCg +-----END RSA PRIVATE KEY----- diff --git a/deps/openssl/openssl/demos/certs/apps/mkacerts.sh b/deps/openssl/openssl/demos/certs/apps/mkacerts.sh new file mode 100644 index 000000000..70984969f --- /dev/null +++ b/deps/openssl/openssl/demos/certs/apps/mkacerts.sh @@ -0,0 +1,45 @@ +#!/bin/sh + +# Recreate the demo certificates in the apps directory. + +OPENSSL=openssl + +# Root CA: create certificate directly +CN="OpenSSL Test Root CA" $OPENSSL req -config apps.cnf -x509 -nodes \ + -keyout root.pem -out root.pem -key rootkey.pem -new -days 3650 +# Intermediate CA: request first +CN="OpenSSL Test Intermediate CA" $OPENSSL req -config apps.cnf -nodes \ + -key intkey.pem -out intreq.pem -new +# Sign request: CA extensions +$OPENSSL x509 -req -in intreq.pem -CA root.pem -CAkey rootkey.pem -days 3630 \ + -extfile apps.cnf -extensions v3_ca -CAcreateserial -out intca.pem +# Client certificate: request first +CN="Test Client Cert" $OPENSSL req -config apps.cnf -nodes \ + -key ckey.pem -out creq.pem -new +# Sign using intermediate CA +$OPENSSL x509 -req -in creq.pem -CA intca.pem -CAkey intkey.pem -days 3600 \ + -extfile apps.cnf -extensions usr_cert -CAcreateserial | \ + $OPENSSL x509 -nameopt oneline -subject -issuer >client.pem +# Server certificate: request first +CN="Test Server Cert" $OPENSSL req -config apps.cnf -nodes \ + -key skey.pem -out sreq.pem -new +# Sign using intermediate CA +$OPENSSL x509 -req -in sreq.pem -CA intca.pem -CAkey intkey.pem -days 3600 \ + -extfile apps.cnf -extensions usr_cert -CAcreateserial | \ + $OPENSSL x509 -nameopt oneline -subject -issuer >server.pem +# Server certificate #2: request first +CN="Test Server Cert #2" $OPENSSL req -config apps.cnf -nodes \ + -key skey2.pem -out sreq2.pem -new +# Sign using intermediate CA +$OPENSSL x509 -req -in sreq2.pem -CA intca.pem -CAkey intkey.pem -days 3600 \ + -extfile apps.cnf -extensions usr_cert -CAcreateserial | \ + $OPENSSL x509 -nameopt oneline -subject -issuer >server2.pem + +# Append keys to file. + +cat skey.pem >>server.pem +cat skey2.pem >>server2.pem +cat ckey.pem >>client.pem + +$OPENSSL verify -CAfile root.pem -untrusted intca.pem \ + server2.pem server.pem client.pem diff --git a/deps/openssl/openssl/demos/certs/apps/mkxcerts.sh b/deps/openssl/openssl/demos/certs/apps/mkxcerts.sh new file mode 100644 index 000000000..ebe192043 --- /dev/null +++ b/deps/openssl/openssl/demos/certs/apps/mkxcerts.sh @@ -0,0 +1,29 @@ + +# Create certificates using various algorithms to test multi-certificate +# functionality. + +OPENSSL=../../../apps/openssl +CN="OpenSSL Test RSA SHA-1 cert" $OPENSSL req \ + -config apps.cnf -extensions usr_cert -x509 -nodes \ + -keyout tsha1.pem -out tsha1.pem -new -days 3650 -sha1 +CN="OpenSSL Test RSA SHA-256 cert" $OPENSSL req \ + -config apps.cnf -extensions usr_cert -x509 -nodes \ + -keyout tsha256.pem -out tsha256.pem -new -days 3650 -sha256 +CN="OpenSSL Test RSA SHA-512 cert" $OPENSSL req \ + -config apps.cnf -extensions usr_cert -x509 -nodes \ + -keyout tsha512.pem -out tsha512.pem -new -days 3650 -sha512 + +# Create EC parameters + +$OPENSSL ecparam -name P-256 -out ecp256.pem +$OPENSSL ecparam -name P-384 -out ecp384.pem + +CN="OpenSSL Test P-256 SHA-256 cert" $OPENSSL req \ + -config apps.cnf -extensions ec_cert -x509 -nodes \ + -nodes -keyout tecp256.pem -out tecp256.pem -newkey ec:ecp256.pem \ + -days 3650 -sha256 + +CN="OpenSSL Test P-384 SHA-384 cert" $OPENSSL req \ + -config apps.cnf -extensions ec_cert -x509 -nodes \ + -nodes -keyout tecp384.pem -out tecp384.pem -newkey ec:ecp384.pem \ + -days 3650 -sha384 diff --git a/deps/openssl/openssl/demos/certs/apps/rootkey.pem b/deps/openssl/openssl/demos/certs/apps/rootkey.pem new file mode 100644 index 000000000..2600aab8e --- /dev/null +++ b/deps/openssl/openssl/demos/certs/apps/rootkey.pem @@ -0,0 +1,27 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIEpgIBAAKCAQEA0xpquKAoY6trkxz8uuE6RyYfMOy+Rgvt19pqG3x8sEpFNjDN +IG873HniShNaOrseRtrGRgCDcecNOQ0LLOQYo10zz0er8+0YgUWVx5Ag5q3cqN3T +kjDc+0sRZMONPoUwD0ySOT9dumbJypEjA0q2AgKgWwaO4ilzg/fWTEruLeuL4meX +K9WZFmMnGuF4kHSocZeKWs5UM86WIOf/+NdtzLNd6a5HwqAB5Azggiz2Ngck6Aet +Mi0inBr3A1MSn0oIaQ7rGvbQ2QrIOnpdHJ36GadQHuvvtZOm28o8UVONMMWoS1yJ +/1TaRWQJ+faZJE7yegJtUf75+5HwsxaUP32C3wIDAQABAoIBAQCEybEnwVamm0Vn +nGw9AT+vUYN9Ou3VEdviUzk7YOrt2Un/9GKTbGSzItf80H+JQfqhhywBDIGiPDxN +Dq9g5Xm6CP51/BdlsFYhuqukhDyt3d9XOXHEG4hlaarfP0KxeQXqGbhA2mMSxWVZ +TkI/59blHNHRcCagjIJlGJhsFRYNO1/ApfA5zN7fWCFvH1XWZhuvsPDgUXKm4BS0 +p3ol67MVJHRfYcLb/txBO5rBhSXinK0jEBiljRcE0rWzRycSedmDgG3SNV17wvA0 +UWgMNpPcJ1b7Satr0nM7A8+siV8FRcfvPqCuGPKCYTrNn71hGJEhKXKwlURj9+95 +O5yzRxjBAoGBAPtTRYN40/piRB0XLpi+zNh+4Ba4TGfXSymbaozgC/pI5wfgGXrz +IpT9ujjV42r8TABHvXa6uiGm0cbxcUgq2n6Y8rf6iHxmn23ezCEBUs7rd6jtt11b +m58T8o0XWyOgAovaH0UgzMtrlsZYR2fli5254oRkTWwaUTuO38z6CVddAoGBANcH +nvdu3RniIYStsr5/deu7l81ZQ9rSiR1m3H6Wy8ryMIfkYfa0WqXhwNHrLrhvhLIQ +7mGnJ+jAkJyVQULE6UdbmVW8tC58Dfrgz/1s7RMeUYPnOmRpx79c/LqZ2IunfFWx +IvBvFu7vidEHA+1tU2N+oXNsU+B9XpfsJ+/d2QtrAoGBAJTuP58tFtClMp/agO5b +AqC4bqqIBB704cGCK53XlsF2OhHcprzJH5ES2iub8+wOHit8V7Xn6SzP4jf2E58k +Zd3nXM3RVNgDKC6/fE+CrUOZHYupcqOMCag29eDOGl/+DgQ5+ZXJXhKdaveWkJns +2NNat/SkS4zn+4NDozOgZ7CxAoGBAIuXjfJRTUXNUDci0APtGO9U1AJiLbOzs4Gb +0g539IqmWS0O7S3L/YDsolFkXOsssjcq2KYabsUhpX+RQVGIJWzGoS9QlqQKssSo +Bz4c5Xbg2shHZtfi9+JaClNVJofazdOPcAAoDfpFFPHWnQ0YSOcxQLx+maEFok/7 +5h1IputLAoGBAKGBWDPwskgRRfCAIFpCJLOu/9D30M/akMtO0kJYQpBjOaKuigUy +ic7pthFVse/pMUljXHAd1hs2CTjMW1ukEusU3x1Ei6wvnHHqn0Hs+6D5NQFQkcMn +7rejJ+bpJPRAn40AAV5hGBYI12XycB8ZgyPC4hTUK6unGVK06DC4qvdv +-----END RSA PRIVATE KEY----- diff --git a/deps/openssl/openssl/demos/certs/apps/skey.pem b/deps/openssl/openssl/demos/certs/apps/skey.pem new file mode 100644 index 000000000..dbd403d19 --- /dev/null +++ b/deps/openssl/openssl/demos/certs/apps/skey.pem @@ -0,0 +1,27 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIEpAIBAAKCAQEA84TzkjbcskbKZnrlKcXzSSgi07n+4N7kOM7uIhzpkTuU0HIv +h4VZS2axxfV6hV3CD9MuKVg2zEhroqK1Js5n4ke230nSP/qiELfCl0R+hzRtbfKL +tFUr1iHeU0uQ6v3q+Tg1K/Tmmg72uxKrhyHDL7z0BriPjhAHJ5XlQsvR1RCMkqzu +D9wjSInJxpMMIgLndOclAKv4D1wQtYU7ZpTw+01XBlUhIiXb86qpYL9NqnnRq5JI +uhmOEuxo2ca63+xaHNhD/udSyc8C0Md/yX6wlONTRFgLLv0pdLUGm1xEjfsydaQ6 +qGd7hzIKUI3hohNKJa/mHLElv7SZolPTogK/EQIDAQABAoIBAADq9FwNtuE5IRQn +zGtO4q7Y5uCzZ8GDNYr9RKp+P2cbuWDbvVAecYq2NV9QoIiWJOAYZKklOvekIju3 +r0UZLA0PRiIrTg6NrESx3JrjWDK8QNlUO7CPTZ39/K+FrmMkV9lem9yxjJjyC34D +AQB+YRTx+l14HppjdxNwHjAVQpIx/uO2F5xAMuk32+3K+pq9CZUtrofe1q4Agj9R +5s8mSy9pbRo9kW9wl5xdEotz1LivFOEiqPUJTUq5J5PeMKao3vdK726XI4Z455Nm +W2/MA0YV0ug2FYinHcZdvKM6dimH8GLfa3X8xKRfzjGjTiMSwsdjgMa4awY3tEHH +674jhAECgYEA/zqMrc0zsbNk83sjgaYIug5kzEpN4ic020rSZsmQxSCerJTgNhmg +utKSCt0Re09Jt3LqG48msahX8ycqDsHNvlEGPQSbMu9IYeO3Wr3fAm75GEtFWePY +BhM73I7gkRt4s8bUiUepMG/wY45c5tRF23xi8foReHFFe9MDzh8fJFECgYEA9EFX +4qAik1pOJGNei9BMwmx0I0gfVEIgu0tzeVqT45vcxbxr7RkTEaDoAG6PlbWP6D9a +WQNLp4gsgRM90ZXOJ4up5DsAWDluvaF4/omabMA+MJJ5kGZ0gCj5rbZbKqUws7x8 +bp+6iBfUPJUbcqNqFmi/08Yt7vrDnMnyMw2A/sECgYEAiiuRMxnuzVm34hQcsbhH +6ymVqf7j0PW2qK0F4H1ocT9qhzWFd+RB3kHWrCjnqODQoI6GbGr/4JepHUpre1ex +4UEN5oSS3G0ru0rC3U4C59dZ5KwDHFm7ffZ1pr52ljfQDUsrjjIMRtuiwNK2OoRa +WSsqiaL+SDzSB+nBmpnAizECgYBdt/y6rerWUx4MhDwwtTnel7JwHyo2MDFS6/5g +n8qC2Lj6/fMDRE22w+CA2esp7EJNQJGv+b27iFpbJEDh+/Lf5YzIT4MwVskQ5bYB +JFcmRxUVmf4e09D7o705U/DjCgMH09iCsbLmqQ38ONIRSHZaJtMDtNTHD1yi+jF+ +OT43gQKBgQC/2OHZoko6iRlNOAQ/tMVFNq7fL81GivoQ9F1U0Qr+DH3ZfaH8eIkX +xT0ToMPJUzWAn8pZv0snA0um6SIgvkCuxO84OkANCVbttzXImIsL7pFzfcwV/ERK +UM6j0ZuSMFOCr/lGPAoOQU0fskidGEHi1/kW+suSr28TqsyYZpwBDQ== +-----END RSA PRIVATE KEY----- diff --git a/deps/openssl/openssl/demos/certs/apps/skey2.pem b/deps/openssl/openssl/demos/certs/apps/skey2.pem new file mode 100644 index 000000000..785382285 --- /dev/null +++ b/deps/openssl/openssl/demos/certs/apps/skey2.pem @@ -0,0 +1,27 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIEowIBAAKCAQEA63Yu4/cnLRvi+BIwcoIz5hKmcziREG2tujKEBs4JVO3uV3+f +UW/4YFULigKImXu/0fKyuMyeFu4l3V8NC6gachvAeWhiniN9sPgPU3AQKaF1y9gq +2EBEI2cFCKS5WASItjZCY951ZKuXYJdYDgC4kPlvI4N5M4ORHPa4pqfa/dzfMLEi +92sLGn7q5mArzn+5Xh2jD9Vif8w0RlDRxv1rQ413PGVBtfuhF1PSXNhbPtjpn+33 +DdJdNACv8D4PDmjUtKyshqvSXSE/RURldW13v68efBWhOQiLXcAkmISbxfzveS1k +KMSV8nuWwhS5rw0xMlavRTEgqbX7Jm14xGRrFwIDAQABAoIBAHLsTPihIfLnYIE5 +x4GsQQ5zXeBw5ITDM37ktwHnQDC+rIzyUl1aLD1AZRBoKinXd4lOTqLZ4/NHKx4A +DYr58mZtWyUmqLOMmQVuHXTZBlp7XtYuXMMNovQwjQlp9LicBeoBU6gQ5PVMtubD +F4xGF89Sn0cTHW3iMkqTtQ5KcR1j57OcJO0FEb1vPvk2MXI5ZyAatUYE7YacbEzd +rg02uIwx3FqNSkuSI79uz4hMdV5TPtuhxx9nTwj9aLUhXFeZ0mn2PVgVzEnnMoJb ++znlsZDgzDlJqdaD744YGWh8Z3OEssB35KfzFcdOeO6yH8lmv2Zfznk7pNPT7LTb +Lae9VgkCgYEA92p1qnAB3NtJtNcaW53i0S5WJgS1hxWKvUDx3lTB9s8X9fHpqL1a +E94fDfWzp/hax6FefUKIvBOukPLQ6bYjTMiFoOHzVirghAIuIUoMI5VtLhwD1hKs +Lr7l/dptMgKb1nZHyXoKHRBthsy3K4+udsPi8TzMvYElgEqyQIe/Rk0CgYEA86GL +8HC6zLszzKERDPBxrboRmoFvVUCTQDhsfj1M8aR3nQ8V5LkdIJc7Wqm/Ggfk9QRf +rJ8M2WUMlU5CNnCn/KCrKzCNZIReze3fV+HnKdbcXGLvgbHPrhnz8yYehUFG+RGq +bVyDWRU94T38izy2s5qMYrMJWZEYyXncSPbfcPMCgYAtaXfxcZ+V5xYPQFARMtiX +5nZfggvDoJuXgx0h3tK/N2HBfcaSdzbaYLG4gTmZggc/jwnl2dl5E++9oSPhUdIG +3ONSFUbxsOsGr9PBvnKd8WZZyUCXAVRjPBzAzF+whzQNWCZy/5htnz9LN7YDI9s0 +5113Q96cheDZPFydZY0hHQKBgQDVbEhNukM5xCiNcu+f2SaMnLp9EjQ4h5g3IvaP +5B16daw/Dw8LzcohWboqIxeAsze0GD/D1ZUJAEd0qBjC3g+a9BjefervCjKOzXng +38mEUm+6EwVjJSQcjSmycEs+Sr/kwr/8i5WYvU32+jk4tFgMoC+o6tQe/Uesf68k +z/dPVwKBgGbF7Vv1/3SmhlOy+zYyvJ0CrWtKxH9QP6tLIEgEpd8x7YTSuCH94yok +kToMXYA3sWNPt22GbRDZ+rcp4c7HkDx6I6vpdP9aQEwJTp0EPy0sgWr2XwYmreIQ +NFmkk8Itn9EY2R9VBaP7GLv5kvwxDdLAnmwGmzVtbmaVdxCaBwUk +-----END RSA PRIVATE KEY----- diff --git a/deps/openssl/openssl/demos/certs/ca.cnf b/deps/openssl/openssl/demos/certs/ca.cnf new file mode 100644 index 000000000..e0c73c4ee --- /dev/null +++ b/deps/openssl/openssl/demos/certs/ca.cnf @@ -0,0 +1,82 @@ +# +# OpenSSL example configuration file for automated certificate creation. +# + +# This definition stops the following lines choking if HOME or CN +# is undefined. +HOME = . +CN = "Not Defined" +default_ca = ca + +# Comment out the next line to ignore configuration errors +config_diagnostics = 1 + +#################################################################### +[ req ] +default_bits = 1024 +default_keyfile = privkey.pem +# Don't prompt for fields: use those in section directly +prompt = no +distinguished_name = req_distinguished_name +x509_extensions = v3_ca # The extensions to add to the self signed cert +string_mask = utf8only + +# req_extensions = v3_req # The extensions to add to a certificate request + +[ req_distinguished_name ] +countryName = UK + +organizationName = OpenSSL Group +# Take CN from environment so it can come from a script. +commonName = $ENV::CN + +[ usr_cert ] + +# These extensions are added when 'ca' signs a request for an end entity +# certificate + +basicConstraints=critical, CA:FALSE +keyUsage=critical, nonRepudiation, digitalSignature, keyEncipherment + +# PKIX recommendations harmless if included in all certificates. +subjectKeyIdentifier=hash +authorityKeyIdentifier=keyid +# OCSP responder certificate +[ ocsp_cert ] + +basicConstraints=critical, CA:FALSE +keyUsage=critical, nonRepudiation, digitalSignature, keyEncipherment + +# PKIX recommendations harmless if included in all certificates. +subjectKeyIdentifier=hash +authorityKeyIdentifier=keyid +extendedKeyUsage=OCSPSigning + +[ dh_cert ] + +# These extensions are added when 'ca' signs a request for an end entity +# DH certificate + +basicConstraints=critical, CA:FALSE +keyUsage=critical, keyAgreement + +# PKIX recommendations harmless if included in all certificates. +subjectKeyIdentifier=hash +authorityKeyIdentifier=keyid + +[ v3_ca ] + + +# Extensions for a typical CA + +# PKIX recommendation. + +subjectKeyIdentifier=hash +authorityKeyIdentifier=keyid:always +basicConstraints = critical,CA:true +keyUsage = critical, cRLSign, keyCertSign + +# Minimal CA entry to allow generation of CRLs. +[ca] +database=index.txt +crlnumber=crlnum.txt diff --git a/deps/openssl/openssl/demos/certs/mkcerts.sh b/deps/openssl/openssl/demos/certs/mkcerts.sh new file mode 100644 index 000000000..2d14a9598 --- /dev/null +++ b/deps/openssl/openssl/demos/certs/mkcerts.sh @@ -0,0 +1,96 @@ +#!/bin/sh + +OPENSSL=../../apps/openssl +OPENSSL_CONF=../../apps/openssl.cnf +export OPENSSL_CONF + +# Root CA: create certificate directly +CN="Test Root CA" $OPENSSL req -config ca.cnf -x509 -nodes \ + -keyout root.pem -out root.pem -newkey rsa:2048 -days 3650 +# Intermediate CA: request first +CN="Test Intermediate CA" $OPENSSL req -config ca.cnf -nodes \ + -keyout intkey.pem -out intreq.pem -newkey rsa:2048 +# Sign request: CA extensions +$OPENSSL x509 -req -in intreq.pem -CA root.pem -days 3600 \ + -extfile ca.cnf -extensions v3_ca -CAcreateserial -out intca.pem + +# Server certificate: create request first +CN="Test Server Cert" $OPENSSL req -config ca.cnf -nodes \ + -keyout skey.pem -out req.pem -newkey rsa:1024 +# Sign request: end entity extensions +$OPENSSL x509 -req -in req.pem -CA intca.pem -CAkey intkey.pem -days 3600 \ + -extfile ca.cnf -extensions usr_cert -CAcreateserial -out server.pem + +# Client certificate: request first +CN="Test Client Cert" $OPENSSL req -config ca.cnf -nodes \ + -keyout ckey.pem -out creq.pem -newkey rsa:1024 +# Sign using intermediate CA +$OPENSSL x509 -req -in creq.pem -CA intca.pem -CAkey intkey.pem -days 3600 \ + -extfile ca.cnf -extensions usr_cert -CAcreateserial -out client.pem + +# Revoked certificate: request first +CN="Test Revoked Cert" $OPENSSL req -config ca.cnf -nodes \ + -keyout revkey.pem -out rreq.pem -newkey rsa:1024 +# Sign using intermediate CA +$OPENSSL x509 -req -in rreq.pem -CA intca.pem -CAkey intkey.pem -days 3600 \ + -extfile ca.cnf -extensions usr_cert -CAcreateserial -out rev.pem + +# OCSP responder certificate: request first +CN="Test OCSP Responder Cert" $OPENSSL req -config ca.cnf -nodes \ + -keyout respkey.pem -out respreq.pem -newkey rsa:1024 +# Sign using intermediate CA and responder extensions +$OPENSSL x509 -req -in respreq.pem -CA intca.pem -CAkey intkey.pem -days 3600 \ + -extfile ca.cnf -extensions ocsp_cert -CAcreateserial -out resp.pem + +# Example creating a PKCS#3 DH certificate. + +# First DH parameters + +[ -f dhp.pem ] || $OPENSSL genpkey -genparam -algorithm DH -pkeyopt dh_paramgen_prime_len:1024 -out dhp.pem + +# Now a DH private key +$OPENSSL genpkey -paramfile dhp.pem -out dhskey.pem +# Create DH public key file +$OPENSSL pkey -in dhskey.pem -pubout -out dhspub.pem +# Certificate request, key just reuses old one as it is ignored when the +# request is signed. +CN="Test Server DH Cert" $OPENSSL req -config ca.cnf -new \ + -key skey.pem -out dhsreq.pem +# Sign request: end entity DH extensions +$OPENSSL x509 -req -in dhsreq.pem -CA root.pem -days 3600 \ + -force_pubkey dhspub.pem \ + -extfile ca.cnf -extensions dh_cert -CAcreateserial -out dhserver.pem + +# DH client certificate + +$OPENSSL genpkey -paramfile dhp.pem -out dhckey.pem +$OPENSSL pkey -in dhckey.pem -pubout -out dhcpub.pem +CN="Test Client DH Cert" $OPENSSL req -config ca.cnf -new \ + -key skey.pem -out dhcreq.pem +$OPENSSL x509 -req -in dhcreq.pem -CA root.pem -days 3600 \ + -force_pubkey dhcpub.pem \ + -extfile ca.cnf -extensions dh_cert -CAcreateserial -out dhclient.pem + +# Examples of CRL generation without the need to use 'ca' to issue +# certificates. +# Create zero length index file +>index.txt +# Create initial crl number file +echo 01 >crlnum.txt +# Add entries for server and client certs +$OPENSSL ca -valid server.pem -keyfile root.pem -cert root.pem \ + -config ca.cnf -md sha1 +$OPENSSL ca -valid client.pem -keyfile root.pem -cert root.pem \ + -config ca.cnf -md sha1 +$OPENSSL ca -valid rev.pem -keyfile root.pem -cert root.pem \ + -config ca.cnf -md sha1 +# Generate a CRL. +$OPENSSL ca -gencrl -keyfile root.pem -cert root.pem -config ca.cnf \ + -md sha1 -crldays 1 -out crl1.pem +# Revoke a certificate +openssl ca -revoke rev.pem -crl_reason superseded \ + -keyfile root.pem -cert root.pem -config ca.cnf -md sha1 +# Generate another CRL +$OPENSSL ca -gencrl -keyfile root.pem -cert root.pem -config ca.cnf \ + -md sha1 -crldays 1 -out crl2.pem + diff --git a/deps/openssl/openssl/demos/certs/ocspquery.sh b/deps/openssl/openssl/demos/certs/ocspquery.sh new file mode 100644 index 000000000..f66411330 --- /dev/null +++ b/deps/openssl/openssl/demos/certs/ocspquery.sh @@ -0,0 +1,21 @@ +# Example querying OpenSSL test responder. Assumes ocsprun.sh has been +# called. + +OPENSSL=../../apps/openssl +OPENSSL_CONF=../../apps/openssl.cnf +export OPENSSL_CONF + +# Send responder queries for each certificate. + +echo "Requesting OCSP status for each certificate" +$OPENSSL ocsp -issuer intca.pem -cert client.pem -CAfile root.pem \ + -url http://127.0.0.1:8888/ +$OPENSSL ocsp -issuer intca.pem -cert server.pem -CAfile root.pem \ + -url http://127.0.0.1:8888/ +$OPENSSL ocsp -issuer intca.pem -cert rev.pem -CAfile root.pem \ + -url http://127.0.0.1:8888/ +# One query for all three certificates. +echo "Requesting OCSP status for three certificates in one request" +$OPENSSL ocsp -issuer intca.pem \ + -cert client.pem -cert server.pem -cert rev.pem \ + -CAfile root.pem -url http://127.0.0.1:8888/ diff --git a/deps/openssl/openssl/demos/certs/ocsprun.sh b/deps/openssl/openssl/demos/certs/ocsprun.sh new file mode 100644 index 000000000..a65e5f2fd --- /dev/null +++ b/deps/openssl/openssl/demos/certs/ocsprun.sh @@ -0,0 +1,14 @@ +# Example of running an querying OpenSSL test OCSP responder. +# This assumes "mkcerts.sh" or similar has been run to set up the +# necessary file structure. + +OPENSSL=../../apps/openssl +OPENSSL_CONF=../../apps/openssl.cnf +export OPENSSL_CONF + +# Run OCSP responder. + +PORT=8888 + +$OPENSSL ocsp -port $PORT -index index.txt -CA intca.pem \ + -rsigner resp.pem -rkey respkey.pem -rother intca.pem $* diff --git a/deps/openssl/openssl/demos/cipher/Makefile b/deps/openssl/openssl/demos/cipher/Makefile new file mode 100644 index 000000000..81f526535 --- /dev/null +++ b/deps/openssl/openssl/demos/cipher/Makefile @@ -0,0 +1,27 @@ +# Quick instruction: +# To build against an OpenSSL built in the source tree, do this: +# +# make OPENSSL_INCS_LOCATION=-I../../include OPENSSL_LIBS_LOCATION=-L../.. +# +# To run the demos when linked with a shared library (default): +# +# LD_LIBRARY_PATH=../.. ./aesccm +# LD_LIBRARY_PATH=../.. ./aesgcm +# LD_LIBRARY_PATH=../.. ./aeskeywrap +# LD_LIBRARY_PATH=../.. ./ariacbc + +CFLAGS = $(OPENSSL_INCS_LOCATION) +LDFLAGS = $(OPENSSL_LIBS_LOCATION) -lssl -lcrypto + +all: aesccm aesgcm aeskeywrap ariacbc + +aesccm: aesccm.o +aesgcm: aesgcm.o +aeskeywrap: aeskeywrap.o +ariacbc: ariacbc.o + +aesccm aesgcm aeskeywrap ariacbc: + $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) + +clean: + $(RM) aesccm aesgcm aeskeywrap ariacbc *.o diff --git a/deps/openssl/openssl/demos/cipher/aesccm.c b/deps/openssl/openssl/demos/cipher/aesccm.c new file mode 100644 index 000000000..5a2d42815 --- /dev/null +++ b/deps/openssl/openssl/demos/cipher/aesccm.c @@ -0,0 +1,238 @@ +/* + * Copyright 2013-2021 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the Apache License 2.0 (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +/* + * Simple AES CCM authenticated encryption with additional data (AEAD) + * demonstration program. + */ + +#include +#include +#include +#include +#include + +/* AES-CCM test data obtained from NIST public test vectors */ + +/* AES key */ +static const unsigned char ccm_key[] = { + 0xce, 0xb0, 0x09, 0xae, 0xa4, 0x45, 0x44, 0x51, 0xfe, 0xad, 0xf0, 0xe6, + 0xb3, 0x6f, 0x45, 0x55, 0x5d, 0xd0, 0x47, 0x23, 0xba, 0xa4, 0x48, 0xe8 +}; + +/* Unique nonce to be used for this message */ +static const unsigned char ccm_nonce[] = { + 0x76, 0x40, 0x43, 0xc4, 0x94, 0x60, 0xb7 +}; + +/* + * Example of Additional Authenticated Data (AAD), i.e. unencrypted data + * which can be authenticated using the generated Tag value. + */ +static const unsigned char ccm_adata[] = { + 0x6e, 0x80, 0xdd, 0x7f, 0x1b, 0xad, 0xf3, 0xa1, 0xc9, 0xab, 0x25, 0xc7, + 0x5f, 0x10, 0xbd, 0xe7, 0x8c, 0x23, 0xfa, 0x0e, 0xb8, 0xf9, 0xaa, 0xa5, + 0x3a, 0xde, 0xfb, 0xf4, 0xcb, 0xf7, 0x8f, 0xe4 +}; + +/* Example plaintext to encrypt */ +static const unsigned char ccm_pt[] = { + 0xc8, 0xd2, 0x75, 0xf9, 0x19, 0xe1, 0x7d, 0x7f, 0xe6, 0x9c, 0x2a, 0x1f, + 0x58, 0x93, 0x9d, 0xfe, 0x4d, 0x40, 0x37, 0x91, 0xb5, 0xdf, 0x13, 0x10 +}; + +/* Expected ciphertext value */ +static const unsigned char ccm_ct[] = { + 0x8a, 0x0f, 0x3d, 0x82, 0x29, 0xe4, 0x8e, 0x74, 0x87, 0xfd, 0x95, 0xa2, + 0x8a, 0xd3, 0x92, 0xc8, 0x0b, 0x36, 0x81, 0xd4, 0xfb, 0xc7, 0xbb, 0xfd +}; + +/* Expected AEAD Tag value */ +static const unsigned char ccm_tag[] = { + 0x2d, 0xd6, 0xef, 0x1c, 0x45, 0xd4, 0xcc, 0xb7, 0x23, 0xdc, 0x07, 0x44, + 0x14, 0xdb, 0x50, 0x6d +}; + +/* + * A library context and property query can be used to select & filter + * algorithm implementations. If they are NULL then the default library + * context and properties are used. + */ +OSSL_LIB_CTX *libctx = NULL; +const char *propq = NULL; + + +int aes_ccm_encrypt(void) +{ + int ret = 0; + EVP_CIPHER_CTX *ctx; + EVP_CIPHER *cipher = NULL; + int outlen, tmplen; + size_t ccm_nonce_len = sizeof(ccm_nonce); + size_t ccm_tag_len = sizeof(ccm_tag); + unsigned char outbuf[1024]; + unsigned char outtag[16]; + OSSL_PARAM params[3] = { + OSSL_PARAM_END, OSSL_PARAM_END, OSSL_PARAM_END + }; + + printf("AES CCM Encrypt:\n"); + printf("Plaintext:\n"); + BIO_dump_fp(stdout, ccm_pt, sizeof(ccm_pt)); + + /* Create a context for the encrypt operation */ + if ((ctx = EVP_CIPHER_CTX_new()) == NULL) + goto err; + + /* Fetch the cipher implementation */ + if ((cipher = EVP_CIPHER_fetch(libctx, "AES-192-CCM", propq)) == NULL) + goto err; + + /* Set nonce length if default 96 bits is not appropriate */ + params[0] = OSSL_PARAM_construct_size_t(OSSL_CIPHER_PARAM_AEAD_IVLEN, + &ccm_nonce_len); + /* Set tag length */ + params[1] = OSSL_PARAM_construct_octet_string(OSSL_CIPHER_PARAM_AEAD_TAG, + NULL, ccm_tag_len); + + /* + * Initialise encrypt operation with the cipher & mode, + * nonce length and tag length parameters. + */ + if (!EVP_EncryptInit_ex2(ctx, cipher, NULL, NULL, params)) + goto err; + + /* Initialise key and nonce */ + if (!EVP_EncryptInit_ex(ctx, NULL, NULL, ccm_key, ccm_nonce)) + goto err; + + /* Set plaintext length: only needed if AAD is used */ + if (!EVP_EncryptUpdate(ctx, NULL, &outlen, NULL, sizeof(ccm_pt))) + goto err; + + /* Zero or one call to specify any AAD */ + if (!EVP_EncryptUpdate(ctx, NULL, &outlen, ccm_adata, sizeof(ccm_adata))) + goto err; + + /* Encrypt plaintext: can only be called once */ + if (!EVP_EncryptUpdate(ctx, outbuf, &outlen, ccm_pt, sizeof(ccm_pt))) + goto err; + + /* Output encrypted block */ + printf("Ciphertext:\n"); + BIO_dump_fp(stdout, outbuf, outlen); + + /* Finalise: note get no output for CCM */ + if (!EVP_EncryptFinal_ex(ctx, NULL, &tmplen)) + goto err; + + /* Get tag */ + params[0] = OSSL_PARAM_construct_octet_string(OSSL_CIPHER_PARAM_AEAD_TAG, + outtag, ccm_tag_len); + params[1] = OSSL_PARAM_construct_end(); + + if (!EVP_CIPHER_CTX_get_params(ctx, params)) + goto err; + + /* Output tag */ + printf("Tag:\n"); + BIO_dump_fp(stdout, outtag, ccm_tag_len); + + ret = 1; +err: + if (!ret) + ERR_print_errors_fp(stderr); + + EVP_CIPHER_free(cipher); + EVP_CIPHER_CTX_free(ctx); + + return ret; +} + +int aes_ccm_decrypt(void) +{ + int ret = 0; + EVP_CIPHER_CTX *ctx; + EVP_CIPHER *cipher = NULL; + int outlen, rv; + unsigned char outbuf[1024]; + size_t ccm_nonce_len = sizeof(ccm_nonce); + OSSL_PARAM params[3] = { + OSSL_PARAM_END, OSSL_PARAM_END, OSSL_PARAM_END + }; + + printf("AES CCM Decrypt:\n"); + printf("Ciphertext:\n"); + BIO_dump_fp(stdout, ccm_ct, sizeof(ccm_ct)); + + if ((ctx = EVP_CIPHER_CTX_new()) == NULL) + goto err; + + /* Fetch the cipher implementation */ + if ((cipher = EVP_CIPHER_fetch(libctx, "AES-192-CCM", propq)) == NULL) + goto err; + + /* Set nonce length if default 96 bits is not appropriate */ + params[0] = OSSL_PARAM_construct_size_t(OSSL_CIPHER_PARAM_AEAD_IVLEN, + &ccm_nonce_len); + /* Set tag length */ + params[1] = OSSL_PARAM_construct_octet_string(OSSL_CIPHER_PARAM_AEAD_TAG, + (unsigned char *)ccm_tag, + sizeof(ccm_tag)); + /* + * Initialise decrypt operation with the cipher & mode, + * nonce length and expected tag parameters. + */ + if (!EVP_DecryptInit_ex2(ctx, cipher, NULL, NULL, params)) + goto err; + + /* Specify key and IV */ + if (!EVP_DecryptInit_ex(ctx, NULL, NULL, ccm_key, ccm_nonce)) + goto err; + + /* Set ciphertext length: only needed if we have AAD */ + if (!EVP_DecryptUpdate(ctx, NULL, &outlen, NULL, sizeof(ccm_ct))) + goto err; + + /* Zero or one call to specify any AAD */ + if (!EVP_DecryptUpdate(ctx, NULL, &outlen, ccm_adata, sizeof(ccm_adata))) + goto err; + + /* Decrypt plaintext, verify tag: can only be called once */ + rv = EVP_DecryptUpdate(ctx, outbuf, &outlen, ccm_ct, sizeof(ccm_ct)); + + /* Output decrypted block: if tag verify failed we get nothing */ + if (rv > 0) { + printf("Tag verify successful!\nPlaintext:\n"); + BIO_dump_fp(stdout, outbuf, outlen); + } else { + printf("Tag verify failed!\nPlaintext not available\n"); + goto err; + } + ret = 1; +err: + if (!ret) + ERR_print_errors_fp(stderr); + + EVP_CIPHER_free(cipher); + EVP_CIPHER_CTX_free(ctx); + + return ret; +} + +int main(int argc, char **argv) +{ + if (!aes_ccm_encrypt()) + return 1; + + if (!aes_ccm_decrypt()) + return 1; + + return 0; +} diff --git a/deps/openssl/openssl/demos/cipher/aesgcm.c b/deps/openssl/openssl/demos/cipher/aesgcm.c new file mode 100644 index 000000000..aaf4000d5 --- /dev/null +++ b/deps/openssl/openssl/demos/cipher/aesgcm.c @@ -0,0 +1,228 @@ +/* + * Copyright 2012-2021 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the Apache License 2.0 (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +/* + * Simple AES GCM authenticated encryption with additional data (AEAD) + * demonstration program. + */ + +#include +#include +#include +#include +#include + +/* AES-GCM test data obtained from NIST public test vectors */ + +/* AES key */ +static const unsigned char gcm_key[] = { + 0xee, 0xbc, 0x1f, 0x57, 0x48, 0x7f, 0x51, 0x92, 0x1c, 0x04, 0x65, 0x66, + 0x5f, 0x8a, 0xe6, 0xd1, 0x65, 0x8b, 0xb2, 0x6d, 0xe6, 0xf8, 0xa0, 0x69, + 0xa3, 0x52, 0x02, 0x93, 0xa5, 0x72, 0x07, 0x8f +}; + +/* Unique initialisation vector */ +static const unsigned char gcm_iv[] = { + 0x99, 0xaa, 0x3e, 0x68, 0xed, 0x81, 0x73, 0xa0, 0xee, 0xd0, 0x66, 0x84 +}; + +/* Example plaintext to encrypt */ +static const unsigned char gcm_pt[] = { + 0xf5, 0x6e, 0x87, 0x05, 0x5b, 0xc3, 0x2d, 0x0e, 0xeb, 0x31, 0xb2, 0xea, + 0xcc, 0x2b, 0xf2, 0xa5 +}; + +/* + * Example of Additional Authenticated Data (AAD), i.e. unencrypted data + * which can be authenticated using the generated Tag value. + */ +static const unsigned char gcm_aad[] = { + 0x4d, 0x23, 0xc3, 0xce, 0xc3, 0x34, 0xb4, 0x9b, 0xdb, 0x37, 0x0c, 0x43, + 0x7f, 0xec, 0x78, 0xde +}; + +/* Expected ciphertext value */ +static const unsigned char gcm_ct[] = { + 0xf7, 0x26, 0x44, 0x13, 0xa8, 0x4c, 0x0e, 0x7c, 0xd5, 0x36, 0x86, 0x7e, + 0xb9, 0xf2, 0x17, 0x36 +}; + +/* Expected AEAD Tag value */ +static const unsigned char gcm_tag[] = { + 0x67, 0xba, 0x05, 0x10, 0x26, 0x2a, 0xe4, 0x87, 0xd7, 0x37, 0xee, 0x62, + 0x98, 0xf7, 0x7e, 0x0c +}; + +/* + * A library context and property query can be used to select & filter + * algorithm implementations. If they are NULL then the default library + * context and properties are used. + */ +OSSL_LIB_CTX *libctx = NULL; +const char *propq = NULL; + +int aes_gcm_encrypt(void) +{ + int ret = 0; + EVP_CIPHER_CTX *ctx; + EVP_CIPHER *cipher = NULL; + int outlen, tmplen; + size_t gcm_ivlen = sizeof(gcm_iv); + unsigned char outbuf[1024]; + unsigned char outtag[16]; + OSSL_PARAM params[2] = { + OSSL_PARAM_END, OSSL_PARAM_END + }; + + printf("AES GCM Encrypt:\n"); + printf("Plaintext:\n"); + BIO_dump_fp(stdout, gcm_pt, sizeof(gcm_pt)); + + /* Create a context for the encrypt operation */ + if ((ctx = EVP_CIPHER_CTX_new()) == NULL) + goto err; + + /* Fetch the cipher implementation */ + if ((cipher = EVP_CIPHER_fetch(libctx, "AES-256-GCM", propq)) == NULL) + goto err; + + /* Set IV length if default 96 bits is not appropriate */ + params[0] = OSSL_PARAM_construct_size_t(OSSL_CIPHER_PARAM_AEAD_IVLEN, + &gcm_ivlen); + + /* + * Initialise an encrypt operation with the cipher/mode, key, IV and + * IV length parameter. + * For demonstration purposes the IV is being set here. In a compliant + * application the IV would be generated internally so the iv passed in + * would be NULL. + */ + if (!EVP_EncryptInit_ex2(ctx, cipher, gcm_key, gcm_iv, params)) + goto err; + + /* Zero or more calls to specify any AAD */ + if (!EVP_EncryptUpdate(ctx, NULL, &outlen, gcm_aad, sizeof(gcm_aad))) + goto err; + + /* Encrypt plaintext */ + if (!EVP_EncryptUpdate(ctx, outbuf, &outlen, gcm_pt, sizeof(gcm_pt))) + goto err; + + /* Output encrypted block */ + printf("Ciphertext:\n"); + BIO_dump_fp(stdout, outbuf, outlen); + + /* Finalise: note get no output for GCM */ + if (!EVP_EncryptFinal_ex(ctx, outbuf, &tmplen)) + goto err; + + /* Get tag */ + params[0] = OSSL_PARAM_construct_octet_string(OSSL_CIPHER_PARAM_AEAD_TAG, + outtag, 16); + + if (!EVP_CIPHER_CTX_get_params(ctx, params)) + goto err; + + /* Output tag */ + printf("Tag:\n"); + BIO_dump_fp(stdout, outtag, 16); + + ret = 1; +err: + if (!ret) + ERR_print_errors_fp(stderr); + + EVP_CIPHER_free(cipher); + EVP_CIPHER_CTX_free(ctx); + + return ret; +} + +int aes_gcm_decrypt(void) +{ + int ret = 0; + EVP_CIPHER_CTX *ctx; + EVP_CIPHER *cipher = NULL; + int outlen, rv; + size_t gcm_ivlen = sizeof(gcm_iv); + unsigned char outbuf[1024]; + OSSL_PARAM params[2] = { + OSSL_PARAM_END, OSSL_PARAM_END + }; + + printf("AES GCM Decrypt:\n"); + printf("Ciphertext:\n"); + BIO_dump_fp(stdout, gcm_ct, sizeof(gcm_ct)); + + if ((ctx = EVP_CIPHER_CTX_new()) == NULL) + goto err; + + /* Fetch the cipher implementation */ + if ((cipher = EVP_CIPHER_fetch(libctx, "AES-256-GCM", propq)) == NULL) + goto err; + + /* Set IV length if default 96 bits is not appropriate */ + params[0] = OSSL_PARAM_construct_size_t(OSSL_CIPHER_PARAM_AEAD_IVLEN, + &gcm_ivlen); + + /* + * Initialise an encrypt operation with the cipher/mode, key, IV and + * IV length parameter. + */ + if (!EVP_DecryptInit_ex2(ctx, cipher, gcm_key, gcm_iv, params)) + goto err; + + /* Zero or more calls to specify any AAD */ + if (!EVP_DecryptUpdate(ctx, NULL, &outlen, gcm_aad, sizeof(gcm_aad))) + goto err; + + /* Decrypt plaintext */ + if (!EVP_DecryptUpdate(ctx, outbuf, &outlen, gcm_ct, sizeof(gcm_ct))) + goto err; + + /* Output decrypted block */ + printf("Plaintext:\n"); + BIO_dump_fp(stdout, outbuf, outlen); + + /* Set expected tag value. */ + params[0] = OSSL_PARAM_construct_octet_string(OSSL_CIPHER_PARAM_AEAD_TAG, + (void*)gcm_tag, sizeof(gcm_tag)); + + if (!EVP_CIPHER_CTX_set_params(ctx, params)) + goto err; + + /* Finalise: note get no output for GCM */ + rv = EVP_DecryptFinal_ex(ctx, outbuf, &outlen); + /* + * Print out return value. If this is not successful authentication + * failed and plaintext is not trustworthy. + */ + printf("Tag Verify %s\n", rv > 0 ? "Successful!" : "Failed!"); + + ret = 1; +err: + if (!ret) + ERR_print_errors_fp(stderr); + + EVP_CIPHER_free(cipher); + EVP_CIPHER_CTX_free(ctx); + + return ret; +} + +int main(int argc, char **argv) +{ + if (!aes_gcm_encrypt()) + return 1; + + if (!aes_gcm_decrypt()) + return 1; + + return 0; +} diff --git a/deps/openssl/openssl/demos/cipher/aeskeywrap.c b/deps/openssl/openssl/demos/cipher/aeskeywrap.c new file mode 100644 index 000000000..f987772e4 --- /dev/null +++ b/deps/openssl/openssl/demos/cipher/aeskeywrap.c @@ -0,0 +1,181 @@ +/* + * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the Apache License 2.0 (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +/* + * Simple aes wrap encryption demonstration program. + */ + +#include +#include +#include +#include +#include +#include + +/* aes key */ +static const unsigned char wrap_key[] = { + 0xee, 0xbc, 0x1f, 0x57, 0x48, 0x7f, 0x51, 0x92, 0x1c, 0x04, 0x65, 0x66, + 0x5f, 0x8a, 0xe6, 0xd1, 0x65, 0x8b, 0xb2, 0x6d, 0xe6, 0xf8, 0xa0, 0x69, + 0xa3, 0x52, 0x02, 0x93, 0xa5, 0x72, 0x07, 0x8f +}; + +/* Unique initialisation vector */ +static const unsigned char wrap_iv[] = { + 0x99, 0xaa, 0x3e, 0x68, 0xed, 0x81, 0x73, 0xa0, 0xee, 0xd0, 0x66, 0x84, + 0x99, 0xaa, 0x3e, 0x68, +}; + +/* Example plaintext to encrypt */ +static const unsigned char wrap_pt[] = { + 0xad, 0x4f, 0xc9, 0xfc, 0x77, 0x69, 0xc9, 0xea, 0xfc, 0xdf, 0x00, 0xac, + 0x34, 0xec, 0x40, 0xbc, 0x28, 0x3f, 0xa4, 0x5e, 0xd8, 0x99, 0xe4, 0x5d, + 0x5e, 0x7a, 0xc4, 0xe6, 0xca, 0x7b, 0xa5, 0xb7, +}; + +/* Expected ciphertext value */ +static const unsigned char wrap_ct[] = { + 0x97, 0x99, 0x55, 0xca, 0xf6, 0x3e, 0x95, 0x54, 0x39, 0xd6, 0xaf, 0x63, 0xff, 0x2c, 0xe3, 0x96, + 0xf7, 0x0d, 0x2c, 0x9c, 0xc7, 0x43, 0xc0, 0xb6, 0x31, 0x43, 0xb9, 0x20, 0xac, 0x6b, 0xd3, 0x67, + 0xad, 0x01, 0xaf, 0xa7, 0x32, 0x74, 0x26, 0x92, +}; + +/* + * A library context and property query can be used to select & filter + * algorithm implementations. If they are NULL then the default library + * context and properties are used. + */ +OSSL_LIB_CTX *libctx = NULL; +const char *propq = NULL; + +int aes_wrap_encrypt(void) +{ + int ret = 0; + EVP_CIPHER_CTX *ctx; + EVP_CIPHER *cipher = NULL; + int outlen, tmplen; + unsigned char outbuf[1024]; + + printf("aes wrap Encrypt:\n"); + printf("Plaintext:\n"); + BIO_dump_fp(stdout, wrap_pt, sizeof(wrap_pt)); + + /* Create a context for the encrypt operation */ + if ((ctx = EVP_CIPHER_CTX_new()) == NULL) + goto err; + + EVP_CIPHER_CTX_set_flags(ctx, EVP_CIPHER_CTX_FLAG_WRAP_ALLOW); + + /* Fetch the cipher implementation */ + if ((cipher = EVP_CIPHER_fetch(libctx, "AES-256-WRAP", propq)) == NULL) + goto err; + + /* + * Initialise an encrypt operation with the cipher/mode, key and IV. + * We are not setting any custom params so let params be just NULL. + */ + if (!EVP_EncryptInit_ex2(ctx, cipher, wrap_key, wrap_iv, /* params */ NULL)) + goto err; + + /* Encrypt plaintext */ + if (!EVP_EncryptUpdate(ctx, outbuf, &outlen, wrap_pt, sizeof(wrap_pt))) + goto err; + + /* Finalise: there can be some additional output from padding */ + if (!EVP_EncryptFinal_ex(ctx, outbuf + outlen, &tmplen)) + goto err; + outlen += tmplen; + + /* Output encrypted block */ + printf("Ciphertext (outlen:%d):\n", outlen); + BIO_dump_fp(stdout, outbuf, outlen); + + if (sizeof(wrap_ct) == outlen && !CRYPTO_memcmp(outbuf, wrap_ct, outlen)) + printf("Final ciphertext matches expected ciphertext\n"); + else + printf("Final ciphertext differs from expected ciphertext\n"); + + ret = 1; +err: + if (!ret) + ERR_print_errors_fp(stderr); + + EVP_CIPHER_free(cipher); + EVP_CIPHER_CTX_free(ctx); + + return ret; +} + +int aes_wrap_decrypt(void) +{ + int ret = 0; + EVP_CIPHER_CTX *ctx; + EVP_CIPHER *cipher = NULL; + int outlen, tmplen; + unsigned char outbuf[1024]; + + printf("aes wrap Decrypt:\n"); + printf("Ciphertext:\n"); + BIO_dump_fp(stdout, wrap_ct, sizeof(wrap_ct)); + + if ((ctx = EVP_CIPHER_CTX_new()) == NULL) + goto err; + + EVP_CIPHER_CTX_set_flags(ctx, EVP_CIPHER_CTX_FLAG_WRAP_ALLOW); + + /* Fetch the cipher implementation */ + if ((cipher = EVP_CIPHER_fetch(libctx, "aes-256-wrap", propq)) == NULL) + goto err; + + /* + * Initialise an encrypt operation with the cipher/mode, key and IV. + * We are not setting any custom params so let params be just NULL. + */ + if (!EVP_DecryptInit_ex2(ctx, cipher, wrap_key, wrap_iv, /* params */ NULL)) + goto err; + + /* Decrypt plaintext */ + if (!EVP_DecryptUpdate(ctx, outbuf, &outlen, wrap_ct, sizeof(wrap_ct))) + goto err; + + /* Finalise: there can be some additional output from padding */ + if (!EVP_DecryptFinal_ex(ctx, outbuf + outlen, &tmplen)) + goto err; + outlen += tmplen; + + /* Output decrypted block */ + printf("Plaintext (outlen:%d):\n", outlen); + BIO_dump_fp(stdout, outbuf, outlen); + + if (sizeof(wrap_pt) == outlen && !CRYPTO_memcmp(outbuf, wrap_pt, outlen)) + printf("Final plaintext matches original plaintext\n"); + else + printf("Final plaintext differs from original plaintext\n"); + + ret = 1; +err: + if (!ret) + ERR_print_errors_fp(stderr); + + EVP_CIPHER_free(cipher); + EVP_CIPHER_CTX_free(ctx); + + return ret; +} + +int main(int argc, char **argv) +{ + if (!aes_wrap_encrypt()) + return 1; + + if (!aes_wrap_decrypt()) + return 1; + + return 0; +} + diff --git a/deps/openssl/openssl/demos/cipher/ariacbc.c b/deps/openssl/openssl/demos/cipher/ariacbc.c new file mode 100644 index 000000000..8999fe6e7 --- /dev/null +++ b/deps/openssl/openssl/demos/cipher/ariacbc.c @@ -0,0 +1,178 @@ +/* + * Copyright 2012-2022 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the Apache License 2.0 (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +/* + * Simple ARIA CBC encryption demonstration program. + */ + +#include +#include +#include +#include +#include +#include + +/* ARIA key */ +static const unsigned char cbc_key[] = { + 0xee, 0xbc, 0x1f, 0x57, 0x48, 0x7f, 0x51, 0x92, 0x1c, 0x04, 0x65, 0x66, + 0x5f, 0x8a, 0xe6, 0xd1, 0x65, 0x8b, 0xb2, 0x6d, 0xe6, 0xf8, 0xa0, 0x69, + 0xa3, 0x52, 0x02, 0x93, 0xa5, 0x72, 0x07, 0x8f +}; + +/* Unique initialisation vector */ +static const unsigned char cbc_iv[] = { + 0x99, 0xaa, 0x3e, 0x68, 0xed, 0x81, 0x73, 0xa0, 0xee, 0xd0, 0x66, 0x84, + 0x99, 0xaa, 0x3e, 0x68, +}; + +/* Example plaintext to encrypt */ +static const unsigned char cbc_pt[] = { + 0xf5, 0x6e, 0x87, 0x05, 0x5b, 0xc3, 0x2d, 0x0e, 0xeb, 0x31, 0xb2, 0xea, + 0xcc, 0x2b, 0xf2, 0xa5 +}; + +/* Expected ciphertext value */ +static const unsigned char cbc_ct[] = { + 0x9a, 0x44, 0xe6, 0x85, 0x94, 0x26, 0xff, 0x30, 0x03, 0xd3, 0x7e, 0xc6, + 0xb5, 0x4a, 0x09, 0x66, 0x39, 0x28, 0xf3, 0x67, 0x14, 0xbc, 0xe8, 0xe2, + 0xcf, 0x31, 0xb8, 0x60, 0x42, 0x72, 0x6d, 0xc8 +}; + +/* + * A library context and property query can be used to select & filter + * algorithm implementations. If they are NULL then the default library + * context and properties are used. + */ +OSSL_LIB_CTX *libctx = NULL; +const char *propq = NULL; + +int aria_cbc_encrypt(void) +{ + int ret = 0; + EVP_CIPHER_CTX *ctx; + EVP_CIPHER *cipher = NULL; + int outlen, tmplen; + size_t cbc_ivlen = sizeof(cbc_iv); + unsigned char outbuf[1024]; + unsigned char outtag[16]; + + printf("ARIA CBC Encrypt:\n"); + printf("Plaintext:\n"); + BIO_dump_fp(stdout, cbc_pt, sizeof(cbc_pt)); + + /* Create a context for the encrypt operation */ + if ((ctx = EVP_CIPHER_CTX_new()) == NULL) + goto err; + + /* Fetch the cipher implementation */ + if ((cipher = EVP_CIPHER_fetch(libctx, "ARIA-256-CBC", propq)) == NULL) + goto err; + + /* + * Initialise an encrypt operation with the cipher/mode, key and IV. + * We are not setting any custom params so let params be just NULL. + */ + if (!EVP_EncryptInit_ex2(ctx, cipher, cbc_key, cbc_iv, /* params */ NULL)) + goto err; + + /* Encrypt plaintext */ + if (!EVP_EncryptUpdate(ctx, outbuf, &outlen, cbc_pt, sizeof(cbc_pt))) + goto err; + + /* Finalise: there can be some additional output from padding */ + if (!EVP_EncryptFinal_ex(ctx, outbuf + outlen, &tmplen)) + goto err; + outlen += tmplen; + + /* Output encrypted block */ + printf("Ciphertext (outlen:%d):\n", outlen); + BIO_dump_fp(stdout, outbuf, outlen); + + if (sizeof(cbc_ct) == outlen && !CRYPTO_memcmp(outbuf, cbc_ct, outlen)) + printf("Final ciphertext matches expected ciphertext\n"); + else + printf("Final ciphertext differs from expected ciphertext\n"); + + ret = 1; +err: + if (!ret) + ERR_print_errors_fp(stderr); + + EVP_CIPHER_free(cipher); + EVP_CIPHER_CTX_free(ctx); + + return ret; +} + +int aria_cbc_decrypt(void) +{ + int ret = 0; + EVP_CIPHER_CTX *ctx; + EVP_CIPHER *cipher = NULL; + int outlen, tmplen, rv; + size_t cbc_ivlen = sizeof(cbc_iv); + unsigned char outbuf[1024]; + + printf("ARIA CBC Decrypt:\n"); + printf("Ciphertext:\n"); + BIO_dump_fp(stdout, cbc_ct, sizeof(cbc_ct)); + + if ((ctx = EVP_CIPHER_CTX_new()) == NULL) + goto err; + + /* Fetch the cipher implementation */ + if ((cipher = EVP_CIPHER_fetch(libctx, "ARIA-256-CBC", propq)) == NULL) + goto err; + + /* + * Initialise an encrypt operation with the cipher/mode, key and IV. + * We are not setting any custom params so let params be just NULL. + */ + if (!EVP_DecryptInit_ex2(ctx, cipher, cbc_key, cbc_iv, /* params */ NULL)) + goto err; + + /* Decrypt plaintext */ + if (!EVP_DecryptUpdate(ctx, outbuf, &outlen, cbc_ct, sizeof(cbc_ct))) + goto err; + + /* Finalise: there can be some additional output from padding */ + if (!EVP_DecryptFinal_ex(ctx, outbuf + outlen, &tmplen)) + goto err; + outlen += tmplen; + + /* Output decrypted block */ + printf("Plaintext (outlen:%d):\n", outlen); + BIO_dump_fp(stdout, outbuf, outlen); + + if (sizeof(cbc_pt) == outlen && !CRYPTO_memcmp(outbuf, cbc_pt, outlen)) + printf("Final plaintext matches original plaintext\n"); + else + printf("Final plaintext differs from original plaintext\n"); + + ret = 1; +err: + if (!ret) + ERR_print_errors_fp(stderr); + + EVP_CIPHER_free(cipher); + EVP_CIPHER_CTX_free(ctx); + + return ret; +} + +int main(int argc, char **argv) +{ + if (!aria_cbc_encrypt()) + return 1; + + if (!aria_cbc_decrypt()) + return 1; + + return 0; +} diff --git a/deps/openssl/openssl/demos/cms/cacert.pem b/deps/openssl/openssl/demos/cms/cacert.pem new file mode 100644 index 000000000..1949fc33a --- /dev/null +++ b/deps/openssl/openssl/demos/cms/cacert.pem @@ -0,0 +1,29 @@ +-----BEGIN CERTIFICATE----- +MIIFBjCCA26gAwIBAgIUM/WihZJZUTZvqoyNaUlp59DOaWYwDQYJKoZIhvcNAQEL +BQAwVzELMAkGA1UEBhMCVUsxEjAQBgNVBAcMCVRlc3QgQ2l0eTEWMBQGA1UECgwN +T3BlblNTTCBHcm91cDEcMBoGA1UEAwwTVGVzdCBTL01JTUUgUm9vdCBDQTAgFw0x +ODA2MTQxMjQ2MjhaGA8yMTE4MDYxNDEyNDYyOFowVzELMAkGA1UEBhMCVUsxEjAQ +BgNVBAcMCVRlc3QgQ2l0eTEWMBQGA1UECgwNT3BlblNTTCBHcm91cDEcMBoGA1UE +AwwTVGVzdCBTL01JTUUgUm9vdCBDQTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCC +AYoCggGBAMzxOVHZFVxN9XQIVW3y1bK5ir3jKpKkU6zKrw8MdRvm233eqWSOYJvs +3rgdT59iv+CaPcBT5offbP0eH43H96CubJji/vQLMUzc/cLrJuCbLHREbSCsFNpf +lYw5mkT98dCFV66HuN6Nwqi5kW8TxGSXkD4OZqklbbicrXoXh5qhREID5hgbrijy +BiIHyp6bDq5zUCcmHP/Gdw2aTMEQZNsdw4MavtB65vI7dYxo2zEzdmJ3NnjlG7qZ +6Od6V4IW8yRAK9GLj0TUCZl28pq6rNio+F5Lst3clX9PDxh7LphNrXXYiHjXp2Kn +LZbOnz1SJSmCeisy/EFN6fRtwdwqcM1AcKNBU+UqFq0Mv0sgNdRwghYWGQht0mT9 ++Pg5HxTzDlOOmBT1kAduxJNLiRQlgysPDN94Os0EpzJyA87Z6yJRGvYGZ5mrdfx2 +8p6bHptf46h1WzCX4wDy2J86y+odgWMnSkmF9h8ySj66rgmLrz40n+mDm8bhUblK +AV8IqN8WmQIDAQABo4HHMIHEMB0GA1UdDgQWBBSkmMaBYQPTEGcqe1maU2IDOMLQ +ezCBlAYDVR0jBIGMMIGJgBSkmMaBYQPTEGcqe1maU2IDOMLQe6FbpFkwVzELMAkG +A1UEBhMCVUsxEjAQBgNVBAcMCVRlc3QgQ2l0eTEWMBQGA1UECgwNT3BlblNTTCBH +cm91cDEcMBoGA1UEAwwTVGVzdCBTL01JTUUgUm9vdCBDQYIUM/WihZJZUTZvqoyN +aUlp59DOaWYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAYEAqP1CQRGM +roHvk6dhI4ElNae5seRdSQNTtwAhlP1RoSoFz8xybMgDksKE07t77gDsKvU2SuXV +fdICqVpjpN9cRYKM6VmiREdU6OGsPQ74u4sOg4cT/tuou0RsD/uQaznb5NOvo2T0 +8rmX0Ai3+lbEuMBCaGNU0KYJifYy4QrSqEapq4W3NbqH85msOiKHEDh1vz9IWz6z +WKjdv9lst56XuLTZrJ/O0T0qD6aMXyqK6ZART/FELjDXc+9Ey4TH+msOEKq0uQWt +y7Grfmz52dTnAjBw+6/ggE9sA8Wo6DhwbEUaOA9BB5YP+XWsIkUUbiVHU7D8TyiE +KHt2DkaWvjl1/RdtzQUO/vGI4yuFTZfLf23KcwgtHJI3JxLNAMLM3I2jmoWhKm/d +GkVYsGH1GWonv0UTv/TKlOXaTYWK9fQVoYkFc+FrwUd2lev5FizJNigL9qatGyRZ +giJmWWlf0bMMIxwWZzQswxLyKdkNlvkKf9T6BjEmGLeOHZCn0x2sOyUi +-----END CERTIFICATE----- diff --git a/deps/openssl/openssl/demos/cms/cakey.pem b/deps/openssl/openssl/demos/cms/cakey.pem new file mode 100644 index 000000000..486c975b7 --- /dev/null +++ b/deps/openssl/openssl/demos/cms/cakey.pem @@ -0,0 +1,39 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIG5QIBAAKCAYEAzPE5UdkVXE31dAhVbfLVsrmKveMqkqRTrMqvDwx1G+bbfd6p +ZI5gm+zeuB1Pn2K/4Jo9wFPmh99s/R4fjcf3oK5smOL+9AsxTNz9wusm4JssdERt +IKwU2l+VjDmaRP3x0IVXroe43o3CqLmRbxPEZJeQPg5mqSVtuJyteheHmqFEQgPm +GBuuKPIGIgfKnpsOrnNQJyYc/8Z3DZpMwRBk2x3Dgxq+0Hrm8jt1jGjbMTN2Ync2 +eOUbupno53pXghbzJEAr0YuPRNQJmXbymrqs2Kj4Xkuy3dyVf08PGHsumE2tddiI +eNenYqctls6fPVIlKYJ6KzL8QU3p9G3B3CpwzUBwo0FT5SoWrQy/SyA11HCCFhYZ +CG3SZP34+DkfFPMOU46YFPWQB27Ek0uJFCWDKw8M33g6zQSnMnIDztnrIlEa9gZn +mat1/Hbynpsem1/jqHVbMJfjAPLYnzrL6h2BYydKSYX2HzJKPrquCYuvPjSf6YOb +xuFRuUoBXwio3xaZAgMBAAECggGBAJrqILzozke2ujpablEtBTITJHgC9lRgmMt9 +bjR+4ysTJ4kOvZbANPDIbVZY+a3uVEIv9UujYBgG4Hi4w3tF074G+xnaRIQuzbZf +OgaUABA527GLY74VtbGYHRAhHqbWGmrX0H6iIzE/kQw/MVr4YzTyiFsQQbPMEhNB +g7RNgvh0vIb2MYC5s71JrS8eGqAnb0KY8daV7ce9upJyt2Acx1AGQJqipegrbtVd +8q4PONkJIIyvtmJONNaprq8DAJDaTNdcZu7f7mymF5UFpp4Lh6raAvOZAZjgkPYW +PsX2uMAsYchXTmSDGOHNafqeyTS0UEaw6FRhpxzMoSxRXX4/RhjeShadYwHxbh7s +UwFU7S9EWlj8CjgGs00KFM1eMV0sEYsL8sRf7ZiWM5XJsmXKbRZjA5V+7OoSGElB +zJcERK6NFCISijApZlVveEVZS0qESivKd9bspOzbMdoJyjBW1LZdMH85YIwM8Dox +VqGR0QD3UP8RpZBRwTiFenqOpwARnQKBwQD1NBGcTxLLUUluEBG/TD9KM5sCnkm8 +cn5RomwTeBrUr9SXOJuUPa8RNLrAeosuWCrx9JkF25IBExQbbs1NRHuziOIOyI0+ +hvqP85zJln7kUDtiDMFfUdS8Q6PF3b3wJl6cbipowWwsahvUSkx3W8UWrzZHsvrO +LBtvEZdwetNWN50FK040uM6y/x71xfvUhlKBsuZBgDFU9aXJZAGpkCklZnByURN6 +LZudDQETdYo7/X8qqPlcHwHStGj9YXg/e38CgcEA1fdVA6s+KlRUGRTUDaUFPDji +MciTcvA3teXJWNAsFWd71oLT5eQNI50afF242ikTT6JuXFH0mMYKoVe/LFo7m2mf +uLcW4yM/FiKTkhnBQGm7KNqyvXB0T0DWTDSeS7hTzD6KjuJPf7JVH5I4In8jSKJd +3mzTA9keIosnxjX7EOsZNQd0+MKaJYHnvJsxYaoT9FXoONuyzQu96TQ8Q+fkVHXh +I/ENAw0qfoJ5mw5dQnU2UtjP6cSNVQ9Rsr48GNnnAoHBAJcI65AMZNc3yrMw0r2y +iYl7IBAMz/5zx7shANE9OcmoRJqhE7PMCvneMOo+kVyKkmlW8KrbBKQEzG3ZYjwl +4sxDlHrmrZnGKrBgrkK9oIuhn/JVSQcdsJwGTeqjG0vBVqWkdhrwiWESOvIYkeEz +dcLzScwAQtyb7ooLm+x8u5Bv0RhOBG4VJ7y5yKg6u1O9KTUarRnLjJd4eBYEs8Fu +Oun+n2TK6+RmE2Q5jmAeFne9PYdZbb+Ame7fkYwBbcAsoQKBwQC1KHQSZyp7LGsH +0Vq5Mr77/i2FeQ1eg4SnvaZ8S8UHWla/iIVgX3XAcYO7SJ76F00CX8SQ5dLyhrr5 +YBG8u6k8LHHPMzVtmqoPU7cePDAjGWIddQ1g15WihILsgqCD+8z3YPxvfa1RsOvh +jyt4Ca0WEmLnr7v5xhp9pNRIPewUpvjwrR+cfyeEGjjat4tX5Wh/tzym51y7vvVM +Pa3I0M3BtQyqIa2ip8MS2eWcIs1TN2qHOorOolwHaLEDZY38fIECgcAKns98A2G3 +tLvZaDZlVsJWZsdSDUrFCKvx9QbTZHbyOL5JU/8TgLBgfOgV2yxLXn9Pq+0Quvb2 +EjaFuA3GKOFi50WtfwR6Yo1DaFcx5n0bDShnaHOF+dUi0BVQd2V1DsqAwF5/Eh3A +lX+XuWeSam4/91WhmNMCZpfYv0GErs4ZBHHsl54jmvrrjbhg/efUvpWKi/9vlKm+ ++ITH+nG1xCnyEEVZ+vm9Qq57lCLBZGyGT4PetllpsRrGcdO4/gfK8lY= +-----END RSA PRIVATE KEY----- diff --git a/deps/openssl/openssl/demos/cms/cms_comp.c b/deps/openssl/openssl/demos/cms/cms_comp.c new file mode 100644 index 000000000..ee1b5a38c --- /dev/null +++ b/deps/openssl/openssl/demos/cms/cms_comp.c @@ -0,0 +1,64 @@ +/* + * Copyright 2008-2016 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the Apache License 2.0 (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +/* Simple S/MIME compress example */ +#include +#include +#include + +int main(int argc, char **argv) +{ + BIO *in = NULL, *out = NULL; + CMS_ContentInfo *cms = NULL; + int ret = 1; + + /* + * On OpenSSL 1.0.0+ only: + * for streaming set CMS_STREAM + */ + int flags = CMS_STREAM; + + OpenSSL_add_all_algorithms(); + ERR_load_crypto_strings(); + + /* Open content being compressed */ + + in = BIO_new_file("comp.txt", "r"); + + if (!in) + goto err; + + /* compress content */ + cms = CMS_compress(in, NID_zlib_compression, flags); + + if (!cms) + goto err; + + out = BIO_new_file("smcomp.txt", "w"); + if (!out) + goto err; + + /* Write out S/MIME message */ + if (!SMIME_write_CMS(out, cms, in, flags)) + goto err; + + ret = 0; + + err: + + if (ret) { + fprintf(stderr, "Error Compressing Data\n"); + ERR_print_errors_fp(stderr); + } + + CMS_ContentInfo_free(cms); + BIO_free(in); + BIO_free(out); + return ret; +} diff --git a/deps/openssl/openssl/demos/cms/cms_ddec.c b/deps/openssl/openssl/demos/cms/cms_ddec.c new file mode 100644 index 000000000..cb6c2694c --- /dev/null +++ b/deps/openssl/openssl/demos/cms/cms_ddec.c @@ -0,0 +1,88 @@ +/* + * Copyright 2008-2016 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the Apache License 2.0 (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +/* + * S/MIME detached data decrypt example: rarely done but should the need + * arise this is an example.... + */ +#include +#include +#include + +int main(int argc, char **argv) +{ + BIO *in = NULL, *out = NULL, *tbio = NULL, *dcont = NULL; + X509 *rcert = NULL; + EVP_PKEY *rkey = NULL; + CMS_ContentInfo *cms = NULL; + int ret = 1; + + OpenSSL_add_all_algorithms(); + ERR_load_crypto_strings(); + + /* Read in recipient certificate and private key */ + tbio = BIO_new_file("signer.pem", "r"); + + if (!tbio) + goto err; + + rcert = PEM_read_bio_X509(tbio, NULL, 0, NULL); + + BIO_reset(tbio); + + rkey = PEM_read_bio_PrivateKey(tbio, NULL, 0, NULL); + + if (!rcert || !rkey) + goto err; + + /* Open PEM file containing enveloped data */ + + in = BIO_new_file("smencr.pem", "r"); + + if (!in) + goto err; + + /* Parse PEM content */ + cms = PEM_read_bio_CMS(in, NULL, 0, NULL); + + if (!cms) + goto err; + + /* Open file containing detached content */ + dcont = BIO_new_file("smencr.out", "rb"); + + if (!in) + goto err; + + out = BIO_new_file("encrout.txt", "w"); + if (!out) + goto err; + + /* Decrypt S/MIME message */ + if (!CMS_decrypt(cms, rkey, rcert, dcont, out, 0)) + goto err; + + ret = 0; + + err: + + if (ret) { + fprintf(stderr, "Error Decrypting Data\n"); + ERR_print_errors_fp(stderr); + } + + CMS_ContentInfo_free(cms); + X509_free(rcert); + EVP_PKEY_free(rkey); + BIO_free(in); + BIO_free(out); + BIO_free(tbio); + BIO_free(dcont); + return ret; +} diff --git a/deps/openssl/openssl/demos/cms/cms_dec.c b/deps/openssl/openssl/demos/cms/cms_dec.c new file mode 100644 index 000000000..f33ef1eb7 --- /dev/null +++ b/deps/openssl/openssl/demos/cms/cms_dec.c @@ -0,0 +1,78 @@ +/* + * Copyright 2008-2016 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the Apache License 2.0 (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +/* Simple S/MIME decryption example */ +#include +#include +#include + +int main(int argc, char **argv) +{ + BIO *in = NULL, *out = NULL, *tbio = NULL; + X509 *rcert = NULL; + EVP_PKEY *rkey = NULL; + CMS_ContentInfo *cms = NULL; + int ret = 1; + + OpenSSL_add_all_algorithms(); + ERR_load_crypto_strings(); + + /* Read in recipient certificate and private key */ + tbio = BIO_new_file("signer.pem", "r"); + + if (!tbio) + goto err; + + rcert = PEM_read_bio_X509(tbio, NULL, 0, NULL); + + BIO_reset(tbio); + + rkey = PEM_read_bio_PrivateKey(tbio, NULL, 0, NULL); + + if (!rcert || !rkey) + goto err; + + /* Open S/MIME message to decrypt */ + + in = BIO_new_file("smencr.txt", "r"); + + if (!in) + goto err; + + /* Parse message */ + cms = SMIME_read_CMS(in, NULL); + + if (!cms) + goto err; + + out = BIO_new_file("decout.txt", "w"); + if (!out) + goto err; + + /* Decrypt S/MIME message */ + if (!CMS_decrypt(cms, rkey, rcert, NULL, out, 0)) + goto err; + + ret = 0; + + err: + + if (ret) { + fprintf(stderr, "Error Decrypting Data\n"); + ERR_print_errors_fp(stderr); + } + + CMS_ContentInfo_free(cms); + X509_free(rcert); + EVP_PKEY_free(rkey); + BIO_free(in); + BIO_free(out); + BIO_free(tbio); + return ret; +} diff --git a/deps/openssl/openssl/demos/cms/cms_denc.c b/deps/openssl/openssl/demos/cms/cms_denc.c new file mode 100644 index 000000000..60b0aa192 --- /dev/null +++ b/deps/openssl/openssl/demos/cms/cms_denc.c @@ -0,0 +1,97 @@ +/* + * Copyright 2008-2016 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the Apache License 2.0 (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +/* + * S/MIME detached data encrypt example: rarely done but should the need + * arise this is an example.... + */ +#include +#include +#include + +int main(int argc, char **argv) +{ + BIO *in = NULL, *out = NULL, *tbio = NULL, *dout = NULL; + X509 *rcert = NULL; + STACK_OF(X509) *recips = NULL; + CMS_ContentInfo *cms = NULL; + int ret = 1; + + int flags = CMS_STREAM | CMS_DETACHED; + + OpenSSL_add_all_algorithms(); + ERR_load_crypto_strings(); + + /* Read in recipient certificate */ + tbio = BIO_new_file("signer.pem", "r"); + + if (!tbio) + goto err; + + rcert = PEM_read_bio_X509(tbio, NULL, 0, NULL); + + if (!rcert) + goto err; + + /* Create recipient STACK and add recipient cert to it */ + recips = sk_X509_new_null(); + + if (!recips || !sk_X509_push(recips, rcert)) + goto err; + + /* + * sk_X509_pop_free will free up recipient STACK and its contents so set + * rcert to NULL so it isn't freed up twice. + */ + rcert = NULL; + + /* Open content being encrypted */ + + in = BIO_new_file("encr.txt", "r"); + + dout = BIO_new_file("smencr.out", "wb"); + + if (!in) + goto err; + + /* encrypt content */ + cms = CMS_encrypt(recips, in, EVP_des_ede3_cbc(), flags); + + if (!cms) + goto err; + + out = BIO_new_file("smencr.pem", "w"); + if (!out) + goto err; + + if (!CMS_final(cms, in, dout, flags)) + goto err; + + /* Write out CMS structure without content */ + if (!PEM_write_bio_CMS(out, cms)) + goto err; + + ret = 0; + + err: + + if (ret) { + fprintf(stderr, "Error Encrypting Data\n"); + ERR_print_errors_fp(stderr); + } + + CMS_ContentInfo_free(cms); + X509_free(rcert); + sk_X509_pop_free(recips, X509_free); + BIO_free(in); + BIO_free(out); + BIO_free(dout); + BIO_free(tbio); + return ret; +} diff --git a/deps/openssl/openssl/demos/cms/cms_enc.c b/deps/openssl/openssl/demos/cms/cms_enc.c new file mode 100644 index 000000000..9ef7a3955 --- /dev/null +++ b/deps/openssl/openssl/demos/cms/cms_enc.c @@ -0,0 +1,92 @@ +/* + * Copyright 2008-2016 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the Apache License 2.0 (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +/* Simple S/MIME encrypt example */ +#include +#include +#include + +int main(int argc, char **argv) +{ + BIO *in = NULL, *out = NULL, *tbio = NULL; + X509 *rcert = NULL; + STACK_OF(X509) *recips = NULL; + CMS_ContentInfo *cms = NULL; + int ret = 1; + + /* + * On OpenSSL 1.0.0 and later only: + * for streaming set CMS_STREAM + */ + int flags = CMS_STREAM; + + OpenSSL_add_all_algorithms(); + ERR_load_crypto_strings(); + + /* Read in recipient certificate */ + tbio = BIO_new_file("signer.pem", "r"); + + if (!tbio) + goto err; + + rcert = PEM_read_bio_X509(tbio, NULL, 0, NULL); + + if (!rcert) + goto err; + + /* Create recipient STACK and add recipient cert to it */ + recips = sk_X509_new_null(); + + if (!recips || !sk_X509_push(recips, rcert)) + goto err; + + /* + * sk_X509_pop_free will free up recipient STACK and its contents so set + * rcert to NULL so it isn't freed up twice. + */ + rcert = NULL; + + /* Open content being encrypted */ + + in = BIO_new_file("encr.txt", "r"); + + if (!in) + goto err; + + /* encrypt content */ + cms = CMS_encrypt(recips, in, EVP_des_ede3_cbc(), flags); + + if (!cms) + goto err; + + out = BIO_new_file("smencr.txt", "w"); + if (!out) + goto err; + + /* Write out S/MIME message */ + if (!SMIME_write_CMS(out, cms, in, flags)) + goto err; + + ret = 0; + + err: + + if (ret) { + fprintf(stderr, "Error Encrypting Data\n"); + ERR_print_errors_fp(stderr); + } + + CMS_ContentInfo_free(cms); + X509_free(rcert); + sk_X509_pop_free(recips, X509_free); + BIO_free(in); + BIO_free(out); + BIO_free(tbio); + return ret; +} diff --git a/deps/openssl/openssl/demos/cms/cms_sign.c b/deps/openssl/openssl/demos/cms/cms_sign.c new file mode 100644 index 000000000..a52f5cec0 --- /dev/null +++ b/deps/openssl/openssl/demos/cms/cms_sign.c @@ -0,0 +1,88 @@ +/* + * Copyright 2008-2016 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the Apache License 2.0 (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +/* Simple S/MIME signing example */ +#include +#include +#include + +int main(int argc, char **argv) +{ + BIO *in = NULL, *out = NULL, *tbio = NULL; + X509 *scert = NULL; + EVP_PKEY *skey = NULL; + CMS_ContentInfo *cms = NULL; + int ret = 1; + + /* + * For simple S/MIME signing use CMS_DETACHED. On OpenSSL 1.0.0 only: for + * streaming detached set CMS_DETACHED|CMS_STREAM for streaming + * non-detached set CMS_STREAM + */ + int flags = CMS_DETACHED | CMS_STREAM; + + OpenSSL_add_all_algorithms(); + ERR_load_crypto_strings(); + + /* Read in signer certificate and private key */ + tbio = BIO_new_file("signer.pem", "r"); + + if (!tbio) + goto err; + + scert = PEM_read_bio_X509(tbio, NULL, 0, NULL); + + BIO_reset(tbio); + + skey = PEM_read_bio_PrivateKey(tbio, NULL, 0, NULL); + + if (!scert || !skey) + goto err; + + /* Open content being signed */ + + in = BIO_new_file("sign.txt", "r"); + + if (!in) + goto err; + + /* Sign content */ + cms = CMS_sign(scert, skey, NULL, in, flags); + + if (!cms) + goto err; + + out = BIO_new_file("smout.txt", "w"); + if (!out) + goto err; + + if (!(flags & CMS_STREAM)) + BIO_reset(in); + + /* Write out S/MIME message */ + if (!SMIME_write_CMS(out, cms, in, flags)) + goto err; + + ret = 0; + + err: + + if (ret) { + fprintf(stderr, "Error Signing Data\n"); + ERR_print_errors_fp(stderr); + } + + CMS_ContentInfo_free(cms); + X509_free(scert); + EVP_PKEY_free(skey); + BIO_free(in); + BIO_free(out); + BIO_free(tbio); + return ret; +} diff --git a/deps/openssl/openssl/demos/cms/cms_sign2.c b/deps/openssl/openssl/demos/cms/cms_sign2.c new file mode 100644 index 000000000..beda9779a --- /dev/null +++ b/deps/openssl/openssl/demos/cms/cms_sign2.c @@ -0,0 +1,98 @@ +/* + * Copyright 2008-2016 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the Apache License 2.0 (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +/* S/MIME signing example: 2 signers */ +#include +#include +#include + +int main(int argc, char **argv) +{ + BIO *in = NULL, *out = NULL, *tbio = NULL; + X509 *scert = NULL, *scert2 = NULL; + EVP_PKEY *skey = NULL, *skey2 = NULL; + CMS_ContentInfo *cms = NULL; + int ret = 1; + + OpenSSL_add_all_algorithms(); + ERR_load_crypto_strings(); + + tbio = BIO_new_file("signer.pem", "r"); + + if (!tbio) + goto err; + + scert = PEM_read_bio_X509(tbio, NULL, 0, NULL); + + BIO_reset(tbio); + + skey = PEM_read_bio_PrivateKey(tbio, NULL, 0, NULL); + + BIO_free(tbio); + + tbio = BIO_new_file("signer2.pem", "r"); + + if (!tbio) + goto err; + + scert2 = PEM_read_bio_X509(tbio, NULL, 0, NULL); + + BIO_reset(tbio); + + skey2 = PEM_read_bio_PrivateKey(tbio, NULL, 0, NULL); + + if (!scert2 || !skey2) + goto err; + + in = BIO_new_file("sign.txt", "r"); + + if (!in) + goto err; + + cms = CMS_sign(NULL, NULL, NULL, in, CMS_STREAM | CMS_PARTIAL); + + if (!cms) + goto err; + + /* Add each signer in turn */ + + if (!CMS_add1_signer(cms, scert, skey, NULL, 0)) + goto err; + + if (!CMS_add1_signer(cms, scert2, skey2, NULL, 0)) + goto err; + + out = BIO_new_file("smout.txt", "w"); + if (!out) + goto err; + + /* NB: content included and finalized by SMIME_write_CMS */ + + if (!SMIME_write_CMS(out, cms, in, CMS_STREAM)) + goto err; + + ret = 0; + + err: + + if (ret) { + fprintf(stderr, "Error Signing Data\n"); + ERR_print_errors_fp(stderr); + } + + CMS_ContentInfo_free(cms); + X509_free(scert); + EVP_PKEY_free(skey); + X509_free(scert2); + EVP_PKEY_free(skey2); + BIO_free(in); + BIO_free(out); + BIO_free(tbio); + return ret; +} diff --git a/deps/openssl/openssl/demos/cms/cms_uncomp.c b/deps/openssl/openssl/demos/cms/cms_uncomp.c new file mode 100644 index 000000000..35e68ebcc --- /dev/null +++ b/deps/openssl/openssl/demos/cms/cms_uncomp.c @@ -0,0 +1,58 @@ +/* + * Copyright 2008-2016 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the Apache License 2.0 (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +/* Simple S/MIME uncompression example */ +#include +#include +#include + +int main(int argc, char **argv) +{ + BIO *in = NULL, *out = NULL; + CMS_ContentInfo *cms = NULL; + int ret = 1; + + OpenSSL_add_all_algorithms(); + ERR_load_crypto_strings(); + + /* Open compressed content */ + + in = BIO_new_file("smcomp.txt", "r"); + + if (!in) + goto err; + + /* Sign content */ + cms = SMIME_read_CMS(in, NULL); + + if (!cms) + goto err; + + out = BIO_new_file("smuncomp.txt", "w"); + if (!out) + goto err; + + /* Uncompress S/MIME message */ + if (!CMS_uncompress(cms, out, NULL, 0)) + goto err; + + ret = 0; + + err: + + if (ret) { + fprintf(stderr, "Error Uncompressing Data\n"); + ERR_print_errors_fp(stderr); + } + + CMS_ContentInfo_free(cms); + BIO_free(in); + BIO_free(out); + return ret; +} diff --git a/deps/openssl/openssl/demos/cms/cms_ver.c b/deps/openssl/openssl/demos/cms/cms_ver.c new file mode 100644 index 000000000..3c0a7aa19 --- /dev/null +++ b/deps/openssl/openssl/demos/cms/cms_ver.c @@ -0,0 +1,88 @@ +/* + * Copyright 2008-2016 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the Apache License 2.0 (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +/* Simple S/MIME verification example */ +#include +#include +#include + +int main(int argc, char **argv) +{ + BIO *in = NULL, *out = NULL, *tbio = NULL, *cont = NULL; + X509_STORE *st = NULL; + X509 *cacert = NULL; + CMS_ContentInfo *cms = NULL; + + int ret = 1; + + OpenSSL_add_all_algorithms(); + ERR_load_crypto_strings(); + + /* Set up trusted CA certificate store */ + + st = X509_STORE_new(); + if (st == NULL) + goto err; + + /* Read in CA certificate */ + tbio = BIO_new_file("cacert.pem", "r"); + + if (tbio == NULL) + goto err; + + cacert = PEM_read_bio_X509(tbio, NULL, 0, NULL); + + if (cacert == NULL) + goto err; + + if (!X509_STORE_add_cert(st, cacert)) + goto err; + + /* Open message being verified */ + + in = BIO_new_file("smout.txt", "r"); + + if (in == NULL) + goto err; + + /* parse message */ + cms = SMIME_read_CMS(in, &cont); + + if (cms == NULL) + goto err; + + /* File to output verified content to */ + out = BIO_new_file("smver.txt", "w"); + if (out == NULL) + goto err; + + if (!CMS_verify(cms, NULL, st, cont, out, 0)) { + fprintf(stderr, "Verification Failure\n"); + goto err; + } + + fprintf(stderr, "Verification Successful\n"); + + ret = 0; + + err: + + if (ret) { + fprintf(stderr, "Error Verifying Data\n"); + ERR_print_errors_fp(stderr); + } + + X509_STORE_free(st); + CMS_ContentInfo_free(cms); + X509_free(cacert); + BIO_free(in); + BIO_free(out); + BIO_free(tbio); + return ret; +} diff --git a/deps/openssl/openssl/demos/cms/comp.txt b/deps/openssl/openssl/demos/cms/comp.txt new file mode 100644 index 000000000..1672328e7 --- /dev/null +++ b/deps/openssl/openssl/demos/cms/comp.txt @@ -0,0 +1,22 @@ +Content-type: text/plain + +Some Text To be Compressed +Some Text To be Compressed +Some Text To be Compressed +Some Text To be Compressed +Some Text To be Compressed +Some Text To be Compressed +Some Text To be Compressed +Some Text To be Compressed +Some Text To be Compressed +Some Text To be Compressed +Some Text To be Compressed +Some Text To be Compressed +Some Text To be Compressed +Some Text To be Compressed +Some Text To be Compressed +Some Text To be Compressed +Some Text To be Compressed +Some Text To be Compressed +Some Text To be Compressed +Some Text To be Compressed diff --git a/deps/openssl/openssl/demos/cms/encr.txt b/deps/openssl/openssl/demos/cms/encr.txt new file mode 100644 index 000000000..0eceb407b --- /dev/null +++ b/deps/openssl/openssl/demos/cms/encr.txt @@ -0,0 +1,3 @@ +Content-type: text/plain + +Sample OpenSSL Data for CMS encryption diff --git a/deps/openssl/openssl/demos/cms/sign.txt b/deps/openssl/openssl/demos/cms/sign.txt new file mode 100644 index 000000000..c3f9d73d6 --- /dev/null +++ b/deps/openssl/openssl/demos/cms/sign.txt @@ -0,0 +1,3 @@ +Content-type: text/plain + +Test OpenSSL CMS Signed Content diff --git a/deps/openssl/openssl/demos/cms/signer.pem b/deps/openssl/openssl/demos/cms/signer.pem new file mode 100644 index 000000000..4bbf7a69f --- /dev/null +++ b/deps/openssl/openssl/demos/cms/signer.pem @@ -0,0 +1,52 @@ +-----BEGIN CERTIFICATE----- +MIIELDCCApSgAwIBAgIIcsOElVeHzfQwDQYJKoZIhvcNAQELBQAwVzELMAkGA1UE +BhMCVUsxEjAQBgNVBAcMCVRlc3QgQ2l0eTEWMBQGA1UECgwNT3BlblNTTCBHcm91 +cDEcMBoGA1UEAwwTVGVzdCBTL01JTUUgUm9vdCBDQTAgFw0xODA2MTQxMjQ2Mjha +GA8yMTE4MDYxNDEyNDYyOFowVjELMAkGA1UEBhMCVUsxJTAjBgNVBAMMHE9wZW5T +U0wgdGVzdCBTL01JTUUgc2lnbmVyIDExIDAeBgkqhkiG9w0BCQEWEXRlc3QxQG9w +ZW5zc2wub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1vvSgaL1 +byi9AE8Ep3v7Yv36JxYywaZhUy8dEFRiYn6NsVhhNo6SK1Mp8daQ0MZoMzbT1aKp +JTLTgDJZHit2t1d6l3aWJG+cbcLua+XKowaZjj6rirB390fuL4qt5PiAb571QFtu +L8apcydwGEdkaPRuCnvctN8VcZPTKh+M8VEESyxk5K37QYKaAB6ItWR5KhjiAuDt +zsJbjEtOvGtmu2FRCU47GzfkdjYo7tY38WTY+2WWh+idKErtmYSinmhE0H7+yoJB +s1VCI+cq5tVW+oEO9HF4vEDEUykEFFPsCEkIWM+RjCgK8cRSCpg6VQr+ZTii6k7C +m9CP81QhUoV3QwIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1P +cGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUg1DE7OaNqMQQ +8Z1bvjhnlisxfsMwHwYDVR0jBBgwFoAUpJjGgWED0xBnKntZmlNiAzjC0HswDQYJ +KoZIhvcNAQELBQADggGBAGxAivCwPsAYmMZfVJTELWNNMBzKzmeRvrp6k/6S74Pw +LDEhTnslCV4U1gTSd3nQ+LRm1fkzxLA12A/rlqN51P8B+hyVSMN9dj54YUcFd+KO +XhkSDrSpph6hRqGy8zqELzlb1Q8yoIBclEmyv+CkXMrpnm+4JL4kzyj/iBRkZTDz +ns15jJD9KHgrOnclaoDRkOT6lGbsd3j+aviKEj8ZILufSMw+W2YORy3nSAencjbO +ezivVujqm+pjkfqdCS1HcFB7LhQEILfFqkssw8YmtJVrM9LF8VIcqueXbVZmeS/1 +QV5B7OEmtsM+NkoLF5ldWdPQvmftbShh+AAlpcsmqiRefQgA3aQn6YOnOHnnQwgB +oQRNjQXsjgxV4t2HFYpwkK41kx4HToVGciPNMkndzfY/GJmgXsXfB6/AfUfhLTDv +tbws1MZhaCNOffw3/SVS2nLREMFCGn5uAgNkqssWqeWJu3910XF640tqPBj5YGFc +fykwWNhG5xS04EHpztgKdQ== +-----END CERTIFICATE----- +-----BEGIN RSA PRIVATE KEY----- +MIIEpQIBAAKCAQEA1vvSgaL1byi9AE8Ep3v7Yv36JxYywaZhUy8dEFRiYn6NsVhh +No6SK1Mp8daQ0MZoMzbT1aKpJTLTgDJZHit2t1d6l3aWJG+cbcLua+XKowaZjj6r +irB390fuL4qt5PiAb571QFtuL8apcydwGEdkaPRuCnvctN8VcZPTKh+M8VEESyxk +5K37QYKaAB6ItWR5KhjiAuDtzsJbjEtOvGtmu2FRCU47GzfkdjYo7tY38WTY+2WW +h+idKErtmYSinmhE0H7+yoJBs1VCI+cq5tVW+oEO9HF4vEDEUykEFFPsCEkIWM+R +jCgK8cRSCpg6VQr+ZTii6k7Cm9CP81QhUoV3QwIDAQABAoIBAQC6LCWmIisNcmgK +RmOvbszKc0sYYj7eOGl8EgbHR2xUA2hNNk4pYtnuLvzZ84hBZDCEeWyFS3HTRuql +z/QhDl6mc1k0pXtsXkNHQlIamksbVvHPnzIKzrt1J5N7FEt3SERhZXTZoNQRB6di +k7qdK+YmhdZtucnt0GrPisaJaf0yU/EjLuX+MU/0Xrc23lVhR3yqYhaOhWvrxTHM +evykI0kOL+gU58eN2eWE4ELjS2z+njKDqcEyeIy00FdBAtCoKjMsWpRytKNmcFm9 +LdtMmizskF8VS3+XsDbkseIODx1xJ65IFmHHMV2xLG5/+bQppkB8JuE3EDrtFiUJ +lGdfmBlxAoGBAP3Asg0drdunv7imeEOGpyj5JwF1hCVQ71IBGdqTr3aPqOlDH/io +up7t+VBuSLqj1P20HygNjow+ALw/Ko+a0icodg7QA2Co0/RiBwa+u2SgpYDqC9Kt +KIdRcv+NXkhXF/DLIn0jJvI53OtKsbgTv/C+aCipblofnO9sF4AhShq1AoGBANjj +Ou0czloNORbk3qAxLi4b5P/YOyZBJDa0zijFdD1jImfOeyNFXeg2ID+8ZjDkP/eP +pLy/Gt/8bVb+O+9wMOho3kWKZBN3O2VsLJYakAehDsC5ax7i2HtEqg1L1krW2duS +POiKg3qNjETM30zTA4pHwkNAETIktResze7SRm0XAoGABH7KaLMS5mZFXjcMwF19 +TpuDVmJHkgWqB7DfTWD6ZcZLvr4irdwHWlNq7ELX5P6MAmaTerkqwk9C4hLYZSzf +9jOgS8jhlm/HOXgXGcZ9OV4jMHJ0/Sl2I1eNCvvtJKjuUqS2mrLpuLbPtBdhqJoo +91HYNIgz3ULcG921WN6+GlUCgYEA066T6LDgxgt52NpwXrEhfWdETmDg+ilCCxLU +0/5DwVZsUhy5Gmeti+Kn/w0GQFnGBP1xr7ZlqI9auDlSjhNV6L/RkNXNbyJEGm1F +5wrt4ERVfcx6vJ5y43zU7D1EXa7s2t0UDXKDeK2GZe//UZ/yKJh5BeIV5nblOMI0 +DA+3JOkCgYEA80QGLjGlCvxKceVbuohbIZ1+/EoXPq993ER9S8D2MTGATsEcygtF +rM8JcHTv75sjycqu68BAQr1Z5qwwrMyY0vWVEorKzvAXEWolC67asR4cDutOd+qy +WlEIyojX45GwHCHpcbVRiGRWuj3kwkc+WzdgusBoAJrPCigES/Cr8uA= +-----END RSA PRIVATE KEY----- diff --git a/deps/openssl/openssl/demos/cms/signer2.pem b/deps/openssl/openssl/demos/cms/signer2.pem new file mode 100644 index 000000000..52827297e --- /dev/null +++ b/deps/openssl/openssl/demos/cms/signer2.pem @@ -0,0 +1,52 @@ +-----BEGIN CERTIFICATE----- +MIIELDCCApSgAwIBAgIIcsOElVeHzfUwDQYJKoZIhvcNAQELBQAwVzELMAkGA1UE +BhMCVUsxEjAQBgNVBAcMCVRlc3QgQ2l0eTEWMBQGA1UECgwNT3BlblNTTCBHcm91 +cDEcMBoGA1UEAwwTVGVzdCBTL01JTUUgUm9vdCBDQTAgFw0xODA2MTQxMjQ2Mjha +GA8yMTE4MDYxNDEyNDYyOFowVjELMAkGA1UEBhMCVUsxJTAjBgNVBAMMHE9wZW5T +U0wgdGVzdCBTL01JTUUgc2lnbmVyIDIxIDAeBgkqhkiG9w0BCQEWEXRlc3QyQG9w +ZW5zc2wub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1ledrM9R +3x3bZypZAEi00DJYAmLS5F6Gg3+xpjE745UWKrjDAY5KswavKKa3vZxoUz2omNSg +4nYfLSowq7AI3VnZ8LwNo8lAeo7AX9elrsmzQzhr2DCdCdbRhCWoiS/ba5tKIhlb +gFnP+pB8jhC9qZuQJkpVaivywMW8rA9DRbeDcQjDKhUi0ukVDYHDd9+FtNM3H1t3 +AUGWBecjWYa4hXC3CsH3+cFBZKjAepL74hqiEfsEyzKesft3NFd1AcVY9W5MRCK4 +lUFiDbBtIgPkvPJeoEs/kFp3+OvJFDwi4K4Z6XzALyT0LXNx6w3kSfx0TLdNjXLD +O9a2dzwhHhPtCQIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1P +cGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUYJEUXnMb/ux0 +WrzSh+bnhpi6GS0wHwYDVR0jBBgwFoAUpJjGgWED0xBnKntZmlNiAzjC0HswDQYJ +KoZIhvcNAQELBQADggGBAFbrwfsSciDFI97c7oqS8jtxOSa3c4B7xhmcgUkYCiaD +7mbZuqTUf4ltJJZXP/TJ44fhL0zVAvRXSXw1LE3YvLGOlBc6dM3D7DyL5pfUTUBY +ICt+NLfG5iHtkiZPPSfK2t5f4UGFwU/ERT62sLu4keLI5igi9J2jKSykN3u5SQ3s +Zsennow5zUsFkcz9hkB4RczlHRogA0SgVhELQbN1nYIqJJDRFZL+CmarDRTFMilk +7dXCacw6xt9vIc3ZXO+pu2g1ezgSPwOoUykQcL3UhAEIIyt+TRe3fafh5TXwd8tr +FAecAuz5Mqsmek5nEW9ZeYmxNz5VFwc4F61y4xFj7lI0frLCCAu3gVoqiQrW+WwR +e27z1Nm4uUcduFqj45Pu2eTyV3LZtLUbFvL5ZSPUCSk1wVmC2otX8ksFDDTO1rIy +l5Qd1g1P8bLuj8NG98J2zVOabtaxYCAIBPZ3dUh2eNrPKoLAvrgKh1MH+K2Eh5Oy +z1T4Eu+e5Kq/uQkZpI5QzA== +-----END CERTIFICATE----- +-----BEGIN RSA PRIVATE KEY----- +MIIEogIBAAKCAQEA1ledrM9R3x3bZypZAEi00DJYAmLS5F6Gg3+xpjE745UWKrjD +AY5KswavKKa3vZxoUz2omNSg4nYfLSowq7AI3VnZ8LwNo8lAeo7AX9elrsmzQzhr +2DCdCdbRhCWoiS/ba5tKIhlbgFnP+pB8jhC9qZuQJkpVaivywMW8rA9DRbeDcQjD +KhUi0ukVDYHDd9+FtNM3H1t3AUGWBecjWYa4hXC3CsH3+cFBZKjAepL74hqiEfsE +yzKesft3NFd1AcVY9W5MRCK4lUFiDbBtIgPkvPJeoEs/kFp3+OvJFDwi4K4Z6XzA +LyT0LXNx6w3kSfx0TLdNjXLDO9a2dzwhHhPtCQIDAQABAoIBAGMEGJfTMiwS+979 +ph3GeJjRGO0JQAk1TYiDvcpbZiItJg9YSOV4GTP4u4PY+HqEPYFus2relu/mx2Iy +4kb9zCqNLmvSQ67M8pdrSJ093pEPJlvAPbmiQ3lfHmyghOnTDNb55tY3xphVZQmI +I7HxM9ydO4skva6NXNgGwLDvYBFc6z6d95ai/WEFWHOt5Mt7OVOWAHQ0lAOofWLA +2BwKmrQnCwMvm1TMoKaAU/ngTToUGBMIN1HwRcY6qDraZte5o3EDRABHB78OHrSu +I/Eoi//5C8A7iZ5Y189lMbahIN6xVMwHwwIqLptTV2GNZOKSiIXnM06vIf4CPZKl +3VlwBgECgYEA/BKnn23KtefA906QNkrIOXASLEE1T77NlTYIRDTsUoz6XTVSvOCI +ARxdsoLwFko5ICMhti9S/1G/MYH0BoJN8rbzvjmZDfwF612p0AYALyBlRgW+ID9L +41CJQcLWxeiQd/GcrUZmudVNUGXa8nsNHmFleGLchXeqU7M6fljJOkECgYEA2a56 +yvYQgMF/SIPkxU1+WcQC6+JGc+ax220/lysBsDb4SkXomfGtFWbenxwamuQu+n67 +DJWi9oJIi9Vj4eKOXS6vjCAkYeLgCpK6S26frPtxJuZwl/lF7mFl8Z4ZnJeiFJ4h +AXt5r9vqnOZtCnLqRRAlqF5OswWgv/mhJ6jpMMkCgYBMPaAxWlXLexMkOcDoiunQ +ZZM5i2eCfSVVEgiiCJfJyBYZhv1FX2wDWf8E9RGEzGJG1BloLxwdWS5I3RNfvJ2y +4Z8LVAR09Fsd+zBXWNlJZ7T53tbIjhx33m4FU9b9+P9pJ8zJo9eCMX+253e3i3xG +ShMUvGIShEUiF72DZXtHgQKBgDi867CfNmn5BW4nQqfSrQ5EsuY80lQ/WzhwX1TN +luERUuI5GomVnqGncHtUXfLlawFLqwF6t0E9cB9SfXhRDv5mvsbtUc5Zzj+zQu+K +ZAA4gaO8CLjz9jBOHr49kTtpootxM/Uo8+zMi3hd7yn8Def2b3pVKnorC10+eazW +sAFRAoGAet6fQbQD+4vZ1oukZcZhmVlIWTSZJ1vAGCcT/3E40pqpPY+Ho56Lcwh0 +9f4TAykuGwFgqvZvR8yD2gpuISYGYplWqa1N6qxMaiVzmY5q1XW+O74xRH5Kz5fr +D+3j2x4EiyG7AYyZMOphDtBd/TSQQMYmGW6PiyM9ceIVnDK1Dd4= +-----END RSA PRIVATE KEY----- diff --git a/deps/openssl/openssl/demos/digest/BIO_f_md.c b/deps/openssl/openssl/demos/digest/BIO_f_md.c new file mode 100644 index 000000000..2ecc53e13 --- /dev/null +++ b/deps/openssl/openssl/demos/digest/BIO_f_md.c @@ -0,0 +1,122 @@ +/*- + * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the Apache License 2.0 (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +/*- + * Example of using EVP_MD_fetch and EVP_Digest* methods to calculate + * a digest of static buffers + * You can find SHA3 test vectors from NIST here: + * https://csrc.nist.gov/CSRC/media/Projects/Cryptographic-Algorithm-Validation-Program/documents/sha3/sha-3bytetestvectors.zip + * For example, contains these lines: + Len = 80 + Msg = 1ca984dcc913344370cf + MD = 6915ea0eeffb99b9b246a0e34daf3947852684c3d618260119a22835659e4f23d4eb66a15d0affb8e93771578f5e8f25b7a5f2a55f511fb8b96325ba2cd14816 + * use xxd convert the hex message string to binary input for BIO_f_md: + * echo "1ca984dcc913344370cf" | xxd -r -p | ./BIO_f_md + * and then verify the output matches MD above. + */ + +#include +#include +#include +#include +#include + +/*- + * This demonstration will show how to digest data using + * a BIO configured with a message digest + * A message digest name may be passed as an argument. + * The default digest is SHA3-512 + */ + +int main(int argc, char * argv[]) +{ + int result = 1; + OSSL_LIB_CTX *library_context = NULL; + BIO *input = NULL; + BIO *bio_digest = NULL; + EVP_MD *md = NULL; + unsigned char buffer[512]; + size_t readct, writect; + size_t digest_size; + char *digest_value=NULL; + int j; + + input = BIO_new_fd( fileno(stdin), 1 ); + if (input == NULL) { + fprintf(stderr, "BIO_new_fd() for stdin returned NULL\n"); + goto cleanup; + } + library_context = OSSL_LIB_CTX_new(); + if (library_context == NULL) { + fprintf(stderr, "OSSL_LIB_CTX_new() returned NULL\n"); + goto cleanup; + } + + /* + * Fetch a message digest by name + * The algorithm name is case insensitive. + * See providers(7) for details about algorithm fetching + */ + md = EVP_MD_fetch( library_context, "SHA3-512", NULL ); + if (md == NULL) { + fprintf(stderr, "EVP_MD_fetch did not find SHA3-512.\n"); + goto cleanup; + } + digest_size = EVP_MD_get_size(md); + digest_value = OPENSSL_malloc(digest_size); + if (digest_value == NULL) { + fprintf(stderr, "Can't allocate %lu bytes for the digest value.\n", (unsigned long)digest_size); + goto cleanup; + } + /* Make a bio that uses the digest */ + bio_digest = BIO_new(BIO_f_md()); + if (bio_digest == NULL) { + fprintf(stderr, "BIO_new(BIO_f_md()) returned NULL\n"); + goto cleanup; + } + /* set our bio_digest BIO to digest data */ + if (BIO_set_md(bio_digest,md) != 1) { + fprintf(stderr, "BIO_set_md failed.\n"); + goto cleanup; + } + /*- + * We will use BIO chaining so that as we read, the digest gets updated + * See the man page for BIO_push + */ + BIO *reading = BIO_push( bio_digest, input ); + + while( BIO_read(reading, buffer, sizeof(buffer)) > 0 ) + ; + + /*- + * BIO_gets must be used to calculate the final + * digest value and then copy it to digest_value. + */ + if (BIO_gets(bio_digest, digest_value, digest_size) != digest_size) { + fprintf(stderr, "BIO_gets(bio_digest) failed\n"); + goto cleanup; + } + for (j=0; j +#include +#include +#include + +/*- + * This demonstration will show how to digest data using + * the soliloqy from Hamlet scene 1 act 3 + * The soliloqy is split into two parts to demonstrate using EVP_DigestUpdate + * more than once. + */ + +const char * hamlet_1 = + "To be, or not to be, that is the question,\n" + "Whether tis nobler in the minde to suffer\n" + "The Å¿lings and arrowes of outragious fortune,\n" + "Or to take Armes again in a sea of troubles,\n" + "And by opposing, end them, to die to sleep;\n" + "No more, and by a sleep, to say we end\n" + "The heart-ache, and the thousand natural shocks\n" + "That flesh is heir to? tis a consumation\n" + "Devoutly to be wished. To die to sleep,\n" + "To sleepe, perchance to dreame, Aye, there's the rub,\n" + "For in that sleep of death what dreams may come\n" + "When we haue shuffled off this mortal coil\n" + "Must give us pause. There's the respect\n" + "That makes calamity of so long life:\n" + "For who would bear the Ships and Scorns of time,\n" + "The oppressor's wrong, the proud man's Contumely,\n" + "The pangs of dispised love, the Law's delay,\n" +; +const char * hamlet_2 = + "The insolence of Office, and the spurns\n" + "That patient merit of the'unworthy takes,\n" + "When he himself might his Quietas make\n" + "With a bare bodkin? Who would fardels bear,\n" + "To grunt and sweat under a weary life,\n" + "But that the dread of something after death,\n" + "The undiscovered country, from whose bourn\n" + "No traveller returns, puzzles the will,\n" + "And makes us rather bear those ills we have,\n" + "Then fly to others we know not of?\n" + "Thus conscience does make cowards of us all,\n" + "And thus the native hue of Resolution\n" + "Is sickled o'er with the pale cast of Thought,\n" + "And enterprises of great pith and moment,\n" + "With this regard their currents turn awry,\n" + "And lose the name of Action. Soft you now,\n" + "The fair Ophelia? Nymph in thy Orisons\n" + "Be all my sins remember'd.\n" +; + +/* The known value of the SHA3-512 digest of the above soliloqy */ +const unsigned char known_answer[] = { + 0xbb, 0x69, 0xf8, 0x09, 0x9c, 0x2e, 0x00, 0x3d, + 0xa4, 0x29, 0x5f, 0x59, 0x4b, 0x89, 0xe4, 0xd9, + 0xdb, 0xa2, 0xe5, 0xaf, 0xa5, 0x87, 0x73, 0x9d, + 0x83, 0x72, 0xcf, 0xea, 0x84, 0x66, 0xc1, 0xf9, + 0xc9, 0x78, 0xef, 0xba, 0x3d, 0xe9, 0xc1, 0xff, + 0xa3, 0x75, 0xc7, 0x58, 0x74, 0x8e, 0x9c, 0x1d, + 0x14, 0xd9, 0xdd, 0xd1, 0xfd, 0x24, 0x30, 0xd6, + 0x81, 0xca, 0x8f, 0x78, 0x29, 0x19, 0x9a, 0xfe, +}; + +int demonstrate_digest(void) +{ + OSSL_LIB_CTX *library_context; + int result = 0; + const char *option_properties = NULL; + EVP_MD *message_digest = NULL; + EVP_MD_CTX *digest_context = NULL; + unsigned int digest_length; + unsigned char *digest_value = NULL; + int j; + + library_context = OSSL_LIB_CTX_new(); + if (library_context == NULL) { + fprintf(stderr, "OSSL_LIB_CTX_new() returned NULL\n"); + goto cleanup; + } + + /* + * Fetch a message digest by name + * The algorithm name is case insensitive. + * See providers(7) for details about algorithm fetching + */ + message_digest = EVP_MD_fetch(library_context, + "SHA3-512", option_properties); + if (message_digest == NULL) { + fprintf(stderr, "EVP_MD_fetch could not find SHA3-512."); + goto cleanup; + } + /* Determine the length of the fetched digest type */ + digest_length = EVP_MD_get_size(message_digest); + if (digest_length <= 0) { + fprintf(stderr, "EVP_MD_get_size returned invalid size.\n"); + goto cleanup; + } + + digest_value = OPENSSL_malloc(digest_length); + if (digest_value == NULL) { + fprintf(stderr, "No memory.\n"); + goto cleanup; + } + /* + * Make a message digest context to hold temporary state + * during digest creation + */ + digest_context = EVP_MD_CTX_new(); + if (digest_context == NULL) { + fprintf(stderr, "EVP_MD_CTX_new failed.\n"); + goto cleanup; + } + /* + * Initialize the message digest context to use the fetched + * digest provider + */ + if (EVP_DigestInit(digest_context, message_digest) != 1) { + fprintf(stderr, "EVP_DigestInit failed.\n"); + goto cleanup; + } + /* Digest parts one and two of the soliloqy */ + if (EVP_DigestUpdate(digest_context, hamlet_1, strlen(hamlet_1)) != 1) { + fprintf(stderr, "EVP_DigestUpdate(hamlet_1) failed.\n"); + goto cleanup; + } + if (EVP_DigestUpdate(digest_context, hamlet_2, strlen(hamlet_2)) != 1) { + fprintf(stderr, "EVP_DigestUpdate(hamlet_2) failed.\n"); + goto cleanup; + } + if (EVP_DigestFinal(digest_context, digest_value, &digest_length) != 1) { + fprintf(stderr, "EVP_DigestFinal() failed.\n"); + goto cleanup; + } + for (j=0; j +#include +#include +#include + +/*- + * This demonstration will show how to digest data using + * a BIO created to read from stdin + */ + +int demonstrate_digest(BIO *input) +{ + OSSL_LIB_CTX *library_context = NULL; + int result = 0; + const char * option_properties = NULL; + EVP_MD *message_digest = NULL; + EVP_MD_CTX *digest_context = NULL; + unsigned int digest_length; + unsigned char *digest_value = NULL; + unsigned char buffer[512]; + int ii; + + library_context = OSSL_LIB_CTX_new(); + if (library_context == NULL) { + fprintf(stderr, "OSSL_LIB_CTX_new() returned NULL\n"); + goto cleanup; + } + + /* + * Fetch a message digest by name + * The algorithm name is case insensitive. + * See providers(7) for details about algorithm fetching + */ + message_digest = EVP_MD_fetch(library_context, + "SHA3-512", option_properties); + if (message_digest == NULL) { + fprintf(stderr, "EVP_MD_fetch could not find SHA3-512."); + ERR_print_errors_fp(stderr); + OSSL_LIB_CTX_free(library_context); + return 0; + } + /* Determine the length of the fetched digest type */ + digest_length = EVP_MD_get_size(message_digest); + if (digest_length <= 0) { + fprintf(stderr, "EVP_MD_get_size returned invalid size.\n"); + goto cleanup; + } + + digest_value = OPENSSL_malloc(digest_length); + if (digest_value == NULL) { + fprintf(stderr, "No memory.\n"); + goto cleanup; + } + /* + * Make a message digest context to hold temporary state + * during digest creation + */ + digest_context = EVP_MD_CTX_new(); + if (digest_context == NULL) { + fprintf(stderr, "EVP_MD_CTX_new failed.\n"); + ERR_print_errors_fp(stderr); + goto cleanup; + } + /* + * Initialize the message digest context to use the fetched + * digest provider + */ + if (EVP_DigestInit(digest_context, message_digest) != 1) { + fprintf(stderr, "EVP_DigestInit failed.\n"); + ERR_print_errors_fp(stderr); + goto cleanup; + } + while ((ii = BIO_read(input, buffer, sizeof(buffer))) > 0) { + if (EVP_DigestUpdate(digest_context, buffer, ii) != 1) { + fprintf(stderr, "EVP_DigestUpdate() failed.\n"); + goto cleanup; + } + } + if (EVP_DigestFinal(digest_context, digest_value, &digest_length) != 1) { + fprintf(stderr, "EVP_DigestFinal() failed.\n"); + goto cleanup; + } + result = 1; + for (ii=0; ii +#include +#include +#include +#include + +/* + * Example of using an extendable-output hash function (XOF). A XOF is a hash + * function with configurable output length and which can generate an + * arbitrarily large output. + * + * This example uses SHAKE256, an extendable output variant of SHA3 (Keccak). + * + * To generate different output lengths, you can pass a single integer argument + * on the command line, which is the output size in bytes. By default, a 20-byte + * output is generated and (for this length only) a known answer test is + * performed. + */ + +/* Our input to the XOF hash function. */ +const char message[] = "This is a test message."; + +/* Expected output when an output length of 20 bytes is used. */ +static const char known_answer[] = { + 0x52, 0x97, 0x93, 0x78, 0x27, 0x58, 0x7d, 0x62, + 0x8b, 0x00, 0x25, 0xb5, 0xec, 0x39, 0x5e, 0x2d, + 0x7f, 0x3e, 0xd4, 0x19 +}; + +/* + * A property query used for selecting the SHAKE256 implementation. + */ +static const char *propq = NULL; + +int main(int argc, char **argv) +{ + int rv = 1; + OSSL_LIB_CTX *libctx = NULL; + EVP_MD *md = NULL; + EVP_MD_CTX *ctx = NULL; + unsigned int digest_len = 20; + int digest_len_i; + unsigned char *digest = NULL; + + /* Allow digest length to be changed for demonstration purposes. */ + if (argc > 1) { + digest_len_i = atoi(argv[1]); + if (digest_len_i <= 0) { + fprintf(stderr, "Specify a non-negative digest length\n"); + goto end; + } + + digest_len = (unsigned int)digest_len_i; + } + + /* + * Retrieve desired algorithm. This must be a hash algorithm which supports + * XOF. + */ + md = EVP_MD_fetch(libctx, "SHAKE256", propq); + if (md == NULL) { + fprintf(stderr, "Failed to retrieve SHAKE256 algorithm\n"); + goto end; + } + + /* Create context. */ + ctx = EVP_MD_CTX_new(); + if (ctx == NULL) { + fprintf(stderr, "Failed to create digest context\n"); + goto end; + } + + /* Initialize digest context. */ + if (EVP_DigestInit(ctx, md) == 0) { + fprintf(stderr, "Failed to initialize digest\n"); + goto end; + } + + /* + * Feed our message into the digest function. + * This may be called multiple times. + */ + if (EVP_DigestUpdate(ctx, message, sizeof(message)) == 0) { + fprintf(stderr, "Failed to hash input message\n"); + goto end; + } + + /* Allocate enough memory for our digest length. */ + digest = OPENSSL_malloc(digest_len); + if (digest == NULL) { + fprintf(stderr, "Failed to allocate memory for digest\n"); + goto end; + } + + /* Get computed digest. The digest will be of whatever length we specify. */ + if (EVP_DigestFinalXOF(ctx, digest, digest_len) == 0) { + fprintf(stderr, "Failed to finalize hash\n"); + goto end; + } + + printf("Output digest:\n"); + BIO_dump_indent_fp(stdout, digest, digest_len, 2); + + /* If digest length is 20 bytes, check it matches our known answer. */ + if (digest_len == 20) { + /* + * Always use a constant-time function such as CRYPTO_memcmp + * when comparing cryptographic values. Do not use memcmp(3). + */ + if (CRYPTO_memcmp(digest, known_answer, sizeof(known_answer)) != 0) { + fprintf(stderr, "Output does not match expected result\n"); + goto end; + } + } + + rv = 0; +end: + OPENSSL_free(digest); + EVP_MD_CTX_free(ctx); + EVP_MD_free(md); + OSSL_LIB_CTX_free(libctx); + return rv; +} diff --git a/deps/openssl/openssl/demos/digest/Makefile b/deps/openssl/openssl/demos/digest/Makefile new file mode 100644 index 000000000..0bfb6dd5f --- /dev/null +++ b/deps/openssl/openssl/demos/digest/Makefile @@ -0,0 +1,23 @@ +# +# To run the demos when linked with a shared library (default): +# +# LD_LIBRARY_PATH=../.. ./EVP_MD_demo + +CFLAGS = -I../../include -g -Wall +LDFLAGS = -L../.. +LDLIBS = -lcrypto + +all: EVP_MD_demo EVP_MD_stdin EVP_MD_xof BIO_f_md + +%.o: %.c + $(CC) $(CFLAGS) -c $< + +EVP_MD_demo: EVP_MD_demo.o +EVP_MD_stdin: EVP_MD_stdin.o +EVP_MD_xof: EVP_MD_xof.o +BIO_f_md: BIO_f_md.o + +test: ; + +clean: + $(RM) *.o EVP_MD_demo EVP_MD_stdin EVP_MD_xof BIO_f_md diff --git a/deps/openssl/openssl/demos/encode/Makefile b/deps/openssl/openssl/demos/encode/Makefile new file mode 100644 index 000000000..b88d76b51 --- /dev/null +++ b/deps/openssl/openssl/demos/encode/Makefile @@ -0,0 +1,20 @@ +# +# To run the demos when linked with a shared library (default): +# +# LD_LIBRARY_PATH=../.. ./rsa_encode + +CFLAGS = -I../../include -g -Wall +LDFLAGS = -L../.. +LDLIBS = -lcrypto + +all: ec_encode rsa_encode + +%.o: %.c + $(CC) $(CFLAGS) -c $< + +%_encode: %_encode.o + +test: ; + +clean: + $(RM) *.o rsa_encode ec_encode diff --git a/deps/openssl/openssl/demos/encode/ec_encode.c b/deps/openssl/openssl/demos/encode/ec_encode.c new file mode 100644 index 000000000..8c296fbad --- /dev/null +++ b/deps/openssl/openssl/demos/encode/ec_encode.c @@ -0,0 +1,205 @@ +/*- + * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the Apache License 2.0 (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ +#include +#include +#include +#include + +/* + * Example showing the encoding and decoding of EC public and private keys. A + * PEM-encoded EC key is read in from stdin, decoded, and then re-encoded and + * output for demonstration purposes. Both public and private keys are accepted. + * + * This can be used to load EC keys from a file or save EC keys to a file. + */ + +/* A property query used for selecting algorithm implementations. */ +static const char *propq = NULL; + +/* + * Load a PEM-encoded EC key from a file, optionally decrypting it with a + * supplied passphrase. + */ +static EVP_PKEY *load_key(OSSL_LIB_CTX *libctx, FILE *f, const char *passphrase) +{ + int rv = 0; + EVP_PKEY *pkey = NULL; + OSSL_DECODER_CTX *dctx = NULL; + int selection = 0; + + /* + * Create PEM decoder context expecting an EC key. + * + * For raw (non-PEM-encoded) keys, change "PEM" to "DER". + * + * The selection argument here specifies whether we are willing to accept a + * public key, private key, or either. If it is set to zero, either will be + * accepted. If set to EVP_PKEY_KEYPAIR, a private key will be required, and + * if set to EVP_PKEY_PUBLIC_KEY, a public key will be required. + */ + dctx = OSSL_DECODER_CTX_new_for_pkey(&pkey, "PEM", NULL, "EC", + selection, + libctx, propq); + if (dctx == NULL) { + fprintf(stderr, "OSSL_DECODER_CTX_new_for_pkey() failed\n"); + goto cleanup; + } + + /* + * Set passphrase if provided; needed to decrypt encrypted PEM files. + * If the input is not encrypted, any passphrase provided is ignored. + * + * Alternative methods for specifying passphrases exist, such as a callback + * (see OSSL_DECODER_CTX_set_passphrase_cb(3)), which may be more useful for + * interactive applications which do not know if a passphrase should be + * prompted for in advance, or for GUI applications. + */ + if (passphrase != NULL) { + if (OSSL_DECODER_CTX_set_passphrase(dctx, + (const unsigned char *)passphrase, + strlen(passphrase)) == 0) { + fprintf(stderr, "OSSL_DECODER_CTX_set_passphrase() failed\n"); + goto cleanup; + } + } + + /* Do the decode, reading from file. */ + if (OSSL_DECODER_from_fp(dctx, f) == 0) { + fprintf(stderr, "OSSL_DECODER_from_fp() failed\n"); + goto cleanup; + } + + rv = 1; +cleanup: + OSSL_DECODER_CTX_free(dctx); + + /* + * pkey is created by OSSL_DECODER_CTX_new_for_pkey, but we + * might fail subsequently, so ensure it's properly freed + * in this case. + */ + if (rv == 0) { + EVP_PKEY_free(pkey); + pkey = NULL; + } + + return pkey; +} + +/* + * Store a EC public or private key to a file using PEM encoding. + * + * If a passphrase is supplied, the file is encrypted, otherwise + * it is unencrypted. + */ +static int store_key(EVP_PKEY *pkey, FILE *f, const char *passphrase) +{ + int rv = 0; + int selection; + OSSL_ENCODER_CTX *ectx = NULL; + + /* + * Create a PEM encoder context. + * + * For raw (non-PEM-encoded) output, change "PEM" to "DER". + * + * The selection argument controls whether the private key is exported + * (EVP_PKEY_KEYPAIR), or only the public key (EVP_PKEY_PUBLIC_KEY). The + * former will fail if we only have a public key. + * + * Note that unlike the decode API, you cannot specify zero here. + * + * Purely for the sake of demonstration, here we choose to export the whole + * key if a passphrase is provided and the public key otherwise. + */ + selection = (passphrase != NULL) + ? EVP_PKEY_KEYPAIR + : EVP_PKEY_PUBLIC_KEY; + + ectx = OSSL_ENCODER_CTX_new_for_pkey(pkey, selection, "PEM", NULL, propq); + if (ectx == NULL) { + fprintf(stderr, "OSSL_ENCODER_CTX_new_for_pkey() failed\n"); + goto cleanup; + } + + /* + * Set passphrase if provided; the encoded output will then be encrypted + * using the passphrase. + * + * Alternative methods for specifying passphrases exist, such as a callback + * (see OSSL_ENCODER_CTX_set_passphrase_cb(3), just as for OSSL_DECODER_CTX; + * however you are less likely to need them as you presumably know whether + * encryption is desired in advance. + * + * Note that specifying a passphrase alone is not enough to cause the + * key to be encrypted. You must set both a cipher and a passphrase. + */ + if (passphrase != NULL) { + /* + * Set cipher. Let's use AES-256-CBC, because it is + * more quantum resistant. + */ + if (OSSL_ENCODER_CTX_set_cipher(ectx, "AES-256-CBC", propq) == 0) { + fprintf(stderr, "OSSL_ENCODER_CTX_set_cipher() failed\n"); + goto cleanup; + } + + /* Set passphrase. */ + if (OSSL_ENCODER_CTX_set_passphrase(ectx, + (const unsigned char *)passphrase, + strlen(passphrase)) == 0) { + fprintf(stderr, "OSSL_ENCODER_CTX_set_passphrase() failed\n"); + goto cleanup; + } + } + + /* Do the encode, writing to the given file. */ + if (OSSL_ENCODER_to_fp(ectx, f) == 0) { + fprintf(stderr, "OSSL_ENCODER_to_fp() failed\n"); + goto cleanup; + } + + rv = 1; +cleanup: + OSSL_ENCODER_CTX_free(ectx); + return rv; +} + +int main(int argc, char **argv) +{ + int rv = 1; + OSSL_LIB_CTX *libctx = NULL; + EVP_PKEY *pkey = NULL; + const char *passphrase_in = NULL, *passphrase_out = NULL; + + /* usage: ec_encode */ + if (argc > 1 && argv[1][0]) + passphrase_in = argv[1]; + + if (argc > 2 && argv[2][0]) + passphrase_out = argv[2]; + + /* Decode PEM key from stdin and then PEM encode it to stdout. */ + pkey = load_key(libctx, stdin, passphrase_in); + if (pkey == NULL) { + fprintf(stderr, "Failed to decode key\n"); + goto cleanup; + } + + if (store_key(pkey, stdout, passphrase_out) == 0) { + fprintf(stderr, "Failed to encode key\n"); + goto cleanup; + } + + rv = 0; +cleanup: + EVP_PKEY_free(pkey); + OSSL_LIB_CTX_free(libctx); + return rv; +} diff --git a/deps/openssl/openssl/demos/encode/rsa_encode.c b/deps/openssl/openssl/demos/encode/rsa_encode.c new file mode 100644 index 000000000..2bf6d13e6 --- /dev/null +++ b/deps/openssl/openssl/demos/encode/rsa_encode.c @@ -0,0 +1,202 @@ +/*- + * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the Apache License 2.0 (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ +#include +#include +#include +#include + +/* + * Example showing the encoding and decoding of RSA public and private keys. A + * PEM-encoded RSA key is read in from stdin, decoded, and then re-encoded and + * output for demonstration purposes. Both public and private keys are accepted. + * + * This can be used to load RSA keys from a file or save RSA keys to a file. + */ + +/* A property query used for selecting algorithm implementations. */ +static const char *propq = NULL; + +/* + * Load a PEM-encoded RSA key from a file, optionally decrypting it with a + * supplied passphrase. + */ +static EVP_PKEY *load_key(OSSL_LIB_CTX *libctx, FILE *f, const char *passphrase) +{ + int rv = 0; + EVP_PKEY *pkey = NULL; + OSSL_DECODER_CTX *dctx = NULL; + int selection = 0; + + /* + * Create PEM decoder context expecting an RSA key. + * + * For raw (non-PEM-encoded) keys, change "PEM" to "DER". + * + * The selection argument here specifies whether we are willing to accept a + * public key, private key, or either. If it is set to zero, either will be + * accepted. If set to EVP_PKEY_KEYPAIR, a private key will be required, and + * if set to EVP_PKEY_PUBLIC_KEY, a public key will be required. + */ + dctx = OSSL_DECODER_CTX_new_for_pkey(&pkey, "PEM", NULL, "RSA", + selection, + libctx, propq); + if (dctx == NULL) { + fprintf(stderr, "OSSL_DECODER_CTX_new_for_pkey() failed\n"); + goto cleanup; + } + + /* + * Set passphrase if provided; needed to decrypt encrypted PEM files. + * If the input is not encrypted, any passphrase provided is ignored. + * + * Alternative methods for specifying passphrases exist, such as a callback + * (see OSSL_DECODER_CTX_set_passphrase_cb(3)), which may be more useful for + * interactive applications which do not know if a passphrase should be + * prompted for in advance, or for GUI applications. + */ + if (passphrase != NULL) { + if (OSSL_DECODER_CTX_set_passphrase(dctx, + (const unsigned char *)passphrase, + strlen(passphrase)) == 0) { + fprintf(stderr, "OSSL_DECODER_CTX_set_passphrase() failed\n"); + goto cleanup; + } + } + + /* Do the decode, reading from file. */ + if (OSSL_DECODER_from_fp(dctx, f) == 0) { + fprintf(stderr, "OSSL_DECODER_from_fp() failed\n"); + goto cleanup; + } + + rv = 1; +cleanup: + OSSL_DECODER_CTX_free(dctx); + + /* + * pkey is created by OSSL_DECODER_CTX_new_for_pkey, but we + * might fail subsequently, so ensure it's properly freed + * in this case. + */ + if (rv == 0) { + EVP_PKEY_free(pkey); + pkey = NULL; + } + + return pkey; +} + +/* + * Store an RSA public or private key to a file using PEM encoding. + * + * If a passphrase is supplied, the file is encrypted, otherwise + * it is unencrypted. + */ +static int store_key(EVP_PKEY *pkey, FILE *f, const char *passphrase) +{ + int rv = 0; + int selection; + OSSL_ENCODER_CTX *ectx = NULL; + + /* + * Create a PEM encoder context. + * + * For raw (non-PEM-encoded) output, change "PEM" to "DER". + * + * The selection argument controls whether the private key is exported + * (EVP_PKEY_KEYPAIR), or only the public key (EVP_PKEY_PUBLIC_KEY). The + * former will fail if we only have a public key. + * + * Note that unlike the decode API, you cannot specify zero here. + * + * Purely for the sake of demonstration, here we choose to export the whole + * key if a passphrase is provided and the public key otherwise. + */ + selection = (passphrase != NULL) + ? EVP_PKEY_KEYPAIR + : EVP_PKEY_PUBLIC_KEY; + + ectx = OSSL_ENCODER_CTX_new_for_pkey(pkey, selection, "PEM", NULL, propq); + if (ectx == NULL) { + fprintf(stderr, "OSSL_ENCODER_CTX_new_for_pkey() failed\n"); + goto cleanup; + } + + /* + * Set passphrase if provided; the encoded output will then be encrypted + * using the passphrase. + * + * Alternative methods for specifying passphrases exist, such as a callback + * (see OSSL_ENCODER_CTX_set_passphrase_cb(3), just as for OSSL_DECODER_CTX; + * however you are less likely to need them as you presumably know whether + * encryption is desired in advance. + * + * Note that specifying a passphrase alone is not enough to cause the + * key to be encrypted. You must set both a cipher and a passphrase. + */ + if (passphrase != NULL) { + /* Set cipher. AES-128-CBC is a reasonable default. */ + if (OSSL_ENCODER_CTX_set_cipher(ectx, "AES-128-CBC", propq) == 0) { + fprintf(stderr, "OSSL_ENCODER_CTX_set_cipher() failed\n"); + goto cleanup; + } + + /* Set passphrase. */ + if (OSSL_ENCODER_CTX_set_passphrase(ectx, + (const unsigned char *)passphrase, + strlen(passphrase)) == 0) { + fprintf(stderr, "OSSL_ENCODER_CTX_set_passphrase() failed\n"); + goto cleanup; + } + } + + /* Do the encode, writing to the given file. */ + if (OSSL_ENCODER_to_fp(ectx, f) == 0) { + fprintf(stderr, "OSSL_ENCODER_to_fp() failed\n"); + goto cleanup; + } + + rv = 1; +cleanup: + OSSL_ENCODER_CTX_free(ectx); + return rv; +} + +int main(int argc, char **argv) +{ + int rv = 1; + OSSL_LIB_CTX *libctx = NULL; + EVP_PKEY *pkey = NULL; + const char *passphrase_in = NULL, *passphrase_out = NULL; + + /* usage: rsa_encode */ + if (argc > 1 && argv[1][0]) + passphrase_in = argv[1]; + + if (argc > 2 && argv[2][0]) + passphrase_out = argv[2]; + + /* Decode PEM key from stdin and then PEM encode it to stdout. */ + pkey = load_key(libctx, stdin, passphrase_in); + if (pkey == NULL) { + fprintf(stderr, "Failed to decode key\n"); + goto cleanup; + } + + if (store_key(pkey, stdout, passphrase_out) == 0) { + fprintf(stderr, "Failed to encode key\n"); + goto cleanup; + } + + rv = 0; +cleanup: + EVP_PKEY_free(pkey); + OSSL_LIB_CTX_free(libctx); + return rv; +} diff --git a/deps/openssl/openssl/demos/kdf/Makefile b/deps/openssl/openssl/demos/kdf/Makefile new file mode 100644 index 000000000..0aa511310 --- /dev/null +++ b/deps/openssl/openssl/demos/kdf/Makefile @@ -0,0 +1,22 @@ +# +# To run the demos when linked with a shared library (default): +# +# LD_LIBRARY_PATH=../.. ./hkdf + +CFLAGS = -I../../include -g +LDFLAGS = -L../.. +LDLIBS = -lcrypto + +all: hkdf pbkdf2 scrypt + +%.o: %.c + $(CC) $(CFLAGS) -c $< + +hkdf: hkdf.o +pbkdf2: pbkdf2.o +scrypt: scrypt.o + +test: ; + +clean: + $(RM) *.o hkdf pbkdf2 scrypt diff --git a/deps/openssl/openssl/demos/kdf/hkdf.c b/deps/openssl/openssl/demos/kdf/hkdf.c new file mode 100644 index 000000000..cb7a170e9 --- /dev/null +++ b/deps/openssl/openssl/demos/kdf/hkdf.c @@ -0,0 +1,104 @@ +/* + * Copyright 2021 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the Apache License 2.0 (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +#include +#include +#include +#include +#include +#include + +/* + * test vector from + * https://datatracker.ietf.org/doc/html/rfc5869 + */ + +static unsigned char hkdf_salt[] = { + 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, + 0x0c +}; + +static unsigned char hkdf_ikm[] = { + 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, + 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b +}; + +static unsigned char hkdf_info[] = { + 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9 +}; + +/* Expected output keying material */ +static unsigned char hkdf_okm[] = { + 0x3c, 0xb2, 0x5f, 0x25, 0xfa, 0xac, 0xd5, 0x7a, 0x90, 0x43, 0x4f, 0x64, + 0xd0, 0x36, 0x2f, 0x2a, 0x2d, 0x2d, 0x0a, 0x90, 0xcf, 0x1a, 0x5a, 0x4c, + 0x5d, 0xb0, 0x2d, 0x56, 0xec, 0xc4, 0xc5, 0xbf, 0x34, 0x00, 0x72, 0x08, + 0xd5, 0xb8, 0x87, 0x18, 0x58, 0x65 +}; + +int main(int argc, char **argv) +{ + int rv = 1; + EVP_KDF *kdf = NULL; + EVP_KDF_CTX *kctx = NULL; + unsigned char out[42]; + OSSL_PARAM params[5], *p = params; + OSSL_LIB_CTX *library_context = NULL; + + library_context = OSSL_LIB_CTX_new(); + if (library_context == NULL) { + fprintf(stderr, "OSSL_LIB_CTX_new() returned NULL\n"); + goto end; + } + + /* Fetch the key derivation function implementation */ + kdf = EVP_KDF_fetch(library_context, "HKDF", NULL); + if (kdf == NULL) { + fprintf(stderr, "EVP_KDF_fetch() returned NULL\n"); + goto end; + } + + /* Create a context for the key derivation operation */ + kctx = EVP_KDF_CTX_new(kdf); + if (kctx == NULL) { + fprintf(stderr, "EVP_KDF_CTX_new() returned NULL\n"); + goto end; + } + + /* Set the underlying hash function used to derive the key */ + *p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_DIGEST, + "SHA256", 0); + /* Set input keying material */ + *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_KEY, hkdf_ikm, + sizeof(hkdf_ikm)); + /* Set application specific information */ + *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_INFO, hkdf_info, + sizeof(hkdf_info)); + /* Set salt */ + *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_SALT, hkdf_salt, + sizeof(hkdf_salt)); + *p = OSSL_PARAM_construct_end(); + + /* Derive the key */ + if (EVP_KDF_derive(kctx, out, sizeof(out), params) != 1) { + fprintf(stderr, "EVP_KDF_derive() failed\n"); + goto end; + } + + if (CRYPTO_memcmp(hkdf_okm, out, sizeof(hkdf_okm)) != 0) { + fprintf(stderr, "Generated key does not match expected value\n"); + goto end; + } + + rv = 0; +end: + EVP_KDF_CTX_free(kctx); + EVP_KDF_free(kdf); + OSSL_LIB_CTX_free(library_context); + return rv; +} diff --git a/deps/openssl/openssl/demos/kdf/pbkdf2.c b/deps/openssl/openssl/demos/kdf/pbkdf2.c new file mode 100644 index 000000000..3e0adaee7 --- /dev/null +++ b/deps/openssl/openssl/demos/kdf/pbkdf2.c @@ -0,0 +1,117 @@ +/* + * Copyright 2021 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the Apache License 2.0 (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +#include +#include +#include +#include +#include +#include + +/* + * test vector from + * https://datatracker.ietf.org/doc/html/rfc7914 + */ + +/* + * Hard coding a password into an application is very bad. + * It is done here solely for educational purposes. + */ +static unsigned char password[] = { + 'P', 'a', 's', 's', 'w', 'o', 'r', 'd' +}; + +/* + * The salt is better not being hard coded too. Each password should have a + * different salt if possible. The salt is not considered secret information + * and is safe to store with an encrypted password. + */ +static unsigned char pbkdf2_salt[] = { + 'N', 'a', 'C', 'l' +}; + +/* + * The iteration parameter can be variable or hard coded. The disadvantage with + * hard coding them is that they cannot easily be adjusted for future + * technological improvements appear. + */ +static unsigned int pbkdf2_iterations = 80000; + +static const unsigned char expected_output[] = { + + 0x4d, 0xdc, 0xd8, 0xf6, 0x0b, 0x98, 0xbe, 0x21, + 0x83, 0x0c, 0xee, 0x5e, 0xf2, 0x27, 0x01, 0xf9, + 0x64, 0x1a, 0x44, 0x18, 0xd0, 0x4c, 0x04, 0x14, + 0xae, 0xff, 0x08, 0x87, 0x6b, 0x34, 0xab, 0x56, + 0xa1, 0xd4, 0x25, 0xa1, 0x22, 0x58, 0x33, 0x54, + 0x9a, 0xdb, 0x84, 0x1b, 0x51, 0xc9, 0xb3, 0x17, + 0x6a, 0x27, 0x2b, 0xde, 0xbb, 0xa1, 0xd0, 0x78, + 0x47, 0x8f, 0x62, 0xb3, 0x97, 0xf3, 0x3c, 0x8d +}; + +int main(int argc, char **argv) +{ + int rv = 1; + EVP_KDF *kdf = NULL; + EVP_KDF_CTX *kctx = NULL; + unsigned char out[64]; + OSSL_PARAM params[5], *p = params; + OSSL_LIB_CTX *library_context = NULL; + + library_context = OSSL_LIB_CTX_new(); + if (library_context == NULL) { + fprintf(stderr, "OSSL_LIB_CTX_new() returned NULL\n"); + goto end; + } + + /* Fetch the key derivation function implementation */ + kdf = EVP_KDF_fetch(library_context, "PBKDF2", NULL); + if (kdf == NULL) { + fprintf(stderr, "EVP_KDF_fetch() returned NULL\n"); + goto end; + } + + /* Create a context for the key derivation operation */ + kctx = EVP_KDF_CTX_new(kdf); + if (kctx == NULL) { + fprintf(stderr, "EVP_KDF_CTX_new() returned NULL\n"); + goto end; + } + + /* Set password */ + *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_PASSWORD, password, + sizeof(password)); + /* Set salt */ + *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_SALT, pbkdf2_salt, + sizeof(pbkdf2_salt)); + /* Set iteration count (default 2048) */ + *p++ = OSSL_PARAM_construct_uint(OSSL_KDF_PARAM_ITER, &pbkdf2_iterations); + /* Set the underlying hash function used to derive the key */ + *p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_DIGEST, + "SHA256", 0); + *p = OSSL_PARAM_construct_end(); + + /* Derive the key */ + if (EVP_KDF_derive(kctx, out, sizeof(out), params) != 1) { + fprintf(stderr, "EVP_KDF_derive() failed\n"); + goto end; + } + + if (CRYPTO_memcmp(expected_output, out, sizeof(expected_output)) != 0) { + fprintf(stderr, "Generated key does not match expected value\n"); + goto end; + } + + rv = 0; +end: + EVP_KDF_CTX_free(kctx); + EVP_KDF_free(kdf); + OSSL_LIB_CTX_free(library_context); + return rv; +} diff --git a/deps/openssl/openssl/demos/kdf/scrypt.c b/deps/openssl/openssl/demos/kdf/scrypt.c new file mode 100644 index 000000000..2be990880 --- /dev/null +++ b/deps/openssl/openssl/demos/kdf/scrypt.c @@ -0,0 +1,120 @@ +/* + * Copyright 2021 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the Apache License 2.0 (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +#include +#include +#include +#include +#include +#include + +/* + * test vector from + * https://datatracker.ietf.org/doc/html/rfc7914 + */ + +/* + * Hard coding a password into an application is very bad. + * It is done here solely for educational purposes. + */ +static unsigned char password[] = { + 'p', 'a', 's', 's', 'w', 'o', 'r', 'd' +}; + +/* + * The salt is better not being hard coded too. Each password should have a + * different salt if possible. The salt is not considered secret information + * and is safe to store with an encrypted password. + */ +static unsigned char scrypt_salt[] = { + 'N', 'a', 'C', 'l' +}; + +/* + * The SCRYPT parameters can be variable or hard coded. The disadvantage with + * hard coding them is that they cannot easily be adjusted for future + * technological improvements appear. + */ +static unsigned int scrypt_n = 1024; +static unsigned int scrypt_r = 8; +static unsigned int scrypt_p = 16; + +static const unsigned char expected_output[] = { + + 0xfd, 0xba, 0xbe, 0x1c, 0x9d, 0x34, 0x72, 0x00, + 0x78, 0x56, 0xe7, 0x19, 0x0d, 0x01, 0xe9, 0xfe, + 0x7c, 0x6a, 0xd7, 0xcb, 0xc8, 0x23, 0x78, 0x30, + 0xe7, 0x73, 0x76, 0x63, 0x4b, 0x37, 0x31, 0x62, + 0x2e, 0xaf, 0x30, 0xd9, 0x2e, 0x22, 0xa3, 0x88, + 0x6f, 0xf1, 0x09, 0x27, 0x9d, 0x98, 0x30, 0xda, + 0xc7, 0x27, 0xaf, 0xb9, 0x4a, 0x83, 0xee, 0x6d, + 0x83, 0x60, 0xcb, 0xdf, 0xa2, 0xcc, 0x06, 0x40 +}; + +int main(int argc, char **argv) +{ + int rv = 1; + EVP_KDF *kdf = NULL; + EVP_KDF_CTX *kctx = NULL; + unsigned char out[64]; + OSSL_PARAM params[6], *p = params; + OSSL_LIB_CTX *library_context = NULL; + + library_context = OSSL_LIB_CTX_new(); + if (library_context == NULL) { + fprintf(stderr, "OSSL_LIB_CTX_new() returned NULL\n"); + goto end; + } + + /* Fetch the key derivation function implementation */ + kdf = EVP_KDF_fetch(library_context, "SCRYPT", NULL); + if (kdf == NULL) { + fprintf(stderr, "EVP_KDF_fetch() returned NULL\n"); + goto end; + } + + /* Create a context for the key derivation operation */ + kctx = EVP_KDF_CTX_new(kdf); + if (kctx == NULL) { + fprintf(stderr, "EVP_KDF_CTX_new() returned NULL\n"); + goto end; + } + + /* Set password */ + *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_PASSWORD, password, + sizeof(password)); + /* Set salt */ + *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_SALT, scrypt_salt, + sizeof(scrypt_salt)); + /* Set N (default 1048576) */ + *p++ = OSSL_PARAM_construct_uint(OSSL_KDF_PARAM_SCRYPT_N, &scrypt_n); + /* Set R (default 8) */ + *p++ = OSSL_PARAM_construct_uint(OSSL_KDF_PARAM_SCRYPT_R, &scrypt_r); + /* Set P (default 1) */ + *p++ = OSSL_PARAM_construct_uint(OSSL_KDF_PARAM_SCRYPT_P, &scrypt_p); + *p = OSSL_PARAM_construct_end(); + + /* Derive the key */ + if (EVP_KDF_derive(kctx, out, sizeof(out), params) != 1) { + fprintf(stderr, "EVP_KDF_derive() failed\n"); + goto end; + } + + if (CRYPTO_memcmp(expected_output, out, sizeof(expected_output)) != 0) { + fprintf(stderr, "Generated key does not match expected value\n"); + goto end; + } + + rv = 0; +end: + EVP_KDF_CTX_free(kctx); + EVP_KDF_free(kdf); + OSSL_LIB_CTX_free(library_context); + return rv; +} diff --git a/deps/openssl/openssl/demos/keyexch/x25519.c b/deps/openssl/openssl/demos/keyexch/x25519.c new file mode 100644 index 000000000..bd35e0a98 --- /dev/null +++ b/deps/openssl/openssl/demos/keyexch/x25519.c @@ -0,0 +1,278 @@ +/* + * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the Apache License 2.0 (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +#include +#include +#include +#include + +/* + * This is a demonstration of key exchange using X25519. + * + * The variables beginning `peer1_` / `peer2_` are data which would normally be + * accessible to that peer. + * + * Ordinarily you would use random keys, which are demonstrated + * below when use_kat=0. A known answer test is demonstrated + * when use_kat=1. + */ + +/* A property query used for selecting the X25519 implementation. */ +static const char *propq = NULL; + +static const unsigned char peer1_privk_data[32] = { + 0x80, 0x5b, 0x30, 0x20, 0x25, 0x4a, 0x70, 0x2c, + 0xad, 0xa9, 0x8d, 0x7d, 0x47, 0xf8, 0x1b, 0x20, + 0x89, 0xd2, 0xf9, 0x14, 0xac, 0x92, 0x27, 0xf2, + 0x10, 0x7e, 0xdb, 0x21, 0xbd, 0x73, 0x73, 0x5d +}; + +static const unsigned char peer2_privk_data[32] = { + 0xf8, 0x84, 0x19, 0x69, 0x79, 0x13, 0x0d, 0xbd, + 0xb1, 0x76, 0xd7, 0x0e, 0x7e, 0x0f, 0xb6, 0xf4, + 0x8c, 0x4a, 0x8c, 0x5f, 0xd8, 0x15, 0x09, 0x0a, + 0x71, 0x78, 0x74, 0x92, 0x0f, 0x85, 0xc8, 0x43 +}; + +static const unsigned char expected_result[32] = { + 0x19, 0x71, 0x26, 0x12, 0x74, 0xb5, 0xb1, 0xce, + 0x77, 0xd0, 0x79, 0x24, 0xb6, 0x0a, 0x5c, 0x72, + 0x0c, 0xa6, 0x56, 0xc0, 0x11, 0xeb, 0x43, 0x11, + 0x94, 0x3b, 0x01, 0x45, 0xca, 0x19, 0xfe, 0x09 +}; + +typedef struct peer_data_st { + const char *name; /* name of peer */ + EVP_PKEY *privk; /* privk generated for peer */ + unsigned char pubk_data[32]; /* generated pubk to send to other peer */ + + unsigned char *secret; /* allocated shared secret buffer */ + size_t secret_len; +} PEER_DATA; + +/* + * Prepare for X25519 key exchange. The public key to be sent to the remote peer + * is put in pubk_data, which should be a 32-byte buffer. Returns 1 on success. + */ +static int keyexch_x25519_before( + OSSL_LIB_CTX *libctx, + const unsigned char *kat_privk_data, + PEER_DATA *local_peer) +{ + int rv = 0; + size_t pubk_data_len = 0; + + /* Generate or load X25519 key for the peer */ + if (kat_privk_data != NULL) + local_peer->privk = + EVP_PKEY_new_raw_private_key_ex(libctx, "X25519", propq, + kat_privk_data, + sizeof(peer1_privk_data)); + else + local_peer->privk = EVP_PKEY_Q_keygen(libctx, propq, "X25519"); + + if (local_peer->privk == NULL) { + fprintf(stderr, "Could not load or generate private key\n"); + goto end; + } + + /* Get public key corresponding to the private key */ + if (EVP_PKEY_get_octet_string_param(local_peer->privk, + OSSL_PKEY_PARAM_PUB_KEY, + local_peer->pubk_data, + sizeof(local_peer->pubk_data), + &pubk_data_len) == 0) { + fprintf(stderr, "EVP_PKEY_get_octet_string_param() failed\n"); + goto end; + } + + /* X25519 public keys are always 32 bytes */ + if (pubk_data_len != 32) { + fprintf(stderr, "EVP_PKEY_get_octet_string_param() " + "yielded wrong length\n"); + goto end; + } + + rv = 1; +end: + if (rv == 0) { + EVP_PKEY_free(local_peer->privk); + local_peer->privk = NULL; + } + + return rv; +} + +/* + * Complete X25519 key exchange. remote_peer_pubk_data should be the 32 byte + * public key value received from the remote peer. On success, returns 1 and the + * secret is pointed to by *secret. The caller must free it. + */ +static int keyexch_x25519_after( + OSSL_LIB_CTX *libctx, + int use_kat, + PEER_DATA *local_peer, + const unsigned char *remote_peer_pubk_data) +{ + int rv = 0; + EVP_PKEY *remote_peer_pubk = NULL; + EVP_PKEY_CTX *ctx = NULL; + + local_peer->secret = NULL; + + /* Load public key for remote peer. */ + remote_peer_pubk = + EVP_PKEY_new_raw_public_key_ex(libctx, "X25519", propq, + remote_peer_pubk_data, 32); + if (remote_peer_pubk == NULL) { + fprintf(stderr, "EVP_PKEY_new_raw_public_key_ex() failed\n"); + goto end; + } + + /* Create key exchange context. */ + ctx = EVP_PKEY_CTX_new_from_pkey(libctx, local_peer->privk, propq); + if (ctx == NULL) { + fprintf(stderr, "EVP_PKEY_CTX_new_from_pkey() failed\n"); + goto end; + } + + /* Initialize derivation process. */ + if (EVP_PKEY_derive_init(ctx) == 0) { + fprintf(stderr, "EVP_PKEY_derive_init() failed\n"); + goto end; + } + + /* Configure each peer with the other peer's public key. */ + if (EVP_PKEY_derive_set_peer(ctx, remote_peer_pubk) == 0) { + fprintf(stderr, "EVP_PKEY_derive_set_peer() failed\n"); + goto end; + } + + /* Determine the secret length. */ + if (EVP_PKEY_derive(ctx, NULL, &local_peer->secret_len) == 0) { + fprintf(stderr, "EVP_PKEY_derive() failed\n"); + goto end; + } + + /* + * We are using X25519, so the secret generated will always be 32 bytes. + * However for exposition, the code below demonstrates a generic + * implementation for arbitrary lengths. + */ + if (local_peer->secret_len != 32) { /* unreachable */ + fprintf(stderr, "Secret is always 32 bytes for X25519\n"); + goto end; + } + + /* Allocate memory for shared secrets. */ + local_peer->secret = OPENSSL_malloc(local_peer->secret_len); + if (local_peer->secret == NULL) { + fprintf(stderr, "Could not allocate memory for secret\n"); + goto end; + } + + /* Derive the shared secret. */ + if (EVP_PKEY_derive(ctx, local_peer->secret, + &local_peer->secret_len) == 0) { + fprintf(stderr, "EVP_PKEY_derive() failed\n"); + goto end; + } + + printf("Shared secret (%s):\n", local_peer->name); + BIO_dump_indent_fp(stdout, local_peer->secret, local_peer->secret_len, 2); + putchar('\n'); + + rv = 1; +end: + EVP_PKEY_CTX_free(ctx); + EVP_PKEY_free(remote_peer_pubk); + if (rv == 0) { + OPENSSL_clear_free(local_peer->secret, local_peer->secret_len); + local_peer->secret = NULL; + } + + return rv; +} + +static int keyexch_x25519(int use_kat) +{ + int rv = 0; + OSSL_LIB_CTX *libctx = NULL; + PEER_DATA peer1 = {"peer 1"}, peer2 = {"peer 2"}; + + /* + * Each peer generates its private key and sends its public key + * to the other peer. The private key is stored locally for + * later use. + */ + if (keyexch_x25519_before(libctx, use_kat ? peer1_privk_data : NULL, + &peer1) == 0) + return 0; + + if (keyexch_x25519_before(libctx, use_kat ? peer2_privk_data : NULL, + &peer2) == 0) + return 0; + + /* + * Each peer uses the other peer's public key to perform key exchange. + * After this succeeds, each peer has the same secret in its + * PEER_DATA. + */ + if (keyexch_x25519_after(libctx, use_kat, &peer1, peer2.pubk_data) == 0) + return 0; + + if (keyexch_x25519_after(libctx, use_kat, &peer2, peer1.pubk_data) == 0) + return 0; + + /* + * Here we demonstrate the secrets are equal for exposition purposes. + * + * Although in practice you will generally not need to compare secrets + * produced through key exchange, if you do compare cryptographic secrets, + * always do so using a constant-time function such as CRYPTO_memcmp, never + * using memcmp(3). + */ + if (CRYPTO_memcmp(peer1.secret, peer2.secret, peer1.secret_len) != 0) { + fprintf(stderr, "Negotiated secrets do not match\n"); + goto end; + } + + /* If we are doing the KAT, the secret should equal our reference result. */ + if (use_kat && CRYPTO_memcmp(peer1.secret, expected_result, + peer1.secret_len) != 0) { + fprintf(stderr, "Did not get expected result\n"); + goto end; + } + + rv = 1; +end: + /* The secrets are sensitive, so ensure they are erased before freeing. */ + OPENSSL_clear_free(peer1.secret, peer1.secret_len); + OPENSSL_clear_free(peer2.secret, peer2.secret_len); + + EVP_PKEY_free(peer1.privk); + EVP_PKEY_free(peer2.privk); + OSSL_LIB_CTX_free(libctx); + return rv; +} + +int main(int argc, char **argv) +{ + /* Test X25519 key exchange with known result. */ + printf("Key exchange using known answer (deterministic):\n"); + if (keyexch_x25519(1) == 0) + return 1; + + /* Test X25519 key exchange with random keys. */ + printf("Key exchange using random keys:\n"); + if (keyexch_x25519(0) == 0) + return 1; + + return 0; +} diff --git a/deps/openssl/openssl/demos/mac/Makefile b/deps/openssl/openssl/demos/mac/Makefile new file mode 100644 index 000000000..00d2d8dbe --- /dev/null +++ b/deps/openssl/openssl/demos/mac/Makefile @@ -0,0 +1,25 @@ +# Quick instruction: +# To build against an OpenSSL built in the source tree, do this: +# +# make OPENSSL_INCS_LOCATION=-I../../include OPENSSL_LIBS_LOCATION=-L../.. +# +# To run the demos when linked with a shared library (default): +# +# LD_LIBRARY_PATH=../.. ./gmac +# LD_LIBRARY_PATH=../.. ./poly1305 + +CFLAGS = $(OPENSSL_INCS_LOCATION) -Wall +LDFLAGS = $(OPENSSL_LIBS_LOCATION) -lssl -lcrypto + +all: gmac hmac-sha512 cmac-aes256 poly1305 + +gmac: gmac.o +hmac-sha512: hmac-sha512.o +cmac-aes256: cmac-aes256.o +poly1305: poly1305.o + +gmac hmac-sha512 cmac-aes256 poly1305: + $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) + +clean: + $(RM) gmac hmac-sha512 cmac-aes256 poly1305 *.o diff --git a/deps/openssl/openssl/demos/mac/cmac-aes256.c b/deps/openssl/openssl/demos/mac/cmac-aes256.c new file mode 100644 index 000000000..6f4fd78b6 --- /dev/null +++ b/deps/openssl/openssl/demos/mac/cmac-aes256.c @@ -0,0 +1,154 @@ +/*- + * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the Apache License 2.0 (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +/* + * Example of using EVP_MAC_ methods to calculate + * a CMAC of static buffers + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +/* + * Hard coding the key into an application is very bad. + * It is done here solely for educational purposes. + */ +static unsigned char key[] = { + 0x6c, 0xde, 0x14, 0xf5, 0xd5, 0x2a, 0x4a, 0xdf, + 0x12, 0x39, 0x1e, 0xbf, 0x36, 0xf9, 0x6a, 0x46, + 0x48, 0xd0, 0xb6, 0x51, 0x89, 0xfc, 0x24, 0x85, + 0xa8, 0x8d, 0xdf, 0x7e, 0x80, 0x14, 0xc8, 0xce, +}; + +static const unsigned char data[] = + "To be, or not to be, that is the question,\n" + "Whether tis nobler in the minde to suffer\n" + "The Å¿lings and arrowes of outragious fortune,\n" + "Or to take Armes again in a sea of troubles,\n" + "And by opposing, end them, to die to sleep;\n" + "No more, and by a sleep, to say we end\n" + "The heart-ache, and the thousand natural shocks\n" + "That flesh is heir to? tis a consumation\n" + "Devoutly to be wished. To die to sleep,\n" + "To sleepe, perchance to dreame, Aye, there's the rub,\n" + "For in that sleep of death what dreams may come\n" + "When we haue shuffled off this mortal coil\n" + "Must give us pause. There's the respect\n" + "That makes calamity of so long life:\n" + "For who would bear the Ships and Scorns of time,\n" + "The oppressor's wrong, the proud man's Contumely,\n" + "The pangs of dispised love, the Law's delay,\n" +; + +/* The known value of the CMAC/AES256 MAC of the above soliloqy */ +static const unsigned char expected_output[] = { + 0x67, 0x92, 0x32, 0x23, 0x50, 0x3d, 0xc5, 0xba, + 0x78, 0xd4, 0x6d, 0x63, 0xf2, 0x2b, 0xe9, 0x56, +}; + +/* + * A property query used for selecting the MAC implementation. + */ +static const char *propq = NULL; + +int main(void) +{ + int rv = EXIT_FAILURE; + OSSL_LIB_CTX *library_context = NULL; + EVP_MAC *mac = NULL; + EVP_MAC_CTX *mctx = NULL; + unsigned char *out = NULL; + size_t out_len = 0; + OSSL_PARAM params[4], *p = params; + char cipher_name[] = "aes256"; + + library_context = OSSL_LIB_CTX_new(); + if (library_context == NULL) { + fprintf(stderr, "OSSL_LIB_CTX_new() returned NULL\n"); + goto end; + } + + /* Fetch the CMAC implementation */ + mac = EVP_MAC_fetch(library_context, "CMAC", propq); + if (mac == NULL) { + fprintf(stderr, "EVP_MAC_fetch() returned NULL\n"); + goto end; + } + + /* Create a context for the CMAC operation */ + mctx = EVP_MAC_CTX_new(mac); + if (mctx == NULL) { + fprintf(stderr, "EVP_MAC_CTX_new() returned NULL\n"); + goto end; + } + + /* The underlying cipher to be used */ + *p++ = OSSL_PARAM_construct_utf8_string(OSSL_MAC_PARAM_CIPHER, cipher_name, + sizeof(cipher_name)); + *p = OSSL_PARAM_construct_end(); + + /* Initialise the CMAC operation */ + if (!EVP_MAC_init(mctx, key, sizeof(key), params)) { + fprintf(stderr, "EVP_MAC_init() failed\n"); + goto end; + } + + /* Make one or more calls to process the data to be authenticated */ + if (!EVP_MAC_update(mctx, data, sizeof(data))) { + fprintf(stderr, "EVP_MAC_update() failed\n"); + goto end; + } + + /* Make a call to the final with a NULL buffer to get the length of the MAC */ + if (!EVP_MAC_final(mctx, NULL, &out_len, 0)) { + fprintf(stderr, "EVP_MAC_final() failed\n"); + goto end; + } + out = OPENSSL_malloc(out_len); + if (out == NULL) { + fprintf(stderr, "malloc failed\n"); + goto end; + } + /* Make one call to the final to get the MAC */ + if (!EVP_MAC_final(mctx, out, &out_len, out_len)) { + fprintf(stderr, "EVP_MAC_final() failed\n"); + goto end; + } + + printf("Generated MAC:\n"); + BIO_dump_indent_fp(stdout, out, out_len, 2); + putchar('\n'); + + if (out_len != sizeof(expected_output)) { + fprintf(stderr, "Generated MAC has an unexpected length\n"); + goto end; + } + + if (CRYPTO_memcmp(expected_output, out, sizeof(expected_output)) != 0) { + fprintf(stderr, "Generated MAC does not match expected value\n"); + goto end; + } + + rv = EXIT_SUCCESS; +end: + if (rv != EXIT_SUCCESS) + ERR_print_errors_fp(stderr); + /* OpenSSL free functions will ignore NULL arguments */ + OPENSSL_free(out); + EVP_MAC_CTX_free(mctx); + EVP_MAC_free(mac); + OSSL_LIB_CTX_free(library_context); + return rv; +} diff --git a/deps/openssl/openssl/demos/mac/gmac.c b/deps/openssl/openssl/demos/mac/gmac.c new file mode 100644 index 000000000..bdaa9b1da --- /dev/null +++ b/deps/openssl/openssl/demos/mac/gmac.c @@ -0,0 +1,145 @@ +/* + * Copyright 2021 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the Apache License 2.0 (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +#include +#include +#include +#include +#include +#include + +/* + * Taken from NIST's GCM Test Vectors + * http://csrc.nist.gov/groups/STM/cavp/ + */ + +/* + * Hard coding the key into an application is very bad. + * It is done here solely for educational purposes. + */ +static unsigned char key[] = { + 0x77, 0xbe, 0x63, 0x70, 0x89, 0x71, 0xc4, 0xe2, + 0x40, 0xd1, 0xcb, 0x79, 0xe8, 0xd7, 0x7f, 0xeb +}; + +/* + * The initialisation vector (IV) is better not being hard coded too. + * Repeating password/IV pairs compromises the integrity of GMAC. + * The IV is not considered secret information and is safe to store with + * an encrypted password. + */ +static unsigned char iv[] = { + 0xe0, 0xe0, 0x0f, 0x19, 0xfe, 0xd7, 0xba, + 0x01, 0x36, 0xa7, 0x97, 0xf3 +}; + +static unsigned char data[] = { + 0x7a, 0x43, 0xec, 0x1d, 0x9c, 0x0a, 0x5a, 0x78, + 0xa0, 0xb1, 0x65, 0x33, 0xa6, 0x21, 0x3c, 0xab +}; + +static const unsigned char expected_output[] = { + 0x20, 0x9f, 0xcc, 0x8d, 0x36, 0x75, 0xed, 0x93, + 0x8e, 0x9c, 0x71, 0x66, 0x70, 0x9d, 0xd9, 0x46 +}; + +/* + * A property query used for selecting the GMAC implementation and the + * underlying GCM mode cipher. + */ +static char *propq = NULL; + +int main(int argc, char **argv) +{ + int rv = EXIT_FAILURE; + EVP_MAC *mac = NULL; + EVP_MAC_CTX *mctx = NULL; + unsigned char out[16]; + OSSL_PARAM params[4], *p = params; + OSSL_LIB_CTX *library_context = NULL; + size_t out_len = 0; + + library_context = OSSL_LIB_CTX_new(); + if (library_context == NULL) { + fprintf(stderr, "OSSL_LIB_CTX_new() returned NULL\n"); + goto end; + } + + /* Fetch the GMAC implementation */ + mac = EVP_MAC_fetch(library_context, "GMAC", propq); + if (mac == NULL) { + fprintf(stderr, "EVP_MAC_fetch() returned NULL\n"); + goto end; + } + + /* Create a context for the GMAC operation */ + mctx = EVP_MAC_CTX_new(mac); + if (mctx == NULL) { + fprintf(stderr, "EVP_MAC_CTX_new() returned NULL\n"); + goto end; + } + + /* GMAC requries a GCM mode cipher to be specified */ + *p++ = OSSL_PARAM_construct_utf8_string(OSSL_MAC_PARAM_CIPHER, + "AES-128-GCM", 0); + + /* + * If a non-default property query is required when fetching the GCM mode + * cipher, it needs to be specified too. + */ + if (propq != NULL) + *p++ = OSSL_PARAM_construct_utf8_string(OSSL_MAC_PARAM_PROPERTIES, + propq, 0); + + /* Set the initialisation vector (IV) */ + *p++ = OSSL_PARAM_construct_octet_string(OSSL_CIPHER_PARAM_IV, + iv, sizeof(iv)); + *p = OSSL_PARAM_construct_end(); + + /* Initialise the GMAC operation */ + if (!EVP_MAC_init(mctx, key, sizeof(key), params)) { + fprintf(stderr, "EVP_MAC_init() failed\n"); + goto end; + } + + /* Make one or more calls to process the data to be authenticated */ + if (!EVP_MAC_update(mctx, data, sizeof(data))) { + fprintf(stderr, "EVP_MAC_update() failed\n"); + goto end; + } + + /* Make one call to the final to get the MAC */ + if (!EVP_MAC_final(mctx, out, &out_len, sizeof(out))) { + fprintf(stderr, "EVP_MAC_final() failed\n"); + goto end; + } + + printf("Generated MAC:\n"); + BIO_dump_indent_fp(stdout, out, out_len, 2); + putchar('\n'); + + if (out_len != sizeof(expected_output)) { + fprintf(stderr, "Generated MAC has an unexpected length\n"); + goto end; + } + + if (CRYPTO_memcmp(expected_output, out, sizeof(expected_output)) != 0) { + fprintf(stderr, "Generated MAC does not match expected value\n"); + goto end; + } + + rv = EXIT_SUCCESS; +end: + EVP_MAC_CTX_free(mctx); + EVP_MAC_free(mac); + OSSL_LIB_CTX_free(library_context); + if (rv != EXIT_SUCCESS) + ERR_print_errors_fp(stderr); + return rv; +} diff --git a/deps/openssl/openssl/demos/mac/hmac-sha512.c b/deps/openssl/openssl/demos/mac/hmac-sha512.c new file mode 100644 index 000000000..c258b90ee --- /dev/null +++ b/deps/openssl/openssl/demos/mac/hmac-sha512.c @@ -0,0 +1,166 @@ +/*- + * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the Apache License 2.0 (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +/* + * Example of using EVP_MAC_ methods to calculate + * a HMAC of static buffers + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +/* + * Hard coding the key into an application is very bad. + * It is done here solely for educational purposes. + */ +static unsigned char key[] = { + 0x25, 0xfd, 0x12, 0x99, 0xdf, 0xad, 0x1a, 0x03, + 0x0a, 0x81, 0x3c, 0x2d, 0xcc, 0x05, 0xd1, 0x5c, + 0x17, 0x7a, 0x36, 0x73, 0x17, 0xef, 0x41, 0x75, + 0x71, 0x18, 0xe0, 0x1a, 0xda, 0x99, 0xc3, 0x61, + 0x38, 0xb5, 0xb1, 0xe0, 0x82, 0x2c, 0x70, 0xa4, + 0xc0, 0x8e, 0x5e, 0xf9, 0x93, 0x9f, 0xcf, 0xf7, + 0x32, 0x4d, 0x0c, 0xbd, 0x31, 0x12, 0x0f, 0x9a, + 0x15, 0xee, 0x82, 0xdb, 0x8d, 0x29, 0x54, 0x14, +}; + +static const unsigned char data[] = + "To be, or not to be, that is the question,\n" + "Whether tis nobler in the minde to suffer\n" + "The Å¿lings and arrowes of outragious fortune,\n" + "Or to take Armes again in a sea of troubles,\n" + "And by opposing, end them, to die to sleep;\n" + "No more, and by a sleep, to say we end\n" + "The heart-ache, and the thousand natural shocks\n" + "That flesh is heir to? tis a consumation\n" + "Devoutly to be wished. To die to sleep,\n" + "To sleepe, perchance to dreame, Aye, there's the rub,\n" + "For in that sleep of death what dreams may come\n" + "When we haue shuffled off this mortal coil\n" + "Must give us pause. There's the respect\n" + "That makes calamity of so long life:\n" + "For who would bear the Ships and Scorns of time,\n" + "The oppressor's wrong, the proud man's Contumely,\n" + "The pangs of dispised love, the Law's delay,\n" +; + +/* The known value of the HMAC/SHA3-512 MAC of the above soliloqy */ +static const unsigned char expected_output[] = { + 0x3b, 0x77, 0x5f, 0xf1, 0x4f, 0x9e, 0xb9, 0x23, + 0x8f, 0xdc, 0xa0, 0x68, 0x15, 0x7b, 0x8a, 0xf1, + 0x96, 0x23, 0xaa, 0x3c, 0x1f, 0xe9, 0xdc, 0x89, + 0x11, 0x7d, 0x58, 0x07, 0xe7, 0x96, 0x17, 0xe3, + 0x44, 0x8b, 0x03, 0x37, 0x91, 0xc0, 0x6e, 0x06, + 0x7c, 0x54, 0xe4, 0xa4, 0xcc, 0xd5, 0x16, 0xbb, + 0x5e, 0x4d, 0x64, 0x7d, 0x88, 0x23, 0xc9, 0xb7, + 0x25, 0xda, 0xbe, 0x4b, 0xe4, 0xd5, 0x34, 0x30, +}; + +/* + * A property query used for selecting the MAC implementation. + */ +static const char *propq = NULL; + +int main(void) +{ + int rv = EXIT_FAILURE; + OSSL_LIB_CTX *library_context = NULL; + EVP_MAC *mac = NULL; + EVP_MAC_CTX *mctx = NULL; + EVP_MD_CTX *digest_context = NULL; + unsigned char *out = NULL; + size_t out_len = 0; + OSSL_PARAM params[4], *p = params; + char digest_name[] = "SHA3-512"; + + library_context = OSSL_LIB_CTX_new(); + if (library_context == NULL) { + fprintf(stderr, "OSSL_LIB_CTX_new() returned NULL\n"); + goto end; + } + + /* Fetch the HMAC implementation */ + mac = EVP_MAC_fetch(library_context, "HMAC", propq); + if (mac == NULL) { + fprintf(stderr, "EVP_MAC_fetch() returned NULL\n"); + goto end; + } + + /* Create a context for the HMAC operation */ + mctx = EVP_MAC_CTX_new(mac); + if (mctx == NULL) { + fprintf(stderr, "EVP_MAC_CTX_new() returned NULL\n"); + goto end; + } + + /* The underlying digest to be used */ + *p++ = OSSL_PARAM_construct_utf8_string(OSSL_MAC_PARAM_DIGEST, digest_name, + sizeof(digest_name)); + *p = OSSL_PARAM_construct_end(); + + /* Initialise the HMAC operation */ + if (!EVP_MAC_init(mctx, key, sizeof(key), params)) { + fprintf(stderr, "EVP_MAC_init() failed\n"); + goto end; + } + + /* Make one or more calls to process the data to be authenticated */ + if (!EVP_MAC_update(mctx, data, sizeof(data))) { + fprintf(stderr, "EVP_MAC_update() failed\n"); + goto end; + } + + /* Make a call to the final with a NULL buffer to get the length of the MAC */ + if (!EVP_MAC_final(mctx, NULL, &out_len, 0)) { + fprintf(stderr, "EVP_MAC_final() failed\n"); + goto end; + } + out = OPENSSL_malloc(out_len); + if (out == NULL) { + fprintf(stderr, "malloc failed\n"); + goto end; + } + /* Make one call to the final to get the MAC */ + if (!EVP_MAC_final(mctx, out, &out_len, out_len)) { + fprintf(stderr, "EVP_MAC_final() failed\n"); + goto end; + } + + printf("Generated MAC:\n"); + BIO_dump_indent_fp(stdout, out, out_len, 2); + putchar('\n'); + + if (out_len != sizeof(expected_output)) { + fprintf(stderr, "Generated MAC has an unexpected length\n"); + goto end; + } + + if (CRYPTO_memcmp(expected_output, out, sizeof(expected_output)) != 0) { + fprintf(stderr, "Generated MAC does not match expected value\n"); + goto end; + } + + rv = EXIT_SUCCESS; +end: + if (rv != EXIT_SUCCESS) + ERR_print_errors_fp(stderr); + /* OpenSSL free functions will ignore NULL arguments */ + OPENSSL_free(out); + EVP_MD_CTX_free(digest_context); + EVP_MAC_CTX_free(mctx); + EVP_MAC_free(mac); + OSSL_LIB_CTX_free(library_context); + return rv; +} diff --git a/deps/openssl/openssl/demos/mac/poly1305.c b/deps/openssl/openssl/demos/mac/poly1305.c new file mode 100644 index 000000000..1aa95e583 --- /dev/null +++ b/deps/openssl/openssl/demos/mac/poly1305.c @@ -0,0 +1,209 @@ +/* + * Copyright 2021-2022 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the Apache License 2.0 (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +#include +#include +#include +#include +#include +#include +#include + +/* + * This is a demonstration of how to compute Poly1305-AES using the OpenSSL + * Poly1305 and AES providers and the EVP API. + * + * Please note that: + * + * - Poly1305 must never be used alone and must be used in conjunction with + * another primitive which processes the input nonce to be secure; + * + * - you must never pass a nonce to the Poly1305 primitive directly; + * + * - Poly1305 exhibits catastrophic failure (that is, can be broken) if a + * nonce is ever reused for a given key. + * + * If you are looking for a general purpose MAC, you should consider using a + * different MAC and looking at one of the other examples, unless you have a + * good familiarity with the details and caveats of Poly1305. + * + * This example uses AES, as described in the original paper, "The Poly1305-AES + * message authentication code": + * https://cr.yp.to/mac/poly1305-20050329.pdf + * + * The test vectors below are from that paper. + */ + +/* + * Hard coding the key into an application is very bad. + * It is done here solely for educational purposes. + * These are the "r" and "k" inputs to Poly1305-AES. + */ +static const unsigned char test_r[] = { + 0x85, 0x1f, 0xc4, 0x0c, 0x34, 0x67, 0xac, 0x0b, + 0xe0, 0x5c, 0xc2, 0x04, 0x04, 0xf3, 0xf7, 0x00 +}; + +static const unsigned char test_k[] = { + 0xec, 0x07, 0x4c, 0x83, 0x55, 0x80, 0x74, 0x17, + 0x01, 0x42, 0x5b, 0x62, 0x32, 0x35, 0xad, 0xd6 +}; + +/* + * Hard coding a nonce must not be done under any circumstances and is done here + * purely for demonstration purposes. Please note that Poly1305 exhibits + * catastrophic failure (that is, can be broken) if a nonce is ever reused for a + * given key. + */ +static const unsigned char test_n[] = { + 0xfb, 0x44, 0x73, 0x50, 0xc4, 0xe8, 0x68, 0xc5, + 0x2a, 0xc3, 0x27, 0x5c, 0xf9, 0xd4, 0x32, 0x7e +}; + +/* Input message. */ +static const unsigned char test_m[] = { + 0xf3, 0xf6 +}; + +static const unsigned char expected_output[] = { + 0xf4, 0xc6, 0x33, 0xc3, 0x04, 0x4f, 0xc1, 0x45, + 0xf8, 0x4f, 0x33, 0x5c, 0xb8, 0x19, 0x53, 0xde +}; + +/* + * A property query used for selecting the POLY1305 implementation. + */ +static char *propq = NULL; + +int main(int argc, char **argv) +{ + int rv = EXIT_FAILURE; + EVP_CIPHER *aes = NULL; + EVP_CIPHER_CTX *aesctx = NULL; + EVP_MAC *mac = NULL; + EVP_MAC_CTX *mctx = NULL; + unsigned char composite_key[32]; + unsigned char out[16]; + OSSL_LIB_CTX *library_context = NULL; + size_t out_len = 0; + int aes_len = 0; + + library_context = OSSL_LIB_CTX_new(); + if (library_context == NULL) { + fprintf(stderr, "OSSL_LIB_CTX_new() returned NULL\n"); + goto end; + } + + /* Fetch the Poly1305 implementation */ + mac = EVP_MAC_fetch(library_context, "POLY1305", propq); + if (mac == NULL) { + fprintf(stderr, "EVP_MAC_fetch() returned NULL\n"); + goto end; + } + + /* Create a context for the Poly1305 operation */ + mctx = EVP_MAC_CTX_new(mac); + if (mctx == NULL) { + fprintf(stderr, "EVP_MAC_CTX_new() returned NULL\n"); + goto end; + } + + /* Fetch the AES implementation */ + aes = EVP_CIPHER_fetch(library_context, "AES-128-ECB", propq); + if (aes == NULL) { + fprintf(stderr, "EVP_CIPHER_fetch() returned NULL\n"); + goto end; + } + + /* Create a context for AES */ + aesctx = EVP_CIPHER_CTX_new(); + if (aesctx == NULL) { + fprintf(stderr, "EVP_CIPHER_CTX_new() returned NULL\n"); + goto end; + } + + /* Initialize the AES cipher with the 128-bit key k */ + if (!EVP_EncryptInit_ex(aesctx, aes, NULL, test_k, NULL)) { + fprintf(stderr, "EVP_EncryptInit_ex() failed\n"); + goto end; + } + + /* + * Disable padding for the AES cipher. We do not strictly need to do this as + * we are encrypting a single block and thus there are no alignment or + * padding concerns, but this ensures that the operation below fails if + * padding would be required for some reason, which in this circumstance + * would indicate an implementation bug. + */ + if (!EVP_CIPHER_CTX_set_padding(aesctx, 0)) { + fprintf(stderr, "EVP_CIPHER_CTX_set_padding() failed\n"); + goto end; + } + + /* + * Computes the value AES_k(n) which we need for our Poly1305-AES + * computation below. + */ + if (!EVP_EncryptUpdate(aesctx, composite_key + 16, &aes_len, + test_n, sizeof(test_n))) { + fprintf(stderr, "EVP_EncryptUpdate() failed\n"); + goto end; + } + + /* + * The Poly1305 provider expects the key r to be passed as the first 16 + * bytes of the "key" and the processed nonce (that is, AES_k(n)) to be + * passed as the second 16 bytes of the "key". We already put the processed + * nonce in the correct place above, so copy r into place. + */ + memcpy(composite_key, test_r, 16); + + /* Initialise the Poly1305 operation */ + if (!EVP_MAC_init(mctx, composite_key, sizeof(composite_key), NULL)) { + fprintf(stderr, "EVP_MAC_init() failed\n"); + goto end; + } + + /* Make one or more calls to process the data to be authenticated */ + if (!EVP_MAC_update(mctx, test_m, sizeof(test_m))) { + fprintf(stderr, "EVP_MAC_update() failed\n"); + goto end; + } + + /* Make one call to the final to get the MAC */ + if (!EVP_MAC_final(mctx, out, &out_len, sizeof(out))) { + fprintf(stderr, "EVP_MAC_final() failed\n"); + goto end; + } + + printf("Generated MAC:\n"); + BIO_dump_indent_fp(stdout, out, out_len, 2); + putchar('\n'); + + if (out_len != sizeof(expected_output)) { + fprintf(stderr, "Generated MAC has an unexpected length\n"); + goto end; + } + + if (CRYPTO_memcmp(expected_output, out, sizeof(expected_output)) != 0) { + fprintf(stderr, "Generated MAC does not match expected value\n"); + goto end; + } + + rv = EXIT_SUCCESS; +end: + EVP_CIPHER_CTX_free(aesctx); + EVP_CIPHER_free(aes); + EVP_MAC_CTX_free(mctx); + EVP_MAC_free(mac); + OSSL_LIB_CTX_free(library_context); + if (rv != EXIT_SUCCESS) + ERR_print_errors_fp(stderr); + return rv; +} diff --git a/deps/openssl/openssl/demos/mac/siphash.c b/deps/openssl/openssl/demos/mac/siphash.c new file mode 100644 index 000000000..4d36a9d48 --- /dev/null +++ b/deps/openssl/openssl/demos/mac/siphash.c @@ -0,0 +1,129 @@ +/* + * Copyright 2021-2022 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the Apache License 2.0 (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +#include +#include +#include +#include +#include +#include + +/* + * Taken from the test vector from the paper "SipHash: a fast short-input PRF". + * https://www.aumasson.jp/siphash/siphash.pdf + */ + +/* + * Hard coding the key into an application is very bad. + * It is done here solely for educational purposes. + */ +static unsigned char key[] = { + 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, + 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f +}; + +static unsigned char data[] = { + 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, + 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e +}; + +static const unsigned char expected_output[] = { + 0xe5, 0x45, 0xbe, 0x49, 0x61, 0xca, 0x29, 0xa1 +}; + +/* + * A property query used for selecting the SIPHASH implementation. + */ +static char *propq = NULL; + +int main(int argc, char **argv) +{ + int rv = EXIT_FAILURE; + EVP_MAC *mac = NULL; + EVP_MAC_CTX *mctx = NULL; + unsigned char out[8]; + OSSL_PARAM params[4], *p = params; + OSSL_LIB_CTX *library_context = NULL; + unsigned int digest_len = 8, c_rounds = 2, d_rounds = 4; + size_t out_len = 0; + + library_context = OSSL_LIB_CTX_new(); + if (library_context == NULL) { + fprintf(stderr, "OSSL_LIB_CTX_new() returned NULL\n"); + goto end; + } + + /* Fetch the SipHash implementation */ + mac = EVP_MAC_fetch(library_context, "SIPHASH", propq); + if (mac == NULL) { + fprintf(stderr, "EVP_MAC_fetch() returned NULL\n"); + goto end; + } + + /* Create a context for the SipHash operation */ + mctx = EVP_MAC_CTX_new(mac); + if (mctx == NULL) { + fprintf(stderr, "EVP_MAC_CTX_new() returned NULL\n"); + goto end; + } + + /* SipHash can support either 8 or 16-byte digests. */ + *p++ = OSSL_PARAM_construct_uint(OSSL_MAC_PARAM_SIZE, &digest_len); + + /* + * The number of C-rounds and D-rounds is configurable. Standard SipHash + * uses values of 2 and 4 respectively. The following lines are unnecessary + * as they set the default, but demonstrate how to change these values. + */ + *p++ = OSSL_PARAM_construct_uint(OSSL_MAC_PARAM_C_ROUNDS, &c_rounds); + *p++ = OSSL_PARAM_construct_uint(OSSL_MAC_PARAM_D_ROUNDS, &d_rounds); + + *p = OSSL_PARAM_construct_end(); + + /* Initialise the SIPHASH operation */ + if (!EVP_MAC_init(mctx, key, sizeof(key), params)) { + fprintf(stderr, "EVP_MAC_init() failed\n"); + goto end; + } + + /* Make one or more calls to process the data to be authenticated */ + if (!EVP_MAC_update(mctx, data, sizeof(data))) { + fprintf(stderr, "EVP_MAC_update() failed\n"); + goto end; + } + + /* Make one call to the final to get the MAC */ + if (!EVP_MAC_final(mctx, out, &out_len, sizeof(out))) { + fprintf(stderr, "EVP_MAC_final() failed\n"); + goto end; + } + + printf("Generated MAC:\n"); + BIO_dump_indent_fp(stdout, out, out_len, 2); + putchar('\n'); + + if (out_len != sizeof(expected_output)) { + fprintf(stderr, "Generated MAC has an unexpected length\n"); + goto end; + } + + if (CRYPTO_memcmp(expected_output, out, sizeof(expected_output)) != 0) { + fprintf(stderr, "Generated MAC does not match expected value\n"); + goto end; + } + + rv = EXIT_SUCCESS; +end: + EVP_MAC_CTX_free(mctx); + EVP_MAC_free(mac); + OSSL_LIB_CTX_free(library_context); + if (rv != EXIT_SUCCESS) + ERR_print_errors_fp(stderr); + return rv; +} diff --git a/deps/openssl/openssl/demos/pkcs12/pkread.c b/deps/openssl/openssl/demos/pkcs12/pkread.c new file mode 100644 index 000000000..3b153f8ed --- /dev/null +++ b/deps/openssl/openssl/demos/pkcs12/pkread.c @@ -0,0 +1,111 @@ +/* + * Copyright 2000-2020 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the Apache License 2.0 (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +#include +#include +#include +#include +#include + +/* Simple PKCS#12 file reader */ + +static char *find_friendly_name(PKCS12 *p12) +{ + STACK_OF(PKCS7) *safes; + int n, m; + char *name = NULL; + PKCS7 *safe; + STACK_OF(PKCS12_SAFEBAG) *bags; + PKCS12_SAFEBAG *bag; + + if ((safes = PKCS12_unpack_authsafes(p12)) == NULL) + return NULL; + + for (n = 0; n < sk_PKCS7_num(safes) && name == NULL; n++) { + safe = sk_PKCS7_value(safes, n); + if (OBJ_obj2nid(safe->type) != NID_pkcs7_data + || (bags = PKCS12_unpack_p7data(safe)) == NULL) + continue; + + for (m = 0; m < sk_PKCS12_SAFEBAG_num(bags) && name == NULL; m++) { + bag = sk_PKCS12_SAFEBAG_value(bags, m); + name = PKCS12_get_friendlyname(bag); + } + sk_PKCS12_SAFEBAG_pop_free(bags, PKCS12_SAFEBAG_free); + } + + sk_PKCS7_pop_free(safes, PKCS7_free); + + return name; +} + +int main(int argc, char **argv) +{ + FILE *fp; + EVP_PKEY *pkey = NULL; + X509 *cert = NULL; + STACK_OF(X509) *ca = NULL; + PKCS12 *p12 = NULL; + char *name = NULL; + int i, ret = EXIT_FAILURE; + + if (argc != 4) { + fprintf(stderr, "Usage: pkread p12file password opfile\n"); + exit(EXIT_FAILURE); + } + + if ((fp = fopen(argv[1], "rb")) == NULL) { + fprintf(stderr, "Error opening file %s\n", argv[1]); + exit(EXIT_FAILURE); + } + p12 = d2i_PKCS12_fp(fp, NULL); + fclose(fp); + if (p12 == NULL) { + fprintf(stderr, "Error reading PKCS#12 file\n"); + ERR_print_errors_fp(stderr); + goto err; + } + if (!PKCS12_parse(p12, argv[2], &pkey, &cert, &ca)) { + fprintf(stderr, "Error parsing PKCS#12 file\n"); + ERR_print_errors_fp(stderr); + goto err; + } + name = find_friendly_name(p12); + PKCS12_free(p12); + if ((fp = fopen(argv[3], "w")) == NULL) { + fprintf(stderr, "Error opening file %s\n", argv[3]); + goto err; + } + if (name != NULL) + fprintf(fp, "***Friendly Name***\n%s\n", name); + if (pkey != NULL) { + fprintf(fp, "***Private Key***\n"); + PEM_write_PrivateKey(fp, pkey, NULL, NULL, 0, NULL, NULL); + } + if (cert != NULL) { + fprintf(fp, "***User Certificate***\n"); + PEM_write_X509_AUX(fp, cert); + } + if (ca != NULL && sk_X509_num(ca) > 0) { + fprintf(fp, "***Other Certificates***\n"); + for (i = 0; i < sk_X509_num(ca); i++) + PEM_write_X509_AUX(fp, sk_X509_value(ca, i)); + } + fclose(fp); + + ret = EXIT_SUCCESS; + + err: + OPENSSL_free(name); + X509_free(cert); + EVP_PKEY_free(pkey); + sk_X509_pop_free(ca, X509_free); + + return ret; +} diff --git a/deps/openssl/openssl/demos/pkcs12/pkwrite.c b/deps/openssl/openssl/demos/pkcs12/pkwrite.c new file mode 100644 index 000000000..51afd25a2 --- /dev/null +++ b/deps/openssl/openssl/demos/pkcs12/pkwrite.c @@ -0,0 +1,53 @@ +/* + * Copyright 2000-2020 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the Apache License 2.0 (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +#include +#include +#include +#include +#include + +/* Simple PKCS#12 file creator */ + +int main(int argc, char **argv) +{ + FILE *fp; + EVP_PKEY *pkey; + X509 *cert; + PKCS12 *p12; + if (argc != 5) { + fprintf(stderr, "Usage: pkwrite infile password name p12file\n"); + exit(1); + } + OpenSSL_add_all_algorithms(); + ERR_load_crypto_strings(); + if ((fp = fopen(argv[1], "r")) == NULL) { + fprintf(stderr, "Error opening file %s\n", argv[1]); + exit(1); + } + cert = PEM_read_X509(fp, NULL, NULL, NULL); + rewind(fp); + pkey = PEM_read_PrivateKey(fp, NULL, NULL, NULL); + fclose(fp); + p12 = PKCS12_create(argv[2], argv[3], pkey, cert, NULL, 0, 0, 0, 0, 0); + if (!p12) { + fprintf(stderr, "Error creating PKCS#12 structure\n"); + ERR_print_errors_fp(stderr); + exit(1); + } + if ((fp = fopen(argv[4], "wb")) == NULL) { + fprintf(stderr, "Error opening file %s\n", argv[4]); + ERR_print_errors_fp(stderr); + exit(1); + } + i2d_PKCS12_fp(fp, p12); + PKCS12_free(p12); + fclose(fp); + return 0; +} diff --git a/deps/openssl/openssl/demos/pkey/EVP_PKEY_DSA_keygen.c b/deps/openssl/openssl/demos/pkey/EVP_PKEY_DSA_keygen.c new file mode 100644 index 000000000..bf74a2e62 --- /dev/null +++ b/deps/openssl/openssl/demos/pkey/EVP_PKEY_DSA_keygen.c @@ -0,0 +1,83 @@ +/*- + * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the Apache License 2.0 (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +/* + * Example showing how to generate an DSA key pair. + */ + +#include +#include "dsa.inc" + +/* + * Generate dsa params using default values. + * See the EVP_PKEY_DSA_param_fromdata demo if you need + * to load DSA params from raw values. + * See the EVP_PKEY_DSA_paramgen demo if you need to + * use non default parameters. + */ +EVP_PKEY *dsa_genparams(OSSL_LIB_CTX *libctx, const char *propq) +{ + EVP_PKEY *dsaparamkey = NULL; + EVP_PKEY_CTX *ctx = NULL; + + /* Use the dsa params in a EVP_PKEY ctx */ + ctx = EVP_PKEY_CTX_new_from_name(libctx, "DSA", propq); + if (ctx == NULL) { + fprintf(stderr, "EVP_PKEY_CTX_new_from_name() failed\n"); + return NULL; + } + + if (EVP_PKEY_paramgen_init(ctx) <= 0 + || EVP_PKEY_paramgen(ctx, &dsaparamkey) <= 0) { + fprintf(stderr, "DSA paramgen failed\n"); + goto cleanup; + } +cleanup: + EVP_PKEY_CTX_free(ctx); + return dsaparamkey; +} + +int main(int argc, char **argv) +{ + int rv = EXIT_FAILURE; + OSSL_LIB_CTX *libctx = NULL; + const char *propq = NULL; + EVP_PKEY *dsaparamskey = NULL; + EVP_PKEY *dsakey = NULL; + EVP_PKEY_CTX *ctx = NULL; + + /* Generate random dsa params */ + dsaparamskey = dsa_genparams(libctx, propq); + if (dsaparamskey == NULL) + goto cleanup; + + /* Use the dsa params in a EVP_PKEY ctx */ + ctx = EVP_PKEY_CTX_new_from_pkey(libctx, dsaparamskey, propq); + if (ctx == NULL) { + fprintf(stderr, "EVP_PKEY_CTX_new_from_pkey() failed\n"); + goto cleanup; + } + + /* Generate a key using the dsa params */ + if (EVP_PKEY_keygen_init(ctx) <= 0 + || EVP_PKEY_keygen(ctx, &dsakey) <= 0) { + fprintf(stderr, "DSA keygen failed\n"); + goto cleanup; + } + + if (!dsa_print_key(dsakey, 1, libctx, propq)) + goto cleanup; + + rv = EXIT_SUCCESS; +cleanup: + EVP_PKEY_free(dsakey); + EVP_PKEY_free(dsaparamskey); + EVP_PKEY_CTX_free(ctx); + return rv; +} diff --git a/deps/openssl/openssl/demos/pkey/EVP_PKEY_DSA_paramfromdata.c b/deps/openssl/openssl/demos/pkey/EVP_PKEY_DSA_paramfromdata.c new file mode 100644 index 000000000..4c9e55820 --- /dev/null +++ b/deps/openssl/openssl/demos/pkey/EVP_PKEY_DSA_paramfromdata.c @@ -0,0 +1,75 @@ +/*- + * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the Apache License 2.0 (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +/* + * Example showing how to load DSA params from raw data + * using EVP_PKEY_fromdata() + */ + +#include +#include +#include +#include "dsa.inc" + +int main(int argc, char **argv) +{ + int rv = EXIT_FAILURE; + OSSL_LIB_CTX *libctx = NULL; + const char *propq = NULL; + EVP_PKEY_CTX *ctx = NULL; + EVP_PKEY *dsaparamkey = NULL; + OSSL_PARAM_BLD *bld = NULL; + OSSL_PARAM *params = NULL; + BIGNUM *p = NULL, *q = NULL, *g = NULL; + + p = BN_bin2bn(dsa_p, sizeof(dsa_p), NULL); + q = BN_bin2bn(dsa_q, sizeof(dsa_q), NULL); + g = BN_bin2bn(dsa_g, sizeof(dsa_g), NULL); + if (p == NULL || q == NULL || g == NULL) + goto cleanup; + + /* Use OSSL_PARAM_BLD if you need to handle BIGNUM Parameters */ + bld = OSSL_PARAM_BLD_new(); + if (bld == NULL) + goto cleanup; + if (!OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_FFC_P, p) + || !OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_FFC_Q, q) + || !OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_FFC_G, g)) + goto cleanup; + params = OSSL_PARAM_BLD_to_param(bld); + if (params == NULL) + goto cleanup; + + ctx = EVP_PKEY_CTX_new_from_name(libctx, "DSA", propq); + if (ctx == NULL) { + fprintf(stderr, "EVP_PKEY_CTX_new_from_name() failed\n"); + goto cleanup; + } + + if (EVP_PKEY_fromdata_init(ctx) <= 0 + || EVP_PKEY_fromdata(ctx, &dsaparamkey, EVP_PKEY_KEY_PARAMETERS, params) <= 0) { + fprintf(stderr, "EVP_PKEY_fromdata() failed\n"); + goto cleanup; + } + + if (!dsa_print_key(dsaparamkey, 0, libctx, propq)) + goto cleanup; + + rv = EXIT_SUCCESS; +cleanup: + EVP_PKEY_free(dsaparamkey); + EVP_PKEY_CTX_free(ctx); + OSSL_PARAM_free(params); + OSSL_PARAM_BLD_free(bld); + BN_free(g); + BN_free(q); + BN_free(p); + + return rv; +} diff --git a/deps/openssl/openssl/demos/pkey/EVP_PKEY_DSA_paramgen.c b/deps/openssl/openssl/demos/pkey/EVP_PKEY_DSA_paramgen.c new file mode 100644 index 000000000..05dda29c9 --- /dev/null +++ b/deps/openssl/openssl/demos/pkey/EVP_PKEY_DSA_paramgen.c @@ -0,0 +1,66 @@ +/*- + * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the Apache License 2.0 (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +/* + * Example showing how to generate DSA params using + * FIPS 186-4 DSA FFC parameter generation. + */ + +#include +#include "dsa.inc" + +int main(int argc, char **argv) +{ + int rv = EXIT_FAILURE; + OSSL_LIB_CTX *libctx = NULL; + const char *propq = NULL; + EVP_PKEY_CTX *ctx = NULL; + EVP_PKEY *dsaparamkey = NULL; + OSSL_PARAM params[7]; + unsigned int pbits = 2048; + unsigned int qbits = 256; + int gindex = 42; + + ctx = EVP_PKEY_CTX_new_from_name(libctx, "DSA", propq); + if (ctx == NULL) + goto cleanup; + + /* + * Demonstrate how to set optional DSA fields as params. + * See doc/man7/EVP_PKEY-FFC.pod and doc/man7/EVP_PKEY-DSA.pod + * for more information. + */ + params[0] = OSSL_PARAM_construct_utf8_string(OSSL_PKEY_PARAM_FFC_TYPE, + "fips186_4", 0); + params[1] = OSSL_PARAM_construct_uint(OSSL_PKEY_PARAM_FFC_PBITS, &pbits); + params[2] = OSSL_PARAM_construct_uint(OSSL_PKEY_PARAM_FFC_QBITS, &qbits); + params[3] = OSSL_PARAM_construct_int(OSSL_PKEY_PARAM_FFC_GINDEX, &gindex); + params[4] = OSSL_PARAM_construct_utf8_string(OSSL_PKEY_PARAM_FFC_DIGEST, + "SHA384", 0); + params[5] = OSSL_PARAM_construct_utf8_string(OSSL_PKEY_PARAM_FFC_DIGEST_PROPS, + "provider=default", 0); + params[6] = OSSL_PARAM_construct_end(); + + /* Generate a dsa param key using optional params */ + if (EVP_PKEY_paramgen_init(ctx) <= 0 + || EVP_PKEY_CTX_set_params(ctx, params) <= 0 + || EVP_PKEY_paramgen(ctx, &dsaparamkey) <= 0) { + fprintf(stderr, "DSA paramgen failed\n"); + goto cleanup; + } + + if (!dsa_print_key(dsaparamkey, 0, libctx, propq)) + goto cleanup; + + rv = EXIT_SUCCESS; +cleanup: + EVP_PKEY_free(dsaparamkey); + EVP_PKEY_CTX_free(ctx); + return rv; +} diff --git a/deps/openssl/openssl/demos/pkey/EVP_PKEY_DSA_paramvalidate.c b/deps/openssl/openssl/demos/pkey/EVP_PKEY_DSA_paramvalidate.c new file mode 100644 index 000000000..f726d30fb --- /dev/null +++ b/deps/openssl/openssl/demos/pkey/EVP_PKEY_DSA_paramvalidate.c @@ -0,0 +1,202 @@ +/*- + * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the Apache License 2.0 (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +/* + * Example showing how to validate DSA parameters. + * + * Proper FIPS 186-4 DSA (FFC) parameter validation requires that all + * the parameters used during parameter generation are supplied + * when doing the validation. Unfortunately saving DSA parameters as + * a PEM or DER file does not write out all required fields. Because + * of this the default provider normally only does a partial + * validation. The FIPS provider will however try to do a full + * validation. To force the default provider to use full + * validation the 'seed' that is output during generation must be + * added to the key. See doc/man7/EVP_PKEY-FFC for more information. + */ + +#include +#include +#include +#include "dsa.inc" + +/* The following values were output from the EVP_PKEY_DSA_paramgen demo */ +static const char dsapem[] = + "-----BEGIN DSA PARAMETERS-----\n" + "MIICLAKCAQEA1pobSR1FJ3+Tvi0J6Tk1PSV2owZey1Nuo847hGw/59VCS6RPQEqr\n" + "vp5fhbvBjupBeVGA/AMH6rI4i4h6jlhurrqH1CqUHVcDhJzxV668bMLiP3mIxg5o\n" + "9Yq8x6BnSOtH5Je0tpeE0/fEvvLjCwBUbwnwWxzjANcvDUEt9XYeRrtB2v52fr56\n" + "hVYz3wMMNog4CEDOLTvx7/84eVPuUeWDRQFH1EaHMdulP34KBcatEEpEZapkepng\n" + "nohm9sFSPQhq2utpkH7pNXdG0EILBtRDCvUpF5720a48LYofdggh2VEZfgElAGFk\n" + "dW/CkvyBDmGIzil5aTz4MMsdudaVYgzt6wIhAPsSGC42Qa+X0AFGvonb5nmfUVm/\n" + "8aC+tHk7Nb2AYLHXAoIBADx5C0H1+QHsmGKvuOaY+WKUt7aWUrEivD1zBMJAQ6bL\n" + "Wv9lbCq1CFHvVzojeOVpn872NqDEpkx4HTpvqhxWL5CkbN/HaGItsQzkD59AQg3v\n" + "4YsLlkesq9Jq6x/aWetJXWO36fszFv1gpD3NY3wliBvMYHx62jfc5suh9D3ZZvu7\n" + "PLGH4X4kcfzK/R2b0oVbEBjVTe5GMRYZRqnvfSW2f2fA7BzI1OL83UxDDe58cL2M\n" + "GcAoUYXOBAfZ37qLMm2juf+o5gCrT4CXfRPu6kbapt7V/YIc1nsNgeAOKKoFBHBQ\n" + "gc5u5G6G/j79FVoSDq9DYwTJcHPsU+eHj1uWHso1AjQ=\n" + "-----END DSA PARAMETERS-----\n"; + +static const char hexseed[] = + "cba30ccd905aa7675a0b81769704bf3c" + "ccf2ca1892b2eaf6b9e2b38d9bf6affc" + "42ada55986d8a1772b442770954d0b65"; +const int gindex = 42; +const int pcounter = 363; +static const char digest[] = "SHA384"; + +/* + * Create a new dsa param key that is the combination of an existing param key + * plus extra parameters. + */ +EVP_PKEY_CTX *create_merged_key(EVP_PKEY *dsaparams, const OSSL_PARAM *newparams, + OSSL_LIB_CTX *libctx, const char *propq) +{ + EVP_PKEY_CTX *out = NULL; + EVP_PKEY_CTX *ctx = NULL; + EVP_PKEY *pkey = NULL; + OSSL_PARAM *mergedparams = NULL; + OSSL_PARAM *loadedparams = NULL; + + /* Specify EVP_PKEY_KEY_PUBLIC here if you have a public key */ + if (EVP_PKEY_todata(dsaparams, EVP_PKEY_KEY_PARAMETERS, &loadedparams) <= 0) { + fprintf(stderr, "EVP_PKEY_todata() failed\n"); + goto cleanup; + } + mergedparams = OSSL_PARAM_merge(loadedparams, newparams); + if (mergedparams == NULL) { + fprintf(stderr, "OSSL_PARAM_merge() failed\n"); + goto cleanup; + } + + ctx = EVP_PKEY_CTX_new_from_name(libctx, "DSA", propq); + if (ctx == NULL) { + fprintf(stderr, "EVP_PKEY_CTX_new_from_name() failed\n"); + goto cleanup; + } + if (EVP_PKEY_fromdata_init(ctx) <= 0 + || EVP_PKEY_fromdata(ctx, &pkey, + EVP_PKEY_KEY_PARAMETERS, mergedparams) <= 0) { + fprintf(stderr, "EVP_PKEY_fromdata() failed\n"); + goto cleanup; + } + out = EVP_PKEY_CTX_new_from_pkey(libctx, pkey, propq); + if (out == NULL) { + fprintf(stderr, "EVP_PKEY_CTX_new_from_pkey() failed\n"); + goto cleanup; + } + +cleanup: + EVP_PKEY_free(pkey); + OSSL_PARAM_free(loadedparams); + OSSL_PARAM_free(mergedparams); + EVP_PKEY_CTX_free(ctx); + return out; +} + +int main(int argc, char **argv) +{ + int rv = EXIT_FAILURE; + OSSL_LIB_CTX *libctx = NULL; + const char *propq = NULL; + EVP_PKEY *dsaparamskey = NULL; + EVP_PKEY_CTX *ctx = NULL; + EVP_PKEY_CTX *ctx1 = NULL; + EVP_PKEY_CTX *ctx2 = NULL; + BIO *in = NULL; + OSSL_PARAM params[6]; + unsigned char seed[64]; + size_t seedlen; + + if (!OPENSSL_hexstr2buf_ex(seed, sizeof(seed), &seedlen, hexseed, '\0')) + goto cleanup; + /* + * This example loads the PEM data from a memory buffer + * Use BIO_new_fp() to load a PEM file instead + */ + in = BIO_new_mem_buf(dsapem, strlen(dsapem)); + if (in == NULL) { + fprintf(stderr, "BIO_new_mem_buf() failed\n"); + goto cleanup; + } + + /* Load DSA params from pem data */ + dsaparamskey = PEM_read_bio_Parameters_ex(in, NULL, libctx, propq); + if (dsaparamskey == NULL) { + fprintf(stderr, "Failed to load dsa params\n"); + goto cleanup; + } + + ctx = EVP_PKEY_CTX_new_from_pkey(libctx, dsaparamskey, propq); + if (ctx == NULL) { + fprintf(stderr, "EVP_PKEY_CTX_new_from_pkey() failed\n"); + goto cleanup; + } + /* + * When using the default provider this only does a partial check to + * make sure that the values of p, q and g are ok. + * This will fail however if the FIPS provider is used since it does + * a proper FIPS 186-4 key validation which requires extra parameters + */ + if (EVP_PKEY_param_check(ctx) <= 0) { + fprintf(stderr, "Simple EVP_PKEY_param_check() failed \n"); + goto cleanup; + } + + /* + * Setup parameters that we want to add. + * For illustration purposes it deliberately omits a required parameter. + */ + params[0] = OSSL_PARAM_construct_utf8_string(OSSL_PKEY_PARAM_FFC_TYPE, + "fips186_4", 0); + /* Force it to do a proper validation by setting the seed */ + params[1] = OSSL_PARAM_construct_octet_string(OSSL_PKEY_PARAM_FFC_SEED, + (void *)seed, seedlen); + params[2] = OSSL_PARAM_construct_int(OSSL_PKEY_PARAM_FFC_GINDEX, (int *)&gindex); + params[3] = OSSL_PARAM_construct_int(OSSL_PKEY_PARAM_FFC_PCOUNTER, (int *)&pcounter); + params[4] = OSSL_PARAM_construct_end(); + + /* generate a new key that is the combination of the existing key and the new params */ + ctx1 = create_merged_key(dsaparamskey, params, libctx, propq); + if (ctx1 == NULL) + goto cleanup; + /* This will fail since not all the parameters used for key generation are added */ + if (EVP_PKEY_param_check(ctx1) > 0) { + fprintf(stderr, "EVP_PKEY_param_check() should fail\n"); + goto cleanup; + } + + /* + * Add the missing parameters onto the end of the existing list of params + * If the default was used for the generation then this parameter is not + * needed + */ + params[4] = OSSL_PARAM_construct_utf8_string(OSSL_PKEY_PARAM_FFC_DIGEST, + (char *)digest, 0); + params[5] = OSSL_PARAM_construct_end(); + ctx2 = create_merged_key(dsaparamskey, params, libctx, propq); + if (ctx2 == NULL) + goto cleanup; + if (EVP_PKEY_param_check(ctx2) <= 0) { + fprintf(stderr, "EVP_PKEY_param_check() failed\n"); + goto cleanup; + } + + if (!dsa_print_key(EVP_PKEY_CTX_get0_pkey(ctx2), 0, libctx, propq)) + goto cleanup; + + rv = EXIT_SUCCESS; +cleanup: + EVP_PKEY_free(dsaparamskey); + EVP_PKEY_CTX_free(ctx2); + EVP_PKEY_CTX_free(ctx1); + EVP_PKEY_CTX_free(ctx); + BIO_free(in); + return rv; +} diff --git a/deps/openssl/openssl/demos/pkey/EVP_PKEY_EC_keygen.c b/deps/openssl/openssl/demos/pkey/EVP_PKEY_EC_keygen.c new file mode 100644 index 000000000..fa862bdaa --- /dev/null +++ b/deps/openssl/openssl/demos/pkey/EVP_PKEY_EC_keygen.c @@ -0,0 +1,155 @@ +/*- + * Copyright 2021-2022 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the Apache License 2.0 (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +/* + * Example showing how to generate an EC key and extract values from the + * generated key. + */ + +#include +#include +#include +#include +#include + +static int get_key_values(EVP_PKEY *pkey); + +/* + * The following code shows how to generate an EC key from a curve name + * with additional parameters. If only the curve name is required then the + * simple helper can be used instead i.e. Either + * pkey = EVP_EC_gen(curvename); OR + * pkey = EVP_PKEY_Q_keygen(libctx, propq, "EC", curvename); + */ +static EVP_PKEY *do_ec_keygen(void) +{ + /* + * The libctx and propq can be set if required, they are included here + * to show how they are passed to EVP_PKEY_CTX_new_from_name(). + */ + OSSL_LIB_CTX *libctx = NULL; + const char *propq = NULL; + EVP_PKEY *key = NULL; + OSSL_PARAM params[3]; + EVP_PKEY_CTX *genctx = NULL; + const char *curvename = "P-256"; + int use_cofactordh = 1; + + genctx = EVP_PKEY_CTX_new_from_name(libctx, "EC", propq); + if (genctx == NULL) { + fprintf(stderr, "EVP_PKEY_CTX_new_from_name() failed\n"); + goto cleanup; + } + + if (EVP_PKEY_keygen_init(genctx) <= 0) { + fprintf(stderr, "EVP_PKEY_keygen_init() failed\n"); + goto cleanup; + } + + params[0] = OSSL_PARAM_construct_utf8_string(OSSL_PKEY_PARAM_GROUP_NAME, + (char *)curvename, 0); + /* + * This is an optional parameter. + * For many curves where the cofactor is 1, setting this has no effect. + */ + params[1] = OSSL_PARAM_construct_int(OSSL_PKEY_PARAM_USE_COFACTOR_ECDH, + &use_cofactordh); + params[2] = OSSL_PARAM_construct_end(); + if (!EVP_PKEY_CTX_set_params(genctx, params)) { + fprintf(stderr, "EVP_PKEY_CTX_set_params() failed\n"); + goto cleanup; + } + + fprintf(stdout, "Generating EC key\n\n"); + if (EVP_PKEY_generate(genctx, &key) <= 0) { + fprintf(stderr, "EVP_PKEY_generate() failed\n"); + goto cleanup; + } +cleanup: + EVP_PKEY_CTX_free(genctx); + return key; +} + +/* + * The following code shows how retrieve key data from the generated + * EC key. See doc/man7/EVP_PKEY-EC.pod for more information. + * + * EVP_PKEY_print_private() could also be used to display the values. + */ +static int get_key_values(EVP_PKEY *pkey) +{ + int result = 0; + char out_curvename[80]; + unsigned char out_pubkey[80]; + unsigned char out_privkey[80]; + BIGNUM *out_priv = NULL; + size_t out_pubkey_len, out_privkey_len = 0; + + if (!EVP_PKEY_get_utf8_string_param(pkey, OSSL_PKEY_PARAM_GROUP_NAME, + out_curvename, sizeof(out_curvename), + NULL)) { + fprintf(stderr, "Failed to get curve name\n"); + goto cleanup; + } + + if (!EVP_PKEY_get_octet_string_param(pkey, OSSL_PKEY_PARAM_PUB_KEY, + out_pubkey, sizeof(out_pubkey), + &out_pubkey_len)) { + fprintf(stderr, "Failed to get public key\n"); + goto cleanup; + } + + if (!EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_PRIV_KEY, &out_priv)) { + fprintf(stderr, "Failed to get private key\n"); + goto cleanup; + } + + out_privkey_len = BN_bn2bin(out_priv, out_privkey); + if (out_privkey_len <= 0 || out_privkey_len > sizeof(out_privkey)) { + fprintf(stderr, "BN_bn2bin failed\n"); + goto cleanup; + } + + fprintf(stdout, "Curve name: %s\n", out_curvename); + fprintf(stdout, "Public key:\n"); + BIO_dump_indent_fp(stdout, out_pubkey, out_pubkey_len, 2); + fprintf(stdout, "Private Key:\n"); + BIO_dump_indent_fp(stdout, out_privkey, out_privkey_len, 2); + + result = 1; +cleanup: + /* Zeroize the private key data when we free it */ + BN_clear_free(out_priv); + return result; +} + +int main(void) +{ + int result = 0; + EVP_PKEY *pkey; + + pkey = do_ec_keygen(); + if (pkey == NULL) + goto cleanup; + + if (!get_key_values(pkey)) + goto cleanup; + + /* + * At this point we can write out the generated key using + * i2d_PrivateKey() and i2d_PublicKey() if required. + */ + result = 1; +cleanup: + if (result != 1) + ERR_print_errors_fp(stderr); + + EVP_PKEY_free(pkey); + return result == 0; +} diff --git a/deps/openssl/openssl/demos/pkey/EVP_PKEY_RSA_keygen.c b/deps/openssl/openssl/demos/pkey/EVP_PKEY_RSA_keygen.c new file mode 100644 index 000000000..fbecfb6bd --- /dev/null +++ b/deps/openssl/openssl/demos/pkey/EVP_PKEY_RSA_keygen.c @@ -0,0 +1,289 @@ +/*- + * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the Apache License 2.0 (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +/* + * Example showing how to generate an RSA key pair. + * + * When generating an RSA key, you must specify the number of bits in the key. A + * reasonable value would be 4096. Avoid using values below 2048. These values + * are reasonable as of 2022. + */ + +#include +#include +#include +#include +#include +#include +#include + +/* A property query used for selecting algorithm implementations. */ +static const char *propq = NULL; + +/* + * Generates an RSA public-private key pair and returns it. + * The number of bits is specified by the bits argument. + * + * This uses the long way of generating an RSA key. + */ +static EVP_PKEY *generate_rsa_key_long(OSSL_LIB_CTX *libctx, unsigned int bits) +{ + EVP_PKEY_CTX *genctx = NULL; + EVP_PKEY *pkey = NULL; + unsigned int primes = 2; + + /* Create context using RSA algorithm. "RSA-PSS" could also be used here. */ + genctx = EVP_PKEY_CTX_new_from_name(libctx, "RSA", propq); + if (genctx == NULL) { + fprintf(stderr, "EVP_PKEY_CTX_new_from_name() failed\n"); + goto cleanup; + } + + /* Initialize context for key generation purposes. */ + if (EVP_PKEY_keygen_init(genctx) <= 0) { + fprintf(stderr, "EVP_PKEY_keygen_init() failed\n"); + goto cleanup; + } + + /* + * Here we set the number of bits to use in the RSA key. + * See comment at top of file for information on appropriate values. + */ + if (EVP_PKEY_CTX_set_rsa_keygen_bits(genctx, bits) <= 0) { + fprintf(stderr, "EVP_PKEY_CTX_set_rsa_keygen_bits() failed\n"); + goto cleanup; + } + + /* + * It is possible to create an RSA key using more than two primes. + * Do not do this unless you know why you need this. + * You ordinarily do not need to specify this, as the default is two. + * + * Both of these parameters can also be set via EVP_PKEY_CTX_set_params, but + * these functions provide a more concise way to do so. + */ + if (EVP_PKEY_CTX_set_rsa_keygen_primes(genctx, primes) <= 0) { + fprintf(stderr, "EVP_PKEY_CTX_set_rsa_keygen_primes() failed\n"); + goto cleanup; + } + + /* + * Generating an RSA key with a number of bits large enough to be secure for + * modern applications can take a fairly substantial amount of time (e.g. + * one second). If you require fast key generation, consider using an EC key + * instead. + * + * If you require progress information during the key generation process, + * you can set a progress callback using EVP_PKEY_set_cb; see the example in + * EVP_PKEY_generate(3). + */ + fprintf(stderr, "Generating RSA key, this may take some time...\n"); + if (EVP_PKEY_generate(genctx, &pkey) <= 0) { + fprintf(stderr, "EVP_PKEY_generate() failed\n"); + goto cleanup; + } + + /* pkey is now set to an object representing the generated key pair. */ + +cleanup: + EVP_PKEY_CTX_free(genctx); + return pkey; +} + +/* + * Generates an RSA public-private key pair and returns it. + * The number of bits is specified by the bits argument. + * + * This uses a more concise way of generating an RSA key, which is suitable for + * simple cases. It is used if -s is passed on the command line, otherwise the + * long method above is used. The ability to choose between these two methods is + * shown here only for demonstration; the results are equivalent. + */ +static EVP_PKEY *generate_rsa_key_short(OSSL_LIB_CTX *libctx, unsigned int bits) +{ + EVP_PKEY *pkey = NULL; + + fprintf(stderr, "Generating RSA key, this may take some time...\n"); + pkey = EVP_PKEY_Q_keygen(libctx, propq, "RSA", (size_t)bits); + + if (pkey == NULL) + fprintf(stderr, "EVP_PKEY_Q_keygen() failed\n"); + + return pkey; +} + +/* + * Prints information on an EVP_PKEY object representing an RSA key pair. + */ +static int dump_key(const EVP_PKEY *pkey) +{ + int rv = 0; + int bits = 0; + BIGNUM *n = NULL, *e = NULL, *d = NULL, *p = NULL, *q = NULL; + + /* + * Retrieve value of n. This value is not secret and forms part of the + * public key. + * + * Calling EVP_PKEY_get_bn_param with a NULL BIGNUM pointer causes + * a new BIGNUM to be allocated, so these must be freed subsequently. + */ + if (EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_N, &n) == 0) { + fprintf(stderr, "Failed to retrieve n\n"); + goto cleanup; + } + + /* + * Retrieve value of e. This value is not secret and forms part of the + * public key. It is typically 65537 and need not be changed. + */ + if (EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_E, &e) == 0) { + fprintf(stderr, "Failed to retrieve e\n"); + goto cleanup; + } + + /* + * Retrieve value of d. This value is secret and forms part of the private + * key. It must not be published. + */ + if (EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_D, &d) == 0) { + fprintf(stderr, "Failed to retrieve d\n"); + goto cleanup; + } + + /* + * Retrieve value of the first prime factor, commonly known as p. This value + * is secret and forms part of the private key. It must not be published. + */ + if (EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_FACTOR1, &p) == 0) { + fprintf(stderr, "Failed to retrieve p\n"); + goto cleanup; + } + + /* + * Retrieve value of the second prime factor, commonly known as q. This value + * is secret and forms part of the private key. It must not be published. + * + * If you are creating an RSA key with more than two primes for special + * applications, you can retrieve these primes with + * OSSL_PKEY_PARAM_RSA_FACTOR3, etc. + */ + if (EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_FACTOR2, &q) == 0) { + fprintf(stderr, "Failed to retrieve q\n"); + goto cleanup; + } + + /* + * We can also retrieve the key size in bits for informational purposes. + */ + if (EVP_PKEY_get_int_param(pkey, OSSL_PKEY_PARAM_BITS, &bits) == 0) { + fprintf(stderr, "Failed to retrieve bits\n"); + goto cleanup; + } + + /* Output hexadecimal representations of the BIGNUM objects. */ + fprintf(stdout, "\nNumber of bits: %d\n\n", bits); + fprintf(stderr, "Public values:\n"); + fprintf(stdout, " n = 0x"); + BN_print_fp(stdout, n); + fprintf(stdout, "\n"); + + fprintf(stdout, " e = 0x"); + BN_print_fp(stdout, e); + fprintf(stdout, "\n\n"); + + fprintf(stdout, "Private values:\n"); + fprintf(stdout, " d = 0x"); + BN_print_fp(stdout, d); + fprintf(stdout, "\n"); + + fprintf(stdout, " p = 0x"); + BN_print_fp(stdout, p); + fprintf(stdout, "\n"); + + fprintf(stdout, " q = 0x"); + BN_print_fp(stdout, q); + fprintf(stdout, "\n\n"); + + /* Output a PEM encoding of the public key. */ + if (PEM_write_PUBKEY(stdout, pkey) == 0) { + fprintf(stderr, "Failed to output PEM-encoded public key\n"); + goto cleanup; + } + + /* + * Output a PEM encoding of the private key. Please note that this output is + * not encrypted. You may wish to use the arguments to specify encryption of + * the key if you are storing it on disk. See PEM_write_PrivateKey(3). + */ + if (PEM_write_PrivateKey(stdout, pkey, NULL, NULL, 0, NULL, NULL) == 0) { + fprintf(stderr, "Failed to output PEM-encoded private key\n"); + goto cleanup; + } + + rv = 1; +cleanup: + BN_free(n); /* not secret */ + BN_free(e); /* not secret */ + BN_clear_free(d); /* secret - scrub before freeing */ + BN_clear_free(p); /* secret - scrub before freeing */ + BN_clear_free(q); /* secret - scrub before freeing */ + return rv; +} + +int main(int argc, char **argv) +{ + int rv = 1; + OSSL_LIB_CTX *libctx = NULL; + EVP_PKEY *pkey = NULL; + unsigned int bits = 4096; + int bits_i, use_short = 0; + + /* usage: [-s] [] */ + if (argc > 1 && strcmp(argv[1], "-s") == 0) { + --argc; + ++argv; + use_short = 1; + } + + if (argc > 1) { + bits_i = atoi(argv[1]); + if (bits < 512) { + fprintf(stderr, "Invalid RSA key size\n"); + return 1; + } + + bits = (unsigned int)bits_i; + } + + /* Avoid using key sizes less than 2048 bits; see comment at top of file. */ + if (bits < 2048) + fprintf(stderr, "Warning: very weak key size\n\n"); + + /* Generate RSA key. */ + if (use_short) + pkey = generate_rsa_key_short(libctx, bits); + else + pkey = generate_rsa_key_long(libctx, bits); + + if (pkey == NULL) + goto cleanup; + + /* Dump the integers comprising the key. */ + if (dump_key(pkey) == 0) { + fprintf(stderr, "Failed to dump key\n"); + goto cleanup; + } + + rv = 0; +cleanup: + EVP_PKEY_free(pkey); + OSSL_LIB_CTX_free(libctx); + return rv; +} diff --git a/deps/openssl/openssl/demos/pkey/Makefile b/deps/openssl/openssl/demos/pkey/Makefile new file mode 100644 index 000000000..9e7013003 --- /dev/null +++ b/deps/openssl/openssl/demos/pkey/Makefile @@ -0,0 +1,37 @@ +# +# To run the demos when linked with a shared library (default): +# +# LD_LIBRARY_PATH=../.. ./EVP_PKEY_EC_keygen +# LD_LIBRARY_PATH=../.. ./EVP_PKEY_RSA_keygen +# LD_LIBRARY_PATH=../.. ./EVP_PKEY_DSA_keygen +# LD_LIBRARY_PATH=../.. ./EVP_PKEY_DSA_paramgen +# LD_LIBRARY_PATH=../.. ./EVP_PKEY_DSA_paramvalidate +# LD_LIBRARY_PATH=../.. ./EVP_PKEY_DSA_paramfromdata + +CFLAGS = -I../../include -g -Wall +LDFLAGS = -L../.. +LDLIBS = -lcrypto + +all: EVP_PKEY_EC_keygen EVP_PKEY_RSA_keygen EVP_PKEY_DSA_keygen \ + EVP_PKEY_DSA_paramgen EVP_PKEY_DSA_paramvalidate EVP_PKEY_DSA_paramfromdata \ + +%.o: %.c dsa.inc + $(CC) $(CFLAGS) -c $< + +EVP_PKEY_EC_keygen: EVP_PKEY_EC_keygen.o + +EVP_PKEY_RSA_keygen: EVP_PKEY_RSA_keygen.o + +EVP_PKEY_DSA_keygen: EVP_PKEY_DSA_keygen.o + +EVP_PKEY_DSA_paramgen: EVP_PKEY_DSA_paramgen.o + +EVP_PKEY_DSA_paramvalidate: EVP_PKEY_DSA_paramvalidate.o + +EVP_PKEY_DSA_paramfromdata: EVP_PKEY_DSA_paramfromdata.o + +test: ; + +clean: + $(RM) *.o EVP_PKEY_EC_keygen EVP_PKEY_RSA_keygen EVP_PKEY_DSA_keygen \ + EVP_PKEY_DSA_paramgen EVP_PKEY_DSA_paramfromdata EVP_PKEY_DSA_paramvalidate diff --git a/deps/openssl/openssl/demos/pkey/dsa.inc b/deps/openssl/openssl/demos/pkey/dsa.inc new file mode 100644 index 000000000..82c65057e --- /dev/null +++ b/deps/openssl/openssl/demos/pkey/dsa.inc @@ -0,0 +1,172 @@ +/*- + * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the Apache License 2.0 (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +#include +#include + +/* Raw DSA params for P, Q and G */ +static const unsigned char dsa_p[] = { + 0xa2, 0x9b, 0x88, 0x72, 0xce, 0x8b, 0x84, 0x23, + 0xb7, 0xd5, 0xd2, 0x1d, 0x4b, 0x02, 0xf5, 0x7e, + 0x03, 0xe9, 0xe6, 0xb8, 0xa2, 0x58, 0xdc, 0x16, + 0x61, 0x1b, 0xa0, 0x98, 0xab, 0x54, 0x34, 0x15, + 0xe4, 0x15, 0xf1, 0x56, 0x99, 0x7a, 0x3e, 0xe2, + 0x36, 0x65, 0x8f, 0xa0, 0x93, 0x26, 0x0d, 0xe3, + 0xad, 0x42, 0x2e, 0x05, 0xe0, 0x46, 0xf9, 0xec, + 0x29, 0x16, 0x1a, 0x37, 0x5f, 0x0e, 0xb4, 0xef, + 0xfc, 0xef, 0x58, 0x28, 0x5c, 0x5d, 0x39, 0xed, + 0x42, 0x5d, 0x7a, 0x62, 0xca, 0x12, 0x89, 0x6c, + 0x4a, 0x92, 0xcb, 0x19, 0x46, 0xf2, 0x95, 0x2a, + 0x48, 0x13, 0x3f, 0x07, 0xda, 0x36, 0x4d, 0x1b, + 0xdf, 0x6b, 0x0f, 0x71, 0x39, 0x98, 0x3e, 0x69, + 0x3c, 0x80, 0x05, 0x9b, 0x0e, 0xac, 0xd1, 0x47, + 0x9b, 0xa9, 0xf2, 0x85, 0x77, 0x54, 0xed, 0xe7, + 0x5f, 0x11, 0x2b, 0x07, 0xeb, 0xbf, 0x35, 0x34, + 0x8b, 0xbf, 0x3e, 0x01, 0xe0, 0x2f, 0x2d, 0x47, + 0x3d, 0xe3, 0x94, 0x53, 0xf9, 0x9d, 0xd2, 0x36, + 0x75, 0x41, 0xca, 0xca, 0x3b, 0xa0, 0x11, 0x66, + 0x34, 0x3d, 0x7b, 0x5b, 0x58, 0xa3, 0x7b, 0xd1, + 0xb7, 0x52, 0x1d, 0xb2, 0xf1, 0x3b, 0x86, 0x70, + 0x71, 0x32, 0xfe, 0x09, 0xf4, 0xcd, 0x09, 0xdc, + 0x16, 0x18, 0xfa, 0x34, 0x01, 0xeb, 0xf9, 0xcc, + 0x7b, 0x19, 0xfa, 0x94, 0xaa, 0x47, 0x20, 0x88, + 0x13, 0x3d, 0x6c, 0xb2, 0xd3, 0x5c, 0x11, 0x79, + 0xc8, 0xc8, 0xff, 0x36, 0x87, 0x58, 0xd5, 0x07, + 0xd9, 0xf9, 0xa1, 0x7d, 0x46, 0xc1, 0x10, 0xfe, + 0x31, 0x44, 0xce, 0x9b, 0x02, 0x2b, 0x42, 0xe4, + 0x19, 0xeb, 0x4f, 0x53, 0x88, 0x61, 0x3b, 0xfc, + 0x3e, 0x26, 0x24, 0x1a, 0x43, 0x2e, 0x87, 0x06, + 0xbc, 0x58, 0xef, 0x76, 0x11, 0x72, 0x78, 0xde, + 0xab, 0x6c, 0xf6, 0x92, 0x61, 0x82, 0x91, 0xb7 +}; + +static const unsigned char dsa_q[] = { + 0xa3, 0xbf, 0xd9, 0xab, 0x78, 0x84, 0x79, 0x4e, + 0x38, 0x34, 0x50, 0xd5, 0x89, 0x1d, 0xc1, 0x8b, + 0x65, 0x15, 0x7b, 0xdc, 0xfc, 0xda, 0xc5, 0x15, + 0x18, 0x90, 0x28, 0x67 +}; + +static const unsigned char dsa_g[] = { + 0x68, 0x19, 0x27, 0x88, 0x69, 0xc7, 0xfd, 0x3d, + 0x2d, 0x7b, 0x77, 0xf7, 0x7e, 0x81, 0x50, 0xd9, + 0xad, 0x43, 0x3b, 0xea, 0x3b, 0xa8, 0x5e, 0xfc, + 0x80, 0x41, 0x5a, 0xa3, 0x54, 0x5f, 0x78, 0xf7, + 0x22, 0x96, 0xf0, 0x6c, 0xb1, 0x9c, 0xed, 0xa0, + 0x6c, 0x94, 0xb0, 0x55, 0x1c, 0xfe, 0x6e, 0x6f, + 0x86, 0x3e, 0x31, 0xd1, 0xde, 0x6e, 0xed, 0x7d, + 0xab, 0x8b, 0x0c, 0x9d, 0xf2, 0x31, 0xe0, 0x84, + 0x34, 0xd1, 0x18, 0x4f, 0x91, 0xd0, 0x33, 0x69, + 0x6b, 0xb3, 0x82, 0xf8, 0x45, 0x5e, 0x98, 0x88, + 0xf5, 0xd3, 0x1d, 0x47, 0x84, 0xec, 0x40, 0x12, + 0x02, 0x46, 0xf4, 0xbe, 0xa6, 0x17, 0x94, 0xbb, + 0xa5, 0x86, 0x6f, 0x09, 0x74, 0x64, 0x63, 0xbd, + 0xf8, 0xe9, 0xe1, 0x08, 0xcd, 0x95, 0x29, 0xc3, + 0xd0, 0xf6, 0xdf, 0x80, 0x31, 0x6e, 0x2e, 0x70, + 0xaa, 0xeb, 0x1b, 0x26, 0xcd, 0xb8, 0xad, 0x97, + 0xbc, 0x3d, 0x28, 0x7e, 0x0b, 0x8d, 0x61, 0x6c, + 0x42, 0xe6, 0x5b, 0x87, 0xdb, 0x20, 0xde, 0xb7, + 0x00, 0x5b, 0xc4, 0x16, 0x74, 0x7a, 0x64, 0x70, + 0x14, 0x7a, 0x68, 0xa7, 0x82, 0x03, 0x88, 0xeb, + 0xf4, 0x4d, 0x52, 0xe0, 0x62, 0x8a, 0xf9, 0xcf, + 0x1b, 0x71, 0x66, 0xd0, 0x34, 0x65, 0xf3, 0x5a, + 0xcc, 0x31, 0xb6, 0x11, 0x0c, 0x43, 0xda, 0xbc, + 0x7c, 0x5d, 0x59, 0x1e, 0x67, 0x1e, 0xaf, 0x7c, + 0x25, 0x2c, 0x1c, 0x14, 0x53, 0x36, 0xa1, 0xa4, + 0xdd, 0xf1, 0x32, 0x44, 0xd5, 0x5e, 0x83, 0x56, + 0x80, 0xca, 0xb2, 0x53, 0x3b, 0x82, 0xdf, 0x2e, + 0xfe, 0x55, 0xec, 0x18, 0xc1, 0xe6, 0xcd, 0x00, + 0x7b, 0xb0, 0x89, 0x75, 0x8b, 0xb1, 0x7c, 0x2c, + 0xbe, 0x14, 0x44, 0x1b, 0xd0, 0x93, 0xae, 0x66, + 0xe5, 0x97, 0x6d, 0x53, 0x73, 0x3f, 0x4f, 0xa3, + 0x26, 0x97, 0x01, 0xd3, 0x1d, 0x23, 0xd4, 0x67 +}; + +/* Helper function to retrieve and print a key BIGNUM field */ +static void print_bn(BIO *bio, const EVP_PKEY *pkey, const char *name) +{ + BIGNUM *bn = NULL; + + if (EVP_PKEY_get_bn_param(pkey, name, &bn) == 0) + return; + + BIO_printf(bio, " %s = 0x", name); + BN_print(bio, bn); + BIO_printf(bio, "\n"); + BN_clear_free(bn); +} + +/* + * Print DSA key info + * + * This method shows how to extract DSA data from an EVP_PKEY. + * There are simpler ways to print using EVP_PKEY_print_XXXX(). + */ +static int dsa_print_key(const EVP_PKEY *pkey, int keypair, + OSSL_LIB_CTX *libctx, const char *propq) +{ + + int rv = 0, gindex, counter; + BIO *bio = BIO_new_fp(stdout, BIO_NOCLOSE); + unsigned char seed[2048]; + size_t seedlen; + + if (bio == NULL) + return 0; + + /* Output hexadecimal representations of the BIGNUM objects. */ + BIO_printf(bio, "\nPublic values:\n"); + print_bn(bio, pkey, OSSL_PKEY_PARAM_FFC_P); + print_bn(bio, pkey, OSSL_PKEY_PARAM_FFC_Q); + print_bn(bio, pkey, OSSL_PKEY_PARAM_FFC_G); + + if (EVP_PKEY_get_octet_string_param(pkey, OSSL_PKEY_PARAM_FFC_SEED, seed, + sizeof(seed), &seedlen) > 0) { + BIO_printf(bio, " %s\n", OSSL_PKEY_PARAM_FFC_SEED); + BIO_dump(bio, seed, seedlen); + } + if (EVP_PKEY_get_int_param(pkey, OSSL_PKEY_PARAM_FFC_GINDEX, &gindex) > 0) { + if (gindex != -1) + BIO_printf(bio, " %s = %d\n", OSSL_PKEY_PARAM_FFC_GINDEX, gindex); + } + if (EVP_PKEY_get_int_param(pkey, OSSL_PKEY_PARAM_FFC_PCOUNTER, &counter) > 0) { + if (counter != -1) + BIO_printf(bio, " %s = %d\n", OSSL_PKEY_PARAM_FFC_PCOUNTER, counter); + } + + if (keypair) { + fprintf(stdout, "\nPrivate value:\n"); + print_bn(bio, pkey, OSSL_PKEY_PARAM_PRIV_KEY); + + /* Output a PEM encoding of the public key. */ + if (PEM_write_bio_PUBKEY_ex(bio, pkey, libctx, propq) == 0) { + fprintf(stderr, "Failed to output PEM-encoded public key\n"); + goto cleanup; + } + + /* + * Output a PEM encoding of the private key. Please note that this output is + * not encrypted. You may wish to use the arguments to specify encryption of + * the key if you are storing it on disk. See PEM_write_bio_PrivateKey_ex(3). + */ + if (PEM_write_bio_PrivateKey_ex(bio, pkey, NULL, NULL, 0, NULL, NULL, libctx, propq) == 0) { + fprintf(stderr, "Failed to output PEM-encoded private key\n"); + goto cleanup; + } + } else { + if (PEM_write_bio_Parameters(bio, pkey) == 0) { + fprintf(stderr, "Failed to output PEM-encoded params\n"); + goto cleanup; + } + } + rv = 1; +cleanup: + BIO_free(bio); + return rv; +} diff --git a/deps/openssl/openssl/demos/signature/EVP_Signature_demo.c b/deps/openssl/openssl/demos/signature/EVP_Signature_demo.c new file mode 100644 index 000000000..123c95c26 --- /dev/null +++ b/deps/openssl/openssl/demos/signature/EVP_Signature_demo.c @@ -0,0 +1,235 @@ +/*- + * Copyright 2021 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the Apache License 2.0 (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +/* + * An example that uses the EVP_MD*, EVP_DigestSign* and EVP_DigestVerify* + * methods to calculate and verify a signature of two static buffers. + */ + +#include +#include +#include +#include +#include +#include "EVP_Signature_demo.h" + +/* + * This demonstration will calculate and verify a signature of data using + * the soliloquy from Hamlet scene 1 act 3 + */ + +static const char *hamlet_1 = + "To be, or not to be, that is the question,\n" + "Whether tis nobler in the minde to suffer\n" + "The slings and arrowes of outragious fortune,\n" + "Or to take Armes again in a sea of troubles,\n" +; +static const char *hamlet_2 = + "And by opposing, end them, to die to sleep;\n" + "No more, and by a sleep, to say we end\n" + "The heart-ache, and the thousand natural shocks\n" + "That flesh is heir to? tis a consumation\n" +; + +/* + * For demo_sign, load EC private key priv_key from priv_key_der[]. + * For demo_verify, load EC public key pub_key from pub_key_der[]. + */ +static EVP_PKEY *get_key(OSSL_LIB_CTX *libctx, const char *propq, int public) +{ + OSSL_DECODER_CTX *dctx = NULL; + EVP_PKEY *pkey = NULL; + int selection; + const unsigned char *data; + size_t data_len; + + if (public) { + selection = EVP_PKEY_PUBLIC_KEY; + data = pub_key_der; + data_len = sizeof(pub_key_der); + } else { + selection = EVP_PKEY_KEYPAIR; + data = priv_key_der; + data_len = sizeof(priv_key_der); + } + dctx = OSSL_DECODER_CTX_new_for_pkey(&pkey, "DER", NULL, "EC", + selection, libctx, propq); + (void)OSSL_DECODER_from_data(dctx, &data, &data_len); + OSSL_DECODER_CTX_free(dctx); + if (pkey == NULL) + fprintf(stderr, "Failed to load %s key.\n", public ? "public" : "private"); + return pkey; +} + +static int demo_sign(OSSL_LIB_CTX *libctx, const char *sig_name, + size_t *sig_out_len, unsigned char **sig_out_value) +{ + int result = 0, public = 0; + size_t sig_len; + unsigned char *sig_value = NULL; + const char *propq = NULL; + EVP_MD_CTX *sign_context = NULL; + EVP_PKEY *priv_key = NULL; + + /* Get private key */ + priv_key = get_key(libctx, propq, public); + if (priv_key == NULL) { + fprintf(stderr, "Get private key failed.\n"); + goto cleanup; + } + /* + * Make a message signature context to hold temporary state + * during signature creation + */ + sign_context = EVP_MD_CTX_new(); + if (sign_context == NULL) { + fprintf(stderr, "EVP_MD_CTX_new failed.\n"); + goto cleanup; + } + /* + * Initialize the sign context to use the fetched + * sign provider. + */ + if (!EVP_DigestSignInit_ex(sign_context, NULL, sig_name, + libctx, NULL, priv_key, NULL)) { + fprintf(stderr, "EVP_DigestSignInit_ex failed.\n"); + goto cleanup; + } + /* + * EVP_DigestSignUpdate() can be called several times on the same context + * to include additional data. + */ + if (!EVP_DigestSignUpdate(sign_context, hamlet_1, strlen(hamlet_1))) { + fprintf(stderr, "EVP_DigestSignUpdate(hamlet_1) failed.\n"); + goto cleanup; + } + if (!EVP_DigestSignUpdate(sign_context, hamlet_2, strlen(hamlet_2))) { + fprintf(stderr, "EVP_DigestSignUpdate(hamlet_2) failed.\n"); + goto cleanup; + } + /* Call EVP_DigestSignFinal to get signature length sig_len */ + if (!EVP_DigestSignFinal(sign_context, NULL, &sig_len)) { + fprintf(stderr, "EVP_DigestSignFinal failed.\n"); + goto cleanup; + } + if (sig_len <= 0) { + fprintf(stderr, "EVP_DigestSignFinal returned invalid signature length.\n"); + goto cleanup; + } + sig_value = OPENSSL_malloc(sig_len); + if (sig_value == NULL) { + fprintf(stderr, "No memory.\n"); + goto cleanup; + } + if (!EVP_DigestSignFinal(sign_context, sig_value, &sig_len)) { + fprintf(stderr, "EVP_DigestSignFinal failed.\n"); + goto cleanup; + } + *sig_out_len = sig_len; + *sig_out_value = sig_value; + fprintf(stdout, "Generating signature:\n"); + BIO_dump_indent_fp(stdout, sig_value, sig_len, 2); + fprintf(stdout, "\n"); + result = 1; + +cleanup: + /* OpenSSL free functions will ignore NULL arguments */ + if (!result) + OPENSSL_free(sig_value); + EVP_PKEY_free(priv_key); + EVP_MD_CTX_free(sign_context); + return result; +} + +static int demo_verify(OSSL_LIB_CTX *libctx, const char *sig_name, + size_t sig_len, unsigned char *sig_value) +{ + int result = 0, public = 1; + const char *propq = NULL; + EVP_MD_CTX *verify_context = NULL; + EVP_PKEY *pub_key = NULL; + + /* + * Make a verify signature context to hold temporary state + * during signature verification + */ + verify_context = EVP_MD_CTX_new(); + if (verify_context == NULL) { + fprintf(stderr, "EVP_MD_CTX_new failed.\n"); + goto cleanup; + } + /* Get public key */ + pub_key = get_key(libctx, propq, public); + if (pub_key == NULL) { + fprintf(stderr, "Get public key failed.\n"); + goto cleanup; + } + /* Verify */ + if (!EVP_DigestVerifyInit_ex(verify_context, NULL, sig_name, + libctx, NULL, pub_key, NULL)) { + fprintf(stderr, "EVP_DigestVerifyInit failed.\n"); + goto cleanup; + } + /* + * EVP_DigestVerifyUpdate() can be called several times on the same context + * to include additional data. + */ + if (!EVP_DigestVerifyUpdate(verify_context, hamlet_1, strlen(hamlet_1))) { + fprintf(stderr, "EVP_DigestVerifyUpdate(hamlet_1) failed.\n"); + goto cleanup; + } + if (!EVP_DigestVerifyUpdate(verify_context, hamlet_2, strlen(hamlet_2))) { + fprintf(stderr, "EVP_DigestVerifyUpdate(hamlet_2) failed.\n"); + goto cleanup; + } + if (EVP_DigestVerifyFinal(verify_context, sig_value, sig_len) <= 0) { + fprintf(stderr, "EVP_DigestVerifyFinal failed.\n"); + goto cleanup; + } + fprintf(stdout, "Signature verified.\n"); + result = 1; + +cleanup: + /* OpenSSL free functions will ignore NULL arguments */ + EVP_PKEY_free(pub_key); + EVP_MD_CTX_free(verify_context); + return result; +} + +int main(void) +{ + OSSL_LIB_CTX *libctx = NULL; + const char *sig_name = "SHA3-512"; + size_t sig_len = 0; + unsigned char *sig_value = NULL; + int result = 0; + + libctx = OSSL_LIB_CTX_new(); + if (libctx == NULL) { + fprintf(stderr, "OSSL_LIB_CTX_new() returned NULL\n"); + goto cleanup; + } + if (!demo_sign(libctx, sig_name, &sig_len, &sig_value)) { + fprintf(stderr, "demo_sign failed.\n"); + goto cleanup; + } + if (!demo_verify(libctx, sig_name, sig_len, sig_value)) { + fprintf(stderr, "demo_verify failed.\n"); + goto cleanup; + } + result = 1; + +cleanup: + if (result != 1) + ERR_print_errors_fp(stderr); + /* OpenSSL free functions will ignore NULL arguments */ + OSSL_LIB_CTX_free(libctx); + OPENSSL_free(sig_value); + return result == 0; +} diff --git a/deps/openssl/openssl/demos/signature/EVP_Signature_demo.h b/deps/openssl/openssl/demos/signature/EVP_Signature_demo.h new file mode 100644 index 000000000..aef3e6078 --- /dev/null +++ b/deps/openssl/openssl/demos/signature/EVP_Signature_demo.h @@ -0,0 +1,76 @@ +/*- + * Copyright 2021 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the Apache License 2.0 (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +/* Signers private EC key */ +static const unsigned char priv_key_der[] = { +0x30, 0x82, 0x01, 0x68, 0x02, 0x01, 0x01, 0x04, 0x20, 0x51, 0x77, 0xae, +0xf4, 0x18, 0xf4, 0x6b, 0xc4, 0xe5, 0xbb, 0xe9, 0xe6, 0x9e, 0x6d, 0xb0, +0xea, 0x12, 0xf9, 0xf3, 0xdb, 0x9d, 0x56, 0x59, 0xf7, 0x5a, 0x17, 0xd7, +0xd1, 0xe4, 0xd7, 0x47, 0x28, 0xa0, 0x81, 0xfa, 0x30, 0x81, 0xf7, 0x02, +0x01, 0x01, 0x30, 0x2c, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x01, +0x01, 0x02, 0x21, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x01, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, +0x30, 0x5b, 0x04, 0x20, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x01, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, +0x04, 0x20, 0x5a, 0xc6, 0x35, 0xd8, 0xaa, 0x3a, 0x93, 0xe7, 0xb3, 0xeb, +0xbd, 0x55, 0x76, 0x98, 0x86, 0xbc, 0x65, 0x1d, 0x06, 0xb0, 0xcc, 0x53, +0xb0, 0xf6, 0x3b, 0xce, 0x3c, 0x3e, 0x27, 0xd2, 0x60, 0x4b, 0x03, 0x15, +0x00, 0xc4, 0x9d, 0x36, 0x08, 0x86, 0xe7, 0x04, 0x93, 0x6a, 0x66, 0x78, +0xe1, 0x13, 0x9d, 0x26, 0xb7, 0x81, 0x9f, 0x7e, 0x90, 0x04, 0x41, 0x04, +0x6b, 0x17, 0xd1, 0xf2, 0xe1, 0x2c, 0x42, 0x47, 0xf8, 0xbc, 0xe6, 0xe5, +0x63, 0xa4, 0x40, 0xf2, 0x77, 0x03, 0x7d, 0x81, 0x2d, 0xeb, 0x33, 0xa0, +0xf4, 0xa1, 0x39, 0x45, 0xd8, 0x98, 0xc2, 0x96, 0x4f, 0xe3, 0x42, 0xe2, +0xfe, 0x1a, 0x7f, 0x9b, 0x8e, 0xe7, 0xeb, 0x4a, 0x7c, 0x0f, 0x9e, 0x16, +0x2b, 0xce, 0x33, 0x57, 0x6b, 0x31, 0x5e, 0xce, 0xcb, 0xb6, 0x40, 0x68, +0x37, 0xbf, 0x51, 0xf5, 0x02, 0x21, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, +0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbc, +0xe6, 0xfa, 0xad, 0xa7, 0x17, 0x9e, 0x84, 0xf3, 0xb9, 0xca, 0xc2, 0xfc, +0x63, 0x25, 0x51, 0x02, 0x01, 0x01, 0xa1, 0x44, 0x03, 0x42, 0x00, 0x04, +0x4f, 0xe7, 0x7b, 0xb6, 0xbb, 0x54, 0x42, 0x39, 0xed, 0x5d, 0xe5, 0x40, +0xc8, 0xd8, 0x71, 0xca, 0x6d, 0x83, 0x71, 0xd1, 0x88, 0x2a, 0x65, 0x00, +0x6c, 0xc6, 0x2f, 0x01, 0x31, 0x49, 0xbe, 0x76, 0x7a, 0x67, 0x6a, 0x28, +0x33, 0xc7, 0x5b, 0xb9, 0x24, 0x45, 0x24, 0x6e, 0xf0, 0x6d, 0x2f, 0x34, +0x06, 0x53, 0x73, 0x6a, 0xff, 0x90, 0x90, 0xc1, 0x6d, 0x9b, 0x94, 0x0d, +0x0e, 0x1f, 0x95, 0x65, +}; + +/* The matching public key used for verifying */ +static const unsigned char pub_key_der[] = { +0x30, 0x82, 0x01, 0x4b, 0x30, 0x82, 0x01, 0x03, 0x06, 0x07, 0x2a, 0x86, +0x48, 0xce, 0x3d, 0x02, 0x01, 0x30, 0x81, 0xf7, 0x02, 0x01, 0x01, 0x30, +0x2c, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x01, 0x01, 0x02, 0x21, +0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, +0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x30, 0x5b, 0x04, +0x20, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, +0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x04, 0x20, 0x5a, +0xc6, 0x35, 0xd8, 0xaa, 0x3a, 0x93, 0xe7, 0xb3, 0xeb, 0xbd, 0x55, 0x76, +0x98, 0x86, 0xbc, 0x65, 0x1d, 0x06, 0xb0, 0xcc, 0x53, 0xb0, 0xf6, 0x3b, +0xce, 0x3c, 0x3e, 0x27, 0xd2, 0x60, 0x4b, 0x03, 0x15, 0x00, 0xc4, 0x9d, +0x36, 0x08, 0x86, 0xe7, 0x04, 0x93, 0x6a, 0x66, 0x78, 0xe1, 0x13, 0x9d, +0x26, 0xb7, 0x81, 0x9f, 0x7e, 0x90, 0x04, 0x41, 0x04, 0x6b, 0x17, 0xd1, +0xf2, 0xe1, 0x2c, 0x42, 0x47, 0xf8, 0xbc, 0xe6, 0xe5, 0x63, 0xa4, 0x40, +0xf2, 0x77, 0x03, 0x7d, 0x81, 0x2d, 0xeb, 0x33, 0xa0, 0xf4, 0xa1, 0x39, +0x45, 0xd8, 0x98, 0xc2, 0x96, 0x4f, 0xe3, 0x42, 0xe2, 0xfe, 0x1a, 0x7f, +0x9b, 0x8e, 0xe7, 0xeb, 0x4a, 0x7c, 0x0f, 0x9e, 0x16, 0x2b, 0xce, 0x33, +0x57, 0x6b, 0x31, 0x5e, 0xce, 0xcb, 0xb6, 0x40, 0x68, 0x37, 0xbf, 0x51, +0xf5, 0x02, 0x21, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, +0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbc, 0xe6, 0xfa, 0xad, +0xa7, 0x17, 0x9e, 0x84, 0xf3, 0xb9, 0xca, 0xc2, 0xfc, 0x63, 0x25, 0x51, +0x02, 0x01, 0x01, 0x03, 0x42, 0x00, 0x04, 0x4f, 0xe7, 0x7b, 0xb6, 0xbb, +0x54, 0x42, 0x39, 0xed, 0x5d, 0xe5, 0x40, 0xc8, 0xd8, 0x71, 0xca, 0x6d, +0x83, 0x71, 0xd1, 0x88, 0x2a, 0x65, 0x00, 0x6c, 0xc6, 0x2f, 0x01, 0x31, +0x49, 0xbe, 0x76, 0x7a, 0x67, 0x6a, 0x28, 0x33, 0xc7, 0x5b, 0xb9, 0x24, +0x45, 0x24, 0x6e, 0xf0, 0x6d, 0x2f, 0x34, 0x06, 0x53, 0x73, 0x6a, 0xff, +0x90, 0x90, 0xc1, 0x6d, 0x9b, 0x94, 0x0d, 0x0e, 0x1f, 0x95, 0x65, +}; + diff --git a/deps/openssl/openssl/demos/signature/Makefile b/deps/openssl/openssl/demos/signature/Makefile new file mode 100644 index 000000000..563ec7799 --- /dev/null +++ b/deps/openssl/openssl/demos/signature/Makefile @@ -0,0 +1,22 @@ +# +# To run the demos when linked with a shared library (default): +# +# LD_LIBRARY_PATH=../.. ./EVP_Signature_demo + +CFLAGS = -I../../include -g -Wall +LDFLAGS = -L../.. +LDLIBS = -lcrypto + +all: EVP_Signature_demo rsa_pss_direct rsa_pss_hash + +%.o: %.c + $(CC) $(CFLAGS) -c $< + +EVP_Signature_demo: EVP_Signature_demo.o +rsa_pss_direct: rsa_pss_direct.o +rsa_pss_hash: rsa_pss_hash.o + +test: ; + +clean: + $(RM) *.o EVP_Signature_demo rsa_pss_direct rsa_pss_hash diff --git a/deps/openssl/openssl/demos/signature/rsa_pss.h b/deps/openssl/openssl/demos/signature/rsa_pss.h new file mode 100644 index 000000000..bdab9f891 --- /dev/null +++ b/deps/openssl/openssl/demos/signature/rsa_pss.h @@ -0,0 +1,256 @@ +/*- + * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the Apache License 2.0 (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +/* 4096-bit RSA private key, DER. */ +static const unsigned char rsa_priv_key[] = { + 0x30, 0x82, 0x09, 0x28, 0x02, 0x01, 0x00, 0x02, 0x82, 0x02, 0x01, 0x00, + 0xa3, 0x14, 0xe4, 0xb8, 0xd8, 0x58, 0x0d, 0xab, 0xd7, 0x87, 0xa4, 0xf6, + 0x84, 0x51, 0x74, 0x60, 0x4c, 0xe3, 0x60, 0x28, 0x89, 0x49, 0x65, 0x18, + 0x5c, 0x8f, 0x1a, 0x1b, 0xe9, 0xdb, 0xc1, 0xc1, 0xf7, 0x08, 0x27, 0x44, + 0xe5, 0x9d, 0x9a, 0x33, 0xc3, 0xac, 0x5a, 0xca, 0xba, 0x20, 0x5a, 0x9e, + 0x3a, 0x18, 0xb5, 0x3d, 0xe3, 0x9d, 0x94, 0x58, 0xa7, 0xa9, 0x5a, 0x0b, + 0x4f, 0xb8, 0xe5, 0xa3, 0x7b, 0x01, 0x11, 0x0f, 0x16, 0x11, 0xb8, 0x65, + 0x2f, 0xa8, 0x95, 0xf7, 0x58, 0x2c, 0xec, 0x1d, 0x41, 0xad, 0xd1, 0x12, + 0xca, 0x4a, 0x80, 0x35, 0x35, 0x43, 0x7e, 0xe0, 0x97, 0xfc, 0x86, 0x8f, + 0xcf, 0x4b, 0xdc, 0xbc, 0x15, 0x2c, 0x8e, 0x90, 0x84, 0x26, 0x83, 0xc1, + 0x96, 0x97, 0xf4, 0xd7, 0x90, 0xce, 0xfe, 0xd4, 0xf3, 0x70, 0x22, 0xa8, + 0xb0, 0x1f, 0xed, 0x08, 0xd7, 0xc5, 0xc0, 0xd6, 0x41, 0x6b, 0x24, 0x68, + 0x5c, 0x07, 0x1f, 0x44, 0x97, 0xd8, 0x6e, 0x18, 0x93, 0x67, 0xc3, 0xba, + 0x3a, 0xaf, 0xfd, 0xc2, 0x65, 0x00, 0x21, 0x63, 0xdf, 0xb7, 0x28, 0x68, + 0xd6, 0xc0, 0x20, 0x86, 0x92, 0xed, 0x68, 0x6a, 0x27, 0x3a, 0x07, 0xec, + 0x66, 0x00, 0xfe, 0x51, 0x51, 0x86, 0x41, 0x6f, 0x83, 0x69, 0xd2, 0xf0, + 0xe6, 0xf7, 0x61, 0xda, 0x12, 0x45, 0x53, 0x09, 0xdf, 0xf8, 0x42, 0xc7, + 0x30, 0x6a, 0xe5, 0xd8, 0x2b, 0xa2, 0x49, 0x7a, 0x05, 0x10, 0xee, 0xb2, + 0x59, 0x0a, 0xe5, 0xbe, 0xf8, 0x4d, 0x0f, 0xa8, 0x9e, 0x63, 0x81, 0x39, + 0x32, 0xaa, 0xfd, 0xa8, 0x03, 0xf6, 0xd8, 0xc6, 0xaa, 0x02, 0x93, 0x03, + 0xeb, 0x15, 0xd3, 0x38, 0xc8, 0x1a, 0x78, 0xcf, 0xf3, 0xa7, 0x9f, 0x98, + 0x4b, 0x91, 0x5b, 0x79, 0xf8, 0x4e, 0x53, 0xaf, 0x0c, 0x65, 0xe9, 0xb0, + 0x93, 0xc2, 0xcb, 0x5d, 0x3c, 0x5f, 0x6e, 0x39, 0xd2, 0x58, 0x23, 0x50, + 0xe5, 0x2e, 0xef, 0x12, 0x00, 0xa4, 0x59, 0x13, 0x2b, 0x2f, 0x2c, 0x0a, + 0x7b, 0x36, 0x89, 0xc5, 0xe5, 0x8f, 0x95, 0x5e, 0x14, 0x0f, 0x0f, 0x94, + 0x5a, 0xe9, 0xdc, 0x0b, 0x49, 0x14, 0xbe, 0x0a, 0x70, 0x45, 0xc1, 0x7c, + 0xbf, 0x83, 0x70, 0xfd, 0x3d, 0x99, 0xe6, 0x8a, 0xf5, 0x9c, 0x09, 0x71, + 0x84, 0x9a, 0x18, 0xa0, 0xe0, 0x6c, 0x43, 0x5c, 0x7e, 0x48, 0x33, 0xc8, + 0xbe, 0x5d, 0xdd, 0xd8, 0x77, 0xe3, 0xe7, 0x6b, 0x34, 0x4b, 0xa2, 0xb7, + 0x54, 0x07, 0x72, 0x2e, 0xab, 0xa9, 0x91, 0x1e, 0x4b, 0xe3, 0xb5, 0xd8, + 0xfa, 0x35, 0x64, 0x8a, 0xe9, 0x03, 0xa1, 0xa8, 0x26, 0xbd, 0x72, 0x58, + 0x10, 0x6a, 0xec, 0x1a, 0xf6, 0x1e, 0xb8, 0xc0, 0x46, 0x19, 0x31, 0x2c, + 0xca, 0xf9, 0x6a, 0xd7, 0x2e, 0xd0, 0xa7, 0x2c, 0x60, 0x58, 0xc4, 0x8f, + 0x46, 0x63, 0x61, 0x8d, 0x29, 0x6f, 0xe2, 0x5f, 0xe2, 0x43, 0x90, 0x9c, + 0xe6, 0xfc, 0x08, 0x41, 0xc8, 0xb5, 0x23, 0x56, 0x24, 0x3e, 0x3a, 0x2c, + 0x41, 0x22, 0x43, 0xda, 0x22, 0x15, 0x2b, 0xad, 0xd0, 0xfa, 0xc8, 0x47, + 0x44, 0xe6, 0x2a, 0xf9, 0x38, 0x90, 0x13, 0x62, 0x22, 0xea, 0x06, 0x8c, + 0x44, 0x9c, 0xd6, 0xca, 0x50, 0x93, 0xe9, 0xd4, 0x03, 0xd8, 0x3e, 0x71, + 0x36, 0x4b, 0xaa, 0xab, 0xbb, 0xe2, 0x48, 0x66, 0x26, 0x53, 0xb1, 0x6d, + 0x3b, 0x82, 0x2c, 0x8c, 0x25, 0x05, 0xf0, 0xf8, 0xcf, 0x55, 0xbf, 0x8e, + 0x29, 0xf7, 0x54, 0x5b, 0x6f, 0x30, 0x54, 0xa6, 0xad, 0x46, 0xff, 0x22, + 0x95, 0xb1, 0x87, 0x98, 0x00, 0x51, 0x69, 0x15, 0x07, 0xbd, 0x3d, 0x9c, + 0x6e, 0xaa, 0xaa, 0x3b, 0x0b, 0x74, 0x65, 0x4c, 0x04, 0xe0, 0x80, 0x3e, + 0xaf, 0x5e, 0x10, 0xd6, 0x9b, 0x28, 0x37, 0x6f, 0x02, 0x03, 0x01, 0x00, + 0x01, 0x02, 0x82, 0x02, 0x00, 0x09, 0x6e, 0xf8, 0xf8, 0x14, 0x53, 0xab, + 0x9e, 0xc8, 0x1d, 0xe9, 0x95, 0xf4, 0xfb, 0x7d, 0x3e, 0xe0, 0xd3, 0xba, + 0x49, 0x3d, 0xff, 0xc7, 0xe0, 0x4b, 0xe2, 0x5f, 0x41, 0x44, 0x1a, 0xd9, + 0x2f, 0x6e, 0x29, 0xc3, 0x93, 0xc1, 0xb0, 0x87, 0x2d, 0xfd, 0x60, 0xa7, + 0xf3, 0xd8, 0x26, 0x6c, 0xf7, 0x80, 0x26, 0xd3, 0xbd, 0x1b, 0xc0, 0x8e, + 0xc7, 0x3e, 0x13, 0x96, 0xc8, 0xd6, 0xb8, 0xbc, 0x57, 0xe3, 0x92, 0xa1, + 0x38, 0xfd, 0x2e, 0xd3, 0x3a, 0xcf, 0x31, 0xf2, 0x52, 0xd7, 0x7f, 0xe9, + 0xbc, 0x9b, 0x83, 0x01, 0x78, 0x13, 0xc9, 0x91, 0x77, 0x02, 0x78, 0xc0, + 0x0b, 0x1f, 0xdf, 0x94, 0xad, 0x16, 0xf1, 0xad, 0x78, 0x17, 0xc5, 0x77, + 0x0d, 0xb7, 0x07, 0x3f, 0x51, 0xe0, 0x73, 0x33, 0xcf, 0x90, 0x69, 0xd8, + 0xe5, 0xda, 0x9b, 0x1e, 0xf6, 0x21, 0x12, 0x07, 0xb5, 0x1e, 0x3e, 0x2b, + 0x34, 0x79, 0x9e, 0x48, 0x01, 0xdd, 0x68, 0xf0, 0x0f, 0x18, 0xb5, 0x85, + 0x50, 0xd8, 0x9e, 0x04, 0xfd, 0x6d, 0xcd, 0xa6, 0x61, 0x2b, 0x54, 0x81, + 0x99, 0xf4, 0x63, 0xf4, 0xeb, 0x73, 0x98, 0xb3, 0x88, 0xf5, 0x50, 0xd4, + 0x5c, 0x67, 0x9e, 0x7c, 0xbc, 0xd8, 0xfd, 0xaf, 0xb8, 0x66, 0x7d, 0xdc, + 0xa5, 0x25, 0xb5, 0xe6, 0x64, 0xd7, 0x07, 0x72, 0x5a, 0x99, 0xf9, 0xf6, + 0x9e, 0xb8, 0x9c, 0xf4, 0xc7, 0xee, 0xee, 0x10, 0x13, 0x9c, 0x1a, 0x8c, + 0x23, 0x89, 0xcd, 0x7b, 0xf1, 0x47, 0x23, 0x51, 0x3c, 0xe5, 0xc2, 0x17, + 0x68, 0xca, 0x98, 0xb8, 0xed, 0xe5, 0x17, 0x6d, 0x0a, 0xde, 0x07, 0xd6, + 0x6c, 0x4f, 0x83, 0x4c, 0x9b, 0xca, 0x6a, 0x7d, 0xc8, 0x68, 0x12, 0xd7, + 0xf0, 0x37, 0x88, 0xf7, 0xbb, 0x68, 0x8b, 0xa4, 0xfd, 0xfe, 0x36, 0x11, + 0xb3, 0x2b, 0x85, 0x6d, 0xaa, 0x30, 0x31, 0xf1, 0x6f, 0x80, 0x72, 0x42, + 0x23, 0xfe, 0x93, 0x88, 0xcc, 0x1e, 0x4b, 0x53, 0x4f, 0x8e, 0x24, 0x67, + 0x4a, 0x72, 0xb6, 0x3c, 0x13, 0x00, 0x11, 0x4f, 0xe1, 0x30, 0xd6, 0xe7, + 0x45, 0x8f, 0xaf, 0xdd, 0xe5, 0xaa, 0xb7, 0x02, 0x17, 0x04, 0xf8, 0xd2, + 0xc1, 0x7b, 0x6c, 0x92, 0xec, 0x76, 0x94, 0x1b, 0xb0, 0xe4, 0xc3, 0x0c, + 0x9e, 0xee, 0xb5, 0xdc, 0x97, 0xca, 0x10, 0x1d, 0x17, 0x96, 0x45, 0xd4, + 0x04, 0x0c, 0xea, 0xca, 0x45, 0xfc, 0x52, 0x54, 0x82, 0x9b, 0xdf, 0x64, + 0xd6, 0x59, 0x6c, 0x12, 0x70, 0xf0, 0x19, 0xd8, 0x46, 0xbb, 0x08, 0x43, + 0x81, 0xa1, 0x73, 0xa8, 0x00, 0xc9, 0x4e, 0xb9, 0xd5, 0xfd, 0x42, 0x5f, + 0xcf, 0x94, 0x14, 0x18, 0xab, 0x9d, 0x11, 0xd0, 0xbd, 0x44, 0x88, 0x2c, + 0xd8, 0x29, 0xec, 0x94, 0x70, 0xf9, 0x42, 0x14, 0xf4, 0xb0, 0x3f, 0xfe, + 0x27, 0x16, 0x43, 0x59, 0x90, 0x14, 0x48, 0x61, 0x8c, 0x91, 0xd9, 0x37, + 0x41, 0xef, 0xf1, 0xe9, 0x15, 0x4a, 0x4f, 0x5e, 0x1f, 0x50, 0x25, 0x20, + 0x2d, 0xa6, 0xf8, 0x79, 0x0d, 0x92, 0xb0, 0x00, 0x0b, 0xa2, 0xfb, 0xc3, + 0x7b, 0x0f, 0xa6, 0xff, 0x75, 0x5d, 0x70, 0xaa, 0xcf, 0x0a, 0xdf, 0xe1, + 0xfc, 0x32, 0x53, 0x1e, 0xf6, 0xe6, 0x69, 0x9f, 0x09, 0xd0, 0xc8, 0xab, + 0xaf, 0xec, 0xb0, 0x04, 0xfa, 0x83, 0xe2, 0x29, 0x23, 0x54, 0x37, 0x87, + 0x63, 0x47, 0x75, 0x9b, 0xdb, 0x1f, 0x4f, 0x1b, 0x6b, 0xa6, 0xe2, 0x67, + 0x1c, 0xb4, 0x74, 0x9e, 0x48, 0x77, 0x61, 0xc2, 0x9a, 0x3e, 0x6b, 0x89, + 0xa9, 0x68, 0x74, 0x27, 0x01, 0x29, 0xd6, 0x46, 0xe8, 0x0f, 0xd0, 0x33, + 0x22, 0x00, 0x45, 0x6c, 0xde, 0x32, 0x28, 0x42, 0x57, 0xaf, 0x70, 0x28, + 0xa0, 0xd5, 0x99, 0xbb, 0x1f, 0xd7, 0x3c, 0x84, 0x20, 0x70, 0x1f, 0xe3, + 0xa9, 0x02, 0x82, 0x01, 0x01, 0x00, 0xe6, 0x68, 0xfe, 0x5f, 0x75, 0x71, + 0x2a, 0xd8, 0xcf, 0x0d, 0x1d, 0xf4, 0xa1, 0x06, 0x8b, 0xa5, 0x70, 0x6f, + 0x29, 0x03, 0xf3, 0x50, 0xd3, 0x83, 0x39, 0xf9, 0xf6, 0xe5, 0x79, 0x7a, + 0x29, 0x75, 0xde, 0xda, 0x6a, 0x98, 0x7c, 0x33, 0xf8, 0x64, 0xca, 0x86, + 0x5a, 0xda, 0x55, 0x5b, 0x4d, 0x7b, 0x1a, 0xe5, 0x5d, 0x19, 0x7d, 0xf3, + 0x57, 0x49, 0x3d, 0x7a, 0xe8, 0x3f, 0x5a, 0x40, 0x8c, 0x15, 0xc7, 0xb0, + 0x53, 0xf8, 0x63, 0x42, 0x17, 0x7c, 0x20, 0xb9, 0xfc, 0xff, 0x27, 0xd0, + 0xc2, 0x0c, 0x45, 0x52, 0x1b, 0x75, 0x1f, 0x89, 0x87, 0xc4, 0xa8, 0x07, + 0x3b, 0x73, 0x16, 0xc7, 0xd7, 0x77, 0x2e, 0x47, 0xa2, 0x7d, 0x12, 0xb4, + 0x25, 0x24, 0x5e, 0xa5, 0xb2, 0x12, 0x76, 0x65, 0xd1, 0xcd, 0xa4, 0x66, + 0x33, 0x2d, 0xed, 0xb2, 0x85, 0xb0, 0xb3, 0x33, 0x56, 0x18, 0x5a, 0xb3, + 0x75, 0x43, 0x4d, 0x40, 0x14, 0x22, 0x55, 0xf6, 0x5a, 0x0c, 0x6a, 0xb3, + 0xc3, 0x8a, 0x9b, 0x76, 0x1e, 0x23, 0x8d, 0x4a, 0x8f, 0x38, 0x21, 0x25, + 0x43, 0x45, 0xf6, 0x25, 0x46, 0xdb, 0xae, 0x42, 0x43, 0x74, 0x69, 0x15, + 0x46, 0xf0, 0x3a, 0x41, 0x4f, 0x9f, 0xfe, 0xda, 0x07, 0x0b, 0x38, 0xbe, + 0x6b, 0xad, 0xc2, 0xef, 0x5b, 0x97, 0x18, 0x42, 0x13, 0xac, 0x13, 0x15, + 0x70, 0x7b, 0xe2, 0x00, 0xbb, 0x41, 0x22, 0x99, 0xe5, 0xd3, 0x67, 0xfe, + 0xfd, 0xbd, 0x8e, 0xc3, 0xca, 0x60, 0x59, 0x3d, 0x8f, 0x85, 0x76, 0x41, + 0xf0, 0xb8, 0x09, 0x1a, 0x48, 0x50, 0xe4, 0x9c, 0x4a, 0x56, 0x02, 0x60, + 0x76, 0xff, 0xde, 0xd4, 0x8e, 0x76, 0xa3, 0x9c, 0x30, 0xb4, 0xa4, 0x73, + 0xe6, 0xb0, 0x70, 0xac, 0x67, 0x5f, 0x25, 0xd2, 0x94, 0xc5, 0x25, 0xb6, + 0xbf, 0xf6, 0x0b, 0xd8, 0x9f, 0x35, 0x8c, 0x20, 0xb6, 0xdd, 0x02, 0x82, + 0x01, 0x01, 0x00, 0xb5, 0x31, 0x9e, 0xa2, 0x10, 0x38, 0xca, 0x2b, 0x07, + 0xc9, 0x3f, 0x0f, 0x18, 0x2c, 0x98, 0x7f, 0x15, 0x87, 0x92, 0x93, 0x2e, + 0xce, 0x6b, 0x11, 0x42, 0x2a, 0x94, 0x3e, 0x31, 0xd0, 0xf5, 0xae, 0x9d, + 0xc7, 0x67, 0x51, 0x3c, 0x0a, 0x52, 0x04, 0x94, 0x86, 0x2e, 0x50, 0x32, + 0xe1, 0x48, 0x83, 0x85, 0xe8, 0x82, 0x04, 0x2f, 0x25, 0xbc, 0xea, 0xfc, + 0x3d, 0x4b, 0xd1, 0x53, 0x90, 0x61, 0x97, 0x47, 0x73, 0xcd, 0x1f, 0xa9, + 0x5a, 0x3f, 0xfb, 0xbf, 0xc3, 0xd5, 0x19, 0xb6, 0xd3, 0x59, 0x57, 0x37, + 0xd9, 0x09, 0x29, 0xd3, 0x80, 0xc4, 0xae, 0x52, 0xce, 0xce, 0x82, 0x29, + 0x6b, 0x95, 0x44, 0x69, 0x33, 0xfd, 0x6a, 0x6d, 0x65, 0xf7, 0xa9, 0xc0, + 0x65, 0x25, 0x91, 0x05, 0xdf, 0x07, 0xbe, 0x61, 0x5c, 0xaa, 0x8f, 0x87, + 0xc8, 0x43, 0xd7, 0x30, 0xd0, 0x8b, 0x25, 0xaf, 0xb8, 0x5d, 0x50, 0x4e, + 0x31, 0x4a, 0xc9, 0x79, 0x56, 0xbf, 0x8d, 0xcc, 0x40, 0xa7, 0xea, 0xd4, + 0xf7, 0x66, 0x86, 0xe2, 0x0b, 0xf3, 0x13, 0xbc, 0xdc, 0x0d, 0x62, 0x28, + 0x4e, 0xb7, 0x31, 0xb4, 0x5a, 0x9b, 0x97, 0x65, 0x76, 0x24, 0xbb, 0xef, + 0x90, 0x1b, 0xdb, 0x93, 0x98, 0xae, 0xce, 0xb0, 0x69, 0x82, 0x49, 0x94, + 0xc0, 0xc3, 0x8f, 0x9c, 0x5d, 0x26, 0x45, 0xa0, 0xad, 0x15, 0x3b, 0x6e, + 0xda, 0x6e, 0x78, 0xc1, 0x78, 0xc3, 0x15, 0x8e, 0x64, 0xaf, 0x50, 0xa6, + 0xb7, 0xd9, 0xfb, 0x8f, 0x68, 0xa0, 0x2d, 0x59, 0xa9, 0xce, 0x5b, 0xa7, + 0x91, 0x36, 0xb8, 0x05, 0x28, 0x31, 0x25, 0xc7, 0x7e, 0xa4, 0x68, 0x9d, + 0xea, 0x5c, 0x71, 0x10, 0x84, 0xab, 0xc4, 0xd7, 0xbe, 0x7d, 0xe9, 0x4a, + 0x11, 0x22, 0xa6, 0xd5, 0xa3, 0x6e, 0x46, 0x07, 0x70, 0x78, 0xcc, 0xd5, + 0xbc, 0xfe, 0xc4, 0x39, 0x58, 0xf4, 0xbb, 0x02, 0x82, 0x01, 0x01, 0x00, + 0xaa, 0x0c, 0x73, 0x30, 0x20, 0x8d, 0x15, 0x02, 0x4e, 0x4d, 0x6f, 0xfe, + 0x4b, 0x99, 0x79, 0x16, 0xf0, 0x94, 0x19, 0xc1, 0x40, 0xa2, 0x36, 0x78, + 0x73, 0x21, 0x78, 0x86, 0x83, 0xd1, 0x15, 0x28, 0x59, 0x00, 0xfa, 0x0a, + 0xf0, 0x1f, 0xab, 0x03, 0x38, 0x35, 0x50, 0x78, 0x32, 0xe6, 0xdf, 0x98, + 0x2b, 0x91, 0x7b, 0xd4, 0x84, 0x90, 0x43, 0xab, 0x5a, 0x24, 0x8b, 0xa3, + 0xb6, 0x08, 0x4d, 0x5b, 0x05, 0xb5, 0xad, 0x43, 0x74, 0x7e, 0x22, 0xb7, + 0x09, 0xb0, 0x3a, 0x78, 0x55, 0xfa, 0x4c, 0x3c, 0xa2, 0x2c, 0xa6, 0xf7, + 0x19, 0xff, 0x76, 0xa4, 0x3d, 0x1e, 0x99, 0x51, 0xa7, 0x4e, 0x76, 0x47, + 0x0f, 0x70, 0xef, 0x0b, 0x3f, 0xf2, 0x94, 0x36, 0xf3, 0x63, 0x76, 0xb9, + 0x09, 0x88, 0xbb, 0xfe, 0xf9, 0x86, 0x33, 0xdf, 0x81, 0xbe, 0x6f, 0xcc, + 0xa9, 0x75, 0x09, 0xe5, 0x8f, 0x8b, 0x42, 0xd0, 0x19, 0x03, 0x61, 0xd8, + 0xb5, 0x78, 0xcb, 0x9c, 0xbe, 0x63, 0x4d, 0xbd, 0xce, 0x5e, 0xae, 0x7f, + 0xae, 0x97, 0x88, 0x7b, 0xf4, 0x7a, 0x7b, 0xdb, 0xf6, 0x7e, 0x2c, 0x7d, + 0x95, 0x6e, 0x72, 0x3a, 0x48, 0x13, 0xdb, 0xf7, 0x10, 0x07, 0x83, 0xac, + 0xa1, 0x7a, 0x68, 0x18, 0x70, 0x18, 0x99, 0x7f, 0xf4, 0x8e, 0x93, 0x1a, + 0x40, 0x5d, 0x04, 0x07, 0xcb, 0x4d, 0xd7, 0x66, 0x96, 0xb5, 0xd3, 0x7d, + 0x8e, 0xfb, 0xe6, 0x12, 0xd0, 0x7d, 0xf0, 0xe7, 0x25, 0xa6, 0x7a, 0x86, + 0x01, 0x56, 0xdd, 0xc5, 0xb2, 0x31, 0x98, 0x67, 0x3a, 0xd0, 0x9a, 0xee, + 0x98, 0xca, 0x80, 0x52, 0x5a, 0x0e, 0xb7, 0xc4, 0xbf, 0xc0, 0x40, 0x24, + 0x6f, 0x3b, 0xa6, 0xf6, 0xab, 0x28, 0x9e, 0xe9, 0x39, 0x3f, 0x04, 0x4b, + 0xc4, 0xae, 0x55, 0xfd, 0xea, 0x87, 0xa5, 0xc5, 0x01, 0x99, 0x2e, 0x67, + 0x66, 0xb3, 0xfe, 0x41, 0x02, 0x82, 0x01, 0x00, 0x05, 0x26, 0x96, 0xf2, + 0xd6, 0x71, 0x36, 0xd6, 0x08, 0x4f, 0xa1, 0x3a, 0x45, 0x9e, 0xa6, 0xeb, + 0x1d, 0xea, 0x8f, 0xb1, 0x1d, 0x68, 0x82, 0xc4, 0xa7, 0xd3, 0xdc, 0x08, + 0xf4, 0x93, 0x93, 0x18, 0x56, 0xa5, 0xdf, 0x7b, 0x00, 0xb0, 0xee, 0x69, + 0xf0, 0xea, 0xeb, 0x90, 0x1e, 0x12, 0x27, 0x64, 0x8d, 0xbe, 0xf1, 0x4b, + 0x3b, 0x27, 0xe0, 0x79, 0xf1, 0x97, 0xb0, 0x7b, 0x0f, 0xdc, 0x0f, 0xda, + 0x24, 0x0e, 0xd7, 0xaa, 0xe9, 0xbe, 0x86, 0x09, 0x1b, 0x07, 0x6f, 0x1c, + 0x5f, 0x05, 0x1d, 0x0a, 0x0c, 0xad, 0x5f, 0xc4, 0x4f, 0x9d, 0xde, 0x79, + 0x72, 0x23, 0x2c, 0xdd, 0xa8, 0x5d, 0xc5, 0x8d, 0x7f, 0x4c, 0x1a, 0x0d, + 0x17, 0x75, 0x09, 0x98, 0x4a, 0xbe, 0xd5, 0x55, 0x8d, 0x0c, 0x2d, 0x05, + 0x2d, 0x71, 0x5b, 0xeb, 0xde, 0x99, 0x43, 0xcc, 0x6f, 0x37, 0xce, 0x6c, + 0xd0, 0xd4, 0xf5, 0xda, 0x1d, 0x8e, 0xeb, 0x28, 0x55, 0x09, 0xb1, 0x42, + 0x4f, 0xa7, 0x1a, 0xde, 0xe3, 0x14, 0xf1, 0x56, 0x2e, 0x40, 0xd6, 0xb5, + 0x1d, 0xee, 0x47, 0x77, 0x1d, 0xdc, 0x36, 0xfa, 0xf3, 0xbc, 0x8b, 0xa5, + 0xbf, 0x1d, 0x9f, 0xa7, 0xb4, 0x04, 0xad, 0xb6, 0x0d, 0x39, 0x0e, 0xe7, + 0x13, 0x3e, 0xbc, 0x94, 0x68, 0xe5, 0x1d, 0xea, 0x0c, 0x30, 0xdd, 0xb0, + 0xa7, 0x03, 0xa4, 0x91, 0xde, 0xf1, 0xd8, 0xa8, 0x18, 0x1f, 0xdd, 0xb3, + 0xd4, 0x2b, 0x6a, 0x8c, 0x69, 0x60, 0xda, 0x92, 0x7b, 0x1e, 0x27, 0x47, + 0x82, 0xbf, 0xff, 0xfc, 0xbd, 0x03, 0xb4, 0xc1, 0x80, 0x6c, 0x07, 0x11, + 0xa2, 0xdd, 0x27, 0xc1, 0x4d, 0x93, 0xe6, 0xf2, 0xd3, 0xdc, 0x61, 0xa1, + 0xa3, 0xdc, 0x67, 0x69, 0xe5, 0x50, 0x1d, 0x63, 0x0e, 0xb9, 0xa9, 0x9d, + 0xd6, 0x02, 0x4d, 0x7c, 0xcd, 0x2a, 0xa5, 0x37, 0x60, 0xc5, 0xf5, 0x97, + 0x02, 0x82, 0x01, 0x00, 0x14, 0x8b, 0x04, 0xdb, 0x4e, 0x41, 0x4a, 0xcd, + 0x86, 0x2e, 0x5f, 0x13, 0xb3, 0x48, 0x1e, 0x00, 0xdf, 0x8d, 0x0b, 0x35, + 0x51, 0x51, 0x1b, 0x16, 0x3d, 0x49, 0x4e, 0xe1, 0xee, 0x4d, 0xc7, 0x03, + 0xc0, 0xf6, 0x5c, 0x6c, 0x36, 0xe8, 0x22, 0xa5, 0x79, 0xb4, 0x4c, 0xce, + 0xa8, 0x45, 0x12, 0x2c, 0xf3, 0x6a, 0xcd, 0x33, 0xbd, 0xd0, 0x84, 0x4d, + 0xf7, 0x8f, 0xb5, 0x80, 0x1f, 0x18, 0x52, 0xad, 0xad, 0xce, 0xcd, 0x94, + 0xc9, 0xc6, 0xb4, 0xd2, 0x14, 0x29, 0xe4, 0xc7, 0x40, 0xf1, 0x0b, 0x85, + 0x43, 0xaf, 0x11, 0xd3, 0x46, 0x0a, 0xb1, 0x15, 0x87, 0x1f, 0x4e, 0x2e, + 0xc1, 0x11, 0xe9, 0x24, 0x70, 0x40, 0xba, 0x0b, 0x0e, 0x4a, 0xac, 0x45, + 0x21, 0xcc, 0x6d, 0xa4, 0x1d, 0x55, 0x33, 0x89, 0x4c, 0x65, 0x21, 0x23, + 0xab, 0x61, 0x31, 0xcb, 0x11, 0x65, 0xb3, 0x80, 0xa4, 0x5a, 0x2b, 0xf1, + 0x65, 0xdb, 0x4c, 0x58, 0x5a, 0xbe, 0xf3, 0x15, 0xcd, 0x94, 0xa1, 0xe4, + 0xcb, 0x30, 0xfa, 0xe1, 0x28, 0x51, 0x52, 0xd2, 0xb8, 0xb4, 0x8c, 0xfc, + 0x3a, 0xcc, 0xd1, 0x19, 0xa2, 0x27, 0x36, 0xfa, 0xc4, 0x23, 0x96, 0xb9, + 0xc7, 0x74, 0xca, 0xf1, 0x45, 0x1f, 0x4b, 0xc2, 0x77, 0x4d, 0x32, 0x3f, + 0xab, 0x7a, 0xd9, 0x2b, 0x22, 0x1d, 0xcb, 0x24, 0x58, 0x29, 0xa3, 0xb8, + 0x92, 0xdb, 0x1c, 0xda, 0x84, 0x01, 0xca, 0x6d, 0x4a, 0x50, 0xd4, 0x2b, + 0x79, 0xfa, 0xc5, 0x4c, 0x9d, 0x79, 0x49, 0xf1, 0xde, 0xbd, 0x3f, 0x50, + 0xa7, 0xa6, 0xc6, 0xc7, 0x99, 0x61, 0x9b, 0xda, 0x38, 0xdc, 0xbe, 0x85, + 0x75, 0x81, 0xb9, 0x0f, 0x33, 0xd0, 0xd4, 0xd0, 0xaa, 0xbd, 0x32, 0xc9, + 0x62, 0xe8, 0x21, 0x24, 0xeb, 0x03, 0x73, 0x46, 0xb3, 0x84, 0x65, 0xf2, + 0x40, 0x7d, 0x1b, 0x1b, 0x8f, 0x86, 0x7c, 0xe7 +}; + +/* The corresponding public key, DER. */ +static const unsigned char rsa_pub_key[] = { + 0x30, 0x82, 0x02, 0x0a, 0x02, 0x82, 0x02, 0x01, 0x00, 0xa3, 0x14, 0xe4, + 0xb8, 0xd8, 0x58, 0x0d, 0xab, 0xd7, 0x87, 0xa4, 0xf6, 0x84, 0x51, 0x74, + 0x60, 0x4c, 0xe3, 0x60, 0x28, 0x89, 0x49, 0x65, 0x18, 0x5c, 0x8f, 0x1a, + 0x1b, 0xe9, 0xdb, 0xc1, 0xc1, 0xf7, 0x08, 0x27, 0x44, 0xe5, 0x9d, 0x9a, + 0x33, 0xc3, 0xac, 0x5a, 0xca, 0xba, 0x20, 0x5a, 0x9e, 0x3a, 0x18, 0xb5, + 0x3d, 0xe3, 0x9d, 0x94, 0x58, 0xa7, 0xa9, 0x5a, 0x0b, 0x4f, 0xb8, 0xe5, + 0xa3, 0x7b, 0x01, 0x11, 0x0f, 0x16, 0x11, 0xb8, 0x65, 0x2f, 0xa8, 0x95, + 0xf7, 0x58, 0x2c, 0xec, 0x1d, 0x41, 0xad, 0xd1, 0x12, 0xca, 0x4a, 0x80, + 0x35, 0x35, 0x43, 0x7e, 0xe0, 0x97, 0xfc, 0x86, 0x8f, 0xcf, 0x4b, 0xdc, + 0xbc, 0x15, 0x2c, 0x8e, 0x90, 0x84, 0x26, 0x83, 0xc1, 0x96, 0x97, 0xf4, + 0xd7, 0x90, 0xce, 0xfe, 0xd4, 0xf3, 0x70, 0x22, 0xa8, 0xb0, 0x1f, 0xed, + 0x08, 0xd7, 0xc5, 0xc0, 0xd6, 0x41, 0x6b, 0x24, 0x68, 0x5c, 0x07, 0x1f, + 0x44, 0x97, 0xd8, 0x6e, 0x18, 0x93, 0x67, 0xc3, 0xba, 0x3a, 0xaf, 0xfd, + 0xc2, 0x65, 0x00, 0x21, 0x63, 0xdf, 0xb7, 0x28, 0x68, 0xd6, 0xc0, 0x20, + 0x86, 0x92, 0xed, 0x68, 0x6a, 0x27, 0x3a, 0x07, 0xec, 0x66, 0x00, 0xfe, + 0x51, 0x51, 0x86, 0x41, 0x6f, 0x83, 0x69, 0xd2, 0xf0, 0xe6, 0xf7, 0x61, + 0xda, 0x12, 0x45, 0x53, 0x09, 0xdf, 0xf8, 0x42, 0xc7, 0x30, 0x6a, 0xe5, + 0xd8, 0x2b, 0xa2, 0x49, 0x7a, 0x05, 0x10, 0xee, 0xb2, 0x59, 0x0a, 0xe5, + 0xbe, 0xf8, 0x4d, 0x0f, 0xa8, 0x9e, 0x63, 0x81, 0x39, 0x32, 0xaa, 0xfd, + 0xa8, 0x03, 0xf6, 0xd8, 0xc6, 0xaa, 0x02, 0x93, 0x03, 0xeb, 0x15, 0xd3, + 0x38, 0xc8, 0x1a, 0x78, 0xcf, 0xf3, 0xa7, 0x9f, 0x98, 0x4b, 0x91, 0x5b, + 0x79, 0xf8, 0x4e, 0x53, 0xaf, 0x0c, 0x65, 0xe9, 0xb0, 0x93, 0xc2, 0xcb, + 0x5d, 0x3c, 0x5f, 0x6e, 0x39, 0xd2, 0x58, 0x23, 0x50, 0xe5, 0x2e, 0xef, + 0x12, 0x00, 0xa4, 0x59, 0x13, 0x2b, 0x2f, 0x2c, 0x0a, 0x7b, 0x36, 0x89, + 0xc5, 0xe5, 0x8f, 0x95, 0x5e, 0x14, 0x0f, 0x0f, 0x94, 0x5a, 0xe9, 0xdc, + 0x0b, 0x49, 0x14, 0xbe, 0x0a, 0x70, 0x45, 0xc1, 0x7c, 0xbf, 0x83, 0x70, + 0xfd, 0x3d, 0x99, 0xe6, 0x8a, 0xf5, 0x9c, 0x09, 0x71, 0x84, 0x9a, 0x18, + 0xa0, 0xe0, 0x6c, 0x43, 0x5c, 0x7e, 0x48, 0x33, 0xc8, 0xbe, 0x5d, 0xdd, + 0xd8, 0x77, 0xe3, 0xe7, 0x6b, 0x34, 0x4b, 0xa2, 0xb7, 0x54, 0x07, 0x72, + 0x2e, 0xab, 0xa9, 0x91, 0x1e, 0x4b, 0xe3, 0xb5, 0xd8, 0xfa, 0x35, 0x64, + 0x8a, 0xe9, 0x03, 0xa1, 0xa8, 0x26, 0xbd, 0x72, 0x58, 0x10, 0x6a, 0xec, + 0x1a, 0xf6, 0x1e, 0xb8, 0xc0, 0x46, 0x19, 0x31, 0x2c, 0xca, 0xf9, 0x6a, + 0xd7, 0x2e, 0xd0, 0xa7, 0x2c, 0x60, 0x58, 0xc4, 0x8f, 0x46, 0x63, 0x61, + 0x8d, 0x29, 0x6f, 0xe2, 0x5f, 0xe2, 0x43, 0x90, 0x9c, 0xe6, 0xfc, 0x08, + 0x41, 0xc8, 0xb5, 0x23, 0x56, 0x24, 0x3e, 0x3a, 0x2c, 0x41, 0x22, 0x43, + 0xda, 0x22, 0x15, 0x2b, 0xad, 0xd0, 0xfa, 0xc8, 0x47, 0x44, 0xe6, 0x2a, + 0xf9, 0x38, 0x90, 0x13, 0x62, 0x22, 0xea, 0x06, 0x8c, 0x44, 0x9c, 0xd6, + 0xca, 0x50, 0x93, 0xe9, 0xd4, 0x03, 0xd8, 0x3e, 0x71, 0x36, 0x4b, 0xaa, + 0xab, 0xbb, 0xe2, 0x48, 0x66, 0x26, 0x53, 0xb1, 0x6d, 0x3b, 0x82, 0x2c, + 0x8c, 0x25, 0x05, 0xf0, 0xf8, 0xcf, 0x55, 0xbf, 0x8e, 0x29, 0xf7, 0x54, + 0x5b, 0x6f, 0x30, 0x54, 0xa6, 0xad, 0x46, 0xff, 0x22, 0x95, 0xb1, 0x87, + 0x98, 0x00, 0x51, 0x69, 0x15, 0x07, 0xbd, 0x3d, 0x9c, 0x6e, 0xaa, 0xaa, + 0x3b, 0x0b, 0x74, 0x65, 0x4c, 0x04, 0xe0, 0x80, 0x3e, 0xaf, 0x5e, 0x10, + 0xd6, 0x9b, 0x28, 0x37, 0x6f, 0x02, 0x03, 0x01, 0x00, 0x01 +}; diff --git a/deps/openssl/openssl/demos/signature/rsa_pss_direct.c b/deps/openssl/openssl/demos/signature/rsa_pss_direct.c new file mode 100644 index 000000000..1ecfa9d89 --- /dev/null +++ b/deps/openssl/openssl/demos/signature/rsa_pss_direct.c @@ -0,0 +1,204 @@ +/* + * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the Apache License 2.0 (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include "rsa_pss.h" + +/* + * The digest to be signed. This should be the output of a hash function. + * Here we sign an all-zeroes digest for demonstration purposes. + */ +static const unsigned char test_digest[32] = {0}; + +/* A property query used for selecting algorithm implementations. */ +static const char *propq = NULL; + +/* + * This function demonstrates RSA signing of a SHA-256 digest using the PSS + * padding scheme. You must already have hashed the data you want to sign. + * For a higher-level demonstration which does the hashing for you, see + * rsa_pss_hash.c. + * + * For more information, see RFC 8017 section 9.1. The digest passed in + * (test_digest above) corresponds to the 'mHash' value. + */ +static int sign(OSSL_LIB_CTX *libctx, unsigned char **sig, size_t *sig_len) +{ + int rv = 0; + EVP_PKEY *pkey = NULL; + EVP_PKEY_CTX *ctx = NULL; + EVP_MD *md = NULL; + const unsigned char *ppriv_key = NULL; + + *sig = NULL; + + /* Load DER-encoded RSA private key. */ + ppriv_key = rsa_priv_key; + pkey = d2i_PrivateKey_ex(EVP_PKEY_RSA, NULL, &ppriv_key, + sizeof(rsa_priv_key), libctx, propq); + if (pkey == NULL) { + fprintf(stderr, "Failed to load private key\n"); + goto end; + } + + /* Fetch hash algorithm we want to use. */ + md = EVP_MD_fetch(libctx, "SHA256", propq); + if (md == NULL) { + fprintf(stderr, "Failed to fetch hash algorithm\n"); + goto end; + } + + /* Create signing context. */ + ctx = EVP_PKEY_CTX_new_from_pkey(libctx, pkey, propq); + if (ctx == NULL) { + fprintf(stderr, "Failed to create signing context\n"); + goto end; + } + + /* Initialize context for signing and set options. */ + if (EVP_PKEY_sign_init(ctx) == 0) { + fprintf(stderr, "Failed to initialize signing context\n"); + goto end; + } + + if (EVP_PKEY_CTX_set_rsa_padding(ctx, RSA_PKCS1_PSS_PADDING) == 0) { + fprintf(stderr, "Failed to configure padding\n"); + goto end; + } + + if (EVP_PKEY_CTX_set_signature_md(ctx, md) == 0) { + fprintf(stderr, "Failed to configure digest type\n"); + goto end; + } + + /* Determine length of signature. */ + if (EVP_PKEY_sign(ctx, NULL, sig_len, + test_digest, sizeof(test_digest)) == 0) { + fprintf(stderr, "Failed to get signature length\n"); + goto end; + } + + /* Allocate memory for signature. */ + *sig = OPENSSL_malloc(*sig_len); + if (*sig == NULL) { + fprintf(stderr, "Failed to allocate memory for signature\n"); + goto end; + } + + /* Generate signature. */ + if (EVP_PKEY_sign(ctx, *sig, sig_len, + test_digest, sizeof(test_digest)) != 1) { + fprintf(stderr, "Failed to sign\n"); + goto end; + } + + rv = 1; +end: + EVP_PKEY_CTX_free(ctx); + EVP_PKEY_free(pkey); + EVP_MD_free(md); + + if (rv == 0) + OPENSSL_free(*sig); + + return rv; +} + +/* + * This function demonstrates verification of an RSA signature over a SHA-256 + * digest using the PSS signature scheme. + */ +static int verify(OSSL_LIB_CTX *libctx, const unsigned char *sig, size_t sig_len) +{ + int rv = 0; + const unsigned char *ppub_key = NULL; + EVP_PKEY *pkey = NULL; + EVP_PKEY_CTX *ctx = NULL; + EVP_MD *md = NULL; + + /* Load DER-encoded RSA public key. */ + ppub_key = rsa_pub_key; + pkey = d2i_PublicKey(EVP_PKEY_RSA, NULL, &ppub_key, sizeof(rsa_pub_key)); + if (pkey == NULL) { + fprintf(stderr, "Failed to load public key\n"); + goto end; + } + + /* Fetch hash algorithm we want to use. */ + md = EVP_MD_fetch(libctx, "SHA256", propq); + if (md == NULL) { + fprintf(stderr, "Failed to fetch hash algorithm\n"); + goto end; + } + + /* Create verification context. */ + ctx = EVP_PKEY_CTX_new_from_pkey(libctx, pkey, propq); + if (ctx == NULL) { + fprintf(stderr, "Failed to create verification context\n"); + goto end; + } + + /* Initialize context for verification and set options. */ + if (EVP_PKEY_verify_init(ctx) == 0) { + fprintf(stderr, "Failed to initialize verification context\n"); + goto end; + } + + if (EVP_PKEY_CTX_set_rsa_padding(ctx, RSA_PKCS1_PSS_PADDING) == 0) { + fprintf(stderr, "Failed to configure padding\n"); + goto end; + } + + if (EVP_PKEY_CTX_set_signature_md(ctx, md) == 0) { + fprintf(stderr, "Failed to configure digest type\n"); + goto end; + } + + /* Verify signature. */ + if (EVP_PKEY_verify(ctx, sig, sig_len, + test_digest, sizeof(test_digest)) == 0) { + fprintf(stderr, "Failed to verify signature; " + "signature may be invalid\n"); + goto end; + } + + rv = 1; +end: + EVP_PKEY_CTX_free(ctx); + EVP_PKEY_free(pkey); + EVP_MD_free(md); + return rv; +} + +int main(int argc, char **argv) +{ + int rv = 1; + OSSL_LIB_CTX *libctx = NULL; + unsigned char *sig = NULL; + size_t sig_len = 0; + + if (sign(libctx, &sig, &sig_len) == 0) + goto end; + + if (verify(libctx, sig, sig_len) == 0) + goto end; + + rv = 0; +end: + OPENSSL_free(sig); + OSSL_LIB_CTX_free(libctx); + return rv; +} diff --git a/deps/openssl/openssl/demos/signature/rsa_pss_hash.c b/deps/openssl/openssl/demos/signature/rsa_pss_hash.c new file mode 100644 index 000000000..e1d4e7cc9 --- /dev/null +++ b/deps/openssl/openssl/demos/signature/rsa_pss_hash.c @@ -0,0 +1,189 @@ +/* + * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the Apache License 2.0 (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include "rsa_pss.h" + +/* The data to be signed. This will be hashed. */ +static const char test_message[] = + "This is an example message to be signed."; + +/* A property query used for selecting algorithm implementations. */ +static const char *propq = NULL; + +/* + * This function demonstrates RSA signing of an arbitrary-length message. + * Hashing is performed automatically. In this example, SHA-256 is used. If you + * have already hashed your message and simply want to sign the hash directly, + * see rsa_pss_direct.c. + */ +static int sign(OSSL_LIB_CTX *libctx, unsigned char **sig, size_t *sig_len) +{ + int rv = 0; + EVP_PKEY *pkey = NULL; + EVP_MD_CTX *mctx = NULL; + OSSL_PARAM params[2], *p = params; + const unsigned char *ppriv_key = NULL; + + *sig = NULL; + + /* Load DER-encoded RSA private key. */ + ppriv_key = rsa_priv_key; + pkey = d2i_PrivateKey_ex(EVP_PKEY_RSA, NULL, &ppriv_key, + sizeof(rsa_priv_key), libctx, propq); + if (pkey == NULL) { + fprintf(stderr, "Failed to load private key\n"); + goto end; + } + + /* Create MD context used for signing. */ + mctx = EVP_MD_CTX_new(); + if (mctx == NULL) { + fprintf(stderr, "Failed to create MD context\n"); + goto end; + } + + /* Initialize MD context for signing. */ + *p++ = OSSL_PARAM_construct_utf8_string(OSSL_SIGNATURE_PARAM_PAD_MODE, + OSSL_PKEY_RSA_PAD_MODE_PSS, 0); + *p = OSSL_PARAM_construct_end(); + + if (EVP_DigestSignInit_ex(mctx, NULL, "SHA256", libctx, propq, + pkey, params) == 0) { + fprintf(stderr, "Failed to initialize signing context\n"); + goto end; + } + + /* + * Feed data to be signed into the algorithm. This may + * be called multiple times. + */ + if (EVP_DigestSignUpdate(mctx, test_message, sizeof(test_message)) == 0) { + fprintf(stderr, "Failed to hash message into signing context\n"); + goto end; + } + + /* Determine signature length. */ + if (EVP_DigestSignFinal(mctx, NULL, sig_len) == 0) { + fprintf(stderr, "Failed to get signature length\n"); + goto end; + } + + /* Allocate memory for signature. */ + *sig = OPENSSL_malloc(*sig_len); + if (*sig == NULL) { + fprintf(stderr, "Failed to allocate memory for signature\n"); + goto end; + } + + /* Generate signature. */ + if (EVP_DigestSignFinal(mctx, *sig, sig_len) == 0) { + fprintf(stderr, "Failed to sign\n"); + goto end; + } + + rv = 1; +end: + EVP_MD_CTX_free(mctx); + EVP_PKEY_free(pkey); + + if (rv == 0) + OPENSSL_free(*sig); + + return rv; +} + +/* + * This function demonstrates verification of an RSA signature over an + * arbitrary-length message using the PSS signature scheme. Hashing is performed + * automatically. + */ +static int verify(OSSL_LIB_CTX *libctx, const unsigned char *sig, size_t sig_len) +{ + int rv = 0; + EVP_PKEY *pkey = NULL; + EVP_MD_CTX *mctx = NULL; + OSSL_PARAM params[2], *p = params; + const unsigned char *ppub_key = NULL; + + /* Load DER-encoded RSA public key. */ + ppub_key = rsa_pub_key; + pkey = d2i_PublicKey(EVP_PKEY_RSA, NULL, &ppub_key, sizeof(rsa_pub_key)); + if (pkey == NULL) { + fprintf(stderr, "Failed to load public key\n"); + goto end; + } + + /* Create MD context used for verification. */ + mctx = EVP_MD_CTX_new(); + if (mctx == NULL) { + fprintf(stderr, "Failed to create MD context\n"); + goto end; + } + + /* Initialize MD context for verification. */ + *p++ = OSSL_PARAM_construct_utf8_string(OSSL_SIGNATURE_PARAM_PAD_MODE, + OSSL_PKEY_RSA_PAD_MODE_PSS, 0); + *p = OSSL_PARAM_construct_end(); + + if (EVP_DigestVerifyInit_ex(mctx, NULL, "SHA256", libctx, propq, + pkey, params) == 0) { + fprintf(stderr, "Failed to initialize signing context\n"); + goto end; + } + + /* + * Feed data to be signed into the algorithm. This may + * be called multiple times. + */ + if (EVP_DigestVerifyUpdate(mctx, test_message, sizeof(test_message)) == 0) { + fprintf(stderr, "Failed to hash message into signing context\n"); + goto end; + } + + /* Verify signature. */ + if (EVP_DigestVerifyFinal(mctx, sig, sig_len) == 0) { + fprintf(stderr, "Failed to verify signature; " + "signature may be invalid\n"); + goto end; + } + + rv = 1; +end: + EVP_MD_CTX_free(mctx); + EVP_PKEY_free(pkey); + return rv; +} + +int main(int argc, char **argv) +{ + int rv = 1; + OSSL_LIB_CTX *libctx = NULL; + unsigned char *sig = NULL; + size_t sig_len = 0; + + if (sign(libctx, &sig, &sig_len) == 0) + goto end; + + if (verify(libctx, sig, sig_len) == 0) + goto end; + + rv = 0; +end: + OPENSSL_free(sig); + OSSL_LIB_CTX_free(libctx); + return rv; +} diff --git a/deps/openssl/openssl/demos/smime/cacert.pem b/deps/openssl/openssl/demos/smime/cacert.pem new file mode 100644 index 000000000..1949fc33a --- /dev/null +++ b/deps/openssl/openssl/demos/smime/cacert.pem @@ -0,0 +1,29 @@ +-----BEGIN CERTIFICATE----- +MIIFBjCCA26gAwIBAgIUM/WihZJZUTZvqoyNaUlp59DOaWYwDQYJKoZIhvcNAQEL +BQAwVzELMAkGA1UEBhMCVUsxEjAQBgNVBAcMCVRlc3QgQ2l0eTEWMBQGA1UECgwN +T3BlblNTTCBHcm91cDEcMBoGA1UEAwwTVGVzdCBTL01JTUUgUm9vdCBDQTAgFw0x +ODA2MTQxMjQ2MjhaGA8yMTE4MDYxNDEyNDYyOFowVzELMAkGA1UEBhMCVUsxEjAQ +BgNVBAcMCVRlc3QgQ2l0eTEWMBQGA1UECgwNT3BlblNTTCBHcm91cDEcMBoGA1UE +AwwTVGVzdCBTL01JTUUgUm9vdCBDQTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCC +AYoCggGBAMzxOVHZFVxN9XQIVW3y1bK5ir3jKpKkU6zKrw8MdRvm233eqWSOYJvs +3rgdT59iv+CaPcBT5offbP0eH43H96CubJji/vQLMUzc/cLrJuCbLHREbSCsFNpf +lYw5mkT98dCFV66HuN6Nwqi5kW8TxGSXkD4OZqklbbicrXoXh5qhREID5hgbrijy +BiIHyp6bDq5zUCcmHP/Gdw2aTMEQZNsdw4MavtB65vI7dYxo2zEzdmJ3NnjlG7qZ +6Od6V4IW8yRAK9GLj0TUCZl28pq6rNio+F5Lst3clX9PDxh7LphNrXXYiHjXp2Kn +LZbOnz1SJSmCeisy/EFN6fRtwdwqcM1AcKNBU+UqFq0Mv0sgNdRwghYWGQht0mT9 ++Pg5HxTzDlOOmBT1kAduxJNLiRQlgysPDN94Os0EpzJyA87Z6yJRGvYGZ5mrdfx2 +8p6bHptf46h1WzCX4wDy2J86y+odgWMnSkmF9h8ySj66rgmLrz40n+mDm8bhUblK +AV8IqN8WmQIDAQABo4HHMIHEMB0GA1UdDgQWBBSkmMaBYQPTEGcqe1maU2IDOMLQ +ezCBlAYDVR0jBIGMMIGJgBSkmMaBYQPTEGcqe1maU2IDOMLQe6FbpFkwVzELMAkG +A1UEBhMCVUsxEjAQBgNVBAcMCVRlc3QgQ2l0eTEWMBQGA1UECgwNT3BlblNTTCBH +cm91cDEcMBoGA1UEAwwTVGVzdCBTL01JTUUgUm9vdCBDQYIUM/WihZJZUTZvqoyN +aUlp59DOaWYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAYEAqP1CQRGM +roHvk6dhI4ElNae5seRdSQNTtwAhlP1RoSoFz8xybMgDksKE07t77gDsKvU2SuXV +fdICqVpjpN9cRYKM6VmiREdU6OGsPQ74u4sOg4cT/tuou0RsD/uQaznb5NOvo2T0 +8rmX0Ai3+lbEuMBCaGNU0KYJifYy4QrSqEapq4W3NbqH85msOiKHEDh1vz9IWz6z +WKjdv9lst56XuLTZrJ/O0T0qD6aMXyqK6ZART/FELjDXc+9Ey4TH+msOEKq0uQWt +y7Grfmz52dTnAjBw+6/ggE9sA8Wo6DhwbEUaOA9BB5YP+XWsIkUUbiVHU7D8TyiE +KHt2DkaWvjl1/RdtzQUO/vGI4yuFTZfLf23KcwgtHJI3JxLNAMLM3I2jmoWhKm/d +GkVYsGH1GWonv0UTv/TKlOXaTYWK9fQVoYkFc+FrwUd2lev5FizJNigL9qatGyRZ +giJmWWlf0bMMIxwWZzQswxLyKdkNlvkKf9T6BjEmGLeOHZCn0x2sOyUi +-----END CERTIFICATE----- diff --git a/deps/openssl/openssl/demos/smime/cakey.pem b/deps/openssl/openssl/demos/smime/cakey.pem new file mode 100644 index 000000000..486c975b7 --- /dev/null +++ b/deps/openssl/openssl/demos/smime/cakey.pem @@ -0,0 +1,39 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIG5QIBAAKCAYEAzPE5UdkVXE31dAhVbfLVsrmKveMqkqRTrMqvDwx1G+bbfd6p +ZI5gm+zeuB1Pn2K/4Jo9wFPmh99s/R4fjcf3oK5smOL+9AsxTNz9wusm4JssdERt +IKwU2l+VjDmaRP3x0IVXroe43o3CqLmRbxPEZJeQPg5mqSVtuJyteheHmqFEQgPm +GBuuKPIGIgfKnpsOrnNQJyYc/8Z3DZpMwRBk2x3Dgxq+0Hrm8jt1jGjbMTN2Ync2 +eOUbupno53pXghbzJEAr0YuPRNQJmXbymrqs2Kj4Xkuy3dyVf08PGHsumE2tddiI +eNenYqctls6fPVIlKYJ6KzL8QU3p9G3B3CpwzUBwo0FT5SoWrQy/SyA11HCCFhYZ +CG3SZP34+DkfFPMOU46YFPWQB27Ek0uJFCWDKw8M33g6zQSnMnIDztnrIlEa9gZn +mat1/Hbynpsem1/jqHVbMJfjAPLYnzrL6h2BYydKSYX2HzJKPrquCYuvPjSf6YOb +xuFRuUoBXwio3xaZAgMBAAECggGBAJrqILzozke2ujpablEtBTITJHgC9lRgmMt9 +bjR+4ysTJ4kOvZbANPDIbVZY+a3uVEIv9UujYBgG4Hi4w3tF074G+xnaRIQuzbZf +OgaUABA527GLY74VtbGYHRAhHqbWGmrX0H6iIzE/kQw/MVr4YzTyiFsQQbPMEhNB +g7RNgvh0vIb2MYC5s71JrS8eGqAnb0KY8daV7ce9upJyt2Acx1AGQJqipegrbtVd +8q4PONkJIIyvtmJONNaprq8DAJDaTNdcZu7f7mymF5UFpp4Lh6raAvOZAZjgkPYW +PsX2uMAsYchXTmSDGOHNafqeyTS0UEaw6FRhpxzMoSxRXX4/RhjeShadYwHxbh7s +UwFU7S9EWlj8CjgGs00KFM1eMV0sEYsL8sRf7ZiWM5XJsmXKbRZjA5V+7OoSGElB +zJcERK6NFCISijApZlVveEVZS0qESivKd9bspOzbMdoJyjBW1LZdMH85YIwM8Dox +VqGR0QD3UP8RpZBRwTiFenqOpwARnQKBwQD1NBGcTxLLUUluEBG/TD9KM5sCnkm8 +cn5RomwTeBrUr9SXOJuUPa8RNLrAeosuWCrx9JkF25IBExQbbs1NRHuziOIOyI0+ +hvqP85zJln7kUDtiDMFfUdS8Q6PF3b3wJl6cbipowWwsahvUSkx3W8UWrzZHsvrO +LBtvEZdwetNWN50FK040uM6y/x71xfvUhlKBsuZBgDFU9aXJZAGpkCklZnByURN6 +LZudDQETdYo7/X8qqPlcHwHStGj9YXg/e38CgcEA1fdVA6s+KlRUGRTUDaUFPDji +MciTcvA3teXJWNAsFWd71oLT5eQNI50afF242ikTT6JuXFH0mMYKoVe/LFo7m2mf +uLcW4yM/FiKTkhnBQGm7KNqyvXB0T0DWTDSeS7hTzD6KjuJPf7JVH5I4In8jSKJd +3mzTA9keIosnxjX7EOsZNQd0+MKaJYHnvJsxYaoT9FXoONuyzQu96TQ8Q+fkVHXh +I/ENAw0qfoJ5mw5dQnU2UtjP6cSNVQ9Rsr48GNnnAoHBAJcI65AMZNc3yrMw0r2y +iYl7IBAMz/5zx7shANE9OcmoRJqhE7PMCvneMOo+kVyKkmlW8KrbBKQEzG3ZYjwl +4sxDlHrmrZnGKrBgrkK9oIuhn/JVSQcdsJwGTeqjG0vBVqWkdhrwiWESOvIYkeEz +dcLzScwAQtyb7ooLm+x8u5Bv0RhOBG4VJ7y5yKg6u1O9KTUarRnLjJd4eBYEs8Fu +Oun+n2TK6+RmE2Q5jmAeFne9PYdZbb+Ame7fkYwBbcAsoQKBwQC1KHQSZyp7LGsH +0Vq5Mr77/i2FeQ1eg4SnvaZ8S8UHWla/iIVgX3XAcYO7SJ76F00CX8SQ5dLyhrr5 +YBG8u6k8LHHPMzVtmqoPU7cePDAjGWIddQ1g15WihILsgqCD+8z3YPxvfa1RsOvh +jyt4Ca0WEmLnr7v5xhp9pNRIPewUpvjwrR+cfyeEGjjat4tX5Wh/tzym51y7vvVM +Pa3I0M3BtQyqIa2ip8MS2eWcIs1TN2qHOorOolwHaLEDZY38fIECgcAKns98A2G3 +tLvZaDZlVsJWZsdSDUrFCKvx9QbTZHbyOL5JU/8TgLBgfOgV2yxLXn9Pq+0Quvb2 +EjaFuA3GKOFi50WtfwR6Yo1DaFcx5n0bDShnaHOF+dUi0BVQd2V1DsqAwF5/Eh3A +lX+XuWeSam4/91WhmNMCZpfYv0GErs4ZBHHsl54jmvrrjbhg/efUvpWKi/9vlKm+ ++ITH+nG1xCnyEEVZ+vm9Qq57lCLBZGyGT4PetllpsRrGcdO4/gfK8lY= +-----END RSA PRIVATE KEY----- diff --git a/deps/openssl/openssl/demos/smime/encr.txt b/deps/openssl/openssl/demos/smime/encr.txt new file mode 100644 index 000000000..f163a326e --- /dev/null +++ b/deps/openssl/openssl/demos/smime/encr.txt @@ -0,0 +1,3 @@ +Content-type: text/plain + +Sample OpenSSL Data for PKCS#7 encryption diff --git a/deps/openssl/openssl/demos/smime/sign.txt b/deps/openssl/openssl/demos/smime/sign.txt new file mode 100644 index 000000000..af1341d0a --- /dev/null +++ b/deps/openssl/openssl/demos/smime/sign.txt @@ -0,0 +1,3 @@ +Content-type: text/plain + +Test OpenSSL Signed Content diff --git a/deps/openssl/openssl/demos/smime/signer.pem b/deps/openssl/openssl/demos/smime/signer.pem new file mode 100644 index 000000000..4bbf7a69f --- /dev/null +++ b/deps/openssl/openssl/demos/smime/signer.pem @@ -0,0 +1,52 @@ +-----BEGIN CERTIFICATE----- +MIIELDCCApSgAwIBAgIIcsOElVeHzfQwDQYJKoZIhvcNAQELBQAwVzELMAkGA1UE +BhMCVUsxEjAQBgNVBAcMCVRlc3QgQ2l0eTEWMBQGA1UECgwNT3BlblNTTCBHcm91 +cDEcMBoGA1UEAwwTVGVzdCBTL01JTUUgUm9vdCBDQTAgFw0xODA2MTQxMjQ2Mjha +GA8yMTE4MDYxNDEyNDYyOFowVjELMAkGA1UEBhMCVUsxJTAjBgNVBAMMHE9wZW5T +U0wgdGVzdCBTL01JTUUgc2lnbmVyIDExIDAeBgkqhkiG9w0BCQEWEXRlc3QxQG9w +ZW5zc2wub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1vvSgaL1 +byi9AE8Ep3v7Yv36JxYywaZhUy8dEFRiYn6NsVhhNo6SK1Mp8daQ0MZoMzbT1aKp +JTLTgDJZHit2t1d6l3aWJG+cbcLua+XKowaZjj6rirB390fuL4qt5PiAb571QFtu +L8apcydwGEdkaPRuCnvctN8VcZPTKh+M8VEESyxk5K37QYKaAB6ItWR5KhjiAuDt +zsJbjEtOvGtmu2FRCU47GzfkdjYo7tY38WTY+2WWh+idKErtmYSinmhE0H7+yoJB +s1VCI+cq5tVW+oEO9HF4vEDEUykEFFPsCEkIWM+RjCgK8cRSCpg6VQr+ZTii6k7C +m9CP81QhUoV3QwIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1P +cGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUg1DE7OaNqMQQ +8Z1bvjhnlisxfsMwHwYDVR0jBBgwFoAUpJjGgWED0xBnKntZmlNiAzjC0HswDQYJ +KoZIhvcNAQELBQADggGBAGxAivCwPsAYmMZfVJTELWNNMBzKzmeRvrp6k/6S74Pw +LDEhTnslCV4U1gTSd3nQ+LRm1fkzxLA12A/rlqN51P8B+hyVSMN9dj54YUcFd+KO +XhkSDrSpph6hRqGy8zqELzlb1Q8yoIBclEmyv+CkXMrpnm+4JL4kzyj/iBRkZTDz +ns15jJD9KHgrOnclaoDRkOT6lGbsd3j+aviKEj8ZILufSMw+W2YORy3nSAencjbO +ezivVujqm+pjkfqdCS1HcFB7LhQEILfFqkssw8YmtJVrM9LF8VIcqueXbVZmeS/1 +QV5B7OEmtsM+NkoLF5ldWdPQvmftbShh+AAlpcsmqiRefQgA3aQn6YOnOHnnQwgB +oQRNjQXsjgxV4t2HFYpwkK41kx4HToVGciPNMkndzfY/GJmgXsXfB6/AfUfhLTDv +tbws1MZhaCNOffw3/SVS2nLREMFCGn5uAgNkqssWqeWJu3910XF640tqPBj5YGFc +fykwWNhG5xS04EHpztgKdQ== +-----END CERTIFICATE----- +-----BEGIN RSA PRIVATE KEY----- +MIIEpQIBAAKCAQEA1vvSgaL1byi9AE8Ep3v7Yv36JxYywaZhUy8dEFRiYn6NsVhh +No6SK1Mp8daQ0MZoMzbT1aKpJTLTgDJZHit2t1d6l3aWJG+cbcLua+XKowaZjj6r +irB390fuL4qt5PiAb571QFtuL8apcydwGEdkaPRuCnvctN8VcZPTKh+M8VEESyxk +5K37QYKaAB6ItWR5KhjiAuDtzsJbjEtOvGtmu2FRCU47GzfkdjYo7tY38WTY+2WW +h+idKErtmYSinmhE0H7+yoJBs1VCI+cq5tVW+oEO9HF4vEDEUykEFFPsCEkIWM+R +jCgK8cRSCpg6VQr+ZTii6k7Cm9CP81QhUoV3QwIDAQABAoIBAQC6LCWmIisNcmgK +RmOvbszKc0sYYj7eOGl8EgbHR2xUA2hNNk4pYtnuLvzZ84hBZDCEeWyFS3HTRuql +z/QhDl6mc1k0pXtsXkNHQlIamksbVvHPnzIKzrt1J5N7FEt3SERhZXTZoNQRB6di +k7qdK+YmhdZtucnt0GrPisaJaf0yU/EjLuX+MU/0Xrc23lVhR3yqYhaOhWvrxTHM +evykI0kOL+gU58eN2eWE4ELjS2z+njKDqcEyeIy00FdBAtCoKjMsWpRytKNmcFm9 +LdtMmizskF8VS3+XsDbkseIODx1xJ65IFmHHMV2xLG5/+bQppkB8JuE3EDrtFiUJ +lGdfmBlxAoGBAP3Asg0drdunv7imeEOGpyj5JwF1hCVQ71IBGdqTr3aPqOlDH/io +up7t+VBuSLqj1P20HygNjow+ALw/Ko+a0icodg7QA2Co0/RiBwa+u2SgpYDqC9Kt +KIdRcv+NXkhXF/DLIn0jJvI53OtKsbgTv/C+aCipblofnO9sF4AhShq1AoGBANjj +Ou0czloNORbk3qAxLi4b5P/YOyZBJDa0zijFdD1jImfOeyNFXeg2ID+8ZjDkP/eP +pLy/Gt/8bVb+O+9wMOho3kWKZBN3O2VsLJYakAehDsC5ax7i2HtEqg1L1krW2duS +POiKg3qNjETM30zTA4pHwkNAETIktResze7SRm0XAoGABH7KaLMS5mZFXjcMwF19 +TpuDVmJHkgWqB7DfTWD6ZcZLvr4irdwHWlNq7ELX5P6MAmaTerkqwk9C4hLYZSzf +9jOgS8jhlm/HOXgXGcZ9OV4jMHJ0/Sl2I1eNCvvtJKjuUqS2mrLpuLbPtBdhqJoo +91HYNIgz3ULcG921WN6+GlUCgYEA066T6LDgxgt52NpwXrEhfWdETmDg+ilCCxLU +0/5DwVZsUhy5Gmeti+Kn/w0GQFnGBP1xr7ZlqI9auDlSjhNV6L/RkNXNbyJEGm1F +5wrt4ERVfcx6vJ5y43zU7D1EXa7s2t0UDXKDeK2GZe//UZ/yKJh5BeIV5nblOMI0 +DA+3JOkCgYEA80QGLjGlCvxKceVbuohbIZ1+/EoXPq993ER9S8D2MTGATsEcygtF +rM8JcHTv75sjycqu68BAQr1Z5qwwrMyY0vWVEorKzvAXEWolC67asR4cDutOd+qy +WlEIyojX45GwHCHpcbVRiGRWuj3kwkc+WzdgusBoAJrPCigES/Cr8uA= +-----END RSA PRIVATE KEY----- diff --git a/deps/openssl/openssl/demos/smime/signer2.pem b/deps/openssl/openssl/demos/smime/signer2.pem new file mode 100644 index 000000000..52827297e --- /dev/null +++ b/deps/openssl/openssl/demos/smime/signer2.pem @@ -0,0 +1,52 @@ +-----BEGIN CERTIFICATE----- +MIIELDCCApSgAwIBAgIIcsOElVeHzfUwDQYJKoZIhvcNAQELBQAwVzELMAkGA1UE +BhMCVUsxEjAQBgNVBAcMCVRlc3QgQ2l0eTEWMBQGA1UECgwNT3BlblNTTCBHcm91 +cDEcMBoGA1UEAwwTVGVzdCBTL01JTUUgUm9vdCBDQTAgFw0xODA2MTQxMjQ2Mjha +GA8yMTE4MDYxNDEyNDYyOFowVjELMAkGA1UEBhMCVUsxJTAjBgNVBAMMHE9wZW5T +U0wgdGVzdCBTL01JTUUgc2lnbmVyIDIxIDAeBgkqhkiG9w0BCQEWEXRlc3QyQG9w +ZW5zc2wub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1ledrM9R +3x3bZypZAEi00DJYAmLS5F6Gg3+xpjE745UWKrjDAY5KswavKKa3vZxoUz2omNSg +4nYfLSowq7AI3VnZ8LwNo8lAeo7AX9elrsmzQzhr2DCdCdbRhCWoiS/ba5tKIhlb +gFnP+pB8jhC9qZuQJkpVaivywMW8rA9DRbeDcQjDKhUi0ukVDYHDd9+FtNM3H1t3 +AUGWBecjWYa4hXC3CsH3+cFBZKjAepL74hqiEfsEyzKesft3NFd1AcVY9W5MRCK4 +lUFiDbBtIgPkvPJeoEs/kFp3+OvJFDwi4K4Z6XzALyT0LXNx6w3kSfx0TLdNjXLD +O9a2dzwhHhPtCQIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1P +cGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUYJEUXnMb/ux0 +WrzSh+bnhpi6GS0wHwYDVR0jBBgwFoAUpJjGgWED0xBnKntZmlNiAzjC0HswDQYJ +KoZIhvcNAQELBQADggGBAFbrwfsSciDFI97c7oqS8jtxOSa3c4B7xhmcgUkYCiaD +7mbZuqTUf4ltJJZXP/TJ44fhL0zVAvRXSXw1LE3YvLGOlBc6dM3D7DyL5pfUTUBY +ICt+NLfG5iHtkiZPPSfK2t5f4UGFwU/ERT62sLu4keLI5igi9J2jKSykN3u5SQ3s +Zsennow5zUsFkcz9hkB4RczlHRogA0SgVhELQbN1nYIqJJDRFZL+CmarDRTFMilk +7dXCacw6xt9vIc3ZXO+pu2g1ezgSPwOoUykQcL3UhAEIIyt+TRe3fafh5TXwd8tr +FAecAuz5Mqsmek5nEW9ZeYmxNz5VFwc4F61y4xFj7lI0frLCCAu3gVoqiQrW+WwR +e27z1Nm4uUcduFqj45Pu2eTyV3LZtLUbFvL5ZSPUCSk1wVmC2otX8ksFDDTO1rIy +l5Qd1g1P8bLuj8NG98J2zVOabtaxYCAIBPZ3dUh2eNrPKoLAvrgKh1MH+K2Eh5Oy +z1T4Eu+e5Kq/uQkZpI5QzA== +-----END CERTIFICATE----- +-----BEGIN RSA PRIVATE KEY----- +MIIEogIBAAKCAQEA1ledrM9R3x3bZypZAEi00DJYAmLS5F6Gg3+xpjE745UWKrjD +AY5KswavKKa3vZxoUz2omNSg4nYfLSowq7AI3VnZ8LwNo8lAeo7AX9elrsmzQzhr +2DCdCdbRhCWoiS/ba5tKIhlbgFnP+pB8jhC9qZuQJkpVaivywMW8rA9DRbeDcQjD +KhUi0ukVDYHDd9+FtNM3H1t3AUGWBecjWYa4hXC3CsH3+cFBZKjAepL74hqiEfsE +yzKesft3NFd1AcVY9W5MRCK4lUFiDbBtIgPkvPJeoEs/kFp3+OvJFDwi4K4Z6XzA +LyT0LXNx6w3kSfx0TLdNjXLDO9a2dzwhHhPtCQIDAQABAoIBAGMEGJfTMiwS+979 +ph3GeJjRGO0JQAk1TYiDvcpbZiItJg9YSOV4GTP4u4PY+HqEPYFus2relu/mx2Iy +4kb9zCqNLmvSQ67M8pdrSJ093pEPJlvAPbmiQ3lfHmyghOnTDNb55tY3xphVZQmI +I7HxM9ydO4skva6NXNgGwLDvYBFc6z6d95ai/WEFWHOt5Mt7OVOWAHQ0lAOofWLA +2BwKmrQnCwMvm1TMoKaAU/ngTToUGBMIN1HwRcY6qDraZte5o3EDRABHB78OHrSu +I/Eoi//5C8A7iZ5Y189lMbahIN6xVMwHwwIqLptTV2GNZOKSiIXnM06vIf4CPZKl +3VlwBgECgYEA/BKnn23KtefA906QNkrIOXASLEE1T77NlTYIRDTsUoz6XTVSvOCI +ARxdsoLwFko5ICMhti9S/1G/MYH0BoJN8rbzvjmZDfwF612p0AYALyBlRgW+ID9L +41CJQcLWxeiQd/GcrUZmudVNUGXa8nsNHmFleGLchXeqU7M6fljJOkECgYEA2a56 +yvYQgMF/SIPkxU1+WcQC6+JGc+ax220/lysBsDb4SkXomfGtFWbenxwamuQu+n67 +DJWi9oJIi9Vj4eKOXS6vjCAkYeLgCpK6S26frPtxJuZwl/lF7mFl8Z4ZnJeiFJ4h +AXt5r9vqnOZtCnLqRRAlqF5OswWgv/mhJ6jpMMkCgYBMPaAxWlXLexMkOcDoiunQ +ZZM5i2eCfSVVEgiiCJfJyBYZhv1FX2wDWf8E9RGEzGJG1BloLxwdWS5I3RNfvJ2y +4Z8LVAR09Fsd+zBXWNlJZ7T53tbIjhx33m4FU9b9+P9pJ8zJo9eCMX+253e3i3xG +ShMUvGIShEUiF72DZXtHgQKBgDi867CfNmn5BW4nQqfSrQ5EsuY80lQ/WzhwX1TN +luERUuI5GomVnqGncHtUXfLlawFLqwF6t0E9cB9SfXhRDv5mvsbtUc5Zzj+zQu+K +ZAA4gaO8CLjz9jBOHr49kTtpootxM/Uo8+zMi3hd7yn8Def2b3pVKnorC10+eazW +sAFRAoGAet6fQbQD+4vZ1oukZcZhmVlIWTSZJ1vAGCcT/3E40pqpPY+Ho56Lcwh0 +9f4TAykuGwFgqvZvR8yD2gpuISYGYplWqa1N6qxMaiVzmY5q1XW+O74xRH5Kz5fr +D+3j2x4EiyG7AYyZMOphDtBd/TSQQMYmGW6PiyM9ceIVnDK1Dd4= +-----END RSA PRIVATE KEY----- diff --git a/deps/openssl/openssl/demos/smime/smdec.c b/deps/openssl/openssl/demos/smime/smdec.c new file mode 100644 index 000000000..debcedd5e --- /dev/null +++ b/deps/openssl/openssl/demos/smime/smdec.c @@ -0,0 +1,78 @@ +/* + * Copyright 2007-2016 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the Apache License 2.0 (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +/* Simple S/MIME signing example */ +#include +#include +#include + +int main(int argc, char **argv) +{ + BIO *in = NULL, *out = NULL, *tbio = NULL; + X509 *rcert = NULL; + EVP_PKEY *rkey = NULL; + PKCS7 *p7 = NULL; + int ret = 1; + + OpenSSL_add_all_algorithms(); + ERR_load_crypto_strings(); + + /* Read in recipient certificate and private key */ + tbio = BIO_new_file("signer.pem", "r"); + + if (!tbio) + goto err; + + rcert = PEM_read_bio_X509(tbio, NULL, 0, NULL); + + BIO_reset(tbio); + + rkey = PEM_read_bio_PrivateKey(tbio, NULL, 0, NULL); + + if (!rcert || !rkey) + goto err; + + /* Open content being signed */ + + in = BIO_new_file("smencr.txt", "r"); + + if (!in) + goto err; + + /* Sign content */ + p7 = SMIME_read_PKCS7(in, NULL); + + if (!p7) + goto err; + + out = BIO_new_file("encrout.txt", "w"); + if (!out) + goto err; + + /* Decrypt S/MIME message */ + if (!PKCS7_decrypt(p7, rkey, rcert, out, 0)) + goto err; + + ret = 0; + + err: + if (ret) { + fprintf(stderr, "Error Signing Data\n"); + ERR_print_errors_fp(stderr); + } + PKCS7_free(p7); + X509_free(rcert); + EVP_PKEY_free(rkey); + BIO_free(in); + BIO_free(out); + BIO_free(tbio); + + return ret; + +} diff --git a/deps/openssl/openssl/demos/smime/smenc.c b/deps/openssl/openssl/demos/smime/smenc.c new file mode 100644 index 000000000..0714dddfd --- /dev/null +++ b/deps/openssl/openssl/demos/smime/smenc.c @@ -0,0 +1,91 @@ +/* + * Copyright 2007-2016 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the Apache License 2.0 (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +/* Simple S/MIME encrypt example */ +#include +#include +#include + +int main(int argc, char **argv) +{ + BIO *in = NULL, *out = NULL, *tbio = NULL; + X509 *rcert = NULL; + STACK_OF(X509) *recips = NULL; + PKCS7 *p7 = NULL; + int ret = 1; + + /* + * On OpenSSL 0.9.9 only: + * for streaming set PKCS7_STREAM + */ + int flags = PKCS7_STREAM; + + OpenSSL_add_all_algorithms(); + ERR_load_crypto_strings(); + + /* Read in recipient certificate */ + tbio = BIO_new_file("signer.pem", "r"); + + if (!tbio) + goto err; + + rcert = PEM_read_bio_X509(tbio, NULL, 0, NULL); + + if (!rcert) + goto err; + + /* Create recipient STACK and add recipient cert to it */ + recips = sk_X509_new_null(); + + if (!recips || !sk_X509_push(recips, rcert)) + goto err; + + /* + * sk_X509_pop_free will free up recipient STACK and its contents so set + * rcert to NULL so it isn't freed up twice. + */ + rcert = NULL; + + /* Open content being encrypted */ + + in = BIO_new_file("encr.txt", "r"); + + if (!in) + goto err; + + /* encrypt content */ + p7 = PKCS7_encrypt(recips, in, EVP_des_ede3_cbc(), flags); + + if (!p7) + goto err; + + out = BIO_new_file("smencr.txt", "w"); + if (!out) + goto err; + + /* Write out S/MIME message */ + if (!SMIME_write_PKCS7(out, p7, in, flags)) + goto err; + + ret = 0; + + err: + if (ret) { + fprintf(stderr, "Error Encrypting Data\n"); + ERR_print_errors_fp(stderr); + } + PKCS7_free(p7); + X509_free(rcert); + sk_X509_pop_free(recips, X509_free); + BIO_free(in); + BIO_free(out); + BIO_free(tbio); + return ret; + +} diff --git a/deps/openssl/openssl/demos/smime/smsign.c b/deps/openssl/openssl/demos/smime/smsign.c new file mode 100644 index 000000000..ac2c27b52 --- /dev/null +++ b/deps/openssl/openssl/demos/smime/smsign.c @@ -0,0 +1,88 @@ +/* + * Copyright 2007-2016 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the Apache License 2.0 (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +/* Simple S/MIME signing example */ +#include +#include +#include + +int main(int argc, char **argv) +{ + BIO *in = NULL, *out = NULL, *tbio = NULL; + X509 *scert = NULL; + EVP_PKEY *skey = NULL; + PKCS7 *p7 = NULL; + int ret = 1; + + /* + * For simple S/MIME signing use PKCS7_DETACHED. On OpenSSL 0.9.9 only: + * for streaming detached set PKCS7_DETACHED|PKCS7_STREAM for streaming + * non-detached set PKCS7_STREAM + */ + int flags = PKCS7_DETACHED | PKCS7_STREAM; + + OpenSSL_add_all_algorithms(); + ERR_load_crypto_strings(); + + /* Read in signer certificate and private key */ + tbio = BIO_new_file("signer.pem", "r"); + + if (!tbio) + goto err; + + scert = PEM_read_bio_X509(tbio, NULL, 0, NULL); + + BIO_reset(tbio); + + skey = PEM_read_bio_PrivateKey(tbio, NULL, 0, NULL); + + if (!scert || !skey) + goto err; + + /* Open content being signed */ + + in = BIO_new_file("sign.txt", "r"); + + if (!in) + goto err; + + /* Sign content */ + p7 = PKCS7_sign(scert, skey, NULL, in, flags); + + if (!p7) + goto err; + + out = BIO_new_file("smout.txt", "w"); + if (!out) + goto err; + + if (!(flags & PKCS7_STREAM)) + BIO_reset(in); + + /* Write out S/MIME message */ + if (!SMIME_write_PKCS7(out, p7, in, flags)) + goto err; + + ret = 0; + + err: + if (ret) { + fprintf(stderr, "Error Signing Data\n"); + ERR_print_errors_fp(stderr); + } + PKCS7_free(p7); + X509_free(scert); + EVP_PKEY_free(skey); + BIO_free(in); + BIO_free(out); + BIO_free(tbio); + + return ret; + +} diff --git a/deps/openssl/openssl/demos/smime/smsign2.c b/deps/openssl/openssl/demos/smime/smsign2.c new file mode 100644 index 000000000..a9e702574 --- /dev/null +++ b/deps/openssl/openssl/demos/smime/smsign2.c @@ -0,0 +1,96 @@ +/* + * Copyright 2007-2016 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the Apache License 2.0 (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +/* S/MIME signing example: 2 signers. OpenSSL 0.9.9 only */ +#include +#include +#include + +int main(int argc, char **argv) +{ + BIO *in = NULL, *out = NULL, *tbio = NULL; + X509 *scert = NULL, *scert2 = NULL; + EVP_PKEY *skey = NULL, *skey2 = NULL; + PKCS7 *p7 = NULL; + int ret = 1; + + OpenSSL_add_all_algorithms(); + ERR_load_crypto_strings(); + + tbio = BIO_new_file("signer.pem", "r"); + + if (!tbio) + goto err; + + scert = PEM_read_bio_X509(tbio, NULL, 0, NULL); + + BIO_reset(tbio); + + skey = PEM_read_bio_PrivateKey(tbio, NULL, 0, NULL); + + BIO_free(tbio); + + tbio = BIO_new_file("signer2.pem", "r"); + + if (!tbio) + goto err; + + scert2 = PEM_read_bio_X509(tbio, NULL, 0, NULL); + + BIO_reset(tbio); + + skey2 = PEM_read_bio_PrivateKey(tbio, NULL, 0, NULL); + + if (!scert2 || !skey2) + goto err; + + in = BIO_new_file("sign.txt", "r"); + + if (!in) + goto err; + + p7 = PKCS7_sign(NULL, NULL, NULL, in, PKCS7_STREAM | PKCS7_PARTIAL); + + if (!p7) + goto err; + + /* Add each signer in turn */ + + if (!PKCS7_sign_add_signer(p7, scert, skey, NULL, 0)) + goto err; + + if (!PKCS7_sign_add_signer(p7, scert2, skey2, NULL, 0)) + goto err; + + out = BIO_new_file("smout.txt", "w"); + if (!out) + goto err; + + /* NB: content included and finalized by SMIME_write_PKCS7 */ + + if (!SMIME_write_PKCS7(out, p7, in, PKCS7_STREAM)) + goto err; + + ret = 0; + + err: + if (ret) { + fprintf(stderr, "Error Signing Data\n"); + ERR_print_errors_fp(stderr); + } + PKCS7_free(p7); + X509_free(scert); + EVP_PKEY_free(skey); + X509_free(scert2); + EVP_PKEY_free(skey2); + BIO_free(in); + BIO_free(out); + BIO_free(tbio); + return ret; +} diff --git a/deps/openssl/openssl/demos/smime/smver.c b/deps/openssl/openssl/demos/smime/smver.c new file mode 100644 index 000000000..5d552b180 --- /dev/null +++ b/deps/openssl/openssl/demos/smime/smver.c @@ -0,0 +1,87 @@ +/* + * Copyright 2007-2016 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the Apache License 2.0 (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +/* Simple S/MIME verification example */ +#include +#include +#include + +int main(int argc, char **argv) +{ + BIO *in = NULL, *out = NULL, *tbio = NULL, *cont = NULL; + X509_STORE *st = NULL; + X509 *cacert = NULL; + PKCS7 *p7 = NULL; + + int ret = 1; + + OpenSSL_add_all_algorithms(); + ERR_load_crypto_strings(); + + /* Set up trusted CA certificate store */ + + st = X509_STORE_new(); + if (st == NULL) + goto err; + + /* Read in signer certificate and private key */ + tbio = BIO_new_file("cacert.pem", "r"); + + if (tbio == NULL) + goto err; + + cacert = PEM_read_bio_X509(tbio, NULL, 0, NULL); + + if (cacert == NULL) + goto err; + + if (!X509_STORE_add_cert(st, cacert)) + goto err; + + /* Open content being signed */ + + in = BIO_new_file("smout.txt", "r"); + + if (in == NULL) + goto err; + + /* Sign content */ + p7 = SMIME_read_PKCS7(in, &cont); + + if (p7 == NULL) + goto err; + + /* File to output verified content to */ + out = BIO_new_file("smver.txt", "w"); + if (out == NULL) + goto err; + + if (!PKCS7_verify(p7, NULL, st, cont, out, 0)) { + fprintf(stderr, "Verification Failure\n"); + goto err; + } + + fprintf(stderr, "Verification Successful\n"); + + ret = 0; + + err: + if (ret) { + fprintf(stderr, "Error Verifying Data\n"); + ERR_print_errors_fp(stderr); + } + + X509_STORE_free(st); + PKCS7_free(p7); + X509_free(cacert); + BIO_free(in); + BIO_free(out); + BIO_free(tbio); + return ret; +} diff --git a/deps/openssl/openssl/doc/HOWTO/certificates.txt b/deps/openssl/openssl/doc/HOWTO/certificates.txt new file mode 100644 index 000000000..78ab97b41 --- /dev/null +++ b/deps/openssl/openssl/doc/HOWTO/certificates.txt @@ -0,0 +1,110 @@ + + HOWTO certificates + +1. Introduction + +How you handle certificates depends a great deal on what your role is. +Your role can be one or several of: + + - User of some client application + - User of some server application + - Certificate authority + +This file is for users who wish to get a certificate of their own. +Certificate authorities should read https://www.openssl.org/docs/apps/ca.html. + +In all the cases shown below, the standard configuration file, as +compiled into openssl, will be used. You may find it in /etc/, +/usr/local/ssl/ or somewhere else. By default the file is named +openssl.cnf and is described at https://www.openssl.org/docs/apps/config.html. +You can specify a different configuration file using the +'-config {file}' argument with the commands shown below. + + +2. Relationship with keys + +Certificates are related to public key cryptography by containing a +public key. To be useful, there must be a corresponding private key +somewhere. With OpenSSL, public keys are easily derived from private +keys, so before you create a certificate or a certificate request, you +need to create a private key. + +Private keys are generated with 'openssl genrsa -out privkey.pem' if +you want an RSA private key, or if you want a DSA private key: +'openssl dsaparam -out dsaparam.pem 2048; openssl gendsa -out privkey.pem dsaparam.pem'. + +The private keys created by these commands are not passphrase protected; +it might or might not be the desirable thing. Further information on how to +create private keys can be found at https://www.openssl.org/docs/HOWTO/keys.txt. +The rest of this text assumes you have a private key in the file privkey.pem. + + +3. Creating a certificate request + +To create a certificate, you need to start with a certificate request +(or, as some certificate authorities like to put it, "certificate +signing request", since that's exactly what they do, they sign it and +give you the result back, thus making it authentic according to their +policies). A certificate request is sent to a certificate authority +to get it signed into a certificate. You can also sign the certificate +yourself if you have your own certificate authority or create a +self-signed certificate (typically for testing purpose). + +The certificate request is created like this: + + openssl req -new -key privkey.pem -out cert.csr + +Now, cert.csr can be sent to the certificate authority, if they can +handle files in PEM format. If not, use the extra argument '-outform' +followed by the keyword for the format to use (see another HOWTO +). In some cases, -outform does not let you output the +certificate request in the right format and you will have to use one +of the various other commands that are exposed by openssl (or get +creative and use a combination of tools). + +The certificate authority performs various checks (according to their +policies) and usually waits for payment from you. Once that is +complete, they send you your new certificate. + +Section 5 will tell you more on how to handle the certificate you +received. + + +4. Creating a self-signed test certificate + +You can create a self-signed certificate if you don't want to deal +with a certificate authority, or if you just want to create a test +certificate for yourself. This is similar to creating a certificate +request, but creates a certificate instead of a certificate request. +This is NOT the recommended way to create a CA certificate, see +https://www.openssl.org/docs/apps/ca.html. + + openssl req -new -x509 -key privkey.pem -out cacert.pem -days 1095 + + +5. What to do with the certificate + +If you created everything yourself, or if the certificate authority +was kind enough, your certificate is a raw DER thing in PEM format. +Your key most definitely is if you have followed the examples above. +However, some (most?) certificate authorities will encode them with +things like PKCS7 or PKCS12, or something else. Depending on your +applications, this may be perfectly OK, it all depends on what they +know how to decode. If not, there are a number of OpenSSL tools to +convert between some (most?) formats. + +So, depending on your application, you may have to convert your +certificate and your key to various formats, most often also putting +them together into one file. The ways to do this is described in +another HOWTO , I will just mention the simplest case. +In the case of a raw DER thing in PEM format, and assuming that's all +right for your applications, simply concatenating the certificate and +the key into a new file and using that one should be enough. With +some applications, you don't even have to do that. + + +By now, you have your certificate and your private key and can start +using applications that depend on it. + +-- +Richard Levitte diff --git a/deps/openssl/openssl/doc/HOWTO/keys.txt b/deps/openssl/openssl/doc/HOWTO/keys.txt new file mode 100644 index 000000000..c4a74c54f --- /dev/null +++ b/deps/openssl/openssl/doc/HOWTO/keys.txt @@ -0,0 +1,105 @@ + + HOWTO keys + +1. Introduction + +Keys are the basis of public key algorithms and PKI. Keys usually +come in pairs, with one half being the public key and the other half +being the private key. With OpenSSL, the private key contains the +public key information as well, so a public key doesn't need to be +generated separately. + +Public keys come in several flavors, using different cryptographic +algorithms. The most popular ones associated with certificates are +RSA and DSA, and this HOWTO will show how to generate each of them. + + +2. To generate an RSA key + +An RSA key can be used both for encryption and for signing. + +Generating a key for the RSA algorithm is quite easy, all you have to +do is the following: + + openssl genrsa -des3 -out privkey.pem 2048 + +With this variant, you will be prompted for a protecting password. If +you don't want your key to be protected by a password, remove the flag +'-des3' from the command line above. + +The number 2048 is the size of the key, in bits. Today, 2048 or +higher is recommended for RSA keys, as fewer amount of bits is +consider insecure or to be insecure pretty soon. + + +3. To generate a DSA key + +A DSA key can be used for signing only. It is important to +know what a certificate request with a DSA key can really be used for. + +Generating a key for the DSA algorithm is a two-step process. First, +you have to generate parameters from which to generate the key: + + openssl dsaparam -out dsaparam.pem 2048 + +The number 2048 is the size of the key, in bits. Today, 2048 or +higher is recommended for DSA keys, as fewer amount of bits is +consider insecure or to be insecure pretty soon. + +When that is done, you can generate a key using the parameters in +question (actually, several keys can be generated from the same +parameters): + + openssl gendsa -des3 -out privkey.pem dsaparam.pem + +With this variant, you will be prompted for a protecting password. If +you don't want your key to be protected by a password, remove the flag +'-des3' from the command line above. + + +4. To generate an EC key + +An EC key can be used both for key agreement (ECDH) and signing (ECDSA). + +Generating a key for ECC is similar to generating a DSA key. These are +two-step processes. First, you have to get the EC parameters from which +the key will be generated: + + openssl ecparam -name prime256v1 -out prime256v1.pem + +The prime256v1, or NIST P-256, which stands for 'X9.62/SECG curve over +a 256-bit prime field', is the name of an elliptic curve which generates the +parameters. You can use the following command to list all supported curves: + + openssl ecparam -list_curves + +When that is done, you can generate a key using the created parameters (several +keys can be produced from the same parameters): + + openssl genpkey -des3 -paramfile prime256v1.pem -out private.key + +With this variant, you will be prompted for a password to protect your key. +If you don't want your key to be protected by a password, remove the flag +'-des3' from the command line above. + +You can also directly generate the key in one step: + + openssl ecparam -genkey -name prime256v1 -out private.key + +or + + openssl genpkey -algorithm EC -pkeyopt ec_paramgen_curve:P-256 + + +5. NOTE + +If you intend to use the key together with a server certificate, +it may be reasonable to avoid protecting it with a password, since +otherwise someone would have to type in the password every time the +server needs to access the key. + +For X25519 and X448, it's treated as a distinct algorithm but not as one of +the curves listed with 'ecparam -list_curves' option. You can use +the following command to generate an X25519 key: + + openssl genpkey -algorithm X25519 -out xkey.pem diff --git a/deps/openssl/openssl/doc/README.md b/deps/openssl/openssl/doc/README.md new file mode 100644 index 000000000..12bb37ddb --- /dev/null +++ b/deps/openssl/openssl/doc/README.md @@ -0,0 +1,30 @@ +OpenSSL Documentation +===================== + +README.md This file + +[fingerprints.txt](fingerprints.txt) + PGP fingerprints of authorised release signers + +standards.txt +standards.txt + Moved to the web, + +[HOWTO/](HOWTO/) + A few how-to documents; not necessarily up-to-date + +[man1/](man1/) + The openssl command-line tools; start with openssl.pod + +[man3/](man3/) + The SSL library and the crypto library + +[man5/](man5/) + File formats + +[man7/](man7/) + Overviews; start with crypto.pod and ssl.pod, for example + Algorithm specific EVP_PKEY documentation. + +Formatted versions of the manpages (apps,ssl,crypto) can be found at + diff --git a/deps/openssl/openssl/doc/build.info b/deps/openssl/openssl/doc/build.info new file mode 100644 index 000000000..00dc15072 --- /dev/null +++ b/deps/openssl/openssl/doc/build.info @@ -0,0 +1,4872 @@ +SUBDIRS = man1 + +DEPEND[html/man1/CA.pl.html]=man1/CA.pl.pod +GENERATE[html/man1/CA.pl.html]=man1/CA.pl.pod +DEPEND[man/man1/CA.pl.1]=man1/CA.pl.pod +GENERATE[man/man1/CA.pl.1]=man1/CA.pl.pod +DEPEND[html/man1/openssl-asn1parse.html]=man1/openssl-asn1parse.pod +GENERATE[html/man1/openssl-asn1parse.html]=man1/openssl-asn1parse.pod +DEPEND[man/man1/openssl-asn1parse.1]=man1/openssl-asn1parse.pod +GENERATE[man/man1/openssl-asn1parse.1]=man1/openssl-asn1parse.pod +DEPEND[man1/openssl-asn1parse.pod]{pod}=man1/openssl-asn1parse.pod.in +GENERATE[man1/openssl-asn1parse.pod]=man1/openssl-asn1parse.pod.in +DEPEND[html/man1/openssl-ca.html]=man1/openssl-ca.pod +GENERATE[html/man1/openssl-ca.html]=man1/openssl-ca.pod +DEPEND[man/man1/openssl-ca.1]=man1/openssl-ca.pod +GENERATE[man/man1/openssl-ca.1]=man1/openssl-ca.pod +DEPEND[man1/openssl-ca.pod]{pod}=man1/openssl-ca.pod.in +GENERATE[man1/openssl-ca.pod]=man1/openssl-ca.pod.in +DEPEND[html/man1/openssl-ciphers.html]=man1/openssl-ciphers.pod +GENERATE[html/man1/openssl-ciphers.html]=man1/openssl-ciphers.pod +DEPEND[man/man1/openssl-ciphers.1]=man1/openssl-ciphers.pod +GENERATE[man/man1/openssl-ciphers.1]=man1/openssl-ciphers.pod +DEPEND[man1/openssl-ciphers.pod]{pod}=man1/openssl-ciphers.pod.in +GENERATE[man1/openssl-ciphers.pod]=man1/openssl-ciphers.pod.in +DEPEND[html/man1/openssl-cmds.html]=man1/openssl-cmds.pod +GENERATE[html/man1/openssl-cmds.html]=man1/openssl-cmds.pod +DEPEND[man/man1/openssl-cmds.1]=man1/openssl-cmds.pod +GENERATE[man/man1/openssl-cmds.1]=man1/openssl-cmds.pod +DEPEND[man1/openssl-cmds.pod]{pod}=man1/openssl-cmds.pod.in +GENERATE[man1/openssl-cmds.pod]=man1/openssl-cmds.pod.in +DEPEND[html/man1/openssl-cmp.html]=man1/openssl-cmp.pod +GENERATE[html/man1/openssl-cmp.html]=man1/openssl-cmp.pod +DEPEND[man/man1/openssl-cmp.1]=man1/openssl-cmp.pod +GENERATE[man/man1/openssl-cmp.1]=man1/openssl-cmp.pod +DEPEND[man1/openssl-cmp.pod]{pod}=man1/openssl-cmp.pod.in +GENERATE[man1/openssl-cmp.pod]=man1/openssl-cmp.pod.in +DEPEND[html/man1/openssl-cms.html]=man1/openssl-cms.pod +GENERATE[html/man1/openssl-cms.html]=man1/openssl-cms.pod +DEPEND[man/man1/openssl-cms.1]=man1/openssl-cms.pod +GENERATE[man/man1/openssl-cms.1]=man1/openssl-cms.pod +DEPEND[man1/openssl-cms.pod]{pod}=man1/openssl-cms.pod.in +GENERATE[man1/openssl-cms.pod]=man1/openssl-cms.pod.in +DEPEND[html/man1/openssl-crl.html]=man1/openssl-crl.pod +GENERATE[html/man1/openssl-crl.html]=man1/openssl-crl.pod +DEPEND[man/man1/openssl-crl.1]=man1/openssl-crl.pod +GENERATE[man/man1/openssl-crl.1]=man1/openssl-crl.pod +DEPEND[man1/openssl-crl.pod]{pod}=man1/openssl-crl.pod.in +GENERATE[man1/openssl-crl.pod]=man1/openssl-crl.pod.in +DEPEND[html/man1/openssl-crl2pkcs7.html]=man1/openssl-crl2pkcs7.pod +GENERATE[html/man1/openssl-crl2pkcs7.html]=man1/openssl-crl2pkcs7.pod +DEPEND[man/man1/openssl-crl2pkcs7.1]=man1/openssl-crl2pkcs7.pod +GENERATE[man/man1/openssl-crl2pkcs7.1]=man1/openssl-crl2pkcs7.pod +DEPEND[man1/openssl-crl2pkcs7.pod]{pod}=man1/openssl-crl2pkcs7.pod.in +GENERATE[man1/openssl-crl2pkcs7.pod]=man1/openssl-crl2pkcs7.pod.in +DEPEND[html/man1/openssl-dgst.html]=man1/openssl-dgst.pod +GENERATE[html/man1/openssl-dgst.html]=man1/openssl-dgst.pod +DEPEND[man/man1/openssl-dgst.1]=man1/openssl-dgst.pod +GENERATE[man/man1/openssl-dgst.1]=man1/openssl-dgst.pod +DEPEND[man1/openssl-dgst.pod]{pod}=man1/openssl-dgst.pod.in +GENERATE[man1/openssl-dgst.pod]=man1/openssl-dgst.pod.in +DEPEND[html/man1/openssl-dhparam.html]=man1/openssl-dhparam.pod +GENERATE[html/man1/openssl-dhparam.html]=man1/openssl-dhparam.pod +DEPEND[man/man1/openssl-dhparam.1]=man1/openssl-dhparam.pod +GENERATE[man/man1/openssl-dhparam.1]=man1/openssl-dhparam.pod +DEPEND[man1/openssl-dhparam.pod]{pod}=man1/openssl-dhparam.pod.in +GENERATE[man1/openssl-dhparam.pod]=man1/openssl-dhparam.pod.in +DEPEND[html/man1/openssl-dsa.html]=man1/openssl-dsa.pod +GENERATE[html/man1/openssl-dsa.html]=man1/openssl-dsa.pod +DEPEND[man/man1/openssl-dsa.1]=man1/openssl-dsa.pod +GENERATE[man/man1/openssl-dsa.1]=man1/openssl-dsa.pod +DEPEND[man1/openssl-dsa.pod]{pod}=man1/openssl-dsa.pod.in +GENERATE[man1/openssl-dsa.pod]=man1/openssl-dsa.pod.in +DEPEND[html/man1/openssl-dsaparam.html]=man1/openssl-dsaparam.pod +GENERATE[html/man1/openssl-dsaparam.html]=man1/openssl-dsaparam.pod +DEPEND[man/man1/openssl-dsaparam.1]=man1/openssl-dsaparam.pod +GENERATE[man/man1/openssl-dsaparam.1]=man1/openssl-dsaparam.pod +DEPEND[man1/openssl-dsaparam.pod]{pod}=man1/openssl-dsaparam.pod.in +GENERATE[man1/openssl-dsaparam.pod]=man1/openssl-dsaparam.pod.in +DEPEND[html/man1/openssl-ec.html]=man1/openssl-ec.pod +GENERATE[html/man1/openssl-ec.html]=man1/openssl-ec.pod +DEPEND[man/man1/openssl-ec.1]=man1/openssl-ec.pod +GENERATE[man/man1/openssl-ec.1]=man1/openssl-ec.pod +DEPEND[man1/openssl-ec.pod]{pod}=man1/openssl-ec.pod.in +GENERATE[man1/openssl-ec.pod]=man1/openssl-ec.pod.in +DEPEND[html/man1/openssl-ecparam.html]=man1/openssl-ecparam.pod +GENERATE[html/man1/openssl-ecparam.html]=man1/openssl-ecparam.pod +DEPEND[man/man1/openssl-ecparam.1]=man1/openssl-ecparam.pod +GENERATE[man/man1/openssl-ecparam.1]=man1/openssl-ecparam.pod +DEPEND[man1/openssl-ecparam.pod]{pod}=man1/openssl-ecparam.pod.in +GENERATE[man1/openssl-ecparam.pod]=man1/openssl-ecparam.pod.in +DEPEND[html/man1/openssl-enc.html]=man1/openssl-enc.pod +GENERATE[html/man1/openssl-enc.html]=man1/openssl-enc.pod +DEPEND[man/man1/openssl-enc.1]=man1/openssl-enc.pod +GENERATE[man/man1/openssl-enc.1]=man1/openssl-enc.pod +DEPEND[man1/openssl-enc.pod]{pod}=man1/openssl-enc.pod.in +GENERATE[man1/openssl-enc.pod]=man1/openssl-enc.pod.in +DEPEND[html/man1/openssl-engine.html]=man1/openssl-engine.pod +GENERATE[html/man1/openssl-engine.html]=man1/openssl-engine.pod +DEPEND[man/man1/openssl-engine.1]=man1/openssl-engine.pod +GENERATE[man/man1/openssl-engine.1]=man1/openssl-engine.pod +DEPEND[man1/openssl-engine.pod]{pod}=man1/openssl-engine.pod.in +GENERATE[man1/openssl-engine.pod]=man1/openssl-engine.pod.in +DEPEND[html/man1/openssl-errstr.html]=man1/openssl-errstr.pod +GENERATE[html/man1/openssl-errstr.html]=man1/openssl-errstr.pod +DEPEND[man/man1/openssl-errstr.1]=man1/openssl-errstr.pod +GENERATE[man/man1/openssl-errstr.1]=man1/openssl-errstr.pod +DEPEND[man1/openssl-errstr.pod]{pod}=man1/openssl-errstr.pod.in +GENERATE[man1/openssl-errstr.pod]=man1/openssl-errstr.pod.in +DEPEND[html/man1/openssl-fipsinstall.html]=man1/openssl-fipsinstall.pod +GENERATE[html/man1/openssl-fipsinstall.html]=man1/openssl-fipsinstall.pod +DEPEND[man/man1/openssl-fipsinstall.1]=man1/openssl-fipsinstall.pod +GENERATE[man/man1/openssl-fipsinstall.1]=man1/openssl-fipsinstall.pod +DEPEND[man1/openssl-fipsinstall.pod]{pod}=man1/openssl-fipsinstall.pod.in +GENERATE[man1/openssl-fipsinstall.pod]=man1/openssl-fipsinstall.pod.in +DEPEND[html/man1/openssl-format-options.html]=man1/openssl-format-options.pod +GENERATE[html/man1/openssl-format-options.html]=man1/openssl-format-options.pod +DEPEND[man/man1/openssl-format-options.1]=man1/openssl-format-options.pod +GENERATE[man/man1/openssl-format-options.1]=man1/openssl-format-options.pod +DEPEND[html/man1/openssl-gendsa.html]=man1/openssl-gendsa.pod +GENERATE[html/man1/openssl-gendsa.html]=man1/openssl-gendsa.pod +DEPEND[man/man1/openssl-gendsa.1]=man1/openssl-gendsa.pod +GENERATE[man/man1/openssl-gendsa.1]=man1/openssl-gendsa.pod +DEPEND[man1/openssl-gendsa.pod]{pod}=man1/openssl-gendsa.pod.in +GENERATE[man1/openssl-gendsa.pod]=man1/openssl-gendsa.pod.in +DEPEND[html/man1/openssl-genpkey.html]=man1/openssl-genpkey.pod +GENERATE[html/man1/openssl-genpkey.html]=man1/openssl-genpkey.pod +DEPEND[man/man1/openssl-genpkey.1]=man1/openssl-genpkey.pod +GENERATE[man/man1/openssl-genpkey.1]=man1/openssl-genpkey.pod +DEPEND[man1/openssl-genpkey.pod]{pod}=man1/openssl-genpkey.pod.in +GENERATE[man1/openssl-genpkey.pod]=man1/openssl-genpkey.pod.in +DEPEND[html/man1/openssl-genrsa.html]=man1/openssl-genrsa.pod +GENERATE[html/man1/openssl-genrsa.html]=man1/openssl-genrsa.pod +DEPEND[man/man1/openssl-genrsa.1]=man1/openssl-genrsa.pod +GENERATE[man/man1/openssl-genrsa.1]=man1/openssl-genrsa.pod +DEPEND[man1/openssl-genrsa.pod]{pod}=man1/openssl-genrsa.pod.in +GENERATE[man1/openssl-genrsa.pod]=man1/openssl-genrsa.pod.in +DEPEND[html/man1/openssl-info.html]=man1/openssl-info.pod +GENERATE[html/man1/openssl-info.html]=man1/openssl-info.pod +DEPEND[man/man1/openssl-info.1]=man1/openssl-info.pod +GENERATE[man/man1/openssl-info.1]=man1/openssl-info.pod +DEPEND[man1/openssl-info.pod]{pod}=man1/openssl-info.pod.in +GENERATE[man1/openssl-info.pod]=man1/openssl-info.pod.in +DEPEND[html/man1/openssl-kdf.html]=man1/openssl-kdf.pod +GENERATE[html/man1/openssl-kdf.html]=man1/openssl-kdf.pod +DEPEND[man/man1/openssl-kdf.1]=man1/openssl-kdf.pod +GENERATE[man/man1/openssl-kdf.1]=man1/openssl-kdf.pod +DEPEND[man1/openssl-kdf.pod]{pod}=man1/openssl-kdf.pod.in +GENERATE[man1/openssl-kdf.pod]=man1/openssl-kdf.pod.in +DEPEND[html/man1/openssl-list.html]=man1/openssl-list.pod +GENERATE[html/man1/openssl-list.html]=man1/openssl-list.pod +DEPEND[man/man1/openssl-list.1]=man1/openssl-list.pod +GENERATE[man/man1/openssl-list.1]=man1/openssl-list.pod +DEPEND[man1/openssl-list.pod]{pod}=man1/openssl-list.pod.in +GENERATE[man1/openssl-list.pod]=man1/openssl-list.pod.in +DEPEND[html/man1/openssl-mac.html]=man1/openssl-mac.pod +GENERATE[html/man1/openssl-mac.html]=man1/openssl-mac.pod +DEPEND[man/man1/openssl-mac.1]=man1/openssl-mac.pod +GENERATE[man/man1/openssl-mac.1]=man1/openssl-mac.pod +DEPEND[man1/openssl-mac.pod]{pod}=man1/openssl-mac.pod.in +GENERATE[man1/openssl-mac.pod]=man1/openssl-mac.pod.in +DEPEND[html/man1/openssl-namedisplay-options.html]=man1/openssl-namedisplay-options.pod +GENERATE[html/man1/openssl-namedisplay-options.html]=man1/openssl-namedisplay-options.pod +DEPEND[man/man1/openssl-namedisplay-options.1]=man1/openssl-namedisplay-options.pod +GENERATE[man/man1/openssl-namedisplay-options.1]=man1/openssl-namedisplay-options.pod +DEPEND[html/man1/openssl-nseq.html]=man1/openssl-nseq.pod +GENERATE[html/man1/openssl-nseq.html]=man1/openssl-nseq.pod +DEPEND[man/man1/openssl-nseq.1]=man1/openssl-nseq.pod +GENERATE[man/man1/openssl-nseq.1]=man1/openssl-nseq.pod +DEPEND[man1/openssl-nseq.pod]{pod}=man1/openssl-nseq.pod.in +GENERATE[man1/openssl-nseq.pod]=man1/openssl-nseq.pod.in +DEPEND[html/man1/openssl-ocsp.html]=man1/openssl-ocsp.pod +GENERATE[html/man1/openssl-ocsp.html]=man1/openssl-ocsp.pod +DEPEND[man/man1/openssl-ocsp.1]=man1/openssl-ocsp.pod +GENERATE[man/man1/openssl-ocsp.1]=man1/openssl-ocsp.pod +DEPEND[man1/openssl-ocsp.pod]{pod}=man1/openssl-ocsp.pod.in +GENERATE[man1/openssl-ocsp.pod]=man1/openssl-ocsp.pod.in +DEPEND[html/man1/openssl-passphrase-options.html]=man1/openssl-passphrase-options.pod +GENERATE[html/man1/openssl-passphrase-options.html]=man1/openssl-passphrase-options.pod +DEPEND[man/man1/openssl-passphrase-options.1]=man1/openssl-passphrase-options.pod +GENERATE[man/man1/openssl-passphrase-options.1]=man1/openssl-passphrase-options.pod +DEPEND[html/man1/openssl-passwd.html]=man1/openssl-passwd.pod +GENERATE[html/man1/openssl-passwd.html]=man1/openssl-passwd.pod +DEPEND[man/man1/openssl-passwd.1]=man1/openssl-passwd.pod +GENERATE[man/man1/openssl-passwd.1]=man1/openssl-passwd.pod +DEPEND[man1/openssl-passwd.pod]{pod}=man1/openssl-passwd.pod.in +GENERATE[man1/openssl-passwd.pod]=man1/openssl-passwd.pod.in +DEPEND[html/man1/openssl-pkcs12.html]=man1/openssl-pkcs12.pod +GENERATE[html/man1/openssl-pkcs12.html]=man1/openssl-pkcs12.pod +DEPEND[man/man1/openssl-pkcs12.1]=man1/openssl-pkcs12.pod +GENERATE[man/man1/openssl-pkcs12.1]=man1/openssl-pkcs12.pod +DEPEND[man1/openssl-pkcs12.pod]{pod}=man1/openssl-pkcs12.pod.in +GENERATE[man1/openssl-pkcs12.pod]=man1/openssl-pkcs12.pod.in +DEPEND[html/man1/openssl-pkcs7.html]=man1/openssl-pkcs7.pod +GENERATE[html/man1/openssl-pkcs7.html]=man1/openssl-pkcs7.pod +DEPEND[man/man1/openssl-pkcs7.1]=man1/openssl-pkcs7.pod +GENERATE[man/man1/openssl-pkcs7.1]=man1/openssl-pkcs7.pod +DEPEND[man1/openssl-pkcs7.pod]{pod}=man1/openssl-pkcs7.pod.in +GENERATE[man1/openssl-pkcs7.pod]=man1/openssl-pkcs7.pod.in +DEPEND[html/man1/openssl-pkcs8.html]=man1/openssl-pkcs8.pod +GENERATE[html/man1/openssl-pkcs8.html]=man1/openssl-pkcs8.pod +DEPEND[man/man1/openssl-pkcs8.1]=man1/openssl-pkcs8.pod +GENERATE[man/man1/openssl-pkcs8.1]=man1/openssl-pkcs8.pod +DEPEND[man1/openssl-pkcs8.pod]{pod}=man1/openssl-pkcs8.pod.in +GENERATE[man1/openssl-pkcs8.pod]=man1/openssl-pkcs8.pod.in +DEPEND[html/man1/openssl-pkey.html]=man1/openssl-pkey.pod +GENERATE[html/man1/openssl-pkey.html]=man1/openssl-pkey.pod +DEPEND[man/man1/openssl-pkey.1]=man1/openssl-pkey.pod +GENERATE[man/man1/openssl-pkey.1]=man1/openssl-pkey.pod +DEPEND[man1/openssl-pkey.pod]{pod}=man1/openssl-pkey.pod.in +GENERATE[man1/openssl-pkey.pod]=man1/openssl-pkey.pod.in +DEPEND[html/man1/openssl-pkeyparam.html]=man1/openssl-pkeyparam.pod +GENERATE[html/man1/openssl-pkeyparam.html]=man1/openssl-pkeyparam.pod +DEPEND[man/man1/openssl-pkeyparam.1]=man1/openssl-pkeyparam.pod +GENERATE[man/man1/openssl-pkeyparam.1]=man1/openssl-pkeyparam.pod +DEPEND[man1/openssl-pkeyparam.pod]{pod}=man1/openssl-pkeyparam.pod.in +GENERATE[man1/openssl-pkeyparam.pod]=man1/openssl-pkeyparam.pod.in +DEPEND[html/man1/openssl-pkeyutl.html]=man1/openssl-pkeyutl.pod +GENERATE[html/man1/openssl-pkeyutl.html]=man1/openssl-pkeyutl.pod +DEPEND[man/man1/openssl-pkeyutl.1]=man1/openssl-pkeyutl.pod +GENERATE[man/man1/openssl-pkeyutl.1]=man1/openssl-pkeyutl.pod +DEPEND[man1/openssl-pkeyutl.pod]{pod}=man1/openssl-pkeyutl.pod.in +GENERATE[man1/openssl-pkeyutl.pod]=man1/openssl-pkeyutl.pod.in +DEPEND[html/man1/openssl-prime.html]=man1/openssl-prime.pod +GENERATE[html/man1/openssl-prime.html]=man1/openssl-prime.pod +DEPEND[man/man1/openssl-prime.1]=man1/openssl-prime.pod +GENERATE[man/man1/openssl-prime.1]=man1/openssl-prime.pod +DEPEND[man1/openssl-prime.pod]{pod}=man1/openssl-prime.pod.in +GENERATE[man1/openssl-prime.pod]=man1/openssl-prime.pod.in +DEPEND[html/man1/openssl-rand.html]=man1/openssl-rand.pod +GENERATE[html/man1/openssl-rand.html]=man1/openssl-rand.pod +DEPEND[man/man1/openssl-rand.1]=man1/openssl-rand.pod +GENERATE[man/man1/openssl-rand.1]=man1/openssl-rand.pod +DEPEND[man1/openssl-rand.pod]{pod}=man1/openssl-rand.pod.in +GENERATE[man1/openssl-rand.pod]=man1/openssl-rand.pod.in +DEPEND[html/man1/openssl-rehash.html]=man1/openssl-rehash.pod +GENERATE[html/man1/openssl-rehash.html]=man1/openssl-rehash.pod +DEPEND[man/man1/openssl-rehash.1]=man1/openssl-rehash.pod +GENERATE[man/man1/openssl-rehash.1]=man1/openssl-rehash.pod +DEPEND[man1/openssl-rehash.pod]{pod}=man1/openssl-rehash.pod.in +GENERATE[man1/openssl-rehash.pod]=man1/openssl-rehash.pod.in +DEPEND[html/man1/openssl-req.html]=man1/openssl-req.pod +GENERATE[html/man1/openssl-req.html]=man1/openssl-req.pod +DEPEND[man/man1/openssl-req.1]=man1/openssl-req.pod +GENERATE[man/man1/openssl-req.1]=man1/openssl-req.pod +DEPEND[man1/openssl-req.pod]{pod}=man1/openssl-req.pod.in +GENERATE[man1/openssl-req.pod]=man1/openssl-req.pod.in +DEPEND[html/man1/openssl-rsa.html]=man1/openssl-rsa.pod +GENERATE[html/man1/openssl-rsa.html]=man1/openssl-rsa.pod +DEPEND[man/man1/openssl-rsa.1]=man1/openssl-rsa.pod +GENERATE[man/man1/openssl-rsa.1]=man1/openssl-rsa.pod +DEPEND[man1/openssl-rsa.pod]{pod}=man1/openssl-rsa.pod.in +GENERATE[man1/openssl-rsa.pod]=man1/openssl-rsa.pod.in +DEPEND[html/man1/openssl-rsautl.html]=man1/openssl-rsautl.pod +GENERATE[html/man1/openssl-rsautl.html]=man1/openssl-rsautl.pod +DEPEND[man/man1/openssl-rsautl.1]=man1/openssl-rsautl.pod +GENERATE[man/man1/openssl-rsautl.1]=man1/openssl-rsautl.pod +DEPEND[man1/openssl-rsautl.pod]{pod}=man1/openssl-rsautl.pod.in +GENERATE[man1/openssl-rsautl.pod]=man1/openssl-rsautl.pod.in +DEPEND[html/man1/openssl-s_client.html]=man1/openssl-s_client.pod +GENERATE[html/man1/openssl-s_client.html]=man1/openssl-s_client.pod +DEPEND[man/man1/openssl-s_client.1]=man1/openssl-s_client.pod +GENERATE[man/man1/openssl-s_client.1]=man1/openssl-s_client.pod +DEPEND[man1/openssl-s_client.pod]{pod}=man1/openssl-s_client.pod.in +GENERATE[man1/openssl-s_client.pod]=man1/openssl-s_client.pod.in +DEPEND[html/man1/openssl-s_server.html]=man1/openssl-s_server.pod +GENERATE[html/man1/openssl-s_server.html]=man1/openssl-s_server.pod +DEPEND[man/man1/openssl-s_server.1]=man1/openssl-s_server.pod +GENERATE[man/man1/openssl-s_server.1]=man1/openssl-s_server.pod +DEPEND[man1/openssl-s_server.pod]{pod}=man1/openssl-s_server.pod.in +GENERATE[man1/openssl-s_server.pod]=man1/openssl-s_server.pod.in +DEPEND[html/man1/openssl-s_time.html]=man1/openssl-s_time.pod +GENERATE[html/man1/openssl-s_time.html]=man1/openssl-s_time.pod +DEPEND[man/man1/openssl-s_time.1]=man1/openssl-s_time.pod +GENERATE[man/man1/openssl-s_time.1]=man1/openssl-s_time.pod +DEPEND[man1/openssl-s_time.pod]{pod}=man1/openssl-s_time.pod.in +GENERATE[man1/openssl-s_time.pod]=man1/openssl-s_time.pod.in +DEPEND[html/man1/openssl-sess_id.html]=man1/openssl-sess_id.pod +GENERATE[html/man1/openssl-sess_id.html]=man1/openssl-sess_id.pod +DEPEND[man/man1/openssl-sess_id.1]=man1/openssl-sess_id.pod +GENERATE[man/man1/openssl-sess_id.1]=man1/openssl-sess_id.pod +DEPEND[man1/openssl-sess_id.pod]{pod}=man1/openssl-sess_id.pod.in +GENERATE[man1/openssl-sess_id.pod]=man1/openssl-sess_id.pod.in +DEPEND[html/man1/openssl-smime.html]=man1/openssl-smime.pod +GENERATE[html/man1/openssl-smime.html]=man1/openssl-smime.pod +DEPEND[man/man1/openssl-smime.1]=man1/openssl-smime.pod +GENERATE[man/man1/openssl-smime.1]=man1/openssl-smime.pod +DEPEND[man1/openssl-smime.pod]{pod}=man1/openssl-smime.pod.in +GENERATE[man1/openssl-smime.pod]=man1/openssl-smime.pod.in +DEPEND[html/man1/openssl-speed.html]=man1/openssl-speed.pod +GENERATE[html/man1/openssl-speed.html]=man1/openssl-speed.pod +DEPEND[man/man1/openssl-speed.1]=man1/openssl-speed.pod +GENERATE[man/man1/openssl-speed.1]=man1/openssl-speed.pod +DEPEND[man1/openssl-speed.pod]{pod}=man1/openssl-speed.pod.in +GENERATE[man1/openssl-speed.pod]=man1/openssl-speed.pod.in +DEPEND[html/man1/openssl-spkac.html]=man1/openssl-spkac.pod +GENERATE[html/man1/openssl-spkac.html]=man1/openssl-spkac.pod +DEPEND[man/man1/openssl-spkac.1]=man1/openssl-spkac.pod +GENERATE[man/man1/openssl-spkac.1]=man1/openssl-spkac.pod +DEPEND[man1/openssl-spkac.pod]{pod}=man1/openssl-spkac.pod.in +GENERATE[man1/openssl-spkac.pod]=man1/openssl-spkac.pod.in +DEPEND[html/man1/openssl-srp.html]=man1/openssl-srp.pod +GENERATE[html/man1/openssl-srp.html]=man1/openssl-srp.pod +DEPEND[man/man1/openssl-srp.1]=man1/openssl-srp.pod +GENERATE[man/man1/openssl-srp.1]=man1/openssl-srp.pod +DEPEND[man1/openssl-srp.pod]{pod}=man1/openssl-srp.pod.in +GENERATE[man1/openssl-srp.pod]=man1/openssl-srp.pod.in +DEPEND[html/man1/openssl-storeutl.html]=man1/openssl-storeutl.pod +GENERATE[html/man1/openssl-storeutl.html]=man1/openssl-storeutl.pod +DEPEND[man/man1/openssl-storeutl.1]=man1/openssl-storeutl.pod +GENERATE[man/man1/openssl-storeutl.1]=man1/openssl-storeutl.pod +DEPEND[man1/openssl-storeutl.pod]{pod}=man1/openssl-storeutl.pod.in +GENERATE[man1/openssl-storeutl.pod]=man1/openssl-storeutl.pod.in +DEPEND[html/man1/openssl-ts.html]=man1/openssl-ts.pod +GENERATE[html/man1/openssl-ts.html]=man1/openssl-ts.pod +DEPEND[man/man1/openssl-ts.1]=man1/openssl-ts.pod +GENERATE[man/man1/openssl-ts.1]=man1/openssl-ts.pod +DEPEND[man1/openssl-ts.pod]{pod}=man1/openssl-ts.pod.in +GENERATE[man1/openssl-ts.pod]=man1/openssl-ts.pod.in +DEPEND[html/man1/openssl-verification-options.html]=man1/openssl-verification-options.pod +GENERATE[html/man1/openssl-verification-options.html]=man1/openssl-verification-options.pod +DEPEND[man/man1/openssl-verification-options.1]=man1/openssl-verification-options.pod +GENERATE[man/man1/openssl-verification-options.1]=man1/openssl-verification-options.pod +DEPEND[html/man1/openssl-verify.html]=man1/openssl-verify.pod +GENERATE[html/man1/openssl-verify.html]=man1/openssl-verify.pod +DEPEND[man/man1/openssl-verify.1]=man1/openssl-verify.pod +GENERATE[man/man1/openssl-verify.1]=man1/openssl-verify.pod +DEPEND[man1/openssl-verify.pod]{pod}=man1/openssl-verify.pod.in +GENERATE[man1/openssl-verify.pod]=man1/openssl-verify.pod.in +DEPEND[html/man1/openssl-version.html]=man1/openssl-version.pod +GENERATE[html/man1/openssl-version.html]=man1/openssl-version.pod +DEPEND[man/man1/openssl-version.1]=man1/openssl-version.pod +GENERATE[man/man1/openssl-version.1]=man1/openssl-version.pod +DEPEND[man1/openssl-version.pod]{pod}=man1/openssl-version.pod.in +GENERATE[man1/openssl-version.pod]=man1/openssl-version.pod.in +DEPEND[html/man1/openssl-x509.html]=man1/openssl-x509.pod +GENERATE[html/man1/openssl-x509.html]=man1/openssl-x509.pod +DEPEND[man/man1/openssl-x509.1]=man1/openssl-x509.pod +GENERATE[man/man1/openssl-x509.1]=man1/openssl-x509.pod +DEPEND[man1/openssl-x509.pod]{pod}=man1/openssl-x509.pod.in +GENERATE[man1/openssl-x509.pod]=man1/openssl-x509.pod.in +DEPEND[html/man1/openssl.html]=man1/openssl.pod +GENERATE[html/man1/openssl.html]=man1/openssl.pod +DEPEND[man/man1/openssl.1]=man1/openssl.pod +GENERATE[man/man1/openssl.1]=man1/openssl.pod +DEPEND[html/man1/tsget.html]=man1/tsget.pod +GENERATE[html/man1/tsget.html]=man1/tsget.pod +DEPEND[man/man1/tsget.1]=man1/tsget.pod +GENERATE[man/man1/tsget.1]=man1/tsget.pod +IMAGEDOCS[man1]= +HTMLDOCS[man1]=html/man1/CA.pl.html \ +html/man1/openssl-asn1parse.html \ +html/man1/openssl-ca.html \ +html/man1/openssl-ciphers.html \ +html/man1/openssl-cmds.html \ +html/man1/openssl-cmp.html \ +html/man1/openssl-cms.html \ +html/man1/openssl-crl.html \ +html/man1/openssl-crl2pkcs7.html \ +html/man1/openssl-dgst.html \ +html/man1/openssl-dhparam.html \ +html/man1/openssl-dsa.html \ +html/man1/openssl-dsaparam.html \ +html/man1/openssl-ec.html \ +html/man1/openssl-ecparam.html \ +html/man1/openssl-enc.html \ +html/man1/openssl-engine.html \ +html/man1/openssl-errstr.html \ +html/man1/openssl-fipsinstall.html \ +html/man1/openssl-format-options.html \ +html/man1/openssl-gendsa.html \ +html/man1/openssl-genpkey.html \ +html/man1/openssl-genrsa.html \ +html/man1/openssl-info.html \ +html/man1/openssl-kdf.html \ +html/man1/openssl-list.html \ +html/man1/openssl-mac.html \ +html/man1/openssl-namedisplay-options.html \ +html/man1/openssl-nseq.html \ +html/man1/openssl-ocsp.html \ +html/man1/openssl-passphrase-options.html \ +html/man1/openssl-passwd.html \ +html/man1/openssl-pkcs12.html \ +html/man1/openssl-pkcs7.html \ +html/man1/openssl-pkcs8.html \ +html/man1/openssl-pkey.html \ +html/man1/openssl-pkeyparam.html \ +html/man1/openssl-pkeyutl.html \ +html/man1/openssl-prime.html \ +html/man1/openssl-rand.html \ +html/man1/openssl-rehash.html \ +html/man1/openssl-req.html \ +html/man1/openssl-rsa.html \ +html/man1/openssl-rsautl.html \ +html/man1/openssl-s_client.html \ +html/man1/openssl-s_server.html \ +html/man1/openssl-s_time.html \ +html/man1/openssl-sess_id.html \ +html/man1/openssl-smime.html \ +html/man1/openssl-speed.html \ +html/man1/openssl-spkac.html \ +html/man1/openssl-srp.html \ +html/man1/openssl-storeutl.html \ +html/man1/openssl-ts.html \ +html/man1/openssl-verification-options.html \ +html/man1/openssl-verify.html \ +html/man1/openssl-version.html \ +html/man1/openssl-x509.html \ +html/man1/openssl.html \ +html/man1/tsget.html +MANDOCS[man1]=man/man1/CA.pl.1 \ +man/man1/openssl-asn1parse.1 \ +man/man1/openssl-ca.1 \ +man/man1/openssl-ciphers.1 \ +man/man1/openssl-cmds.1 \ +man/man1/openssl-cmp.1 \ +man/man1/openssl-cms.1 \ +man/man1/openssl-crl.1 \ +man/man1/openssl-crl2pkcs7.1 \ +man/man1/openssl-dgst.1 \ +man/man1/openssl-dhparam.1 \ +man/man1/openssl-dsa.1 \ +man/man1/openssl-dsaparam.1 \ +man/man1/openssl-ec.1 \ +man/man1/openssl-ecparam.1 \ +man/man1/openssl-enc.1 \ +man/man1/openssl-engine.1 \ +man/man1/openssl-errstr.1 \ +man/man1/openssl-fipsinstall.1 \ +man/man1/openssl-format-options.1 \ +man/man1/openssl-gendsa.1 \ +man/man1/openssl-genpkey.1 \ +man/man1/openssl-genrsa.1 \ +man/man1/openssl-info.1 \ +man/man1/openssl-kdf.1 \ +man/man1/openssl-list.1 \ +man/man1/openssl-mac.1 \ +man/man1/openssl-namedisplay-options.1 \ +man/man1/openssl-nseq.1 \ +man/man1/openssl-ocsp.1 \ +man/man1/openssl-passphrase-options.1 \ +man/man1/openssl-passwd.1 \ +man/man1/openssl-pkcs12.1 \ +man/man1/openssl-pkcs7.1 \ +man/man1/openssl-pkcs8.1 \ +man/man1/openssl-pkey.1 \ +man/man1/openssl-pkeyparam.1 \ +man/man1/openssl-pkeyutl.1 \ +man/man1/openssl-prime.1 \ +man/man1/openssl-rand.1 \ +man/man1/openssl-rehash.1 \ +man/man1/openssl-req.1 \ +man/man1/openssl-rsa.1 \ +man/man1/openssl-rsautl.1 \ +man/man1/openssl-s_client.1 \ +man/man1/openssl-s_server.1 \ +man/man1/openssl-s_time.1 \ +man/man1/openssl-sess_id.1 \ +man/man1/openssl-smime.1 \ +man/man1/openssl-speed.1 \ +man/man1/openssl-spkac.1 \ +man/man1/openssl-srp.1 \ +man/man1/openssl-storeutl.1 \ +man/man1/openssl-ts.1 \ +man/man1/openssl-verification-options.1 \ +man/man1/openssl-verify.1 \ +man/man1/openssl-version.1 \ +man/man1/openssl-x509.1 \ +man/man1/openssl.1 \ +man/man1/tsget.1 +DEPEND[html/man3/ADMISSIONS.html]=man3/ADMISSIONS.pod +GENERATE[html/man3/ADMISSIONS.html]=man3/ADMISSIONS.pod +DEPEND[man/man3/ADMISSIONS.3]=man3/ADMISSIONS.pod +GENERATE[man/man3/ADMISSIONS.3]=man3/ADMISSIONS.pod +DEPEND[html/man3/ASN1_EXTERN_FUNCS.html]=man3/ASN1_EXTERN_FUNCS.pod +GENERATE[html/man3/ASN1_EXTERN_FUNCS.html]=man3/ASN1_EXTERN_FUNCS.pod +DEPEND[man/man3/ASN1_EXTERN_FUNCS.3]=man3/ASN1_EXTERN_FUNCS.pod +GENERATE[man/man3/ASN1_EXTERN_FUNCS.3]=man3/ASN1_EXTERN_FUNCS.pod +DEPEND[html/man3/ASN1_INTEGER_get_int64.html]=man3/ASN1_INTEGER_get_int64.pod +GENERATE[html/man3/ASN1_INTEGER_get_int64.html]=man3/ASN1_INTEGER_get_int64.pod +DEPEND[man/man3/ASN1_INTEGER_get_int64.3]=man3/ASN1_INTEGER_get_int64.pod +GENERATE[man/man3/ASN1_INTEGER_get_int64.3]=man3/ASN1_INTEGER_get_int64.pod +DEPEND[html/man3/ASN1_INTEGER_new.html]=man3/ASN1_INTEGER_new.pod +GENERATE[html/man3/ASN1_INTEGER_new.html]=man3/ASN1_INTEGER_new.pod +DEPEND[man/man3/ASN1_INTEGER_new.3]=man3/ASN1_INTEGER_new.pod +GENERATE[man/man3/ASN1_INTEGER_new.3]=man3/ASN1_INTEGER_new.pod +DEPEND[html/man3/ASN1_ITEM_lookup.html]=man3/ASN1_ITEM_lookup.pod +GENERATE[html/man3/ASN1_ITEM_lookup.html]=man3/ASN1_ITEM_lookup.pod +DEPEND[man/man3/ASN1_ITEM_lookup.3]=man3/ASN1_ITEM_lookup.pod +GENERATE[man/man3/ASN1_ITEM_lookup.3]=man3/ASN1_ITEM_lookup.pod +DEPEND[html/man3/ASN1_OBJECT_new.html]=man3/ASN1_OBJECT_new.pod +GENERATE[html/man3/ASN1_OBJECT_new.html]=man3/ASN1_OBJECT_new.pod +DEPEND[man/man3/ASN1_OBJECT_new.3]=man3/ASN1_OBJECT_new.pod +GENERATE[man/man3/ASN1_OBJECT_new.3]=man3/ASN1_OBJECT_new.pod +DEPEND[html/man3/ASN1_STRING_TABLE_add.html]=man3/ASN1_STRING_TABLE_add.pod +GENERATE[html/man3/ASN1_STRING_TABLE_add.html]=man3/ASN1_STRING_TABLE_add.pod +DEPEND[man/man3/ASN1_STRING_TABLE_add.3]=man3/ASN1_STRING_TABLE_add.pod +GENERATE[man/man3/ASN1_STRING_TABLE_add.3]=man3/ASN1_STRING_TABLE_add.pod +DEPEND[html/man3/ASN1_STRING_length.html]=man3/ASN1_STRING_length.pod +GENERATE[html/man3/ASN1_STRING_length.html]=man3/ASN1_STRING_length.pod +DEPEND[man/man3/ASN1_STRING_length.3]=man3/ASN1_STRING_length.pod +GENERATE[man/man3/ASN1_STRING_length.3]=man3/ASN1_STRING_length.pod +DEPEND[html/man3/ASN1_STRING_new.html]=man3/ASN1_STRING_new.pod +GENERATE[html/man3/ASN1_STRING_new.html]=man3/ASN1_STRING_new.pod +DEPEND[man/man3/ASN1_STRING_new.3]=man3/ASN1_STRING_new.pod +GENERATE[man/man3/ASN1_STRING_new.3]=man3/ASN1_STRING_new.pod +DEPEND[html/man3/ASN1_STRING_print_ex.html]=man3/ASN1_STRING_print_ex.pod +GENERATE[html/man3/ASN1_STRING_print_ex.html]=man3/ASN1_STRING_print_ex.pod +DEPEND[man/man3/ASN1_STRING_print_ex.3]=man3/ASN1_STRING_print_ex.pod +GENERATE[man/man3/ASN1_STRING_print_ex.3]=man3/ASN1_STRING_print_ex.pod +DEPEND[html/man3/ASN1_TIME_set.html]=man3/ASN1_TIME_set.pod +GENERATE[html/man3/ASN1_TIME_set.html]=man3/ASN1_TIME_set.pod +DEPEND[man/man3/ASN1_TIME_set.3]=man3/ASN1_TIME_set.pod +GENERATE[man/man3/ASN1_TIME_set.3]=man3/ASN1_TIME_set.pod +DEPEND[html/man3/ASN1_TYPE_get.html]=man3/ASN1_TYPE_get.pod +GENERATE[html/man3/ASN1_TYPE_get.html]=man3/ASN1_TYPE_get.pod +DEPEND[man/man3/ASN1_TYPE_get.3]=man3/ASN1_TYPE_get.pod +GENERATE[man/man3/ASN1_TYPE_get.3]=man3/ASN1_TYPE_get.pod +DEPEND[html/man3/ASN1_aux_cb.html]=man3/ASN1_aux_cb.pod +GENERATE[html/man3/ASN1_aux_cb.html]=man3/ASN1_aux_cb.pod +DEPEND[man/man3/ASN1_aux_cb.3]=man3/ASN1_aux_cb.pod +GENERATE[man/man3/ASN1_aux_cb.3]=man3/ASN1_aux_cb.pod +DEPEND[html/man3/ASN1_generate_nconf.html]=man3/ASN1_generate_nconf.pod +GENERATE[html/man3/ASN1_generate_nconf.html]=man3/ASN1_generate_nconf.pod +DEPEND[man/man3/ASN1_generate_nconf.3]=man3/ASN1_generate_nconf.pod +GENERATE[man/man3/ASN1_generate_nconf.3]=man3/ASN1_generate_nconf.pod +DEPEND[html/man3/ASN1_item_d2i_bio.html]=man3/ASN1_item_d2i_bio.pod +GENERATE[html/man3/ASN1_item_d2i_bio.html]=man3/ASN1_item_d2i_bio.pod +DEPEND[man/man3/ASN1_item_d2i_bio.3]=man3/ASN1_item_d2i_bio.pod +GENERATE[man/man3/ASN1_item_d2i_bio.3]=man3/ASN1_item_d2i_bio.pod +DEPEND[html/man3/ASN1_item_new.html]=man3/ASN1_item_new.pod +GENERATE[html/man3/ASN1_item_new.html]=man3/ASN1_item_new.pod +DEPEND[man/man3/ASN1_item_new.3]=man3/ASN1_item_new.pod +GENERATE[man/man3/ASN1_item_new.3]=man3/ASN1_item_new.pod +DEPEND[html/man3/ASN1_item_sign.html]=man3/ASN1_item_sign.pod +GENERATE[html/man3/ASN1_item_sign.html]=man3/ASN1_item_sign.pod +DEPEND[man/man3/ASN1_item_sign.3]=man3/ASN1_item_sign.pod +GENERATE[man/man3/ASN1_item_sign.3]=man3/ASN1_item_sign.pod +DEPEND[html/man3/ASYNC_WAIT_CTX_new.html]=man3/ASYNC_WAIT_CTX_new.pod +GENERATE[html/man3/ASYNC_WAIT_CTX_new.html]=man3/ASYNC_WAIT_CTX_new.pod +DEPEND[man/man3/ASYNC_WAIT_CTX_new.3]=man3/ASYNC_WAIT_CTX_new.pod +GENERATE[man/man3/ASYNC_WAIT_CTX_new.3]=man3/ASYNC_WAIT_CTX_new.pod +DEPEND[html/man3/ASYNC_start_job.html]=man3/ASYNC_start_job.pod +GENERATE[html/man3/ASYNC_start_job.html]=man3/ASYNC_start_job.pod +DEPEND[man/man3/ASYNC_start_job.3]=man3/ASYNC_start_job.pod +GENERATE[man/man3/ASYNC_start_job.3]=man3/ASYNC_start_job.pod +DEPEND[html/man3/BF_encrypt.html]=man3/BF_encrypt.pod +GENERATE[html/man3/BF_encrypt.html]=man3/BF_encrypt.pod +DEPEND[man/man3/BF_encrypt.3]=man3/BF_encrypt.pod +GENERATE[man/man3/BF_encrypt.3]=man3/BF_encrypt.pod +DEPEND[html/man3/BIO_ADDR.html]=man3/BIO_ADDR.pod +GENERATE[html/man3/BIO_ADDR.html]=man3/BIO_ADDR.pod +DEPEND[man/man3/BIO_ADDR.3]=man3/BIO_ADDR.pod +GENERATE[man/man3/BIO_ADDR.3]=man3/BIO_ADDR.pod +DEPEND[html/man3/BIO_ADDRINFO.html]=man3/BIO_ADDRINFO.pod +GENERATE[html/man3/BIO_ADDRINFO.html]=man3/BIO_ADDRINFO.pod +DEPEND[man/man3/BIO_ADDRINFO.3]=man3/BIO_ADDRINFO.pod +GENERATE[man/man3/BIO_ADDRINFO.3]=man3/BIO_ADDRINFO.pod +DEPEND[html/man3/BIO_connect.html]=man3/BIO_connect.pod +GENERATE[html/man3/BIO_connect.html]=man3/BIO_connect.pod +DEPEND[man/man3/BIO_connect.3]=man3/BIO_connect.pod +GENERATE[man/man3/BIO_connect.3]=man3/BIO_connect.pod +DEPEND[html/man3/BIO_ctrl.html]=man3/BIO_ctrl.pod +GENERATE[html/man3/BIO_ctrl.html]=man3/BIO_ctrl.pod +DEPEND[man/man3/BIO_ctrl.3]=man3/BIO_ctrl.pod +GENERATE[man/man3/BIO_ctrl.3]=man3/BIO_ctrl.pod +DEPEND[html/man3/BIO_f_base64.html]=man3/BIO_f_base64.pod +GENERATE[html/man3/BIO_f_base64.html]=man3/BIO_f_base64.pod +DEPEND[man/man3/BIO_f_base64.3]=man3/BIO_f_base64.pod +GENERATE[man/man3/BIO_f_base64.3]=man3/BIO_f_base64.pod +DEPEND[html/man3/BIO_f_buffer.html]=man3/BIO_f_buffer.pod +GENERATE[html/man3/BIO_f_buffer.html]=man3/BIO_f_buffer.pod +DEPEND[man/man3/BIO_f_buffer.3]=man3/BIO_f_buffer.pod +GENERATE[man/man3/BIO_f_buffer.3]=man3/BIO_f_buffer.pod +DEPEND[html/man3/BIO_f_cipher.html]=man3/BIO_f_cipher.pod +GENERATE[html/man3/BIO_f_cipher.html]=man3/BIO_f_cipher.pod +DEPEND[man/man3/BIO_f_cipher.3]=man3/BIO_f_cipher.pod +GENERATE[man/man3/BIO_f_cipher.3]=man3/BIO_f_cipher.pod +DEPEND[html/man3/BIO_f_md.html]=man3/BIO_f_md.pod +GENERATE[html/man3/BIO_f_md.html]=man3/BIO_f_md.pod +DEPEND[man/man3/BIO_f_md.3]=man3/BIO_f_md.pod +GENERATE[man/man3/BIO_f_md.3]=man3/BIO_f_md.pod +DEPEND[html/man3/BIO_f_null.html]=man3/BIO_f_null.pod +GENERATE[html/man3/BIO_f_null.html]=man3/BIO_f_null.pod +DEPEND[man/man3/BIO_f_null.3]=man3/BIO_f_null.pod +GENERATE[man/man3/BIO_f_null.3]=man3/BIO_f_null.pod +DEPEND[html/man3/BIO_f_prefix.html]=man3/BIO_f_prefix.pod +GENERATE[html/man3/BIO_f_prefix.html]=man3/BIO_f_prefix.pod +DEPEND[man/man3/BIO_f_prefix.3]=man3/BIO_f_prefix.pod +GENERATE[man/man3/BIO_f_prefix.3]=man3/BIO_f_prefix.pod +DEPEND[html/man3/BIO_f_readbuffer.html]=man3/BIO_f_readbuffer.pod +GENERATE[html/man3/BIO_f_readbuffer.html]=man3/BIO_f_readbuffer.pod +DEPEND[man/man3/BIO_f_readbuffer.3]=man3/BIO_f_readbuffer.pod +GENERATE[man/man3/BIO_f_readbuffer.3]=man3/BIO_f_readbuffer.pod +DEPEND[html/man3/BIO_f_ssl.html]=man3/BIO_f_ssl.pod +GENERATE[html/man3/BIO_f_ssl.html]=man3/BIO_f_ssl.pod +DEPEND[man/man3/BIO_f_ssl.3]=man3/BIO_f_ssl.pod +GENERATE[man/man3/BIO_f_ssl.3]=man3/BIO_f_ssl.pod +DEPEND[html/man3/BIO_find_type.html]=man3/BIO_find_type.pod +GENERATE[html/man3/BIO_find_type.html]=man3/BIO_find_type.pod +DEPEND[man/man3/BIO_find_type.3]=man3/BIO_find_type.pod +GENERATE[man/man3/BIO_find_type.3]=man3/BIO_find_type.pod +DEPEND[html/man3/BIO_get_data.html]=man3/BIO_get_data.pod +GENERATE[html/man3/BIO_get_data.html]=man3/BIO_get_data.pod +DEPEND[man/man3/BIO_get_data.3]=man3/BIO_get_data.pod +GENERATE[man/man3/BIO_get_data.3]=man3/BIO_get_data.pod +DEPEND[html/man3/BIO_get_ex_new_index.html]=man3/BIO_get_ex_new_index.pod +GENERATE[html/man3/BIO_get_ex_new_index.html]=man3/BIO_get_ex_new_index.pod +DEPEND[man/man3/BIO_get_ex_new_index.3]=man3/BIO_get_ex_new_index.pod +GENERATE[man/man3/BIO_get_ex_new_index.3]=man3/BIO_get_ex_new_index.pod +DEPEND[html/man3/BIO_meth_new.html]=man3/BIO_meth_new.pod +GENERATE[html/man3/BIO_meth_new.html]=man3/BIO_meth_new.pod +DEPEND[man/man3/BIO_meth_new.3]=man3/BIO_meth_new.pod +GENERATE[man/man3/BIO_meth_new.3]=man3/BIO_meth_new.pod +DEPEND[html/man3/BIO_new.html]=man3/BIO_new.pod +GENERATE[html/man3/BIO_new.html]=man3/BIO_new.pod +DEPEND[man/man3/BIO_new.3]=man3/BIO_new.pod +GENERATE[man/man3/BIO_new.3]=man3/BIO_new.pod +DEPEND[html/man3/BIO_new_CMS.html]=man3/BIO_new_CMS.pod +GENERATE[html/man3/BIO_new_CMS.html]=man3/BIO_new_CMS.pod +DEPEND[man/man3/BIO_new_CMS.3]=man3/BIO_new_CMS.pod +GENERATE[man/man3/BIO_new_CMS.3]=man3/BIO_new_CMS.pod +DEPEND[html/man3/BIO_parse_hostserv.html]=man3/BIO_parse_hostserv.pod +GENERATE[html/man3/BIO_parse_hostserv.html]=man3/BIO_parse_hostserv.pod +DEPEND[man/man3/BIO_parse_hostserv.3]=man3/BIO_parse_hostserv.pod +GENERATE[man/man3/BIO_parse_hostserv.3]=man3/BIO_parse_hostserv.pod +DEPEND[html/man3/BIO_printf.html]=man3/BIO_printf.pod +GENERATE[html/man3/BIO_printf.html]=man3/BIO_printf.pod +DEPEND[man/man3/BIO_printf.3]=man3/BIO_printf.pod +GENERATE[man/man3/BIO_printf.3]=man3/BIO_printf.pod +DEPEND[html/man3/BIO_push.html]=man3/BIO_push.pod +GENERATE[html/man3/BIO_push.html]=man3/BIO_push.pod +DEPEND[man/man3/BIO_push.3]=man3/BIO_push.pod +GENERATE[man/man3/BIO_push.3]=man3/BIO_push.pod +DEPEND[html/man3/BIO_read.html]=man3/BIO_read.pod +GENERATE[html/man3/BIO_read.html]=man3/BIO_read.pod +DEPEND[man/man3/BIO_read.3]=man3/BIO_read.pod +GENERATE[man/man3/BIO_read.3]=man3/BIO_read.pod +DEPEND[html/man3/BIO_s_accept.html]=man3/BIO_s_accept.pod +GENERATE[html/man3/BIO_s_accept.html]=man3/BIO_s_accept.pod +DEPEND[man/man3/BIO_s_accept.3]=man3/BIO_s_accept.pod +GENERATE[man/man3/BIO_s_accept.3]=man3/BIO_s_accept.pod +DEPEND[html/man3/BIO_s_bio.html]=man3/BIO_s_bio.pod +GENERATE[html/man3/BIO_s_bio.html]=man3/BIO_s_bio.pod +DEPEND[man/man3/BIO_s_bio.3]=man3/BIO_s_bio.pod +GENERATE[man/man3/BIO_s_bio.3]=man3/BIO_s_bio.pod +DEPEND[html/man3/BIO_s_connect.html]=man3/BIO_s_connect.pod +GENERATE[html/man3/BIO_s_connect.html]=man3/BIO_s_connect.pod +DEPEND[man/man3/BIO_s_connect.3]=man3/BIO_s_connect.pod +GENERATE[man/man3/BIO_s_connect.3]=man3/BIO_s_connect.pod +DEPEND[html/man3/BIO_s_core.html]=man3/BIO_s_core.pod +GENERATE[html/man3/BIO_s_core.html]=man3/BIO_s_core.pod +DEPEND[man/man3/BIO_s_core.3]=man3/BIO_s_core.pod +GENERATE[man/man3/BIO_s_core.3]=man3/BIO_s_core.pod +DEPEND[html/man3/BIO_s_datagram.html]=man3/BIO_s_datagram.pod +GENERATE[html/man3/BIO_s_datagram.html]=man3/BIO_s_datagram.pod +DEPEND[man/man3/BIO_s_datagram.3]=man3/BIO_s_datagram.pod +GENERATE[man/man3/BIO_s_datagram.3]=man3/BIO_s_datagram.pod +DEPEND[html/man3/BIO_s_fd.html]=man3/BIO_s_fd.pod +GENERATE[html/man3/BIO_s_fd.html]=man3/BIO_s_fd.pod +DEPEND[man/man3/BIO_s_fd.3]=man3/BIO_s_fd.pod +GENERATE[man/man3/BIO_s_fd.3]=man3/BIO_s_fd.pod +DEPEND[html/man3/BIO_s_file.html]=man3/BIO_s_file.pod +GENERATE[html/man3/BIO_s_file.html]=man3/BIO_s_file.pod +DEPEND[man/man3/BIO_s_file.3]=man3/BIO_s_file.pod +GENERATE[man/man3/BIO_s_file.3]=man3/BIO_s_file.pod +DEPEND[html/man3/BIO_s_mem.html]=man3/BIO_s_mem.pod +GENERATE[html/man3/BIO_s_mem.html]=man3/BIO_s_mem.pod +DEPEND[man/man3/BIO_s_mem.3]=man3/BIO_s_mem.pod +GENERATE[man/man3/BIO_s_mem.3]=man3/BIO_s_mem.pod +DEPEND[html/man3/BIO_s_null.html]=man3/BIO_s_null.pod +GENERATE[html/man3/BIO_s_null.html]=man3/BIO_s_null.pod +DEPEND[man/man3/BIO_s_null.3]=man3/BIO_s_null.pod +GENERATE[man/man3/BIO_s_null.3]=man3/BIO_s_null.pod +DEPEND[html/man3/BIO_s_socket.html]=man3/BIO_s_socket.pod +GENERATE[html/man3/BIO_s_socket.html]=man3/BIO_s_socket.pod +DEPEND[man/man3/BIO_s_socket.3]=man3/BIO_s_socket.pod +GENERATE[man/man3/BIO_s_socket.3]=man3/BIO_s_socket.pod +DEPEND[html/man3/BIO_set_callback.html]=man3/BIO_set_callback.pod +GENERATE[html/man3/BIO_set_callback.html]=man3/BIO_set_callback.pod +DEPEND[man/man3/BIO_set_callback.3]=man3/BIO_set_callback.pod +GENERATE[man/man3/BIO_set_callback.3]=man3/BIO_set_callback.pod +DEPEND[html/man3/BIO_should_retry.html]=man3/BIO_should_retry.pod +GENERATE[html/man3/BIO_should_retry.html]=man3/BIO_should_retry.pod +DEPEND[man/man3/BIO_should_retry.3]=man3/BIO_should_retry.pod +GENERATE[man/man3/BIO_should_retry.3]=man3/BIO_should_retry.pod +DEPEND[html/man3/BIO_socket_wait.html]=man3/BIO_socket_wait.pod +GENERATE[html/man3/BIO_socket_wait.html]=man3/BIO_socket_wait.pod +DEPEND[man/man3/BIO_socket_wait.3]=man3/BIO_socket_wait.pod +GENERATE[man/man3/BIO_socket_wait.3]=man3/BIO_socket_wait.pod +DEPEND[html/man3/BN_BLINDING_new.html]=man3/BN_BLINDING_new.pod +GENERATE[html/man3/BN_BLINDING_new.html]=man3/BN_BLINDING_new.pod +DEPEND[man/man3/BN_BLINDING_new.3]=man3/BN_BLINDING_new.pod +GENERATE[man/man3/BN_BLINDING_new.3]=man3/BN_BLINDING_new.pod +DEPEND[html/man3/BN_CTX_new.html]=man3/BN_CTX_new.pod +GENERATE[html/man3/BN_CTX_new.html]=man3/BN_CTX_new.pod +DEPEND[man/man3/BN_CTX_new.3]=man3/BN_CTX_new.pod +GENERATE[man/man3/BN_CTX_new.3]=man3/BN_CTX_new.pod +DEPEND[html/man3/BN_CTX_start.html]=man3/BN_CTX_start.pod +GENERATE[html/man3/BN_CTX_start.html]=man3/BN_CTX_start.pod +DEPEND[man/man3/BN_CTX_start.3]=man3/BN_CTX_start.pod +GENERATE[man/man3/BN_CTX_start.3]=man3/BN_CTX_start.pod +DEPEND[html/man3/BN_add.html]=man3/BN_add.pod +GENERATE[html/man3/BN_add.html]=man3/BN_add.pod +DEPEND[man/man3/BN_add.3]=man3/BN_add.pod +GENERATE[man/man3/BN_add.3]=man3/BN_add.pod +DEPEND[html/man3/BN_add_word.html]=man3/BN_add_word.pod +GENERATE[html/man3/BN_add_word.html]=man3/BN_add_word.pod +DEPEND[man/man3/BN_add_word.3]=man3/BN_add_word.pod +GENERATE[man/man3/BN_add_word.3]=man3/BN_add_word.pod +DEPEND[html/man3/BN_bn2bin.html]=man3/BN_bn2bin.pod +GENERATE[html/man3/BN_bn2bin.html]=man3/BN_bn2bin.pod +DEPEND[man/man3/BN_bn2bin.3]=man3/BN_bn2bin.pod +GENERATE[man/man3/BN_bn2bin.3]=man3/BN_bn2bin.pod +DEPEND[html/man3/BN_cmp.html]=man3/BN_cmp.pod +GENERATE[html/man3/BN_cmp.html]=man3/BN_cmp.pod +DEPEND[man/man3/BN_cmp.3]=man3/BN_cmp.pod +GENERATE[man/man3/BN_cmp.3]=man3/BN_cmp.pod +DEPEND[html/man3/BN_copy.html]=man3/BN_copy.pod +GENERATE[html/man3/BN_copy.html]=man3/BN_copy.pod +DEPEND[man/man3/BN_copy.3]=man3/BN_copy.pod +GENERATE[man/man3/BN_copy.3]=man3/BN_copy.pod +DEPEND[html/man3/BN_generate_prime.html]=man3/BN_generate_prime.pod +GENERATE[html/man3/BN_generate_prime.html]=man3/BN_generate_prime.pod +DEPEND[man/man3/BN_generate_prime.3]=man3/BN_generate_prime.pod +GENERATE[man/man3/BN_generate_prime.3]=man3/BN_generate_prime.pod +DEPEND[html/man3/BN_mod_exp_mont.html]=man3/BN_mod_exp_mont.pod +GENERATE[html/man3/BN_mod_exp_mont.html]=man3/BN_mod_exp_mont.pod +DEPEND[man/man3/BN_mod_exp_mont.3]=man3/BN_mod_exp_mont.pod +GENERATE[man/man3/BN_mod_exp_mont.3]=man3/BN_mod_exp_mont.pod +DEPEND[html/man3/BN_mod_inverse.html]=man3/BN_mod_inverse.pod +GENERATE[html/man3/BN_mod_inverse.html]=man3/BN_mod_inverse.pod +DEPEND[man/man3/BN_mod_inverse.3]=man3/BN_mod_inverse.pod +GENERATE[man/man3/BN_mod_inverse.3]=man3/BN_mod_inverse.pod +DEPEND[html/man3/BN_mod_mul_montgomery.html]=man3/BN_mod_mul_montgomery.pod +GENERATE[html/man3/BN_mod_mul_montgomery.html]=man3/BN_mod_mul_montgomery.pod +DEPEND[man/man3/BN_mod_mul_montgomery.3]=man3/BN_mod_mul_montgomery.pod +GENERATE[man/man3/BN_mod_mul_montgomery.3]=man3/BN_mod_mul_montgomery.pod +DEPEND[html/man3/BN_mod_mul_reciprocal.html]=man3/BN_mod_mul_reciprocal.pod +GENERATE[html/man3/BN_mod_mul_reciprocal.html]=man3/BN_mod_mul_reciprocal.pod +DEPEND[man/man3/BN_mod_mul_reciprocal.3]=man3/BN_mod_mul_reciprocal.pod +GENERATE[man/man3/BN_mod_mul_reciprocal.3]=man3/BN_mod_mul_reciprocal.pod +DEPEND[html/man3/BN_new.html]=man3/BN_new.pod +GENERATE[html/man3/BN_new.html]=man3/BN_new.pod +DEPEND[man/man3/BN_new.3]=man3/BN_new.pod +GENERATE[man/man3/BN_new.3]=man3/BN_new.pod +DEPEND[html/man3/BN_num_bytes.html]=man3/BN_num_bytes.pod +GENERATE[html/man3/BN_num_bytes.html]=man3/BN_num_bytes.pod +DEPEND[man/man3/BN_num_bytes.3]=man3/BN_num_bytes.pod +GENERATE[man/man3/BN_num_bytes.3]=man3/BN_num_bytes.pod +DEPEND[html/man3/BN_rand.html]=man3/BN_rand.pod +GENERATE[html/man3/BN_rand.html]=man3/BN_rand.pod +DEPEND[man/man3/BN_rand.3]=man3/BN_rand.pod +GENERATE[man/man3/BN_rand.3]=man3/BN_rand.pod +DEPEND[html/man3/BN_security_bits.html]=man3/BN_security_bits.pod +GENERATE[html/man3/BN_security_bits.html]=man3/BN_security_bits.pod +DEPEND[man/man3/BN_security_bits.3]=man3/BN_security_bits.pod +GENERATE[man/man3/BN_security_bits.3]=man3/BN_security_bits.pod +DEPEND[html/man3/BN_set_bit.html]=man3/BN_set_bit.pod +GENERATE[html/man3/BN_set_bit.html]=man3/BN_set_bit.pod +DEPEND[man/man3/BN_set_bit.3]=man3/BN_set_bit.pod +GENERATE[man/man3/BN_set_bit.3]=man3/BN_set_bit.pod +DEPEND[html/man3/BN_swap.html]=man3/BN_swap.pod +GENERATE[html/man3/BN_swap.html]=man3/BN_swap.pod +DEPEND[man/man3/BN_swap.3]=man3/BN_swap.pod +GENERATE[man/man3/BN_swap.3]=man3/BN_swap.pod +DEPEND[html/man3/BN_zero.html]=man3/BN_zero.pod +GENERATE[html/man3/BN_zero.html]=man3/BN_zero.pod +DEPEND[man/man3/BN_zero.3]=man3/BN_zero.pod +GENERATE[man/man3/BN_zero.3]=man3/BN_zero.pod +DEPEND[html/man3/BUF_MEM_new.html]=man3/BUF_MEM_new.pod +GENERATE[html/man3/BUF_MEM_new.html]=man3/BUF_MEM_new.pod +DEPEND[man/man3/BUF_MEM_new.3]=man3/BUF_MEM_new.pod +GENERATE[man/man3/BUF_MEM_new.3]=man3/BUF_MEM_new.pod +DEPEND[html/man3/CMS_EncryptedData_decrypt.html]=man3/CMS_EncryptedData_decrypt.pod +GENERATE[html/man3/CMS_EncryptedData_decrypt.html]=man3/CMS_EncryptedData_decrypt.pod +DEPEND[man/man3/CMS_EncryptedData_decrypt.3]=man3/CMS_EncryptedData_decrypt.pod +GENERATE[man/man3/CMS_EncryptedData_decrypt.3]=man3/CMS_EncryptedData_decrypt.pod +DEPEND[html/man3/CMS_EncryptedData_encrypt.html]=man3/CMS_EncryptedData_encrypt.pod +GENERATE[html/man3/CMS_EncryptedData_encrypt.html]=man3/CMS_EncryptedData_encrypt.pod +DEPEND[man/man3/CMS_EncryptedData_encrypt.3]=man3/CMS_EncryptedData_encrypt.pod +GENERATE[man/man3/CMS_EncryptedData_encrypt.3]=man3/CMS_EncryptedData_encrypt.pod +DEPEND[html/man3/CMS_EnvelopedData_create.html]=man3/CMS_EnvelopedData_create.pod +GENERATE[html/man3/CMS_EnvelopedData_create.html]=man3/CMS_EnvelopedData_create.pod +DEPEND[man/man3/CMS_EnvelopedData_create.3]=man3/CMS_EnvelopedData_create.pod +GENERATE[man/man3/CMS_EnvelopedData_create.3]=man3/CMS_EnvelopedData_create.pod +DEPEND[html/man3/CMS_add0_cert.html]=man3/CMS_add0_cert.pod +GENERATE[html/man3/CMS_add0_cert.html]=man3/CMS_add0_cert.pod +DEPEND[man/man3/CMS_add0_cert.3]=man3/CMS_add0_cert.pod +GENERATE[man/man3/CMS_add0_cert.3]=man3/CMS_add0_cert.pod +DEPEND[html/man3/CMS_add1_recipient_cert.html]=man3/CMS_add1_recipient_cert.pod +GENERATE[html/man3/CMS_add1_recipient_cert.html]=man3/CMS_add1_recipient_cert.pod +DEPEND[man/man3/CMS_add1_recipient_cert.3]=man3/CMS_add1_recipient_cert.pod +GENERATE[man/man3/CMS_add1_recipient_cert.3]=man3/CMS_add1_recipient_cert.pod +DEPEND[html/man3/CMS_add1_signer.html]=man3/CMS_add1_signer.pod +GENERATE[html/man3/CMS_add1_signer.html]=man3/CMS_add1_signer.pod +DEPEND[man/man3/CMS_add1_signer.3]=man3/CMS_add1_signer.pod +GENERATE[man/man3/CMS_add1_signer.3]=man3/CMS_add1_signer.pod +DEPEND[html/man3/CMS_compress.html]=man3/CMS_compress.pod +GENERATE[html/man3/CMS_compress.html]=man3/CMS_compress.pod +DEPEND[man/man3/CMS_compress.3]=man3/CMS_compress.pod +GENERATE[man/man3/CMS_compress.3]=man3/CMS_compress.pod +DEPEND[html/man3/CMS_data_create.html]=man3/CMS_data_create.pod +GENERATE[html/man3/CMS_data_create.html]=man3/CMS_data_create.pod +DEPEND[man/man3/CMS_data_create.3]=man3/CMS_data_create.pod +GENERATE[man/man3/CMS_data_create.3]=man3/CMS_data_create.pod +DEPEND[html/man3/CMS_decrypt.html]=man3/CMS_decrypt.pod +GENERATE[html/man3/CMS_decrypt.html]=man3/CMS_decrypt.pod +DEPEND[man/man3/CMS_decrypt.3]=man3/CMS_decrypt.pod +GENERATE[man/man3/CMS_decrypt.3]=man3/CMS_decrypt.pod +DEPEND[html/man3/CMS_digest_create.html]=man3/CMS_digest_create.pod +GENERATE[html/man3/CMS_digest_create.html]=man3/CMS_digest_create.pod +DEPEND[man/man3/CMS_digest_create.3]=man3/CMS_digest_create.pod +GENERATE[man/man3/CMS_digest_create.3]=man3/CMS_digest_create.pod +DEPEND[html/man3/CMS_encrypt.html]=man3/CMS_encrypt.pod +GENERATE[html/man3/CMS_encrypt.html]=man3/CMS_encrypt.pod +DEPEND[man/man3/CMS_encrypt.3]=man3/CMS_encrypt.pod +GENERATE[man/man3/CMS_encrypt.3]=man3/CMS_encrypt.pod +DEPEND[html/man3/CMS_final.html]=man3/CMS_final.pod +GENERATE[html/man3/CMS_final.html]=man3/CMS_final.pod +DEPEND[man/man3/CMS_final.3]=man3/CMS_final.pod +GENERATE[man/man3/CMS_final.3]=man3/CMS_final.pod +DEPEND[html/man3/CMS_get0_RecipientInfos.html]=man3/CMS_get0_RecipientInfos.pod +GENERATE[html/man3/CMS_get0_RecipientInfos.html]=man3/CMS_get0_RecipientInfos.pod +DEPEND[man/man3/CMS_get0_RecipientInfos.3]=man3/CMS_get0_RecipientInfos.pod +GENERATE[man/man3/CMS_get0_RecipientInfos.3]=man3/CMS_get0_RecipientInfos.pod +DEPEND[html/man3/CMS_get0_SignerInfos.html]=man3/CMS_get0_SignerInfos.pod +GENERATE[html/man3/CMS_get0_SignerInfos.html]=man3/CMS_get0_SignerInfos.pod +DEPEND[man/man3/CMS_get0_SignerInfos.3]=man3/CMS_get0_SignerInfos.pod +GENERATE[man/man3/CMS_get0_SignerInfos.3]=man3/CMS_get0_SignerInfos.pod +DEPEND[html/man3/CMS_get0_type.html]=man3/CMS_get0_type.pod +GENERATE[html/man3/CMS_get0_type.html]=man3/CMS_get0_type.pod +DEPEND[man/man3/CMS_get0_type.3]=man3/CMS_get0_type.pod +GENERATE[man/man3/CMS_get0_type.3]=man3/CMS_get0_type.pod +DEPEND[html/man3/CMS_get1_ReceiptRequest.html]=man3/CMS_get1_ReceiptRequest.pod +GENERATE[html/man3/CMS_get1_ReceiptRequest.html]=man3/CMS_get1_ReceiptRequest.pod +DEPEND[man/man3/CMS_get1_ReceiptRequest.3]=man3/CMS_get1_ReceiptRequest.pod +GENERATE[man/man3/CMS_get1_ReceiptRequest.3]=man3/CMS_get1_ReceiptRequest.pod +DEPEND[html/man3/CMS_sign.html]=man3/CMS_sign.pod +GENERATE[html/man3/CMS_sign.html]=man3/CMS_sign.pod +DEPEND[man/man3/CMS_sign.3]=man3/CMS_sign.pod +GENERATE[man/man3/CMS_sign.3]=man3/CMS_sign.pod +DEPEND[html/man3/CMS_sign_receipt.html]=man3/CMS_sign_receipt.pod +GENERATE[html/man3/CMS_sign_receipt.html]=man3/CMS_sign_receipt.pod +DEPEND[man/man3/CMS_sign_receipt.3]=man3/CMS_sign_receipt.pod +GENERATE[man/man3/CMS_sign_receipt.3]=man3/CMS_sign_receipt.pod +DEPEND[html/man3/CMS_uncompress.html]=man3/CMS_uncompress.pod +GENERATE[html/man3/CMS_uncompress.html]=man3/CMS_uncompress.pod +DEPEND[man/man3/CMS_uncompress.3]=man3/CMS_uncompress.pod +GENERATE[man/man3/CMS_uncompress.3]=man3/CMS_uncompress.pod +DEPEND[html/man3/CMS_verify.html]=man3/CMS_verify.pod +GENERATE[html/man3/CMS_verify.html]=man3/CMS_verify.pod +DEPEND[man/man3/CMS_verify.3]=man3/CMS_verify.pod +GENERATE[man/man3/CMS_verify.3]=man3/CMS_verify.pod +DEPEND[html/man3/CMS_verify_receipt.html]=man3/CMS_verify_receipt.pod +GENERATE[html/man3/CMS_verify_receipt.html]=man3/CMS_verify_receipt.pod +DEPEND[man/man3/CMS_verify_receipt.3]=man3/CMS_verify_receipt.pod +GENERATE[man/man3/CMS_verify_receipt.3]=man3/CMS_verify_receipt.pod +DEPEND[html/man3/CONF_modules_free.html]=man3/CONF_modules_free.pod +GENERATE[html/man3/CONF_modules_free.html]=man3/CONF_modules_free.pod +DEPEND[man/man3/CONF_modules_free.3]=man3/CONF_modules_free.pod +GENERATE[man/man3/CONF_modules_free.3]=man3/CONF_modules_free.pod +DEPEND[html/man3/CONF_modules_load_file.html]=man3/CONF_modules_load_file.pod +GENERATE[html/man3/CONF_modules_load_file.html]=man3/CONF_modules_load_file.pod +DEPEND[man/man3/CONF_modules_load_file.3]=man3/CONF_modules_load_file.pod +GENERATE[man/man3/CONF_modules_load_file.3]=man3/CONF_modules_load_file.pod +DEPEND[html/man3/CRYPTO_THREAD_run_once.html]=man3/CRYPTO_THREAD_run_once.pod +GENERATE[html/man3/CRYPTO_THREAD_run_once.html]=man3/CRYPTO_THREAD_run_once.pod +DEPEND[man/man3/CRYPTO_THREAD_run_once.3]=man3/CRYPTO_THREAD_run_once.pod +GENERATE[man/man3/CRYPTO_THREAD_run_once.3]=man3/CRYPTO_THREAD_run_once.pod +DEPEND[html/man3/CRYPTO_get_ex_new_index.html]=man3/CRYPTO_get_ex_new_index.pod +GENERATE[html/man3/CRYPTO_get_ex_new_index.html]=man3/CRYPTO_get_ex_new_index.pod +DEPEND[man/man3/CRYPTO_get_ex_new_index.3]=man3/CRYPTO_get_ex_new_index.pod +GENERATE[man/man3/CRYPTO_get_ex_new_index.3]=man3/CRYPTO_get_ex_new_index.pod +DEPEND[html/man3/CRYPTO_memcmp.html]=man3/CRYPTO_memcmp.pod +GENERATE[html/man3/CRYPTO_memcmp.html]=man3/CRYPTO_memcmp.pod +DEPEND[man/man3/CRYPTO_memcmp.3]=man3/CRYPTO_memcmp.pod +GENERATE[man/man3/CRYPTO_memcmp.3]=man3/CRYPTO_memcmp.pod +DEPEND[html/man3/CTLOG_STORE_get0_log_by_id.html]=man3/CTLOG_STORE_get0_log_by_id.pod +GENERATE[html/man3/CTLOG_STORE_get0_log_by_id.html]=man3/CTLOG_STORE_get0_log_by_id.pod +DEPEND[man/man3/CTLOG_STORE_get0_log_by_id.3]=man3/CTLOG_STORE_get0_log_by_id.pod +GENERATE[man/man3/CTLOG_STORE_get0_log_by_id.3]=man3/CTLOG_STORE_get0_log_by_id.pod +DEPEND[html/man3/CTLOG_STORE_new.html]=man3/CTLOG_STORE_new.pod +GENERATE[html/man3/CTLOG_STORE_new.html]=man3/CTLOG_STORE_new.pod +DEPEND[man/man3/CTLOG_STORE_new.3]=man3/CTLOG_STORE_new.pod +GENERATE[man/man3/CTLOG_STORE_new.3]=man3/CTLOG_STORE_new.pod +DEPEND[html/man3/CTLOG_new.html]=man3/CTLOG_new.pod +GENERATE[html/man3/CTLOG_new.html]=man3/CTLOG_new.pod +DEPEND[man/man3/CTLOG_new.3]=man3/CTLOG_new.pod +GENERATE[man/man3/CTLOG_new.3]=man3/CTLOG_new.pod +DEPEND[html/man3/CT_POLICY_EVAL_CTX_new.html]=man3/CT_POLICY_EVAL_CTX_new.pod +GENERATE[html/man3/CT_POLICY_EVAL_CTX_new.html]=man3/CT_POLICY_EVAL_CTX_new.pod +DEPEND[man/man3/CT_POLICY_EVAL_CTX_new.3]=man3/CT_POLICY_EVAL_CTX_new.pod +GENERATE[man/man3/CT_POLICY_EVAL_CTX_new.3]=man3/CT_POLICY_EVAL_CTX_new.pod +DEPEND[html/man3/DEFINE_STACK_OF.html]=man3/DEFINE_STACK_OF.pod +GENERATE[html/man3/DEFINE_STACK_OF.html]=man3/DEFINE_STACK_OF.pod +DEPEND[man/man3/DEFINE_STACK_OF.3]=man3/DEFINE_STACK_OF.pod +GENERATE[man/man3/DEFINE_STACK_OF.3]=man3/DEFINE_STACK_OF.pod +DEPEND[html/man3/DES_random_key.html]=man3/DES_random_key.pod +GENERATE[html/man3/DES_random_key.html]=man3/DES_random_key.pod +DEPEND[man/man3/DES_random_key.3]=man3/DES_random_key.pod +GENERATE[man/man3/DES_random_key.3]=man3/DES_random_key.pod +DEPEND[html/man3/DH_generate_key.html]=man3/DH_generate_key.pod +GENERATE[html/man3/DH_generate_key.html]=man3/DH_generate_key.pod +DEPEND[man/man3/DH_generate_key.3]=man3/DH_generate_key.pod +GENERATE[man/man3/DH_generate_key.3]=man3/DH_generate_key.pod +DEPEND[html/man3/DH_generate_parameters.html]=man3/DH_generate_parameters.pod +GENERATE[html/man3/DH_generate_parameters.html]=man3/DH_generate_parameters.pod +DEPEND[man/man3/DH_generate_parameters.3]=man3/DH_generate_parameters.pod +GENERATE[man/man3/DH_generate_parameters.3]=man3/DH_generate_parameters.pod +DEPEND[html/man3/DH_get0_pqg.html]=man3/DH_get0_pqg.pod +GENERATE[html/man3/DH_get0_pqg.html]=man3/DH_get0_pqg.pod +DEPEND[man/man3/DH_get0_pqg.3]=man3/DH_get0_pqg.pod +GENERATE[man/man3/DH_get0_pqg.3]=man3/DH_get0_pqg.pod +DEPEND[html/man3/DH_get_1024_160.html]=man3/DH_get_1024_160.pod +GENERATE[html/man3/DH_get_1024_160.html]=man3/DH_get_1024_160.pod +DEPEND[man/man3/DH_get_1024_160.3]=man3/DH_get_1024_160.pod +GENERATE[man/man3/DH_get_1024_160.3]=man3/DH_get_1024_160.pod +DEPEND[html/man3/DH_meth_new.html]=man3/DH_meth_new.pod +GENERATE[html/man3/DH_meth_new.html]=man3/DH_meth_new.pod +DEPEND[man/man3/DH_meth_new.3]=man3/DH_meth_new.pod +GENERATE[man/man3/DH_meth_new.3]=man3/DH_meth_new.pod +DEPEND[html/man3/DH_new.html]=man3/DH_new.pod +GENERATE[html/man3/DH_new.html]=man3/DH_new.pod +DEPEND[man/man3/DH_new.3]=man3/DH_new.pod +GENERATE[man/man3/DH_new.3]=man3/DH_new.pod +DEPEND[html/man3/DH_new_by_nid.html]=man3/DH_new_by_nid.pod +GENERATE[html/man3/DH_new_by_nid.html]=man3/DH_new_by_nid.pod +DEPEND[man/man3/DH_new_by_nid.3]=man3/DH_new_by_nid.pod +GENERATE[man/man3/DH_new_by_nid.3]=man3/DH_new_by_nid.pod +DEPEND[html/man3/DH_set_method.html]=man3/DH_set_method.pod +GENERATE[html/man3/DH_set_method.html]=man3/DH_set_method.pod +DEPEND[man/man3/DH_set_method.3]=man3/DH_set_method.pod +GENERATE[man/man3/DH_set_method.3]=man3/DH_set_method.pod +DEPEND[html/man3/DH_size.html]=man3/DH_size.pod +GENERATE[html/man3/DH_size.html]=man3/DH_size.pod +DEPEND[man/man3/DH_size.3]=man3/DH_size.pod +GENERATE[man/man3/DH_size.3]=man3/DH_size.pod +DEPEND[html/man3/DSA_SIG_new.html]=man3/DSA_SIG_new.pod +GENERATE[html/man3/DSA_SIG_new.html]=man3/DSA_SIG_new.pod +DEPEND[man/man3/DSA_SIG_new.3]=man3/DSA_SIG_new.pod +GENERATE[man/man3/DSA_SIG_new.3]=man3/DSA_SIG_new.pod +DEPEND[html/man3/DSA_do_sign.html]=man3/DSA_do_sign.pod +GENERATE[html/man3/DSA_do_sign.html]=man3/DSA_do_sign.pod +DEPEND[man/man3/DSA_do_sign.3]=man3/DSA_do_sign.pod +GENERATE[man/man3/DSA_do_sign.3]=man3/DSA_do_sign.pod +DEPEND[html/man3/DSA_dup_DH.html]=man3/DSA_dup_DH.pod +GENERATE[html/man3/DSA_dup_DH.html]=man3/DSA_dup_DH.pod +DEPEND[man/man3/DSA_dup_DH.3]=man3/DSA_dup_DH.pod +GENERATE[man/man3/DSA_dup_DH.3]=man3/DSA_dup_DH.pod +DEPEND[html/man3/DSA_generate_key.html]=man3/DSA_generate_key.pod +GENERATE[html/man3/DSA_generate_key.html]=man3/DSA_generate_key.pod +DEPEND[man/man3/DSA_generate_key.3]=man3/DSA_generate_key.pod +GENERATE[man/man3/DSA_generate_key.3]=man3/DSA_generate_key.pod +DEPEND[html/man3/DSA_generate_parameters.html]=man3/DSA_generate_parameters.pod +GENERATE[html/man3/DSA_generate_parameters.html]=man3/DSA_generate_parameters.pod +DEPEND[man/man3/DSA_generate_parameters.3]=man3/DSA_generate_parameters.pod +GENERATE[man/man3/DSA_generate_parameters.3]=man3/DSA_generate_parameters.pod +DEPEND[html/man3/DSA_get0_pqg.html]=man3/DSA_get0_pqg.pod +GENERATE[html/man3/DSA_get0_pqg.html]=man3/DSA_get0_pqg.pod +DEPEND[man/man3/DSA_get0_pqg.3]=man3/DSA_get0_pqg.pod +GENERATE[man/man3/DSA_get0_pqg.3]=man3/DSA_get0_pqg.pod +DEPEND[html/man3/DSA_meth_new.html]=man3/DSA_meth_new.pod +GENERATE[html/man3/DSA_meth_new.html]=man3/DSA_meth_new.pod +DEPEND[man/man3/DSA_meth_new.3]=man3/DSA_meth_new.pod +GENERATE[man/man3/DSA_meth_new.3]=man3/DSA_meth_new.pod +DEPEND[html/man3/DSA_new.html]=man3/DSA_new.pod +GENERATE[html/man3/DSA_new.html]=man3/DSA_new.pod +DEPEND[man/man3/DSA_new.3]=man3/DSA_new.pod +GENERATE[man/man3/DSA_new.3]=man3/DSA_new.pod +DEPEND[html/man3/DSA_set_method.html]=man3/DSA_set_method.pod +GENERATE[html/man3/DSA_set_method.html]=man3/DSA_set_method.pod +DEPEND[man/man3/DSA_set_method.3]=man3/DSA_set_method.pod +GENERATE[man/man3/DSA_set_method.3]=man3/DSA_set_method.pod +DEPEND[html/man3/DSA_sign.html]=man3/DSA_sign.pod +GENERATE[html/man3/DSA_sign.html]=man3/DSA_sign.pod +DEPEND[man/man3/DSA_sign.3]=man3/DSA_sign.pod +GENERATE[man/man3/DSA_sign.3]=man3/DSA_sign.pod +DEPEND[html/man3/DSA_size.html]=man3/DSA_size.pod +GENERATE[html/man3/DSA_size.html]=man3/DSA_size.pod +DEPEND[man/man3/DSA_size.3]=man3/DSA_size.pod +GENERATE[man/man3/DSA_size.3]=man3/DSA_size.pod +DEPEND[html/man3/DTLS_get_data_mtu.html]=man3/DTLS_get_data_mtu.pod +GENERATE[html/man3/DTLS_get_data_mtu.html]=man3/DTLS_get_data_mtu.pod +DEPEND[man/man3/DTLS_get_data_mtu.3]=man3/DTLS_get_data_mtu.pod +GENERATE[man/man3/DTLS_get_data_mtu.3]=man3/DTLS_get_data_mtu.pod +DEPEND[html/man3/DTLS_set_timer_cb.html]=man3/DTLS_set_timer_cb.pod +GENERATE[html/man3/DTLS_set_timer_cb.html]=man3/DTLS_set_timer_cb.pod +DEPEND[man/man3/DTLS_set_timer_cb.3]=man3/DTLS_set_timer_cb.pod +GENERATE[man/man3/DTLS_set_timer_cb.3]=man3/DTLS_set_timer_cb.pod +DEPEND[html/man3/DTLSv1_listen.html]=man3/DTLSv1_listen.pod +GENERATE[html/man3/DTLSv1_listen.html]=man3/DTLSv1_listen.pod +DEPEND[man/man3/DTLSv1_listen.3]=man3/DTLSv1_listen.pod +GENERATE[man/man3/DTLSv1_listen.3]=man3/DTLSv1_listen.pod +DEPEND[html/man3/ECDSA_SIG_new.html]=man3/ECDSA_SIG_new.pod +GENERATE[html/man3/ECDSA_SIG_new.html]=man3/ECDSA_SIG_new.pod +DEPEND[man/man3/ECDSA_SIG_new.3]=man3/ECDSA_SIG_new.pod +GENERATE[man/man3/ECDSA_SIG_new.3]=man3/ECDSA_SIG_new.pod +DEPEND[html/man3/ECDSA_sign.html]=man3/ECDSA_sign.pod +GENERATE[html/man3/ECDSA_sign.html]=man3/ECDSA_sign.pod +DEPEND[man/man3/ECDSA_sign.3]=man3/ECDSA_sign.pod +GENERATE[man/man3/ECDSA_sign.3]=man3/ECDSA_sign.pod +DEPEND[html/man3/ECPKParameters_print.html]=man3/ECPKParameters_print.pod +GENERATE[html/man3/ECPKParameters_print.html]=man3/ECPKParameters_print.pod +DEPEND[man/man3/ECPKParameters_print.3]=man3/ECPKParameters_print.pod +GENERATE[man/man3/ECPKParameters_print.3]=man3/ECPKParameters_print.pod +DEPEND[html/man3/EC_GFp_simple_method.html]=man3/EC_GFp_simple_method.pod +GENERATE[html/man3/EC_GFp_simple_method.html]=man3/EC_GFp_simple_method.pod +DEPEND[man/man3/EC_GFp_simple_method.3]=man3/EC_GFp_simple_method.pod +GENERATE[man/man3/EC_GFp_simple_method.3]=man3/EC_GFp_simple_method.pod +DEPEND[html/man3/EC_GROUP_copy.html]=man3/EC_GROUP_copy.pod +GENERATE[html/man3/EC_GROUP_copy.html]=man3/EC_GROUP_copy.pod +DEPEND[man/man3/EC_GROUP_copy.3]=man3/EC_GROUP_copy.pod +GENERATE[man/man3/EC_GROUP_copy.3]=man3/EC_GROUP_copy.pod +DEPEND[html/man3/EC_GROUP_new.html]=man3/EC_GROUP_new.pod +GENERATE[html/man3/EC_GROUP_new.html]=man3/EC_GROUP_new.pod +DEPEND[man/man3/EC_GROUP_new.3]=man3/EC_GROUP_new.pod +GENERATE[man/man3/EC_GROUP_new.3]=man3/EC_GROUP_new.pod +DEPEND[html/man3/EC_KEY_get_enc_flags.html]=man3/EC_KEY_get_enc_flags.pod +GENERATE[html/man3/EC_KEY_get_enc_flags.html]=man3/EC_KEY_get_enc_flags.pod +DEPEND[man/man3/EC_KEY_get_enc_flags.3]=man3/EC_KEY_get_enc_flags.pod +GENERATE[man/man3/EC_KEY_get_enc_flags.3]=man3/EC_KEY_get_enc_flags.pod +DEPEND[html/man3/EC_KEY_new.html]=man3/EC_KEY_new.pod +GENERATE[html/man3/EC_KEY_new.html]=man3/EC_KEY_new.pod +DEPEND[man/man3/EC_KEY_new.3]=man3/EC_KEY_new.pod +GENERATE[man/man3/EC_KEY_new.3]=man3/EC_KEY_new.pod +DEPEND[html/man3/EC_POINT_add.html]=man3/EC_POINT_add.pod +GENERATE[html/man3/EC_POINT_add.html]=man3/EC_POINT_add.pod +DEPEND[man/man3/EC_POINT_add.3]=man3/EC_POINT_add.pod +GENERATE[man/man3/EC_POINT_add.3]=man3/EC_POINT_add.pod +DEPEND[html/man3/EC_POINT_new.html]=man3/EC_POINT_new.pod +GENERATE[html/man3/EC_POINT_new.html]=man3/EC_POINT_new.pod +DEPEND[man/man3/EC_POINT_new.3]=man3/EC_POINT_new.pod +GENERATE[man/man3/EC_POINT_new.3]=man3/EC_POINT_new.pod +DEPEND[html/man3/ENGINE_add.html]=man3/ENGINE_add.pod +GENERATE[html/man3/ENGINE_add.html]=man3/ENGINE_add.pod +DEPEND[man/man3/ENGINE_add.3]=man3/ENGINE_add.pod +GENERATE[man/man3/ENGINE_add.3]=man3/ENGINE_add.pod +DEPEND[html/man3/ERR_GET_LIB.html]=man3/ERR_GET_LIB.pod +GENERATE[html/man3/ERR_GET_LIB.html]=man3/ERR_GET_LIB.pod +DEPEND[man/man3/ERR_GET_LIB.3]=man3/ERR_GET_LIB.pod +GENERATE[man/man3/ERR_GET_LIB.3]=man3/ERR_GET_LIB.pod +DEPEND[html/man3/ERR_clear_error.html]=man3/ERR_clear_error.pod +GENERATE[html/man3/ERR_clear_error.html]=man3/ERR_clear_error.pod +DEPEND[man/man3/ERR_clear_error.3]=man3/ERR_clear_error.pod +GENERATE[man/man3/ERR_clear_error.3]=man3/ERR_clear_error.pod +DEPEND[html/man3/ERR_error_string.html]=man3/ERR_error_string.pod +GENERATE[html/man3/ERR_error_string.html]=man3/ERR_error_string.pod +DEPEND[man/man3/ERR_error_string.3]=man3/ERR_error_string.pod +GENERATE[man/man3/ERR_error_string.3]=man3/ERR_error_string.pod +DEPEND[html/man3/ERR_get_error.html]=man3/ERR_get_error.pod +GENERATE[html/man3/ERR_get_error.html]=man3/ERR_get_error.pod +DEPEND[man/man3/ERR_get_error.3]=man3/ERR_get_error.pod +GENERATE[man/man3/ERR_get_error.3]=man3/ERR_get_error.pod +DEPEND[html/man3/ERR_load_crypto_strings.html]=man3/ERR_load_crypto_strings.pod +GENERATE[html/man3/ERR_load_crypto_strings.html]=man3/ERR_load_crypto_strings.pod +DEPEND[man/man3/ERR_load_crypto_strings.3]=man3/ERR_load_crypto_strings.pod +GENERATE[man/man3/ERR_load_crypto_strings.3]=man3/ERR_load_crypto_strings.pod +DEPEND[html/man3/ERR_load_strings.html]=man3/ERR_load_strings.pod +GENERATE[html/man3/ERR_load_strings.html]=man3/ERR_load_strings.pod +DEPEND[man/man3/ERR_load_strings.3]=man3/ERR_load_strings.pod +GENERATE[man/man3/ERR_load_strings.3]=man3/ERR_load_strings.pod +DEPEND[html/man3/ERR_new.html]=man3/ERR_new.pod +GENERATE[html/man3/ERR_new.html]=man3/ERR_new.pod +DEPEND[man/man3/ERR_new.3]=man3/ERR_new.pod +GENERATE[man/man3/ERR_new.3]=man3/ERR_new.pod +DEPEND[html/man3/ERR_print_errors.html]=man3/ERR_print_errors.pod +GENERATE[html/man3/ERR_print_errors.html]=man3/ERR_print_errors.pod +DEPEND[man/man3/ERR_print_errors.3]=man3/ERR_print_errors.pod +GENERATE[man/man3/ERR_print_errors.3]=man3/ERR_print_errors.pod +DEPEND[html/man3/ERR_put_error.html]=man3/ERR_put_error.pod +GENERATE[html/man3/ERR_put_error.html]=man3/ERR_put_error.pod +DEPEND[man/man3/ERR_put_error.3]=man3/ERR_put_error.pod +GENERATE[man/man3/ERR_put_error.3]=man3/ERR_put_error.pod +DEPEND[html/man3/ERR_remove_state.html]=man3/ERR_remove_state.pod +GENERATE[html/man3/ERR_remove_state.html]=man3/ERR_remove_state.pod +DEPEND[man/man3/ERR_remove_state.3]=man3/ERR_remove_state.pod +GENERATE[man/man3/ERR_remove_state.3]=man3/ERR_remove_state.pod +DEPEND[html/man3/ERR_set_mark.html]=man3/ERR_set_mark.pod +GENERATE[html/man3/ERR_set_mark.html]=man3/ERR_set_mark.pod +DEPEND[man/man3/ERR_set_mark.3]=man3/ERR_set_mark.pod +GENERATE[man/man3/ERR_set_mark.3]=man3/ERR_set_mark.pod +DEPEND[html/man3/EVP_ASYM_CIPHER_free.html]=man3/EVP_ASYM_CIPHER_free.pod +GENERATE[html/man3/EVP_ASYM_CIPHER_free.html]=man3/EVP_ASYM_CIPHER_free.pod +DEPEND[man/man3/EVP_ASYM_CIPHER_free.3]=man3/EVP_ASYM_CIPHER_free.pod +GENERATE[man/man3/EVP_ASYM_CIPHER_free.3]=man3/EVP_ASYM_CIPHER_free.pod +DEPEND[html/man3/EVP_BytesToKey.html]=man3/EVP_BytesToKey.pod +GENERATE[html/man3/EVP_BytesToKey.html]=man3/EVP_BytesToKey.pod +DEPEND[man/man3/EVP_BytesToKey.3]=man3/EVP_BytesToKey.pod +GENERATE[man/man3/EVP_BytesToKey.3]=man3/EVP_BytesToKey.pod +DEPEND[html/man3/EVP_CIPHER_CTX_get_cipher_data.html]=man3/EVP_CIPHER_CTX_get_cipher_data.pod +GENERATE[html/man3/EVP_CIPHER_CTX_get_cipher_data.html]=man3/EVP_CIPHER_CTX_get_cipher_data.pod +DEPEND[man/man3/EVP_CIPHER_CTX_get_cipher_data.3]=man3/EVP_CIPHER_CTX_get_cipher_data.pod +GENERATE[man/man3/EVP_CIPHER_CTX_get_cipher_data.3]=man3/EVP_CIPHER_CTX_get_cipher_data.pod +DEPEND[html/man3/EVP_CIPHER_CTX_get_original_iv.html]=man3/EVP_CIPHER_CTX_get_original_iv.pod +GENERATE[html/man3/EVP_CIPHER_CTX_get_original_iv.html]=man3/EVP_CIPHER_CTX_get_original_iv.pod +DEPEND[man/man3/EVP_CIPHER_CTX_get_original_iv.3]=man3/EVP_CIPHER_CTX_get_original_iv.pod +GENERATE[man/man3/EVP_CIPHER_CTX_get_original_iv.3]=man3/EVP_CIPHER_CTX_get_original_iv.pod +DEPEND[html/man3/EVP_CIPHER_meth_new.html]=man3/EVP_CIPHER_meth_new.pod +GENERATE[html/man3/EVP_CIPHER_meth_new.html]=man3/EVP_CIPHER_meth_new.pod +DEPEND[man/man3/EVP_CIPHER_meth_new.3]=man3/EVP_CIPHER_meth_new.pod +GENERATE[man/man3/EVP_CIPHER_meth_new.3]=man3/EVP_CIPHER_meth_new.pod +DEPEND[html/man3/EVP_DigestInit.html]=man3/EVP_DigestInit.pod +GENERATE[html/man3/EVP_DigestInit.html]=man3/EVP_DigestInit.pod +DEPEND[man/man3/EVP_DigestInit.3]=man3/EVP_DigestInit.pod +GENERATE[man/man3/EVP_DigestInit.3]=man3/EVP_DigestInit.pod +DEPEND[html/man3/EVP_DigestSignInit.html]=man3/EVP_DigestSignInit.pod +GENERATE[html/man3/EVP_DigestSignInit.html]=man3/EVP_DigestSignInit.pod +DEPEND[man/man3/EVP_DigestSignInit.3]=man3/EVP_DigestSignInit.pod +GENERATE[man/man3/EVP_DigestSignInit.3]=man3/EVP_DigestSignInit.pod +DEPEND[html/man3/EVP_DigestVerifyInit.html]=man3/EVP_DigestVerifyInit.pod +GENERATE[html/man3/EVP_DigestVerifyInit.html]=man3/EVP_DigestVerifyInit.pod +DEPEND[man/man3/EVP_DigestVerifyInit.3]=man3/EVP_DigestVerifyInit.pod +GENERATE[man/man3/EVP_DigestVerifyInit.3]=man3/EVP_DigestVerifyInit.pod +DEPEND[html/man3/EVP_EncodeInit.html]=man3/EVP_EncodeInit.pod +GENERATE[html/man3/EVP_EncodeInit.html]=man3/EVP_EncodeInit.pod +DEPEND[man/man3/EVP_EncodeInit.3]=man3/EVP_EncodeInit.pod +GENERATE[man/man3/EVP_EncodeInit.3]=man3/EVP_EncodeInit.pod +DEPEND[html/man3/EVP_EncryptInit.html]=man3/EVP_EncryptInit.pod +GENERATE[html/man3/EVP_EncryptInit.html]=man3/EVP_EncryptInit.pod +DEPEND[man/man3/EVP_EncryptInit.3]=man3/EVP_EncryptInit.pod +GENERATE[man/man3/EVP_EncryptInit.3]=man3/EVP_EncryptInit.pod +DEPEND[html/man3/EVP_KDF.html]=man3/EVP_KDF.pod +GENERATE[html/man3/EVP_KDF.html]=man3/EVP_KDF.pod +DEPEND[man/man3/EVP_KDF.3]=man3/EVP_KDF.pod +GENERATE[man/man3/EVP_KDF.3]=man3/EVP_KDF.pod +DEPEND[html/man3/EVP_KEM_free.html]=man3/EVP_KEM_free.pod +GENERATE[html/man3/EVP_KEM_free.html]=man3/EVP_KEM_free.pod +DEPEND[man/man3/EVP_KEM_free.3]=man3/EVP_KEM_free.pod +GENERATE[man/man3/EVP_KEM_free.3]=man3/EVP_KEM_free.pod +DEPEND[html/man3/EVP_KEYEXCH_free.html]=man3/EVP_KEYEXCH_free.pod +GENERATE[html/man3/EVP_KEYEXCH_free.html]=man3/EVP_KEYEXCH_free.pod +DEPEND[man/man3/EVP_KEYEXCH_free.3]=man3/EVP_KEYEXCH_free.pod +GENERATE[man/man3/EVP_KEYEXCH_free.3]=man3/EVP_KEYEXCH_free.pod +DEPEND[html/man3/EVP_KEYMGMT.html]=man3/EVP_KEYMGMT.pod +GENERATE[html/man3/EVP_KEYMGMT.html]=man3/EVP_KEYMGMT.pod +DEPEND[man/man3/EVP_KEYMGMT.3]=man3/EVP_KEYMGMT.pod +GENERATE[man/man3/EVP_KEYMGMT.3]=man3/EVP_KEYMGMT.pod +DEPEND[html/man3/EVP_MAC.html]=man3/EVP_MAC.pod +GENERATE[html/man3/EVP_MAC.html]=man3/EVP_MAC.pod +DEPEND[man/man3/EVP_MAC.3]=man3/EVP_MAC.pod +GENERATE[man/man3/EVP_MAC.3]=man3/EVP_MAC.pod +DEPEND[html/man3/EVP_MD_meth_new.html]=man3/EVP_MD_meth_new.pod +GENERATE[html/man3/EVP_MD_meth_new.html]=man3/EVP_MD_meth_new.pod +DEPEND[man/man3/EVP_MD_meth_new.3]=man3/EVP_MD_meth_new.pod +GENERATE[man/man3/EVP_MD_meth_new.3]=man3/EVP_MD_meth_new.pod +DEPEND[html/man3/EVP_OpenInit.html]=man3/EVP_OpenInit.pod +GENERATE[html/man3/EVP_OpenInit.html]=man3/EVP_OpenInit.pod +DEPEND[man/man3/EVP_OpenInit.3]=man3/EVP_OpenInit.pod +GENERATE[man/man3/EVP_OpenInit.3]=man3/EVP_OpenInit.pod +DEPEND[html/man3/EVP_PBE_CipherInit.html]=man3/EVP_PBE_CipherInit.pod +GENERATE[html/man3/EVP_PBE_CipherInit.html]=man3/EVP_PBE_CipherInit.pod +DEPEND[man/man3/EVP_PBE_CipherInit.3]=man3/EVP_PBE_CipherInit.pod +GENERATE[man/man3/EVP_PBE_CipherInit.3]=man3/EVP_PBE_CipherInit.pod +DEPEND[html/man3/EVP_PKEY2PKCS8.html]=man3/EVP_PKEY2PKCS8.pod +GENERATE[html/man3/EVP_PKEY2PKCS8.html]=man3/EVP_PKEY2PKCS8.pod +DEPEND[man/man3/EVP_PKEY2PKCS8.3]=man3/EVP_PKEY2PKCS8.pod +GENERATE[man/man3/EVP_PKEY2PKCS8.3]=man3/EVP_PKEY2PKCS8.pod +DEPEND[html/man3/EVP_PKEY_ASN1_METHOD.html]=man3/EVP_PKEY_ASN1_METHOD.pod +GENERATE[html/man3/EVP_PKEY_ASN1_METHOD.html]=man3/EVP_PKEY_ASN1_METHOD.pod +DEPEND[man/man3/EVP_PKEY_ASN1_METHOD.3]=man3/EVP_PKEY_ASN1_METHOD.pod +GENERATE[man/man3/EVP_PKEY_ASN1_METHOD.3]=man3/EVP_PKEY_ASN1_METHOD.pod +DEPEND[html/man3/EVP_PKEY_CTX_ctrl.html]=man3/EVP_PKEY_CTX_ctrl.pod +GENERATE[html/man3/EVP_PKEY_CTX_ctrl.html]=man3/EVP_PKEY_CTX_ctrl.pod +DEPEND[man/man3/EVP_PKEY_CTX_ctrl.3]=man3/EVP_PKEY_CTX_ctrl.pod +GENERATE[man/man3/EVP_PKEY_CTX_ctrl.3]=man3/EVP_PKEY_CTX_ctrl.pod +DEPEND[html/man3/EVP_PKEY_CTX_get0_libctx.html]=man3/EVP_PKEY_CTX_get0_libctx.pod +GENERATE[html/man3/EVP_PKEY_CTX_get0_libctx.html]=man3/EVP_PKEY_CTX_get0_libctx.pod +DEPEND[man/man3/EVP_PKEY_CTX_get0_libctx.3]=man3/EVP_PKEY_CTX_get0_libctx.pod +GENERATE[man/man3/EVP_PKEY_CTX_get0_libctx.3]=man3/EVP_PKEY_CTX_get0_libctx.pod +DEPEND[html/man3/EVP_PKEY_CTX_get0_pkey.html]=man3/EVP_PKEY_CTX_get0_pkey.pod +GENERATE[html/man3/EVP_PKEY_CTX_get0_pkey.html]=man3/EVP_PKEY_CTX_get0_pkey.pod +DEPEND[man/man3/EVP_PKEY_CTX_get0_pkey.3]=man3/EVP_PKEY_CTX_get0_pkey.pod +GENERATE[man/man3/EVP_PKEY_CTX_get0_pkey.3]=man3/EVP_PKEY_CTX_get0_pkey.pod +DEPEND[html/man3/EVP_PKEY_CTX_new.html]=man3/EVP_PKEY_CTX_new.pod +GENERATE[html/man3/EVP_PKEY_CTX_new.html]=man3/EVP_PKEY_CTX_new.pod +DEPEND[man/man3/EVP_PKEY_CTX_new.3]=man3/EVP_PKEY_CTX_new.pod +GENERATE[man/man3/EVP_PKEY_CTX_new.3]=man3/EVP_PKEY_CTX_new.pod +DEPEND[html/man3/EVP_PKEY_CTX_set1_pbe_pass.html]=man3/EVP_PKEY_CTX_set1_pbe_pass.pod +GENERATE[html/man3/EVP_PKEY_CTX_set1_pbe_pass.html]=man3/EVP_PKEY_CTX_set1_pbe_pass.pod +DEPEND[man/man3/EVP_PKEY_CTX_set1_pbe_pass.3]=man3/EVP_PKEY_CTX_set1_pbe_pass.pod +GENERATE[man/man3/EVP_PKEY_CTX_set1_pbe_pass.3]=man3/EVP_PKEY_CTX_set1_pbe_pass.pod +DEPEND[html/man3/EVP_PKEY_CTX_set_hkdf_md.html]=man3/EVP_PKEY_CTX_set_hkdf_md.pod +GENERATE[html/man3/EVP_PKEY_CTX_set_hkdf_md.html]=man3/EVP_PKEY_CTX_set_hkdf_md.pod +DEPEND[man/man3/EVP_PKEY_CTX_set_hkdf_md.3]=man3/EVP_PKEY_CTX_set_hkdf_md.pod +GENERATE[man/man3/EVP_PKEY_CTX_set_hkdf_md.3]=man3/EVP_PKEY_CTX_set_hkdf_md.pod +DEPEND[html/man3/EVP_PKEY_CTX_set_params.html]=man3/EVP_PKEY_CTX_set_params.pod +GENERATE[html/man3/EVP_PKEY_CTX_set_params.html]=man3/EVP_PKEY_CTX_set_params.pod +DEPEND[man/man3/EVP_PKEY_CTX_set_params.3]=man3/EVP_PKEY_CTX_set_params.pod +GENERATE[man/man3/EVP_PKEY_CTX_set_params.3]=man3/EVP_PKEY_CTX_set_params.pod +DEPEND[html/man3/EVP_PKEY_CTX_set_rsa_pss_keygen_md.html]=man3/EVP_PKEY_CTX_set_rsa_pss_keygen_md.pod +GENERATE[html/man3/EVP_PKEY_CTX_set_rsa_pss_keygen_md.html]=man3/EVP_PKEY_CTX_set_rsa_pss_keygen_md.pod +DEPEND[man/man3/EVP_PKEY_CTX_set_rsa_pss_keygen_md.3]=man3/EVP_PKEY_CTX_set_rsa_pss_keygen_md.pod +GENERATE[man/man3/EVP_PKEY_CTX_set_rsa_pss_keygen_md.3]=man3/EVP_PKEY_CTX_set_rsa_pss_keygen_md.pod +DEPEND[html/man3/EVP_PKEY_CTX_set_scrypt_N.html]=man3/EVP_PKEY_CTX_set_scrypt_N.pod +GENERATE[html/man3/EVP_PKEY_CTX_set_scrypt_N.html]=man3/EVP_PKEY_CTX_set_scrypt_N.pod +DEPEND[man/man3/EVP_PKEY_CTX_set_scrypt_N.3]=man3/EVP_PKEY_CTX_set_scrypt_N.pod +GENERATE[man/man3/EVP_PKEY_CTX_set_scrypt_N.3]=man3/EVP_PKEY_CTX_set_scrypt_N.pod +DEPEND[html/man3/EVP_PKEY_CTX_set_tls1_prf_md.html]=man3/EVP_PKEY_CTX_set_tls1_prf_md.pod +GENERATE[html/man3/EVP_PKEY_CTX_set_tls1_prf_md.html]=man3/EVP_PKEY_CTX_set_tls1_prf_md.pod +DEPEND[man/man3/EVP_PKEY_CTX_set_tls1_prf_md.3]=man3/EVP_PKEY_CTX_set_tls1_prf_md.pod +GENERATE[man/man3/EVP_PKEY_CTX_set_tls1_prf_md.3]=man3/EVP_PKEY_CTX_set_tls1_prf_md.pod +DEPEND[html/man3/EVP_PKEY_asn1_get_count.html]=man3/EVP_PKEY_asn1_get_count.pod +GENERATE[html/man3/EVP_PKEY_asn1_get_count.html]=man3/EVP_PKEY_asn1_get_count.pod +DEPEND[man/man3/EVP_PKEY_asn1_get_count.3]=man3/EVP_PKEY_asn1_get_count.pod +GENERATE[man/man3/EVP_PKEY_asn1_get_count.3]=man3/EVP_PKEY_asn1_get_count.pod +DEPEND[html/man3/EVP_PKEY_check.html]=man3/EVP_PKEY_check.pod +GENERATE[html/man3/EVP_PKEY_check.html]=man3/EVP_PKEY_check.pod +DEPEND[man/man3/EVP_PKEY_check.3]=man3/EVP_PKEY_check.pod +GENERATE[man/man3/EVP_PKEY_check.3]=man3/EVP_PKEY_check.pod +DEPEND[html/man3/EVP_PKEY_copy_parameters.html]=man3/EVP_PKEY_copy_parameters.pod +GENERATE[html/man3/EVP_PKEY_copy_parameters.html]=man3/EVP_PKEY_copy_parameters.pod +DEPEND[man/man3/EVP_PKEY_copy_parameters.3]=man3/EVP_PKEY_copy_parameters.pod +GENERATE[man/man3/EVP_PKEY_copy_parameters.3]=man3/EVP_PKEY_copy_parameters.pod +DEPEND[html/man3/EVP_PKEY_decapsulate.html]=man3/EVP_PKEY_decapsulate.pod +GENERATE[html/man3/EVP_PKEY_decapsulate.html]=man3/EVP_PKEY_decapsulate.pod +DEPEND[man/man3/EVP_PKEY_decapsulate.3]=man3/EVP_PKEY_decapsulate.pod +GENERATE[man/man3/EVP_PKEY_decapsulate.3]=man3/EVP_PKEY_decapsulate.pod +DEPEND[html/man3/EVP_PKEY_decrypt.html]=man3/EVP_PKEY_decrypt.pod +GENERATE[html/man3/EVP_PKEY_decrypt.html]=man3/EVP_PKEY_decrypt.pod +DEPEND[man/man3/EVP_PKEY_decrypt.3]=man3/EVP_PKEY_decrypt.pod +GENERATE[man/man3/EVP_PKEY_decrypt.3]=man3/EVP_PKEY_decrypt.pod +DEPEND[html/man3/EVP_PKEY_derive.html]=man3/EVP_PKEY_derive.pod +GENERATE[html/man3/EVP_PKEY_derive.html]=man3/EVP_PKEY_derive.pod +DEPEND[man/man3/EVP_PKEY_derive.3]=man3/EVP_PKEY_derive.pod +GENERATE[man/man3/EVP_PKEY_derive.3]=man3/EVP_PKEY_derive.pod +DEPEND[html/man3/EVP_PKEY_digestsign_supports_digest.html]=man3/EVP_PKEY_digestsign_supports_digest.pod +GENERATE[html/man3/EVP_PKEY_digestsign_supports_digest.html]=man3/EVP_PKEY_digestsign_supports_digest.pod +DEPEND[man/man3/EVP_PKEY_digestsign_supports_digest.3]=man3/EVP_PKEY_digestsign_supports_digest.pod +GENERATE[man/man3/EVP_PKEY_digestsign_supports_digest.3]=man3/EVP_PKEY_digestsign_supports_digest.pod +DEPEND[html/man3/EVP_PKEY_encapsulate.html]=man3/EVP_PKEY_encapsulate.pod +GENERATE[html/man3/EVP_PKEY_encapsulate.html]=man3/EVP_PKEY_encapsulate.pod +DEPEND[man/man3/EVP_PKEY_encapsulate.3]=man3/EVP_PKEY_encapsulate.pod +GENERATE[man/man3/EVP_PKEY_encapsulate.3]=man3/EVP_PKEY_encapsulate.pod +DEPEND[html/man3/EVP_PKEY_encrypt.html]=man3/EVP_PKEY_encrypt.pod +GENERATE[html/man3/EVP_PKEY_encrypt.html]=man3/EVP_PKEY_encrypt.pod +DEPEND[man/man3/EVP_PKEY_encrypt.3]=man3/EVP_PKEY_encrypt.pod +GENERATE[man/man3/EVP_PKEY_encrypt.3]=man3/EVP_PKEY_encrypt.pod +DEPEND[html/man3/EVP_PKEY_fromdata.html]=man3/EVP_PKEY_fromdata.pod +GENERATE[html/man3/EVP_PKEY_fromdata.html]=man3/EVP_PKEY_fromdata.pod +DEPEND[man/man3/EVP_PKEY_fromdata.3]=man3/EVP_PKEY_fromdata.pod +GENERATE[man/man3/EVP_PKEY_fromdata.3]=man3/EVP_PKEY_fromdata.pod +DEPEND[html/man3/EVP_PKEY_get_default_digest_nid.html]=man3/EVP_PKEY_get_default_digest_nid.pod +GENERATE[html/man3/EVP_PKEY_get_default_digest_nid.html]=man3/EVP_PKEY_get_default_digest_nid.pod +DEPEND[man/man3/EVP_PKEY_get_default_digest_nid.3]=man3/EVP_PKEY_get_default_digest_nid.pod +GENERATE[man/man3/EVP_PKEY_get_default_digest_nid.3]=man3/EVP_PKEY_get_default_digest_nid.pod +DEPEND[html/man3/EVP_PKEY_get_field_type.html]=man3/EVP_PKEY_get_field_type.pod +GENERATE[html/man3/EVP_PKEY_get_field_type.html]=man3/EVP_PKEY_get_field_type.pod +DEPEND[man/man3/EVP_PKEY_get_field_type.3]=man3/EVP_PKEY_get_field_type.pod +GENERATE[man/man3/EVP_PKEY_get_field_type.3]=man3/EVP_PKEY_get_field_type.pod +DEPEND[html/man3/EVP_PKEY_get_group_name.html]=man3/EVP_PKEY_get_group_name.pod +GENERATE[html/man3/EVP_PKEY_get_group_name.html]=man3/EVP_PKEY_get_group_name.pod +DEPEND[man/man3/EVP_PKEY_get_group_name.3]=man3/EVP_PKEY_get_group_name.pod +GENERATE[man/man3/EVP_PKEY_get_group_name.3]=man3/EVP_PKEY_get_group_name.pod +DEPEND[html/man3/EVP_PKEY_get_size.html]=man3/EVP_PKEY_get_size.pod +GENERATE[html/man3/EVP_PKEY_get_size.html]=man3/EVP_PKEY_get_size.pod +DEPEND[man/man3/EVP_PKEY_get_size.3]=man3/EVP_PKEY_get_size.pod +GENERATE[man/man3/EVP_PKEY_get_size.3]=man3/EVP_PKEY_get_size.pod +DEPEND[html/man3/EVP_PKEY_gettable_params.html]=man3/EVP_PKEY_gettable_params.pod +GENERATE[html/man3/EVP_PKEY_gettable_params.html]=man3/EVP_PKEY_gettable_params.pod +DEPEND[man/man3/EVP_PKEY_gettable_params.3]=man3/EVP_PKEY_gettable_params.pod +GENERATE[man/man3/EVP_PKEY_gettable_params.3]=man3/EVP_PKEY_gettable_params.pod +DEPEND[html/man3/EVP_PKEY_is_a.html]=man3/EVP_PKEY_is_a.pod +GENERATE[html/man3/EVP_PKEY_is_a.html]=man3/EVP_PKEY_is_a.pod +DEPEND[man/man3/EVP_PKEY_is_a.3]=man3/EVP_PKEY_is_a.pod +GENERATE[man/man3/EVP_PKEY_is_a.3]=man3/EVP_PKEY_is_a.pod +DEPEND[html/man3/EVP_PKEY_keygen.html]=man3/EVP_PKEY_keygen.pod +GENERATE[html/man3/EVP_PKEY_keygen.html]=man3/EVP_PKEY_keygen.pod +DEPEND[man/man3/EVP_PKEY_keygen.3]=man3/EVP_PKEY_keygen.pod +GENERATE[man/man3/EVP_PKEY_keygen.3]=man3/EVP_PKEY_keygen.pod +DEPEND[html/man3/EVP_PKEY_meth_get_count.html]=man3/EVP_PKEY_meth_get_count.pod +GENERATE[html/man3/EVP_PKEY_meth_get_count.html]=man3/EVP_PKEY_meth_get_count.pod +DEPEND[man/man3/EVP_PKEY_meth_get_count.3]=man3/EVP_PKEY_meth_get_count.pod +GENERATE[man/man3/EVP_PKEY_meth_get_count.3]=man3/EVP_PKEY_meth_get_count.pod +DEPEND[html/man3/EVP_PKEY_meth_new.html]=man3/EVP_PKEY_meth_new.pod +GENERATE[html/man3/EVP_PKEY_meth_new.html]=man3/EVP_PKEY_meth_new.pod +DEPEND[man/man3/EVP_PKEY_meth_new.3]=man3/EVP_PKEY_meth_new.pod +GENERATE[man/man3/EVP_PKEY_meth_new.3]=man3/EVP_PKEY_meth_new.pod +DEPEND[html/man3/EVP_PKEY_new.html]=man3/EVP_PKEY_new.pod +GENERATE[html/man3/EVP_PKEY_new.html]=man3/EVP_PKEY_new.pod +DEPEND[man/man3/EVP_PKEY_new.3]=man3/EVP_PKEY_new.pod +GENERATE[man/man3/EVP_PKEY_new.3]=man3/EVP_PKEY_new.pod +DEPEND[html/man3/EVP_PKEY_print_private.html]=man3/EVP_PKEY_print_private.pod +GENERATE[html/man3/EVP_PKEY_print_private.html]=man3/EVP_PKEY_print_private.pod +DEPEND[man/man3/EVP_PKEY_print_private.3]=man3/EVP_PKEY_print_private.pod +GENERATE[man/man3/EVP_PKEY_print_private.3]=man3/EVP_PKEY_print_private.pod +DEPEND[html/man3/EVP_PKEY_set1_RSA.html]=man3/EVP_PKEY_set1_RSA.pod +GENERATE[html/man3/EVP_PKEY_set1_RSA.html]=man3/EVP_PKEY_set1_RSA.pod +DEPEND[man/man3/EVP_PKEY_set1_RSA.3]=man3/EVP_PKEY_set1_RSA.pod +GENERATE[man/man3/EVP_PKEY_set1_RSA.3]=man3/EVP_PKEY_set1_RSA.pod +DEPEND[html/man3/EVP_PKEY_set1_encoded_public_key.html]=man3/EVP_PKEY_set1_encoded_public_key.pod +GENERATE[html/man3/EVP_PKEY_set1_encoded_public_key.html]=man3/EVP_PKEY_set1_encoded_public_key.pod +DEPEND[man/man3/EVP_PKEY_set1_encoded_public_key.3]=man3/EVP_PKEY_set1_encoded_public_key.pod +GENERATE[man/man3/EVP_PKEY_set1_encoded_public_key.3]=man3/EVP_PKEY_set1_encoded_public_key.pod +DEPEND[html/man3/EVP_PKEY_set_type.html]=man3/EVP_PKEY_set_type.pod +GENERATE[html/man3/EVP_PKEY_set_type.html]=man3/EVP_PKEY_set_type.pod +DEPEND[man/man3/EVP_PKEY_set_type.3]=man3/EVP_PKEY_set_type.pod +GENERATE[man/man3/EVP_PKEY_set_type.3]=man3/EVP_PKEY_set_type.pod +DEPEND[html/man3/EVP_PKEY_settable_params.html]=man3/EVP_PKEY_settable_params.pod +GENERATE[html/man3/EVP_PKEY_settable_params.html]=man3/EVP_PKEY_settable_params.pod +DEPEND[man/man3/EVP_PKEY_settable_params.3]=man3/EVP_PKEY_settable_params.pod +GENERATE[man/man3/EVP_PKEY_settable_params.3]=man3/EVP_PKEY_settable_params.pod +DEPEND[html/man3/EVP_PKEY_sign.html]=man3/EVP_PKEY_sign.pod +GENERATE[html/man3/EVP_PKEY_sign.html]=man3/EVP_PKEY_sign.pod +DEPEND[man/man3/EVP_PKEY_sign.3]=man3/EVP_PKEY_sign.pod +GENERATE[man/man3/EVP_PKEY_sign.3]=man3/EVP_PKEY_sign.pod +DEPEND[html/man3/EVP_PKEY_todata.html]=man3/EVP_PKEY_todata.pod +GENERATE[html/man3/EVP_PKEY_todata.html]=man3/EVP_PKEY_todata.pod +DEPEND[man/man3/EVP_PKEY_todata.3]=man3/EVP_PKEY_todata.pod +GENERATE[man/man3/EVP_PKEY_todata.3]=man3/EVP_PKEY_todata.pod +DEPEND[html/man3/EVP_PKEY_verify.html]=man3/EVP_PKEY_verify.pod +GENERATE[html/man3/EVP_PKEY_verify.html]=man3/EVP_PKEY_verify.pod +DEPEND[man/man3/EVP_PKEY_verify.3]=man3/EVP_PKEY_verify.pod +GENERATE[man/man3/EVP_PKEY_verify.3]=man3/EVP_PKEY_verify.pod +DEPEND[html/man3/EVP_PKEY_verify_recover.html]=man3/EVP_PKEY_verify_recover.pod +GENERATE[html/man3/EVP_PKEY_verify_recover.html]=man3/EVP_PKEY_verify_recover.pod +DEPEND[man/man3/EVP_PKEY_verify_recover.3]=man3/EVP_PKEY_verify_recover.pod +GENERATE[man/man3/EVP_PKEY_verify_recover.3]=man3/EVP_PKEY_verify_recover.pod +DEPEND[html/man3/EVP_RAND.html]=man3/EVP_RAND.pod +GENERATE[html/man3/EVP_RAND.html]=man3/EVP_RAND.pod +DEPEND[man/man3/EVP_RAND.3]=man3/EVP_RAND.pod +GENERATE[man/man3/EVP_RAND.3]=man3/EVP_RAND.pod +DEPEND[html/man3/EVP_SIGNATURE.html]=man3/EVP_SIGNATURE.pod +GENERATE[html/man3/EVP_SIGNATURE.html]=man3/EVP_SIGNATURE.pod +DEPEND[man/man3/EVP_SIGNATURE.3]=man3/EVP_SIGNATURE.pod +GENERATE[man/man3/EVP_SIGNATURE.3]=man3/EVP_SIGNATURE.pod +DEPEND[html/man3/EVP_SealInit.html]=man3/EVP_SealInit.pod +GENERATE[html/man3/EVP_SealInit.html]=man3/EVP_SealInit.pod +DEPEND[man/man3/EVP_SealInit.3]=man3/EVP_SealInit.pod +GENERATE[man/man3/EVP_SealInit.3]=man3/EVP_SealInit.pod +DEPEND[html/man3/EVP_SignInit.html]=man3/EVP_SignInit.pod +GENERATE[html/man3/EVP_SignInit.html]=man3/EVP_SignInit.pod +DEPEND[man/man3/EVP_SignInit.3]=man3/EVP_SignInit.pod +GENERATE[man/man3/EVP_SignInit.3]=man3/EVP_SignInit.pod +DEPEND[html/man3/EVP_VerifyInit.html]=man3/EVP_VerifyInit.pod +GENERATE[html/man3/EVP_VerifyInit.html]=man3/EVP_VerifyInit.pod +DEPEND[man/man3/EVP_VerifyInit.3]=man3/EVP_VerifyInit.pod +GENERATE[man/man3/EVP_VerifyInit.3]=man3/EVP_VerifyInit.pod +DEPEND[html/man3/EVP_aes_128_gcm.html]=man3/EVP_aes_128_gcm.pod +GENERATE[html/man3/EVP_aes_128_gcm.html]=man3/EVP_aes_128_gcm.pod +DEPEND[man/man3/EVP_aes_128_gcm.3]=man3/EVP_aes_128_gcm.pod +GENERATE[man/man3/EVP_aes_128_gcm.3]=man3/EVP_aes_128_gcm.pod +DEPEND[html/man3/EVP_aria_128_gcm.html]=man3/EVP_aria_128_gcm.pod +GENERATE[html/man3/EVP_aria_128_gcm.html]=man3/EVP_aria_128_gcm.pod +DEPEND[man/man3/EVP_aria_128_gcm.3]=man3/EVP_aria_128_gcm.pod +GENERATE[man/man3/EVP_aria_128_gcm.3]=man3/EVP_aria_128_gcm.pod +DEPEND[html/man3/EVP_bf_cbc.html]=man3/EVP_bf_cbc.pod +GENERATE[html/man3/EVP_bf_cbc.html]=man3/EVP_bf_cbc.pod +DEPEND[man/man3/EVP_bf_cbc.3]=man3/EVP_bf_cbc.pod +GENERATE[man/man3/EVP_bf_cbc.3]=man3/EVP_bf_cbc.pod +DEPEND[html/man3/EVP_blake2b512.html]=man3/EVP_blake2b512.pod +GENERATE[html/man3/EVP_blake2b512.html]=man3/EVP_blake2b512.pod +DEPEND[man/man3/EVP_blake2b512.3]=man3/EVP_blake2b512.pod +GENERATE[man/man3/EVP_blake2b512.3]=man3/EVP_blake2b512.pod +DEPEND[html/man3/EVP_camellia_128_ecb.html]=man3/EVP_camellia_128_ecb.pod +GENERATE[html/man3/EVP_camellia_128_ecb.html]=man3/EVP_camellia_128_ecb.pod +DEPEND[man/man3/EVP_camellia_128_ecb.3]=man3/EVP_camellia_128_ecb.pod +GENERATE[man/man3/EVP_camellia_128_ecb.3]=man3/EVP_camellia_128_ecb.pod +DEPEND[html/man3/EVP_cast5_cbc.html]=man3/EVP_cast5_cbc.pod +GENERATE[html/man3/EVP_cast5_cbc.html]=man3/EVP_cast5_cbc.pod +DEPEND[man/man3/EVP_cast5_cbc.3]=man3/EVP_cast5_cbc.pod +GENERATE[man/man3/EVP_cast5_cbc.3]=man3/EVP_cast5_cbc.pod +DEPEND[html/man3/EVP_chacha20.html]=man3/EVP_chacha20.pod +GENERATE[html/man3/EVP_chacha20.html]=man3/EVP_chacha20.pod +DEPEND[man/man3/EVP_chacha20.3]=man3/EVP_chacha20.pod +GENERATE[man/man3/EVP_chacha20.3]=man3/EVP_chacha20.pod +DEPEND[html/man3/EVP_des_cbc.html]=man3/EVP_des_cbc.pod +GENERATE[html/man3/EVP_des_cbc.html]=man3/EVP_des_cbc.pod +DEPEND[man/man3/EVP_des_cbc.3]=man3/EVP_des_cbc.pod +GENERATE[man/man3/EVP_des_cbc.3]=man3/EVP_des_cbc.pod +DEPEND[html/man3/EVP_desx_cbc.html]=man3/EVP_desx_cbc.pod +GENERATE[html/man3/EVP_desx_cbc.html]=man3/EVP_desx_cbc.pod +DEPEND[man/man3/EVP_desx_cbc.3]=man3/EVP_desx_cbc.pod +GENERATE[man/man3/EVP_desx_cbc.3]=man3/EVP_desx_cbc.pod +DEPEND[html/man3/EVP_idea_cbc.html]=man3/EVP_idea_cbc.pod +GENERATE[html/man3/EVP_idea_cbc.html]=man3/EVP_idea_cbc.pod +DEPEND[man/man3/EVP_idea_cbc.3]=man3/EVP_idea_cbc.pod +GENERATE[man/man3/EVP_idea_cbc.3]=man3/EVP_idea_cbc.pod +DEPEND[html/man3/EVP_md2.html]=man3/EVP_md2.pod +GENERATE[html/man3/EVP_md2.html]=man3/EVP_md2.pod +DEPEND[man/man3/EVP_md2.3]=man3/EVP_md2.pod +GENERATE[man/man3/EVP_md2.3]=man3/EVP_md2.pod +DEPEND[html/man3/EVP_md4.html]=man3/EVP_md4.pod +GENERATE[html/man3/EVP_md4.html]=man3/EVP_md4.pod +DEPEND[man/man3/EVP_md4.3]=man3/EVP_md4.pod +GENERATE[man/man3/EVP_md4.3]=man3/EVP_md4.pod +DEPEND[html/man3/EVP_md5.html]=man3/EVP_md5.pod +GENERATE[html/man3/EVP_md5.html]=man3/EVP_md5.pod +DEPEND[man/man3/EVP_md5.3]=man3/EVP_md5.pod +GENERATE[man/man3/EVP_md5.3]=man3/EVP_md5.pod +DEPEND[html/man3/EVP_mdc2.html]=man3/EVP_mdc2.pod +GENERATE[html/man3/EVP_mdc2.html]=man3/EVP_mdc2.pod +DEPEND[man/man3/EVP_mdc2.3]=man3/EVP_mdc2.pod +GENERATE[man/man3/EVP_mdc2.3]=man3/EVP_mdc2.pod +DEPEND[html/man3/EVP_rc2_cbc.html]=man3/EVP_rc2_cbc.pod +GENERATE[html/man3/EVP_rc2_cbc.html]=man3/EVP_rc2_cbc.pod +DEPEND[man/man3/EVP_rc2_cbc.3]=man3/EVP_rc2_cbc.pod +GENERATE[man/man3/EVP_rc2_cbc.3]=man3/EVP_rc2_cbc.pod +DEPEND[html/man3/EVP_rc4.html]=man3/EVP_rc4.pod +GENERATE[html/man3/EVP_rc4.html]=man3/EVP_rc4.pod +DEPEND[man/man3/EVP_rc4.3]=man3/EVP_rc4.pod +GENERATE[man/man3/EVP_rc4.3]=man3/EVP_rc4.pod +DEPEND[html/man3/EVP_rc5_32_12_16_cbc.html]=man3/EVP_rc5_32_12_16_cbc.pod +GENERATE[html/man3/EVP_rc5_32_12_16_cbc.html]=man3/EVP_rc5_32_12_16_cbc.pod +DEPEND[man/man3/EVP_rc5_32_12_16_cbc.3]=man3/EVP_rc5_32_12_16_cbc.pod +GENERATE[man/man3/EVP_rc5_32_12_16_cbc.3]=man3/EVP_rc5_32_12_16_cbc.pod +DEPEND[html/man3/EVP_ripemd160.html]=man3/EVP_ripemd160.pod +GENERATE[html/man3/EVP_ripemd160.html]=man3/EVP_ripemd160.pod +DEPEND[man/man3/EVP_ripemd160.3]=man3/EVP_ripemd160.pod +GENERATE[man/man3/EVP_ripemd160.3]=man3/EVP_ripemd160.pod +DEPEND[html/man3/EVP_seed_cbc.html]=man3/EVP_seed_cbc.pod +GENERATE[html/man3/EVP_seed_cbc.html]=man3/EVP_seed_cbc.pod +DEPEND[man/man3/EVP_seed_cbc.3]=man3/EVP_seed_cbc.pod +GENERATE[man/man3/EVP_seed_cbc.3]=man3/EVP_seed_cbc.pod +DEPEND[html/man3/EVP_set_default_properties.html]=man3/EVP_set_default_properties.pod +GENERATE[html/man3/EVP_set_default_properties.html]=man3/EVP_set_default_properties.pod +DEPEND[man/man3/EVP_set_default_properties.3]=man3/EVP_set_default_properties.pod +GENERATE[man/man3/EVP_set_default_properties.3]=man3/EVP_set_default_properties.pod +DEPEND[html/man3/EVP_sha1.html]=man3/EVP_sha1.pod +GENERATE[html/man3/EVP_sha1.html]=man3/EVP_sha1.pod +DEPEND[man/man3/EVP_sha1.3]=man3/EVP_sha1.pod +GENERATE[man/man3/EVP_sha1.3]=man3/EVP_sha1.pod +DEPEND[html/man3/EVP_sha224.html]=man3/EVP_sha224.pod +GENERATE[html/man3/EVP_sha224.html]=man3/EVP_sha224.pod +DEPEND[man/man3/EVP_sha224.3]=man3/EVP_sha224.pod +GENERATE[man/man3/EVP_sha224.3]=man3/EVP_sha224.pod +DEPEND[html/man3/EVP_sha3_224.html]=man3/EVP_sha3_224.pod +GENERATE[html/man3/EVP_sha3_224.html]=man3/EVP_sha3_224.pod +DEPEND[man/man3/EVP_sha3_224.3]=man3/EVP_sha3_224.pod +GENERATE[man/man3/EVP_sha3_224.3]=man3/EVP_sha3_224.pod +DEPEND[html/man3/EVP_sm3.html]=man3/EVP_sm3.pod +GENERATE[html/man3/EVP_sm3.html]=man3/EVP_sm3.pod +DEPEND[man/man3/EVP_sm3.3]=man3/EVP_sm3.pod +GENERATE[man/man3/EVP_sm3.3]=man3/EVP_sm3.pod +DEPEND[html/man3/EVP_sm4_cbc.html]=man3/EVP_sm4_cbc.pod +GENERATE[html/man3/EVP_sm4_cbc.html]=man3/EVP_sm4_cbc.pod +DEPEND[man/man3/EVP_sm4_cbc.3]=man3/EVP_sm4_cbc.pod +GENERATE[man/man3/EVP_sm4_cbc.3]=man3/EVP_sm4_cbc.pod +DEPEND[html/man3/EVP_whirlpool.html]=man3/EVP_whirlpool.pod +GENERATE[html/man3/EVP_whirlpool.html]=man3/EVP_whirlpool.pod +DEPEND[man/man3/EVP_whirlpool.3]=man3/EVP_whirlpool.pod +GENERATE[man/man3/EVP_whirlpool.3]=man3/EVP_whirlpool.pod +DEPEND[html/man3/HMAC.html]=man3/HMAC.pod +GENERATE[html/man3/HMAC.html]=man3/HMAC.pod +DEPEND[man/man3/HMAC.3]=man3/HMAC.pod +GENERATE[man/man3/HMAC.3]=man3/HMAC.pod +DEPEND[html/man3/MD5.html]=man3/MD5.pod +GENERATE[html/man3/MD5.html]=man3/MD5.pod +DEPEND[man/man3/MD5.3]=man3/MD5.pod +GENERATE[man/man3/MD5.3]=man3/MD5.pod +DEPEND[html/man3/MDC2_Init.html]=man3/MDC2_Init.pod +GENERATE[html/man3/MDC2_Init.html]=man3/MDC2_Init.pod +DEPEND[man/man3/MDC2_Init.3]=man3/MDC2_Init.pod +GENERATE[man/man3/MDC2_Init.3]=man3/MDC2_Init.pod +DEPEND[html/man3/NCONF_new_ex.html]=man3/NCONF_new_ex.pod +GENERATE[html/man3/NCONF_new_ex.html]=man3/NCONF_new_ex.pod +DEPEND[man/man3/NCONF_new_ex.3]=man3/NCONF_new_ex.pod +GENERATE[man/man3/NCONF_new_ex.3]=man3/NCONF_new_ex.pod +DEPEND[html/man3/OBJ_nid2obj.html]=man3/OBJ_nid2obj.pod +GENERATE[html/man3/OBJ_nid2obj.html]=man3/OBJ_nid2obj.pod +DEPEND[man/man3/OBJ_nid2obj.3]=man3/OBJ_nid2obj.pod +GENERATE[man/man3/OBJ_nid2obj.3]=man3/OBJ_nid2obj.pod +DEPEND[html/man3/OCSP_REQUEST_new.html]=man3/OCSP_REQUEST_new.pod +GENERATE[html/man3/OCSP_REQUEST_new.html]=man3/OCSP_REQUEST_new.pod +DEPEND[man/man3/OCSP_REQUEST_new.3]=man3/OCSP_REQUEST_new.pod +GENERATE[man/man3/OCSP_REQUEST_new.3]=man3/OCSP_REQUEST_new.pod +DEPEND[html/man3/OCSP_cert_to_id.html]=man3/OCSP_cert_to_id.pod +GENERATE[html/man3/OCSP_cert_to_id.html]=man3/OCSP_cert_to_id.pod +DEPEND[man/man3/OCSP_cert_to_id.3]=man3/OCSP_cert_to_id.pod +GENERATE[man/man3/OCSP_cert_to_id.3]=man3/OCSP_cert_to_id.pod +DEPEND[html/man3/OCSP_request_add1_nonce.html]=man3/OCSP_request_add1_nonce.pod +GENERATE[html/man3/OCSP_request_add1_nonce.html]=man3/OCSP_request_add1_nonce.pod +DEPEND[man/man3/OCSP_request_add1_nonce.3]=man3/OCSP_request_add1_nonce.pod +GENERATE[man/man3/OCSP_request_add1_nonce.3]=man3/OCSP_request_add1_nonce.pod +DEPEND[html/man3/OCSP_resp_find_status.html]=man3/OCSP_resp_find_status.pod +GENERATE[html/man3/OCSP_resp_find_status.html]=man3/OCSP_resp_find_status.pod +DEPEND[man/man3/OCSP_resp_find_status.3]=man3/OCSP_resp_find_status.pod +GENERATE[man/man3/OCSP_resp_find_status.3]=man3/OCSP_resp_find_status.pod +DEPEND[html/man3/OCSP_response_status.html]=man3/OCSP_response_status.pod +GENERATE[html/man3/OCSP_response_status.html]=man3/OCSP_response_status.pod +DEPEND[man/man3/OCSP_response_status.3]=man3/OCSP_response_status.pod +GENERATE[man/man3/OCSP_response_status.3]=man3/OCSP_response_status.pod +DEPEND[html/man3/OCSP_sendreq_new.html]=man3/OCSP_sendreq_new.pod +GENERATE[html/man3/OCSP_sendreq_new.html]=man3/OCSP_sendreq_new.pod +DEPEND[man/man3/OCSP_sendreq_new.3]=man3/OCSP_sendreq_new.pod +GENERATE[man/man3/OCSP_sendreq_new.3]=man3/OCSP_sendreq_new.pod +DEPEND[html/man3/OPENSSL_Applink.html]=man3/OPENSSL_Applink.pod +GENERATE[html/man3/OPENSSL_Applink.html]=man3/OPENSSL_Applink.pod +DEPEND[man/man3/OPENSSL_Applink.3]=man3/OPENSSL_Applink.pod +GENERATE[man/man3/OPENSSL_Applink.3]=man3/OPENSSL_Applink.pod +DEPEND[html/man3/OPENSSL_FILE.html]=man3/OPENSSL_FILE.pod +GENERATE[html/man3/OPENSSL_FILE.html]=man3/OPENSSL_FILE.pod +DEPEND[man/man3/OPENSSL_FILE.3]=man3/OPENSSL_FILE.pod +GENERATE[man/man3/OPENSSL_FILE.3]=man3/OPENSSL_FILE.pod +DEPEND[html/man3/OPENSSL_LH_COMPFUNC.html]=man3/OPENSSL_LH_COMPFUNC.pod +GENERATE[html/man3/OPENSSL_LH_COMPFUNC.html]=man3/OPENSSL_LH_COMPFUNC.pod +DEPEND[man/man3/OPENSSL_LH_COMPFUNC.3]=man3/OPENSSL_LH_COMPFUNC.pod +GENERATE[man/man3/OPENSSL_LH_COMPFUNC.3]=man3/OPENSSL_LH_COMPFUNC.pod +DEPEND[html/man3/OPENSSL_LH_stats.html]=man3/OPENSSL_LH_stats.pod +GENERATE[html/man3/OPENSSL_LH_stats.html]=man3/OPENSSL_LH_stats.pod +DEPEND[man/man3/OPENSSL_LH_stats.3]=man3/OPENSSL_LH_stats.pod +GENERATE[man/man3/OPENSSL_LH_stats.3]=man3/OPENSSL_LH_stats.pod +DEPEND[html/man3/OPENSSL_config.html]=man3/OPENSSL_config.pod +GENERATE[html/man3/OPENSSL_config.html]=man3/OPENSSL_config.pod +DEPEND[man/man3/OPENSSL_config.3]=man3/OPENSSL_config.pod +GENERATE[man/man3/OPENSSL_config.3]=man3/OPENSSL_config.pod +DEPEND[html/man3/OPENSSL_fork_prepare.html]=man3/OPENSSL_fork_prepare.pod +GENERATE[html/man3/OPENSSL_fork_prepare.html]=man3/OPENSSL_fork_prepare.pod +DEPEND[man/man3/OPENSSL_fork_prepare.3]=man3/OPENSSL_fork_prepare.pod +GENERATE[man/man3/OPENSSL_fork_prepare.3]=man3/OPENSSL_fork_prepare.pod +DEPEND[html/man3/OPENSSL_gmtime.html]=man3/OPENSSL_gmtime.pod +GENERATE[html/man3/OPENSSL_gmtime.html]=man3/OPENSSL_gmtime.pod +DEPEND[man/man3/OPENSSL_gmtime.3]=man3/OPENSSL_gmtime.pod +GENERATE[man/man3/OPENSSL_gmtime.3]=man3/OPENSSL_gmtime.pod +DEPEND[html/man3/OPENSSL_hexchar2int.html]=man3/OPENSSL_hexchar2int.pod +GENERATE[html/man3/OPENSSL_hexchar2int.html]=man3/OPENSSL_hexchar2int.pod +DEPEND[man/man3/OPENSSL_hexchar2int.3]=man3/OPENSSL_hexchar2int.pod +GENERATE[man/man3/OPENSSL_hexchar2int.3]=man3/OPENSSL_hexchar2int.pod +DEPEND[html/man3/OPENSSL_ia32cap.html]=man3/OPENSSL_ia32cap.pod +GENERATE[html/man3/OPENSSL_ia32cap.html]=man3/OPENSSL_ia32cap.pod +DEPEND[man/man3/OPENSSL_ia32cap.3]=man3/OPENSSL_ia32cap.pod +GENERATE[man/man3/OPENSSL_ia32cap.3]=man3/OPENSSL_ia32cap.pod +DEPEND[html/man3/OPENSSL_init_crypto.html]=man3/OPENSSL_init_crypto.pod +GENERATE[html/man3/OPENSSL_init_crypto.html]=man3/OPENSSL_init_crypto.pod +DEPEND[man/man3/OPENSSL_init_crypto.3]=man3/OPENSSL_init_crypto.pod +GENERATE[man/man3/OPENSSL_init_crypto.3]=man3/OPENSSL_init_crypto.pod +DEPEND[html/man3/OPENSSL_init_ssl.html]=man3/OPENSSL_init_ssl.pod +GENERATE[html/man3/OPENSSL_init_ssl.html]=man3/OPENSSL_init_ssl.pod +DEPEND[man/man3/OPENSSL_init_ssl.3]=man3/OPENSSL_init_ssl.pod +GENERATE[man/man3/OPENSSL_init_ssl.3]=man3/OPENSSL_init_ssl.pod +DEPEND[html/man3/OPENSSL_instrument_bus.html]=man3/OPENSSL_instrument_bus.pod +GENERATE[html/man3/OPENSSL_instrument_bus.html]=man3/OPENSSL_instrument_bus.pod +DEPEND[man/man3/OPENSSL_instrument_bus.3]=man3/OPENSSL_instrument_bus.pod +GENERATE[man/man3/OPENSSL_instrument_bus.3]=man3/OPENSSL_instrument_bus.pod +DEPEND[html/man3/OPENSSL_load_builtin_modules.html]=man3/OPENSSL_load_builtin_modules.pod +GENERATE[html/man3/OPENSSL_load_builtin_modules.html]=man3/OPENSSL_load_builtin_modules.pod +DEPEND[man/man3/OPENSSL_load_builtin_modules.3]=man3/OPENSSL_load_builtin_modules.pod +GENERATE[man/man3/OPENSSL_load_builtin_modules.3]=man3/OPENSSL_load_builtin_modules.pod +DEPEND[html/man3/OPENSSL_malloc.html]=man3/OPENSSL_malloc.pod +GENERATE[html/man3/OPENSSL_malloc.html]=man3/OPENSSL_malloc.pod +DEPEND[man/man3/OPENSSL_malloc.3]=man3/OPENSSL_malloc.pod +GENERATE[man/man3/OPENSSL_malloc.3]=man3/OPENSSL_malloc.pod +DEPEND[html/man3/OPENSSL_s390xcap.html]=man3/OPENSSL_s390xcap.pod +GENERATE[html/man3/OPENSSL_s390xcap.html]=man3/OPENSSL_s390xcap.pod +DEPEND[man/man3/OPENSSL_s390xcap.3]=man3/OPENSSL_s390xcap.pod +GENERATE[man/man3/OPENSSL_s390xcap.3]=man3/OPENSSL_s390xcap.pod +DEPEND[html/man3/OPENSSL_secure_malloc.html]=man3/OPENSSL_secure_malloc.pod +GENERATE[html/man3/OPENSSL_secure_malloc.html]=man3/OPENSSL_secure_malloc.pod +DEPEND[man/man3/OPENSSL_secure_malloc.3]=man3/OPENSSL_secure_malloc.pod +GENERATE[man/man3/OPENSSL_secure_malloc.3]=man3/OPENSSL_secure_malloc.pod +DEPEND[html/man3/OPENSSL_strcasecmp.html]=man3/OPENSSL_strcasecmp.pod +GENERATE[html/man3/OPENSSL_strcasecmp.html]=man3/OPENSSL_strcasecmp.pod +DEPEND[man/man3/OPENSSL_strcasecmp.3]=man3/OPENSSL_strcasecmp.pod +GENERATE[man/man3/OPENSSL_strcasecmp.3]=man3/OPENSSL_strcasecmp.pod +DEPEND[html/man3/OSSL_ALGORITHM.html]=man3/OSSL_ALGORITHM.pod +GENERATE[html/man3/OSSL_ALGORITHM.html]=man3/OSSL_ALGORITHM.pod +DEPEND[man/man3/OSSL_ALGORITHM.3]=man3/OSSL_ALGORITHM.pod +GENERATE[man/man3/OSSL_ALGORITHM.3]=man3/OSSL_ALGORITHM.pod +DEPEND[html/man3/OSSL_CALLBACK.html]=man3/OSSL_CALLBACK.pod +GENERATE[html/man3/OSSL_CALLBACK.html]=man3/OSSL_CALLBACK.pod +DEPEND[man/man3/OSSL_CALLBACK.3]=man3/OSSL_CALLBACK.pod +GENERATE[man/man3/OSSL_CALLBACK.3]=man3/OSSL_CALLBACK.pod +DEPEND[html/man3/OSSL_CMP_CTX_new.html]=man3/OSSL_CMP_CTX_new.pod +GENERATE[html/man3/OSSL_CMP_CTX_new.html]=man3/OSSL_CMP_CTX_new.pod +DEPEND[man/man3/OSSL_CMP_CTX_new.3]=man3/OSSL_CMP_CTX_new.pod +GENERATE[man/man3/OSSL_CMP_CTX_new.3]=man3/OSSL_CMP_CTX_new.pod +DEPEND[html/man3/OSSL_CMP_HDR_get0_transactionID.html]=man3/OSSL_CMP_HDR_get0_transactionID.pod +GENERATE[html/man3/OSSL_CMP_HDR_get0_transactionID.html]=man3/OSSL_CMP_HDR_get0_transactionID.pod +DEPEND[man/man3/OSSL_CMP_HDR_get0_transactionID.3]=man3/OSSL_CMP_HDR_get0_transactionID.pod +GENERATE[man/man3/OSSL_CMP_HDR_get0_transactionID.3]=man3/OSSL_CMP_HDR_get0_transactionID.pod +DEPEND[html/man3/OSSL_CMP_ITAV_set0.html]=man3/OSSL_CMP_ITAV_set0.pod +GENERATE[html/man3/OSSL_CMP_ITAV_set0.html]=man3/OSSL_CMP_ITAV_set0.pod +DEPEND[man/man3/OSSL_CMP_ITAV_set0.3]=man3/OSSL_CMP_ITAV_set0.pod +GENERATE[man/man3/OSSL_CMP_ITAV_set0.3]=man3/OSSL_CMP_ITAV_set0.pod +DEPEND[html/man3/OSSL_CMP_MSG_get0_header.html]=man3/OSSL_CMP_MSG_get0_header.pod +GENERATE[html/man3/OSSL_CMP_MSG_get0_header.html]=man3/OSSL_CMP_MSG_get0_header.pod +DEPEND[man/man3/OSSL_CMP_MSG_get0_header.3]=man3/OSSL_CMP_MSG_get0_header.pod +GENERATE[man/man3/OSSL_CMP_MSG_get0_header.3]=man3/OSSL_CMP_MSG_get0_header.pod +DEPEND[html/man3/OSSL_CMP_MSG_http_perform.html]=man3/OSSL_CMP_MSG_http_perform.pod +GENERATE[html/man3/OSSL_CMP_MSG_http_perform.html]=man3/OSSL_CMP_MSG_http_perform.pod +DEPEND[man/man3/OSSL_CMP_MSG_http_perform.3]=man3/OSSL_CMP_MSG_http_perform.pod +GENERATE[man/man3/OSSL_CMP_MSG_http_perform.3]=man3/OSSL_CMP_MSG_http_perform.pod +DEPEND[html/man3/OSSL_CMP_SRV_CTX_new.html]=man3/OSSL_CMP_SRV_CTX_new.pod +GENERATE[html/man3/OSSL_CMP_SRV_CTX_new.html]=man3/OSSL_CMP_SRV_CTX_new.pod +DEPEND[man/man3/OSSL_CMP_SRV_CTX_new.3]=man3/OSSL_CMP_SRV_CTX_new.pod +GENERATE[man/man3/OSSL_CMP_SRV_CTX_new.3]=man3/OSSL_CMP_SRV_CTX_new.pod +DEPEND[html/man3/OSSL_CMP_STATUSINFO_new.html]=man3/OSSL_CMP_STATUSINFO_new.pod +GENERATE[html/man3/OSSL_CMP_STATUSINFO_new.html]=man3/OSSL_CMP_STATUSINFO_new.pod +DEPEND[man/man3/OSSL_CMP_STATUSINFO_new.3]=man3/OSSL_CMP_STATUSINFO_new.pod +GENERATE[man/man3/OSSL_CMP_STATUSINFO_new.3]=man3/OSSL_CMP_STATUSINFO_new.pod +DEPEND[html/man3/OSSL_CMP_exec_certreq.html]=man3/OSSL_CMP_exec_certreq.pod +GENERATE[html/man3/OSSL_CMP_exec_certreq.html]=man3/OSSL_CMP_exec_certreq.pod +DEPEND[man/man3/OSSL_CMP_exec_certreq.3]=man3/OSSL_CMP_exec_certreq.pod +GENERATE[man/man3/OSSL_CMP_exec_certreq.3]=man3/OSSL_CMP_exec_certreq.pod +DEPEND[html/man3/OSSL_CMP_log_open.html]=man3/OSSL_CMP_log_open.pod +GENERATE[html/man3/OSSL_CMP_log_open.html]=man3/OSSL_CMP_log_open.pod +DEPEND[man/man3/OSSL_CMP_log_open.3]=man3/OSSL_CMP_log_open.pod +GENERATE[man/man3/OSSL_CMP_log_open.3]=man3/OSSL_CMP_log_open.pod +DEPEND[html/man3/OSSL_CMP_validate_msg.html]=man3/OSSL_CMP_validate_msg.pod +GENERATE[html/man3/OSSL_CMP_validate_msg.html]=man3/OSSL_CMP_validate_msg.pod +DEPEND[man/man3/OSSL_CMP_validate_msg.3]=man3/OSSL_CMP_validate_msg.pod +GENERATE[man/man3/OSSL_CMP_validate_msg.3]=man3/OSSL_CMP_validate_msg.pod +DEPEND[html/man3/OSSL_CORE_MAKE_FUNC.html]=man3/OSSL_CORE_MAKE_FUNC.pod +GENERATE[html/man3/OSSL_CORE_MAKE_FUNC.html]=man3/OSSL_CORE_MAKE_FUNC.pod +DEPEND[man/man3/OSSL_CORE_MAKE_FUNC.3]=man3/OSSL_CORE_MAKE_FUNC.pod +GENERATE[man/man3/OSSL_CORE_MAKE_FUNC.3]=man3/OSSL_CORE_MAKE_FUNC.pod +DEPEND[html/man3/OSSL_CRMF_MSG_get0_tmpl.html]=man3/OSSL_CRMF_MSG_get0_tmpl.pod +GENERATE[html/man3/OSSL_CRMF_MSG_get0_tmpl.html]=man3/OSSL_CRMF_MSG_get0_tmpl.pod +DEPEND[man/man3/OSSL_CRMF_MSG_get0_tmpl.3]=man3/OSSL_CRMF_MSG_get0_tmpl.pod +GENERATE[man/man3/OSSL_CRMF_MSG_get0_tmpl.3]=man3/OSSL_CRMF_MSG_get0_tmpl.pod +DEPEND[html/man3/OSSL_CRMF_MSG_set0_validity.html]=man3/OSSL_CRMF_MSG_set0_validity.pod +GENERATE[html/man3/OSSL_CRMF_MSG_set0_validity.html]=man3/OSSL_CRMF_MSG_set0_validity.pod +DEPEND[man/man3/OSSL_CRMF_MSG_set0_validity.3]=man3/OSSL_CRMF_MSG_set0_validity.pod +GENERATE[man/man3/OSSL_CRMF_MSG_set0_validity.3]=man3/OSSL_CRMF_MSG_set0_validity.pod +DEPEND[html/man3/OSSL_CRMF_MSG_set1_regCtrl_regToken.html]=man3/OSSL_CRMF_MSG_set1_regCtrl_regToken.pod +GENERATE[html/man3/OSSL_CRMF_MSG_set1_regCtrl_regToken.html]=man3/OSSL_CRMF_MSG_set1_regCtrl_regToken.pod +DEPEND[man/man3/OSSL_CRMF_MSG_set1_regCtrl_regToken.3]=man3/OSSL_CRMF_MSG_set1_regCtrl_regToken.pod +GENERATE[man/man3/OSSL_CRMF_MSG_set1_regCtrl_regToken.3]=man3/OSSL_CRMF_MSG_set1_regCtrl_regToken.pod +DEPEND[html/man3/OSSL_CRMF_MSG_set1_regInfo_certReq.html]=man3/OSSL_CRMF_MSG_set1_regInfo_certReq.pod +GENERATE[html/man3/OSSL_CRMF_MSG_set1_regInfo_certReq.html]=man3/OSSL_CRMF_MSG_set1_regInfo_certReq.pod +DEPEND[man/man3/OSSL_CRMF_MSG_set1_regInfo_certReq.3]=man3/OSSL_CRMF_MSG_set1_regInfo_certReq.pod +GENERATE[man/man3/OSSL_CRMF_MSG_set1_regInfo_certReq.3]=man3/OSSL_CRMF_MSG_set1_regInfo_certReq.pod +DEPEND[html/man3/OSSL_CRMF_pbmp_new.html]=man3/OSSL_CRMF_pbmp_new.pod +GENERATE[html/man3/OSSL_CRMF_pbmp_new.html]=man3/OSSL_CRMF_pbmp_new.pod +DEPEND[man/man3/OSSL_CRMF_pbmp_new.3]=man3/OSSL_CRMF_pbmp_new.pod +GENERATE[man/man3/OSSL_CRMF_pbmp_new.3]=man3/OSSL_CRMF_pbmp_new.pod +DEPEND[html/man3/OSSL_DECODER.html]=man3/OSSL_DECODER.pod +GENERATE[html/man3/OSSL_DECODER.html]=man3/OSSL_DECODER.pod +DEPEND[man/man3/OSSL_DECODER.3]=man3/OSSL_DECODER.pod +GENERATE[man/man3/OSSL_DECODER.3]=man3/OSSL_DECODER.pod +DEPEND[html/man3/OSSL_DECODER_CTX.html]=man3/OSSL_DECODER_CTX.pod +GENERATE[html/man3/OSSL_DECODER_CTX.html]=man3/OSSL_DECODER_CTX.pod +DEPEND[man/man3/OSSL_DECODER_CTX.3]=man3/OSSL_DECODER_CTX.pod +GENERATE[man/man3/OSSL_DECODER_CTX.3]=man3/OSSL_DECODER_CTX.pod +DEPEND[html/man3/OSSL_DECODER_CTX_new_for_pkey.html]=man3/OSSL_DECODER_CTX_new_for_pkey.pod +GENERATE[html/man3/OSSL_DECODER_CTX_new_for_pkey.html]=man3/OSSL_DECODER_CTX_new_for_pkey.pod +DEPEND[man/man3/OSSL_DECODER_CTX_new_for_pkey.3]=man3/OSSL_DECODER_CTX_new_for_pkey.pod +GENERATE[man/man3/OSSL_DECODER_CTX_new_for_pkey.3]=man3/OSSL_DECODER_CTX_new_for_pkey.pod +DEPEND[html/man3/OSSL_DECODER_from_bio.html]=man3/OSSL_DECODER_from_bio.pod +GENERATE[html/man3/OSSL_DECODER_from_bio.html]=man3/OSSL_DECODER_from_bio.pod +DEPEND[man/man3/OSSL_DECODER_from_bio.3]=man3/OSSL_DECODER_from_bio.pod +GENERATE[man/man3/OSSL_DECODER_from_bio.3]=man3/OSSL_DECODER_from_bio.pod +DEPEND[html/man3/OSSL_DISPATCH.html]=man3/OSSL_DISPATCH.pod +GENERATE[html/man3/OSSL_DISPATCH.html]=man3/OSSL_DISPATCH.pod +DEPEND[man/man3/OSSL_DISPATCH.3]=man3/OSSL_DISPATCH.pod +GENERATE[man/man3/OSSL_DISPATCH.3]=man3/OSSL_DISPATCH.pod +DEPEND[html/man3/OSSL_ENCODER.html]=man3/OSSL_ENCODER.pod +GENERATE[html/man3/OSSL_ENCODER.html]=man3/OSSL_ENCODER.pod +DEPEND[man/man3/OSSL_ENCODER.3]=man3/OSSL_ENCODER.pod +GENERATE[man/man3/OSSL_ENCODER.3]=man3/OSSL_ENCODER.pod +DEPEND[html/man3/OSSL_ENCODER_CTX.html]=man3/OSSL_ENCODER_CTX.pod +GENERATE[html/man3/OSSL_ENCODER_CTX.html]=man3/OSSL_ENCODER_CTX.pod +DEPEND[man/man3/OSSL_ENCODER_CTX.3]=man3/OSSL_ENCODER_CTX.pod +GENERATE[man/man3/OSSL_ENCODER_CTX.3]=man3/OSSL_ENCODER_CTX.pod +DEPEND[html/man3/OSSL_ENCODER_CTX_new_for_pkey.html]=man3/OSSL_ENCODER_CTX_new_for_pkey.pod +GENERATE[html/man3/OSSL_ENCODER_CTX_new_for_pkey.html]=man3/OSSL_ENCODER_CTX_new_for_pkey.pod +DEPEND[man/man3/OSSL_ENCODER_CTX_new_for_pkey.3]=man3/OSSL_ENCODER_CTX_new_for_pkey.pod +GENERATE[man/man3/OSSL_ENCODER_CTX_new_for_pkey.3]=man3/OSSL_ENCODER_CTX_new_for_pkey.pod +DEPEND[html/man3/OSSL_ENCODER_to_bio.html]=man3/OSSL_ENCODER_to_bio.pod +GENERATE[html/man3/OSSL_ENCODER_to_bio.html]=man3/OSSL_ENCODER_to_bio.pod +DEPEND[man/man3/OSSL_ENCODER_to_bio.3]=man3/OSSL_ENCODER_to_bio.pod +GENERATE[man/man3/OSSL_ENCODER_to_bio.3]=man3/OSSL_ENCODER_to_bio.pod +DEPEND[html/man3/OSSL_ESS_check_signing_certs.html]=man3/OSSL_ESS_check_signing_certs.pod +GENERATE[html/man3/OSSL_ESS_check_signing_certs.html]=man3/OSSL_ESS_check_signing_certs.pod +DEPEND[man/man3/OSSL_ESS_check_signing_certs.3]=man3/OSSL_ESS_check_signing_certs.pod +GENERATE[man/man3/OSSL_ESS_check_signing_certs.3]=man3/OSSL_ESS_check_signing_certs.pod +DEPEND[html/man3/OSSL_HTTP_REQ_CTX.html]=man3/OSSL_HTTP_REQ_CTX.pod +GENERATE[html/man3/OSSL_HTTP_REQ_CTX.html]=man3/OSSL_HTTP_REQ_CTX.pod +DEPEND[man/man3/OSSL_HTTP_REQ_CTX.3]=man3/OSSL_HTTP_REQ_CTX.pod +GENERATE[man/man3/OSSL_HTTP_REQ_CTX.3]=man3/OSSL_HTTP_REQ_CTX.pod +DEPEND[html/man3/OSSL_HTTP_parse_url.html]=man3/OSSL_HTTP_parse_url.pod +GENERATE[html/man3/OSSL_HTTP_parse_url.html]=man3/OSSL_HTTP_parse_url.pod +DEPEND[man/man3/OSSL_HTTP_parse_url.3]=man3/OSSL_HTTP_parse_url.pod +GENERATE[man/man3/OSSL_HTTP_parse_url.3]=man3/OSSL_HTTP_parse_url.pod +DEPEND[html/man3/OSSL_HTTP_transfer.html]=man3/OSSL_HTTP_transfer.pod +GENERATE[html/man3/OSSL_HTTP_transfer.html]=man3/OSSL_HTTP_transfer.pod +DEPEND[man/man3/OSSL_HTTP_transfer.3]=man3/OSSL_HTTP_transfer.pod +GENERATE[man/man3/OSSL_HTTP_transfer.3]=man3/OSSL_HTTP_transfer.pod +DEPEND[html/man3/OSSL_ITEM.html]=man3/OSSL_ITEM.pod +GENERATE[html/man3/OSSL_ITEM.html]=man3/OSSL_ITEM.pod +DEPEND[man/man3/OSSL_ITEM.3]=man3/OSSL_ITEM.pod +GENERATE[man/man3/OSSL_ITEM.3]=man3/OSSL_ITEM.pod +DEPEND[html/man3/OSSL_LIB_CTX.html]=man3/OSSL_LIB_CTX.pod +GENERATE[html/man3/OSSL_LIB_CTX.html]=man3/OSSL_LIB_CTX.pod +DEPEND[man/man3/OSSL_LIB_CTX.3]=man3/OSSL_LIB_CTX.pod +GENERATE[man/man3/OSSL_LIB_CTX.3]=man3/OSSL_LIB_CTX.pod +DEPEND[html/man3/OSSL_PARAM.html]=man3/OSSL_PARAM.pod +GENERATE[html/man3/OSSL_PARAM.html]=man3/OSSL_PARAM.pod +DEPEND[man/man3/OSSL_PARAM.3]=man3/OSSL_PARAM.pod +GENERATE[man/man3/OSSL_PARAM.3]=man3/OSSL_PARAM.pod +DEPEND[html/man3/OSSL_PARAM_BLD.html]=man3/OSSL_PARAM_BLD.pod +GENERATE[html/man3/OSSL_PARAM_BLD.html]=man3/OSSL_PARAM_BLD.pod +DEPEND[man/man3/OSSL_PARAM_BLD.3]=man3/OSSL_PARAM_BLD.pod +GENERATE[man/man3/OSSL_PARAM_BLD.3]=man3/OSSL_PARAM_BLD.pod +DEPEND[html/man3/OSSL_PARAM_allocate_from_text.html]=man3/OSSL_PARAM_allocate_from_text.pod +GENERATE[html/man3/OSSL_PARAM_allocate_from_text.html]=man3/OSSL_PARAM_allocate_from_text.pod +DEPEND[man/man3/OSSL_PARAM_allocate_from_text.3]=man3/OSSL_PARAM_allocate_from_text.pod +GENERATE[man/man3/OSSL_PARAM_allocate_from_text.3]=man3/OSSL_PARAM_allocate_from_text.pod +DEPEND[html/man3/OSSL_PARAM_dup.html]=man3/OSSL_PARAM_dup.pod +GENERATE[html/man3/OSSL_PARAM_dup.html]=man3/OSSL_PARAM_dup.pod +DEPEND[man/man3/OSSL_PARAM_dup.3]=man3/OSSL_PARAM_dup.pod +GENERATE[man/man3/OSSL_PARAM_dup.3]=man3/OSSL_PARAM_dup.pod +DEPEND[html/man3/OSSL_PARAM_int.html]=man3/OSSL_PARAM_int.pod +GENERATE[html/man3/OSSL_PARAM_int.html]=man3/OSSL_PARAM_int.pod +DEPEND[man/man3/OSSL_PARAM_int.3]=man3/OSSL_PARAM_int.pod +GENERATE[man/man3/OSSL_PARAM_int.3]=man3/OSSL_PARAM_int.pod +DEPEND[html/man3/OSSL_PROVIDER.html]=man3/OSSL_PROVIDER.pod +GENERATE[html/man3/OSSL_PROVIDER.html]=man3/OSSL_PROVIDER.pod +DEPEND[man/man3/OSSL_PROVIDER.3]=man3/OSSL_PROVIDER.pod +GENERATE[man/man3/OSSL_PROVIDER.3]=man3/OSSL_PROVIDER.pod +DEPEND[html/man3/OSSL_SELF_TEST_new.html]=man3/OSSL_SELF_TEST_new.pod +GENERATE[html/man3/OSSL_SELF_TEST_new.html]=man3/OSSL_SELF_TEST_new.pod +DEPEND[man/man3/OSSL_SELF_TEST_new.3]=man3/OSSL_SELF_TEST_new.pod +GENERATE[man/man3/OSSL_SELF_TEST_new.3]=man3/OSSL_SELF_TEST_new.pod +DEPEND[html/man3/OSSL_SELF_TEST_set_callback.html]=man3/OSSL_SELF_TEST_set_callback.pod +GENERATE[html/man3/OSSL_SELF_TEST_set_callback.html]=man3/OSSL_SELF_TEST_set_callback.pod +DEPEND[man/man3/OSSL_SELF_TEST_set_callback.3]=man3/OSSL_SELF_TEST_set_callback.pod +GENERATE[man/man3/OSSL_SELF_TEST_set_callback.3]=man3/OSSL_SELF_TEST_set_callback.pod +DEPEND[html/man3/OSSL_STORE_INFO.html]=man3/OSSL_STORE_INFO.pod +GENERATE[html/man3/OSSL_STORE_INFO.html]=man3/OSSL_STORE_INFO.pod +DEPEND[man/man3/OSSL_STORE_INFO.3]=man3/OSSL_STORE_INFO.pod +GENERATE[man/man3/OSSL_STORE_INFO.3]=man3/OSSL_STORE_INFO.pod +DEPEND[html/man3/OSSL_STORE_LOADER.html]=man3/OSSL_STORE_LOADER.pod +GENERATE[html/man3/OSSL_STORE_LOADER.html]=man3/OSSL_STORE_LOADER.pod +DEPEND[man/man3/OSSL_STORE_LOADER.3]=man3/OSSL_STORE_LOADER.pod +GENERATE[man/man3/OSSL_STORE_LOADER.3]=man3/OSSL_STORE_LOADER.pod +DEPEND[html/man3/OSSL_STORE_SEARCH.html]=man3/OSSL_STORE_SEARCH.pod +GENERATE[html/man3/OSSL_STORE_SEARCH.html]=man3/OSSL_STORE_SEARCH.pod +DEPEND[man/man3/OSSL_STORE_SEARCH.3]=man3/OSSL_STORE_SEARCH.pod +GENERATE[man/man3/OSSL_STORE_SEARCH.3]=man3/OSSL_STORE_SEARCH.pod +DEPEND[html/man3/OSSL_STORE_attach.html]=man3/OSSL_STORE_attach.pod +GENERATE[html/man3/OSSL_STORE_attach.html]=man3/OSSL_STORE_attach.pod +DEPEND[man/man3/OSSL_STORE_attach.3]=man3/OSSL_STORE_attach.pod +GENERATE[man/man3/OSSL_STORE_attach.3]=man3/OSSL_STORE_attach.pod +DEPEND[html/man3/OSSL_STORE_expect.html]=man3/OSSL_STORE_expect.pod +GENERATE[html/man3/OSSL_STORE_expect.html]=man3/OSSL_STORE_expect.pod +DEPEND[man/man3/OSSL_STORE_expect.3]=man3/OSSL_STORE_expect.pod +GENERATE[man/man3/OSSL_STORE_expect.3]=man3/OSSL_STORE_expect.pod +DEPEND[html/man3/OSSL_STORE_open.html]=man3/OSSL_STORE_open.pod +GENERATE[html/man3/OSSL_STORE_open.html]=man3/OSSL_STORE_open.pod +DEPEND[man/man3/OSSL_STORE_open.3]=man3/OSSL_STORE_open.pod +GENERATE[man/man3/OSSL_STORE_open.3]=man3/OSSL_STORE_open.pod +DEPEND[html/man3/OSSL_trace_enabled.html]=man3/OSSL_trace_enabled.pod +GENERATE[html/man3/OSSL_trace_enabled.html]=man3/OSSL_trace_enabled.pod +DEPEND[man/man3/OSSL_trace_enabled.3]=man3/OSSL_trace_enabled.pod +GENERATE[man/man3/OSSL_trace_enabled.3]=man3/OSSL_trace_enabled.pod +DEPEND[html/man3/OSSL_trace_get_category_num.html]=man3/OSSL_trace_get_category_num.pod +GENERATE[html/man3/OSSL_trace_get_category_num.html]=man3/OSSL_trace_get_category_num.pod +DEPEND[man/man3/OSSL_trace_get_category_num.3]=man3/OSSL_trace_get_category_num.pod +GENERATE[man/man3/OSSL_trace_get_category_num.3]=man3/OSSL_trace_get_category_num.pod +DEPEND[html/man3/OSSL_trace_set_channel.html]=man3/OSSL_trace_set_channel.pod +GENERATE[html/man3/OSSL_trace_set_channel.html]=man3/OSSL_trace_set_channel.pod +DEPEND[man/man3/OSSL_trace_set_channel.3]=man3/OSSL_trace_set_channel.pod +GENERATE[man/man3/OSSL_trace_set_channel.3]=man3/OSSL_trace_set_channel.pod +DEPEND[html/man3/OpenSSL_add_all_algorithms.html]=man3/OpenSSL_add_all_algorithms.pod +GENERATE[html/man3/OpenSSL_add_all_algorithms.html]=man3/OpenSSL_add_all_algorithms.pod +DEPEND[man/man3/OpenSSL_add_all_algorithms.3]=man3/OpenSSL_add_all_algorithms.pod +GENERATE[man/man3/OpenSSL_add_all_algorithms.3]=man3/OpenSSL_add_all_algorithms.pod +DEPEND[html/man3/OpenSSL_version.html]=man3/OpenSSL_version.pod +GENERATE[html/man3/OpenSSL_version.html]=man3/OpenSSL_version.pod +DEPEND[man/man3/OpenSSL_version.3]=man3/OpenSSL_version.pod +GENERATE[man/man3/OpenSSL_version.3]=man3/OpenSSL_version.pod +DEPEND[html/man3/PEM_X509_INFO_read_bio_ex.html]=man3/PEM_X509_INFO_read_bio_ex.pod +GENERATE[html/man3/PEM_X509_INFO_read_bio_ex.html]=man3/PEM_X509_INFO_read_bio_ex.pod +DEPEND[man/man3/PEM_X509_INFO_read_bio_ex.3]=man3/PEM_X509_INFO_read_bio_ex.pod +GENERATE[man/man3/PEM_X509_INFO_read_bio_ex.3]=man3/PEM_X509_INFO_read_bio_ex.pod +DEPEND[html/man3/PEM_bytes_read_bio.html]=man3/PEM_bytes_read_bio.pod +GENERATE[html/man3/PEM_bytes_read_bio.html]=man3/PEM_bytes_read_bio.pod +DEPEND[man/man3/PEM_bytes_read_bio.3]=man3/PEM_bytes_read_bio.pod +GENERATE[man/man3/PEM_bytes_read_bio.3]=man3/PEM_bytes_read_bio.pod +DEPEND[html/man3/PEM_read.html]=man3/PEM_read.pod +GENERATE[html/man3/PEM_read.html]=man3/PEM_read.pod +DEPEND[man/man3/PEM_read.3]=man3/PEM_read.pod +GENERATE[man/man3/PEM_read.3]=man3/PEM_read.pod +DEPEND[html/man3/PEM_read_CMS.html]=man3/PEM_read_CMS.pod +GENERATE[html/man3/PEM_read_CMS.html]=man3/PEM_read_CMS.pod +DEPEND[man/man3/PEM_read_CMS.3]=man3/PEM_read_CMS.pod +GENERATE[man/man3/PEM_read_CMS.3]=man3/PEM_read_CMS.pod +DEPEND[html/man3/PEM_read_bio_PrivateKey.html]=man3/PEM_read_bio_PrivateKey.pod +GENERATE[html/man3/PEM_read_bio_PrivateKey.html]=man3/PEM_read_bio_PrivateKey.pod +DEPEND[man/man3/PEM_read_bio_PrivateKey.3]=man3/PEM_read_bio_PrivateKey.pod +GENERATE[man/man3/PEM_read_bio_PrivateKey.3]=man3/PEM_read_bio_PrivateKey.pod +DEPEND[html/man3/PEM_read_bio_ex.html]=man3/PEM_read_bio_ex.pod +GENERATE[html/man3/PEM_read_bio_ex.html]=man3/PEM_read_bio_ex.pod +DEPEND[man/man3/PEM_read_bio_ex.3]=man3/PEM_read_bio_ex.pod +GENERATE[man/man3/PEM_read_bio_ex.3]=man3/PEM_read_bio_ex.pod +DEPEND[html/man3/PEM_write_bio_CMS_stream.html]=man3/PEM_write_bio_CMS_stream.pod +GENERATE[html/man3/PEM_write_bio_CMS_stream.html]=man3/PEM_write_bio_CMS_stream.pod +DEPEND[man/man3/PEM_write_bio_CMS_stream.3]=man3/PEM_write_bio_CMS_stream.pod +GENERATE[man/man3/PEM_write_bio_CMS_stream.3]=man3/PEM_write_bio_CMS_stream.pod +DEPEND[html/man3/PEM_write_bio_PKCS7_stream.html]=man3/PEM_write_bio_PKCS7_stream.pod +GENERATE[html/man3/PEM_write_bio_PKCS7_stream.html]=man3/PEM_write_bio_PKCS7_stream.pod +DEPEND[man/man3/PEM_write_bio_PKCS7_stream.3]=man3/PEM_write_bio_PKCS7_stream.pod +GENERATE[man/man3/PEM_write_bio_PKCS7_stream.3]=man3/PEM_write_bio_PKCS7_stream.pod +DEPEND[html/man3/PKCS12_PBE_keyivgen.html]=man3/PKCS12_PBE_keyivgen.pod +GENERATE[html/man3/PKCS12_PBE_keyivgen.html]=man3/PKCS12_PBE_keyivgen.pod +DEPEND[man/man3/PKCS12_PBE_keyivgen.3]=man3/PKCS12_PBE_keyivgen.pod +GENERATE[man/man3/PKCS12_PBE_keyivgen.3]=man3/PKCS12_PBE_keyivgen.pod +DEPEND[html/man3/PKCS12_SAFEBAG_create_cert.html]=man3/PKCS12_SAFEBAG_create_cert.pod +GENERATE[html/man3/PKCS12_SAFEBAG_create_cert.html]=man3/PKCS12_SAFEBAG_create_cert.pod +DEPEND[man/man3/PKCS12_SAFEBAG_create_cert.3]=man3/PKCS12_SAFEBAG_create_cert.pod +GENERATE[man/man3/PKCS12_SAFEBAG_create_cert.3]=man3/PKCS12_SAFEBAG_create_cert.pod +DEPEND[html/man3/PKCS12_SAFEBAG_get0_attrs.html]=man3/PKCS12_SAFEBAG_get0_attrs.pod +GENERATE[html/man3/PKCS12_SAFEBAG_get0_attrs.html]=man3/PKCS12_SAFEBAG_get0_attrs.pod +DEPEND[man/man3/PKCS12_SAFEBAG_get0_attrs.3]=man3/PKCS12_SAFEBAG_get0_attrs.pod +GENERATE[man/man3/PKCS12_SAFEBAG_get0_attrs.3]=man3/PKCS12_SAFEBAG_get0_attrs.pod +DEPEND[html/man3/PKCS12_SAFEBAG_get1_cert.html]=man3/PKCS12_SAFEBAG_get1_cert.pod +GENERATE[html/man3/PKCS12_SAFEBAG_get1_cert.html]=man3/PKCS12_SAFEBAG_get1_cert.pod +DEPEND[man/man3/PKCS12_SAFEBAG_get1_cert.3]=man3/PKCS12_SAFEBAG_get1_cert.pod +GENERATE[man/man3/PKCS12_SAFEBAG_get1_cert.3]=man3/PKCS12_SAFEBAG_get1_cert.pod +DEPEND[html/man3/PKCS12_add1_attr_by_NID.html]=man3/PKCS12_add1_attr_by_NID.pod +GENERATE[html/man3/PKCS12_add1_attr_by_NID.html]=man3/PKCS12_add1_attr_by_NID.pod +DEPEND[man/man3/PKCS12_add1_attr_by_NID.3]=man3/PKCS12_add1_attr_by_NID.pod +GENERATE[man/man3/PKCS12_add1_attr_by_NID.3]=man3/PKCS12_add1_attr_by_NID.pod +DEPEND[html/man3/PKCS12_add_CSPName_asc.html]=man3/PKCS12_add_CSPName_asc.pod +GENERATE[html/man3/PKCS12_add_CSPName_asc.html]=man3/PKCS12_add_CSPName_asc.pod +DEPEND[man/man3/PKCS12_add_CSPName_asc.3]=man3/PKCS12_add_CSPName_asc.pod +GENERATE[man/man3/PKCS12_add_CSPName_asc.3]=man3/PKCS12_add_CSPName_asc.pod +DEPEND[html/man3/PKCS12_add_cert.html]=man3/PKCS12_add_cert.pod +GENERATE[html/man3/PKCS12_add_cert.html]=man3/PKCS12_add_cert.pod +DEPEND[man/man3/PKCS12_add_cert.3]=man3/PKCS12_add_cert.pod +GENERATE[man/man3/PKCS12_add_cert.3]=man3/PKCS12_add_cert.pod +DEPEND[html/man3/PKCS12_add_friendlyname_asc.html]=man3/PKCS12_add_friendlyname_asc.pod +GENERATE[html/man3/PKCS12_add_friendlyname_asc.html]=man3/PKCS12_add_friendlyname_asc.pod +DEPEND[man/man3/PKCS12_add_friendlyname_asc.3]=man3/PKCS12_add_friendlyname_asc.pod +GENERATE[man/man3/PKCS12_add_friendlyname_asc.3]=man3/PKCS12_add_friendlyname_asc.pod +DEPEND[html/man3/PKCS12_add_localkeyid.html]=man3/PKCS12_add_localkeyid.pod +GENERATE[html/man3/PKCS12_add_localkeyid.html]=man3/PKCS12_add_localkeyid.pod +DEPEND[man/man3/PKCS12_add_localkeyid.3]=man3/PKCS12_add_localkeyid.pod +GENERATE[man/man3/PKCS12_add_localkeyid.3]=man3/PKCS12_add_localkeyid.pod +DEPEND[html/man3/PKCS12_add_safe.html]=man3/PKCS12_add_safe.pod +GENERATE[html/man3/PKCS12_add_safe.html]=man3/PKCS12_add_safe.pod +DEPEND[man/man3/PKCS12_add_safe.3]=man3/PKCS12_add_safe.pod +GENERATE[man/man3/PKCS12_add_safe.3]=man3/PKCS12_add_safe.pod +DEPEND[html/man3/PKCS12_create.html]=man3/PKCS12_create.pod +GENERATE[html/man3/PKCS12_create.html]=man3/PKCS12_create.pod +DEPEND[man/man3/PKCS12_create.3]=man3/PKCS12_create.pod +GENERATE[man/man3/PKCS12_create.3]=man3/PKCS12_create.pod +DEPEND[html/man3/PKCS12_decrypt_skey.html]=man3/PKCS12_decrypt_skey.pod +GENERATE[html/man3/PKCS12_decrypt_skey.html]=man3/PKCS12_decrypt_skey.pod +DEPEND[man/man3/PKCS12_decrypt_skey.3]=man3/PKCS12_decrypt_skey.pod +GENERATE[man/man3/PKCS12_decrypt_skey.3]=man3/PKCS12_decrypt_skey.pod +DEPEND[html/man3/PKCS12_gen_mac.html]=man3/PKCS12_gen_mac.pod +GENERATE[html/man3/PKCS12_gen_mac.html]=man3/PKCS12_gen_mac.pod +DEPEND[man/man3/PKCS12_gen_mac.3]=man3/PKCS12_gen_mac.pod +GENERATE[man/man3/PKCS12_gen_mac.3]=man3/PKCS12_gen_mac.pod +DEPEND[html/man3/PKCS12_get_friendlyname.html]=man3/PKCS12_get_friendlyname.pod +GENERATE[html/man3/PKCS12_get_friendlyname.html]=man3/PKCS12_get_friendlyname.pod +DEPEND[man/man3/PKCS12_get_friendlyname.3]=man3/PKCS12_get_friendlyname.pod +GENERATE[man/man3/PKCS12_get_friendlyname.3]=man3/PKCS12_get_friendlyname.pod +DEPEND[html/man3/PKCS12_init.html]=man3/PKCS12_init.pod +GENERATE[html/man3/PKCS12_init.html]=man3/PKCS12_init.pod +DEPEND[man/man3/PKCS12_init.3]=man3/PKCS12_init.pod +GENERATE[man/man3/PKCS12_init.3]=man3/PKCS12_init.pod +DEPEND[html/man3/PKCS12_item_decrypt_d2i.html]=man3/PKCS12_item_decrypt_d2i.pod +GENERATE[html/man3/PKCS12_item_decrypt_d2i.html]=man3/PKCS12_item_decrypt_d2i.pod +DEPEND[man/man3/PKCS12_item_decrypt_d2i.3]=man3/PKCS12_item_decrypt_d2i.pod +GENERATE[man/man3/PKCS12_item_decrypt_d2i.3]=man3/PKCS12_item_decrypt_d2i.pod +DEPEND[html/man3/PKCS12_key_gen_utf8_ex.html]=man3/PKCS12_key_gen_utf8_ex.pod +GENERATE[html/man3/PKCS12_key_gen_utf8_ex.html]=man3/PKCS12_key_gen_utf8_ex.pod +DEPEND[man/man3/PKCS12_key_gen_utf8_ex.3]=man3/PKCS12_key_gen_utf8_ex.pod +GENERATE[man/man3/PKCS12_key_gen_utf8_ex.3]=man3/PKCS12_key_gen_utf8_ex.pod +DEPEND[html/man3/PKCS12_newpass.html]=man3/PKCS12_newpass.pod +GENERATE[html/man3/PKCS12_newpass.html]=man3/PKCS12_newpass.pod +DEPEND[man/man3/PKCS12_newpass.3]=man3/PKCS12_newpass.pod +GENERATE[man/man3/PKCS12_newpass.3]=man3/PKCS12_newpass.pod +DEPEND[html/man3/PKCS12_pack_p7encdata.html]=man3/PKCS12_pack_p7encdata.pod +GENERATE[html/man3/PKCS12_pack_p7encdata.html]=man3/PKCS12_pack_p7encdata.pod +DEPEND[man/man3/PKCS12_pack_p7encdata.3]=man3/PKCS12_pack_p7encdata.pod +GENERATE[man/man3/PKCS12_pack_p7encdata.3]=man3/PKCS12_pack_p7encdata.pod +DEPEND[html/man3/PKCS12_parse.html]=man3/PKCS12_parse.pod +GENERATE[html/man3/PKCS12_parse.html]=man3/PKCS12_parse.pod +DEPEND[man/man3/PKCS12_parse.3]=man3/PKCS12_parse.pod +GENERATE[man/man3/PKCS12_parse.3]=man3/PKCS12_parse.pod +DEPEND[html/man3/PKCS5_PBE_keyivgen.html]=man3/PKCS5_PBE_keyivgen.pod +GENERATE[html/man3/PKCS5_PBE_keyivgen.html]=man3/PKCS5_PBE_keyivgen.pod +DEPEND[man/man3/PKCS5_PBE_keyivgen.3]=man3/PKCS5_PBE_keyivgen.pod +GENERATE[man/man3/PKCS5_PBE_keyivgen.3]=man3/PKCS5_PBE_keyivgen.pod +DEPEND[html/man3/PKCS5_PBKDF2_HMAC.html]=man3/PKCS5_PBKDF2_HMAC.pod +GENERATE[html/man3/PKCS5_PBKDF2_HMAC.html]=man3/PKCS5_PBKDF2_HMAC.pod +DEPEND[man/man3/PKCS5_PBKDF2_HMAC.3]=man3/PKCS5_PBKDF2_HMAC.pod +GENERATE[man/man3/PKCS5_PBKDF2_HMAC.3]=man3/PKCS5_PBKDF2_HMAC.pod +DEPEND[html/man3/PKCS7_decrypt.html]=man3/PKCS7_decrypt.pod +GENERATE[html/man3/PKCS7_decrypt.html]=man3/PKCS7_decrypt.pod +DEPEND[man/man3/PKCS7_decrypt.3]=man3/PKCS7_decrypt.pod +GENERATE[man/man3/PKCS7_decrypt.3]=man3/PKCS7_decrypt.pod +DEPEND[html/man3/PKCS7_encrypt.html]=man3/PKCS7_encrypt.pod +GENERATE[html/man3/PKCS7_encrypt.html]=man3/PKCS7_encrypt.pod +DEPEND[man/man3/PKCS7_encrypt.3]=man3/PKCS7_encrypt.pod +GENERATE[man/man3/PKCS7_encrypt.3]=man3/PKCS7_encrypt.pod +DEPEND[html/man3/PKCS7_get_octet_string.html]=man3/PKCS7_get_octet_string.pod +GENERATE[html/man3/PKCS7_get_octet_string.html]=man3/PKCS7_get_octet_string.pod +DEPEND[man/man3/PKCS7_get_octet_string.3]=man3/PKCS7_get_octet_string.pod +GENERATE[man/man3/PKCS7_get_octet_string.3]=man3/PKCS7_get_octet_string.pod +DEPEND[html/man3/PKCS7_sign.html]=man3/PKCS7_sign.pod +GENERATE[html/man3/PKCS7_sign.html]=man3/PKCS7_sign.pod +DEPEND[man/man3/PKCS7_sign.3]=man3/PKCS7_sign.pod +GENERATE[man/man3/PKCS7_sign.3]=man3/PKCS7_sign.pod +DEPEND[html/man3/PKCS7_sign_add_signer.html]=man3/PKCS7_sign_add_signer.pod +GENERATE[html/man3/PKCS7_sign_add_signer.html]=man3/PKCS7_sign_add_signer.pod +DEPEND[man/man3/PKCS7_sign_add_signer.3]=man3/PKCS7_sign_add_signer.pod +GENERATE[man/man3/PKCS7_sign_add_signer.3]=man3/PKCS7_sign_add_signer.pod +DEPEND[html/man3/PKCS7_type_is_other.html]=man3/PKCS7_type_is_other.pod +GENERATE[html/man3/PKCS7_type_is_other.html]=man3/PKCS7_type_is_other.pod +DEPEND[man/man3/PKCS7_type_is_other.3]=man3/PKCS7_type_is_other.pod +GENERATE[man/man3/PKCS7_type_is_other.3]=man3/PKCS7_type_is_other.pod +DEPEND[html/man3/PKCS7_verify.html]=man3/PKCS7_verify.pod +GENERATE[html/man3/PKCS7_verify.html]=man3/PKCS7_verify.pod +DEPEND[man/man3/PKCS7_verify.3]=man3/PKCS7_verify.pod +GENERATE[man/man3/PKCS7_verify.3]=man3/PKCS7_verify.pod +DEPEND[html/man3/PKCS8_encrypt.html]=man3/PKCS8_encrypt.pod +GENERATE[html/man3/PKCS8_encrypt.html]=man3/PKCS8_encrypt.pod +DEPEND[man/man3/PKCS8_encrypt.3]=man3/PKCS8_encrypt.pod +GENERATE[man/man3/PKCS8_encrypt.3]=man3/PKCS8_encrypt.pod +DEPEND[html/man3/PKCS8_pkey_add1_attr.html]=man3/PKCS8_pkey_add1_attr.pod +GENERATE[html/man3/PKCS8_pkey_add1_attr.html]=man3/PKCS8_pkey_add1_attr.pod +DEPEND[man/man3/PKCS8_pkey_add1_attr.3]=man3/PKCS8_pkey_add1_attr.pod +GENERATE[man/man3/PKCS8_pkey_add1_attr.3]=man3/PKCS8_pkey_add1_attr.pod +DEPEND[html/man3/RAND_add.html]=man3/RAND_add.pod +GENERATE[html/man3/RAND_add.html]=man3/RAND_add.pod +DEPEND[man/man3/RAND_add.3]=man3/RAND_add.pod +GENERATE[man/man3/RAND_add.3]=man3/RAND_add.pod +DEPEND[html/man3/RAND_bytes.html]=man3/RAND_bytes.pod +GENERATE[html/man3/RAND_bytes.html]=man3/RAND_bytes.pod +DEPEND[man/man3/RAND_bytes.3]=man3/RAND_bytes.pod +GENERATE[man/man3/RAND_bytes.3]=man3/RAND_bytes.pod +DEPEND[html/man3/RAND_cleanup.html]=man3/RAND_cleanup.pod +GENERATE[html/man3/RAND_cleanup.html]=man3/RAND_cleanup.pod +DEPEND[man/man3/RAND_cleanup.3]=man3/RAND_cleanup.pod +GENERATE[man/man3/RAND_cleanup.3]=man3/RAND_cleanup.pod +DEPEND[html/man3/RAND_egd.html]=man3/RAND_egd.pod +GENERATE[html/man3/RAND_egd.html]=man3/RAND_egd.pod +DEPEND[man/man3/RAND_egd.3]=man3/RAND_egd.pod +GENERATE[man/man3/RAND_egd.3]=man3/RAND_egd.pod +DEPEND[html/man3/RAND_get0_primary.html]=man3/RAND_get0_primary.pod +GENERATE[html/man3/RAND_get0_primary.html]=man3/RAND_get0_primary.pod +DEPEND[man/man3/RAND_get0_primary.3]=man3/RAND_get0_primary.pod +GENERATE[man/man3/RAND_get0_primary.3]=man3/RAND_get0_primary.pod +DEPEND[html/man3/RAND_load_file.html]=man3/RAND_load_file.pod +GENERATE[html/man3/RAND_load_file.html]=man3/RAND_load_file.pod +DEPEND[man/man3/RAND_load_file.3]=man3/RAND_load_file.pod +GENERATE[man/man3/RAND_load_file.3]=man3/RAND_load_file.pod +DEPEND[html/man3/RAND_set_DRBG_type.html]=man3/RAND_set_DRBG_type.pod +GENERATE[html/man3/RAND_set_DRBG_type.html]=man3/RAND_set_DRBG_type.pod +DEPEND[man/man3/RAND_set_DRBG_type.3]=man3/RAND_set_DRBG_type.pod +GENERATE[man/man3/RAND_set_DRBG_type.3]=man3/RAND_set_DRBG_type.pod +DEPEND[html/man3/RAND_set_rand_method.html]=man3/RAND_set_rand_method.pod +GENERATE[html/man3/RAND_set_rand_method.html]=man3/RAND_set_rand_method.pod +DEPEND[man/man3/RAND_set_rand_method.3]=man3/RAND_set_rand_method.pod +GENERATE[man/man3/RAND_set_rand_method.3]=man3/RAND_set_rand_method.pod +DEPEND[html/man3/RC4_set_key.html]=man3/RC4_set_key.pod +GENERATE[html/man3/RC4_set_key.html]=man3/RC4_set_key.pod +DEPEND[man/man3/RC4_set_key.3]=man3/RC4_set_key.pod +GENERATE[man/man3/RC4_set_key.3]=man3/RC4_set_key.pod +DEPEND[html/man3/RIPEMD160_Init.html]=man3/RIPEMD160_Init.pod +GENERATE[html/man3/RIPEMD160_Init.html]=man3/RIPEMD160_Init.pod +DEPEND[man/man3/RIPEMD160_Init.3]=man3/RIPEMD160_Init.pod +GENERATE[man/man3/RIPEMD160_Init.3]=man3/RIPEMD160_Init.pod +DEPEND[html/man3/RSA_blinding_on.html]=man3/RSA_blinding_on.pod +GENERATE[html/man3/RSA_blinding_on.html]=man3/RSA_blinding_on.pod +DEPEND[man/man3/RSA_blinding_on.3]=man3/RSA_blinding_on.pod +GENERATE[man/man3/RSA_blinding_on.3]=man3/RSA_blinding_on.pod +DEPEND[html/man3/RSA_check_key.html]=man3/RSA_check_key.pod +GENERATE[html/man3/RSA_check_key.html]=man3/RSA_check_key.pod +DEPEND[man/man3/RSA_check_key.3]=man3/RSA_check_key.pod +GENERATE[man/man3/RSA_check_key.3]=man3/RSA_check_key.pod +DEPEND[html/man3/RSA_generate_key.html]=man3/RSA_generate_key.pod +GENERATE[html/man3/RSA_generate_key.html]=man3/RSA_generate_key.pod +DEPEND[man/man3/RSA_generate_key.3]=man3/RSA_generate_key.pod +GENERATE[man/man3/RSA_generate_key.3]=man3/RSA_generate_key.pod +DEPEND[html/man3/RSA_get0_key.html]=man3/RSA_get0_key.pod +GENERATE[html/man3/RSA_get0_key.html]=man3/RSA_get0_key.pod +DEPEND[man/man3/RSA_get0_key.3]=man3/RSA_get0_key.pod +GENERATE[man/man3/RSA_get0_key.3]=man3/RSA_get0_key.pod +DEPEND[html/man3/RSA_meth_new.html]=man3/RSA_meth_new.pod +GENERATE[html/man3/RSA_meth_new.html]=man3/RSA_meth_new.pod +DEPEND[man/man3/RSA_meth_new.3]=man3/RSA_meth_new.pod +GENERATE[man/man3/RSA_meth_new.3]=man3/RSA_meth_new.pod +DEPEND[html/man3/RSA_new.html]=man3/RSA_new.pod +GENERATE[html/man3/RSA_new.html]=man3/RSA_new.pod +DEPEND[man/man3/RSA_new.3]=man3/RSA_new.pod +GENERATE[man/man3/RSA_new.3]=man3/RSA_new.pod +DEPEND[html/man3/RSA_padding_add_PKCS1_type_1.html]=man3/RSA_padding_add_PKCS1_type_1.pod +GENERATE[html/man3/RSA_padding_add_PKCS1_type_1.html]=man3/RSA_padding_add_PKCS1_type_1.pod +DEPEND[man/man3/RSA_padding_add_PKCS1_type_1.3]=man3/RSA_padding_add_PKCS1_type_1.pod +GENERATE[man/man3/RSA_padding_add_PKCS1_type_1.3]=man3/RSA_padding_add_PKCS1_type_1.pod +DEPEND[html/man3/RSA_print.html]=man3/RSA_print.pod +GENERATE[html/man3/RSA_print.html]=man3/RSA_print.pod +DEPEND[man/man3/RSA_print.3]=man3/RSA_print.pod +GENERATE[man/man3/RSA_print.3]=man3/RSA_print.pod +DEPEND[html/man3/RSA_private_encrypt.html]=man3/RSA_private_encrypt.pod +GENERATE[html/man3/RSA_private_encrypt.html]=man3/RSA_private_encrypt.pod +DEPEND[man/man3/RSA_private_encrypt.3]=man3/RSA_private_encrypt.pod +GENERATE[man/man3/RSA_private_encrypt.3]=man3/RSA_private_encrypt.pod +DEPEND[html/man3/RSA_public_encrypt.html]=man3/RSA_public_encrypt.pod +GENERATE[html/man3/RSA_public_encrypt.html]=man3/RSA_public_encrypt.pod +DEPEND[man/man3/RSA_public_encrypt.3]=man3/RSA_public_encrypt.pod +GENERATE[man/man3/RSA_public_encrypt.3]=man3/RSA_public_encrypt.pod +DEPEND[html/man3/RSA_set_method.html]=man3/RSA_set_method.pod +GENERATE[html/man3/RSA_set_method.html]=man3/RSA_set_method.pod +DEPEND[man/man3/RSA_set_method.3]=man3/RSA_set_method.pod +GENERATE[man/man3/RSA_set_method.3]=man3/RSA_set_method.pod +DEPEND[html/man3/RSA_sign.html]=man3/RSA_sign.pod +GENERATE[html/man3/RSA_sign.html]=man3/RSA_sign.pod +DEPEND[man/man3/RSA_sign.3]=man3/RSA_sign.pod +GENERATE[man/man3/RSA_sign.3]=man3/RSA_sign.pod +DEPEND[html/man3/RSA_sign_ASN1_OCTET_STRING.html]=man3/RSA_sign_ASN1_OCTET_STRING.pod +GENERATE[html/man3/RSA_sign_ASN1_OCTET_STRING.html]=man3/RSA_sign_ASN1_OCTET_STRING.pod +DEPEND[man/man3/RSA_sign_ASN1_OCTET_STRING.3]=man3/RSA_sign_ASN1_OCTET_STRING.pod +GENERATE[man/man3/RSA_sign_ASN1_OCTET_STRING.3]=man3/RSA_sign_ASN1_OCTET_STRING.pod +DEPEND[html/man3/RSA_size.html]=man3/RSA_size.pod +GENERATE[html/man3/RSA_size.html]=man3/RSA_size.pod +DEPEND[man/man3/RSA_size.3]=man3/RSA_size.pod +GENERATE[man/man3/RSA_size.3]=man3/RSA_size.pod +DEPEND[html/man3/SCT_new.html]=man3/SCT_new.pod +GENERATE[html/man3/SCT_new.html]=man3/SCT_new.pod +DEPEND[man/man3/SCT_new.3]=man3/SCT_new.pod +GENERATE[man/man3/SCT_new.3]=man3/SCT_new.pod +DEPEND[html/man3/SCT_print.html]=man3/SCT_print.pod +GENERATE[html/man3/SCT_print.html]=man3/SCT_print.pod +DEPEND[man/man3/SCT_print.3]=man3/SCT_print.pod +GENERATE[man/man3/SCT_print.3]=man3/SCT_print.pod +DEPEND[html/man3/SCT_validate.html]=man3/SCT_validate.pod +GENERATE[html/man3/SCT_validate.html]=man3/SCT_validate.pod +DEPEND[man/man3/SCT_validate.3]=man3/SCT_validate.pod +GENERATE[man/man3/SCT_validate.3]=man3/SCT_validate.pod +DEPEND[html/man3/SHA256_Init.html]=man3/SHA256_Init.pod +GENERATE[html/man3/SHA256_Init.html]=man3/SHA256_Init.pod +DEPEND[man/man3/SHA256_Init.3]=man3/SHA256_Init.pod +GENERATE[man/man3/SHA256_Init.3]=man3/SHA256_Init.pod +DEPEND[html/man3/SMIME_read_ASN1.html]=man3/SMIME_read_ASN1.pod +GENERATE[html/man3/SMIME_read_ASN1.html]=man3/SMIME_read_ASN1.pod +DEPEND[man/man3/SMIME_read_ASN1.3]=man3/SMIME_read_ASN1.pod +GENERATE[man/man3/SMIME_read_ASN1.3]=man3/SMIME_read_ASN1.pod +DEPEND[html/man3/SMIME_read_CMS.html]=man3/SMIME_read_CMS.pod +GENERATE[html/man3/SMIME_read_CMS.html]=man3/SMIME_read_CMS.pod +DEPEND[man/man3/SMIME_read_CMS.3]=man3/SMIME_read_CMS.pod +GENERATE[man/man3/SMIME_read_CMS.3]=man3/SMIME_read_CMS.pod +DEPEND[html/man3/SMIME_read_PKCS7.html]=man3/SMIME_read_PKCS7.pod +GENERATE[html/man3/SMIME_read_PKCS7.html]=man3/SMIME_read_PKCS7.pod +DEPEND[man/man3/SMIME_read_PKCS7.3]=man3/SMIME_read_PKCS7.pod +GENERATE[man/man3/SMIME_read_PKCS7.3]=man3/SMIME_read_PKCS7.pod +DEPEND[html/man3/SMIME_write_ASN1.html]=man3/SMIME_write_ASN1.pod +GENERATE[html/man3/SMIME_write_ASN1.html]=man3/SMIME_write_ASN1.pod +DEPEND[man/man3/SMIME_write_ASN1.3]=man3/SMIME_write_ASN1.pod +GENERATE[man/man3/SMIME_write_ASN1.3]=man3/SMIME_write_ASN1.pod +DEPEND[html/man3/SMIME_write_CMS.html]=man3/SMIME_write_CMS.pod +GENERATE[html/man3/SMIME_write_CMS.html]=man3/SMIME_write_CMS.pod +DEPEND[man/man3/SMIME_write_CMS.3]=man3/SMIME_write_CMS.pod +GENERATE[man/man3/SMIME_write_CMS.3]=man3/SMIME_write_CMS.pod +DEPEND[html/man3/SMIME_write_PKCS7.html]=man3/SMIME_write_PKCS7.pod +GENERATE[html/man3/SMIME_write_PKCS7.html]=man3/SMIME_write_PKCS7.pod +DEPEND[man/man3/SMIME_write_PKCS7.3]=man3/SMIME_write_PKCS7.pod +GENERATE[man/man3/SMIME_write_PKCS7.3]=man3/SMIME_write_PKCS7.pod +DEPEND[html/man3/SRP_Calc_B.html]=man3/SRP_Calc_B.pod +GENERATE[html/man3/SRP_Calc_B.html]=man3/SRP_Calc_B.pod +DEPEND[man/man3/SRP_Calc_B.3]=man3/SRP_Calc_B.pod +GENERATE[man/man3/SRP_Calc_B.3]=man3/SRP_Calc_B.pod +DEPEND[html/man3/SRP_VBASE_new.html]=man3/SRP_VBASE_new.pod +GENERATE[html/man3/SRP_VBASE_new.html]=man3/SRP_VBASE_new.pod +DEPEND[man/man3/SRP_VBASE_new.3]=man3/SRP_VBASE_new.pod +GENERATE[man/man3/SRP_VBASE_new.3]=man3/SRP_VBASE_new.pod +DEPEND[html/man3/SRP_create_verifier.html]=man3/SRP_create_verifier.pod +GENERATE[html/man3/SRP_create_verifier.html]=man3/SRP_create_verifier.pod +DEPEND[man/man3/SRP_create_verifier.3]=man3/SRP_create_verifier.pod +GENERATE[man/man3/SRP_create_verifier.3]=man3/SRP_create_verifier.pod +DEPEND[html/man3/SRP_user_pwd_new.html]=man3/SRP_user_pwd_new.pod +GENERATE[html/man3/SRP_user_pwd_new.html]=man3/SRP_user_pwd_new.pod +DEPEND[man/man3/SRP_user_pwd_new.3]=man3/SRP_user_pwd_new.pod +GENERATE[man/man3/SRP_user_pwd_new.3]=man3/SRP_user_pwd_new.pod +DEPEND[html/man3/SSL_CIPHER_get_name.html]=man3/SSL_CIPHER_get_name.pod +GENERATE[html/man3/SSL_CIPHER_get_name.html]=man3/SSL_CIPHER_get_name.pod +DEPEND[man/man3/SSL_CIPHER_get_name.3]=man3/SSL_CIPHER_get_name.pod +GENERATE[man/man3/SSL_CIPHER_get_name.3]=man3/SSL_CIPHER_get_name.pod +DEPEND[html/man3/SSL_COMP_add_compression_method.html]=man3/SSL_COMP_add_compression_method.pod +GENERATE[html/man3/SSL_COMP_add_compression_method.html]=man3/SSL_COMP_add_compression_method.pod +DEPEND[man/man3/SSL_COMP_add_compression_method.3]=man3/SSL_COMP_add_compression_method.pod +GENERATE[man/man3/SSL_COMP_add_compression_method.3]=man3/SSL_COMP_add_compression_method.pod +DEPEND[html/man3/SSL_CONF_CTX_new.html]=man3/SSL_CONF_CTX_new.pod +GENERATE[html/man3/SSL_CONF_CTX_new.html]=man3/SSL_CONF_CTX_new.pod +DEPEND[man/man3/SSL_CONF_CTX_new.3]=man3/SSL_CONF_CTX_new.pod +GENERATE[man/man3/SSL_CONF_CTX_new.3]=man3/SSL_CONF_CTX_new.pod +DEPEND[html/man3/SSL_CONF_CTX_set1_prefix.html]=man3/SSL_CONF_CTX_set1_prefix.pod +GENERATE[html/man3/SSL_CONF_CTX_set1_prefix.html]=man3/SSL_CONF_CTX_set1_prefix.pod +DEPEND[man/man3/SSL_CONF_CTX_set1_prefix.3]=man3/SSL_CONF_CTX_set1_prefix.pod +GENERATE[man/man3/SSL_CONF_CTX_set1_prefix.3]=man3/SSL_CONF_CTX_set1_prefix.pod +DEPEND[html/man3/SSL_CONF_CTX_set_flags.html]=man3/SSL_CONF_CTX_set_flags.pod +GENERATE[html/man3/SSL_CONF_CTX_set_flags.html]=man3/SSL_CONF_CTX_set_flags.pod +DEPEND[man/man3/SSL_CONF_CTX_set_flags.3]=man3/SSL_CONF_CTX_set_flags.pod +GENERATE[man/man3/SSL_CONF_CTX_set_flags.3]=man3/SSL_CONF_CTX_set_flags.pod +DEPEND[html/man3/SSL_CONF_CTX_set_ssl_ctx.html]=man3/SSL_CONF_CTX_set_ssl_ctx.pod +GENERATE[html/man3/SSL_CONF_CTX_set_ssl_ctx.html]=man3/SSL_CONF_CTX_set_ssl_ctx.pod +DEPEND[man/man3/SSL_CONF_CTX_set_ssl_ctx.3]=man3/SSL_CONF_CTX_set_ssl_ctx.pod +GENERATE[man/man3/SSL_CONF_CTX_set_ssl_ctx.3]=man3/SSL_CONF_CTX_set_ssl_ctx.pod +DEPEND[html/man3/SSL_CONF_cmd.html]=man3/SSL_CONF_cmd.pod +GENERATE[html/man3/SSL_CONF_cmd.html]=man3/SSL_CONF_cmd.pod +DEPEND[man/man3/SSL_CONF_cmd.3]=man3/SSL_CONF_cmd.pod +GENERATE[man/man3/SSL_CONF_cmd.3]=man3/SSL_CONF_cmd.pod +DEPEND[html/man3/SSL_CONF_cmd_argv.html]=man3/SSL_CONF_cmd_argv.pod +GENERATE[html/man3/SSL_CONF_cmd_argv.html]=man3/SSL_CONF_cmd_argv.pod +DEPEND[man/man3/SSL_CONF_cmd_argv.3]=man3/SSL_CONF_cmd_argv.pod +GENERATE[man/man3/SSL_CONF_cmd_argv.3]=man3/SSL_CONF_cmd_argv.pod +DEPEND[html/man3/SSL_CTX_add1_chain_cert.html]=man3/SSL_CTX_add1_chain_cert.pod +GENERATE[html/man3/SSL_CTX_add1_chain_cert.html]=man3/SSL_CTX_add1_chain_cert.pod +DEPEND[man/man3/SSL_CTX_add1_chain_cert.3]=man3/SSL_CTX_add1_chain_cert.pod +GENERATE[man/man3/SSL_CTX_add1_chain_cert.3]=man3/SSL_CTX_add1_chain_cert.pod +DEPEND[html/man3/SSL_CTX_add_extra_chain_cert.html]=man3/SSL_CTX_add_extra_chain_cert.pod +GENERATE[html/man3/SSL_CTX_add_extra_chain_cert.html]=man3/SSL_CTX_add_extra_chain_cert.pod +DEPEND[man/man3/SSL_CTX_add_extra_chain_cert.3]=man3/SSL_CTX_add_extra_chain_cert.pod +GENERATE[man/man3/SSL_CTX_add_extra_chain_cert.3]=man3/SSL_CTX_add_extra_chain_cert.pod +DEPEND[html/man3/SSL_CTX_add_session.html]=man3/SSL_CTX_add_session.pod +GENERATE[html/man3/SSL_CTX_add_session.html]=man3/SSL_CTX_add_session.pod +DEPEND[man/man3/SSL_CTX_add_session.3]=man3/SSL_CTX_add_session.pod +GENERATE[man/man3/SSL_CTX_add_session.3]=man3/SSL_CTX_add_session.pod +DEPEND[html/man3/SSL_CTX_config.html]=man3/SSL_CTX_config.pod +GENERATE[html/man3/SSL_CTX_config.html]=man3/SSL_CTX_config.pod +DEPEND[man/man3/SSL_CTX_config.3]=man3/SSL_CTX_config.pod +GENERATE[man/man3/SSL_CTX_config.3]=man3/SSL_CTX_config.pod +DEPEND[html/man3/SSL_CTX_ctrl.html]=man3/SSL_CTX_ctrl.pod +GENERATE[html/man3/SSL_CTX_ctrl.html]=man3/SSL_CTX_ctrl.pod +DEPEND[man/man3/SSL_CTX_ctrl.3]=man3/SSL_CTX_ctrl.pod +GENERATE[man/man3/SSL_CTX_ctrl.3]=man3/SSL_CTX_ctrl.pod +DEPEND[html/man3/SSL_CTX_dane_enable.html]=man3/SSL_CTX_dane_enable.pod +GENERATE[html/man3/SSL_CTX_dane_enable.html]=man3/SSL_CTX_dane_enable.pod +DEPEND[man/man3/SSL_CTX_dane_enable.3]=man3/SSL_CTX_dane_enable.pod +GENERATE[man/man3/SSL_CTX_dane_enable.3]=man3/SSL_CTX_dane_enable.pod +DEPEND[html/man3/SSL_CTX_flush_sessions.html]=man3/SSL_CTX_flush_sessions.pod +GENERATE[html/man3/SSL_CTX_flush_sessions.html]=man3/SSL_CTX_flush_sessions.pod +DEPEND[man/man3/SSL_CTX_flush_sessions.3]=man3/SSL_CTX_flush_sessions.pod +GENERATE[man/man3/SSL_CTX_flush_sessions.3]=man3/SSL_CTX_flush_sessions.pod +DEPEND[html/man3/SSL_CTX_free.html]=man3/SSL_CTX_free.pod +GENERATE[html/man3/SSL_CTX_free.html]=man3/SSL_CTX_free.pod +DEPEND[man/man3/SSL_CTX_free.3]=man3/SSL_CTX_free.pod +GENERATE[man/man3/SSL_CTX_free.3]=man3/SSL_CTX_free.pod +DEPEND[html/man3/SSL_CTX_get0_param.html]=man3/SSL_CTX_get0_param.pod +GENERATE[html/man3/SSL_CTX_get0_param.html]=man3/SSL_CTX_get0_param.pod +DEPEND[man/man3/SSL_CTX_get0_param.3]=man3/SSL_CTX_get0_param.pod +GENERATE[man/man3/SSL_CTX_get0_param.3]=man3/SSL_CTX_get0_param.pod +DEPEND[html/man3/SSL_CTX_get_verify_mode.html]=man3/SSL_CTX_get_verify_mode.pod +GENERATE[html/man3/SSL_CTX_get_verify_mode.html]=man3/SSL_CTX_get_verify_mode.pod +DEPEND[man/man3/SSL_CTX_get_verify_mode.3]=man3/SSL_CTX_get_verify_mode.pod +GENERATE[man/man3/SSL_CTX_get_verify_mode.3]=man3/SSL_CTX_get_verify_mode.pod +DEPEND[html/man3/SSL_CTX_has_client_custom_ext.html]=man3/SSL_CTX_has_client_custom_ext.pod +GENERATE[html/man3/SSL_CTX_has_client_custom_ext.html]=man3/SSL_CTX_has_client_custom_ext.pod +DEPEND[man/man3/SSL_CTX_has_client_custom_ext.3]=man3/SSL_CTX_has_client_custom_ext.pod +GENERATE[man/man3/SSL_CTX_has_client_custom_ext.3]=man3/SSL_CTX_has_client_custom_ext.pod +DEPEND[html/man3/SSL_CTX_load_verify_locations.html]=man3/SSL_CTX_load_verify_locations.pod +GENERATE[html/man3/SSL_CTX_load_verify_locations.html]=man3/SSL_CTX_load_verify_locations.pod +DEPEND[man/man3/SSL_CTX_load_verify_locations.3]=man3/SSL_CTX_load_verify_locations.pod +GENERATE[man/man3/SSL_CTX_load_verify_locations.3]=man3/SSL_CTX_load_verify_locations.pod +DEPEND[html/man3/SSL_CTX_new.html]=man3/SSL_CTX_new.pod +GENERATE[html/man3/SSL_CTX_new.html]=man3/SSL_CTX_new.pod +DEPEND[man/man3/SSL_CTX_new.3]=man3/SSL_CTX_new.pod +GENERATE[man/man3/SSL_CTX_new.3]=man3/SSL_CTX_new.pod +DEPEND[html/man3/SSL_CTX_sess_number.html]=man3/SSL_CTX_sess_number.pod +GENERATE[html/man3/SSL_CTX_sess_number.html]=man3/SSL_CTX_sess_number.pod +DEPEND[man/man3/SSL_CTX_sess_number.3]=man3/SSL_CTX_sess_number.pod +GENERATE[man/man3/SSL_CTX_sess_number.3]=man3/SSL_CTX_sess_number.pod +DEPEND[html/man3/SSL_CTX_sess_set_cache_size.html]=man3/SSL_CTX_sess_set_cache_size.pod +GENERATE[html/man3/SSL_CTX_sess_set_cache_size.html]=man3/SSL_CTX_sess_set_cache_size.pod +DEPEND[man/man3/SSL_CTX_sess_set_cache_size.3]=man3/SSL_CTX_sess_set_cache_size.pod +GENERATE[man/man3/SSL_CTX_sess_set_cache_size.3]=man3/SSL_CTX_sess_set_cache_size.pod +DEPEND[html/man3/SSL_CTX_sess_set_get_cb.html]=man3/SSL_CTX_sess_set_get_cb.pod +GENERATE[html/man3/SSL_CTX_sess_set_get_cb.html]=man3/SSL_CTX_sess_set_get_cb.pod +DEPEND[man/man3/SSL_CTX_sess_set_get_cb.3]=man3/SSL_CTX_sess_set_get_cb.pod +GENERATE[man/man3/SSL_CTX_sess_set_get_cb.3]=man3/SSL_CTX_sess_set_get_cb.pod +DEPEND[html/man3/SSL_CTX_sessions.html]=man3/SSL_CTX_sessions.pod +GENERATE[html/man3/SSL_CTX_sessions.html]=man3/SSL_CTX_sessions.pod +DEPEND[man/man3/SSL_CTX_sessions.3]=man3/SSL_CTX_sessions.pod +GENERATE[man/man3/SSL_CTX_sessions.3]=man3/SSL_CTX_sessions.pod +DEPEND[html/man3/SSL_CTX_set0_CA_list.html]=man3/SSL_CTX_set0_CA_list.pod +GENERATE[html/man3/SSL_CTX_set0_CA_list.html]=man3/SSL_CTX_set0_CA_list.pod +DEPEND[man/man3/SSL_CTX_set0_CA_list.3]=man3/SSL_CTX_set0_CA_list.pod +GENERATE[man/man3/SSL_CTX_set0_CA_list.3]=man3/SSL_CTX_set0_CA_list.pod +DEPEND[html/man3/SSL_CTX_set1_curves.html]=man3/SSL_CTX_set1_curves.pod +GENERATE[html/man3/SSL_CTX_set1_curves.html]=man3/SSL_CTX_set1_curves.pod +DEPEND[man/man3/SSL_CTX_set1_curves.3]=man3/SSL_CTX_set1_curves.pod +GENERATE[man/man3/SSL_CTX_set1_curves.3]=man3/SSL_CTX_set1_curves.pod +DEPEND[html/man3/SSL_CTX_set1_sigalgs.html]=man3/SSL_CTX_set1_sigalgs.pod +GENERATE[html/man3/SSL_CTX_set1_sigalgs.html]=man3/SSL_CTX_set1_sigalgs.pod +DEPEND[man/man3/SSL_CTX_set1_sigalgs.3]=man3/SSL_CTX_set1_sigalgs.pod +GENERATE[man/man3/SSL_CTX_set1_sigalgs.3]=man3/SSL_CTX_set1_sigalgs.pod +DEPEND[html/man3/SSL_CTX_set1_verify_cert_store.html]=man3/SSL_CTX_set1_verify_cert_store.pod +GENERATE[html/man3/SSL_CTX_set1_verify_cert_store.html]=man3/SSL_CTX_set1_verify_cert_store.pod +DEPEND[man/man3/SSL_CTX_set1_verify_cert_store.3]=man3/SSL_CTX_set1_verify_cert_store.pod +GENERATE[man/man3/SSL_CTX_set1_verify_cert_store.3]=man3/SSL_CTX_set1_verify_cert_store.pod +DEPEND[html/man3/SSL_CTX_set_alpn_select_cb.html]=man3/SSL_CTX_set_alpn_select_cb.pod +GENERATE[html/man3/SSL_CTX_set_alpn_select_cb.html]=man3/SSL_CTX_set_alpn_select_cb.pod +DEPEND[man/man3/SSL_CTX_set_alpn_select_cb.3]=man3/SSL_CTX_set_alpn_select_cb.pod +GENERATE[man/man3/SSL_CTX_set_alpn_select_cb.3]=man3/SSL_CTX_set_alpn_select_cb.pod +DEPEND[html/man3/SSL_CTX_set_cert_cb.html]=man3/SSL_CTX_set_cert_cb.pod +GENERATE[html/man3/SSL_CTX_set_cert_cb.html]=man3/SSL_CTX_set_cert_cb.pod +DEPEND[man/man3/SSL_CTX_set_cert_cb.3]=man3/SSL_CTX_set_cert_cb.pod +GENERATE[man/man3/SSL_CTX_set_cert_cb.3]=man3/SSL_CTX_set_cert_cb.pod +DEPEND[html/man3/SSL_CTX_set_cert_store.html]=man3/SSL_CTX_set_cert_store.pod +GENERATE[html/man3/SSL_CTX_set_cert_store.html]=man3/SSL_CTX_set_cert_store.pod +DEPEND[man/man3/SSL_CTX_set_cert_store.3]=man3/SSL_CTX_set_cert_store.pod +GENERATE[man/man3/SSL_CTX_set_cert_store.3]=man3/SSL_CTX_set_cert_store.pod +DEPEND[html/man3/SSL_CTX_set_cert_verify_callback.html]=man3/SSL_CTX_set_cert_verify_callback.pod +GENERATE[html/man3/SSL_CTX_set_cert_verify_callback.html]=man3/SSL_CTX_set_cert_verify_callback.pod +DEPEND[man/man3/SSL_CTX_set_cert_verify_callback.3]=man3/SSL_CTX_set_cert_verify_callback.pod +GENERATE[man/man3/SSL_CTX_set_cert_verify_callback.3]=man3/SSL_CTX_set_cert_verify_callback.pod +DEPEND[html/man3/SSL_CTX_set_cipher_list.html]=man3/SSL_CTX_set_cipher_list.pod +GENERATE[html/man3/SSL_CTX_set_cipher_list.html]=man3/SSL_CTX_set_cipher_list.pod +DEPEND[man/man3/SSL_CTX_set_cipher_list.3]=man3/SSL_CTX_set_cipher_list.pod +GENERATE[man/man3/SSL_CTX_set_cipher_list.3]=man3/SSL_CTX_set_cipher_list.pod +DEPEND[html/man3/SSL_CTX_set_client_cert_cb.html]=man3/SSL_CTX_set_client_cert_cb.pod +GENERATE[html/man3/SSL_CTX_set_client_cert_cb.html]=man3/SSL_CTX_set_client_cert_cb.pod +DEPEND[man/man3/SSL_CTX_set_client_cert_cb.3]=man3/SSL_CTX_set_client_cert_cb.pod +GENERATE[man/man3/SSL_CTX_set_client_cert_cb.3]=man3/SSL_CTX_set_client_cert_cb.pod +DEPEND[html/man3/SSL_CTX_set_client_hello_cb.html]=man3/SSL_CTX_set_client_hello_cb.pod +GENERATE[html/man3/SSL_CTX_set_client_hello_cb.html]=man3/SSL_CTX_set_client_hello_cb.pod +DEPEND[man/man3/SSL_CTX_set_client_hello_cb.3]=man3/SSL_CTX_set_client_hello_cb.pod +GENERATE[man/man3/SSL_CTX_set_client_hello_cb.3]=man3/SSL_CTX_set_client_hello_cb.pod +DEPEND[html/man3/SSL_CTX_set_ct_validation_callback.html]=man3/SSL_CTX_set_ct_validation_callback.pod +GENERATE[html/man3/SSL_CTX_set_ct_validation_callback.html]=man3/SSL_CTX_set_ct_validation_callback.pod +DEPEND[man/man3/SSL_CTX_set_ct_validation_callback.3]=man3/SSL_CTX_set_ct_validation_callback.pod +GENERATE[man/man3/SSL_CTX_set_ct_validation_callback.3]=man3/SSL_CTX_set_ct_validation_callback.pod +DEPEND[html/man3/SSL_CTX_set_ctlog_list_file.html]=man3/SSL_CTX_set_ctlog_list_file.pod +GENERATE[html/man3/SSL_CTX_set_ctlog_list_file.html]=man3/SSL_CTX_set_ctlog_list_file.pod +DEPEND[man/man3/SSL_CTX_set_ctlog_list_file.3]=man3/SSL_CTX_set_ctlog_list_file.pod +GENERATE[man/man3/SSL_CTX_set_ctlog_list_file.3]=man3/SSL_CTX_set_ctlog_list_file.pod +DEPEND[html/man3/SSL_CTX_set_default_passwd_cb.html]=man3/SSL_CTX_set_default_passwd_cb.pod +GENERATE[html/man3/SSL_CTX_set_default_passwd_cb.html]=man3/SSL_CTX_set_default_passwd_cb.pod +DEPEND[man/man3/SSL_CTX_set_default_passwd_cb.3]=man3/SSL_CTX_set_default_passwd_cb.pod +GENERATE[man/man3/SSL_CTX_set_default_passwd_cb.3]=man3/SSL_CTX_set_default_passwd_cb.pod +DEPEND[html/man3/SSL_CTX_set_generate_session_id.html]=man3/SSL_CTX_set_generate_session_id.pod +GENERATE[html/man3/SSL_CTX_set_generate_session_id.html]=man3/SSL_CTX_set_generate_session_id.pod +DEPEND[man/man3/SSL_CTX_set_generate_session_id.3]=man3/SSL_CTX_set_generate_session_id.pod +GENERATE[man/man3/SSL_CTX_set_generate_session_id.3]=man3/SSL_CTX_set_generate_session_id.pod +DEPEND[html/man3/SSL_CTX_set_info_callback.html]=man3/SSL_CTX_set_info_callback.pod +GENERATE[html/man3/SSL_CTX_set_info_callback.html]=man3/SSL_CTX_set_info_callback.pod +DEPEND[man/man3/SSL_CTX_set_info_callback.3]=man3/SSL_CTX_set_info_callback.pod +GENERATE[man/man3/SSL_CTX_set_info_callback.3]=man3/SSL_CTX_set_info_callback.pod +DEPEND[html/man3/SSL_CTX_set_keylog_callback.html]=man3/SSL_CTX_set_keylog_callback.pod +GENERATE[html/man3/SSL_CTX_set_keylog_callback.html]=man3/SSL_CTX_set_keylog_callback.pod +DEPEND[man/man3/SSL_CTX_set_keylog_callback.3]=man3/SSL_CTX_set_keylog_callback.pod +GENERATE[man/man3/SSL_CTX_set_keylog_callback.3]=man3/SSL_CTX_set_keylog_callback.pod +DEPEND[html/man3/SSL_CTX_set_max_cert_list.html]=man3/SSL_CTX_set_max_cert_list.pod +GENERATE[html/man3/SSL_CTX_set_max_cert_list.html]=man3/SSL_CTX_set_max_cert_list.pod +DEPEND[man/man3/SSL_CTX_set_max_cert_list.3]=man3/SSL_CTX_set_max_cert_list.pod +GENERATE[man/man3/SSL_CTX_set_max_cert_list.3]=man3/SSL_CTX_set_max_cert_list.pod +DEPEND[html/man3/SSL_CTX_set_min_proto_version.html]=man3/SSL_CTX_set_min_proto_version.pod +GENERATE[html/man3/SSL_CTX_set_min_proto_version.html]=man3/SSL_CTX_set_min_proto_version.pod +DEPEND[man/man3/SSL_CTX_set_min_proto_version.3]=man3/SSL_CTX_set_min_proto_version.pod +GENERATE[man/man3/SSL_CTX_set_min_proto_version.3]=man3/SSL_CTX_set_min_proto_version.pod +DEPEND[html/man3/SSL_CTX_set_mode.html]=man3/SSL_CTX_set_mode.pod +GENERATE[html/man3/SSL_CTX_set_mode.html]=man3/SSL_CTX_set_mode.pod +DEPEND[man/man3/SSL_CTX_set_mode.3]=man3/SSL_CTX_set_mode.pod +GENERATE[man/man3/SSL_CTX_set_mode.3]=man3/SSL_CTX_set_mode.pod +DEPEND[html/man3/SSL_CTX_set_msg_callback.html]=man3/SSL_CTX_set_msg_callback.pod +GENERATE[html/man3/SSL_CTX_set_msg_callback.html]=man3/SSL_CTX_set_msg_callback.pod +DEPEND[man/man3/SSL_CTX_set_msg_callback.3]=man3/SSL_CTX_set_msg_callback.pod +GENERATE[man/man3/SSL_CTX_set_msg_callback.3]=man3/SSL_CTX_set_msg_callback.pod +DEPEND[html/man3/SSL_CTX_set_num_tickets.html]=man3/SSL_CTX_set_num_tickets.pod +GENERATE[html/man3/SSL_CTX_set_num_tickets.html]=man3/SSL_CTX_set_num_tickets.pod +DEPEND[man/man3/SSL_CTX_set_num_tickets.3]=man3/SSL_CTX_set_num_tickets.pod +GENERATE[man/man3/SSL_CTX_set_num_tickets.3]=man3/SSL_CTX_set_num_tickets.pod +DEPEND[html/man3/SSL_CTX_set_options.html]=man3/SSL_CTX_set_options.pod +GENERATE[html/man3/SSL_CTX_set_options.html]=man3/SSL_CTX_set_options.pod +DEPEND[man/man3/SSL_CTX_set_options.3]=man3/SSL_CTX_set_options.pod +GENERATE[man/man3/SSL_CTX_set_options.3]=man3/SSL_CTX_set_options.pod +DEPEND[html/man3/SSL_CTX_set_psk_client_callback.html]=man3/SSL_CTX_set_psk_client_callback.pod +GENERATE[html/man3/SSL_CTX_set_psk_client_callback.html]=man3/SSL_CTX_set_psk_client_callback.pod +DEPEND[man/man3/SSL_CTX_set_psk_client_callback.3]=man3/SSL_CTX_set_psk_client_callback.pod +GENERATE[man/man3/SSL_CTX_set_psk_client_callback.3]=man3/SSL_CTX_set_psk_client_callback.pod +DEPEND[html/man3/SSL_CTX_set_quiet_shutdown.html]=man3/SSL_CTX_set_quiet_shutdown.pod +GENERATE[html/man3/SSL_CTX_set_quiet_shutdown.html]=man3/SSL_CTX_set_quiet_shutdown.pod +DEPEND[man/man3/SSL_CTX_set_quiet_shutdown.3]=man3/SSL_CTX_set_quiet_shutdown.pod +GENERATE[man/man3/SSL_CTX_set_quiet_shutdown.3]=man3/SSL_CTX_set_quiet_shutdown.pod +DEPEND[html/man3/SSL_CTX_set_read_ahead.html]=man3/SSL_CTX_set_read_ahead.pod +GENERATE[html/man3/SSL_CTX_set_read_ahead.html]=man3/SSL_CTX_set_read_ahead.pod +DEPEND[man/man3/SSL_CTX_set_read_ahead.3]=man3/SSL_CTX_set_read_ahead.pod +GENERATE[man/man3/SSL_CTX_set_read_ahead.3]=man3/SSL_CTX_set_read_ahead.pod +DEPEND[html/man3/SSL_CTX_set_record_padding_callback.html]=man3/SSL_CTX_set_record_padding_callback.pod +GENERATE[html/man3/SSL_CTX_set_record_padding_callback.html]=man3/SSL_CTX_set_record_padding_callback.pod +DEPEND[man/man3/SSL_CTX_set_record_padding_callback.3]=man3/SSL_CTX_set_record_padding_callback.pod +GENERATE[man/man3/SSL_CTX_set_record_padding_callback.3]=man3/SSL_CTX_set_record_padding_callback.pod +DEPEND[html/man3/SSL_CTX_set_security_level.html]=man3/SSL_CTX_set_security_level.pod +GENERATE[html/man3/SSL_CTX_set_security_level.html]=man3/SSL_CTX_set_security_level.pod +DEPEND[man/man3/SSL_CTX_set_security_level.3]=man3/SSL_CTX_set_security_level.pod +GENERATE[man/man3/SSL_CTX_set_security_level.3]=man3/SSL_CTX_set_security_level.pod +DEPEND[html/man3/SSL_CTX_set_session_cache_mode.html]=man3/SSL_CTX_set_session_cache_mode.pod +GENERATE[html/man3/SSL_CTX_set_session_cache_mode.html]=man3/SSL_CTX_set_session_cache_mode.pod +DEPEND[man/man3/SSL_CTX_set_session_cache_mode.3]=man3/SSL_CTX_set_session_cache_mode.pod +GENERATE[man/man3/SSL_CTX_set_session_cache_mode.3]=man3/SSL_CTX_set_session_cache_mode.pod +DEPEND[html/man3/SSL_CTX_set_session_id_context.html]=man3/SSL_CTX_set_session_id_context.pod +GENERATE[html/man3/SSL_CTX_set_session_id_context.html]=man3/SSL_CTX_set_session_id_context.pod +DEPEND[man/man3/SSL_CTX_set_session_id_context.3]=man3/SSL_CTX_set_session_id_context.pod +GENERATE[man/man3/SSL_CTX_set_session_id_context.3]=man3/SSL_CTX_set_session_id_context.pod +DEPEND[html/man3/SSL_CTX_set_session_ticket_cb.html]=man3/SSL_CTX_set_session_ticket_cb.pod +GENERATE[html/man3/SSL_CTX_set_session_ticket_cb.html]=man3/SSL_CTX_set_session_ticket_cb.pod +DEPEND[man/man3/SSL_CTX_set_session_ticket_cb.3]=man3/SSL_CTX_set_session_ticket_cb.pod +GENERATE[man/man3/SSL_CTX_set_session_ticket_cb.3]=man3/SSL_CTX_set_session_ticket_cb.pod +DEPEND[html/man3/SSL_CTX_set_split_send_fragment.html]=man3/SSL_CTX_set_split_send_fragment.pod +GENERATE[html/man3/SSL_CTX_set_split_send_fragment.html]=man3/SSL_CTX_set_split_send_fragment.pod +DEPEND[man/man3/SSL_CTX_set_split_send_fragment.3]=man3/SSL_CTX_set_split_send_fragment.pod +GENERATE[man/man3/SSL_CTX_set_split_send_fragment.3]=man3/SSL_CTX_set_split_send_fragment.pod +DEPEND[html/man3/SSL_CTX_set_srp_password.html]=man3/SSL_CTX_set_srp_password.pod +GENERATE[html/man3/SSL_CTX_set_srp_password.html]=man3/SSL_CTX_set_srp_password.pod +DEPEND[man/man3/SSL_CTX_set_srp_password.3]=man3/SSL_CTX_set_srp_password.pod +GENERATE[man/man3/SSL_CTX_set_srp_password.3]=man3/SSL_CTX_set_srp_password.pod +DEPEND[html/man3/SSL_CTX_set_ssl_version.html]=man3/SSL_CTX_set_ssl_version.pod +GENERATE[html/man3/SSL_CTX_set_ssl_version.html]=man3/SSL_CTX_set_ssl_version.pod +DEPEND[man/man3/SSL_CTX_set_ssl_version.3]=man3/SSL_CTX_set_ssl_version.pod +GENERATE[man/man3/SSL_CTX_set_ssl_version.3]=man3/SSL_CTX_set_ssl_version.pod +DEPEND[html/man3/SSL_CTX_set_stateless_cookie_generate_cb.html]=man3/SSL_CTX_set_stateless_cookie_generate_cb.pod +GENERATE[html/man3/SSL_CTX_set_stateless_cookie_generate_cb.html]=man3/SSL_CTX_set_stateless_cookie_generate_cb.pod +DEPEND[man/man3/SSL_CTX_set_stateless_cookie_generate_cb.3]=man3/SSL_CTX_set_stateless_cookie_generate_cb.pod +GENERATE[man/man3/SSL_CTX_set_stateless_cookie_generate_cb.3]=man3/SSL_CTX_set_stateless_cookie_generate_cb.pod +DEPEND[html/man3/SSL_CTX_set_timeout.html]=man3/SSL_CTX_set_timeout.pod +GENERATE[html/man3/SSL_CTX_set_timeout.html]=man3/SSL_CTX_set_timeout.pod +DEPEND[man/man3/SSL_CTX_set_timeout.3]=man3/SSL_CTX_set_timeout.pod +GENERATE[man/man3/SSL_CTX_set_timeout.3]=man3/SSL_CTX_set_timeout.pod +DEPEND[html/man3/SSL_CTX_set_tlsext_servername_callback.html]=man3/SSL_CTX_set_tlsext_servername_callback.pod +GENERATE[html/man3/SSL_CTX_set_tlsext_servername_callback.html]=man3/SSL_CTX_set_tlsext_servername_callback.pod +DEPEND[man/man3/SSL_CTX_set_tlsext_servername_callback.3]=man3/SSL_CTX_set_tlsext_servername_callback.pod +GENERATE[man/man3/SSL_CTX_set_tlsext_servername_callback.3]=man3/SSL_CTX_set_tlsext_servername_callback.pod +DEPEND[html/man3/SSL_CTX_set_tlsext_status_cb.html]=man3/SSL_CTX_set_tlsext_status_cb.pod +GENERATE[html/man3/SSL_CTX_set_tlsext_status_cb.html]=man3/SSL_CTX_set_tlsext_status_cb.pod +DEPEND[man/man3/SSL_CTX_set_tlsext_status_cb.3]=man3/SSL_CTX_set_tlsext_status_cb.pod +GENERATE[man/man3/SSL_CTX_set_tlsext_status_cb.3]=man3/SSL_CTX_set_tlsext_status_cb.pod +DEPEND[html/man3/SSL_CTX_set_tlsext_ticket_key_cb.html]=man3/SSL_CTX_set_tlsext_ticket_key_cb.pod +GENERATE[html/man3/SSL_CTX_set_tlsext_ticket_key_cb.html]=man3/SSL_CTX_set_tlsext_ticket_key_cb.pod +DEPEND[man/man3/SSL_CTX_set_tlsext_ticket_key_cb.3]=man3/SSL_CTX_set_tlsext_ticket_key_cb.pod +GENERATE[man/man3/SSL_CTX_set_tlsext_ticket_key_cb.3]=man3/SSL_CTX_set_tlsext_ticket_key_cb.pod +DEPEND[html/man3/SSL_CTX_set_tlsext_use_srtp.html]=man3/SSL_CTX_set_tlsext_use_srtp.pod +GENERATE[html/man3/SSL_CTX_set_tlsext_use_srtp.html]=man3/SSL_CTX_set_tlsext_use_srtp.pod +DEPEND[man/man3/SSL_CTX_set_tlsext_use_srtp.3]=man3/SSL_CTX_set_tlsext_use_srtp.pod +GENERATE[man/man3/SSL_CTX_set_tlsext_use_srtp.3]=man3/SSL_CTX_set_tlsext_use_srtp.pod +DEPEND[html/man3/SSL_CTX_set_tmp_dh_callback.html]=man3/SSL_CTX_set_tmp_dh_callback.pod +GENERATE[html/man3/SSL_CTX_set_tmp_dh_callback.html]=man3/SSL_CTX_set_tmp_dh_callback.pod +DEPEND[man/man3/SSL_CTX_set_tmp_dh_callback.3]=man3/SSL_CTX_set_tmp_dh_callback.pod +GENERATE[man/man3/SSL_CTX_set_tmp_dh_callback.3]=man3/SSL_CTX_set_tmp_dh_callback.pod +DEPEND[html/man3/SSL_CTX_set_tmp_ecdh.html]=man3/SSL_CTX_set_tmp_ecdh.pod +GENERATE[html/man3/SSL_CTX_set_tmp_ecdh.html]=man3/SSL_CTX_set_tmp_ecdh.pod +DEPEND[man/man3/SSL_CTX_set_tmp_ecdh.3]=man3/SSL_CTX_set_tmp_ecdh.pod +GENERATE[man/man3/SSL_CTX_set_tmp_ecdh.3]=man3/SSL_CTX_set_tmp_ecdh.pod +DEPEND[html/man3/SSL_CTX_set_verify.html]=man3/SSL_CTX_set_verify.pod +GENERATE[html/man3/SSL_CTX_set_verify.html]=man3/SSL_CTX_set_verify.pod +DEPEND[man/man3/SSL_CTX_set_verify.3]=man3/SSL_CTX_set_verify.pod +GENERATE[man/man3/SSL_CTX_set_verify.3]=man3/SSL_CTX_set_verify.pod +DEPEND[html/man3/SSL_CTX_use_certificate.html]=man3/SSL_CTX_use_certificate.pod +GENERATE[html/man3/SSL_CTX_use_certificate.html]=man3/SSL_CTX_use_certificate.pod +DEPEND[man/man3/SSL_CTX_use_certificate.3]=man3/SSL_CTX_use_certificate.pod +GENERATE[man/man3/SSL_CTX_use_certificate.3]=man3/SSL_CTX_use_certificate.pod +DEPEND[html/man3/SSL_CTX_use_psk_identity_hint.html]=man3/SSL_CTX_use_psk_identity_hint.pod +GENERATE[html/man3/SSL_CTX_use_psk_identity_hint.html]=man3/SSL_CTX_use_psk_identity_hint.pod +DEPEND[man/man3/SSL_CTX_use_psk_identity_hint.3]=man3/SSL_CTX_use_psk_identity_hint.pod +GENERATE[man/man3/SSL_CTX_use_psk_identity_hint.3]=man3/SSL_CTX_use_psk_identity_hint.pod +DEPEND[html/man3/SSL_CTX_use_serverinfo.html]=man3/SSL_CTX_use_serverinfo.pod +GENERATE[html/man3/SSL_CTX_use_serverinfo.html]=man3/SSL_CTX_use_serverinfo.pod +DEPEND[man/man3/SSL_CTX_use_serverinfo.3]=man3/SSL_CTX_use_serverinfo.pod +GENERATE[man/man3/SSL_CTX_use_serverinfo.3]=man3/SSL_CTX_use_serverinfo.pod +DEPEND[html/man3/SSL_SESSION_free.html]=man3/SSL_SESSION_free.pod +GENERATE[html/man3/SSL_SESSION_free.html]=man3/SSL_SESSION_free.pod +DEPEND[man/man3/SSL_SESSION_free.3]=man3/SSL_SESSION_free.pod +GENERATE[man/man3/SSL_SESSION_free.3]=man3/SSL_SESSION_free.pod +DEPEND[html/man3/SSL_SESSION_get0_cipher.html]=man3/SSL_SESSION_get0_cipher.pod +GENERATE[html/man3/SSL_SESSION_get0_cipher.html]=man3/SSL_SESSION_get0_cipher.pod +DEPEND[man/man3/SSL_SESSION_get0_cipher.3]=man3/SSL_SESSION_get0_cipher.pod +GENERATE[man/man3/SSL_SESSION_get0_cipher.3]=man3/SSL_SESSION_get0_cipher.pod +DEPEND[html/man3/SSL_SESSION_get0_hostname.html]=man3/SSL_SESSION_get0_hostname.pod +GENERATE[html/man3/SSL_SESSION_get0_hostname.html]=man3/SSL_SESSION_get0_hostname.pod +DEPEND[man/man3/SSL_SESSION_get0_hostname.3]=man3/SSL_SESSION_get0_hostname.pod +GENERATE[man/man3/SSL_SESSION_get0_hostname.3]=man3/SSL_SESSION_get0_hostname.pod +DEPEND[html/man3/SSL_SESSION_get0_id_context.html]=man3/SSL_SESSION_get0_id_context.pod +GENERATE[html/man3/SSL_SESSION_get0_id_context.html]=man3/SSL_SESSION_get0_id_context.pod +DEPEND[man/man3/SSL_SESSION_get0_id_context.3]=man3/SSL_SESSION_get0_id_context.pod +GENERATE[man/man3/SSL_SESSION_get0_id_context.3]=man3/SSL_SESSION_get0_id_context.pod +DEPEND[html/man3/SSL_SESSION_get0_peer.html]=man3/SSL_SESSION_get0_peer.pod +GENERATE[html/man3/SSL_SESSION_get0_peer.html]=man3/SSL_SESSION_get0_peer.pod +DEPEND[man/man3/SSL_SESSION_get0_peer.3]=man3/SSL_SESSION_get0_peer.pod +GENERATE[man/man3/SSL_SESSION_get0_peer.3]=man3/SSL_SESSION_get0_peer.pod +DEPEND[html/man3/SSL_SESSION_get_compress_id.html]=man3/SSL_SESSION_get_compress_id.pod +GENERATE[html/man3/SSL_SESSION_get_compress_id.html]=man3/SSL_SESSION_get_compress_id.pod +DEPEND[man/man3/SSL_SESSION_get_compress_id.3]=man3/SSL_SESSION_get_compress_id.pod +GENERATE[man/man3/SSL_SESSION_get_compress_id.3]=man3/SSL_SESSION_get_compress_id.pod +DEPEND[html/man3/SSL_SESSION_get_protocol_version.html]=man3/SSL_SESSION_get_protocol_version.pod +GENERATE[html/man3/SSL_SESSION_get_protocol_version.html]=man3/SSL_SESSION_get_protocol_version.pod +DEPEND[man/man3/SSL_SESSION_get_protocol_version.3]=man3/SSL_SESSION_get_protocol_version.pod +GENERATE[man/man3/SSL_SESSION_get_protocol_version.3]=man3/SSL_SESSION_get_protocol_version.pod +DEPEND[html/man3/SSL_SESSION_get_time.html]=man3/SSL_SESSION_get_time.pod +GENERATE[html/man3/SSL_SESSION_get_time.html]=man3/SSL_SESSION_get_time.pod +DEPEND[man/man3/SSL_SESSION_get_time.3]=man3/SSL_SESSION_get_time.pod +GENERATE[man/man3/SSL_SESSION_get_time.3]=man3/SSL_SESSION_get_time.pod +DEPEND[html/man3/SSL_SESSION_has_ticket.html]=man3/SSL_SESSION_has_ticket.pod +GENERATE[html/man3/SSL_SESSION_has_ticket.html]=man3/SSL_SESSION_has_ticket.pod +DEPEND[man/man3/SSL_SESSION_has_ticket.3]=man3/SSL_SESSION_has_ticket.pod +GENERATE[man/man3/SSL_SESSION_has_ticket.3]=man3/SSL_SESSION_has_ticket.pod +DEPEND[html/man3/SSL_SESSION_is_resumable.html]=man3/SSL_SESSION_is_resumable.pod +GENERATE[html/man3/SSL_SESSION_is_resumable.html]=man3/SSL_SESSION_is_resumable.pod +DEPEND[man/man3/SSL_SESSION_is_resumable.3]=man3/SSL_SESSION_is_resumable.pod +GENERATE[man/man3/SSL_SESSION_is_resumable.3]=man3/SSL_SESSION_is_resumable.pod +DEPEND[html/man3/SSL_SESSION_print.html]=man3/SSL_SESSION_print.pod +GENERATE[html/man3/SSL_SESSION_print.html]=man3/SSL_SESSION_print.pod +DEPEND[man/man3/SSL_SESSION_print.3]=man3/SSL_SESSION_print.pod +GENERATE[man/man3/SSL_SESSION_print.3]=man3/SSL_SESSION_print.pod +DEPEND[html/man3/SSL_SESSION_set1_id.html]=man3/SSL_SESSION_set1_id.pod +GENERATE[html/man3/SSL_SESSION_set1_id.html]=man3/SSL_SESSION_set1_id.pod +DEPEND[man/man3/SSL_SESSION_set1_id.3]=man3/SSL_SESSION_set1_id.pod +GENERATE[man/man3/SSL_SESSION_set1_id.3]=man3/SSL_SESSION_set1_id.pod +DEPEND[html/man3/SSL_accept.html]=man3/SSL_accept.pod +GENERATE[html/man3/SSL_accept.html]=man3/SSL_accept.pod +DEPEND[man/man3/SSL_accept.3]=man3/SSL_accept.pod +GENERATE[man/man3/SSL_accept.3]=man3/SSL_accept.pod +DEPEND[html/man3/SSL_alert_type_string.html]=man3/SSL_alert_type_string.pod +GENERATE[html/man3/SSL_alert_type_string.html]=man3/SSL_alert_type_string.pod +DEPEND[man/man3/SSL_alert_type_string.3]=man3/SSL_alert_type_string.pod +GENERATE[man/man3/SSL_alert_type_string.3]=man3/SSL_alert_type_string.pod +DEPEND[html/man3/SSL_alloc_buffers.html]=man3/SSL_alloc_buffers.pod +GENERATE[html/man3/SSL_alloc_buffers.html]=man3/SSL_alloc_buffers.pod +DEPEND[man/man3/SSL_alloc_buffers.3]=man3/SSL_alloc_buffers.pod +GENERATE[man/man3/SSL_alloc_buffers.3]=man3/SSL_alloc_buffers.pod +DEPEND[html/man3/SSL_check_chain.html]=man3/SSL_check_chain.pod +GENERATE[html/man3/SSL_check_chain.html]=man3/SSL_check_chain.pod +DEPEND[man/man3/SSL_check_chain.3]=man3/SSL_check_chain.pod +GENERATE[man/man3/SSL_check_chain.3]=man3/SSL_check_chain.pod +DEPEND[html/man3/SSL_clear.html]=man3/SSL_clear.pod +GENERATE[html/man3/SSL_clear.html]=man3/SSL_clear.pod +DEPEND[man/man3/SSL_clear.3]=man3/SSL_clear.pod +GENERATE[man/man3/SSL_clear.3]=man3/SSL_clear.pod +DEPEND[html/man3/SSL_connect.html]=man3/SSL_connect.pod +GENERATE[html/man3/SSL_connect.html]=man3/SSL_connect.pod +DEPEND[man/man3/SSL_connect.3]=man3/SSL_connect.pod +GENERATE[man/man3/SSL_connect.3]=man3/SSL_connect.pod +DEPEND[html/man3/SSL_do_handshake.html]=man3/SSL_do_handshake.pod +GENERATE[html/man3/SSL_do_handshake.html]=man3/SSL_do_handshake.pod +DEPEND[man/man3/SSL_do_handshake.3]=man3/SSL_do_handshake.pod +GENERATE[man/man3/SSL_do_handshake.3]=man3/SSL_do_handshake.pod +DEPEND[html/man3/SSL_export_keying_material.html]=man3/SSL_export_keying_material.pod +GENERATE[html/man3/SSL_export_keying_material.html]=man3/SSL_export_keying_material.pod +DEPEND[man/man3/SSL_export_keying_material.3]=man3/SSL_export_keying_material.pod +GENERATE[man/man3/SSL_export_keying_material.3]=man3/SSL_export_keying_material.pod +DEPEND[html/man3/SSL_extension_supported.html]=man3/SSL_extension_supported.pod +GENERATE[html/man3/SSL_extension_supported.html]=man3/SSL_extension_supported.pod +DEPEND[man/man3/SSL_extension_supported.3]=man3/SSL_extension_supported.pod +GENERATE[man/man3/SSL_extension_supported.3]=man3/SSL_extension_supported.pod +DEPEND[html/man3/SSL_free.html]=man3/SSL_free.pod +GENERATE[html/man3/SSL_free.html]=man3/SSL_free.pod +DEPEND[man/man3/SSL_free.3]=man3/SSL_free.pod +GENERATE[man/man3/SSL_free.3]=man3/SSL_free.pod +DEPEND[html/man3/SSL_get0_peer_scts.html]=man3/SSL_get0_peer_scts.pod +GENERATE[html/man3/SSL_get0_peer_scts.html]=man3/SSL_get0_peer_scts.pod +DEPEND[man/man3/SSL_get0_peer_scts.3]=man3/SSL_get0_peer_scts.pod +GENERATE[man/man3/SSL_get0_peer_scts.3]=man3/SSL_get0_peer_scts.pod +DEPEND[html/man3/SSL_get_SSL_CTX.html]=man3/SSL_get_SSL_CTX.pod +GENERATE[html/man3/SSL_get_SSL_CTX.html]=man3/SSL_get_SSL_CTX.pod +DEPEND[man/man3/SSL_get_SSL_CTX.3]=man3/SSL_get_SSL_CTX.pod +GENERATE[man/man3/SSL_get_SSL_CTX.3]=man3/SSL_get_SSL_CTX.pod +DEPEND[html/man3/SSL_get_all_async_fds.html]=man3/SSL_get_all_async_fds.pod +GENERATE[html/man3/SSL_get_all_async_fds.html]=man3/SSL_get_all_async_fds.pod +DEPEND[man/man3/SSL_get_all_async_fds.3]=man3/SSL_get_all_async_fds.pod +GENERATE[man/man3/SSL_get_all_async_fds.3]=man3/SSL_get_all_async_fds.pod +DEPEND[html/man3/SSL_get_certificate.html]=man3/SSL_get_certificate.pod +GENERATE[html/man3/SSL_get_certificate.html]=man3/SSL_get_certificate.pod +DEPEND[man/man3/SSL_get_certificate.3]=man3/SSL_get_certificate.pod +GENERATE[man/man3/SSL_get_certificate.3]=man3/SSL_get_certificate.pod +DEPEND[html/man3/SSL_get_ciphers.html]=man3/SSL_get_ciphers.pod +GENERATE[html/man3/SSL_get_ciphers.html]=man3/SSL_get_ciphers.pod +DEPEND[man/man3/SSL_get_ciphers.3]=man3/SSL_get_ciphers.pod +GENERATE[man/man3/SSL_get_ciphers.3]=man3/SSL_get_ciphers.pod +DEPEND[html/man3/SSL_get_client_random.html]=man3/SSL_get_client_random.pod +GENERATE[html/man3/SSL_get_client_random.html]=man3/SSL_get_client_random.pod +DEPEND[man/man3/SSL_get_client_random.3]=man3/SSL_get_client_random.pod +GENERATE[man/man3/SSL_get_client_random.3]=man3/SSL_get_client_random.pod +DEPEND[html/man3/SSL_get_current_cipher.html]=man3/SSL_get_current_cipher.pod +GENERATE[html/man3/SSL_get_current_cipher.html]=man3/SSL_get_current_cipher.pod +DEPEND[man/man3/SSL_get_current_cipher.3]=man3/SSL_get_current_cipher.pod +GENERATE[man/man3/SSL_get_current_cipher.3]=man3/SSL_get_current_cipher.pod +DEPEND[html/man3/SSL_get_default_timeout.html]=man3/SSL_get_default_timeout.pod +GENERATE[html/man3/SSL_get_default_timeout.html]=man3/SSL_get_default_timeout.pod +DEPEND[man/man3/SSL_get_default_timeout.3]=man3/SSL_get_default_timeout.pod +GENERATE[man/man3/SSL_get_default_timeout.3]=man3/SSL_get_default_timeout.pod +DEPEND[html/man3/SSL_get_error.html]=man3/SSL_get_error.pod +GENERATE[html/man3/SSL_get_error.html]=man3/SSL_get_error.pod +DEPEND[man/man3/SSL_get_error.3]=man3/SSL_get_error.pod +GENERATE[man/man3/SSL_get_error.3]=man3/SSL_get_error.pod +DEPEND[html/man3/SSL_get_extms_support.html]=man3/SSL_get_extms_support.pod +GENERATE[html/man3/SSL_get_extms_support.html]=man3/SSL_get_extms_support.pod +DEPEND[man/man3/SSL_get_extms_support.3]=man3/SSL_get_extms_support.pod +GENERATE[man/man3/SSL_get_extms_support.3]=man3/SSL_get_extms_support.pod +DEPEND[html/man3/SSL_get_fd.html]=man3/SSL_get_fd.pod +GENERATE[html/man3/SSL_get_fd.html]=man3/SSL_get_fd.pod +DEPEND[man/man3/SSL_get_fd.3]=man3/SSL_get_fd.pod +GENERATE[man/man3/SSL_get_fd.3]=man3/SSL_get_fd.pod +DEPEND[html/man3/SSL_get_peer_cert_chain.html]=man3/SSL_get_peer_cert_chain.pod +GENERATE[html/man3/SSL_get_peer_cert_chain.html]=man3/SSL_get_peer_cert_chain.pod +DEPEND[man/man3/SSL_get_peer_cert_chain.3]=man3/SSL_get_peer_cert_chain.pod +GENERATE[man/man3/SSL_get_peer_cert_chain.3]=man3/SSL_get_peer_cert_chain.pod +DEPEND[html/man3/SSL_get_peer_certificate.html]=man3/SSL_get_peer_certificate.pod +GENERATE[html/man3/SSL_get_peer_certificate.html]=man3/SSL_get_peer_certificate.pod +DEPEND[man/man3/SSL_get_peer_certificate.3]=man3/SSL_get_peer_certificate.pod +GENERATE[man/man3/SSL_get_peer_certificate.3]=man3/SSL_get_peer_certificate.pod +DEPEND[html/man3/SSL_get_peer_signature_nid.html]=man3/SSL_get_peer_signature_nid.pod +GENERATE[html/man3/SSL_get_peer_signature_nid.html]=man3/SSL_get_peer_signature_nid.pod +DEPEND[man/man3/SSL_get_peer_signature_nid.3]=man3/SSL_get_peer_signature_nid.pod +GENERATE[man/man3/SSL_get_peer_signature_nid.3]=man3/SSL_get_peer_signature_nid.pod +DEPEND[html/man3/SSL_get_peer_tmp_key.html]=man3/SSL_get_peer_tmp_key.pod +GENERATE[html/man3/SSL_get_peer_tmp_key.html]=man3/SSL_get_peer_tmp_key.pod +DEPEND[man/man3/SSL_get_peer_tmp_key.3]=man3/SSL_get_peer_tmp_key.pod +GENERATE[man/man3/SSL_get_peer_tmp_key.3]=man3/SSL_get_peer_tmp_key.pod +DEPEND[html/man3/SSL_get_psk_identity.html]=man3/SSL_get_psk_identity.pod +GENERATE[html/man3/SSL_get_psk_identity.html]=man3/SSL_get_psk_identity.pod +DEPEND[man/man3/SSL_get_psk_identity.3]=man3/SSL_get_psk_identity.pod +GENERATE[man/man3/SSL_get_psk_identity.3]=man3/SSL_get_psk_identity.pod +DEPEND[html/man3/SSL_get_rbio.html]=man3/SSL_get_rbio.pod +GENERATE[html/man3/SSL_get_rbio.html]=man3/SSL_get_rbio.pod +DEPEND[man/man3/SSL_get_rbio.3]=man3/SSL_get_rbio.pod +GENERATE[man/man3/SSL_get_rbio.3]=man3/SSL_get_rbio.pod +DEPEND[html/man3/SSL_get_session.html]=man3/SSL_get_session.pod +GENERATE[html/man3/SSL_get_session.html]=man3/SSL_get_session.pod +DEPEND[man/man3/SSL_get_session.3]=man3/SSL_get_session.pod +GENERATE[man/man3/SSL_get_session.3]=man3/SSL_get_session.pod +DEPEND[html/man3/SSL_get_shared_sigalgs.html]=man3/SSL_get_shared_sigalgs.pod +GENERATE[html/man3/SSL_get_shared_sigalgs.html]=man3/SSL_get_shared_sigalgs.pod +DEPEND[man/man3/SSL_get_shared_sigalgs.3]=man3/SSL_get_shared_sigalgs.pod +GENERATE[man/man3/SSL_get_shared_sigalgs.3]=man3/SSL_get_shared_sigalgs.pod +DEPEND[html/man3/SSL_get_verify_result.html]=man3/SSL_get_verify_result.pod +GENERATE[html/man3/SSL_get_verify_result.html]=man3/SSL_get_verify_result.pod +DEPEND[man/man3/SSL_get_verify_result.3]=man3/SSL_get_verify_result.pod +GENERATE[man/man3/SSL_get_verify_result.3]=man3/SSL_get_verify_result.pod +DEPEND[html/man3/SSL_get_version.html]=man3/SSL_get_version.pod +GENERATE[html/man3/SSL_get_version.html]=man3/SSL_get_version.pod +DEPEND[man/man3/SSL_get_version.3]=man3/SSL_get_version.pod +GENERATE[man/man3/SSL_get_version.3]=man3/SSL_get_version.pod +DEPEND[html/man3/SSL_group_to_name.html]=man3/SSL_group_to_name.pod +GENERATE[html/man3/SSL_group_to_name.html]=man3/SSL_group_to_name.pod +DEPEND[man/man3/SSL_group_to_name.3]=man3/SSL_group_to_name.pod +GENERATE[man/man3/SSL_group_to_name.3]=man3/SSL_group_to_name.pod +DEPEND[html/man3/SSL_in_init.html]=man3/SSL_in_init.pod +GENERATE[html/man3/SSL_in_init.html]=man3/SSL_in_init.pod +DEPEND[man/man3/SSL_in_init.3]=man3/SSL_in_init.pod +GENERATE[man/man3/SSL_in_init.3]=man3/SSL_in_init.pod +DEPEND[html/man3/SSL_key_update.html]=man3/SSL_key_update.pod +GENERATE[html/man3/SSL_key_update.html]=man3/SSL_key_update.pod +DEPEND[man/man3/SSL_key_update.3]=man3/SSL_key_update.pod +GENERATE[man/man3/SSL_key_update.3]=man3/SSL_key_update.pod +DEPEND[html/man3/SSL_library_init.html]=man3/SSL_library_init.pod +GENERATE[html/man3/SSL_library_init.html]=man3/SSL_library_init.pod +DEPEND[man/man3/SSL_library_init.3]=man3/SSL_library_init.pod +GENERATE[man/man3/SSL_library_init.3]=man3/SSL_library_init.pod +DEPEND[html/man3/SSL_load_client_CA_file.html]=man3/SSL_load_client_CA_file.pod +GENERATE[html/man3/SSL_load_client_CA_file.html]=man3/SSL_load_client_CA_file.pod +DEPEND[man/man3/SSL_load_client_CA_file.3]=man3/SSL_load_client_CA_file.pod +GENERATE[man/man3/SSL_load_client_CA_file.3]=man3/SSL_load_client_CA_file.pod +DEPEND[html/man3/SSL_new.html]=man3/SSL_new.pod +GENERATE[html/man3/SSL_new.html]=man3/SSL_new.pod +DEPEND[man/man3/SSL_new.3]=man3/SSL_new.pod +GENERATE[man/man3/SSL_new.3]=man3/SSL_new.pod +DEPEND[html/man3/SSL_pending.html]=man3/SSL_pending.pod +GENERATE[html/man3/SSL_pending.html]=man3/SSL_pending.pod +DEPEND[man/man3/SSL_pending.3]=man3/SSL_pending.pod +GENERATE[man/man3/SSL_pending.3]=man3/SSL_pending.pod +DEPEND[html/man3/SSL_read.html]=man3/SSL_read.pod +GENERATE[html/man3/SSL_read.html]=man3/SSL_read.pod +DEPEND[man/man3/SSL_read.3]=man3/SSL_read.pod +GENERATE[man/man3/SSL_read.3]=man3/SSL_read.pod +DEPEND[html/man3/SSL_read_early_data.html]=man3/SSL_read_early_data.pod +GENERATE[html/man3/SSL_read_early_data.html]=man3/SSL_read_early_data.pod +DEPEND[man/man3/SSL_read_early_data.3]=man3/SSL_read_early_data.pod +GENERATE[man/man3/SSL_read_early_data.3]=man3/SSL_read_early_data.pod +DEPEND[html/man3/SSL_rstate_string.html]=man3/SSL_rstate_string.pod +GENERATE[html/man3/SSL_rstate_string.html]=man3/SSL_rstate_string.pod +DEPEND[man/man3/SSL_rstate_string.3]=man3/SSL_rstate_string.pod +GENERATE[man/man3/SSL_rstate_string.3]=man3/SSL_rstate_string.pod +DEPEND[html/man3/SSL_session_reused.html]=man3/SSL_session_reused.pod +GENERATE[html/man3/SSL_session_reused.html]=man3/SSL_session_reused.pod +DEPEND[man/man3/SSL_session_reused.3]=man3/SSL_session_reused.pod +GENERATE[man/man3/SSL_session_reused.3]=man3/SSL_session_reused.pod +DEPEND[html/man3/SSL_set1_host.html]=man3/SSL_set1_host.pod +GENERATE[html/man3/SSL_set1_host.html]=man3/SSL_set1_host.pod +DEPEND[man/man3/SSL_set1_host.3]=man3/SSL_set1_host.pod +GENERATE[man/man3/SSL_set1_host.3]=man3/SSL_set1_host.pod +DEPEND[html/man3/SSL_set_async_callback.html]=man3/SSL_set_async_callback.pod +GENERATE[html/man3/SSL_set_async_callback.html]=man3/SSL_set_async_callback.pod +DEPEND[man/man3/SSL_set_async_callback.3]=man3/SSL_set_async_callback.pod +GENERATE[man/man3/SSL_set_async_callback.3]=man3/SSL_set_async_callback.pod +DEPEND[html/man3/SSL_set_bio.html]=man3/SSL_set_bio.pod +GENERATE[html/man3/SSL_set_bio.html]=man3/SSL_set_bio.pod +DEPEND[man/man3/SSL_set_bio.3]=man3/SSL_set_bio.pod +GENERATE[man/man3/SSL_set_bio.3]=man3/SSL_set_bio.pod +DEPEND[html/man3/SSL_set_connect_state.html]=man3/SSL_set_connect_state.pod +GENERATE[html/man3/SSL_set_connect_state.html]=man3/SSL_set_connect_state.pod +DEPEND[man/man3/SSL_set_connect_state.3]=man3/SSL_set_connect_state.pod +GENERATE[man/man3/SSL_set_connect_state.3]=man3/SSL_set_connect_state.pod +DEPEND[html/man3/SSL_set_fd.html]=man3/SSL_set_fd.pod +GENERATE[html/man3/SSL_set_fd.html]=man3/SSL_set_fd.pod +DEPEND[man/man3/SSL_set_fd.3]=man3/SSL_set_fd.pod +GENERATE[man/man3/SSL_set_fd.3]=man3/SSL_set_fd.pod +DEPEND[html/man3/SSL_set_retry_verify.html]=man3/SSL_set_retry_verify.pod +GENERATE[html/man3/SSL_set_retry_verify.html]=man3/SSL_set_retry_verify.pod +DEPEND[man/man3/SSL_set_retry_verify.3]=man3/SSL_set_retry_verify.pod +GENERATE[man/man3/SSL_set_retry_verify.3]=man3/SSL_set_retry_verify.pod +DEPEND[html/man3/SSL_set_session.html]=man3/SSL_set_session.pod +GENERATE[html/man3/SSL_set_session.html]=man3/SSL_set_session.pod +DEPEND[man/man3/SSL_set_session.3]=man3/SSL_set_session.pod +GENERATE[man/man3/SSL_set_session.3]=man3/SSL_set_session.pod +DEPEND[html/man3/SSL_set_shutdown.html]=man3/SSL_set_shutdown.pod +GENERATE[html/man3/SSL_set_shutdown.html]=man3/SSL_set_shutdown.pod +DEPEND[man/man3/SSL_set_shutdown.3]=man3/SSL_set_shutdown.pod +GENERATE[man/man3/SSL_set_shutdown.3]=man3/SSL_set_shutdown.pod +DEPEND[html/man3/SSL_set_verify_result.html]=man3/SSL_set_verify_result.pod +GENERATE[html/man3/SSL_set_verify_result.html]=man3/SSL_set_verify_result.pod +DEPEND[man/man3/SSL_set_verify_result.3]=man3/SSL_set_verify_result.pod +GENERATE[man/man3/SSL_set_verify_result.3]=man3/SSL_set_verify_result.pod +DEPEND[html/man3/SSL_shutdown.html]=man3/SSL_shutdown.pod +GENERATE[html/man3/SSL_shutdown.html]=man3/SSL_shutdown.pod +DEPEND[man/man3/SSL_shutdown.3]=man3/SSL_shutdown.pod +GENERATE[man/man3/SSL_shutdown.3]=man3/SSL_shutdown.pod +DEPEND[html/man3/SSL_state_string.html]=man3/SSL_state_string.pod +GENERATE[html/man3/SSL_state_string.html]=man3/SSL_state_string.pod +DEPEND[man/man3/SSL_state_string.3]=man3/SSL_state_string.pod +GENERATE[man/man3/SSL_state_string.3]=man3/SSL_state_string.pod +DEPEND[html/man3/SSL_want.html]=man3/SSL_want.pod +GENERATE[html/man3/SSL_want.html]=man3/SSL_want.pod +DEPEND[man/man3/SSL_want.3]=man3/SSL_want.pod +GENERATE[man/man3/SSL_want.3]=man3/SSL_want.pod +DEPEND[html/man3/SSL_write.html]=man3/SSL_write.pod +GENERATE[html/man3/SSL_write.html]=man3/SSL_write.pod +DEPEND[man/man3/SSL_write.3]=man3/SSL_write.pod +GENERATE[man/man3/SSL_write.3]=man3/SSL_write.pod +DEPEND[html/man3/TS_RESP_CTX_new.html]=man3/TS_RESP_CTX_new.pod +GENERATE[html/man3/TS_RESP_CTX_new.html]=man3/TS_RESP_CTX_new.pod +DEPEND[man/man3/TS_RESP_CTX_new.3]=man3/TS_RESP_CTX_new.pod +GENERATE[man/man3/TS_RESP_CTX_new.3]=man3/TS_RESP_CTX_new.pod +DEPEND[html/man3/TS_VERIFY_CTX_set_certs.html]=man3/TS_VERIFY_CTX_set_certs.pod +GENERATE[html/man3/TS_VERIFY_CTX_set_certs.html]=man3/TS_VERIFY_CTX_set_certs.pod +DEPEND[man/man3/TS_VERIFY_CTX_set_certs.3]=man3/TS_VERIFY_CTX_set_certs.pod +GENERATE[man/man3/TS_VERIFY_CTX_set_certs.3]=man3/TS_VERIFY_CTX_set_certs.pod +DEPEND[html/man3/UI_STRING.html]=man3/UI_STRING.pod +GENERATE[html/man3/UI_STRING.html]=man3/UI_STRING.pod +DEPEND[man/man3/UI_STRING.3]=man3/UI_STRING.pod +GENERATE[man/man3/UI_STRING.3]=man3/UI_STRING.pod +DEPEND[html/man3/UI_UTIL_read_pw.html]=man3/UI_UTIL_read_pw.pod +GENERATE[html/man3/UI_UTIL_read_pw.html]=man3/UI_UTIL_read_pw.pod +DEPEND[man/man3/UI_UTIL_read_pw.3]=man3/UI_UTIL_read_pw.pod +GENERATE[man/man3/UI_UTIL_read_pw.3]=man3/UI_UTIL_read_pw.pod +DEPEND[html/man3/UI_create_method.html]=man3/UI_create_method.pod +GENERATE[html/man3/UI_create_method.html]=man3/UI_create_method.pod +DEPEND[man/man3/UI_create_method.3]=man3/UI_create_method.pod +GENERATE[man/man3/UI_create_method.3]=man3/UI_create_method.pod +DEPEND[html/man3/UI_new.html]=man3/UI_new.pod +GENERATE[html/man3/UI_new.html]=man3/UI_new.pod +DEPEND[man/man3/UI_new.3]=man3/UI_new.pod +GENERATE[man/man3/UI_new.3]=man3/UI_new.pod +DEPEND[html/man3/X509V3_get_d2i.html]=man3/X509V3_get_d2i.pod +GENERATE[html/man3/X509V3_get_d2i.html]=man3/X509V3_get_d2i.pod +DEPEND[man/man3/X509V3_get_d2i.3]=man3/X509V3_get_d2i.pod +GENERATE[man/man3/X509V3_get_d2i.3]=man3/X509V3_get_d2i.pod +DEPEND[html/man3/X509V3_set_ctx.html]=man3/X509V3_set_ctx.pod +GENERATE[html/man3/X509V3_set_ctx.html]=man3/X509V3_set_ctx.pod +DEPEND[man/man3/X509V3_set_ctx.3]=man3/X509V3_set_ctx.pod +GENERATE[man/man3/X509V3_set_ctx.3]=man3/X509V3_set_ctx.pod +DEPEND[html/man3/X509_ALGOR_dup.html]=man3/X509_ALGOR_dup.pod +GENERATE[html/man3/X509_ALGOR_dup.html]=man3/X509_ALGOR_dup.pod +DEPEND[man/man3/X509_ALGOR_dup.3]=man3/X509_ALGOR_dup.pod +GENERATE[man/man3/X509_ALGOR_dup.3]=man3/X509_ALGOR_dup.pod +DEPEND[html/man3/X509_CRL_get0_by_serial.html]=man3/X509_CRL_get0_by_serial.pod +GENERATE[html/man3/X509_CRL_get0_by_serial.html]=man3/X509_CRL_get0_by_serial.pod +DEPEND[man/man3/X509_CRL_get0_by_serial.3]=man3/X509_CRL_get0_by_serial.pod +GENERATE[man/man3/X509_CRL_get0_by_serial.3]=man3/X509_CRL_get0_by_serial.pod +DEPEND[html/man3/X509_EXTENSION_set_object.html]=man3/X509_EXTENSION_set_object.pod +GENERATE[html/man3/X509_EXTENSION_set_object.html]=man3/X509_EXTENSION_set_object.pod +DEPEND[man/man3/X509_EXTENSION_set_object.3]=man3/X509_EXTENSION_set_object.pod +GENERATE[man/man3/X509_EXTENSION_set_object.3]=man3/X509_EXTENSION_set_object.pod +DEPEND[html/man3/X509_LOOKUP.html]=man3/X509_LOOKUP.pod +GENERATE[html/man3/X509_LOOKUP.html]=man3/X509_LOOKUP.pod +DEPEND[man/man3/X509_LOOKUP.3]=man3/X509_LOOKUP.pod +GENERATE[man/man3/X509_LOOKUP.3]=man3/X509_LOOKUP.pod +DEPEND[html/man3/X509_LOOKUP_hash_dir.html]=man3/X509_LOOKUP_hash_dir.pod +GENERATE[html/man3/X509_LOOKUP_hash_dir.html]=man3/X509_LOOKUP_hash_dir.pod +DEPEND[man/man3/X509_LOOKUP_hash_dir.3]=man3/X509_LOOKUP_hash_dir.pod +GENERATE[man/man3/X509_LOOKUP_hash_dir.3]=man3/X509_LOOKUP_hash_dir.pod +DEPEND[html/man3/X509_LOOKUP_meth_new.html]=man3/X509_LOOKUP_meth_new.pod +GENERATE[html/man3/X509_LOOKUP_meth_new.html]=man3/X509_LOOKUP_meth_new.pod +DEPEND[man/man3/X509_LOOKUP_meth_new.3]=man3/X509_LOOKUP_meth_new.pod +GENERATE[man/man3/X509_LOOKUP_meth_new.3]=man3/X509_LOOKUP_meth_new.pod +DEPEND[html/man3/X509_NAME_ENTRY_get_object.html]=man3/X509_NAME_ENTRY_get_object.pod +GENERATE[html/man3/X509_NAME_ENTRY_get_object.html]=man3/X509_NAME_ENTRY_get_object.pod +DEPEND[man/man3/X509_NAME_ENTRY_get_object.3]=man3/X509_NAME_ENTRY_get_object.pod +GENERATE[man/man3/X509_NAME_ENTRY_get_object.3]=man3/X509_NAME_ENTRY_get_object.pod +DEPEND[html/man3/X509_NAME_add_entry_by_txt.html]=man3/X509_NAME_add_entry_by_txt.pod +GENERATE[html/man3/X509_NAME_add_entry_by_txt.html]=man3/X509_NAME_add_entry_by_txt.pod +DEPEND[man/man3/X509_NAME_add_entry_by_txt.3]=man3/X509_NAME_add_entry_by_txt.pod +GENERATE[man/man3/X509_NAME_add_entry_by_txt.3]=man3/X509_NAME_add_entry_by_txt.pod +DEPEND[html/man3/X509_NAME_get0_der.html]=man3/X509_NAME_get0_der.pod +GENERATE[html/man3/X509_NAME_get0_der.html]=man3/X509_NAME_get0_der.pod +DEPEND[man/man3/X509_NAME_get0_der.3]=man3/X509_NAME_get0_der.pod +GENERATE[man/man3/X509_NAME_get0_der.3]=man3/X509_NAME_get0_der.pod +DEPEND[html/man3/X509_NAME_get_index_by_NID.html]=man3/X509_NAME_get_index_by_NID.pod +GENERATE[html/man3/X509_NAME_get_index_by_NID.html]=man3/X509_NAME_get_index_by_NID.pod +DEPEND[man/man3/X509_NAME_get_index_by_NID.3]=man3/X509_NAME_get_index_by_NID.pod +GENERATE[man/man3/X509_NAME_get_index_by_NID.3]=man3/X509_NAME_get_index_by_NID.pod +DEPEND[html/man3/X509_NAME_print_ex.html]=man3/X509_NAME_print_ex.pod +GENERATE[html/man3/X509_NAME_print_ex.html]=man3/X509_NAME_print_ex.pod +DEPEND[man/man3/X509_NAME_print_ex.3]=man3/X509_NAME_print_ex.pod +GENERATE[man/man3/X509_NAME_print_ex.3]=man3/X509_NAME_print_ex.pod +DEPEND[html/man3/X509_PUBKEY_new.html]=man3/X509_PUBKEY_new.pod +GENERATE[html/man3/X509_PUBKEY_new.html]=man3/X509_PUBKEY_new.pod +DEPEND[man/man3/X509_PUBKEY_new.3]=man3/X509_PUBKEY_new.pod +GENERATE[man/man3/X509_PUBKEY_new.3]=man3/X509_PUBKEY_new.pod +DEPEND[html/man3/X509_SIG_get0.html]=man3/X509_SIG_get0.pod +GENERATE[html/man3/X509_SIG_get0.html]=man3/X509_SIG_get0.pod +DEPEND[man/man3/X509_SIG_get0.3]=man3/X509_SIG_get0.pod +GENERATE[man/man3/X509_SIG_get0.3]=man3/X509_SIG_get0.pod +DEPEND[html/man3/X509_STORE_CTX_get_error.html]=man3/X509_STORE_CTX_get_error.pod +GENERATE[html/man3/X509_STORE_CTX_get_error.html]=man3/X509_STORE_CTX_get_error.pod +DEPEND[man/man3/X509_STORE_CTX_get_error.3]=man3/X509_STORE_CTX_get_error.pod +GENERATE[man/man3/X509_STORE_CTX_get_error.3]=man3/X509_STORE_CTX_get_error.pod +DEPEND[html/man3/X509_STORE_CTX_new.html]=man3/X509_STORE_CTX_new.pod +GENERATE[html/man3/X509_STORE_CTX_new.html]=man3/X509_STORE_CTX_new.pod +DEPEND[man/man3/X509_STORE_CTX_new.3]=man3/X509_STORE_CTX_new.pod +GENERATE[man/man3/X509_STORE_CTX_new.3]=man3/X509_STORE_CTX_new.pod +DEPEND[html/man3/X509_STORE_CTX_set_verify_cb.html]=man3/X509_STORE_CTX_set_verify_cb.pod +GENERATE[html/man3/X509_STORE_CTX_set_verify_cb.html]=man3/X509_STORE_CTX_set_verify_cb.pod +DEPEND[man/man3/X509_STORE_CTX_set_verify_cb.3]=man3/X509_STORE_CTX_set_verify_cb.pod +GENERATE[man/man3/X509_STORE_CTX_set_verify_cb.3]=man3/X509_STORE_CTX_set_verify_cb.pod +DEPEND[html/man3/X509_STORE_add_cert.html]=man3/X509_STORE_add_cert.pod +GENERATE[html/man3/X509_STORE_add_cert.html]=man3/X509_STORE_add_cert.pod +DEPEND[man/man3/X509_STORE_add_cert.3]=man3/X509_STORE_add_cert.pod +GENERATE[man/man3/X509_STORE_add_cert.3]=man3/X509_STORE_add_cert.pod +DEPEND[html/man3/X509_STORE_get0_param.html]=man3/X509_STORE_get0_param.pod +GENERATE[html/man3/X509_STORE_get0_param.html]=man3/X509_STORE_get0_param.pod +DEPEND[man/man3/X509_STORE_get0_param.3]=man3/X509_STORE_get0_param.pod +GENERATE[man/man3/X509_STORE_get0_param.3]=man3/X509_STORE_get0_param.pod +DEPEND[html/man3/X509_STORE_new.html]=man3/X509_STORE_new.pod +GENERATE[html/man3/X509_STORE_new.html]=man3/X509_STORE_new.pod +DEPEND[man/man3/X509_STORE_new.3]=man3/X509_STORE_new.pod +GENERATE[man/man3/X509_STORE_new.3]=man3/X509_STORE_new.pod +DEPEND[html/man3/X509_STORE_set_verify_cb_func.html]=man3/X509_STORE_set_verify_cb_func.pod +GENERATE[html/man3/X509_STORE_set_verify_cb_func.html]=man3/X509_STORE_set_verify_cb_func.pod +DEPEND[man/man3/X509_STORE_set_verify_cb_func.3]=man3/X509_STORE_set_verify_cb_func.pod +GENERATE[man/man3/X509_STORE_set_verify_cb_func.3]=man3/X509_STORE_set_verify_cb_func.pod +DEPEND[html/man3/X509_VERIFY_PARAM_set_flags.html]=man3/X509_VERIFY_PARAM_set_flags.pod +GENERATE[html/man3/X509_VERIFY_PARAM_set_flags.html]=man3/X509_VERIFY_PARAM_set_flags.pod +DEPEND[man/man3/X509_VERIFY_PARAM_set_flags.3]=man3/X509_VERIFY_PARAM_set_flags.pod +GENERATE[man/man3/X509_VERIFY_PARAM_set_flags.3]=man3/X509_VERIFY_PARAM_set_flags.pod +DEPEND[html/man3/X509_add_cert.html]=man3/X509_add_cert.pod +GENERATE[html/man3/X509_add_cert.html]=man3/X509_add_cert.pod +DEPEND[man/man3/X509_add_cert.3]=man3/X509_add_cert.pod +GENERATE[man/man3/X509_add_cert.3]=man3/X509_add_cert.pod +DEPEND[html/man3/X509_check_ca.html]=man3/X509_check_ca.pod +GENERATE[html/man3/X509_check_ca.html]=man3/X509_check_ca.pod +DEPEND[man/man3/X509_check_ca.3]=man3/X509_check_ca.pod +GENERATE[man/man3/X509_check_ca.3]=man3/X509_check_ca.pod +DEPEND[html/man3/X509_check_host.html]=man3/X509_check_host.pod +GENERATE[html/man3/X509_check_host.html]=man3/X509_check_host.pod +DEPEND[man/man3/X509_check_host.3]=man3/X509_check_host.pod +GENERATE[man/man3/X509_check_host.3]=man3/X509_check_host.pod +DEPEND[html/man3/X509_check_issued.html]=man3/X509_check_issued.pod +GENERATE[html/man3/X509_check_issued.html]=man3/X509_check_issued.pod +DEPEND[man/man3/X509_check_issued.3]=man3/X509_check_issued.pod +GENERATE[man/man3/X509_check_issued.3]=man3/X509_check_issued.pod +DEPEND[html/man3/X509_check_private_key.html]=man3/X509_check_private_key.pod +GENERATE[html/man3/X509_check_private_key.html]=man3/X509_check_private_key.pod +DEPEND[man/man3/X509_check_private_key.3]=man3/X509_check_private_key.pod +GENERATE[man/man3/X509_check_private_key.3]=man3/X509_check_private_key.pod +DEPEND[html/man3/X509_check_purpose.html]=man3/X509_check_purpose.pod +GENERATE[html/man3/X509_check_purpose.html]=man3/X509_check_purpose.pod +DEPEND[man/man3/X509_check_purpose.3]=man3/X509_check_purpose.pod +GENERATE[man/man3/X509_check_purpose.3]=man3/X509_check_purpose.pod +DEPEND[html/man3/X509_cmp.html]=man3/X509_cmp.pod +GENERATE[html/man3/X509_cmp.html]=man3/X509_cmp.pod +DEPEND[man/man3/X509_cmp.3]=man3/X509_cmp.pod +GENERATE[man/man3/X509_cmp.3]=man3/X509_cmp.pod +DEPEND[html/man3/X509_cmp_time.html]=man3/X509_cmp_time.pod +GENERATE[html/man3/X509_cmp_time.html]=man3/X509_cmp_time.pod +DEPEND[man/man3/X509_cmp_time.3]=man3/X509_cmp_time.pod +GENERATE[man/man3/X509_cmp_time.3]=man3/X509_cmp_time.pod +DEPEND[html/man3/X509_digest.html]=man3/X509_digest.pod +GENERATE[html/man3/X509_digest.html]=man3/X509_digest.pod +DEPEND[man/man3/X509_digest.3]=man3/X509_digest.pod +GENERATE[man/man3/X509_digest.3]=man3/X509_digest.pod +DEPEND[html/man3/X509_dup.html]=man3/X509_dup.pod +GENERATE[html/man3/X509_dup.html]=man3/X509_dup.pod +DEPEND[man/man3/X509_dup.3]=man3/X509_dup.pod +GENERATE[man/man3/X509_dup.3]=man3/X509_dup.pod +DEPEND[html/man3/X509_get0_distinguishing_id.html]=man3/X509_get0_distinguishing_id.pod +GENERATE[html/man3/X509_get0_distinguishing_id.html]=man3/X509_get0_distinguishing_id.pod +DEPEND[man/man3/X509_get0_distinguishing_id.3]=man3/X509_get0_distinguishing_id.pod +GENERATE[man/man3/X509_get0_distinguishing_id.3]=man3/X509_get0_distinguishing_id.pod +DEPEND[html/man3/X509_get0_notBefore.html]=man3/X509_get0_notBefore.pod +GENERATE[html/man3/X509_get0_notBefore.html]=man3/X509_get0_notBefore.pod +DEPEND[man/man3/X509_get0_notBefore.3]=man3/X509_get0_notBefore.pod +GENERATE[man/man3/X509_get0_notBefore.3]=man3/X509_get0_notBefore.pod +DEPEND[html/man3/X509_get0_signature.html]=man3/X509_get0_signature.pod +GENERATE[html/man3/X509_get0_signature.html]=man3/X509_get0_signature.pod +DEPEND[man/man3/X509_get0_signature.3]=man3/X509_get0_signature.pod +GENERATE[man/man3/X509_get0_signature.3]=man3/X509_get0_signature.pod +DEPEND[html/man3/X509_get0_uids.html]=man3/X509_get0_uids.pod +GENERATE[html/man3/X509_get0_uids.html]=man3/X509_get0_uids.pod +DEPEND[man/man3/X509_get0_uids.3]=man3/X509_get0_uids.pod +GENERATE[man/man3/X509_get0_uids.3]=man3/X509_get0_uids.pod +DEPEND[html/man3/X509_get_extension_flags.html]=man3/X509_get_extension_flags.pod +GENERATE[html/man3/X509_get_extension_flags.html]=man3/X509_get_extension_flags.pod +DEPEND[man/man3/X509_get_extension_flags.3]=man3/X509_get_extension_flags.pod +GENERATE[man/man3/X509_get_extension_flags.3]=man3/X509_get_extension_flags.pod +DEPEND[html/man3/X509_get_pubkey.html]=man3/X509_get_pubkey.pod +GENERATE[html/man3/X509_get_pubkey.html]=man3/X509_get_pubkey.pod +DEPEND[man/man3/X509_get_pubkey.3]=man3/X509_get_pubkey.pod +GENERATE[man/man3/X509_get_pubkey.3]=man3/X509_get_pubkey.pod +DEPEND[html/man3/X509_get_serialNumber.html]=man3/X509_get_serialNumber.pod +GENERATE[html/man3/X509_get_serialNumber.html]=man3/X509_get_serialNumber.pod +DEPEND[man/man3/X509_get_serialNumber.3]=man3/X509_get_serialNumber.pod +GENERATE[man/man3/X509_get_serialNumber.3]=man3/X509_get_serialNumber.pod +DEPEND[html/man3/X509_get_subject_name.html]=man3/X509_get_subject_name.pod +GENERATE[html/man3/X509_get_subject_name.html]=man3/X509_get_subject_name.pod +DEPEND[man/man3/X509_get_subject_name.3]=man3/X509_get_subject_name.pod +GENERATE[man/man3/X509_get_subject_name.3]=man3/X509_get_subject_name.pod +DEPEND[html/man3/X509_get_version.html]=man3/X509_get_version.pod +GENERATE[html/man3/X509_get_version.html]=man3/X509_get_version.pod +DEPEND[man/man3/X509_get_version.3]=man3/X509_get_version.pod +GENERATE[man/man3/X509_get_version.3]=man3/X509_get_version.pod +DEPEND[html/man3/X509_load_http.html]=man3/X509_load_http.pod +GENERATE[html/man3/X509_load_http.html]=man3/X509_load_http.pod +DEPEND[man/man3/X509_load_http.3]=man3/X509_load_http.pod +GENERATE[man/man3/X509_load_http.3]=man3/X509_load_http.pod +DEPEND[html/man3/X509_new.html]=man3/X509_new.pod +GENERATE[html/man3/X509_new.html]=man3/X509_new.pod +DEPEND[man/man3/X509_new.3]=man3/X509_new.pod +GENERATE[man/man3/X509_new.3]=man3/X509_new.pod +DEPEND[html/man3/X509_sign.html]=man3/X509_sign.pod +GENERATE[html/man3/X509_sign.html]=man3/X509_sign.pod +DEPEND[man/man3/X509_sign.3]=man3/X509_sign.pod +GENERATE[man/man3/X509_sign.3]=man3/X509_sign.pod +DEPEND[html/man3/X509_verify.html]=man3/X509_verify.pod +GENERATE[html/man3/X509_verify.html]=man3/X509_verify.pod +DEPEND[man/man3/X509_verify.3]=man3/X509_verify.pod +GENERATE[man/man3/X509_verify.3]=man3/X509_verify.pod +DEPEND[html/man3/X509_verify_cert.html]=man3/X509_verify_cert.pod +GENERATE[html/man3/X509_verify_cert.html]=man3/X509_verify_cert.pod +DEPEND[man/man3/X509_verify_cert.3]=man3/X509_verify_cert.pod +GENERATE[man/man3/X509_verify_cert.3]=man3/X509_verify_cert.pod +DEPEND[html/man3/X509v3_get_ext_by_NID.html]=man3/X509v3_get_ext_by_NID.pod +GENERATE[html/man3/X509v3_get_ext_by_NID.html]=man3/X509v3_get_ext_by_NID.pod +DEPEND[man/man3/X509v3_get_ext_by_NID.3]=man3/X509v3_get_ext_by_NID.pod +GENERATE[man/man3/X509v3_get_ext_by_NID.3]=man3/X509v3_get_ext_by_NID.pod +DEPEND[html/man3/b2i_PVK_bio_ex.html]=man3/b2i_PVK_bio_ex.pod +GENERATE[html/man3/b2i_PVK_bio_ex.html]=man3/b2i_PVK_bio_ex.pod +DEPEND[man/man3/b2i_PVK_bio_ex.3]=man3/b2i_PVK_bio_ex.pod +GENERATE[man/man3/b2i_PVK_bio_ex.3]=man3/b2i_PVK_bio_ex.pod +DEPEND[html/man3/d2i_PKCS8PrivateKey_bio.html]=man3/d2i_PKCS8PrivateKey_bio.pod +GENERATE[html/man3/d2i_PKCS8PrivateKey_bio.html]=man3/d2i_PKCS8PrivateKey_bio.pod +DEPEND[man/man3/d2i_PKCS8PrivateKey_bio.3]=man3/d2i_PKCS8PrivateKey_bio.pod +GENERATE[man/man3/d2i_PKCS8PrivateKey_bio.3]=man3/d2i_PKCS8PrivateKey_bio.pod +DEPEND[html/man3/d2i_PrivateKey.html]=man3/d2i_PrivateKey.pod +GENERATE[html/man3/d2i_PrivateKey.html]=man3/d2i_PrivateKey.pod +DEPEND[man/man3/d2i_PrivateKey.3]=man3/d2i_PrivateKey.pod +GENERATE[man/man3/d2i_PrivateKey.3]=man3/d2i_PrivateKey.pod +DEPEND[html/man3/d2i_RSAPrivateKey.html]=man3/d2i_RSAPrivateKey.pod +GENERATE[html/man3/d2i_RSAPrivateKey.html]=man3/d2i_RSAPrivateKey.pod +DEPEND[man/man3/d2i_RSAPrivateKey.3]=man3/d2i_RSAPrivateKey.pod +GENERATE[man/man3/d2i_RSAPrivateKey.3]=man3/d2i_RSAPrivateKey.pod +DEPEND[html/man3/d2i_SSL_SESSION.html]=man3/d2i_SSL_SESSION.pod +GENERATE[html/man3/d2i_SSL_SESSION.html]=man3/d2i_SSL_SESSION.pod +DEPEND[man/man3/d2i_SSL_SESSION.3]=man3/d2i_SSL_SESSION.pod +GENERATE[man/man3/d2i_SSL_SESSION.3]=man3/d2i_SSL_SESSION.pod +DEPEND[html/man3/d2i_X509.html]=man3/d2i_X509.pod +GENERATE[html/man3/d2i_X509.html]=man3/d2i_X509.pod +DEPEND[man/man3/d2i_X509.3]=man3/d2i_X509.pod +GENERATE[man/man3/d2i_X509.3]=man3/d2i_X509.pod +DEPEND[html/man3/i2d_CMS_bio_stream.html]=man3/i2d_CMS_bio_stream.pod +GENERATE[html/man3/i2d_CMS_bio_stream.html]=man3/i2d_CMS_bio_stream.pod +DEPEND[man/man3/i2d_CMS_bio_stream.3]=man3/i2d_CMS_bio_stream.pod +GENERATE[man/man3/i2d_CMS_bio_stream.3]=man3/i2d_CMS_bio_stream.pod +DEPEND[html/man3/i2d_PKCS7_bio_stream.html]=man3/i2d_PKCS7_bio_stream.pod +GENERATE[html/man3/i2d_PKCS7_bio_stream.html]=man3/i2d_PKCS7_bio_stream.pod +DEPEND[man/man3/i2d_PKCS7_bio_stream.3]=man3/i2d_PKCS7_bio_stream.pod +GENERATE[man/man3/i2d_PKCS7_bio_stream.3]=man3/i2d_PKCS7_bio_stream.pod +DEPEND[html/man3/i2d_re_X509_tbs.html]=man3/i2d_re_X509_tbs.pod +GENERATE[html/man3/i2d_re_X509_tbs.html]=man3/i2d_re_X509_tbs.pod +DEPEND[man/man3/i2d_re_X509_tbs.3]=man3/i2d_re_X509_tbs.pod +GENERATE[man/man3/i2d_re_X509_tbs.3]=man3/i2d_re_X509_tbs.pod +DEPEND[html/man3/o2i_SCT_LIST.html]=man3/o2i_SCT_LIST.pod +GENERATE[html/man3/o2i_SCT_LIST.html]=man3/o2i_SCT_LIST.pod +DEPEND[man/man3/o2i_SCT_LIST.3]=man3/o2i_SCT_LIST.pod +GENERATE[man/man3/o2i_SCT_LIST.3]=man3/o2i_SCT_LIST.pod +DEPEND[html/man3/s2i_ASN1_IA5STRING.html]=man3/s2i_ASN1_IA5STRING.pod +GENERATE[html/man3/s2i_ASN1_IA5STRING.html]=man3/s2i_ASN1_IA5STRING.pod +DEPEND[man/man3/s2i_ASN1_IA5STRING.3]=man3/s2i_ASN1_IA5STRING.pod +GENERATE[man/man3/s2i_ASN1_IA5STRING.3]=man3/s2i_ASN1_IA5STRING.pod +IMAGEDOCS[man3]= +HTMLDOCS[man3]=html/man3/ADMISSIONS.html \ +html/man3/ASN1_EXTERN_FUNCS.html \ +html/man3/ASN1_INTEGER_get_int64.html \ +html/man3/ASN1_INTEGER_new.html \ +html/man3/ASN1_ITEM_lookup.html \ +html/man3/ASN1_OBJECT_new.html \ +html/man3/ASN1_STRING_TABLE_add.html \ +html/man3/ASN1_STRING_length.html \ +html/man3/ASN1_STRING_new.html \ +html/man3/ASN1_STRING_print_ex.html \ +html/man3/ASN1_TIME_set.html \ +html/man3/ASN1_TYPE_get.html \ +html/man3/ASN1_aux_cb.html \ +html/man3/ASN1_generate_nconf.html \ +html/man3/ASN1_item_d2i_bio.html \ +html/man3/ASN1_item_new.html \ +html/man3/ASN1_item_sign.html \ +html/man3/ASYNC_WAIT_CTX_new.html \ +html/man3/ASYNC_start_job.html \ +html/man3/BF_encrypt.html \ +html/man3/BIO_ADDR.html \ +html/man3/BIO_ADDRINFO.html \ +html/man3/BIO_connect.html \ +html/man3/BIO_ctrl.html \ +html/man3/BIO_f_base64.html \ +html/man3/BIO_f_buffer.html \ +html/man3/BIO_f_cipher.html \ +html/man3/BIO_f_md.html \ +html/man3/BIO_f_null.html \ +html/man3/BIO_f_prefix.html \ +html/man3/BIO_f_readbuffer.html \ +html/man3/BIO_f_ssl.html \ +html/man3/BIO_find_type.html \ +html/man3/BIO_get_data.html \ +html/man3/BIO_get_ex_new_index.html \ +html/man3/BIO_meth_new.html \ +html/man3/BIO_new.html \ +html/man3/BIO_new_CMS.html \ +html/man3/BIO_parse_hostserv.html \ +html/man3/BIO_printf.html \ +html/man3/BIO_push.html \ +html/man3/BIO_read.html \ +html/man3/BIO_s_accept.html \ +html/man3/BIO_s_bio.html \ +html/man3/BIO_s_connect.html \ +html/man3/BIO_s_core.html \ +html/man3/BIO_s_datagram.html \ +html/man3/BIO_s_fd.html \ +html/man3/BIO_s_file.html \ +html/man3/BIO_s_mem.html \ +html/man3/BIO_s_null.html \ +html/man3/BIO_s_socket.html \ +html/man3/BIO_set_callback.html \ +html/man3/BIO_should_retry.html \ +html/man3/BIO_socket_wait.html \ +html/man3/BN_BLINDING_new.html \ +html/man3/BN_CTX_new.html \ +html/man3/BN_CTX_start.html \ +html/man3/BN_add.html \ +html/man3/BN_add_word.html \ +html/man3/BN_bn2bin.html \ +html/man3/BN_cmp.html \ +html/man3/BN_copy.html \ +html/man3/BN_generate_prime.html \ +html/man3/BN_mod_exp_mont.html \ +html/man3/BN_mod_inverse.html \ +html/man3/BN_mod_mul_montgomery.html \ +html/man3/BN_mod_mul_reciprocal.html \ +html/man3/BN_new.html \ +html/man3/BN_num_bytes.html \ +html/man3/BN_rand.html \ +html/man3/BN_security_bits.html \ +html/man3/BN_set_bit.html \ +html/man3/BN_swap.html \ +html/man3/BN_zero.html \ +html/man3/BUF_MEM_new.html \ +html/man3/CMS_EncryptedData_decrypt.html \ +html/man3/CMS_EncryptedData_encrypt.html \ +html/man3/CMS_EnvelopedData_create.html \ +html/man3/CMS_add0_cert.html \ +html/man3/CMS_add1_recipient_cert.html \ +html/man3/CMS_add1_signer.html \ +html/man3/CMS_compress.html \ +html/man3/CMS_data_create.html \ +html/man3/CMS_decrypt.html \ +html/man3/CMS_digest_create.html \ +html/man3/CMS_encrypt.html \ +html/man3/CMS_final.html \ +html/man3/CMS_get0_RecipientInfos.html \ +html/man3/CMS_get0_SignerInfos.html \ +html/man3/CMS_get0_type.html \ +html/man3/CMS_get1_ReceiptRequest.html \ +html/man3/CMS_sign.html \ +html/man3/CMS_sign_receipt.html \ +html/man3/CMS_uncompress.html \ +html/man3/CMS_verify.html \ +html/man3/CMS_verify_receipt.html \ +html/man3/CONF_modules_free.html \ +html/man3/CONF_modules_load_file.html \ +html/man3/CRYPTO_THREAD_run_once.html \ +html/man3/CRYPTO_get_ex_new_index.html \ +html/man3/CRYPTO_memcmp.html \ +html/man3/CTLOG_STORE_get0_log_by_id.html \ +html/man3/CTLOG_STORE_new.html \ +html/man3/CTLOG_new.html \ +html/man3/CT_POLICY_EVAL_CTX_new.html \ +html/man3/DEFINE_STACK_OF.html \ +html/man3/DES_random_key.html \ +html/man3/DH_generate_key.html \ +html/man3/DH_generate_parameters.html \ +html/man3/DH_get0_pqg.html \ +html/man3/DH_get_1024_160.html \ +html/man3/DH_meth_new.html \ +html/man3/DH_new.html \ +html/man3/DH_new_by_nid.html \ +html/man3/DH_set_method.html \ +html/man3/DH_size.html \ +html/man3/DSA_SIG_new.html \ +html/man3/DSA_do_sign.html \ +html/man3/DSA_dup_DH.html \ +html/man3/DSA_generate_key.html \ +html/man3/DSA_generate_parameters.html \ +html/man3/DSA_get0_pqg.html \ +html/man3/DSA_meth_new.html \ +html/man3/DSA_new.html \ +html/man3/DSA_set_method.html \ +html/man3/DSA_sign.html \ +html/man3/DSA_size.html \ +html/man3/DTLS_get_data_mtu.html \ +html/man3/DTLS_set_timer_cb.html \ +html/man3/DTLSv1_listen.html \ +html/man3/ECDSA_SIG_new.html \ +html/man3/ECDSA_sign.html \ +html/man3/ECPKParameters_print.html \ +html/man3/EC_GFp_simple_method.html \ +html/man3/EC_GROUP_copy.html \ +html/man3/EC_GROUP_new.html \ +html/man3/EC_KEY_get_enc_flags.html \ +html/man3/EC_KEY_new.html \ +html/man3/EC_POINT_add.html \ +html/man3/EC_POINT_new.html \ +html/man3/ENGINE_add.html \ +html/man3/ERR_GET_LIB.html \ +html/man3/ERR_clear_error.html \ +html/man3/ERR_error_string.html \ +html/man3/ERR_get_error.html \ +html/man3/ERR_load_crypto_strings.html \ +html/man3/ERR_load_strings.html \ +html/man3/ERR_new.html \ +html/man3/ERR_print_errors.html \ +html/man3/ERR_put_error.html \ +html/man3/ERR_remove_state.html \ +html/man3/ERR_set_mark.html \ +html/man3/EVP_ASYM_CIPHER_free.html \ +html/man3/EVP_BytesToKey.html \ +html/man3/EVP_CIPHER_CTX_get_cipher_data.html \ +html/man3/EVP_CIPHER_CTX_get_original_iv.html \ +html/man3/EVP_CIPHER_meth_new.html \ +html/man3/EVP_DigestInit.html \ +html/man3/EVP_DigestSignInit.html \ +html/man3/EVP_DigestVerifyInit.html \ +html/man3/EVP_EncodeInit.html \ +html/man3/EVP_EncryptInit.html \ +html/man3/EVP_KDF.html \ +html/man3/EVP_KEM_free.html \ +html/man3/EVP_KEYEXCH_free.html \ +html/man3/EVP_KEYMGMT.html \ +html/man3/EVP_MAC.html \ +html/man3/EVP_MD_meth_new.html \ +html/man3/EVP_OpenInit.html \ +html/man3/EVP_PBE_CipherInit.html \ +html/man3/EVP_PKEY2PKCS8.html \ +html/man3/EVP_PKEY_ASN1_METHOD.html \ +html/man3/EVP_PKEY_CTX_ctrl.html \ +html/man3/EVP_PKEY_CTX_get0_libctx.html \ +html/man3/EVP_PKEY_CTX_get0_pkey.html \ +html/man3/EVP_PKEY_CTX_new.html \ +html/man3/EVP_PKEY_CTX_set1_pbe_pass.html \ +html/man3/EVP_PKEY_CTX_set_hkdf_md.html \ +html/man3/EVP_PKEY_CTX_set_params.html \ +html/man3/EVP_PKEY_CTX_set_rsa_pss_keygen_md.html \ +html/man3/EVP_PKEY_CTX_set_scrypt_N.html \ +html/man3/EVP_PKEY_CTX_set_tls1_prf_md.html \ +html/man3/EVP_PKEY_asn1_get_count.html \ +html/man3/EVP_PKEY_check.html \ +html/man3/EVP_PKEY_copy_parameters.html \ +html/man3/EVP_PKEY_decapsulate.html \ +html/man3/EVP_PKEY_decrypt.html \ +html/man3/EVP_PKEY_derive.html \ +html/man3/EVP_PKEY_digestsign_supports_digest.html \ +html/man3/EVP_PKEY_encapsulate.html \ +html/man3/EVP_PKEY_encrypt.html \ +html/man3/EVP_PKEY_fromdata.html \ +html/man3/EVP_PKEY_get_default_digest_nid.html \ +html/man3/EVP_PKEY_get_field_type.html \ +html/man3/EVP_PKEY_get_group_name.html \ +html/man3/EVP_PKEY_get_size.html \ +html/man3/EVP_PKEY_gettable_params.html \ +html/man3/EVP_PKEY_is_a.html \ +html/man3/EVP_PKEY_keygen.html \ +html/man3/EVP_PKEY_meth_get_count.html \ +html/man3/EVP_PKEY_meth_new.html \ +html/man3/EVP_PKEY_new.html \ +html/man3/EVP_PKEY_print_private.html \ +html/man3/EVP_PKEY_set1_RSA.html \ +html/man3/EVP_PKEY_set1_encoded_public_key.html \ +html/man3/EVP_PKEY_set_type.html \ +html/man3/EVP_PKEY_settable_params.html \ +html/man3/EVP_PKEY_sign.html \ +html/man3/EVP_PKEY_todata.html \ +html/man3/EVP_PKEY_verify.html \ +html/man3/EVP_PKEY_verify_recover.html \ +html/man3/EVP_RAND.html \ +html/man3/EVP_SIGNATURE.html \ +html/man3/EVP_SealInit.html \ +html/man3/EVP_SignInit.html \ +html/man3/EVP_VerifyInit.html \ +html/man3/EVP_aes_128_gcm.html \ +html/man3/EVP_aria_128_gcm.html \ +html/man3/EVP_bf_cbc.html \ +html/man3/EVP_blake2b512.html \ +html/man3/EVP_camellia_128_ecb.html \ +html/man3/EVP_cast5_cbc.html \ +html/man3/EVP_chacha20.html \ +html/man3/EVP_des_cbc.html \ +html/man3/EVP_desx_cbc.html \ +html/man3/EVP_idea_cbc.html \ +html/man3/EVP_md2.html \ +html/man3/EVP_md4.html \ +html/man3/EVP_md5.html \ +html/man3/EVP_mdc2.html \ +html/man3/EVP_rc2_cbc.html \ +html/man3/EVP_rc4.html \ +html/man3/EVP_rc5_32_12_16_cbc.html \ +html/man3/EVP_ripemd160.html \ +html/man3/EVP_seed_cbc.html \ +html/man3/EVP_set_default_properties.html \ +html/man3/EVP_sha1.html \ +html/man3/EVP_sha224.html \ +html/man3/EVP_sha3_224.html \ +html/man3/EVP_sm3.html \ +html/man3/EVP_sm4_cbc.html \ +html/man3/EVP_whirlpool.html \ +html/man3/HMAC.html \ +html/man3/MD5.html \ +html/man3/MDC2_Init.html \ +html/man3/NCONF_new_ex.html \ +html/man3/OBJ_nid2obj.html \ +html/man3/OCSP_REQUEST_new.html \ +html/man3/OCSP_cert_to_id.html \ +html/man3/OCSP_request_add1_nonce.html \ +html/man3/OCSP_resp_find_status.html \ +html/man3/OCSP_response_status.html \ +html/man3/OCSP_sendreq_new.html \ +html/man3/OPENSSL_Applink.html \ +html/man3/OPENSSL_FILE.html \ +html/man3/OPENSSL_LH_COMPFUNC.html \ +html/man3/OPENSSL_LH_stats.html \ +html/man3/OPENSSL_config.html \ +html/man3/OPENSSL_fork_prepare.html \ +html/man3/OPENSSL_gmtime.html \ +html/man3/OPENSSL_hexchar2int.html \ +html/man3/OPENSSL_ia32cap.html \ +html/man3/OPENSSL_init_crypto.html \ +html/man3/OPENSSL_init_ssl.html \ +html/man3/OPENSSL_instrument_bus.html \ +html/man3/OPENSSL_load_builtin_modules.html \ +html/man3/OPENSSL_malloc.html \ +html/man3/OPENSSL_s390xcap.html \ +html/man3/OPENSSL_secure_malloc.html \ +html/man3/OPENSSL_strcasecmp.html \ +html/man3/OSSL_ALGORITHM.html \ +html/man3/OSSL_CALLBACK.html \ +html/man3/OSSL_CMP_CTX_new.html \ +html/man3/OSSL_CMP_HDR_get0_transactionID.html \ +html/man3/OSSL_CMP_ITAV_set0.html \ +html/man3/OSSL_CMP_MSG_get0_header.html \ +html/man3/OSSL_CMP_MSG_http_perform.html \ +html/man3/OSSL_CMP_SRV_CTX_new.html \ +html/man3/OSSL_CMP_STATUSINFO_new.html \ +html/man3/OSSL_CMP_exec_certreq.html \ +html/man3/OSSL_CMP_log_open.html \ +html/man3/OSSL_CMP_validate_msg.html \ +html/man3/OSSL_CORE_MAKE_FUNC.html \ +html/man3/OSSL_CRMF_MSG_get0_tmpl.html \ +html/man3/OSSL_CRMF_MSG_set0_validity.html \ +html/man3/OSSL_CRMF_MSG_set1_regCtrl_regToken.html \ +html/man3/OSSL_CRMF_MSG_set1_regInfo_certReq.html \ +html/man3/OSSL_CRMF_pbmp_new.html \ +html/man3/OSSL_DECODER.html \ +html/man3/OSSL_DECODER_CTX.html \ +html/man3/OSSL_DECODER_CTX_new_for_pkey.html \ +html/man3/OSSL_DECODER_from_bio.html \ +html/man3/OSSL_DISPATCH.html \ +html/man3/OSSL_ENCODER.html \ +html/man3/OSSL_ENCODER_CTX.html \ +html/man3/OSSL_ENCODER_CTX_new_for_pkey.html \ +html/man3/OSSL_ENCODER_to_bio.html \ +html/man3/OSSL_ESS_check_signing_certs.html \ +html/man3/OSSL_HTTP_REQ_CTX.html \ +html/man3/OSSL_HTTP_parse_url.html \ +html/man3/OSSL_HTTP_transfer.html \ +html/man3/OSSL_ITEM.html \ +html/man3/OSSL_LIB_CTX.html \ +html/man3/OSSL_PARAM.html \ +html/man3/OSSL_PARAM_BLD.html \ +html/man3/OSSL_PARAM_allocate_from_text.html \ +html/man3/OSSL_PARAM_dup.html \ +html/man3/OSSL_PARAM_int.html \ +html/man3/OSSL_PROVIDER.html \ +html/man3/OSSL_SELF_TEST_new.html \ +html/man3/OSSL_SELF_TEST_set_callback.html \ +html/man3/OSSL_STORE_INFO.html \ +html/man3/OSSL_STORE_LOADER.html \ +html/man3/OSSL_STORE_SEARCH.html \ +html/man3/OSSL_STORE_attach.html \ +html/man3/OSSL_STORE_expect.html \ +html/man3/OSSL_STORE_open.html \ +html/man3/OSSL_trace_enabled.html \ +html/man3/OSSL_trace_get_category_num.html \ +html/man3/OSSL_trace_set_channel.html \ +html/man3/OpenSSL_add_all_algorithms.html \ +html/man3/OpenSSL_version.html \ +html/man3/PEM_X509_INFO_read_bio_ex.html \ +html/man3/PEM_bytes_read_bio.html \ +html/man3/PEM_read.html \ +html/man3/PEM_read_CMS.html \ +html/man3/PEM_read_bio_PrivateKey.html \ +html/man3/PEM_read_bio_ex.html \ +html/man3/PEM_write_bio_CMS_stream.html \ +html/man3/PEM_write_bio_PKCS7_stream.html \ +html/man3/PKCS12_PBE_keyivgen.html \ +html/man3/PKCS12_SAFEBAG_create_cert.html \ +html/man3/PKCS12_SAFEBAG_get0_attrs.html \ +html/man3/PKCS12_SAFEBAG_get1_cert.html \ +html/man3/PKCS12_add1_attr_by_NID.html \ +html/man3/PKCS12_add_CSPName_asc.html \ +html/man3/PKCS12_add_cert.html \ +html/man3/PKCS12_add_friendlyname_asc.html \ +html/man3/PKCS12_add_localkeyid.html \ +html/man3/PKCS12_add_safe.html \ +html/man3/PKCS12_create.html \ +html/man3/PKCS12_decrypt_skey.html \ +html/man3/PKCS12_gen_mac.html \ +html/man3/PKCS12_get_friendlyname.html \ +html/man3/PKCS12_init.html \ +html/man3/PKCS12_item_decrypt_d2i.html \ +html/man3/PKCS12_key_gen_utf8_ex.html \ +html/man3/PKCS12_newpass.html \ +html/man3/PKCS12_pack_p7encdata.html \ +html/man3/PKCS12_parse.html \ +html/man3/PKCS5_PBE_keyivgen.html \ +html/man3/PKCS5_PBKDF2_HMAC.html \ +html/man3/PKCS7_decrypt.html \ +html/man3/PKCS7_encrypt.html \ +html/man3/PKCS7_get_octet_string.html \ +html/man3/PKCS7_sign.html \ +html/man3/PKCS7_sign_add_signer.html \ +html/man3/PKCS7_type_is_other.html \ +html/man3/PKCS7_verify.html \ +html/man3/PKCS8_encrypt.html \ +html/man3/PKCS8_pkey_add1_attr.html \ +html/man3/RAND_add.html \ +html/man3/RAND_bytes.html \ +html/man3/RAND_cleanup.html \ +html/man3/RAND_egd.html \ +html/man3/RAND_get0_primary.html \ +html/man3/RAND_load_file.html \ +html/man3/RAND_set_DRBG_type.html \ +html/man3/RAND_set_rand_method.html \ +html/man3/RC4_set_key.html \ +html/man3/RIPEMD160_Init.html \ +html/man3/RSA_blinding_on.html \ +html/man3/RSA_check_key.html \ +html/man3/RSA_generate_key.html \ +html/man3/RSA_get0_key.html \ +html/man3/RSA_meth_new.html \ +html/man3/RSA_new.html \ +html/man3/RSA_padding_add_PKCS1_type_1.html \ +html/man3/RSA_print.html \ +html/man3/RSA_private_encrypt.html \ +html/man3/RSA_public_encrypt.html \ +html/man3/RSA_set_method.html \ +html/man3/RSA_sign.html \ +html/man3/RSA_sign_ASN1_OCTET_STRING.html \ +html/man3/RSA_size.html \ +html/man3/SCT_new.html \ +html/man3/SCT_print.html \ +html/man3/SCT_validate.html \ +html/man3/SHA256_Init.html \ +html/man3/SMIME_read_ASN1.html \ +html/man3/SMIME_read_CMS.html \ +html/man3/SMIME_read_PKCS7.html \ +html/man3/SMIME_write_ASN1.html \ +html/man3/SMIME_write_CMS.html \ +html/man3/SMIME_write_PKCS7.html \ +html/man3/SRP_Calc_B.html \ +html/man3/SRP_VBASE_new.html \ +html/man3/SRP_create_verifier.html \ +html/man3/SRP_user_pwd_new.html \ +html/man3/SSL_CIPHER_get_name.html \ +html/man3/SSL_COMP_add_compression_method.html \ +html/man3/SSL_CONF_CTX_new.html \ +html/man3/SSL_CONF_CTX_set1_prefix.html \ +html/man3/SSL_CONF_CTX_set_flags.html \ +html/man3/SSL_CONF_CTX_set_ssl_ctx.html \ +html/man3/SSL_CONF_cmd.html \ +html/man3/SSL_CONF_cmd_argv.html \ +html/man3/SSL_CTX_add1_chain_cert.html \ +html/man3/SSL_CTX_add_extra_chain_cert.html \ +html/man3/SSL_CTX_add_session.html \ +html/man3/SSL_CTX_config.html \ +html/man3/SSL_CTX_ctrl.html \ +html/man3/SSL_CTX_dane_enable.html \ +html/man3/SSL_CTX_flush_sessions.html \ +html/man3/SSL_CTX_free.html \ +html/man3/SSL_CTX_get0_param.html \ +html/man3/SSL_CTX_get_verify_mode.html \ +html/man3/SSL_CTX_has_client_custom_ext.html \ +html/man3/SSL_CTX_load_verify_locations.html \ +html/man3/SSL_CTX_new.html \ +html/man3/SSL_CTX_sess_number.html \ +html/man3/SSL_CTX_sess_set_cache_size.html \ +html/man3/SSL_CTX_sess_set_get_cb.html \ +html/man3/SSL_CTX_sessions.html \ +html/man3/SSL_CTX_set0_CA_list.html \ +html/man3/SSL_CTX_set1_curves.html \ +html/man3/SSL_CTX_set1_sigalgs.html \ +html/man3/SSL_CTX_set1_verify_cert_store.html \ +html/man3/SSL_CTX_set_alpn_select_cb.html \ +html/man3/SSL_CTX_set_cert_cb.html \ +html/man3/SSL_CTX_set_cert_store.html \ +html/man3/SSL_CTX_set_cert_verify_callback.html \ +html/man3/SSL_CTX_set_cipher_list.html \ +html/man3/SSL_CTX_set_client_cert_cb.html \ +html/man3/SSL_CTX_set_client_hello_cb.html \ +html/man3/SSL_CTX_set_ct_validation_callback.html \ +html/man3/SSL_CTX_set_ctlog_list_file.html \ +html/man3/SSL_CTX_set_default_passwd_cb.html \ +html/man3/SSL_CTX_set_generate_session_id.html \ +html/man3/SSL_CTX_set_info_callback.html \ +html/man3/SSL_CTX_set_keylog_callback.html \ +html/man3/SSL_CTX_set_max_cert_list.html \ +html/man3/SSL_CTX_set_min_proto_version.html \ +html/man3/SSL_CTX_set_mode.html \ +html/man3/SSL_CTX_set_msg_callback.html \ +html/man3/SSL_CTX_set_num_tickets.html \ +html/man3/SSL_CTX_set_options.html \ +html/man3/SSL_CTX_set_psk_client_callback.html \ +html/man3/SSL_CTX_set_quiet_shutdown.html \ +html/man3/SSL_CTX_set_read_ahead.html \ +html/man3/SSL_CTX_set_record_padding_callback.html \ +html/man3/SSL_CTX_set_security_level.html \ +html/man3/SSL_CTX_set_session_cache_mode.html \ +html/man3/SSL_CTX_set_session_id_context.html \ +html/man3/SSL_CTX_set_session_ticket_cb.html \ +html/man3/SSL_CTX_set_split_send_fragment.html \ +html/man3/SSL_CTX_set_srp_password.html \ +html/man3/SSL_CTX_set_ssl_version.html \ +html/man3/SSL_CTX_set_stateless_cookie_generate_cb.html \ +html/man3/SSL_CTX_set_timeout.html \ +html/man3/SSL_CTX_set_tlsext_servername_callback.html \ +html/man3/SSL_CTX_set_tlsext_status_cb.html \ +html/man3/SSL_CTX_set_tlsext_ticket_key_cb.html \ +html/man3/SSL_CTX_set_tlsext_use_srtp.html \ +html/man3/SSL_CTX_set_tmp_dh_callback.html \ +html/man3/SSL_CTX_set_tmp_ecdh.html \ +html/man3/SSL_CTX_set_verify.html \ +html/man3/SSL_CTX_use_certificate.html \ +html/man3/SSL_CTX_use_psk_identity_hint.html \ +html/man3/SSL_CTX_use_serverinfo.html \ +html/man3/SSL_SESSION_free.html \ +html/man3/SSL_SESSION_get0_cipher.html \ +html/man3/SSL_SESSION_get0_hostname.html \ +html/man3/SSL_SESSION_get0_id_context.html \ +html/man3/SSL_SESSION_get0_peer.html \ +html/man3/SSL_SESSION_get_compress_id.html \ +html/man3/SSL_SESSION_get_protocol_version.html \ +html/man3/SSL_SESSION_get_time.html \ +html/man3/SSL_SESSION_has_ticket.html \ +html/man3/SSL_SESSION_is_resumable.html \ +html/man3/SSL_SESSION_print.html \ +html/man3/SSL_SESSION_set1_id.html \ +html/man3/SSL_accept.html \ +html/man3/SSL_alert_type_string.html \ +html/man3/SSL_alloc_buffers.html \ +html/man3/SSL_check_chain.html \ +html/man3/SSL_clear.html \ +html/man3/SSL_connect.html \ +html/man3/SSL_do_handshake.html \ +html/man3/SSL_export_keying_material.html \ +html/man3/SSL_extension_supported.html \ +html/man3/SSL_free.html \ +html/man3/SSL_get0_peer_scts.html \ +html/man3/SSL_get_SSL_CTX.html \ +html/man3/SSL_get_all_async_fds.html \ +html/man3/SSL_get_certificate.html \ +html/man3/SSL_get_ciphers.html \ +html/man3/SSL_get_client_random.html \ +html/man3/SSL_get_current_cipher.html \ +html/man3/SSL_get_default_timeout.html \ +html/man3/SSL_get_error.html \ +html/man3/SSL_get_extms_support.html \ +html/man3/SSL_get_fd.html \ +html/man3/SSL_get_peer_cert_chain.html \ +html/man3/SSL_get_peer_certificate.html \ +html/man3/SSL_get_peer_signature_nid.html \ +html/man3/SSL_get_peer_tmp_key.html \ +html/man3/SSL_get_psk_identity.html \ +html/man3/SSL_get_rbio.html \ +html/man3/SSL_get_session.html \ +html/man3/SSL_get_shared_sigalgs.html \ +html/man3/SSL_get_verify_result.html \ +html/man3/SSL_get_version.html \ +html/man3/SSL_group_to_name.html \ +html/man3/SSL_in_init.html \ +html/man3/SSL_key_update.html \ +html/man3/SSL_library_init.html \ +html/man3/SSL_load_client_CA_file.html \ +html/man3/SSL_new.html \ +html/man3/SSL_pending.html \ +html/man3/SSL_read.html \ +html/man3/SSL_read_early_data.html \ +html/man3/SSL_rstate_string.html \ +html/man3/SSL_session_reused.html \ +html/man3/SSL_set1_host.html \ +html/man3/SSL_set_async_callback.html \ +html/man3/SSL_set_bio.html \ +html/man3/SSL_set_connect_state.html \ +html/man3/SSL_set_fd.html \ +html/man3/SSL_set_retry_verify.html \ +html/man3/SSL_set_session.html \ +html/man3/SSL_set_shutdown.html \ +html/man3/SSL_set_verify_result.html \ +html/man3/SSL_shutdown.html \ +html/man3/SSL_state_string.html \ +html/man3/SSL_want.html \ +html/man3/SSL_write.html \ +html/man3/TS_RESP_CTX_new.html \ +html/man3/TS_VERIFY_CTX_set_certs.html \ +html/man3/UI_STRING.html \ +html/man3/UI_UTIL_read_pw.html \ +html/man3/UI_create_method.html \ +html/man3/UI_new.html \ +html/man3/X509V3_get_d2i.html \ +html/man3/X509V3_set_ctx.html \ +html/man3/X509_ALGOR_dup.html \ +html/man3/X509_CRL_get0_by_serial.html \ +html/man3/X509_EXTENSION_set_object.html \ +html/man3/X509_LOOKUP.html \ +html/man3/X509_LOOKUP_hash_dir.html \ +html/man3/X509_LOOKUP_meth_new.html \ +html/man3/X509_NAME_ENTRY_get_object.html \ +html/man3/X509_NAME_add_entry_by_txt.html \ +html/man3/X509_NAME_get0_der.html \ +html/man3/X509_NAME_get_index_by_NID.html \ +html/man3/X509_NAME_print_ex.html \ +html/man3/X509_PUBKEY_new.html \ +html/man3/X509_SIG_get0.html \ +html/man3/X509_STORE_CTX_get_error.html \ +html/man3/X509_STORE_CTX_new.html \ +html/man3/X509_STORE_CTX_set_verify_cb.html \ +html/man3/X509_STORE_add_cert.html \ +html/man3/X509_STORE_get0_param.html \ +html/man3/X509_STORE_new.html \ +html/man3/X509_STORE_set_verify_cb_func.html \ +html/man3/X509_VERIFY_PARAM_set_flags.html \ +html/man3/X509_add_cert.html \ +html/man3/X509_check_ca.html \ +html/man3/X509_check_host.html \ +html/man3/X509_check_issued.html \ +html/man3/X509_check_private_key.html \ +html/man3/X509_check_purpose.html \ +html/man3/X509_cmp.html \ +html/man3/X509_cmp_time.html \ +html/man3/X509_digest.html \ +html/man3/X509_dup.html \ +html/man3/X509_get0_distinguishing_id.html \ +html/man3/X509_get0_notBefore.html \ +html/man3/X509_get0_signature.html \ +html/man3/X509_get0_uids.html \ +html/man3/X509_get_extension_flags.html \ +html/man3/X509_get_pubkey.html \ +html/man3/X509_get_serialNumber.html \ +html/man3/X509_get_subject_name.html \ +html/man3/X509_get_version.html \ +html/man3/X509_load_http.html \ +html/man3/X509_new.html \ +html/man3/X509_sign.html \ +html/man3/X509_verify.html \ +html/man3/X509_verify_cert.html \ +html/man3/X509v3_get_ext_by_NID.html \ +html/man3/b2i_PVK_bio_ex.html \ +html/man3/d2i_PKCS8PrivateKey_bio.html \ +html/man3/d2i_PrivateKey.html \ +html/man3/d2i_RSAPrivateKey.html \ +html/man3/d2i_SSL_SESSION.html \ +html/man3/d2i_X509.html \ +html/man3/i2d_CMS_bio_stream.html \ +html/man3/i2d_PKCS7_bio_stream.html \ +html/man3/i2d_re_X509_tbs.html \ +html/man3/o2i_SCT_LIST.html \ +html/man3/s2i_ASN1_IA5STRING.html +MANDOCS[man3]=man/man3/ADMISSIONS.3 \ +man/man3/ASN1_EXTERN_FUNCS.3 \ +man/man3/ASN1_INTEGER_get_int64.3 \ +man/man3/ASN1_INTEGER_new.3 \ +man/man3/ASN1_ITEM_lookup.3 \ +man/man3/ASN1_OBJECT_new.3 \ +man/man3/ASN1_STRING_TABLE_add.3 \ +man/man3/ASN1_STRING_length.3 \ +man/man3/ASN1_STRING_new.3 \ +man/man3/ASN1_STRING_print_ex.3 \ +man/man3/ASN1_TIME_set.3 \ +man/man3/ASN1_TYPE_get.3 \ +man/man3/ASN1_aux_cb.3 \ +man/man3/ASN1_generate_nconf.3 \ +man/man3/ASN1_item_d2i_bio.3 \ +man/man3/ASN1_item_new.3 \ +man/man3/ASN1_item_sign.3 \ +man/man3/ASYNC_WAIT_CTX_new.3 \ +man/man3/ASYNC_start_job.3 \ +man/man3/BF_encrypt.3 \ +man/man3/BIO_ADDR.3 \ +man/man3/BIO_ADDRINFO.3 \ +man/man3/BIO_connect.3 \ +man/man3/BIO_ctrl.3 \ +man/man3/BIO_f_base64.3 \ +man/man3/BIO_f_buffer.3 \ +man/man3/BIO_f_cipher.3 \ +man/man3/BIO_f_md.3 \ +man/man3/BIO_f_null.3 \ +man/man3/BIO_f_prefix.3 \ +man/man3/BIO_f_readbuffer.3 \ +man/man3/BIO_f_ssl.3 \ +man/man3/BIO_find_type.3 \ +man/man3/BIO_get_data.3 \ +man/man3/BIO_get_ex_new_index.3 \ +man/man3/BIO_meth_new.3 \ +man/man3/BIO_new.3 \ +man/man3/BIO_new_CMS.3 \ +man/man3/BIO_parse_hostserv.3 \ +man/man3/BIO_printf.3 \ +man/man3/BIO_push.3 \ +man/man3/BIO_read.3 \ +man/man3/BIO_s_accept.3 \ +man/man3/BIO_s_bio.3 \ +man/man3/BIO_s_connect.3 \ +man/man3/BIO_s_core.3 \ +man/man3/BIO_s_datagram.3 \ +man/man3/BIO_s_fd.3 \ +man/man3/BIO_s_file.3 \ +man/man3/BIO_s_mem.3 \ +man/man3/BIO_s_null.3 \ +man/man3/BIO_s_socket.3 \ +man/man3/BIO_set_callback.3 \ +man/man3/BIO_should_retry.3 \ +man/man3/BIO_socket_wait.3 \ +man/man3/BN_BLINDING_new.3 \ +man/man3/BN_CTX_new.3 \ +man/man3/BN_CTX_start.3 \ +man/man3/BN_add.3 \ +man/man3/BN_add_word.3 \ +man/man3/BN_bn2bin.3 \ +man/man3/BN_cmp.3 \ +man/man3/BN_copy.3 \ +man/man3/BN_generate_prime.3 \ +man/man3/BN_mod_exp_mont.3 \ +man/man3/BN_mod_inverse.3 \ +man/man3/BN_mod_mul_montgomery.3 \ +man/man3/BN_mod_mul_reciprocal.3 \ +man/man3/BN_new.3 \ +man/man3/BN_num_bytes.3 \ +man/man3/BN_rand.3 \ +man/man3/BN_security_bits.3 \ +man/man3/BN_set_bit.3 \ +man/man3/BN_swap.3 \ +man/man3/BN_zero.3 \ +man/man3/BUF_MEM_new.3 \ +man/man3/CMS_EncryptedData_decrypt.3 \ +man/man3/CMS_EncryptedData_encrypt.3 \ +man/man3/CMS_EnvelopedData_create.3 \ +man/man3/CMS_add0_cert.3 \ +man/man3/CMS_add1_recipient_cert.3 \ +man/man3/CMS_add1_signer.3 \ +man/man3/CMS_compress.3 \ +man/man3/CMS_data_create.3 \ +man/man3/CMS_decrypt.3 \ +man/man3/CMS_digest_create.3 \ +man/man3/CMS_encrypt.3 \ +man/man3/CMS_final.3 \ +man/man3/CMS_get0_RecipientInfos.3 \ +man/man3/CMS_get0_SignerInfos.3 \ +man/man3/CMS_get0_type.3 \ +man/man3/CMS_get1_ReceiptRequest.3 \ +man/man3/CMS_sign.3 \ +man/man3/CMS_sign_receipt.3 \ +man/man3/CMS_uncompress.3 \ +man/man3/CMS_verify.3 \ +man/man3/CMS_verify_receipt.3 \ +man/man3/CONF_modules_free.3 \ +man/man3/CONF_modules_load_file.3 \ +man/man3/CRYPTO_THREAD_run_once.3 \ +man/man3/CRYPTO_get_ex_new_index.3 \ +man/man3/CRYPTO_memcmp.3 \ +man/man3/CTLOG_STORE_get0_log_by_id.3 \ +man/man3/CTLOG_STORE_new.3 \ +man/man3/CTLOG_new.3 \ +man/man3/CT_POLICY_EVAL_CTX_new.3 \ +man/man3/DEFINE_STACK_OF.3 \ +man/man3/DES_random_key.3 \ +man/man3/DH_generate_key.3 \ +man/man3/DH_generate_parameters.3 \ +man/man3/DH_get0_pqg.3 \ +man/man3/DH_get_1024_160.3 \ +man/man3/DH_meth_new.3 \ +man/man3/DH_new.3 \ +man/man3/DH_new_by_nid.3 \ +man/man3/DH_set_method.3 \ +man/man3/DH_size.3 \ +man/man3/DSA_SIG_new.3 \ +man/man3/DSA_do_sign.3 \ +man/man3/DSA_dup_DH.3 \ +man/man3/DSA_generate_key.3 \ +man/man3/DSA_generate_parameters.3 \ +man/man3/DSA_get0_pqg.3 \ +man/man3/DSA_meth_new.3 \ +man/man3/DSA_new.3 \ +man/man3/DSA_set_method.3 \ +man/man3/DSA_sign.3 \ +man/man3/DSA_size.3 \ +man/man3/DTLS_get_data_mtu.3 \ +man/man3/DTLS_set_timer_cb.3 \ +man/man3/DTLSv1_listen.3 \ +man/man3/ECDSA_SIG_new.3 \ +man/man3/ECDSA_sign.3 \ +man/man3/ECPKParameters_print.3 \ +man/man3/EC_GFp_simple_method.3 \ +man/man3/EC_GROUP_copy.3 \ +man/man3/EC_GROUP_new.3 \ +man/man3/EC_KEY_get_enc_flags.3 \ +man/man3/EC_KEY_new.3 \ +man/man3/EC_POINT_add.3 \ +man/man3/EC_POINT_new.3 \ +man/man3/ENGINE_add.3 \ +man/man3/ERR_GET_LIB.3 \ +man/man3/ERR_clear_error.3 \ +man/man3/ERR_error_string.3 \ +man/man3/ERR_get_error.3 \ +man/man3/ERR_load_crypto_strings.3 \ +man/man3/ERR_load_strings.3 \ +man/man3/ERR_new.3 \ +man/man3/ERR_print_errors.3 \ +man/man3/ERR_put_error.3 \ +man/man3/ERR_remove_state.3 \ +man/man3/ERR_set_mark.3 \ +man/man3/EVP_ASYM_CIPHER_free.3 \ +man/man3/EVP_BytesToKey.3 \ +man/man3/EVP_CIPHER_CTX_get_cipher_data.3 \ +man/man3/EVP_CIPHER_CTX_get_original_iv.3 \ +man/man3/EVP_CIPHER_meth_new.3 \ +man/man3/EVP_DigestInit.3 \ +man/man3/EVP_DigestSignInit.3 \ +man/man3/EVP_DigestVerifyInit.3 \ +man/man3/EVP_EncodeInit.3 \ +man/man3/EVP_EncryptInit.3 \ +man/man3/EVP_KDF.3 \ +man/man3/EVP_KEM_free.3 \ +man/man3/EVP_KEYEXCH_free.3 \ +man/man3/EVP_KEYMGMT.3 \ +man/man3/EVP_MAC.3 \ +man/man3/EVP_MD_meth_new.3 \ +man/man3/EVP_OpenInit.3 \ +man/man3/EVP_PBE_CipherInit.3 \ +man/man3/EVP_PKEY2PKCS8.3 \ +man/man3/EVP_PKEY_ASN1_METHOD.3 \ +man/man3/EVP_PKEY_CTX_ctrl.3 \ +man/man3/EVP_PKEY_CTX_get0_libctx.3 \ +man/man3/EVP_PKEY_CTX_get0_pkey.3 \ +man/man3/EVP_PKEY_CTX_new.3 \ +man/man3/EVP_PKEY_CTX_set1_pbe_pass.3 \ +man/man3/EVP_PKEY_CTX_set_hkdf_md.3 \ +man/man3/EVP_PKEY_CTX_set_params.3 \ +man/man3/EVP_PKEY_CTX_set_rsa_pss_keygen_md.3 \ +man/man3/EVP_PKEY_CTX_set_scrypt_N.3 \ +man/man3/EVP_PKEY_CTX_set_tls1_prf_md.3 \ +man/man3/EVP_PKEY_asn1_get_count.3 \ +man/man3/EVP_PKEY_check.3 \ +man/man3/EVP_PKEY_copy_parameters.3 \ +man/man3/EVP_PKEY_decapsulate.3 \ +man/man3/EVP_PKEY_decrypt.3 \ +man/man3/EVP_PKEY_derive.3 \ +man/man3/EVP_PKEY_digestsign_supports_digest.3 \ +man/man3/EVP_PKEY_encapsulate.3 \ +man/man3/EVP_PKEY_encrypt.3 \ +man/man3/EVP_PKEY_fromdata.3 \ +man/man3/EVP_PKEY_get_default_digest_nid.3 \ +man/man3/EVP_PKEY_get_field_type.3 \ +man/man3/EVP_PKEY_get_group_name.3 \ +man/man3/EVP_PKEY_get_size.3 \ +man/man3/EVP_PKEY_gettable_params.3 \ +man/man3/EVP_PKEY_is_a.3 \ +man/man3/EVP_PKEY_keygen.3 \ +man/man3/EVP_PKEY_meth_get_count.3 \ +man/man3/EVP_PKEY_meth_new.3 \ +man/man3/EVP_PKEY_new.3 \ +man/man3/EVP_PKEY_print_private.3 \ +man/man3/EVP_PKEY_set1_RSA.3 \ +man/man3/EVP_PKEY_set1_encoded_public_key.3 \ +man/man3/EVP_PKEY_set_type.3 \ +man/man3/EVP_PKEY_settable_params.3 \ +man/man3/EVP_PKEY_sign.3 \ +man/man3/EVP_PKEY_todata.3 \ +man/man3/EVP_PKEY_verify.3 \ +man/man3/EVP_PKEY_verify_recover.3 \ +man/man3/EVP_RAND.3 \ +man/man3/EVP_SIGNATURE.3 \ +man/man3/EVP_SealInit.3 \ +man/man3/EVP_SignInit.3 \ +man/man3/EVP_VerifyInit.3 \ +man/man3/EVP_aes_128_gcm.3 \ +man/man3/EVP_aria_128_gcm.3 \ +man/man3/EVP_bf_cbc.3 \ +man/man3/EVP_blake2b512.3 \ +man/man3/EVP_camellia_128_ecb.3 \ +man/man3/EVP_cast5_cbc.3 \ +man/man3/EVP_chacha20.3 \ +man/man3/EVP_des_cbc.3 \ +man/man3/EVP_desx_cbc.3 \ +man/man3/EVP_idea_cbc.3 \ +man/man3/EVP_md2.3 \ +man/man3/EVP_md4.3 \ +man/man3/EVP_md5.3 \ +man/man3/EVP_mdc2.3 \ +man/man3/EVP_rc2_cbc.3 \ +man/man3/EVP_rc4.3 \ +man/man3/EVP_rc5_32_12_16_cbc.3 \ +man/man3/EVP_ripemd160.3 \ +man/man3/EVP_seed_cbc.3 \ +man/man3/EVP_set_default_properties.3 \ +man/man3/EVP_sha1.3 \ +man/man3/EVP_sha224.3 \ +man/man3/EVP_sha3_224.3 \ +man/man3/EVP_sm3.3 \ +man/man3/EVP_sm4_cbc.3 \ +man/man3/EVP_whirlpool.3 \ +man/man3/HMAC.3 \ +man/man3/MD5.3 \ +man/man3/MDC2_Init.3 \ +man/man3/NCONF_new_ex.3 \ +man/man3/OBJ_nid2obj.3 \ +man/man3/OCSP_REQUEST_new.3 \ +man/man3/OCSP_cert_to_id.3 \ +man/man3/OCSP_request_add1_nonce.3 \ +man/man3/OCSP_resp_find_status.3 \ +man/man3/OCSP_response_status.3 \ +man/man3/OCSP_sendreq_new.3 \ +man/man3/OPENSSL_Applink.3 \ +man/man3/OPENSSL_FILE.3 \ +man/man3/OPENSSL_LH_COMPFUNC.3 \ +man/man3/OPENSSL_LH_stats.3 \ +man/man3/OPENSSL_config.3 \ +man/man3/OPENSSL_fork_prepare.3 \ +man/man3/OPENSSL_gmtime.3 \ +man/man3/OPENSSL_hexchar2int.3 \ +man/man3/OPENSSL_ia32cap.3 \ +man/man3/OPENSSL_init_crypto.3 \ +man/man3/OPENSSL_init_ssl.3 \ +man/man3/OPENSSL_instrument_bus.3 \ +man/man3/OPENSSL_load_builtin_modules.3 \ +man/man3/OPENSSL_malloc.3 \ +man/man3/OPENSSL_s390xcap.3 \ +man/man3/OPENSSL_secure_malloc.3 \ +man/man3/OPENSSL_strcasecmp.3 \ +man/man3/OSSL_ALGORITHM.3 \ +man/man3/OSSL_CALLBACK.3 \ +man/man3/OSSL_CMP_CTX_new.3 \ +man/man3/OSSL_CMP_HDR_get0_transactionID.3 \ +man/man3/OSSL_CMP_ITAV_set0.3 \ +man/man3/OSSL_CMP_MSG_get0_header.3 \ +man/man3/OSSL_CMP_MSG_http_perform.3 \ +man/man3/OSSL_CMP_SRV_CTX_new.3 \ +man/man3/OSSL_CMP_STATUSINFO_new.3 \ +man/man3/OSSL_CMP_exec_certreq.3 \ +man/man3/OSSL_CMP_log_open.3 \ +man/man3/OSSL_CMP_validate_msg.3 \ +man/man3/OSSL_CORE_MAKE_FUNC.3 \ +man/man3/OSSL_CRMF_MSG_get0_tmpl.3 \ +man/man3/OSSL_CRMF_MSG_set0_validity.3 \ +man/man3/OSSL_CRMF_MSG_set1_regCtrl_regToken.3 \ +man/man3/OSSL_CRMF_MSG_set1_regInfo_certReq.3 \ +man/man3/OSSL_CRMF_pbmp_new.3 \ +man/man3/OSSL_DECODER.3 \ +man/man3/OSSL_DECODER_CTX.3 \ +man/man3/OSSL_DECODER_CTX_new_for_pkey.3 \ +man/man3/OSSL_DECODER_from_bio.3 \ +man/man3/OSSL_DISPATCH.3 \ +man/man3/OSSL_ENCODER.3 \ +man/man3/OSSL_ENCODER_CTX.3 \ +man/man3/OSSL_ENCODER_CTX_new_for_pkey.3 \ +man/man3/OSSL_ENCODER_to_bio.3 \ +man/man3/OSSL_ESS_check_signing_certs.3 \ +man/man3/OSSL_HTTP_REQ_CTX.3 \ +man/man3/OSSL_HTTP_parse_url.3 \ +man/man3/OSSL_HTTP_transfer.3 \ +man/man3/OSSL_ITEM.3 \ +man/man3/OSSL_LIB_CTX.3 \ +man/man3/OSSL_PARAM.3 \ +man/man3/OSSL_PARAM_BLD.3 \ +man/man3/OSSL_PARAM_allocate_from_text.3 \ +man/man3/OSSL_PARAM_dup.3 \ +man/man3/OSSL_PARAM_int.3 \ +man/man3/OSSL_PROVIDER.3 \ +man/man3/OSSL_SELF_TEST_new.3 \ +man/man3/OSSL_SELF_TEST_set_callback.3 \ +man/man3/OSSL_STORE_INFO.3 \ +man/man3/OSSL_STORE_LOADER.3 \ +man/man3/OSSL_STORE_SEARCH.3 \ +man/man3/OSSL_STORE_attach.3 \ +man/man3/OSSL_STORE_expect.3 \ +man/man3/OSSL_STORE_open.3 \ +man/man3/OSSL_trace_enabled.3 \ +man/man3/OSSL_trace_get_category_num.3 \ +man/man3/OSSL_trace_set_channel.3 \ +man/man3/OpenSSL_add_all_algorithms.3 \ +man/man3/OpenSSL_version.3 \ +man/man3/PEM_X509_INFO_read_bio_ex.3 \ +man/man3/PEM_bytes_read_bio.3 \ +man/man3/PEM_read.3 \ +man/man3/PEM_read_CMS.3 \ +man/man3/PEM_read_bio_PrivateKey.3 \ +man/man3/PEM_read_bio_ex.3 \ +man/man3/PEM_write_bio_CMS_stream.3 \ +man/man3/PEM_write_bio_PKCS7_stream.3 \ +man/man3/PKCS12_PBE_keyivgen.3 \ +man/man3/PKCS12_SAFEBAG_create_cert.3 \ +man/man3/PKCS12_SAFEBAG_get0_attrs.3 \ +man/man3/PKCS12_SAFEBAG_get1_cert.3 \ +man/man3/PKCS12_add1_attr_by_NID.3 \ +man/man3/PKCS12_add_CSPName_asc.3 \ +man/man3/PKCS12_add_cert.3 \ +man/man3/PKCS12_add_friendlyname_asc.3 \ +man/man3/PKCS12_add_localkeyid.3 \ +man/man3/PKCS12_add_safe.3 \ +man/man3/PKCS12_create.3 \ +man/man3/PKCS12_decrypt_skey.3 \ +man/man3/PKCS12_gen_mac.3 \ +man/man3/PKCS12_get_friendlyname.3 \ +man/man3/PKCS12_init.3 \ +man/man3/PKCS12_item_decrypt_d2i.3 \ +man/man3/PKCS12_key_gen_utf8_ex.3 \ +man/man3/PKCS12_newpass.3 \ +man/man3/PKCS12_pack_p7encdata.3 \ +man/man3/PKCS12_parse.3 \ +man/man3/PKCS5_PBE_keyivgen.3 \ +man/man3/PKCS5_PBKDF2_HMAC.3 \ +man/man3/PKCS7_decrypt.3 \ +man/man3/PKCS7_encrypt.3 \ +man/man3/PKCS7_get_octet_string.3 \ +man/man3/PKCS7_sign.3 \ +man/man3/PKCS7_sign_add_signer.3 \ +man/man3/PKCS7_type_is_other.3 \ +man/man3/PKCS7_verify.3 \ +man/man3/PKCS8_encrypt.3 \ +man/man3/PKCS8_pkey_add1_attr.3 \ +man/man3/RAND_add.3 \ +man/man3/RAND_bytes.3 \ +man/man3/RAND_cleanup.3 \ +man/man3/RAND_egd.3 \ +man/man3/RAND_get0_primary.3 \ +man/man3/RAND_load_file.3 \ +man/man3/RAND_set_DRBG_type.3 \ +man/man3/RAND_set_rand_method.3 \ +man/man3/RC4_set_key.3 \ +man/man3/RIPEMD160_Init.3 \ +man/man3/RSA_blinding_on.3 \ +man/man3/RSA_check_key.3 \ +man/man3/RSA_generate_key.3 \ +man/man3/RSA_get0_key.3 \ +man/man3/RSA_meth_new.3 \ +man/man3/RSA_new.3 \ +man/man3/RSA_padding_add_PKCS1_type_1.3 \ +man/man3/RSA_print.3 \ +man/man3/RSA_private_encrypt.3 \ +man/man3/RSA_public_encrypt.3 \ +man/man3/RSA_set_method.3 \ +man/man3/RSA_sign.3 \ +man/man3/RSA_sign_ASN1_OCTET_STRING.3 \ +man/man3/RSA_size.3 \ +man/man3/SCT_new.3 \ +man/man3/SCT_print.3 \ +man/man3/SCT_validate.3 \ +man/man3/SHA256_Init.3 \ +man/man3/SMIME_read_ASN1.3 \ +man/man3/SMIME_read_CMS.3 \ +man/man3/SMIME_read_PKCS7.3 \ +man/man3/SMIME_write_ASN1.3 \ +man/man3/SMIME_write_CMS.3 \ +man/man3/SMIME_write_PKCS7.3 \ +man/man3/SRP_Calc_B.3 \ +man/man3/SRP_VBASE_new.3 \ +man/man3/SRP_create_verifier.3 \ +man/man3/SRP_user_pwd_new.3 \ +man/man3/SSL_CIPHER_get_name.3 \ +man/man3/SSL_COMP_add_compression_method.3 \ +man/man3/SSL_CONF_CTX_new.3 \ +man/man3/SSL_CONF_CTX_set1_prefix.3 \ +man/man3/SSL_CONF_CTX_set_flags.3 \ +man/man3/SSL_CONF_CTX_set_ssl_ctx.3 \ +man/man3/SSL_CONF_cmd.3 \ +man/man3/SSL_CONF_cmd_argv.3 \ +man/man3/SSL_CTX_add1_chain_cert.3 \ +man/man3/SSL_CTX_add_extra_chain_cert.3 \ +man/man3/SSL_CTX_add_session.3 \ +man/man3/SSL_CTX_config.3 \ +man/man3/SSL_CTX_ctrl.3 \ +man/man3/SSL_CTX_dane_enable.3 \ +man/man3/SSL_CTX_flush_sessions.3 \ +man/man3/SSL_CTX_free.3 \ +man/man3/SSL_CTX_get0_param.3 \ +man/man3/SSL_CTX_get_verify_mode.3 \ +man/man3/SSL_CTX_has_client_custom_ext.3 \ +man/man3/SSL_CTX_load_verify_locations.3 \ +man/man3/SSL_CTX_new.3 \ +man/man3/SSL_CTX_sess_number.3 \ +man/man3/SSL_CTX_sess_set_cache_size.3 \ +man/man3/SSL_CTX_sess_set_get_cb.3 \ +man/man3/SSL_CTX_sessions.3 \ +man/man3/SSL_CTX_set0_CA_list.3 \ +man/man3/SSL_CTX_set1_curves.3 \ +man/man3/SSL_CTX_set1_sigalgs.3 \ +man/man3/SSL_CTX_set1_verify_cert_store.3 \ +man/man3/SSL_CTX_set_alpn_select_cb.3 \ +man/man3/SSL_CTX_set_cert_cb.3 \ +man/man3/SSL_CTX_set_cert_store.3 \ +man/man3/SSL_CTX_set_cert_verify_callback.3 \ +man/man3/SSL_CTX_set_cipher_list.3 \ +man/man3/SSL_CTX_set_client_cert_cb.3 \ +man/man3/SSL_CTX_set_client_hello_cb.3 \ +man/man3/SSL_CTX_set_ct_validation_callback.3 \ +man/man3/SSL_CTX_set_ctlog_list_file.3 \ +man/man3/SSL_CTX_set_default_passwd_cb.3 \ +man/man3/SSL_CTX_set_generate_session_id.3 \ +man/man3/SSL_CTX_set_info_callback.3 \ +man/man3/SSL_CTX_set_keylog_callback.3 \ +man/man3/SSL_CTX_set_max_cert_list.3 \ +man/man3/SSL_CTX_set_min_proto_version.3 \ +man/man3/SSL_CTX_set_mode.3 \ +man/man3/SSL_CTX_set_msg_callback.3 \ +man/man3/SSL_CTX_set_num_tickets.3 \ +man/man3/SSL_CTX_set_options.3 \ +man/man3/SSL_CTX_set_psk_client_callback.3 \ +man/man3/SSL_CTX_set_quiet_shutdown.3 \ +man/man3/SSL_CTX_set_read_ahead.3 \ +man/man3/SSL_CTX_set_record_padding_callback.3 \ +man/man3/SSL_CTX_set_security_level.3 \ +man/man3/SSL_CTX_set_session_cache_mode.3 \ +man/man3/SSL_CTX_set_session_id_context.3 \ +man/man3/SSL_CTX_set_session_ticket_cb.3 \ +man/man3/SSL_CTX_set_split_send_fragment.3 \ +man/man3/SSL_CTX_set_srp_password.3 \ +man/man3/SSL_CTX_set_ssl_version.3 \ +man/man3/SSL_CTX_set_stateless_cookie_generate_cb.3 \ +man/man3/SSL_CTX_set_timeout.3 \ +man/man3/SSL_CTX_set_tlsext_servername_callback.3 \ +man/man3/SSL_CTX_set_tlsext_status_cb.3 \ +man/man3/SSL_CTX_set_tlsext_ticket_key_cb.3 \ +man/man3/SSL_CTX_set_tlsext_use_srtp.3 \ +man/man3/SSL_CTX_set_tmp_dh_callback.3 \ +man/man3/SSL_CTX_set_tmp_ecdh.3 \ +man/man3/SSL_CTX_set_verify.3 \ +man/man3/SSL_CTX_use_certificate.3 \ +man/man3/SSL_CTX_use_psk_identity_hint.3 \ +man/man3/SSL_CTX_use_serverinfo.3 \ +man/man3/SSL_SESSION_free.3 \ +man/man3/SSL_SESSION_get0_cipher.3 \ +man/man3/SSL_SESSION_get0_hostname.3 \ +man/man3/SSL_SESSION_get0_id_context.3 \ +man/man3/SSL_SESSION_get0_peer.3 \ +man/man3/SSL_SESSION_get_compress_id.3 \ +man/man3/SSL_SESSION_get_protocol_version.3 \ +man/man3/SSL_SESSION_get_time.3 \ +man/man3/SSL_SESSION_has_ticket.3 \ +man/man3/SSL_SESSION_is_resumable.3 \ +man/man3/SSL_SESSION_print.3 \ +man/man3/SSL_SESSION_set1_id.3 \ +man/man3/SSL_accept.3 \ +man/man3/SSL_alert_type_string.3 \ +man/man3/SSL_alloc_buffers.3 \ +man/man3/SSL_check_chain.3 \ +man/man3/SSL_clear.3 \ +man/man3/SSL_connect.3 \ +man/man3/SSL_do_handshake.3 \ +man/man3/SSL_export_keying_material.3 \ +man/man3/SSL_extension_supported.3 \ +man/man3/SSL_free.3 \ +man/man3/SSL_get0_peer_scts.3 \ +man/man3/SSL_get_SSL_CTX.3 \ +man/man3/SSL_get_all_async_fds.3 \ +man/man3/SSL_get_certificate.3 \ +man/man3/SSL_get_ciphers.3 \ +man/man3/SSL_get_client_random.3 \ +man/man3/SSL_get_current_cipher.3 \ +man/man3/SSL_get_default_timeout.3 \ +man/man3/SSL_get_error.3 \ +man/man3/SSL_get_extms_support.3 \ +man/man3/SSL_get_fd.3 \ +man/man3/SSL_get_peer_cert_chain.3 \ +man/man3/SSL_get_peer_certificate.3 \ +man/man3/SSL_get_peer_signature_nid.3 \ +man/man3/SSL_get_peer_tmp_key.3 \ +man/man3/SSL_get_psk_identity.3 \ +man/man3/SSL_get_rbio.3 \ +man/man3/SSL_get_session.3 \ +man/man3/SSL_get_shared_sigalgs.3 \ +man/man3/SSL_get_verify_result.3 \ +man/man3/SSL_get_version.3 \ +man/man3/SSL_group_to_name.3 \ +man/man3/SSL_in_init.3 \ +man/man3/SSL_key_update.3 \ +man/man3/SSL_library_init.3 \ +man/man3/SSL_load_client_CA_file.3 \ +man/man3/SSL_new.3 \ +man/man3/SSL_pending.3 \ +man/man3/SSL_read.3 \ +man/man3/SSL_read_early_data.3 \ +man/man3/SSL_rstate_string.3 \ +man/man3/SSL_session_reused.3 \ +man/man3/SSL_set1_host.3 \ +man/man3/SSL_set_async_callback.3 \ +man/man3/SSL_set_bio.3 \ +man/man3/SSL_set_connect_state.3 \ +man/man3/SSL_set_fd.3 \ +man/man3/SSL_set_retry_verify.3 \ +man/man3/SSL_set_session.3 \ +man/man3/SSL_set_shutdown.3 \ +man/man3/SSL_set_verify_result.3 \ +man/man3/SSL_shutdown.3 \ +man/man3/SSL_state_string.3 \ +man/man3/SSL_want.3 \ +man/man3/SSL_write.3 \ +man/man3/TS_RESP_CTX_new.3 \ +man/man3/TS_VERIFY_CTX_set_certs.3 \ +man/man3/UI_STRING.3 \ +man/man3/UI_UTIL_read_pw.3 \ +man/man3/UI_create_method.3 \ +man/man3/UI_new.3 \ +man/man3/X509V3_get_d2i.3 \ +man/man3/X509V3_set_ctx.3 \ +man/man3/X509_ALGOR_dup.3 \ +man/man3/X509_CRL_get0_by_serial.3 \ +man/man3/X509_EXTENSION_set_object.3 \ +man/man3/X509_LOOKUP.3 \ +man/man3/X509_LOOKUP_hash_dir.3 \ +man/man3/X509_LOOKUP_meth_new.3 \ +man/man3/X509_NAME_ENTRY_get_object.3 \ +man/man3/X509_NAME_add_entry_by_txt.3 \ +man/man3/X509_NAME_get0_der.3 \ +man/man3/X509_NAME_get_index_by_NID.3 \ +man/man3/X509_NAME_print_ex.3 \ +man/man3/X509_PUBKEY_new.3 \ +man/man3/X509_SIG_get0.3 \ +man/man3/X509_STORE_CTX_get_error.3 \ +man/man3/X509_STORE_CTX_new.3 \ +man/man3/X509_STORE_CTX_set_verify_cb.3 \ +man/man3/X509_STORE_add_cert.3 \ +man/man3/X509_STORE_get0_param.3 \ +man/man3/X509_STORE_new.3 \ +man/man3/X509_STORE_set_verify_cb_func.3 \ +man/man3/X509_VERIFY_PARAM_set_flags.3 \ +man/man3/X509_add_cert.3 \ +man/man3/X509_check_ca.3 \ +man/man3/X509_check_host.3 \ +man/man3/X509_check_issued.3 \ +man/man3/X509_check_private_key.3 \ +man/man3/X509_check_purpose.3 \ +man/man3/X509_cmp.3 \ +man/man3/X509_cmp_time.3 \ +man/man3/X509_digest.3 \ +man/man3/X509_dup.3 \ +man/man3/X509_get0_distinguishing_id.3 \ +man/man3/X509_get0_notBefore.3 \ +man/man3/X509_get0_signature.3 \ +man/man3/X509_get0_uids.3 \ +man/man3/X509_get_extension_flags.3 \ +man/man3/X509_get_pubkey.3 \ +man/man3/X509_get_serialNumber.3 \ +man/man3/X509_get_subject_name.3 \ +man/man3/X509_get_version.3 \ +man/man3/X509_load_http.3 \ +man/man3/X509_new.3 \ +man/man3/X509_sign.3 \ +man/man3/X509_verify.3 \ +man/man3/X509_verify_cert.3 \ +man/man3/X509v3_get_ext_by_NID.3 \ +man/man3/b2i_PVK_bio_ex.3 \ +man/man3/d2i_PKCS8PrivateKey_bio.3 \ +man/man3/d2i_PrivateKey.3 \ +man/man3/d2i_RSAPrivateKey.3 \ +man/man3/d2i_SSL_SESSION.3 \ +man/man3/d2i_X509.3 \ +man/man3/i2d_CMS_bio_stream.3 \ +man/man3/i2d_PKCS7_bio_stream.3 \ +man/man3/i2d_re_X509_tbs.3 \ +man/man3/o2i_SCT_LIST.3 \ +man/man3/s2i_ASN1_IA5STRING.3 +DEPEND[html/man5/config.html]=man5/config.pod +GENERATE[html/man5/config.html]=man5/config.pod +DEPEND[man/man5/config.5]=man5/config.pod +GENERATE[man/man5/config.5]=man5/config.pod +DEPEND[html/man5/fips_config.html]=man5/fips_config.pod +GENERATE[html/man5/fips_config.html]=man5/fips_config.pod +DEPEND[man/man5/fips_config.5]=man5/fips_config.pod +GENERATE[man/man5/fips_config.5]=man5/fips_config.pod +DEPEND[html/man5/x509v3_config.html]=man5/x509v3_config.pod +GENERATE[html/man5/x509v3_config.html]=man5/x509v3_config.pod +DEPEND[man/man5/x509v3_config.5]=man5/x509v3_config.pod +GENERATE[man/man5/x509v3_config.5]=man5/x509v3_config.pod +IMAGEDOCS[man5]= +HTMLDOCS[man5]=html/man5/config.html \ +html/man5/fips_config.html \ +html/man5/x509v3_config.html +MANDOCS[man5]=man/man5/config.5 \ +man/man5/fips_config.5 \ +man/man5/x509v3_config.5 +DEPEND[html/man7/EVP_ASYM_CIPHER-RSA.html]=man7/EVP_ASYM_CIPHER-RSA.pod +GENERATE[html/man7/EVP_ASYM_CIPHER-RSA.html]=man7/EVP_ASYM_CIPHER-RSA.pod +DEPEND[man/man7/EVP_ASYM_CIPHER-RSA.7]=man7/EVP_ASYM_CIPHER-RSA.pod +GENERATE[man/man7/EVP_ASYM_CIPHER-RSA.7]=man7/EVP_ASYM_CIPHER-RSA.pod +DEPEND[html/man7/EVP_ASYM_CIPHER-SM2.html]=man7/EVP_ASYM_CIPHER-SM2.pod +GENERATE[html/man7/EVP_ASYM_CIPHER-SM2.html]=man7/EVP_ASYM_CIPHER-SM2.pod +DEPEND[man/man7/EVP_ASYM_CIPHER-SM2.7]=man7/EVP_ASYM_CIPHER-SM2.pod +GENERATE[man/man7/EVP_ASYM_CIPHER-SM2.7]=man7/EVP_ASYM_CIPHER-SM2.pod +DEPEND[html/man7/EVP_CIPHER-AES.html]=man7/EVP_CIPHER-AES.pod +GENERATE[html/man7/EVP_CIPHER-AES.html]=man7/EVP_CIPHER-AES.pod +DEPEND[man/man7/EVP_CIPHER-AES.7]=man7/EVP_CIPHER-AES.pod +GENERATE[man/man7/EVP_CIPHER-AES.7]=man7/EVP_CIPHER-AES.pod +DEPEND[html/man7/EVP_CIPHER-ARIA.html]=man7/EVP_CIPHER-ARIA.pod +GENERATE[html/man7/EVP_CIPHER-ARIA.html]=man7/EVP_CIPHER-ARIA.pod +DEPEND[man/man7/EVP_CIPHER-ARIA.7]=man7/EVP_CIPHER-ARIA.pod +GENERATE[man/man7/EVP_CIPHER-ARIA.7]=man7/EVP_CIPHER-ARIA.pod +DEPEND[html/man7/EVP_CIPHER-BLOWFISH.html]=man7/EVP_CIPHER-BLOWFISH.pod +GENERATE[html/man7/EVP_CIPHER-BLOWFISH.html]=man7/EVP_CIPHER-BLOWFISH.pod +DEPEND[man/man7/EVP_CIPHER-BLOWFISH.7]=man7/EVP_CIPHER-BLOWFISH.pod +GENERATE[man/man7/EVP_CIPHER-BLOWFISH.7]=man7/EVP_CIPHER-BLOWFISH.pod +DEPEND[html/man7/EVP_CIPHER-CAMELLIA.html]=man7/EVP_CIPHER-CAMELLIA.pod +GENERATE[html/man7/EVP_CIPHER-CAMELLIA.html]=man7/EVP_CIPHER-CAMELLIA.pod +DEPEND[man/man7/EVP_CIPHER-CAMELLIA.7]=man7/EVP_CIPHER-CAMELLIA.pod +GENERATE[man/man7/EVP_CIPHER-CAMELLIA.7]=man7/EVP_CIPHER-CAMELLIA.pod +DEPEND[html/man7/EVP_CIPHER-CAST.html]=man7/EVP_CIPHER-CAST.pod +GENERATE[html/man7/EVP_CIPHER-CAST.html]=man7/EVP_CIPHER-CAST.pod +DEPEND[man/man7/EVP_CIPHER-CAST.7]=man7/EVP_CIPHER-CAST.pod +GENERATE[man/man7/EVP_CIPHER-CAST.7]=man7/EVP_CIPHER-CAST.pod +DEPEND[html/man7/EVP_CIPHER-CHACHA.html]=man7/EVP_CIPHER-CHACHA.pod +GENERATE[html/man7/EVP_CIPHER-CHACHA.html]=man7/EVP_CIPHER-CHACHA.pod +DEPEND[man/man7/EVP_CIPHER-CHACHA.7]=man7/EVP_CIPHER-CHACHA.pod +GENERATE[man/man7/EVP_CIPHER-CHACHA.7]=man7/EVP_CIPHER-CHACHA.pod +DEPEND[html/man7/EVP_CIPHER-DES.html]=man7/EVP_CIPHER-DES.pod +GENERATE[html/man7/EVP_CIPHER-DES.html]=man7/EVP_CIPHER-DES.pod +DEPEND[man/man7/EVP_CIPHER-DES.7]=man7/EVP_CIPHER-DES.pod +GENERATE[man/man7/EVP_CIPHER-DES.7]=man7/EVP_CIPHER-DES.pod +DEPEND[html/man7/EVP_CIPHER-IDEA.html]=man7/EVP_CIPHER-IDEA.pod +GENERATE[html/man7/EVP_CIPHER-IDEA.html]=man7/EVP_CIPHER-IDEA.pod +DEPEND[man/man7/EVP_CIPHER-IDEA.7]=man7/EVP_CIPHER-IDEA.pod +GENERATE[man/man7/EVP_CIPHER-IDEA.7]=man7/EVP_CIPHER-IDEA.pod +DEPEND[html/man7/EVP_CIPHER-NULL.html]=man7/EVP_CIPHER-NULL.pod +GENERATE[html/man7/EVP_CIPHER-NULL.html]=man7/EVP_CIPHER-NULL.pod +DEPEND[man/man7/EVP_CIPHER-NULL.7]=man7/EVP_CIPHER-NULL.pod +GENERATE[man/man7/EVP_CIPHER-NULL.7]=man7/EVP_CIPHER-NULL.pod +DEPEND[html/man7/EVP_CIPHER-RC2.html]=man7/EVP_CIPHER-RC2.pod +GENERATE[html/man7/EVP_CIPHER-RC2.html]=man7/EVP_CIPHER-RC2.pod +DEPEND[man/man7/EVP_CIPHER-RC2.7]=man7/EVP_CIPHER-RC2.pod +GENERATE[man/man7/EVP_CIPHER-RC2.7]=man7/EVP_CIPHER-RC2.pod +DEPEND[html/man7/EVP_CIPHER-RC4.html]=man7/EVP_CIPHER-RC4.pod +GENERATE[html/man7/EVP_CIPHER-RC4.html]=man7/EVP_CIPHER-RC4.pod +DEPEND[man/man7/EVP_CIPHER-RC4.7]=man7/EVP_CIPHER-RC4.pod +GENERATE[man/man7/EVP_CIPHER-RC4.7]=man7/EVP_CIPHER-RC4.pod +DEPEND[html/man7/EVP_CIPHER-RC5.html]=man7/EVP_CIPHER-RC5.pod +GENERATE[html/man7/EVP_CIPHER-RC5.html]=man7/EVP_CIPHER-RC5.pod +DEPEND[man/man7/EVP_CIPHER-RC5.7]=man7/EVP_CIPHER-RC5.pod +GENERATE[man/man7/EVP_CIPHER-RC5.7]=man7/EVP_CIPHER-RC5.pod +DEPEND[html/man7/EVP_CIPHER-SEED.html]=man7/EVP_CIPHER-SEED.pod +GENERATE[html/man7/EVP_CIPHER-SEED.html]=man7/EVP_CIPHER-SEED.pod +DEPEND[man/man7/EVP_CIPHER-SEED.7]=man7/EVP_CIPHER-SEED.pod +GENERATE[man/man7/EVP_CIPHER-SEED.7]=man7/EVP_CIPHER-SEED.pod +DEPEND[html/man7/EVP_CIPHER-SM4.html]=man7/EVP_CIPHER-SM4.pod +GENERATE[html/man7/EVP_CIPHER-SM4.html]=man7/EVP_CIPHER-SM4.pod +DEPEND[man/man7/EVP_CIPHER-SM4.7]=man7/EVP_CIPHER-SM4.pod +GENERATE[man/man7/EVP_CIPHER-SM4.7]=man7/EVP_CIPHER-SM4.pod +DEPEND[html/man7/EVP_KDF-HKDF.html]=man7/EVP_KDF-HKDF.pod +GENERATE[html/man7/EVP_KDF-HKDF.html]=man7/EVP_KDF-HKDF.pod +DEPEND[man/man7/EVP_KDF-HKDF.7]=man7/EVP_KDF-HKDF.pod +GENERATE[man/man7/EVP_KDF-HKDF.7]=man7/EVP_KDF-HKDF.pod +DEPEND[html/man7/EVP_KDF-KB.html]=man7/EVP_KDF-KB.pod +GENERATE[html/man7/EVP_KDF-KB.html]=man7/EVP_KDF-KB.pod +DEPEND[man/man7/EVP_KDF-KB.7]=man7/EVP_KDF-KB.pod +GENERATE[man/man7/EVP_KDF-KB.7]=man7/EVP_KDF-KB.pod +DEPEND[html/man7/EVP_KDF-KRB5KDF.html]=man7/EVP_KDF-KRB5KDF.pod +GENERATE[html/man7/EVP_KDF-KRB5KDF.html]=man7/EVP_KDF-KRB5KDF.pod +DEPEND[man/man7/EVP_KDF-KRB5KDF.7]=man7/EVP_KDF-KRB5KDF.pod +GENERATE[man/man7/EVP_KDF-KRB5KDF.7]=man7/EVP_KDF-KRB5KDF.pod +DEPEND[html/man7/EVP_KDF-PBKDF1.html]=man7/EVP_KDF-PBKDF1.pod +GENERATE[html/man7/EVP_KDF-PBKDF1.html]=man7/EVP_KDF-PBKDF1.pod +DEPEND[man/man7/EVP_KDF-PBKDF1.7]=man7/EVP_KDF-PBKDF1.pod +GENERATE[man/man7/EVP_KDF-PBKDF1.7]=man7/EVP_KDF-PBKDF1.pod +DEPEND[html/man7/EVP_KDF-PBKDF2.html]=man7/EVP_KDF-PBKDF2.pod +GENERATE[html/man7/EVP_KDF-PBKDF2.html]=man7/EVP_KDF-PBKDF2.pod +DEPEND[man/man7/EVP_KDF-PBKDF2.7]=man7/EVP_KDF-PBKDF2.pod +GENERATE[man/man7/EVP_KDF-PBKDF2.7]=man7/EVP_KDF-PBKDF2.pod +DEPEND[html/man7/EVP_KDF-PKCS12KDF.html]=man7/EVP_KDF-PKCS12KDF.pod +GENERATE[html/man7/EVP_KDF-PKCS12KDF.html]=man7/EVP_KDF-PKCS12KDF.pod +DEPEND[man/man7/EVP_KDF-PKCS12KDF.7]=man7/EVP_KDF-PKCS12KDF.pod +GENERATE[man/man7/EVP_KDF-PKCS12KDF.7]=man7/EVP_KDF-PKCS12KDF.pod +DEPEND[html/man7/EVP_KDF-SCRYPT.html]=man7/EVP_KDF-SCRYPT.pod +GENERATE[html/man7/EVP_KDF-SCRYPT.html]=man7/EVP_KDF-SCRYPT.pod +DEPEND[man/man7/EVP_KDF-SCRYPT.7]=man7/EVP_KDF-SCRYPT.pod +GENERATE[man/man7/EVP_KDF-SCRYPT.7]=man7/EVP_KDF-SCRYPT.pod +DEPEND[html/man7/EVP_KDF-SS.html]=man7/EVP_KDF-SS.pod +GENERATE[html/man7/EVP_KDF-SS.html]=man7/EVP_KDF-SS.pod +DEPEND[man/man7/EVP_KDF-SS.7]=man7/EVP_KDF-SS.pod +GENERATE[man/man7/EVP_KDF-SS.7]=man7/EVP_KDF-SS.pod +DEPEND[html/man7/EVP_KDF-SSHKDF.html]=man7/EVP_KDF-SSHKDF.pod +GENERATE[html/man7/EVP_KDF-SSHKDF.html]=man7/EVP_KDF-SSHKDF.pod +DEPEND[man/man7/EVP_KDF-SSHKDF.7]=man7/EVP_KDF-SSHKDF.pod +GENERATE[man/man7/EVP_KDF-SSHKDF.7]=man7/EVP_KDF-SSHKDF.pod +DEPEND[html/man7/EVP_KDF-TLS13_KDF.html]=man7/EVP_KDF-TLS13_KDF.pod +GENERATE[html/man7/EVP_KDF-TLS13_KDF.html]=man7/EVP_KDF-TLS13_KDF.pod +DEPEND[man/man7/EVP_KDF-TLS13_KDF.7]=man7/EVP_KDF-TLS13_KDF.pod +GENERATE[man/man7/EVP_KDF-TLS13_KDF.7]=man7/EVP_KDF-TLS13_KDF.pod +DEPEND[html/man7/EVP_KDF-TLS1_PRF.html]=man7/EVP_KDF-TLS1_PRF.pod +GENERATE[html/man7/EVP_KDF-TLS1_PRF.html]=man7/EVP_KDF-TLS1_PRF.pod +DEPEND[man/man7/EVP_KDF-TLS1_PRF.7]=man7/EVP_KDF-TLS1_PRF.pod +GENERATE[man/man7/EVP_KDF-TLS1_PRF.7]=man7/EVP_KDF-TLS1_PRF.pod +DEPEND[html/man7/EVP_KDF-X942-ASN1.html]=man7/EVP_KDF-X942-ASN1.pod +GENERATE[html/man7/EVP_KDF-X942-ASN1.html]=man7/EVP_KDF-X942-ASN1.pod +DEPEND[man/man7/EVP_KDF-X942-ASN1.7]=man7/EVP_KDF-X942-ASN1.pod +GENERATE[man/man7/EVP_KDF-X942-ASN1.7]=man7/EVP_KDF-X942-ASN1.pod +DEPEND[html/man7/EVP_KDF-X942-CONCAT.html]=man7/EVP_KDF-X942-CONCAT.pod +GENERATE[html/man7/EVP_KDF-X942-CONCAT.html]=man7/EVP_KDF-X942-CONCAT.pod +DEPEND[man/man7/EVP_KDF-X942-CONCAT.7]=man7/EVP_KDF-X942-CONCAT.pod +GENERATE[man/man7/EVP_KDF-X942-CONCAT.7]=man7/EVP_KDF-X942-CONCAT.pod +DEPEND[html/man7/EVP_KDF-X963.html]=man7/EVP_KDF-X963.pod +GENERATE[html/man7/EVP_KDF-X963.html]=man7/EVP_KDF-X963.pod +DEPEND[man/man7/EVP_KDF-X963.7]=man7/EVP_KDF-X963.pod +GENERATE[man/man7/EVP_KDF-X963.7]=man7/EVP_KDF-X963.pod +DEPEND[html/man7/EVP_KEM-RSA.html]=man7/EVP_KEM-RSA.pod +GENERATE[html/man7/EVP_KEM-RSA.html]=man7/EVP_KEM-RSA.pod +DEPEND[man/man7/EVP_KEM-RSA.7]=man7/EVP_KEM-RSA.pod +GENERATE[man/man7/EVP_KEM-RSA.7]=man7/EVP_KEM-RSA.pod +DEPEND[html/man7/EVP_KEYEXCH-DH.html]=man7/EVP_KEYEXCH-DH.pod +GENERATE[html/man7/EVP_KEYEXCH-DH.html]=man7/EVP_KEYEXCH-DH.pod +DEPEND[man/man7/EVP_KEYEXCH-DH.7]=man7/EVP_KEYEXCH-DH.pod +GENERATE[man/man7/EVP_KEYEXCH-DH.7]=man7/EVP_KEYEXCH-DH.pod +DEPEND[html/man7/EVP_KEYEXCH-ECDH.html]=man7/EVP_KEYEXCH-ECDH.pod +GENERATE[html/man7/EVP_KEYEXCH-ECDH.html]=man7/EVP_KEYEXCH-ECDH.pod +DEPEND[man/man7/EVP_KEYEXCH-ECDH.7]=man7/EVP_KEYEXCH-ECDH.pod +GENERATE[man/man7/EVP_KEYEXCH-ECDH.7]=man7/EVP_KEYEXCH-ECDH.pod +DEPEND[html/man7/EVP_KEYEXCH-X25519.html]=man7/EVP_KEYEXCH-X25519.pod +GENERATE[html/man7/EVP_KEYEXCH-X25519.html]=man7/EVP_KEYEXCH-X25519.pod +DEPEND[man/man7/EVP_KEYEXCH-X25519.7]=man7/EVP_KEYEXCH-X25519.pod +GENERATE[man/man7/EVP_KEYEXCH-X25519.7]=man7/EVP_KEYEXCH-X25519.pod +DEPEND[html/man7/EVP_MAC-BLAKE2.html]=man7/EVP_MAC-BLAKE2.pod +GENERATE[html/man7/EVP_MAC-BLAKE2.html]=man7/EVP_MAC-BLAKE2.pod +DEPEND[man/man7/EVP_MAC-BLAKE2.7]=man7/EVP_MAC-BLAKE2.pod +GENERATE[man/man7/EVP_MAC-BLAKE2.7]=man7/EVP_MAC-BLAKE2.pod +DEPEND[html/man7/EVP_MAC-CMAC.html]=man7/EVP_MAC-CMAC.pod +GENERATE[html/man7/EVP_MAC-CMAC.html]=man7/EVP_MAC-CMAC.pod +DEPEND[man/man7/EVP_MAC-CMAC.7]=man7/EVP_MAC-CMAC.pod +GENERATE[man/man7/EVP_MAC-CMAC.7]=man7/EVP_MAC-CMAC.pod +DEPEND[html/man7/EVP_MAC-GMAC.html]=man7/EVP_MAC-GMAC.pod +GENERATE[html/man7/EVP_MAC-GMAC.html]=man7/EVP_MAC-GMAC.pod +DEPEND[man/man7/EVP_MAC-GMAC.7]=man7/EVP_MAC-GMAC.pod +GENERATE[man/man7/EVP_MAC-GMAC.7]=man7/EVP_MAC-GMAC.pod +DEPEND[html/man7/EVP_MAC-HMAC.html]=man7/EVP_MAC-HMAC.pod +GENERATE[html/man7/EVP_MAC-HMAC.html]=man7/EVP_MAC-HMAC.pod +DEPEND[man/man7/EVP_MAC-HMAC.7]=man7/EVP_MAC-HMAC.pod +GENERATE[man/man7/EVP_MAC-HMAC.7]=man7/EVP_MAC-HMAC.pod +DEPEND[html/man7/EVP_MAC-KMAC.html]=man7/EVP_MAC-KMAC.pod +GENERATE[html/man7/EVP_MAC-KMAC.html]=man7/EVP_MAC-KMAC.pod +DEPEND[man/man7/EVP_MAC-KMAC.7]=man7/EVP_MAC-KMAC.pod +GENERATE[man/man7/EVP_MAC-KMAC.7]=man7/EVP_MAC-KMAC.pod +DEPEND[html/man7/EVP_MAC-Poly1305.html]=man7/EVP_MAC-Poly1305.pod +GENERATE[html/man7/EVP_MAC-Poly1305.html]=man7/EVP_MAC-Poly1305.pod +DEPEND[man/man7/EVP_MAC-Poly1305.7]=man7/EVP_MAC-Poly1305.pod +GENERATE[man/man7/EVP_MAC-Poly1305.7]=man7/EVP_MAC-Poly1305.pod +DEPEND[html/man7/EVP_MAC-Siphash.html]=man7/EVP_MAC-Siphash.pod +GENERATE[html/man7/EVP_MAC-Siphash.html]=man7/EVP_MAC-Siphash.pod +DEPEND[man/man7/EVP_MAC-Siphash.7]=man7/EVP_MAC-Siphash.pod +GENERATE[man/man7/EVP_MAC-Siphash.7]=man7/EVP_MAC-Siphash.pod +DEPEND[html/man7/EVP_MD-BLAKE2.html]=man7/EVP_MD-BLAKE2.pod +GENERATE[html/man7/EVP_MD-BLAKE2.html]=man7/EVP_MD-BLAKE2.pod +DEPEND[man/man7/EVP_MD-BLAKE2.7]=man7/EVP_MD-BLAKE2.pod +GENERATE[man/man7/EVP_MD-BLAKE2.7]=man7/EVP_MD-BLAKE2.pod +DEPEND[html/man7/EVP_MD-MD2.html]=man7/EVP_MD-MD2.pod +GENERATE[html/man7/EVP_MD-MD2.html]=man7/EVP_MD-MD2.pod +DEPEND[man/man7/EVP_MD-MD2.7]=man7/EVP_MD-MD2.pod +GENERATE[man/man7/EVP_MD-MD2.7]=man7/EVP_MD-MD2.pod +DEPEND[html/man7/EVP_MD-MD4.html]=man7/EVP_MD-MD4.pod +GENERATE[html/man7/EVP_MD-MD4.html]=man7/EVP_MD-MD4.pod +DEPEND[man/man7/EVP_MD-MD4.7]=man7/EVP_MD-MD4.pod +GENERATE[man/man7/EVP_MD-MD4.7]=man7/EVP_MD-MD4.pod +DEPEND[html/man7/EVP_MD-MD5-SHA1.html]=man7/EVP_MD-MD5-SHA1.pod +GENERATE[html/man7/EVP_MD-MD5-SHA1.html]=man7/EVP_MD-MD5-SHA1.pod +DEPEND[man/man7/EVP_MD-MD5-SHA1.7]=man7/EVP_MD-MD5-SHA1.pod +GENERATE[man/man7/EVP_MD-MD5-SHA1.7]=man7/EVP_MD-MD5-SHA1.pod +DEPEND[html/man7/EVP_MD-MD5.html]=man7/EVP_MD-MD5.pod +GENERATE[html/man7/EVP_MD-MD5.html]=man7/EVP_MD-MD5.pod +DEPEND[man/man7/EVP_MD-MD5.7]=man7/EVP_MD-MD5.pod +GENERATE[man/man7/EVP_MD-MD5.7]=man7/EVP_MD-MD5.pod +DEPEND[html/man7/EVP_MD-MDC2.html]=man7/EVP_MD-MDC2.pod +GENERATE[html/man7/EVP_MD-MDC2.html]=man7/EVP_MD-MDC2.pod +DEPEND[man/man7/EVP_MD-MDC2.7]=man7/EVP_MD-MDC2.pod +GENERATE[man/man7/EVP_MD-MDC2.7]=man7/EVP_MD-MDC2.pod +DEPEND[html/man7/EVP_MD-NULL.html]=man7/EVP_MD-NULL.pod +GENERATE[html/man7/EVP_MD-NULL.html]=man7/EVP_MD-NULL.pod +DEPEND[man/man7/EVP_MD-NULL.7]=man7/EVP_MD-NULL.pod +GENERATE[man/man7/EVP_MD-NULL.7]=man7/EVP_MD-NULL.pod +DEPEND[html/man7/EVP_MD-RIPEMD160.html]=man7/EVP_MD-RIPEMD160.pod +GENERATE[html/man7/EVP_MD-RIPEMD160.html]=man7/EVP_MD-RIPEMD160.pod +DEPEND[man/man7/EVP_MD-RIPEMD160.7]=man7/EVP_MD-RIPEMD160.pod +GENERATE[man/man7/EVP_MD-RIPEMD160.7]=man7/EVP_MD-RIPEMD160.pod +DEPEND[html/man7/EVP_MD-SHA1.html]=man7/EVP_MD-SHA1.pod +GENERATE[html/man7/EVP_MD-SHA1.html]=man7/EVP_MD-SHA1.pod +DEPEND[man/man7/EVP_MD-SHA1.7]=man7/EVP_MD-SHA1.pod +GENERATE[man/man7/EVP_MD-SHA1.7]=man7/EVP_MD-SHA1.pod +DEPEND[html/man7/EVP_MD-SHA2.html]=man7/EVP_MD-SHA2.pod +GENERATE[html/man7/EVP_MD-SHA2.html]=man7/EVP_MD-SHA2.pod +DEPEND[man/man7/EVP_MD-SHA2.7]=man7/EVP_MD-SHA2.pod +GENERATE[man/man7/EVP_MD-SHA2.7]=man7/EVP_MD-SHA2.pod +DEPEND[html/man7/EVP_MD-SHA3.html]=man7/EVP_MD-SHA3.pod +GENERATE[html/man7/EVP_MD-SHA3.html]=man7/EVP_MD-SHA3.pod +DEPEND[man/man7/EVP_MD-SHA3.7]=man7/EVP_MD-SHA3.pod +GENERATE[man/man7/EVP_MD-SHA3.7]=man7/EVP_MD-SHA3.pod +DEPEND[html/man7/EVP_MD-SHAKE.html]=man7/EVP_MD-SHAKE.pod +GENERATE[html/man7/EVP_MD-SHAKE.html]=man7/EVP_MD-SHAKE.pod +DEPEND[man/man7/EVP_MD-SHAKE.7]=man7/EVP_MD-SHAKE.pod +GENERATE[man/man7/EVP_MD-SHAKE.7]=man7/EVP_MD-SHAKE.pod +DEPEND[html/man7/EVP_MD-SM3.html]=man7/EVP_MD-SM3.pod +GENERATE[html/man7/EVP_MD-SM3.html]=man7/EVP_MD-SM3.pod +DEPEND[man/man7/EVP_MD-SM3.7]=man7/EVP_MD-SM3.pod +GENERATE[man/man7/EVP_MD-SM3.7]=man7/EVP_MD-SM3.pod +DEPEND[html/man7/EVP_MD-WHIRLPOOL.html]=man7/EVP_MD-WHIRLPOOL.pod +GENERATE[html/man7/EVP_MD-WHIRLPOOL.html]=man7/EVP_MD-WHIRLPOOL.pod +DEPEND[man/man7/EVP_MD-WHIRLPOOL.7]=man7/EVP_MD-WHIRLPOOL.pod +GENERATE[man/man7/EVP_MD-WHIRLPOOL.7]=man7/EVP_MD-WHIRLPOOL.pod +DEPEND[html/man7/EVP_MD-common.html]=man7/EVP_MD-common.pod +GENERATE[html/man7/EVP_MD-common.html]=man7/EVP_MD-common.pod +DEPEND[man/man7/EVP_MD-common.7]=man7/EVP_MD-common.pod +GENERATE[man/man7/EVP_MD-common.7]=man7/EVP_MD-common.pod +DEPEND[html/man7/EVP_PKEY-DH.html]=man7/EVP_PKEY-DH.pod +GENERATE[html/man7/EVP_PKEY-DH.html]=man7/EVP_PKEY-DH.pod +DEPEND[man/man7/EVP_PKEY-DH.7]=man7/EVP_PKEY-DH.pod +GENERATE[man/man7/EVP_PKEY-DH.7]=man7/EVP_PKEY-DH.pod +DEPEND[html/man7/EVP_PKEY-DSA.html]=man7/EVP_PKEY-DSA.pod +GENERATE[html/man7/EVP_PKEY-DSA.html]=man7/EVP_PKEY-DSA.pod +DEPEND[man/man7/EVP_PKEY-DSA.7]=man7/EVP_PKEY-DSA.pod +GENERATE[man/man7/EVP_PKEY-DSA.7]=man7/EVP_PKEY-DSA.pod +DEPEND[html/man7/EVP_PKEY-EC.html]=man7/EVP_PKEY-EC.pod +GENERATE[html/man7/EVP_PKEY-EC.html]=man7/EVP_PKEY-EC.pod +DEPEND[man/man7/EVP_PKEY-EC.7]=man7/EVP_PKEY-EC.pod +GENERATE[man/man7/EVP_PKEY-EC.7]=man7/EVP_PKEY-EC.pod +DEPEND[html/man7/EVP_PKEY-FFC.html]=man7/EVP_PKEY-FFC.pod +GENERATE[html/man7/EVP_PKEY-FFC.html]=man7/EVP_PKEY-FFC.pod +DEPEND[man/man7/EVP_PKEY-FFC.7]=man7/EVP_PKEY-FFC.pod +GENERATE[man/man7/EVP_PKEY-FFC.7]=man7/EVP_PKEY-FFC.pod +DEPEND[html/man7/EVP_PKEY-HMAC.html]=man7/EVP_PKEY-HMAC.pod +GENERATE[html/man7/EVP_PKEY-HMAC.html]=man7/EVP_PKEY-HMAC.pod +DEPEND[man/man7/EVP_PKEY-HMAC.7]=man7/EVP_PKEY-HMAC.pod +GENERATE[man/man7/EVP_PKEY-HMAC.7]=man7/EVP_PKEY-HMAC.pod +DEPEND[html/man7/EVP_PKEY-RSA.html]=man7/EVP_PKEY-RSA.pod +GENERATE[html/man7/EVP_PKEY-RSA.html]=man7/EVP_PKEY-RSA.pod +DEPEND[man/man7/EVP_PKEY-RSA.7]=man7/EVP_PKEY-RSA.pod +GENERATE[man/man7/EVP_PKEY-RSA.7]=man7/EVP_PKEY-RSA.pod +DEPEND[html/man7/EVP_PKEY-SM2.html]=man7/EVP_PKEY-SM2.pod +GENERATE[html/man7/EVP_PKEY-SM2.html]=man7/EVP_PKEY-SM2.pod +DEPEND[man/man7/EVP_PKEY-SM2.7]=man7/EVP_PKEY-SM2.pod +GENERATE[man/man7/EVP_PKEY-SM2.7]=man7/EVP_PKEY-SM2.pod +DEPEND[html/man7/EVP_PKEY-X25519.html]=man7/EVP_PKEY-X25519.pod +GENERATE[html/man7/EVP_PKEY-X25519.html]=man7/EVP_PKEY-X25519.pod +DEPEND[man/man7/EVP_PKEY-X25519.7]=man7/EVP_PKEY-X25519.pod +GENERATE[man/man7/EVP_PKEY-X25519.7]=man7/EVP_PKEY-X25519.pod +DEPEND[html/man7/EVP_RAND-CTR-DRBG.html]=man7/EVP_RAND-CTR-DRBG.pod +GENERATE[html/man7/EVP_RAND-CTR-DRBG.html]=man7/EVP_RAND-CTR-DRBG.pod +DEPEND[man/man7/EVP_RAND-CTR-DRBG.7]=man7/EVP_RAND-CTR-DRBG.pod +GENERATE[man/man7/EVP_RAND-CTR-DRBG.7]=man7/EVP_RAND-CTR-DRBG.pod +DEPEND[html/man7/EVP_RAND-HASH-DRBG.html]=man7/EVP_RAND-HASH-DRBG.pod +GENERATE[html/man7/EVP_RAND-HASH-DRBG.html]=man7/EVP_RAND-HASH-DRBG.pod +DEPEND[man/man7/EVP_RAND-HASH-DRBG.7]=man7/EVP_RAND-HASH-DRBG.pod +GENERATE[man/man7/EVP_RAND-HASH-DRBG.7]=man7/EVP_RAND-HASH-DRBG.pod +DEPEND[html/man7/EVP_RAND-HMAC-DRBG.html]=man7/EVP_RAND-HMAC-DRBG.pod +GENERATE[html/man7/EVP_RAND-HMAC-DRBG.html]=man7/EVP_RAND-HMAC-DRBG.pod +DEPEND[man/man7/EVP_RAND-HMAC-DRBG.7]=man7/EVP_RAND-HMAC-DRBG.pod +GENERATE[man/man7/EVP_RAND-HMAC-DRBG.7]=man7/EVP_RAND-HMAC-DRBG.pod +DEPEND[html/man7/EVP_RAND-SEED-SRC.html]=man7/EVP_RAND-SEED-SRC.pod +GENERATE[html/man7/EVP_RAND-SEED-SRC.html]=man7/EVP_RAND-SEED-SRC.pod +DEPEND[man/man7/EVP_RAND-SEED-SRC.7]=man7/EVP_RAND-SEED-SRC.pod +GENERATE[man/man7/EVP_RAND-SEED-SRC.7]=man7/EVP_RAND-SEED-SRC.pod +DEPEND[html/man7/EVP_RAND-TEST-RAND.html]=man7/EVP_RAND-TEST-RAND.pod +GENERATE[html/man7/EVP_RAND-TEST-RAND.html]=man7/EVP_RAND-TEST-RAND.pod +DEPEND[man/man7/EVP_RAND-TEST-RAND.7]=man7/EVP_RAND-TEST-RAND.pod +GENERATE[man/man7/EVP_RAND-TEST-RAND.7]=man7/EVP_RAND-TEST-RAND.pod +DEPEND[html/man7/EVP_RAND.html]=man7/EVP_RAND.pod +GENERATE[html/man7/EVP_RAND.html]=man7/EVP_RAND.pod +DEPEND[man/man7/EVP_RAND.7]=man7/EVP_RAND.pod +GENERATE[man/man7/EVP_RAND.7]=man7/EVP_RAND.pod +DEPEND[html/man7/EVP_SIGNATURE-DSA.html]=man7/EVP_SIGNATURE-DSA.pod +GENERATE[html/man7/EVP_SIGNATURE-DSA.html]=man7/EVP_SIGNATURE-DSA.pod +DEPEND[man/man7/EVP_SIGNATURE-DSA.7]=man7/EVP_SIGNATURE-DSA.pod +GENERATE[man/man7/EVP_SIGNATURE-DSA.7]=man7/EVP_SIGNATURE-DSA.pod +DEPEND[html/man7/EVP_SIGNATURE-ECDSA.html]=man7/EVP_SIGNATURE-ECDSA.pod +GENERATE[html/man7/EVP_SIGNATURE-ECDSA.html]=man7/EVP_SIGNATURE-ECDSA.pod +DEPEND[man/man7/EVP_SIGNATURE-ECDSA.7]=man7/EVP_SIGNATURE-ECDSA.pod +GENERATE[man/man7/EVP_SIGNATURE-ECDSA.7]=man7/EVP_SIGNATURE-ECDSA.pod +DEPEND[html/man7/EVP_SIGNATURE-ED25519.html]=man7/EVP_SIGNATURE-ED25519.pod +GENERATE[html/man7/EVP_SIGNATURE-ED25519.html]=man7/EVP_SIGNATURE-ED25519.pod +DEPEND[man/man7/EVP_SIGNATURE-ED25519.7]=man7/EVP_SIGNATURE-ED25519.pod +GENERATE[man/man7/EVP_SIGNATURE-ED25519.7]=man7/EVP_SIGNATURE-ED25519.pod +DEPEND[html/man7/EVP_SIGNATURE-HMAC.html]=man7/EVP_SIGNATURE-HMAC.pod +GENERATE[html/man7/EVP_SIGNATURE-HMAC.html]=man7/EVP_SIGNATURE-HMAC.pod +DEPEND[man/man7/EVP_SIGNATURE-HMAC.7]=man7/EVP_SIGNATURE-HMAC.pod +GENERATE[man/man7/EVP_SIGNATURE-HMAC.7]=man7/EVP_SIGNATURE-HMAC.pod +DEPEND[html/man7/EVP_SIGNATURE-RSA.html]=man7/EVP_SIGNATURE-RSA.pod +GENERATE[html/man7/EVP_SIGNATURE-RSA.html]=man7/EVP_SIGNATURE-RSA.pod +DEPEND[man/man7/EVP_SIGNATURE-RSA.7]=man7/EVP_SIGNATURE-RSA.pod +GENERATE[man/man7/EVP_SIGNATURE-RSA.7]=man7/EVP_SIGNATURE-RSA.pod +DEPEND[html/man7/OSSL_PROVIDER-FIPS.html]=man7/OSSL_PROVIDER-FIPS.pod +GENERATE[html/man7/OSSL_PROVIDER-FIPS.html]=man7/OSSL_PROVIDER-FIPS.pod +DEPEND[man/man7/OSSL_PROVIDER-FIPS.7]=man7/OSSL_PROVIDER-FIPS.pod +GENERATE[man/man7/OSSL_PROVIDER-FIPS.7]=man7/OSSL_PROVIDER-FIPS.pod +DEPEND[html/man7/OSSL_PROVIDER-base.html]=man7/OSSL_PROVIDER-base.pod +GENERATE[html/man7/OSSL_PROVIDER-base.html]=man7/OSSL_PROVIDER-base.pod +DEPEND[man/man7/OSSL_PROVIDER-base.7]=man7/OSSL_PROVIDER-base.pod +GENERATE[man/man7/OSSL_PROVIDER-base.7]=man7/OSSL_PROVIDER-base.pod +DEPEND[html/man7/OSSL_PROVIDER-default.html]=man7/OSSL_PROVIDER-default.pod +GENERATE[html/man7/OSSL_PROVIDER-default.html]=man7/OSSL_PROVIDER-default.pod +DEPEND[man/man7/OSSL_PROVIDER-default.7]=man7/OSSL_PROVIDER-default.pod +GENERATE[man/man7/OSSL_PROVIDER-default.7]=man7/OSSL_PROVIDER-default.pod +DEPEND[html/man7/OSSL_PROVIDER-legacy.html]=man7/OSSL_PROVIDER-legacy.pod +GENERATE[html/man7/OSSL_PROVIDER-legacy.html]=man7/OSSL_PROVIDER-legacy.pod +DEPEND[man/man7/OSSL_PROVIDER-legacy.7]=man7/OSSL_PROVIDER-legacy.pod +GENERATE[man/man7/OSSL_PROVIDER-legacy.7]=man7/OSSL_PROVIDER-legacy.pod +DEPEND[html/man7/OSSL_PROVIDER-null.html]=man7/OSSL_PROVIDER-null.pod +GENERATE[html/man7/OSSL_PROVIDER-null.html]=man7/OSSL_PROVIDER-null.pod +DEPEND[man/man7/OSSL_PROVIDER-null.7]=man7/OSSL_PROVIDER-null.pod +GENERATE[man/man7/OSSL_PROVIDER-null.7]=man7/OSSL_PROVIDER-null.pod +DEPEND[html/man7/RAND.html]=man7/RAND.pod +GENERATE[html/man7/RAND.html]=man7/RAND.pod +DEPEND[man/man7/RAND.7]=man7/RAND.pod +GENERATE[man/man7/RAND.7]=man7/RAND.pod +DEPEND[html/man7/RSA-PSS.html]=man7/RSA-PSS.pod +GENERATE[html/man7/RSA-PSS.html]=man7/RSA-PSS.pod +DEPEND[man/man7/RSA-PSS.7]=man7/RSA-PSS.pod +GENERATE[man/man7/RSA-PSS.7]=man7/RSA-PSS.pod +DEPEND[html/man7/X25519.html]=man7/X25519.pod +GENERATE[html/man7/X25519.html]=man7/X25519.pod +DEPEND[man/man7/X25519.7]=man7/X25519.pod +GENERATE[man/man7/X25519.7]=man7/X25519.pod +DEPEND[html/man7/bio.html]=man7/bio.pod +GENERATE[html/man7/bio.html]=man7/bio.pod +DEPEND[man/man7/bio.7]=man7/bio.pod +GENERATE[man/man7/bio.7]=man7/bio.pod +DEPEND[html/man7/crypto.html]=man7/crypto.pod +GENERATE[html/man7/crypto.html]=man7/crypto.pod +DEPEND[man/man7/crypto.7]=man7/crypto.pod +GENERATE[man/man7/crypto.7]=man7/crypto.pod +DEPEND[html/man7/ct.html]=man7/ct.pod +GENERATE[html/man7/ct.html]=man7/ct.pod +DEPEND[man/man7/ct.7]=man7/ct.pod +GENERATE[man/man7/ct.7]=man7/ct.pod +DEPEND[html/man7/des_modes.html]=man7/des_modes.pod +GENERATE[html/man7/des_modes.html]=man7/des_modes.pod +DEPEND[man/man7/des_modes.7]=man7/des_modes.pod +GENERATE[man/man7/des_modes.7]=man7/des_modes.pod +DEPEND[html/man7/evp.html]=man7/evp.pod +GENERATE[html/man7/evp.html]=man7/evp.pod +DEPEND[man/man7/evp.7]=man7/evp.pod +GENERATE[man/man7/evp.7]=man7/evp.pod +DEPEND[html/man7/fips_module.html]=man7/fips_module.pod +GENERATE[html/man7/fips_module.html]=man7/fips_module.pod +DEPEND[man/man7/fips_module.7]=man7/fips_module.pod +GENERATE[man/man7/fips_module.7]=man7/fips_module.pod +DEPEND[html/man7/life_cycle-cipher.html]=man7/life_cycle-cipher.pod +GENERATE[html/man7/life_cycle-cipher.html]=man7/life_cycle-cipher.pod +DEPEND[man/man7/life_cycle-cipher.7]=man7/life_cycle-cipher.pod +GENERATE[man/man7/life_cycle-cipher.7]=man7/life_cycle-cipher.pod +DEPEND[html/man7/life_cycle-digest.html]=man7/life_cycle-digest.pod +GENERATE[html/man7/life_cycle-digest.html]=man7/life_cycle-digest.pod +DEPEND[man/man7/life_cycle-digest.7]=man7/life_cycle-digest.pod +GENERATE[man/man7/life_cycle-digest.7]=man7/life_cycle-digest.pod +DEPEND[html/man7/life_cycle-kdf.html]=man7/life_cycle-kdf.pod +GENERATE[html/man7/life_cycle-kdf.html]=man7/life_cycle-kdf.pod +DEPEND[man/man7/life_cycle-kdf.7]=man7/life_cycle-kdf.pod +GENERATE[man/man7/life_cycle-kdf.7]=man7/life_cycle-kdf.pod +DEPEND[html/man7/life_cycle-mac.html]=man7/life_cycle-mac.pod +GENERATE[html/man7/life_cycle-mac.html]=man7/life_cycle-mac.pod +DEPEND[man/man7/life_cycle-mac.7]=man7/life_cycle-mac.pod +GENERATE[man/man7/life_cycle-mac.7]=man7/life_cycle-mac.pod +DEPEND[html/man7/life_cycle-pkey.html]=man7/life_cycle-pkey.pod +GENERATE[html/man7/life_cycle-pkey.html]=man7/life_cycle-pkey.pod +DEPEND[man/man7/life_cycle-pkey.7]=man7/life_cycle-pkey.pod +GENERATE[man/man7/life_cycle-pkey.7]=man7/life_cycle-pkey.pod +DEPEND[html/man7/life_cycle-rand.html]=man7/life_cycle-rand.pod +GENERATE[html/man7/life_cycle-rand.html]=man7/life_cycle-rand.pod +DEPEND[man/man7/life_cycle-rand.7]=man7/life_cycle-rand.pod +GENERATE[man/man7/life_cycle-rand.7]=man7/life_cycle-rand.pod +DEPEND[html/man7/migration_guide.html]=man7/migration_guide.pod +GENERATE[html/man7/migration_guide.html]=man7/migration_guide.pod +DEPEND[man/man7/migration_guide.7]=man7/migration_guide.pod +GENERATE[man/man7/migration_guide.7]=man7/migration_guide.pod +DEPEND[html/man7/openssl-core.h.html]=man7/openssl-core.h.pod +GENERATE[html/man7/openssl-core.h.html]=man7/openssl-core.h.pod +DEPEND[man/man7/openssl-core.h.7]=man7/openssl-core.h.pod +GENERATE[man/man7/openssl-core.h.7]=man7/openssl-core.h.pod +DEPEND[html/man7/openssl-core_dispatch.h.html]=man7/openssl-core_dispatch.h.pod +GENERATE[html/man7/openssl-core_dispatch.h.html]=man7/openssl-core_dispatch.h.pod +DEPEND[man/man7/openssl-core_dispatch.h.7]=man7/openssl-core_dispatch.h.pod +GENERATE[man/man7/openssl-core_dispatch.h.7]=man7/openssl-core_dispatch.h.pod +DEPEND[html/man7/openssl-core_names.h.html]=man7/openssl-core_names.h.pod +GENERATE[html/man7/openssl-core_names.h.html]=man7/openssl-core_names.h.pod +DEPEND[man/man7/openssl-core_names.h.7]=man7/openssl-core_names.h.pod +GENERATE[man/man7/openssl-core_names.h.7]=man7/openssl-core_names.h.pod +DEPEND[html/man7/openssl-env.html]=man7/openssl-env.pod +GENERATE[html/man7/openssl-env.html]=man7/openssl-env.pod +DEPEND[man/man7/openssl-env.7]=man7/openssl-env.pod +GENERATE[man/man7/openssl-env.7]=man7/openssl-env.pod +DEPEND[html/man7/openssl-glossary.html]=man7/openssl-glossary.pod +GENERATE[html/man7/openssl-glossary.html]=man7/openssl-glossary.pod +DEPEND[man/man7/openssl-glossary.7]=man7/openssl-glossary.pod +GENERATE[man/man7/openssl-glossary.7]=man7/openssl-glossary.pod +DEPEND[html/man7/openssl-threads.html]=man7/openssl-threads.pod +GENERATE[html/man7/openssl-threads.html]=man7/openssl-threads.pod +DEPEND[man/man7/openssl-threads.7]=man7/openssl-threads.pod +GENERATE[man/man7/openssl-threads.7]=man7/openssl-threads.pod +DEPEND[html/man7/openssl_user_macros.html]=man7/openssl_user_macros.pod +GENERATE[html/man7/openssl_user_macros.html]=man7/openssl_user_macros.pod +DEPEND[man/man7/openssl_user_macros.7]=man7/openssl_user_macros.pod +GENERATE[man/man7/openssl_user_macros.7]=man7/openssl_user_macros.pod +DEPEND[man7/openssl_user_macros.pod]{pod}=man7/openssl_user_macros.pod.in +GENERATE[man7/openssl_user_macros.pod]=man7/openssl_user_macros.pod.in +DEPEND[html/man7/ossl_store-file.html]=man7/ossl_store-file.pod +GENERATE[html/man7/ossl_store-file.html]=man7/ossl_store-file.pod +DEPEND[man/man7/ossl_store-file.7]=man7/ossl_store-file.pod +GENERATE[man/man7/ossl_store-file.7]=man7/ossl_store-file.pod +DEPEND[html/man7/ossl_store.html]=man7/ossl_store.pod +GENERATE[html/man7/ossl_store.html]=man7/ossl_store.pod +DEPEND[man/man7/ossl_store.7]=man7/ossl_store.pod +GENERATE[man/man7/ossl_store.7]=man7/ossl_store.pod +DEPEND[html/man7/passphrase-encoding.html]=man7/passphrase-encoding.pod +GENERATE[html/man7/passphrase-encoding.html]=man7/passphrase-encoding.pod +DEPEND[man/man7/passphrase-encoding.7]=man7/passphrase-encoding.pod +GENERATE[man/man7/passphrase-encoding.7]=man7/passphrase-encoding.pod +DEPEND[html/man7/property.html]=man7/property.pod +GENERATE[html/man7/property.html]=man7/property.pod +DEPEND[man/man7/property.7]=man7/property.pod +GENERATE[man/man7/property.7]=man7/property.pod +DEPEND[html/man7/provider-asym_cipher.html]=man7/provider-asym_cipher.pod +GENERATE[html/man7/provider-asym_cipher.html]=man7/provider-asym_cipher.pod +DEPEND[man/man7/provider-asym_cipher.7]=man7/provider-asym_cipher.pod +GENERATE[man/man7/provider-asym_cipher.7]=man7/provider-asym_cipher.pod +DEPEND[html/man7/provider-base.html]=man7/provider-base.pod +GENERATE[html/man7/provider-base.html]=man7/provider-base.pod +DEPEND[man/man7/provider-base.7]=man7/provider-base.pod +GENERATE[man/man7/provider-base.7]=man7/provider-base.pod +DEPEND[html/man7/provider-cipher.html]=man7/provider-cipher.pod +GENERATE[html/man7/provider-cipher.html]=man7/provider-cipher.pod +DEPEND[man/man7/provider-cipher.7]=man7/provider-cipher.pod +GENERATE[man/man7/provider-cipher.7]=man7/provider-cipher.pod +DEPEND[html/man7/provider-decoder.html]=man7/provider-decoder.pod +GENERATE[html/man7/provider-decoder.html]=man7/provider-decoder.pod +DEPEND[man/man7/provider-decoder.7]=man7/provider-decoder.pod +GENERATE[man/man7/provider-decoder.7]=man7/provider-decoder.pod +DEPEND[html/man7/provider-digest.html]=man7/provider-digest.pod +GENERATE[html/man7/provider-digest.html]=man7/provider-digest.pod +DEPEND[man/man7/provider-digest.7]=man7/provider-digest.pod +GENERATE[man/man7/provider-digest.7]=man7/provider-digest.pod +DEPEND[html/man7/provider-encoder.html]=man7/provider-encoder.pod +GENERATE[html/man7/provider-encoder.html]=man7/provider-encoder.pod +DEPEND[man/man7/provider-encoder.7]=man7/provider-encoder.pod +GENERATE[man/man7/provider-encoder.7]=man7/provider-encoder.pod +DEPEND[html/man7/provider-kdf.html]=man7/provider-kdf.pod +GENERATE[html/man7/provider-kdf.html]=man7/provider-kdf.pod +DEPEND[man/man7/provider-kdf.7]=man7/provider-kdf.pod +GENERATE[man/man7/provider-kdf.7]=man7/provider-kdf.pod +DEPEND[html/man7/provider-kem.html]=man7/provider-kem.pod +GENERATE[html/man7/provider-kem.html]=man7/provider-kem.pod +DEPEND[man/man7/provider-kem.7]=man7/provider-kem.pod +GENERATE[man/man7/provider-kem.7]=man7/provider-kem.pod +DEPEND[html/man7/provider-keyexch.html]=man7/provider-keyexch.pod +GENERATE[html/man7/provider-keyexch.html]=man7/provider-keyexch.pod +DEPEND[man/man7/provider-keyexch.7]=man7/provider-keyexch.pod +GENERATE[man/man7/provider-keyexch.7]=man7/provider-keyexch.pod +DEPEND[html/man7/provider-keymgmt.html]=man7/provider-keymgmt.pod +GENERATE[html/man7/provider-keymgmt.html]=man7/provider-keymgmt.pod +DEPEND[man/man7/provider-keymgmt.7]=man7/provider-keymgmt.pod +GENERATE[man/man7/provider-keymgmt.7]=man7/provider-keymgmt.pod +DEPEND[html/man7/provider-mac.html]=man7/provider-mac.pod +GENERATE[html/man7/provider-mac.html]=man7/provider-mac.pod +DEPEND[man/man7/provider-mac.7]=man7/provider-mac.pod +GENERATE[man/man7/provider-mac.7]=man7/provider-mac.pod +DEPEND[html/man7/provider-object.html]=man7/provider-object.pod +GENERATE[html/man7/provider-object.html]=man7/provider-object.pod +DEPEND[man/man7/provider-object.7]=man7/provider-object.pod +GENERATE[man/man7/provider-object.7]=man7/provider-object.pod +DEPEND[html/man7/provider-rand.html]=man7/provider-rand.pod +GENERATE[html/man7/provider-rand.html]=man7/provider-rand.pod +DEPEND[man/man7/provider-rand.7]=man7/provider-rand.pod +GENERATE[man/man7/provider-rand.7]=man7/provider-rand.pod +DEPEND[html/man7/provider-signature.html]=man7/provider-signature.pod +GENERATE[html/man7/provider-signature.html]=man7/provider-signature.pod +DEPEND[man/man7/provider-signature.7]=man7/provider-signature.pod +GENERATE[man/man7/provider-signature.7]=man7/provider-signature.pod +DEPEND[html/man7/provider-storemgmt.html]=man7/provider-storemgmt.pod +GENERATE[html/man7/provider-storemgmt.html]=man7/provider-storemgmt.pod +DEPEND[man/man7/provider-storemgmt.7]=man7/provider-storemgmt.pod +GENERATE[man/man7/provider-storemgmt.7]=man7/provider-storemgmt.pod +DEPEND[html/man7/provider.html]=man7/provider.pod +GENERATE[html/man7/provider.html]=man7/provider.pod +DEPEND[man/man7/provider.7]=man7/provider.pod +GENERATE[man/man7/provider.7]=man7/provider.pod +DEPEND[html/man7/proxy-certificates.html]=man7/proxy-certificates.pod +GENERATE[html/man7/proxy-certificates.html]=man7/proxy-certificates.pod +DEPEND[man/man7/proxy-certificates.7]=man7/proxy-certificates.pod +GENERATE[man/man7/proxy-certificates.7]=man7/proxy-certificates.pod +DEPEND[html/man7/ssl.html]=man7/ssl.pod +GENERATE[html/man7/ssl.html]=man7/ssl.pod +DEPEND[man/man7/ssl.7]=man7/ssl.pod +GENERATE[man/man7/ssl.7]=man7/ssl.pod +DEPEND[html/man7/x509.html]=man7/x509.pod +GENERATE[html/man7/x509.html]=man7/x509.pod +DEPEND[man/man7/x509.7]=man7/x509.pod +GENERATE[man/man7/x509.7]=man7/x509.pod +IMAGEDOCS[man7]=man7/img/cipher.png \ +man7/img/digest.png \ +man7/img/kdf.png \ +man7/img/mac.png \ +man7/img/pkey.png \ +man7/img/rand.png +HTMLDOCS[man7]=html/man7/EVP_ASYM_CIPHER-RSA.html \ +html/man7/EVP_ASYM_CIPHER-SM2.html \ +html/man7/EVP_CIPHER-AES.html \ +html/man7/EVP_CIPHER-ARIA.html \ +html/man7/EVP_CIPHER-BLOWFISH.html \ +html/man7/EVP_CIPHER-CAMELLIA.html \ +html/man7/EVP_CIPHER-CAST.html \ +html/man7/EVP_CIPHER-CHACHA.html \ +html/man7/EVP_CIPHER-DES.html \ +html/man7/EVP_CIPHER-IDEA.html \ +html/man7/EVP_CIPHER-NULL.html \ +html/man7/EVP_CIPHER-RC2.html \ +html/man7/EVP_CIPHER-RC4.html \ +html/man7/EVP_CIPHER-RC5.html \ +html/man7/EVP_CIPHER-SEED.html \ +html/man7/EVP_CIPHER-SM4.html \ +html/man7/EVP_KDF-HKDF.html \ +html/man7/EVP_KDF-KB.html \ +html/man7/EVP_KDF-KRB5KDF.html \ +html/man7/EVP_KDF-PBKDF1.html \ +html/man7/EVP_KDF-PBKDF2.html \ +html/man7/EVP_KDF-PKCS12KDF.html \ +html/man7/EVP_KDF-SCRYPT.html \ +html/man7/EVP_KDF-SS.html \ +html/man7/EVP_KDF-SSHKDF.html \ +html/man7/EVP_KDF-TLS13_KDF.html \ +html/man7/EVP_KDF-TLS1_PRF.html \ +html/man7/EVP_KDF-X942-ASN1.html \ +html/man7/EVP_KDF-X942-CONCAT.html \ +html/man7/EVP_KDF-X963.html \ +html/man7/EVP_KEM-RSA.html \ +html/man7/EVP_KEYEXCH-DH.html \ +html/man7/EVP_KEYEXCH-ECDH.html \ +html/man7/EVP_KEYEXCH-X25519.html \ +html/man7/EVP_MAC-BLAKE2.html \ +html/man7/EVP_MAC-CMAC.html \ +html/man7/EVP_MAC-GMAC.html \ +html/man7/EVP_MAC-HMAC.html \ +html/man7/EVP_MAC-KMAC.html \ +html/man7/EVP_MAC-Poly1305.html \ +html/man7/EVP_MAC-Siphash.html \ +html/man7/EVP_MD-BLAKE2.html \ +html/man7/EVP_MD-MD2.html \ +html/man7/EVP_MD-MD4.html \ +html/man7/EVP_MD-MD5-SHA1.html \ +html/man7/EVP_MD-MD5.html \ +html/man7/EVP_MD-MDC2.html \ +html/man7/EVP_MD-NULL.html \ +html/man7/EVP_MD-RIPEMD160.html \ +html/man7/EVP_MD-SHA1.html \ +html/man7/EVP_MD-SHA2.html \ +html/man7/EVP_MD-SHA3.html \ +html/man7/EVP_MD-SHAKE.html \ +html/man7/EVP_MD-SM3.html \ +html/man7/EVP_MD-WHIRLPOOL.html \ +html/man7/EVP_MD-common.html \ +html/man7/EVP_PKEY-DH.html \ +html/man7/EVP_PKEY-DSA.html \ +html/man7/EVP_PKEY-EC.html \ +html/man7/EVP_PKEY-FFC.html \ +html/man7/EVP_PKEY-HMAC.html \ +html/man7/EVP_PKEY-RSA.html \ +html/man7/EVP_PKEY-SM2.html \ +html/man7/EVP_PKEY-X25519.html \ +html/man7/EVP_RAND-CTR-DRBG.html \ +html/man7/EVP_RAND-HASH-DRBG.html \ +html/man7/EVP_RAND-HMAC-DRBG.html \ +html/man7/EVP_RAND-SEED-SRC.html \ +html/man7/EVP_RAND-TEST-RAND.html \ +html/man7/EVP_RAND.html \ +html/man7/EVP_SIGNATURE-DSA.html \ +html/man7/EVP_SIGNATURE-ECDSA.html \ +html/man7/EVP_SIGNATURE-ED25519.html \ +html/man7/EVP_SIGNATURE-HMAC.html \ +html/man7/EVP_SIGNATURE-RSA.html \ +html/man7/OSSL_PROVIDER-FIPS.html \ +html/man7/OSSL_PROVIDER-base.html \ +html/man7/OSSL_PROVIDER-default.html \ +html/man7/OSSL_PROVIDER-legacy.html \ +html/man7/OSSL_PROVIDER-null.html \ +html/man7/RAND.html \ +html/man7/RSA-PSS.html \ +html/man7/X25519.html \ +html/man7/bio.html \ +html/man7/crypto.html \ +html/man7/ct.html \ +html/man7/des_modes.html \ +html/man7/evp.html \ +html/man7/fips_module.html \ +html/man7/life_cycle-cipher.html \ +html/man7/life_cycle-digest.html \ +html/man7/life_cycle-kdf.html \ +html/man7/life_cycle-mac.html \ +html/man7/life_cycle-pkey.html \ +html/man7/life_cycle-rand.html \ +html/man7/migration_guide.html \ +html/man7/openssl-core.h.html \ +html/man7/openssl-core_dispatch.h.html \ +html/man7/openssl-core_names.h.html \ +html/man7/openssl-env.html \ +html/man7/openssl-glossary.html \ +html/man7/openssl-threads.html \ +html/man7/openssl_user_macros.html \ +html/man7/ossl_store-file.html \ +html/man7/ossl_store.html \ +html/man7/passphrase-encoding.html \ +html/man7/property.html \ +html/man7/provider-asym_cipher.html \ +html/man7/provider-base.html \ +html/man7/provider-cipher.html \ +html/man7/provider-decoder.html \ +html/man7/provider-digest.html \ +html/man7/provider-encoder.html \ +html/man7/provider-kdf.html \ +html/man7/provider-kem.html \ +html/man7/provider-keyexch.html \ +html/man7/provider-keymgmt.html \ +html/man7/provider-mac.html \ +html/man7/provider-object.html \ +html/man7/provider-rand.html \ +html/man7/provider-signature.html \ +html/man7/provider-storemgmt.html \ +html/man7/provider.html \ +html/man7/proxy-certificates.html \ +html/man7/ssl.html \ +html/man7/x509.html +MANDOCS[man7]=man/man7/EVP_ASYM_CIPHER-RSA.7 \ +man/man7/EVP_ASYM_CIPHER-SM2.7 \ +man/man7/EVP_CIPHER-AES.7 \ +man/man7/EVP_CIPHER-ARIA.7 \ +man/man7/EVP_CIPHER-BLOWFISH.7 \ +man/man7/EVP_CIPHER-CAMELLIA.7 \ +man/man7/EVP_CIPHER-CAST.7 \ +man/man7/EVP_CIPHER-CHACHA.7 \ +man/man7/EVP_CIPHER-DES.7 \ +man/man7/EVP_CIPHER-IDEA.7 \ +man/man7/EVP_CIPHER-NULL.7 \ +man/man7/EVP_CIPHER-RC2.7 \ +man/man7/EVP_CIPHER-RC4.7 \ +man/man7/EVP_CIPHER-RC5.7 \ +man/man7/EVP_CIPHER-SEED.7 \ +man/man7/EVP_CIPHER-SM4.7 \ +man/man7/EVP_KDF-HKDF.7 \ +man/man7/EVP_KDF-KB.7 \ +man/man7/EVP_KDF-KRB5KDF.7 \ +man/man7/EVP_KDF-PBKDF1.7 \ +man/man7/EVP_KDF-PBKDF2.7 \ +man/man7/EVP_KDF-PKCS12KDF.7 \ +man/man7/EVP_KDF-SCRYPT.7 \ +man/man7/EVP_KDF-SS.7 \ +man/man7/EVP_KDF-SSHKDF.7 \ +man/man7/EVP_KDF-TLS13_KDF.7 \ +man/man7/EVP_KDF-TLS1_PRF.7 \ +man/man7/EVP_KDF-X942-ASN1.7 \ +man/man7/EVP_KDF-X942-CONCAT.7 \ +man/man7/EVP_KDF-X963.7 \ +man/man7/EVP_KEM-RSA.7 \ +man/man7/EVP_KEYEXCH-DH.7 \ +man/man7/EVP_KEYEXCH-ECDH.7 \ +man/man7/EVP_KEYEXCH-X25519.7 \ +man/man7/EVP_MAC-BLAKE2.7 \ +man/man7/EVP_MAC-CMAC.7 \ +man/man7/EVP_MAC-GMAC.7 \ +man/man7/EVP_MAC-HMAC.7 \ +man/man7/EVP_MAC-KMAC.7 \ +man/man7/EVP_MAC-Poly1305.7 \ +man/man7/EVP_MAC-Siphash.7 \ +man/man7/EVP_MD-BLAKE2.7 \ +man/man7/EVP_MD-MD2.7 \ +man/man7/EVP_MD-MD4.7 \ +man/man7/EVP_MD-MD5-SHA1.7 \ +man/man7/EVP_MD-MD5.7 \ +man/man7/EVP_MD-MDC2.7 \ +man/man7/EVP_MD-NULL.7 \ +man/man7/EVP_MD-RIPEMD160.7 \ +man/man7/EVP_MD-SHA1.7 \ +man/man7/EVP_MD-SHA2.7 \ +man/man7/EVP_MD-SHA3.7 \ +man/man7/EVP_MD-SHAKE.7 \ +man/man7/EVP_MD-SM3.7 \ +man/man7/EVP_MD-WHIRLPOOL.7 \ +man/man7/EVP_MD-common.7 \ +man/man7/EVP_PKEY-DH.7 \ +man/man7/EVP_PKEY-DSA.7 \ +man/man7/EVP_PKEY-EC.7 \ +man/man7/EVP_PKEY-FFC.7 \ +man/man7/EVP_PKEY-HMAC.7 \ +man/man7/EVP_PKEY-RSA.7 \ +man/man7/EVP_PKEY-SM2.7 \ +man/man7/EVP_PKEY-X25519.7 \ +man/man7/EVP_RAND-CTR-DRBG.7 \ +man/man7/EVP_RAND-HASH-DRBG.7 \ +man/man7/EVP_RAND-HMAC-DRBG.7 \ +man/man7/EVP_RAND-SEED-SRC.7 \ +man/man7/EVP_RAND-TEST-RAND.7 \ +man/man7/EVP_RAND.7 \ +man/man7/EVP_SIGNATURE-DSA.7 \ +man/man7/EVP_SIGNATURE-ECDSA.7 \ +man/man7/EVP_SIGNATURE-ED25519.7 \ +man/man7/EVP_SIGNATURE-HMAC.7 \ +man/man7/EVP_SIGNATURE-RSA.7 \ +man/man7/OSSL_PROVIDER-FIPS.7 \ +man/man7/OSSL_PROVIDER-base.7 \ +man/man7/OSSL_PROVIDER-default.7 \ +man/man7/OSSL_PROVIDER-legacy.7 \ +man/man7/OSSL_PROVIDER-null.7 \ +man/man7/RAND.7 \ +man/man7/RSA-PSS.7 \ +man/man7/X25519.7 \ +man/man7/bio.7 \ +man/man7/crypto.7 \ +man/man7/ct.7 \ +man/man7/des_modes.7 \ +man/man7/evp.7 \ +man/man7/fips_module.7 \ +man/man7/life_cycle-cipher.7 \ +man/man7/life_cycle-digest.7 \ +man/man7/life_cycle-kdf.7 \ +man/man7/life_cycle-mac.7 \ +man/man7/life_cycle-pkey.7 \ +man/man7/life_cycle-rand.7 \ +man/man7/migration_guide.7 \ +man/man7/openssl-core.h.7 \ +man/man7/openssl-core_dispatch.h.7 \ +man/man7/openssl-core_names.h.7 \ +man/man7/openssl-env.7 \ +man/man7/openssl-glossary.7 \ +man/man7/openssl-threads.7 \ +man/man7/openssl_user_macros.7 \ +man/man7/ossl_store-file.7 \ +man/man7/ossl_store.7 \ +man/man7/passphrase-encoding.7 \ +man/man7/property.7 \ +man/man7/provider-asym_cipher.7 \ +man/man7/provider-base.7 \ +man/man7/provider-cipher.7 \ +man/man7/provider-decoder.7 \ +man/man7/provider-digest.7 \ +man/man7/provider-encoder.7 \ +man/man7/provider-kdf.7 \ +man/man7/provider-kem.7 \ +man/man7/provider-keyexch.7 \ +man/man7/provider-keymgmt.7 \ +man/man7/provider-mac.7 \ +man/man7/provider-object.7 \ +man/man7/provider-rand.7 \ +man/man7/provider-signature.7 \ +man/man7/provider-storemgmt.7 \ +man/man7/provider.7 \ +man/man7/proxy-certificates.7 \ +man/man7/ssl.7 \ +man/man7/x509.7 + diff --git a/deps/openssl/openssl/doc/build.info.in b/deps/openssl/openssl/doc/build.info.in new file mode 100644 index 000000000..e8dae7058 --- /dev/null +++ b/deps/openssl/openssl/doc/build.info.in @@ -0,0 +1,80 @@ +SUBDIRS = man1 + +{- + use File::Spec::Functions qw(:DEFAULT abs2rel rel2abs); + use File::Basename; + + my $sourcedir = catdir($config{sourcedir}, 'doc'); + + foreach my $section ((1, 3, 5, 7)) { + my @imagefiles = (); + my @htmlfiles = (); + my @manfiles = (); + my %pngfiles = + map { $_ => 1 } glob catfile($sourcedir, "man$section", "img", "*.png"); + my %podfiles = + map { $_ => 1 } glob catfile($sourcedir, "man$section", "*.pod"); + my %podinfiles = + map { $_ => 1 } glob catfile($sourcedir, "man$section", "*.pod.in"); + + foreach (keys %podinfiles) { + (my $p = $_) =~ s|\.in$||i; + $podfiles{$p} = 1; + } + + foreach my $p (sort keys %podfiles) { + my $podfile = abs2rel($p, $sourcedir); + my $podname = basename($podfile, '.pod'); + my $podinfile = $podinfiles{"$p.in"} ? "$podfile.in" : undef; + + my $podname = basename($podfile, ".pod"); + + my $htmlfile = abs2rel(catfile($buildtop, "doc", "html", "man$section", + "$podname.html"), + catdir($buildtop, "doc")); + my $manfile = abs2rel(catfile($buildtop, "doc", "man", "man$section", + "$podname.$section"), + catdir($buildtop, "doc")); + + # The build.info format requires file specs to be in Unix format. + # Especially, since VMS file specs use [ and ], the build.info parser + # will otherwise get terribly confused. + if ($^O eq 'VMS') { + $htmlfile = VMS::Filespec::unixify($htmlfile); + $manfile = VMS::Filespec::unixify($manfile); + $podfile = VMS::Filespec::unixify($podfile); + $podinfile = VMS::Filespec::unixify($podinfile) + if defined $podinfile; + } elsif ($^O eq 'MSWin32') { + $htmlfile =~ s|\\|/|g; + $manfile =~ s|\\|/|g; + $podfile =~ s|\\|/|g; + $podinfile =~ s|\\|/|g + if defined $podinfile; + } + push @htmlfiles, $htmlfile; + push @manfiles, $manfile; + $OUT .= << "_____"; +DEPEND[$htmlfile]=$podfile +GENERATE[$htmlfile]=$podfile +DEPEND[$manfile]=$podfile +GENERATE[$manfile]=$podfile +_____ + $OUT .= << "_____" if $podinfile; +DEPEND[$podfile]{pod}=$podinfile +GENERATE[$podfile]=$podinfile +_____ + } + + foreach my $p (sort keys %pngfiles) { + my $relpath = abs2rel($p, $sourcedir); + my $imagefile = abs2rel(catfile($buildtop, "doc", "$relpath"), + catdir($buildtop, "doc")); + push @imagefiles, $imagefile; + } + + $OUT .= "IMAGEDOCS[man$section]=" . join(" \\\n", @imagefiles) . "\n"; + $OUT .= "HTMLDOCS[man$section]=" . join(" \\\n", @htmlfiles) . "\n"; + $OUT .= "MANDOCS[man$section]=" . join(" \\\n", @manfiles) . "\n"; + } + -} diff --git a/deps/openssl/openssl/doc/dir-locals.example.el b/deps/openssl/openssl/doc/dir-locals.example.el new file mode 100644 index 000000000..dc0d5548a --- /dev/null +++ b/deps/openssl/openssl/doc/dir-locals.example.el @@ -0,0 +1,15 @@ +;;; This is an example of what a .dir-locals.el suitable for OpenSSL +;;; development could look like. +;;; +;;; Apart from setting the CC mode style to "OpenSSL-II", it also +;;; makes sure that tabs are never used for indentation in any file, +;;; and that the fill column is 78. +;;; +;;; For more information see (info "(emacs) Directory Variables") + +((nil + (indent-tabs-mode . nil) + (fill-column . 70) + ) + (c-mode + (c-file-style . "OpenSSL-II"))) diff --git a/deps/openssl/openssl/doc/fingerprints.txt b/deps/openssl/openssl/doc/fingerprints.txt new file mode 100644 index 000000000..9a26f7c66 --- /dev/null +++ b/deps/openssl/openssl/doc/fingerprints.txt @@ -0,0 +1,28 @@ +Fingerprints for Signing Releases + +OpenSSL releases are signed with PGP/GnuPG keys. This file contains +the fingerprints of team members who are "authorized" to sign the +next release. + +The signature is a detached cleartxt signature, with the same name +as the release but with ".asc" appended. For example, release +1.0.1h can be found in openssl-1.0.1h.tar.gz with the signature +in the file named openssl-1.0.1h.tar.gz.asc. + +The following is the list of fingerprints for the keys that are +currently in use to sign OpenSSL distributions: + +OpenSSL OMC: +EFC0 A467 D613 CB83 C7ED 6D30 D894 E2CE 8B3D 79F5 + +Richard Levitte: +7953 AC1F BC3D C8B3 B292 393E D5E9 E43F 7DF9 EE8C + +Matt Caswell: +8657 ABB2 60F0 56B1 E519 0839 D9C4 D26D 0E60 4491 + +Paul Dale: +B7C1 C143 60F3 53A3 6862 E4D5 231C 84CD DCC6 9C45 + +Tomáš Mráz: +A21F AB74 B008 8AA3 6115 2586 B8EF 1A6B A9DA 2D5C diff --git a/deps/openssl/openssl/doc/images/openssl.svg b/deps/openssl/openssl/doc/images/openssl.svg new file mode 100644 index 000000000..9cd6794fb --- /dev/null +++ b/deps/openssl/openssl/doc/images/openssl.svg @@ -0,0 +1,41 @@ + + + + + OpenSSL + Cryptography and SSL/TLS Toolkit + + diff --git a/deps/openssl/openssl/doc/internal/man3/OPENSSL_SA.pod b/deps/openssl/openssl/doc/internal/man3/OPENSSL_SA.pod new file mode 100644 index 000000000..8124003d7 --- /dev/null +++ b/deps/openssl/openssl/doc/internal/man3/OPENSSL_SA.pod @@ -0,0 +1,131 @@ +=pod + +=head1 NAME + +OPENSSL_SA, ossl_sa_TYPE_new, ossl_sa_TYPE_free, +ossl_sa_TYPE_free_leaves, ossl_sa_TYPE_num, ossl_sa_TYPE_doall, +ossl_sa_TYPE_doall_arg, ossl_sa_TYPE_get, ossl_sa_TYPE_set +- sparse array container + +=head1 SYNOPSIS + + #include "crypto/sparse_array.h" + + typedef struct sparse_array_st OPENSSL_SA; + + SPARSE_ARRAY_OF(TYPE) + DEFINE_SPARSE_ARRAY_OF(TYPE) + + SPARSE_ARRAY_OF(TYPE) *ossl_sa_TYPE_new(void); + void ossl_sa_TYPE_free(const SPARSE_ARRAY_OF(TYPE) *sa); + void ossl_sa_TYPE_free_leaves(const SPARSE_ARRAY_OF(TYPE) *sa); + size_t ossl_sa_TYPE_num(const SPARSE_ARRAY_OF(TYPE) *sa); + void ossl_sa_TYPE_doall(const OPENSSL_SA *sa, void (*leaf)(ossl_uintmax_t, + void *)); + void ossl_sa_TYPE_doall_arg(const OPENSSL_SA *sa, + void (*leaf)(ossl_uintmax_t, void *, void *), + void *arg); + TYPE *ossl_sa_TYPE_get(const SPARSE_ARRAY_OF(TYPE) *sa, ossl_uintmax_t idx); + int ossl_sa_TYPE_set(SPARSE_ARRAY_OF(TYPE) *sa, ossl_uintmax_t idx, + TYPE *value); + +=head1 DESCRIPTION + +=begin comment + +POD is pretty good at recognising function names and making them appropriately +bold... however, when part of the function name is variable, we have to help +the processor along + +=end comment + +SPARSE_ARRAY_OF() returns the name for a sparse array of the specified +B>. DEFINE_SPARSE_ARRAY_OF() creates set of functions for a sparse +array of B>. This will mean that a pointer to type B> +is stored in each element of a sparse array, the type is referenced by +B(B>) and each function name begins with +B_>. For example: + + TYPE *ossl_sa_TYPE_get(SPARSE_ARRAY_OF(TYPE) *sa, ossl_uintmax_t idx); + +B_num>() returns the number of elements in I or 0 if I +is NULL. + +B_get>() returns element I in I, where I starts +at zero. If I refers to a value that has not been set then NULL is +returned. + +B_set>() sets element I in I to I, where I +starts at zero. The sparse array will be resized as required. + +B_new>() allocates a new empty sparse array. + +B_free>() frees up the I structure. It does I free up any +elements of I. After this call I is no longer valid. + +B_free_leaves>() frees up the I structure and all of its +elements. After this call I is no longer valid. + +B_doall>() calls the function I for each element in I +in ascending index order. The index position, within the sparse array, +of each item is passed as the first argument to the leaf function and a +pointer to the associated value is passed as the second argument. + +B_doall_arg>() calls the function I for each element in +I in ascending index order. The index position, within the sparse +array, of each item is passed as the first argument to the leaf function, +a pointer to the associated value is passed as the second argument and +the third argument is the user supplied I. + + +=head1 NOTES + +Sparse arrays are an internal data structure and should B be used by user +applications. + +Care should be taken when accessing sparse arrays in multi-threaded +environments. The B_set>() operation can cause the internal +structure of the sparse array to change which causes race conditions if the +sparse array is accessed in a different thread. + +SPARSE_ARRAY_OF() and DEFINE_SPARSE_ARRAY_OF() are implemented as macros. + +The underlying utility B API should not be used directly. It +defines these functions: OPENSSL_SA_doall, OPENSSL_SA_doall_arg, +OPENSSL_SA_free, OPENSSL_SA_free_leaves, OPENSSL_SA_get, OPENSSL_SA_new, +OPENSSL_SA_num and OPENSSL_SA_set. + +=head1 RETURN VALUES + +B_num>() returns the number of elements in the sparse array or +B<0> if the passed sparse array is NULL. + +B_get>() returns a pointer to a sparse array element or NULL if +the element has not be set. + +B_set>() return B<1> on success and B<0> on error. In the latter +case, the elements of the sparse array remain unchanged, although the internal +structures might have. + +B_new>() returns an empty sparse array or NULL if an error +occurs. + +B_doall>(), B_doall_arg>(), +B_free>() and B_free_leaves>() +do not return values. + +=head1 HISTORY + +This functionality was added to OpenSSL 3.0. + +=head1 COPYRIGHT + +Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved. Copyright +(c) 2019, Oracle and/or its affiliates. All rights reserved. + +Licensed under the Apache License 2.0 (the "License"). You may not use this +file except in compliance with the License. You can obtain a copy in the file +LICENSE in the source distribution or at +L. + +=cut diff --git a/deps/openssl/openssl/doc/internal/man3/OPTIONS.pod b/deps/openssl/openssl/doc/internal/man3/OPTIONS.pod new file mode 100644 index 000000000..90593ca46 --- /dev/null +++ b/deps/openssl/openssl/doc/internal/man3/OPTIONS.pod @@ -0,0 +1,343 @@ +=pod + +=head1 NAME + +OPTIONS, OPT_PAIR, OPT_COMMON, OPT_ERR, OPT_EOF, OPT_HELP, +opt_init, opt_progname, opt_appname, opt_getprog, opt_help, +opt_begin, opt_next, opt_flag, opt_arg, opt_unknown, opt_cipher, +opt_cipher_any, opt_cipher_silent, opt_md, +opt_int, opt_int_arg, opt_long, opt_ulong, opt_intmax, opt_uintmax, +opt_format, opt_isdir, opt_string, opt_pair, +opt_num_rest, opt_rest, opt_legacy_okay +- Option parsing for commands and tests + +=head1 SYNOPSIS + + #include "opt.h" + + typedef struct { ... } OPTIONS; + typedef struct { ... } OPT_PAIR; + #define OPT_COMMON + #define OPT_ERR + #define OPT_EOF + #define OPT_HELP + + char *opt_init(int argc, char **argv, const OPTIONS *o); + char *opt_progname(const char *argv0); + char *opt_appname(const char *argv0); + char *opt_getprog(void); + void opt_help(const OPTIONS *list); + + void opt_begin(void); + int opt_next(void); + char *opt_flag(void); + char *opt_arg(void); + char *opt_unknown(void); + int opt_cipher(const char *name, EVP_CIPHER **cipherp); + int opt_cipher_any(const char *name, EVP_CIPHER **cipherp); + int opt_cipher_silent(const char *name, EVP_CIPHER **cipherp); + int opt_md(const char *name, EVP_MD **mdp); + + int opt_int(const char *value, int *result); + int opt_int_arg(void); + int opt_long(const char *value, long *result); + int opt_ulong(const char *value, unsigned long *result); + int opt_intmax(const char *value, intmax_t *result); + int opt_uintmax(const char *value, uintmax_t *result); + + int opt_format(const char *s, unsigned long flags, int *result); + int opt_isdir(const char *name); + int opt_string(const char *name, const char **options); + int opt_pair(const char *name, const OPT_PAIR* pairs, int *result); + + int opt_num_rest(void); + char **opt_rest(void); + + int opt_legacy_okay(void); + +=head1 DESCRIPTION + +The functions on this page provide a common set of option-parsing for +the OpenSSL command and the internal test programs. +It is intended to be used like the standard getopt(3) routine, except +that multi-character flag names are supported, and a variety of parsing +and other utility functions are also provided. + +Programs that use this should make sure to set the appropriate C<-I> +flag. + +These routines expect a global B named B to point to +the equivalent of B. This is already done in the OpenSSL +application. + +=head2 Data Types + +Each program should define, near the main() routine, an enumeration +that is the set of options the program accepts. For example: + + typedef enum OPTION_choice { + OPT_COMMON, + OPT_YES, OPT_NAME, OPT_COUNT, OPT_OFILE, + ... + } OPTION_CHOICE; + +The first two lines must appear exactly as shown. +OPT_COMMON is a macro that expands to C. +In addition to defining symbolic names for the constants that opt_next() +returns, it also helps guarantee that every command has a C<-help> option. +The third line is a sample +set of flags, and the closing C name is used for error-checking +as discussed below. +By declaring the variable as an C, with the right warning +flags, the compiler could check that all specified options are handled. + +The B C specifies an option: what type of argument +it takes (if any), and an optional "help" string. It is a C +containing these fields: + + const char *name; + int retval; + int valtype; + const char *helpstr; + +The B is the name of the option that the user would type. Options +are words prefaced with a minus sign. If the user uses two minus signs, +this is also accepted for compatibility with other GNU software. Some +names are special, and are described below. + +The B is the value to return if the option is found. It should be +one of the choices in the enumeration above. + +The B defines what the option's parameter must be. It should +be chosen from the following set: + + \0 No value + '-' No value + 's' A text string + '/' A directory + '<' Name of file to open for input + '>' Name of file to open for output + 'n' A signed number that fits in the C type + 'p' A positive number that fits in the C type + 'N' A nonnegative number that fits in the C type + 'M' A signed number that fits in the C type + 'U' An unsigned number that fits in the C type + 'l' A signed number that fits in the C type + 'u' An unsigned number that fits in the C type + 'c' File in PEM, DER, or S/MIME format + 'F' A file in PEM or DER format + 'E' Like 'F' but also allows ENGINE + 'f' Any file format + +The B is what to display when the user uses the help option, +which should be C<"help">. + +A program should declare its options right after the enumeration, +and should follow the ordering of the enumeration as this helps +readability and maintainability: + + static OPTIONS my_options[] = { + {"help", OPT_HELP, '-', "Display this summary"}, + {"yes", OPT_YES, '-', "Print an affirmative reply"}, + {"count", OPT_COUNT, 'p', "Repeat count"}, + {"output" OPT_OFILE, '>', "Output file; default is stdout"}, + {NULL} + }; + +Note that the B option is explicitly listed, and the list ends with +an entry of all-null's. The other two special options, B and B +should not appear in the array. + +If the help string is too long to fit into one line, it may be continued +on multiple lines; each entry should use B, like this: + + {"output" OPT_OFILE, '>', "Output file; default is stdout"}, + {OPT_MORE_STR, 0, 0, + "This flag is not really needed on Unix systems"}, + {OPT_MORE_STR, 0, 0, + "(Unix and descendents for ths win!)"} + +Each subsequent line will be indented the correct amount. + +By default, the help display will include a standard prolog: + + Usage: PROGRAM [options] + Valid options are: + ...detailed list of options... + +Sometimes there are parameters that should appear in the synopsis. +Use B as the first entry in your array: + + {OPT_HELP_STR, 1, '-', Usage: %s [options] [text...]\n"} + +The B and B are ignored, and the B should +follow the general construction as shown. The C<%s> will get the program +name. + +If a command has a large set of options, it can be useful to break them +into sections. Use the macro B or B +to indicate this. The two lines below are equivalent: + + OPT_SECTION("Validation"), + {OPT_SECTION_STR, 1, '-', "Validation options:\n"}, + +In addition to providing help about options, you can provide a description +of the parameters a command takes. These should appear at the end of +the options and are indicated by using B or the +B macro: + + OPT_PARAMETERS() + {OPT_PARAM_STR, 1, '-', "Parameters:\n"} + +Every "option" after after this should contain the parameter and +the help string: + + {"text", 0, 0, "Words to display (optional)"}, + +=head2 Functions + +The opt_init() function takes the I and I arguments given to main() +and a pointer I to the list of options. It returns the simple program +name, as defined by opt_progname(). + +The opt_progname() function takes the full pathname C in its I +parameter and returns +the simple short name of the executable, to be used for error messages and +the like. + +The opt_appname() function takes in its I parameter +the "application" name (such +as the specific command from L and appends it to the program +name. This function should only be called once. + +The opt_getprog() function returns the value set by opt_appname(). + +The opt_help() function takes a list of option definitions and prints a +nicely-formatted output. + +The opt_begin() function, which is called automatically by opt_init(), +can be used to reset the option parsing loop. + +The opt_next() function is called, once opt_init() has been called, +in a loop to fetch each option in turn. It returns -1, or B when the +end of arguments has been reached. This is typically done like this: + + prog = opt_init(argc, argv, my_options); + while ((o = opt_next()) != OPT_EOF) { + switch (o) { + case OPT_EOF: + case OPT_ERR: + opthelp: + fprintf(stderr, "%s: Use -help for summary\n", prog); + exit(1); + case OPT_HELP: + opt_help(my_options); + exit(0); + ...other options... + } + } + +Within the option parsing loop, the following functions may be called. + +The opt_flag() function returns the most recent option name +including the preceding C<->. + +The opt_arg() function returns the option's argument value, if there is one. + +The opt_unknown() function returns the unknown option. +In an option list, there can be at most one option with the empty string. +This is a "wildcard" or "unknown" option. For example, it allows an +option to be be taken as digest algorithm, like C<-sha1>. The function +opt_md() takes the specified I and fills in the digest into I. +The functions opt_cipher(), opt_cipher_any() and opt_cipher_silent() +each takes the specified I and fills in the cipher into I. +The function opt_cipher() only accepts ciphers which are not +AEAD and are not using XTS mode. The functions opt_cipher_any() and +opt_cipher_silent() accept any cipher, the latter not emitting an error +if the cipher is not located. + +There are a several useful functions for parsing numbers. These are +opt_int(), opt_long(), opt_ulong(), opt_intmax(), and opt_uintmax(). They all +take C<0x> to mean hexadecimal and C<0> to mean octal, and will do the +necessary range-checking. They return 1 if successful and fill in the +C pointer with the value, or 0 on error. Note that opt_next() +will also do range-check on the argument if the appropriate B +field is specified for the option. This means that error-checking inside +the C C can often be elided. + +The opt_int_arg() function is a convenience abbreviation to opt_int(). +It parses and returns an integer, assuming its range has been checked before. + +The opt_format() function takes a string value, +such as used with the B<-informat> or similar option, and fills +the value from the constants in F file. + +The opt_isdir() function returns 1 if the specified I is +a directory, or 0 if not. + +The opt_string() function checks that I appears in the +NULL-terminated array of strings. It returns 1 if found, +or prints a diagnostic and returns 0 if not. + +The opt_pair() function takes a list of I, each of which +has a text name and an integer. The specified I is +found on the list, it puts the index in I<*result>, and returns +1. If not found, it returns 0. + +The following functions can be used after processing all the options. + +The opt_num_rest() function returns what is left. + +The opt_rest() function returns a pointer to the first non-option. +If there were no parameters, it will point to the NULL that is +at the end of the standard I array. + +The opt_legacy_okay() function returns true if no options have been +specified that would preclude using legacy code paths. Currently, +the various provider options preclude legacy operation. This means, +for example, that specifying both B<-provider> and B<-engine> in the +same command line will not work as expected. + +=head2 Common Options + +There are a few groups of options that are common to many OpenSSL programs. +These are handled with sets of macros that define common option names +and common code to handle them. The categories are identified by a +letter: + + V Validation + X Extended certificate + S TLS/SSL + R Random state + +The B macro is used to define the numeration values, where B +is one of the letters above. The B macro is used to +list the set of common options, and the B is used in +the C statement. + +The common options are used throughout the sources for the OpenSSL commands. +They are also used with common descriptions when generating the +manpages, in the file F, which follow a similar naming +convention. + +=head1 RETURN VALUES + +Detailed above. + +=head1 EXAMPLES + +The best examples can be found in sources for the commands in the F +directory of the source tree. +A notable exception is F which uses this API, but does +things very differently. + +=head1 COPYRIGHT + +Copyright 2021 The OpenSSL Project Authors. All Rights Reserved. + +Licensed under the Apache License 2.0 (the "License"). You may not use this +file except in compliance with the License. You can obtain a copy in the file +LICENSE in the source distribution or at +L. + +=cut diff --git a/deps/openssl/openssl/doc/internal/man3/OSSL_DEPRECATED.pod b/deps/openssl/openssl/doc/internal/man3/OSSL_DEPRECATED.pod new file mode 100644 index 000000000..8370d60f1 --- /dev/null +++ b/deps/openssl/openssl/doc/internal/man3/OSSL_DEPRECATED.pod @@ -0,0 +1,54 @@ +=pod + +=head1 NAME + +OSSL_DEPRECATED, OSSL_DEPRECATED_FOR - General deprecation macros + +=head1 SYNOPSIS + + #include + + #define OSSL_DEPRECATED(since) + #define OSSL_DEPRECATED_FOR(since, msg) + +=head1 DESCRIPTION + +OSSL_DEPRECATED() implements the deprecated attribute if the compiler +supports it, otherwise it expands to nothing. It takes one argument +I that should be set to the OpenSSL version where the symbol was +deprecated, and will be displayed with the deprecation warning message, +for compilers that support user specified deprecation messages. + +OSSL_DEPRECATED_FOR() does the same as OSSL_DEPRECATED(), but also takes a +second argument I, which is an additional text messages to be displayed +with the deprecation warning along with the OpenSSL version number, for +compilers that support user specified deprecation messages. + +These macros are used to define the version specific deprecation macros +described in L. + +=begin comment + +[RETURN VALUES isn't relevant for these macros, but find-doc-nits demands +the presence of this section] + +=head1 RETURN VALUES + +[podchecker doesn't like empty sections] + +=end comment + +=head1 SEE ALSO + +L + +=head1 COPYRIGHT + +Copyright 2020 The OpenSSL Project Authors. All Rights Reserved. + +Licensed under the Apache License 2.0 (the "License"). You may not use +this file except in compliance with the License. You can obtain a copy +in the file LICENSE in the source distribution or at +L. + +=cut diff --git a/deps/openssl/openssl/doc/internal/man3/OSSL_METHOD_STORE.pod b/deps/openssl/openssl/doc/internal/man3/OSSL_METHOD_STORE.pod new file mode 100644 index 000000000..70f6eb520 --- /dev/null +++ b/deps/openssl/openssl/doc/internal/man3/OSSL_METHOD_STORE.pod @@ -0,0 +1,144 @@ +=pod + +=head1 NAME + +OSSL_METHOD_STORE, ossl_method_store_new, ossl_method_store_free, +ossl_method_store_init, ossl_method_store_cleanup, +ossl_method_store_add, ossl_method_store_fetch, +ossl_method_store_remove, ossl_method_store_remove_all_provided, +ossl_method_store_cache_get, ossl_method_store_cache_set, +ossl_method_store_cache_flush_all +- implementation method store and query + +=head1 SYNOPSIS + + #include "internal/property.h" + + typedef struct ossl_method_store_st OSSL_METHOD_STORE; + + OSSL_METHOD_STORE *ossl_method_store_new(OSSL_LIB_CTX *ctx); + void ossl_method_store_free(OSSL_METHOD_STORE *store); + int ossl_method_store_init(OSSL_LIB_CTX *ctx); + void ossl_method_store_cleanup(OSSL_LIB_CTX *ctx); + int ossl_method_store_add(OSSL_METHOD_STORE *store, const OSSL_PROVIDER *prov, + int nid, const char *properties, void *method, + int (*method_up_ref)(void *), + void (*method_destruct)(void *)); + int ossl_method_store_remove(OSSL_METHOD_STORE *store, + int nid, const void *method); + int ossl_method_store_fetch(OSSL_METHOD_STORE *store, + int nid, const char *properties, + void **method, const OSSL_PROVIDER **prov_rw); + int ossl_method_store_remove_all_provided(OSSL_METHOD_STORE *store, + const OSSL_PROVIDER *prov); + + int ossl_method_store_cache_get(OSSL_METHOD_STORE *store, OSSL_PROVIDER *prov, + int nid, const char *prop_query, void **method); + int ossl_method_store_cache_set(OSSL_METHOD_STORE *store, OSSL_PROVIDER *prov, + int nid, const char *prop_query, void *method, + int (*method_up_ref)(void *), + void (*method_destruct)(void *)); + void ossl_method_store_cache_flush_all(OSSL_METHOD_STORE *store); + +=head1 DESCRIPTION + +OSSL_METHOD_STORE stores methods that can be queried using properties and a +numeric identity (nid). + +Methods are expected to be library internal structures. +It's left to the caller to define the exact contents. + +Numeric identities are expected to be an algorithm identity for the methods. +It's left to the caller to define exactly what an algorithm is, and to allocate +these numeric identities accordingly. + +The B also holds an internal query cache, which is accessed +separately (see L below). + +=head2 Store Functions + +ossl_method_store_init() initialises the method store subsystem in the scope of +the library context I. + +ossl_method_store_cleanup() cleans up and shuts down the implementation method +store subsystem in the scope of the library context I. + +ossl_method_store_new() create a new empty method store using the supplied +I to allow access to the required underlying property data. + +ossl_method_store_free() frees resources allocated to I. + +ossl_method_store_add() adds the I constructed from an implementation in +the provider I to the I as an instance of an algorithm indicated by +I and the property definition I, unless the I already +has a method from the same provider with the same I and I. +If the I function is given, it's called to increment the +reference count of the method. +If the I function is given, it's called when this function +fails to add the method to the store, or later on when it is being released from +the I. + +ossl_method_store_remove() removes the I identified by I from the +I. + +ossl_method_store_fetch() queries I for a method identified by I +that matches the property query I. +I<*prop> may be a pointer to a provider, which will narrow the search +to methods from that provider. +The result, if any, is returned in I<*method>, and its provider in I<*prov>. + +ossl_method_store_remove_all_provided() removes all methods from I +that are provided by I. +When doing so, it also flushes the corresponding cache entries. + +=head2 Cache Functions + +ossl_method_store_cache_get() queries the cache associated with the I +for a method identified by I that matches the property query +I. +Additionally, if I isn't NULL, it will be used to narrow the search +to only include methods from that provider. +The result, if any, is returned in I. + +ossl_method_store_cache_set() sets a cache entry identified by I from the +provider I, with the property query I in the I. +Future calls to ossl_method_store_cache_get() will return the specified I. +The I function is called to increment the +reference count of the method and the I function is called +to decrement it. + +ossl_method_store_cache_flush_all() flushes all cached entries associated with +I. + +=head1 NOTES + +The I argument to ossl_method_store_cache_get() and +ossl_method_store_cache_set() is not allowed to be NULL. Use "" for an +empty property definition or query. + +=head1 RETURN VALUES + +ossl_method_store_new() returns a new method store object or NULL on failure. + +ossl_method_store_free(), ossl_method_store_add(), +ossl_method_store_remove(), ossl_method_store_fetch(), +ossl_method_store_cache_get(), ossl_method_store_cache_set() and +ossl_method_store_flush_cache() return B<1> on success and B<0> on error. + +ossl_method_store_free() and ossl_method_store_cleanup() do not return any value. + +=head1 HISTORY + +This functionality was added to OpenSSL 3.0. + +=head1 COPYRIGHT + +Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved. +Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. + +Licensed under the Apache License 2.0 (the "License"). You may not use this +file except in compliance with the License. You can obtain a copy in the file +LICENSE in the source distribution or at +L. + +=cut diff --git a/deps/openssl/openssl/doc/internal/man3/cms_add1_signing_cert.pod b/deps/openssl/openssl/doc/internal/man3/cms_add1_signing_cert.pod new file mode 100644 index 000000000..cc2747dcd --- /dev/null +++ b/deps/openssl/openssl/doc/internal/man3/cms_add1_signing_cert.pod @@ -0,0 +1,46 @@ +=pod + +=head1 NAME + +cms_add1_signing_cert, cms_add1_signing_cert_v2 +- add ESS signing-certificate signed attribute to a +CMS_SignerInfo data structure + +=head1 SYNOPSIS + + #include + + int cms_add1_signing_cert(CMS_SignerInfo *si, ESS_SIGNING_CERT *sc); + + int cms_add1_signing_cert_v2(CMS_SignerInfo *si, ESS_SIGNING_CERT_V2 *sc2); + +=head1 DESCRIPTION + +cms_add1_signing_cert() adds an ESS Signing Certificate I (version 1) signed +attribute to the CMS_SignerInfo I. +cms_add1_signing_cert_v2() adds an ESS Signing Certificate I (version 2) signed +attribute to the CMS_SignerInfo I. +The ESS Signing Certificate attributes version 1 and 2 are defined in RFC 5035 +which updates Section 5.4 of RFC 2634. + +=head1 NOTES + +This attribute is mandatory to make a CMS compliant with CAdES-BES +(European Standard ETSI EN 319 122-1 V1.1.1). +For a fuller description see L). + +=head1 RETURN VALUES + +cms_add1_signing_cert() and cms_add1_signing_cert_v2() return 1 if attribute +is added or 0 if an error occurred. + +=head1 COPYRIGHT + +Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved. + +Licensed under the Apache License 2.0 (the "License"). You may not use +this file except in compliance with the License. You can obtain a copy +in the file LICENSE in the source distribution or at +L. + +=cut diff --git a/deps/openssl/openssl/doc/internal/man3/evp_generic_fetch.pod b/deps/openssl/openssl/doc/internal/man3/evp_generic_fetch.pod new file mode 100644 index 000000000..b23d2ec0e --- /dev/null +++ b/deps/openssl/openssl/doc/internal/man3/evp_generic_fetch.pod @@ -0,0 +1,285 @@ +=pod + +=head1 NAME + +evp_generic_fetch, evp_generic_fetch_by_number, evp_generic_fetch_from_prov +- generic algorithm fetchers and method creators for EVP + +=head1 SYNOPSIS + + /* Only for EVP source */ + #include "evp_local.h" + + void *evp_generic_fetch(OSSL_LIB_CTX *libctx, int operation_id, + const char *name, const char *properties, + void *(*new_method)(int name_id, + const OSSL_DISPATCH *fns, + OSSL_PROVIDER *prov, + void *method_data), + void *method_data, + int (*up_ref_method)(void *), + void (*free_method)(void *)); + + void *evp_generic_fetch_by_number(OSSL_LIB_CTX *ctx, int operation_id, + int name_id, const char *properties, + void *(*new_method)(int name_id, + const OSSL_DISPATCH *fns, + OSSL_PROVIDER *prov, + void *method_data), + void *method_data, + int (*up_ref_method)(void *), + void (*free_method)(void *)); + void *evp_generic_fetch_from_prov(OSSL_PROVIDER *prov, int operation_id, + int name_id, const char *properties, + void *(*new_method)(int name_id, + const OSSL_DISPATCH *fns, + OSSL_PROVIDER *prov, + void *method_data), + void *method_data, + int (*up_ref_method)(void *), + void (*free_method)(void *)); + +=head1 DESCRIPTION + +evp_generic_fetch() calls ossl_method_construct() with the given +I, I, I, and I and uses +it to create an EVP method with the help of the functions +I, I, and I. + +evp_generic_fetch_by_number() does the same thing as evp_generic_fetch(), +but takes a numeric I instead of a name. +I must always be nonzero; as a matter of fact, it being zero +is considered a programming error. +This is meant to be used when one method needs to fetch an associated +method, and is typically called from inside the given function +I. + +evp_generic_fetch_from_prov() does the same thing as evp_generic_fetch(), +but limits the search of methods to the provider given with I. +This is meant to be used when one method needs to fetch an associated +method in the same provider. + +The three functions I, I, and +I are supposed to: + +=over 4 + +=item new_method() + +creates an internal method from function pointers found in the +dispatch table I, with name identity I. +The provider I and I are also passed to be used as +new_method() sees fit. + +=item up_ref_method() + +increments the reference counter for the given method, if there is +one. + +=item free_method() + +frees the given method. + +=back + +=head1 RETURN VALUES + +evp_generic_fetch() returns a method on success, or NULL on error. + +=head1 EXAMPLES + +This is a short example of the fictitious EVP API and operation called +B. + +To begin with, let's assume something like this in +F: + + #define OSSL_OP_FOO 100 + + #define OSSL_FUNC_FOO_NEWCTX_FUNC 2001 + #define OSSL_FUNC_FOO_INIT 2002 + #define OSSL_FUNC_FOO_OPERATE 2003 + #define OSSL_FUNC_FOO_CLEANCTX_FUNC 2004 + #define OSSL_FUNC_FOO_FREECTX_FUNC 2005 + + OSSL_CORE_MAKE_FUNC(void *, foo_newctx, (void)) + OSSL_CORE_MAKE_FUNC(int, foo_init, (void *vctx)) + OSSL_CORE_MAKE_FUNC(int, foo_operate, (void *vctx, + unsigned char *out, size_t *out_l, + unsigned char *in, size_t in_l)) + OSSL_CORE_MAKE_FUNC(void, foo_cleanctx, (void *vctx)) + OSSL_CORE_MAKE_FUNC(void, foo_freectx, (void *vctx)) + +And here's the implementation of the FOO method fetcher: + + /* typedef struct evp_foo_st EVP_FOO */ + struct evp_foo_st { + OSSL_PROVIDER *prov; + int name_id; + CRYPTO_REF_COUNT refcnt; + OSSL_FUNC_foo_newctx_fn *newctx; + OSSL_FUNC_foo_init_fn *init; + OSSL_FUNC_foo_operate_fn *operate; + OSSL_FUNC_foo_cleanctx_fn *cleanctx; + OSSL_FUNC_foo_freectx_fn *freectx; + }; + + /* + * In this example, we have a public method creator and destructor. + * It's not absolutely necessary, but is in the spirit of OpenSSL. + */ + EVP_FOO *EVP_FOO_meth_from_algorithm(int name_id, + const OSSL_DISPATCH *fns, + OSSL_PROVIDER *prov, + void *data) + { + EVP_FOO *foo = NULL; + + if ((foo = OPENSSL_zalloc(sizeof(*foo))) == NULL) + return NULL; + + foo->name_id = name_id; + + for (; fns->function_id != 0; fns++) { + switch (fns->function_id) { + case OSSL_FUNC_FOO_NEWCTX: + foo->newctx = OSSL_FUNC_foo_newctx(fns); + break; + case OSSL_FUNC_FOO_INIT: + foo->init = OSSL_FUNC_foo_init(fns); + break; + case OSSL_FUNC_FOO_OPERATE: + foo->operate = OSSL_FUNC_foo_operate(fns); + break; + case OSSL_FUNC_FOO_CLEANCTX: + foo->cleanctx = OSSL_FUNC_foo_cleanctx(fns); + break; + case OSSL_FUNC_FOO_FREECTX: + foo->freectx = OSSL_FUNC_foo_freectx(fns); + break; + } + } + foo->prov = prov; + if (prov) + ossl_provider_up_ref(prov); + + return foo; + } + + EVP_FOO_meth_free(EVP_FOO *foo) + { + if (foo != NULL) { + OSSL_PROVIDER *prov = foo->prov; + + OPENSSL_free(foo); + ossl_provider_free(prov); + } + } + + static void *foo_from_algorithm(const OSSL_DISPATCH *fns, + OSSL_PROVIDER *prov) + { + return EVP_FOO_meth_from_algorithm(fns, prov); + } + + static int foo_up_ref(void *vfoo) + { + EVP_FOO *foo = vfoo; + int ref = 0; + + CRYPTO_UP_REF(&foo->refcnt, &ref, foo_lock); + return 1; + } + + static void foo_free(void *vfoo) + { + EVP_FOO_meth_free(vfoo); + } + + EVP_FOO *EVP_FOO_fetch(OSSL_LIB_CTX *ctx, + const char *name, + const char *properties) + { + EVP_FOO *foo = + evp_generic_fetch(ctx, OSSL_OP_FOO, name, properties, + foo_from_algorithm, foo_up_ref, foo_free); + + /* + * If this method exists in legacy form, with a constant NID for the + * given |name|, this is the spot to find that NID and set it in + * the newly constructed EVP_FOO instance. + */ + + return foo; + + } + +And finally, the library functions: + + /* typedef struct evp_foo_st EVP_FOO_CTX */ + struct evp_foo_ctx_st { + const EVP_FOO *foo; + void *provctx; /* corresponding provider context */ + }; + + int EVP_FOO_CTX_reset(EVP_FOO_CTX *c) + { + if (c == NULL) + return 1; + if (c->foo != NULL && c->foo->cleanctx != NULL) + c->foo->cleanctx(c->provctx); + return 1; + } + + EVP_FOO_CTX *EVP_FOO_CTX_new(void) + { + return OPENSSL_zalloc(sizeof(EVP_FOO_CTX)); + } + + void EVP_FOO_CTX_free(EVP_FOO_CTX *c) + { + EVP_FOO_CTX_reset(c); + c->foo->freectx(c->provctx); + OPENSSL_free(c); + } + + int EVP_FooInit(EVP_FOO_CTX *c, const EVP_FOO *foo) + { + int ok = 1; + + c->foo = foo; + if (c->provctx == NULL) + c->provctx = c->foo->newctx(); + + ok = c->foo->init(c->provctx); + + return ok; + } + + int EVP_FooOperate(EVP_FOO_CTX *c, unsigned char *out, size_t *outl, + const unsigned char *in, size_t inl) + { + int ok = 1; + + ok = c->foo->update(c->provctx, out, inl, &outl, in, inl); + return ok; + } + +=head1 SEE ALSO + +L + +=head1 HISTORY + +The functions described here were all added in OpenSSL 3.0. + +=head1 COPYRIGHT + +Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved. + +Licensed under the Apache License 2.0 (the "License"). You may not use +this file except in compliance with the License. You can obtain a copy +in the file LICENSE in the source distribution or at +L. + +=cut diff --git a/deps/openssl/openssl/doc/internal/man3/evp_keymgmt_newdata.pod b/deps/openssl/openssl/doc/internal/man3/evp_keymgmt_newdata.pod new file mode 100644 index 000000000..9b3f2c55f --- /dev/null +++ b/deps/openssl/openssl/doc/internal/man3/evp_keymgmt_newdata.pod @@ -0,0 +1,88 @@ +=pod + +=head1 NAME + +evp_keymgmt_newdata, evp_keymgmt_freedata, +evp_keymgmt_get_params, +evp_keymgmt_has, evp_keymgmt_validate, +evp_keymgmt_import, evp_keymgmt_import_types, +evp_keymgmt_export, evp_keymgmt_export_types +- internal KEYMGMT interface functions + +=head1 SYNOPSIS + + #include "crypto/evp.h" + + void *evp_keymgmt_newdata(const EVP_KEYMGMT *keymgmt); + void evp_keymgmt_freedata(const EVP_KEYMGMT *keymgmt, void *keyddata); + int evp_keymgmt_get_params(const EVP_KEYMGMT *keymgmt, + void *keydata, OSSL_PARAM params[]); + + int evp_keymgmt_has(const EVP_KEYMGMT *keymgmt, void *keyddata, int selection); + int evp_keymgmt_validate(const EVP_KEYMGMT *keymgmt, void *keydata, + int selection); + + int evp_keymgmt_import(const EVP_KEYMGMT *keymgmt, void *keydata, + int selection, const OSSL_PARAM params[]); + const OSSL_PARAM *evp_keymgmt_import_types(const EVP_KEYMGMT *keymgmt, + int selection); + int evp_keymgmt_export(const EVP_KEYMGMT *keymgmt, void *keydata, + int selection, OSSL_CALLBACK *param_cb, void *cbarg); + const OSSL_PARAM *evp_keymgmt_export_types(const EVP_KEYMGMT *keymgmt, + int selection); + +=head1 DESCRIPTION + +All these functions are helpers to call the provider's corresponding +function. They all have in common that they take a B as +first argument, which they also retrieve a provider context from when +needed. The rest of the arguments are simply passed on to the +function they wrap around. + +evp_keymgmt_newdata() calls the method's new() function. + +evp_keymgmt_freedata() calls the method's free() function. + +(the name evp_keymgmt_freedata() was chosen to avoid a clash with +EVP_KEYMGMT_free() on case insensitive systems, the name +evp_keymgmt_newdata() was chosen for consistency) + +evp_keymgmt_get_params() calls the method's get_params() function. + +evp_keymgmt_has() calls the method's has() function. + +evp_keymgmt_validate() calls the method's validate() function. + +evp_keymgmt_import() calls the method's import() function. + +evp_keymgmt_import_types() calls the method's import_types() function. + +evp_keymgmt_export() calls the method's export() function. + +evp_keymgmt_export_types() calls the method's export_types() function. + +=head1 RETURN VALUES + +evp_keymgmt_newdata() returns a pointer to a provider side key object, +or NULL on error. + +evp_keymgmt_import_types(), and evp_keymgmt_export_types() return a parameter +descriptor for importing and exporting key data, or NULL if there are no such +descriptors. + +All other functions return 1 on success and 0 on error. + +=head1 HISTORY + +The functions described here were all added in OpenSSL 3.0. + +=head1 COPYRIGHT + +Copyright 2019-2020 The OpenSSL Project Authors. All Rights Reserved. + +Licensed under the Apache License 2.0 (the "License"). You may not use +this file except in compliance with the License. You can obtain a copy +in the file LICENSE in the source distribution or at +L. + +=cut diff --git a/deps/openssl/openssl/doc/internal/man3/evp_keymgmt_util_export_to_provider.pod b/deps/openssl/openssl/doc/internal/man3/evp_keymgmt_util_export_to_provider.pod new file mode 100644 index 000000000..7099e4496 --- /dev/null +++ b/deps/openssl/openssl/doc/internal/man3/evp_keymgmt_util_export_to_provider.pod @@ -0,0 +1,106 @@ +=pod + +=head1 NAME + +evp_keymgmt_util_export, +evp_keymgmt_util_export_to_provider, +evp_keymgmt_util_find_operation_cache, +evp_keymgmt_util_clear_operation_cache, +evp_keymgmt_util_cache_keydata, +evp_keymgmt_util_cache_keyinfo, +evp_keymgmt_util_fromdata, +OP_CACHE_ELEM +- internal KEYMGMT utility functions + +=head1 SYNOPSIS + + #include "crypto/evp.h" + + typedef struct OP_CACHE_ELEM; + + int evp_keymgmt_util_export(const EVP_PKEY *pk, int selection, + OSSL_CALLBACK *export_cb, void *export_cbarg); + void *evp_keymgmt_util_export_to_provider(EVP_PKEY *pk, EVP_KEYMGMT *keymgmt, + int selection); + OP_CACHE_ELEM *evp_keymgmt_util_find_operation_cache(EVP_PKEY *pk, + EVP_KEYMGMT *keymgmt, + int selection); + int evp_keymgmt_util_clear_operation_cache(EVP_PKEY *pk, int locking); + int evp_keymgmt_util_cache_keydata(EVP_PKEY *pk, EVP_KEYMGMT *keymgmt, + void *keydata, int selection); + void evp_keymgmt_util_cache_keyinfo(EVP_PKEY *pk); + void *evp_keymgmt_util_fromdata(EVP_PKEY *target, EVP_KEYMGMT *keymgmt, + int selection, const OSSL_PARAM params[]); + +=head1 DESCRIPTION + +evp_keymgmt_util_export() calls L with the +I and I from I. This is used as a +helper for L. + +evp_keymgmt_util_export_to_provider() exports cached key material +(provider side key material) from the given key I to a provider +via a B interface, if this hasn't already been done. +It maintains a cache of provider key references in I to keep track +of all provider side keys. + +To export a legacy key, use L instead, +as this function ignores any legacy key data. + +evp_keymgmt_util_find_operation_cache() finds +I in I's cache of provided keys for operations. +It should only be called while holding I's lock (read or write). + +evp_keymgmt_util_clear_operation_cache() can be used to explicitly +clear the cache of operation key references. If I is set to 1 then +then I's lock will be obtained while doing the clear. Otherwise it will be +assumed that the lock has already been obtained or is not required. + +evp_keymgmt_util_cache_keydata() can be used to add a provider key +object to a B. + +evp_keymgmt_util_cache_keyinfo() can be used to get all kinds of +information from the provvider "origin" and save it in I's +information cache. + +evp_keymgmt_util_fromdata() can be used to add key object data to a +given key I via a B interface. This is used as a +helper for L. + +In all functions that take a I argument, the selection is used to +constraint the information requested on export. It is also used in the cache +so that key data is guaranteed to contain all the information requested in +the selection. + +=head1 RETURN VALUES + +evp_keymgmt_export_to_provider() and evp_keymgmt_util_fromdata() +return a pointer to the appropriate provider side key (created or +found again), or NULL on error. + +evp_keymgmt_util_find_operation_cache() returns a pointer to the +operation cache slot. If I is NULL, or if there is no slot +with a match for I, NULL is returned. + +evp_keymgmt_util_cache_keydata() and evp_keymgmt_util_clear_operation_cache() +return 1 on success or 0 otherwise. + +=head1 NOTES + +"Legacy key" is the term used for any key that has been assigned to an +B with EVP_PKEY_assign_RSA() and similar functions. + +=head1 SEE ALSO + +L, L + +=head1 COPYRIGHT + +Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved. + +Licensed under the Apache License 2.0 (the "License"). You may not use +this file except in compliance with the License. You can obtain a copy +in the file LICENSE in the source distribution or at +L. + +=cut diff --git a/deps/openssl/openssl/doc/internal/man3/evp_md_get_number.pod b/deps/openssl/openssl/doc/internal/man3/evp_md_get_number.pod new file mode 100644 index 000000000..1f913551a --- /dev/null +++ b/deps/openssl/openssl/doc/internal/man3/evp_md_get_number.pod @@ -0,0 +1,112 @@ +=pod + +=head1 NAME + +ossl_decoder_get_number, evp_md_get_number, evp_cipher_get_number, +evp_mac_get_number, evp_rand_get_number, evp_keymgmt_get_number, +evp_signature_get_number, evp_asym_cipher_get_number, evp_kem_get_number, +evp_keyexch_get_number, evp_kdf_get_number, ossl_encoder_get_number, +ossl_store_loader_get_number - EVP get internal identification numbers + +=head1 SYNOPSIS + + #include "crypto/evp.h" + + int evp_asym_cipher_get_number(const EVP_ASYM_CIPHER *cipher); + int evp_cipher_get_number(const EVP_CIPHER *e); + int evp_kdf_get_number(const EVP_KDF *kdf); + int evp_kem_get_number(const EVP_KEM *kem); + int evp_keyexch_get_number(const EVP_KEYEXCH *exchange); + int evp_keymgmt_get_number(const EVP_KEYMGMT *keymgmt); + int evp_mac_get_number(const EVP_MAC *mac); + int evp_md_get_number(const EVP_MD *md); + int evp_rand_get_number(const EVP_RAND *rand); + int evp_signature_get_number(const EVP_SIGNATURE *signature); + int ossl_decoder_get_number(const OSSL_DECODER *decoder); + int ossl_encoder_get_number(const OSSL_ENCODER *encoder); + int ossl_store_loader_get_number(const OSSL_STORE_LOADER *loader); + +=head1 DESCRIPTION + +All provided algorithms get an associated integer identification number. +This number is dynamic and should be expected to vary from run to run. +These numbers should only be considered to be unique per provider per +library context. + +=over 4 + +=item evp_asym_cipher_get_number() + +Returns the internal dynamic number assigned to I. + +=item evp_cipher_get_number() + +Returns the internal dynamic number assigned to the I. This is only +useful with fetched Bs. + +=item evp_kdf_get_number() + +Keturns the internal dynamic number assigned to I. + +=item evp_kem_get_number() + +Returns the internal dynamic number assigned to I. + +=item evp_keyexch_get_number() + +Returns the internal dynamic number assigned to the I. + +=item evp_keymgmt_get_number() + +Returns the internal dynamic number assigned to the I. + +=item evp_mac_get_number() + +Returns the internal dynamic number assigned to I. + +=item evp_md_get_number() + +Returns the internal dynamic number assigned to the I. This is +only useful with fetched Bs. + +=item evp_rand_get_number() + +Returns the internal dynamic number assigned to I. + +=item evp_signature_get_number() + +Returns the internal dynamic number assigned to I. + +=item ossl_decoder_get_number() + +Returns the internal dynamic number assigned to the given I. + +=item ossl_encoder_get_number() + +Returns the internal dynamic number assigned to the given I. + +=item ossl_store_loader_get_number() + +Returns the internal dynamic number assigned to the given I. + +=back + +=head1 RETURN VALUES + +All of these functions return the provider specific identification number +for the specified algorithm. + +=head1 HISTORY + +This functionality was added to OpenSSL 3.0. + +=head1 COPYRIGHT + +Copyright 2021 The OpenSSL Project Authors. All Rights Reserved. + +Licensed under the Apache License 2.0 (the "License"). You may not use +this file except in compliance with the License. You can obtain a copy +in the file LICENSE in the source distribution or at +L. + +=cut diff --git a/deps/openssl/openssl/doc/internal/man3/evp_pkey_export_to_provider.pod b/deps/openssl/openssl/doc/internal/man3/evp_pkey_export_to_provider.pod new file mode 100644 index 000000000..44efbbe26 --- /dev/null +++ b/deps/openssl/openssl/doc/internal/man3/evp_pkey_export_to_provider.pod @@ -0,0 +1,80 @@ +=pod + +=head1 NAME + +evp_pkey_export_to_provider, evp_pkey_copy_downgraded, evp_pkey_get_legacy +- internal EVP_PKEY support functions for providers + +=head1 SYNOPSIS + + /* Only for EVP source */ + #include "evp_local.h" + + void *evp_pkey_export_to_provider(EVP_PKEY *pk, OSSL_LIB_CTX *libctx, + EVP_KEYMGMT **keymgmt, + const char *propquery); + int evp_pkey_copy_downgraded(EVP_PKEY **dest, const EVP_PKEY *src); + void *evp_pkey_get_legacy(EVP_PKEY *pk); + +=head1 DESCRIPTION + +This manual uses the term "origin", which is explained in internal +L. + +evp_pkey_export_to_provider() exports the "origin" key contained in I +to its operation cache to make it suitable for an B given either +with I<*keymgmt> or with an implicit fetch using I (NULL means the +default context), the name of the legacy type of I, and the I +(NULL means the default property query settings). + +If I isn't NULL but I<*keymgmt> is, and the "origin" was successfully +exported, then I<*keymgmt> is assigned the implicitly fetched B. + +evp_pkey_copy_downgraded() makes a copy of I in legacy form into I<*dest>, +if there's a corresponding legacy implementation. This should be used if the +use of a downgraded key is temporary. +For example, L uses this to try its +best to get "traditional" PEM output even if the input B has a +provider-native internal key. + +evp_pkey_get_legacy() obtains and returns a legacy key structure. If the +EVP_PKEY already contains a legacy key then it is simply returned. If it is a +provider based key, then a new legacy key is constructed based on the provider +key. The legacy key is cached inside the EVP_PKEY and its value returned from +this function. Subsequent calls to evp_pkey_get_legacy() will return the cached +key. Subsequent changes to the provider key are not reflected back in the +legacy key. Similarly changes to the legacy key are not reflected back in the +provider key. + +=head1 RETURN VALUES + +evp_pkey_export_to_provider() returns the provider key data if there was any +allocated. It also either sets I<*keymgmt> to the B associated +with the returned key data, or NULL on error. + +evp_pkey_get_legacy() returns the legacy key or NULL on error. + +=head1 NOTES + +Some functions calling evp_pkey_export_to_provider() may have received a const +key, and may therefore have to cast the key to non-const form to call this +function. Since B is always dynamically allocated, this is OK. + +=head1 SEE ALSO + +L, L + +=head1 HISTORY + +The functions described here were all added in OpenSSL 3.0. + +=head1 COPYRIGHT + +Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved. + +Licensed under the Apache License 2.0 (the "License"). You may not use +this file except in compliance with the License. You can obtain a copy +in the file LICENSE in the source distribution or at +L. + +=cut diff --git a/deps/openssl/openssl/doc/internal/man3/evp_pkey_get1_ED25519.pod b/deps/openssl/openssl/doc/internal/man3/evp_pkey_get1_ED25519.pod new file mode 100644 index 000000000..37b41e459 --- /dev/null +++ b/deps/openssl/openssl/doc/internal/man3/evp_pkey_get1_ED25519.pod @@ -0,0 +1,43 @@ +=pod + +=head1 NAME + +evp_pkey_get1_ED25519, evp_pkey_get1_ED448, +evp_pkey_get1_X25519, evp_pkey_get1_X448 +- internal ECX from EVP_PKEY getter functions + +=head1 SYNOPSIS + + #include "internal/evp.h" + + ECX_KEY *evp_pkey_get1_ED25519(EVP_PKEY *pkey); + ECX_KEY *evp_pkey_get1_ED448(EVP_PKEY *pkey); + ECX_KEY *evp_pkey_get1_X25519(EVP_PKEY *pkey); + ECX_KEY *evp_pkey_get1_X448(EVP_PKEY *pkey); + +=head1 DESCRIPTION + +evp_pkey_get1_ED25519(), evp_pkey_get1_ED448(), evp_pkey_get1_X25519() and +evp_pkey_get1_X448() return the referenced key in I or NULL if the key +is not of the correct type. The returned key must be freed after use. + +=head1 RETURN VALUES + +evp_pkey_get1_ED25519(), evp_pkey_get1_ED448(), evp_pkey_get1_X25519() and +evp_pkey_get1_X448() return the referenced key or NULL if an error +occurred. + +=head1 HISTORY + +This functionality was added to OpenSSL 3.0. + +=head1 COPYRIGHT + +Copyright 2020 The OpenSSL Project Authors. All Rights Reserved. + +Licensed under the Apache License 2.0 (the "License"). You may not use this +file except in compliance with the License. You can obtain a copy in the file +LICENSE in the source distribution or at +L. + +=cut diff --git a/deps/openssl/openssl/doc/internal/man3/ossl_DER_w_begin_sequence.pod b/deps/openssl/openssl/doc/internal/man3/ossl_DER_w_begin_sequence.pod new file mode 100644 index 000000000..b78056f6e --- /dev/null +++ b/deps/openssl/openssl/doc/internal/man3/ossl_DER_w_begin_sequence.pod @@ -0,0 +1,48 @@ +=pod + +=head1 NAME + +ossl_DER_w_begin_sequence, ossl_DER_w_end_sequence +- internal DER writers for DER constructed elements + +=head1 SYNOPSIS + + #include "internal/der.h" + + int ossl_DER_w_begin_sequence(WPACKET *pkt, int tag); + int ossl_DER_w_end_sequence(WPACKET *pkt, int tag); + +=head1 DESCRIPTION + +All functions described here are wrappers for constructed structures, +i.e. the ASN.1 SEQUENCE, SET and CHOICE specifications. They all come +in pairs, as noted by the function names containing the words C +and B. + +When using these, special care must be taken to ensure that the ASN.1 tag +value I is the same in the matching C and C function calls. + +ossl_DER_w_begin_sequence() and ossl_DER_w_end_sequence() begins and ends a +SEQUENCE. + +=head1 RETURN VALUES + +All the functions return 1 on success and 0 on failure. Failure may +mean that the buffer held by the I is too small, but may also +mean that the values given to the functions are invalid, such as the provided +I value being too large for the implementation. + +=head1 SEE ALSO + +L + +=head1 COPYRIGHT + +Copyright 2020 The OpenSSL Project Authors. All Rights Reserved. + +Licensed under the Apache License 2.0 (the "License"). You may not use +this file except in compliance with the License. You can obtain a copy +in the file LICENSE in the source distribution or at +L. + +=cut diff --git a/deps/openssl/openssl/doc/internal/man3/ossl_DER_w_bn.pod b/deps/openssl/openssl/doc/internal/man3/ossl_DER_w_bn.pod new file mode 100644 index 000000000..49644ffd0 --- /dev/null +++ b/deps/openssl/openssl/doc/internal/man3/ossl_DER_w_bn.pod @@ -0,0 +1,66 @@ +=pod + +=head1 NAME + +ossl_DER_w_boolean, ossl_DER_w_uint32, ossl_DER_w_bn, ossl_DER_w_null, +ossl_DER_w_octet_string, ossl_DER_w_octet_string_uint32 +- internal DER writers for DER primitives + +=head1 SYNOPSIS + + #include "internal/der.h" + + int ossl_DER_w_boolean(WPACKET *pkt, int tag, int b); + int ossl_DER_w_uint32(WPACKET *pkt, int tag, uint32_t v); + int ossl_DER_w_bn(WPACKET *pkt, int tag, const BIGNUM *v); + int ossl_DER_w_null(WPACKET *pkt, int tag); + int ossl_DER_w_octet_string(WPACKET *pkt, int tag, + const unsigned char *data, size_t data_n); + int ossl_DER_w_octet_string_uint32(WPACKET *pkt, int tag, uint32_t value); + +=head1 DESCRIPTION + +All functions described here behave the same way, they prepend +(remember that DER writers are used backwards) the DER encoding of +their respective value to the already written output buffer held by +I. + +ossl_DER_w_boolean() writes the primitive BOOLEAN using the value I. +Any value that evaluates as true will render a B BOOLEAN, +otherwise a B BOOLEAN. + +ossl_DER_w_uint32() and ossl_DER_w_bn() both write the primitive INTEGER using +the value I. + +=for comment Other similar functions for diverse C integers should be +added. + +ossl_DER_w_null() writes the primitive NULL. + +ossl_DER_w_octet_string() writes the primitive OCTET STRING using the bytes +from I with a length of I. + +ossl_DER_w_octet_string_uint32() writes the primitive OCTET STRING using a +32 bit value in I. + +=head1 RETURN VALUES + +All the functions return 1 on success and 0 on failure. Failure may +mean that the buffer held by the I is too small, but may also +mean that the values given to the functions are invalid, such as the provided +I value being too large for the implementation. + +=head1 SEE ALSO + +L + +=head1 COPYRIGHT + +Copyright 2020-2022 The OpenSSL Project Authors. All Rights Reserved. + +Licensed under the Apache License 2.0 (the "License"). You may not use +this file except in compliance with the License. You can obtain a copy +in the file LICENSE in the source distribution or at +L. + +=cut diff --git a/deps/openssl/openssl/doc/internal/man3/ossl_DER_w_precompiled.pod b/deps/openssl/openssl/doc/internal/man3/ossl_DER_w_precompiled.pod new file mode 100644 index 000000000..aa7fa3930 --- /dev/null +++ b/deps/openssl/openssl/doc/internal/man3/ossl_DER_w_precompiled.pod @@ -0,0 +1,48 @@ +=pod + +=head1 NAME + +ossl_DER_w_precompiled +- internal DER writers for precompiled DER blobs + +=head1 SYNOPSIS + + #include "internal/der.h" + + int ossl_DER_w_precompiled(WPACKET *pkt, int tag, + const unsigned char *precompiled, + size_t precompiled_n); + +=head1 DESCRIPTION + +There may be already existing DER blobs that can simply be copied to +the buffer held by I. For example, precompiled values, such as +OIDs (for example, C) or complete AlgorithmIdentifiers +(for example, C). To add those as an element in a +structure being DER encoded, use ossl_DER_w_precompiled(). + +ossl_DER_w_precompiled() will simply take the DER encoded blob given as +I with length I and add it to the buffer +held by I. + +=head1 RETURN VALUES + +ossl_DER_w_precompiled() returns 1 on success and 0 on failure. Failure +may mean that the buffer held by the I is too small, but may also +mean that the values given to the functions are invalid, such as the provided +I value being too large for the implementation. + +=head1 SEE ALSO + +L + +=head1 COPYRIGHT + +Copyright 2020 The OpenSSL Project Authors. All Rights Reserved. + +Licensed under the Apache License 2.0 (the "License"). You may not use +this file except in compliance with the License. You can obtain a copy +in the file LICENSE in the source distribution or at +L. + +=cut diff --git a/deps/openssl/openssl/doc/internal/man3/ossl_algorithm_do_all.pod b/deps/openssl/openssl/doc/internal/man3/ossl_algorithm_do_all.pod new file mode 100644 index 000000000..7a321d492 --- /dev/null +++ b/deps/openssl/openssl/doc/internal/man3/ossl_algorithm_do_all.pod @@ -0,0 +1,63 @@ +=pod + +=head1 NAME + +ossl_algorithm_do_all - generic algorithm implementation iterator + +=head1 SYNOPSIS + + void ossl_algorithm_do_all(OSSL_LIB_CTX *libctx, int operation_id, + OSSL_PROVIDER *provider, + void (*fn)(OSSL_PROVIDER *provider, + const OSSL_ALGORITHM *algo, + int no_store, void *data), + void *data); + +=head1 DESCRIPTION + +ossl_algorithm_do_all() looks up every algorithm it can find, given a +library context I, an operation identity I and a +provider I. +I may be NULL to signify that the default library context should +be used. +I may be zero to signify that all kinds of operations +will be looked up. +I may be NULL to signify that all loaded providers will be +queried. + +For each implementation found, the function I is called with the +I for the implementation, the algorithm descriptor I, +the flag I indicating whether the algorithm descriptor may +be remembered or not, and the caller I that was passed to +ossl_algorithm_do_all(). + +=head1 RETURN VALUES + +ossl_algorithm_do_all() doesn't return any value. + +=head1 NOTES + +The function described here are mainly useful for discovery, and +possibly display of what has been discovered, for example an +application that wants to display the loaded providers and what they +may offer, but also for constructors, such as +L. + +=head1 SEE ALSO + +L, L + +=head1 HISTORY + +This functionality was added to OpenSSL 3.0. + +=head1 COPYRIGHT + +Copyright 2019-2020 The OpenSSL Project Authors. All Rights Reserved. + +Licensed under the Apache License 2.0 (the "License"). You may not use this +file except in compliance with the License. You can obtain a copy in the file +LICENSE in the source distribution or at +L. + +=cut diff --git a/deps/openssl/openssl/doc/internal/man3/ossl_cmp_X509_STORE_add1_certs.pod b/deps/openssl/openssl/doc/internal/man3/ossl_cmp_X509_STORE_add1_certs.pod new file mode 100644 index 000000000..97304ee40 --- /dev/null +++ b/deps/openssl/openssl/doc/internal/man3/ossl_cmp_X509_STORE_add1_certs.pod @@ -0,0 +1,44 @@ +=pod + +=head1 NAME + +ossl_cmp_X509_STORE_add1_certs, +ossl_cmp_X509_STORE_get1_certs +- functions manipulating stores of certificates + +=head1 SYNOPSIS + + #include + + int ossl_cmp_X509_STORE_add1_certs(X509_STORE *store, STACK_OF(X509) *certs, + int only_self_signed); + STACK_OF(X509) *ossl_cmp_X509_STORE_get1_certs(X509_STORE *store); + +=head1 DESCRIPTION + +ossl_cmp_X509_STORE_add1_certs() adds all or only self-signed certificates from +the given stack to given store. The I parameter may be NULL. + +ossl_cmp_X509_STORE_get1_certs() retrieves a copy of all certificates in the +given store. + +=head1 RETURN VALUES + +ossl_cmp_X509_STORE_add1_certs() returns 1 on success, 0 on error. + +ossl_cmp_X509_STORE_get1_certs() returns a list of certificates, NULL on error. + +=head1 HISTORY + +The OpenSSL CMP support was added in OpenSSL 3.0. + +=head1 COPYRIGHT + +Copyright 2007-2020 The OpenSSL Project Authors. All Rights Reserved. + +Licensed under the Apache License 2.0 (the "License"). You may not use +this file except in compliance with the License. You can obtain a copy +in the file LICENSE in the source distribution or at +L. + +=cut diff --git a/deps/openssl/openssl/doc/internal/man3/ossl_cmp_asn1_octet_string_set1.pod b/deps/openssl/openssl/doc/internal/man3/ossl_cmp_asn1_octet_string_set1.pod new file mode 100644 index 000000000..a154cda1c --- /dev/null +++ b/deps/openssl/openssl/doc/internal/man3/ossl_cmp_asn1_octet_string_set1.pod @@ -0,0 +1,45 @@ +=pod + +=head1 NAME + +ossl_cmp_asn1_octet_string_set1, +ossl_cmp_asn1_octet_string_set1_bytes +- ASN.1 octet string utility functions + +=head1 SYNOPSIS + + #include "cmp_local.h" + + int ossl_cmp_asn1_octet_string_set1(ASN1_OCTET_STRING **tgt, + const ASN1_OCTET_STRING *src); + int ossl_cmp_asn1_octet_string_set1_bytes(ASN1_OCTET_STRING **tgt, + const unsigned char *bytes, int len); + +=head1 DESCRIPTION + +ossl_cmp_asn1_octet_string_set1() frees any previous value of the variable +referenced via the I argument and assigns either a copy of +the ASN1_OCTET_STRING given as the I argument or NULL. + +ossl_cmp_asn1_octet_string_set1_bytes() frees any previous value of the variable +referenced via the I argument and assigns either a copy of the given byte +string (with the given length) or NULL. + +=head1 RETURN VALUES + +All functions return 1 on success, 0 on error. + +=head1 HISTORY + +The OpenSSL CMP support was added in OpenSSL 3.0. + +=head1 COPYRIGHT + +Copyright 2007-2020 The OpenSSL Project Authors. All Rights Reserved. + +Licensed under the Apache License 2.0 (the "License"). You may not use +this file except in compliance with the License. You can obtain a copy +in the file LICENSE in the source distribution or at +L. + +=cut diff --git a/deps/openssl/openssl/doc/internal/man3/ossl_cmp_certreq_new.pod b/deps/openssl/openssl/doc/internal/man3/ossl_cmp_certreq_new.pod new file mode 100644 index 000000000..37a234066 --- /dev/null +++ b/deps/openssl/openssl/doc/internal/man3/ossl_cmp_certreq_new.pod @@ -0,0 +1,178 @@ +=pod + +=head1 NAME + +ossl_cmp_certreq_new, +ossl_cmp_certrep_new, +ossl_cmp_rr_new, +ossl_cmp_rp_new, +ossl_cmp_certConf_new, +ossl_cmp_pkiconf_new, +ossl_cmp_pollReq_new, +ossl_cmp_pollRep_new, +ossl_cmp_genm_new, +ossl_cmp_genp_new, +ossl_cmp_error_new +- functions for generating CMP messages + +=head1 SYNOPSIS + + #include "cmp_local.h" + + OSSL_ossl_cmp_MSG *ossl_cmp_certreq_new(OSSL_CMP_CTX *ctx, int bodytype, + const OSSL_CRMF_MSG *crm); + OSSL_CMP_MSG *ossl_cmp_certrep_new(OSSL_CMP_CTX *ctx, int bodytype, + int certReqId, const OSSL_CMP_PKISI *si, + X509 *cert, const X509 *encryption_recip, + STACK_OF(X509) *chain, STACK_OF(X509) *caPubs, + int unprotectedErrors); + OSSL_CMP_MSG *ossl_cmp_rr_new(OSSL_CMP_CTX *ctx); + OSSL_CMP_MSG *ossl_cmp_rp_new(OSSL_CMP_CTX *ctx, const OSSL_CMP_PKISI *si, + const OSSL_CRMF_CERTID *cid, + int unprotectedErrors); + OSSL_CMP_MSG *ossl_cmp_certConf_new(OSSL_CMP_CTX *ctx, int certReqId, + int fail_info, const char *text); + OSSL_CMP_MSG *ossl_cmp_pkiconf_new(OSSL_CMP_CTX *ctx); + OSSL_CMP_MSG *ossl_cmp_pollReq_new(OSSL_CMP_CTX *ctx, int crid); + OSSL_CMP_MSG *ossl_cmp_pollRep_new(OSSL_CMP_CTX *ctx, int crid, int poll_after); + OSSL_CMP_MSG *ossl_cmp_genm_new(OSSL_CMP_CTX *ctx); + OSSL_CMP_MSG *ossl_cmp_genp_new(OSSL_CMP_CTX *ctx); + OSSL_CMP_MSG *ossl_cmp_error_new(OSSL_CMP_CTX *ctx, const OSSL_CMP_PKISI *si, + int64_t errorCode, const char *details, + int unprotected); + +=head1 DESCRIPTION + +This is the internal API for creating various CMP PKIMESSAGES. +All functions are based on L. +The allocate a new message, fill it with the relevant data derived from +the given B, and create the applicable protection. + +ossl_cmp_certreq_new() creates a PKIMessage for requesting a certificate, +which can be either of IR/CR/KUR/P10CR, depending on the given I. +The CRMF message to use may be given explicitly via a non-NULL I argument, +otherwise it is created from the information in the I. + +Available CMP certificate request PKIMessage Is are: + +=over 4 + +=item * B - Initialization Request + +=item * B - Certification Request + +=item * B - PKCS#10 Certification Request + +=item * B - Key Update Request + +=back + +ossl_cmp_certrep_new() creates a PKIMessage for certificate response, +which can be either of IP/CP/KUP, depending on the given I, +with the given I and I values and optionally with I, +I, and I. The I, I, and I arguments +are not consumed if present but their internal reference counter is increased. +The I is currently unsupported. +The function does not protect the message if the B value in I +is B and I is nonzero. + +Available CMP certificate response PKIMessage Is are: + +=over 4 + +=item * B - Initialization Response + +=item * B - Certification Response + +=item * B - Key Update Response + +=back + +The list of all CMP PKIMessage Is is: + + #define OSSL_CMP_PKIBODY_IR 0 + #define OSSL_CMP_PKIBODY_IP 1 + #define OSSL_CMP_PKIBODY_CR 2 + #define OSSL_CMP_PKIBODY_CP 3 + #define OSSL_CMP_PKIBODY_P10CR 4 + #define OSSL_CMP_PKIBODY_POPDECC 5 + #define OSSL_CMP_PKIBODY_POPDECR 6 + #define OSSL_CMP_PKIBODY_KRR 9 + #define OSSL_CMP_PKIBODY_KRP 10 + #define OSSL_CMP_PKIBODY_RR 11 + #define OSSL_CMP_PKIBODY_RP 12 + #define OSSL_CMP_PKIBODY_CCR 13 + #define OSSL_CMP_PKIBODY_CCP 14 + #define OSSL_CMP_PKIBODY_CKUANN 15 + #define OSSL_CMP_PKIBODY_CANN 16 + #define OSSL_CMP_PKIBODY_RANN 17 + #define OSSL_CMP_PKIBODY_CRLANN 18 + #define OSSL_CMP_PKIBODY_PKICONF 19 + #define OSSL_CMP_PKIBODY_NESTED 20 + #define OSSL_CMP_PKIBODY_GENM 21 + #define OSSL_CMP_PKIBODY_GENP 22 + #define OSSL_CMP_PKIBODY_ERROR 23 + #define OSSL_CMP_PKIBODY_CERTCONF 24 + #define OSSL_CMP_PKIBODY_POLLREQ 25 + #define OSSL_CMP_PKIBODY_POLLREP 26 + +ossl_cmp_rr_new() creates a Revocation Request message from the +information set via OSSL_CMP_CTX_set1_oldClCert(). + +ossl_cmp_rp_new() creates a Revocation Response message with I and I. +It does not protect the message if the B value in I is B +and I is nonzero. + +ossl_cmp_certConf_new() creates a Certificate Confirmation message for the last +received certificate with the given I. +The PKIStatus defaults to B if the I bit field is 0. +Otherwise it is taken as the failInfo of the PKIStatusInfo, PKIStatus is +set to B, and I is copied to statusString unless it is NULL. + +ossl_cmp_pkiconf_new() creates a PKI Confirmation message. + +ossl_cmp_pollReq_new() creates a Polling Request message with certReqId set to +I. + +ossl_cmp_pollRep_new() creates a Polling Response message with certReqId set to +I and pollAfter to I. + +ossl_cmp_genm_new() creates a new General Message with an empty ITAV stack. + +ossl_cmp_genp_new() creates a new General Response with an empty ITAV stack. + +ossl_cmp_error_new() creates a new Error Message with the given contents +I, I, and optional I
. +If I is positive and in the range of an OpenSSL error code, +the library and reason strings are included in the B field. +If given, the I
are added to the contents of the B field. +The function does not protect the message if I is nonzero. + +=head1 NOTES + +CMP is specified in RFC 4210 (and CRMF in RFC 4211). + +=head1 RETURN VALUES + +All of the functions return a new OSSL_CMP_MSG structure containing +the generated message on success, or NULL on error. + +=head1 SEE ALSO + +L, +L, L + +=head1 HISTORY + +The OpenSSL CMP support was added in OpenSSL 3.0. + +=head1 COPYRIGHT + +Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved. + +Licensed under the Apache License 2.0 (the "License"). You may not use +this file except in compliance with the License. You can obtain a copy +in the file LICENSE in the source distribution or at +L. + +=cut diff --git a/deps/openssl/openssl/doc/internal/man3/ossl_cmp_ctx_set1_caPubs.pod b/deps/openssl/openssl/doc/internal/man3/ossl_cmp_ctx_set1_caPubs.pod new file mode 100644 index 000000000..f3c45ed56 --- /dev/null +++ b/deps/openssl/openssl/doc/internal/man3/ossl_cmp_ctx_set1_caPubs.pod @@ -0,0 +1,76 @@ +=pod + +=head1 NAME + +ossl_cmp_ctx_set1_caPubs, +ossl_cmp_ctx_set0_validatedSrvCert, +ossl_cmp_ctx_set_status, +ossl_cmp_ctx_set0_statusString, +ossl_cmp_ctx_set_failInfoCode, +ossl_cmp_ctx_set0_newCert, +ossl_cmp_ctx_set1_extraCertsIn, +ossl_cmp_ctx_set1_recipNonce +- internal functions for managing the CMP client context datastructure + +=head1 SYNOPSIS + + #include + + int ossl_cmp_ctx_set1_caPubs(OSSL_CMP_CTX *ctx, STACK_OF(X509) *caPubs); + int ossl_cmp_ctx_set0_validatedSrvCert(OSSL_CMP_CTX *ctx, X509 *cert); + int ossl_cmp_ctx_set_status(OSSL_CMP_CTX *ctx, int status); + int ossl_cmp_ctx_set0_statusString(OSSL_CMP_CTX *ctx, + OSSL_CMP_PKIFREETEXT *text); + int ossl_cmp_ctx_set_failInfoCode(OSSL_CMP_CTX *ctx, int fail_info); + int ossl_cmp_ctx_set0_newCert(OSSL_CMP_CTX *ctx, X509 *cert); + int ossl_cmp_ctx_set1_extraCertsIn(OSSL_CMP_CTX *ctx, + STACK_OF(X509) *extraCertsIn); + int ossl_cmp_ctx_set1_recipNonce(OSSL_CMP_CTX *ctx, + const ASN1_OCTET_STRING *nonce); + +=head1 DESCRIPTION + +ossl_cmp_ctx_set1_caPubs() copies the given stack of CA certificates +to the caPubs field of the context. +The reference counts of those certificates handled successfully are increased. + +ossl_cmp_ctx_set0_validatedSrvCert() sets the validatedSrvCert of the context, +which caches any already validated server cert, or NULL if not available. + +ossl_cmp_ctx_set_status() sets the status field of the context. + +ossl_cmp_ctx_set0_statusString() sets the statusString field of the context. + +ossl_cmp_ctx_set_failInfoCode() sets the error code bits in the failInfoCode +field of the context based on the given OSSL_CMP_PKIFAILUREINFO structure. + +ossl_cmp_ctx_set0_newCert() sets the given (newly enrolled) certificate +in the context. + +ossl_cmp_ctx_set1_extraCertsIn() sets the extraCertsIn field of the context. +The reference counts of those certificates handled successfully are increased. + +ossl_cmp_ctx_set1_recipNonce() sets the given recipient nonce in the context. + +=head1 NOTES + +CMP is defined in RFC 4210 (and CRMF in RFC 4211). + +=head1 RETURN VALUES + +All functions return 1 on success, 0 on error. + +=head1 HISTORY + +The OpenSSL CMP support was added in OpenSSL 3.0. + +=head1 COPYRIGHT + +Copyright 2007-2018 The OpenSSL Project Authors. All Rights Reserved. + +Licensed under the Apache License 2.0 (the "License"). You may not use +this file except in compliance with the License. You can obtain a copy +in the file LICENSE in the source distribution or at +L. + +=cut diff --git a/deps/openssl/openssl/doc/internal/man3/ossl_cmp_hdr_init.pod b/deps/openssl/openssl/doc/internal/man3/ossl_cmp_hdr_init.pod new file mode 100644 index 000000000..a0804aa4c --- /dev/null +++ b/deps/openssl/openssl/doc/internal/man3/ossl_cmp_hdr_init.pod @@ -0,0 +1,151 @@ +=pod + +=head1 NAME + +ossl_cmp_hdr_set_pvno, +ossl_cmp_hdr_get_pvno, +ossl_cmp_hdr_get_protection_nid, +ossl_cmp_hdr_get0_sendernonce, +ossl_cmp_general_name_is_NULL_DN, +ossl_cmp_hdr_set1_sender, +ossl_cmp_hdr_set1_recipient, +ossl_cmp_hdr_update_messagetime, +ossl_cmp_hdr_set1_senderKID, +ossl_cmp_hdr_push0_freeText, +ossl_cmp_hdr_push1_freeText, +ossl_cmp_hdr_generalinfo_item_push0, +ossl_cmp_hdr_generalinfo_items_push1, +ossl_cmp_hdr_set_implicitConfirm, +ossl_cmp_hdr_has_implicitConfirm, +ossl_cmp_hdr_set_transactionID, +ossl_cmp_hdr_init +- functions handling CMP message headers + +=head1 SYNOPSIS + + #include "cmp_local.h" + + int ossl_cmp_hdr_set_pvno(OSSL_CMP_PKIHEADER *hdr, int pvno); + int ossl_cmp_hdr_get_pvno(const OSSL_CMP_PKIHEADER *hdr); + int ossl_cmp_hdr_get_protection_nid(const OSSL_CMP_PKIHEADER *hdr); + ASN1_OCTET_STRING + *ossl_cmp_hdr_get0_sendernonce(const OSSL_CMP_PKIHEADER *hdr); + int ossl_cmp_general_name_is_NULL_DN(GENERAL_NAME *name); + + int ossl_cmp_hdr_set1_sender(OSSL_CMP_PKIHEADER *hdr, const X509_NAME *nm); + int ossl_cmp_hdr_set1_recipient(OSSL_CMP_PKIHEADER *hdr, const X509_NAME *nm); + int ossl_cmp_hdr_update_messagetime(OSSL_CMP_PKIHEADER *hdr); + int ossl_cmp_hdr_set1_senderKID(OSSL_CMP_PKIHEADER *hdr, + const ASN1_OCTET_STRING *senderKID); + int ossl_cmp_hdr_generalinfo_item_push0(OSSL_CMP_PKIHEADER *hdr, + OSSL_CMP_ITAV *itav); + int ossl_cmp_hdr_generalinfo_items_push1(OSSL_CMP_PKIHEADER *hdr, + STACK_OF(OSSL_CMP_ITAV) *itavs); + int ossl_cmp_hdr_push0_freeText(OSSL_CMP_PKIHEADER *hdr, + ASN1_UTF8STRING *text); + int ossl_cmp_hdr_push1_freeText(OSSL_CMP_PKIHEADER *hdr, + ASN1_UTF8STRING *text); + int ossl_cmp_hdr_set_implicitConfirm(OSSL_CMP_PKIHEADER *hdr); + int ossl_cmp_hdr_has_implicitConfirm(OSSL_CMP_PKIHEADER *hdr); + int ossl_cmp_hdr_set_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_PKIHEADER *hdr); + int ossl_cmp_hdr_init(OSSL_CMP_CTX *ctx, OSSL_CMP_PKIHEADER *hdr); + +=head1 DESCRIPTION + +ossl_cmp_hdr_set_pvno() sets hdr->pvno to the given B. + +ossl_cmp_hdr_get_pvno() returns the pvno of the given B or -1 on error. + +ossl_cmp_hdr_get_protection_nid returns the NID of the protection algorithm +in B or NID_undef on error. + +ossl_cmp_hdr_get0_sendernonce() returns the sender nonce of the given PKIHeader. + +ossl_cmp_general_name_is_NULL_DN() determines if the given GENERAL_NAME +is the NULL-DN. + +ossl_cmp_hdr_set1_sender() sets the sender field in the given PKIHeader +to the given X509 Name value, without consuming the pointer. + +ossl_cmp_hdr_set1_recipient() sets the recipient field in the given +PKIHeader to the given X509 Name value, without consuming the pointer. +If B is NULL, recipient is set to the NULL DN (the empty list of strings). + +ossl_cmp_hdr_update_messagetime() (re-)sets the messageTime to the current +system time. As written in RFC 4210, section 5.1.1: +The messageTime field contains the time at which the sender created the message. +This may be useful to allow end entities to correct/check their local time for +consistency with the time on a central system. + +ossl_cmp_hdr_set1_senderKID() Sets hdr->senderKID to the given string. +In an PBMAC-protected IR this usually is a reference number issued by the CA, +else the subject key ID of the sender's protecting certificate. + +ossl_cmp_hdr_push0_freeText() pushes an ASN1_UTF8STRING to +hdr->freeText and consumes the given pointer. + +ossl_cmp_hdr_push1_freeText() pushes an ASN1_UTF8STRING to +hdr->freeText and does not consume the pointer. + +ossl_cmp_hdr_generalinfo_item_push0() adds the given InfoTypeAndValue +item to the hdr->generalInfo stack. Consumes the B pointer. + +ossl_cmp_hdr_generalinfo_items_push1() adds a copy of the B stack to +the generalInfo field of PKIheader of the B. Does not consume the B +pointer. + +ossl_cmp_hdr_set_implicitConfirm() sets implicitConfirm in the generalInfo field +of the PKIMessage header. + +ossl_cmp_hdr_has_implicitConfirm() returns 1 if implicitConfirm is +set int generalInfo field of the given PKIMessage header, 0 if not. + +ossl_cmp_hdr_set_transactionID() sets the B field in C. +In case ctx->transactionID is NULL, it starts a new transaction +by creating and storing a new random valuee with 128 bits length. + +ossl_cmp_hdr_init() initializes a PKIHeader structure based on the +values in the given OSSL_CMP_CTX structure. +This starts a new transaction in case ctx->transactionID is NULL. +The sender name is copied from the subject of the client cert, if any, +or else from the subject name provided for certification requests. +As required by RFC 4210 section 5.1.1., if the sender name is not known +to the client it set to the NULL-DN. In this case for identification at least +the senderKID must be set, which we take from any referenceValue provided. + +=head1 NOTES + +CMP is defined in RFC 4210 (and CRMF in RFC 4211). + +=head1 RETURN VALUES + +ossl_cmp_hdr_get_pvno() returns the pvno of the given B or -1 on error. + +ossl_cmp_hdr_get_protection_nid returns the respective NID, NID_undef on error. + +ossl_cmp_hdr_get0_sendernonce() returns the respective nonce, or NULL. + +ossl_cmp_general_name_is_NULL_DN() returns 1 given a NULL-DN, else 0. + +All other functions return 1 on success, 0 on error. + +See the individual functions above. + +=head1 SEE ALSO + +L + +=head1 HISTORY + +The OpenSSL CMP support was added in OpenSSL 3.0. + +=head1 COPYRIGHT + +Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved. + +Licensed under the Apache License 2.0 (the "License"). You may not use +this file except in compliance with the License. You can obtain a copy +in the file LICENSE in the source distribution or at +L. + +=cut diff --git a/deps/openssl/openssl/doc/internal/man3/ossl_cmp_mock_srv_new.pod b/deps/openssl/openssl/doc/internal/man3/ossl_cmp_mock_srv_new.pod new file mode 100644 index 000000000..7bc449a84 --- /dev/null +++ b/deps/openssl/openssl/doc/internal/man3/ossl_cmp_mock_srv_new.pod @@ -0,0 +1,89 @@ +=pod + +=head1 NAME + +ossl_cmp_mock_srv_new, +ossl_cmp_mock_srv_free, +ossl_cmp_mock_srv_set1_certOut, +ossl_cmp_mock_srv_set1_chainOut, +ossl_cmp_mock_srv_set1_caPubsOut, +ossl_cmp_mock_srv_set_statusInfo, +ossl_cmp_mock_srv_set_sendError, +ossl_cmp_mock_srv_set_pollCount, +ossl_cmp_mock_srv_set_checkAfterTime +- functions used for testing with CMP mock server + +=head1 SYNOPSIS + + #include "apps/cmp_mock_srv.h" + + OSSL_CMP_SRV_CTX *ossl_cmp_mock_srv_new(OSSL_LIB_CTX *libctx, const char *propq); + void ossl_cmp_mock_srv_free(OSSL_CMP_SRV_CTX *srv_ctx); + + int ossl_cmp_mock_srv_set1_certOut(OSSL_CMP_SRV_CTX *srv_ctx, X509 *cert); + int ossl_cmp_mock_srv_set1_chainOut(OSSL_CMP_SRV_CTX *srv_ctx, + STACK_OF(X509) *chain); + int ossl_cmp_mock_srv_set1_caPubsOut(OSSL_CMP_SRV_CTX *srv_ctx, + STACK_OF(X509) *caPubs); + int ossl_cmp_mock_srv_set_statusInfo(OSSL_CMP_SRV_CTX *srv_ctx, int status, + int fail_info, const char *text); + int ossl_cmp_mock_srv_set_sendError(OSSL_CMP_SRV_CTX *srv_ctx, int bodytype); + int ossl_cmp_mock_srv_set_pollCount(OSSL_CMP_SRV_CTX *srv_ctx, int count); + int ossl_cmp_mock_srv_set_checkAfterTime(OSSL_CMP_SRV_CTX *srv_ctx, int sec); + +=head1 DESCRIPTION + +ossl_cmp_mock_srv_new() allocates the contexts for the CMP mock server +associated with the library context I and property query string +I, both of which may be NULL to select the defaults. + +ossl_cmp_mock_srv_free() deallocates the contexts for the CMP mock server. + +ossl_cmp_mock_srv_set1_certOut() sets the certificate to be returned in +cp/ip/kup. + +ossl_cmp_mock_srv_set1_chainOut() sets the certificate chain to be added to +the extraCerts in a cp/ip/kup. +It should be useful for the validation of the certificate given via +ossl_cmp_mock_srv_set1_certOut(). + +ossl_cmp_mock_srv_set1_caPubsOut() sets the caPubs to be returned in an ip. + +ossl_cmp_mock_srv_set_statusInfo() sets the status info to be returned. + +ossl_cmp_mock_srv_set_sendError() enables enforcement of error responses +for requests of the given I, or for all requests if I is 1. +A I of -1 can be used to disable this feature, which is the default. + +ossl_cmp_mock_srv_set_pollCount() sets the number of polls before cert response. + +ossl_cmp_mock_srv_set_checkAfterTime() sets the number of seconds +the client should wait for the next poll. + +=head1 NOTES + +CMP is defined in RFC 4210 (and CRMF in RFC 4211). + +=head1 RETURN VALUES + +ossl_cmp_mock_srv() returns a B structure on success, +NULL on error. + +ossl_cmp_mock_srv_free() does not return a value. + +All other functions return 1 on success, 0 on error. + +=head1 HISTORY + +The OpenSSL CMP support was added in OpenSSL 3.0. + +=head1 COPYRIGHT + +Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved. + +Licensed under the Apache License 2.0 (the "License"). You may not use +this file except in compliance with the License. You can obtain a copy +in the file LICENSE in the source distribution or at +L. + +=cut diff --git a/deps/openssl/openssl/doc/internal/man3/ossl_cmp_msg_check_update.pod b/deps/openssl/openssl/doc/internal/man3/ossl_cmp_msg_check_update.pod new file mode 100644 index 000000000..4e7a9224a --- /dev/null +++ b/deps/openssl/openssl/doc/internal/man3/ossl_cmp_msg_check_update.pod @@ -0,0 +1,95 @@ +=pod + +=head1 NAME + +ossl_cmp_allow_unprotected_cb_t, +ossl_cmp_msg_check_update +- generic checks on a received CMP message, updating the context + +=head1 SYNOPSIS + + #include "cmp_local.h" + + typedef int (*ossl_cmp_allow_unprotected_cb_t)(const OSSL_CMP_CTX *ctx, + const OSSL_CMP_MSG *msg, + int invalid_protection, int arg); + + int ossl_cmp_msg_check_update(OSSL_CMP_CTX *ctx, const OSSL_CMP_MSG *msg, + ossl_cmp_allow_unprotected_cb_t cb, int cb_arg); + +=head1 DESCRIPTION + +ossl_cmp_msg_check_update() does all generic checks on the given message B, +which may be a server response or a request by some client, +and updates the B accordingly. + +The B is checked for the following: + +=over 4 + +=item its sender is of appropriate type (currently only B) + and matches any expected sender or srvCert subject given in B, + +=item its protection is present and valid (or a callback function B +is present and indicates that a missing or invalid protection is acceptable), + +=item its CMP protocol version is acceptable, namely B, + +=item its body type is valid, + +=item its transaction ID matches any transaction ID given in B, and + +=item its recipNonce matches any senderNonce given in B. + +=back + +In case no protection is present and B is not NULL then this callback +function is called with its B parameter being 0, while in +case an invalid protection is present the B parameter is 1. +The callback is passed also the arguments B, B, and +(which typically contains the expected message type). +The callback should return 1 on acceptance, 0 on rejection, or -1 on error. +It should not put an error on the error stack since this could be misleading. + +ossl_cmp_msg_check_update() adds all extraCerts contained in the to +the list of untrusted certificates in B such that they are already usable +for OSSL_CMP_validate_msg(), which is called internally, and for future use. +Thus they are available also to the certificate confirmation callback, and the +peer does not need to send them again (at least not in the same transaction). +Note that it does not help validating the message before storing the extraCerts +because they are not part of the protected portion of the message anyway. +For efficiency, the extraCerts are prepended to the list so they get used first. + +If all checks pass then ossl_cmp_msg_check_update() +records in B the senderNonce of the received message as the new recipNonce +and learns the transaction ID if none is currently present in B. + +Moreover, according to RFC 4210 section 5.3.2, if the message protection is +PBM-based then any certificates in the caPubs field are added to the list of +trusted certificates (if set via L). +This way these certs are available for validating subsequent messages in the +same context and could apply to any Polling Response (pollRep), error, or PKI +Confirmation (PKIConf) messages following in the same or future transactions. + +=head1 RETURN VALUES + +ossl_cmp_msg_check_update() returns 1 on success, -1 on error. + +=head1 SEE ALSO + +L + +=head1 HISTORY + +The OpenSSL CMP support was added in OpenSSL 3.0. + +=head1 COPYRIGHT + +Copyright 2007-2020 The OpenSSL Project Authors. All Rights Reserved. + +Licensed under the Apache License 2.0 (the "License"). You may not use +this file except in compliance with the License. You can obtain a copy +in the file LICENSE in the source distribution or at +L. + +=cut diff --git a/deps/openssl/openssl/doc/internal/man3/ossl_cmp_msg_create.pod b/deps/openssl/openssl/doc/internal/man3/ossl_cmp_msg_create.pod new file mode 100644 index 000000000..d4294d3e9 --- /dev/null +++ b/deps/openssl/openssl/doc/internal/man3/ossl_cmp_msg_create.pod @@ -0,0 +1,134 @@ +=pod + +=head1 NAME + +OSSL_CMP_PKIBODY_IR, +OSSL_CMP_PKIBODY_IP, +OSSL_CMP_PKIBODY_CR, +OSSL_CMP_PKIBODY_CP, +OSSL_CMP_PKIBODY_P10CR, +OSSL_CMP_PKIBODY_POPDECC, +OSSL_CMP_PKIBODY_POPDECR, +OSSL_CMP_PKIBODY_KUR, +OSSL_CMP_PKIBODY_KUP, +OSSL_CMP_PKIBODY_KRR, +OSSL_CMP_PKIBODY_KRP, +OSSL_CMP_PKIBODY_RR, +OSSL_CMP_PKIBODY_RP, +OSSL_CMP_PKIBODY_CCR, +OSSL_CMP_PKIBODY_CCP, +OSSL_CMP_PKIBODY_CKUANN, +OSSL_CMP_PKIBODY_CANN, +OSSL_CMP_PKIBODY_RANN, +OSSL_CMP_PKIBODY_CRLANN, +OSSL_CMP_PKIBODY_PKICONF, +OSSL_CMP_PKIBODY_NESTED, +OSSL_CMP_PKIBODY_GENM, +OSSL_CMP_PKIBODY_GENP, +OSSL_CMP_PKIBODY_ERROR, +OSSL_CMP_PKIBODY_CERTCONF, +OSSL_CMP_PKIBODY_POLLREQ, +OSSL_CMP_PKIBODY_POLLREP, +ossl_cmp_bodytype_to_string, +ossl_cmp_msg_get_bodytype, +ossl_cmp_msg_set_bodytype, +ossl_cmp_msg_create, +ossl_cmp_msg_gen_ITAV_push0, +ossl_cmp_msg_gen_ITAVs_push1 +- functions handling CMP messages + +=head1 SYNOPSIS + + #include "cmp_local.h" + + #define OSSL_CMP_PKIBODY_IR 0 + #define OSSL_CMP_PKIBODY_IP 1 + #define OSSL_CMP_PKIBODY_CR 2 + #define OSSL_CMP_PKIBODY_CP 3 + #define OSSL_CMP_PKIBODY_P10CR 4 + #define OSSL_CMP_PKIBODY_POPDECC 5 + #define OSSL_CMP_PKIBODY_POPDECR 6 + #define OSSL_CMP_PKIBODY_KUR 7 + #define OSSL_CMP_PKIBODY_KUP 8 + #define OSSL_CMP_PKIBODY_KRR 9 + #define OSSL_CMP_PKIBODY_KRP 10 + #define OSSL_CMP_PKIBODY_RR 11 + #define OSSL_CMP_PKIBODY_RP 12 + #define OSSL_CMP_PKIBODY_CCR 13 + #define OSSL_CMP_PKIBODY_CCP 14 + #define OSSL_CMP_PKIBODY_CKUANN 15 + #define OSSL_CMP_PKIBODY_CANN 16 + #define OSSL_CMP_PKIBODY_RANN 17 + #define OSSL_CMP_PKIBODY_CRLANN 18 + #define OSSL_CMP_PKIBODY_PKICONF 19 + #define OSSL_CMP_PKIBODY_NESTED 20 + #define OSSL_CMP_PKIBODY_GENM 21 + #define OSSL_CMP_PKIBODY_GENP 22 + #define OSSL_CMP_PKIBODY_ERROR 23 + #define OSSL_CMP_PKIBODY_CERTCONF 24 + #define OSSL_CMP_PKIBODY_POLLREQ 25 + #define OSSL_CMP_PKIBODY_POLLREP 26 + + const char *ossl_cmp_bodytype_to_string(int type); + int ossl_cmp_msg_get_bodytype(const OSSL_CMP_MSG *msg); + int ossl_cmp_msg_set_bodytype( OSSL_CMP_MSG *msg, int type); + OSSL_CMP_MSG *ossl_cmp_msg_create(OSSL_CMP_CTX *ctx, int bodytype); + int ossl_cmp_msg_gen_ITAV_push0(OSSL_CMP_MSG *msg, OSSL_CMP_ITAV *itav); + int ossl_cmp_msg_gen_ITAVs_push1(OSSL_CMP_MSG *msg, + STACK_OF(OSSL_CMP_ITAV) *itavs); + +=head1 DESCRIPTION + +ossl_cmp_bodytype_to_string() returns the name of the given body type as string, +or "illegal body type" on error. + +ossl_cmp_msg_get_bodytype() returns the body type of the given PKIMessage, +or -1 on error. + +ossl_cmp_msg_set_bodytype() sets the type of the message contained in +the PKIMessage body field. +Returns 1 on success, 0 on error. + +ossl_cmp_msg_create() creates and initializes an B structure, +using fields of B for the header and B for the body. +If the current B field in I indicates that there is no +current transaction, it creates and stores a random one with 128 bits length. +Thus, the I may be modified by this and related ossl_cmp_*_new() functions. +Returns pointer to created B on success, NULL on error. + +ossl_cmp_msg_gen_ITAV_push0() pushes the B to the body of the +PKIMessage B of GenMsg or GenRep type. Consumes the B pointer. +Returns 1 on success, 0 on error. + +ossl_cmp_msg_gen_ITAVs_push1() adds a copy of the B stack to the body +of the PKIMessage B of GenMsg or GenRep type. +Does not consume the B pointer nor its elements. +Returns 1 on success, 0 on error. + +=head1 NOTES + +CMP is defined in RFC 4210 (and CRMF in RFC 4211). + +=head1 RETURN VALUES + +See the individual functions above. + +=head1 SEE ALSO + +L, +L, L + +=head1 HISTORY + +The OpenSSL CMP support was added in OpenSSL 3.0. + +=head1 COPYRIGHT + +Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved. + +Licensed under the Apache License 2.0 (the "License"). You may not use +this file except in compliance with the License. You can obtain a copy +in the file LICENSE in the source distribution or at +L. + +=cut diff --git a/deps/openssl/openssl/doc/internal/man3/ossl_cmp_msg_protect.pod b/deps/openssl/openssl/doc/internal/man3/ossl_cmp_msg_protect.pod new file mode 100644 index 000000000..744fbce57 --- /dev/null +++ b/deps/openssl/openssl/doc/internal/man3/ossl_cmp_msg_protect.pod @@ -0,0 +1,66 @@ +=pod + +=head1 NAME + +ossl_cmp_calc_protection, +ossl_cmp_msg_protect, +ossl_cmp_msg_add_extraCerts +- functions for producing CMP message protection + +=head1 SYNOPSIS + + #include "cmp_local.h" + + ASN1_BIT_STRING *ossl_cmp_calc_protection(const OSSL_CMP_CTX *ctx, + const OSSL_CMP_MSG *msg); + int ossl_cmp_msg_protect(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); + int ossl_cmp_msg_add_extraCerts(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); + +=head1 DESCRIPTION + +ossl_cmp_calc_protection() calculates the protection for the given I +according to the algorithm and parameters in the message header's protectionAlg +using the credentials, library context, and property criteria in the I. + +ossl_cmp_msg_protect() (re-)protects the given message I using an algorithm +depending on the available context information given in the I. +If there is a secretValue it selects PBMAC, else if there is a protection cert +it selects Signature and uses ossl_cmp_msg_add_extraCerts (see below). +It also sets the protectionAlg field in the message header accordingly. + +ossl_cmp_msg_add_extraCerts() adds elements to the extraCerts field in I. +If signature-based message protection is used it adds first the CMP signer cert +ctx->cert and then its chain ctx->chain. If this chain is not present in I +tries to build it using ctx->untrusted and caches the result in ctx->chain. +In any case all the certificates explicitly specified to be sent out (i.e., +IextraCertsOut>) are added. Note that it will NOT add the root certificate +of the chain, i.e, the trust anchor (unless it is part of extraCertsOut). + +=head1 NOTES + +CMP is defined in RFC 4210 (and CRMF in RFC 4211). + +The I parameter of ossl_cmp_msg_add_extraCerts() +and thus also of ossl_cmp_msg_protect() cannot be made I +because Ichain> may get adapted to cache the chain of the CMP signer cert. + +=head1 RETURN VALUES + +ossl_cmp_calc_protection() returns the protection on success, else NULL. + +All other functions return 1 on success, 0 on error. + +=head1 HISTORY + +The OpenSSL CMP support was added in OpenSSL 3.0. + +=head1 COPYRIGHT + +Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved. + +Licensed under the Apache License 2.0 (the "License"). You may not use +this file except in compliance with the License. You can obtain a copy +in the file LICENSE in the source distribution or at +L. + +=cut diff --git a/deps/openssl/openssl/doc/internal/man3/ossl_cmp_pkisi_get_status.pod b/deps/openssl/openssl/doc/internal/man3/ossl_cmp_pkisi_get_status.pod new file mode 100644 index 000000000..e44bfd3f0 --- /dev/null +++ b/deps/openssl/openssl/doc/internal/man3/ossl_cmp_pkisi_get_status.pod @@ -0,0 +1,99 @@ +=pod + +=head1 NAME + +ossl_cmp_certresponse_get1_cert, +ossl_cmp_pkisi_get_status, +ossl_cmp_PKIStatus_to_string, +ossl_cmp_pkisi_get0_statusString, +ossl_cmp_pkisi_get_pkifailureinfo, +ossl_cmp_pkisi_check_pkifailureinfo +- functions for managing PKI status information + +=head1 SYNOPSIS + + #include "cmp.h" + +# define OSSL_CMP_PKIFAILUREINFO_badAlg 0 +# define OSSL_CMP_PKIFAILUREINFO_badMessageCheck 1 +# define OSSL_CMP_PKIFAILUREINFO_badRequest 2 +# define OSSL_CMP_PKIFAILUREINFO_badTime 3 +# define OSSL_CMP_PKIFAILUREINFO_badCertId 4 +# define OSSL_CMP_PKIFAILUREINFO_badDataFormat 5 +# define OSSL_CMP_PKIFAILUREINFO_wrongAuthority 6 +# define OSSL_CMP_PKIFAILUREINFO_incorrectData 7 +# define OSSL_CMP_PKIFAILUREINFO_missingTimeStamp 8 +# define OSSL_CMP_PKIFAILUREINFO_badPOP 9 +# define OSSL_CMP_PKIFAILUREINFO_certRevoked 10 +# define OSSL_CMP_PKIFAILUREINFO_certConfirmed 11 +# define OSSL_CMP_PKIFAILUREINFO_wrongIntegrity 12 +# define OSSL_CMP_PKIFAILUREINFO_badRecipientNonce 13 +# define OSSL_CMP_PKIFAILUREINFO_timeNotAvailable 14 +# define OSSL_CMP_PKIFAILUREINFO_unacceptedPolicy 15 +# define OSSL_CMP_PKIFAILUREINFO_unacceptedExtension 16 +# define OSSL_CMP_PKIFAILUREINFO_addInfoNotAvailable 17 +# define OSSL_CMP_PKIFAILUREINFO_badSenderNonce 18 +# define OSSL_CMP_PKIFAILUREINFO_badCertTemplate 19 +# define OSSL_CMP_PKIFAILUREINFO_signerNotTrusted 20 +# define OSSL_CMP_PKIFAILUREINFO_transactionIdInUse 21 +# define OSSL_CMP_PKIFAILUREINFO_unsupportedVersion 22 +# define OSSL_CMP_PKIFAILUREINFO_notAuthorized 23 +# define OSSL_CMP_PKIFAILUREINFO_systemUnavail 24 +# define OSSL_CMP_PKIFAILUREINFO_systemFailure 25 +# define OSSL_CMP_PKIFAILUREINFO_duplicateCertReq 26 +# define OSSL_CMP_PKIFAILUREINFO_MAX 26 + + X509 *ossl_cmp_certresponse_get1_cert(const OSSL_CMP_CTX *ctx, + const OSSL_CMP_CERTRESPONSE *crep); + int ossl_cmp_pkisi_get_status(const OSSL_CMP_PKISI *si); + const char *ossl_cmp_PKIStatus_to_string(int status); + OSSL_CMP_PKIFREETEXT *ossl_cmp_pkisi_get0_statusString(const OSSL_CMP_PKISI *si); + int ossl_cmp_pkisi_get_pkifailureinfo(const OSSL_CMP_PKISI *si); + int ossl_cmp_pkisi_check_pkifailureinfo(const OSSL_CMP_PKISI *si, int index); + +=head1 DESCRIPTION + +ossl_cmp_certresponse_get1_cert() returns a pointer to a copy of the newly +enrolled certificate from the given certResponse I, or NULL on error. +Uses data from I, which in case of indirect POPO includes the private key. + +ossl_cmp_pkisi_get_status() returns the PKIStatus of I, or -1 on error. + +ossl_cmp_PKIStatus_to_string() returns a human-readable string representing +the PKIStatus values as specified in RFC 4210, Appendix F. + +ossl_cmp_pkisi_get0_statusString() returns a direct pointer to the statusString +field contained in I. + +ossl_cmp_pkisi_get_pkifailureinfo() returns the PKIFailureInfo bits +of I, encoded as integer, or -1 on error. + +ossl_cmp_pkisi_check_pkifailureinfo() returns the state of the bit (0 or 1) +with index I in the PKIFailureInfo of the I, or -1 on error. + +=head1 NOTES + +CMP is defined in RFC 4210 (and CRMF in RFC 4211). + +=head1 RETURN VALUES + +See the individual functions above. + +=head1 SEE ALSO + +L, L + +=head1 HISTORY + +The OpenSSL CMP support was added in OpenSSL 3.0. + +=head1 COPYRIGHT + +Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved. + +Licensed under the Apache License 2.0 (the "License"). You may not use +this file except in compliance with the License. You can obtain a copy +in the file LICENSE in the source distribution or at +L. + +=cut diff --git a/deps/openssl/openssl/doc/internal/man3/ossl_cmp_print_log.pod b/deps/openssl/openssl/doc/internal/man3/ossl_cmp_print_log.pod new file mode 100644 index 000000000..f4384402e --- /dev/null +++ b/deps/openssl/openssl/doc/internal/man3/ossl_cmp_print_log.pod @@ -0,0 +1,108 @@ +=pod + +=head1 NAME + +ossl_cmp_print_log, +ossl_cmp_alert, +ossl_cmp_err, +ossl_cmp_warn, +ossl_cmp_info, +ossl_cmp_debug, +ossl_cmp_log, +ossl_cmp_log1, +ossl_cmp_log2, +ossl_cmp_log3, +ossl_cmp_log4, +ossl_cmp_log_parse_metadata, +ossl_cmp_add_error_data, +ossl_cmp_add_error_line +- logging and error reporting support for CMP + +=head1 SYNOPSIS + + #include "cmp_local.h" + + int ossl_cmp_print_log(OSSL_CMP_severity level, const OSSL_CMP_CTX *ctx, + const char *func, const char *file, int line, + const char *level_str, const char *format, ...); + #define ossl_cmp_alert(ctx, msg) + #define ossl_cmp_err(ctx, msg) + #define ossl_cmp_warn(ctx, msg) + #define ossl_cmp_info(ctx, msg) + #define ossl_cmp_debug(ctx, (msg) + #define ossl_cmp_log(level, ctx, msg) + #define ossl_cmp_log1(level, ctx, fmt, arg1) + #define ossl_cmp_log2(level, ctx, fmt, arg1, arg2) + #define ossl_cmp_log3(level, ctx, fmt, arg1, arg2, arg3) + #define ossl_cmp_log4(level, ctx, fmt, arg1, arg2, arg3, arg4) + const char *ossl_cmp_log_parse_metadata(const char *buf, + OSSL_CMP_severity *level, char **func, + char **file, int *line); + + #define ossl_cmp_add_error_data(txt) + #define ossl_cmp_add_error_line(txt) + +=head1 DESCRIPTION + +ossl_cmp_print_log() prints CMP log messages (i.e., diagnostic info) via the +log callback of the B if present and the severity level is sufficient. +If the trace API if enabled the function uses it, prepending the function name, +filename, line number, and severity information to the message being output. +In any case the B, B, B, and B parameters +and the message constructed using the given B and variable further +argument list are passed to the log callback function (unless it is NULL). +The B, B, B, and B arguments may be NULL. + +ossl_cmp_alert(), ossl_cmp_err(), ossl_cmp_warn(), ossl_cmp_info(), and +ossl_cmp_debug() output a simple alert/error/warning/info/debug message +via ossl_cmp_print_log(). + +ossl_cmp_log(), ossl_cmp_log1(), ossl_cmp_log2(), ossl_cmp_log3(), and +ossl_cmp_log4() output a log message with the given severity, +constructing the message text from the given format and arguments. + +ossl_cmp_log_parse_metadata() parses the given message buffer I populated +by ossl_cmp_log() etc. +according to the pattern OSSL_CMP_LOG_START#level ": %s\n", filling in +the variable pointed to by I with the severity level or -1, +the variable pointed to by I with the function name string or NULL, +the variable pointed to by I with the filename string or NULL, and +the variable pointed to by I with the line number or -1. +Any string returned via I<*func> and I<*file> must be freed by the caller. + +ossl_cmp_add_error_data() is a macro calling +L with the separator being ":". + +ossl_cmp_add_error_line() is a macro calling +L with the separator being "\n". + +=head1 RETURN VALUES + +ossl_cmp_log_parse_metadata() returns the pointer to the actual message text +after the OSSL_CMP_LOG_PREFIX and level and ':' if found in the buffer, +else the beginning of the buffer. + +ossl_cmp_add_error_data() and +ossl_cmp_add_error_line() +do not return anything. + +All other functions return 1 on success, 0 on error. + +=head1 SEE ALSO + +L + +=head1 HISTORY + +The OpenSSL CMP support was added in OpenSSL 3.0. + +=head1 COPYRIGHT + +Copyright 2007-2020 The OpenSSL Project Authors. All Rights Reserved. + +Licensed under the Apache License 2.0 (the "License"). You may not use +this file except in compliance with the License. You can obtain a copy +in the file LICENSE in the source distribution or at +L. + +=cut diff --git a/deps/openssl/openssl/doc/internal/man3/ossl_ends_with_dirsep.pod b/deps/openssl/openssl/doc/internal/man3/ossl_ends_with_dirsep.pod new file mode 100644 index 000000000..d19ce7a3b --- /dev/null +++ b/deps/openssl/openssl/doc/internal/man3/ossl_ends_with_dirsep.pod @@ -0,0 +1,45 @@ +=pod + +=head1 NAME + +ossl_ends_with_dirsep, ossl_is_absolute_path +- internal functions to work with paths + +=head1 SYNOPSIS + + #include "internal/cryptlib.h" + + int ossl_ends_with_dirsep(const char *path); + + int ossl_is_absolute_path(const char *path); + +=head1 DESCRIPTION + +ossl_ends_with_dirsep() detects whether the I ends with a directory +separator in a platform agnostic way. + +ossl_is_absolute_path() detects whether the I is absolute path in +a platform agnostic way. + +=head1 RETURN VALUES + +ossl_ends_with_dirsep() returns 1 if the I ends with a directory +separator, 0 otherwise. + +ossl_is_absolute_path() returns 1 if the I is absolute, 0 otherwise. + +=head1 HISTORY + +The functions described here were added in OpenSSL 3.0. + +=head1 COPYRIGHT + +Copyright 2019-2020 The OpenSSL Project Authors. All Rights Reserved. + +Licensed under the Apache License 2.0 (the "License"). You may not use +this file except in compliance with the License. You can obtain a copy +in the file LICENSE in the source distribution or at +L. + +=cut + diff --git a/deps/openssl/openssl/doc/internal/man3/ossl_global_properties_no_mirrored.pod b/deps/openssl/openssl/doc/internal/man3/ossl_global_properties_no_mirrored.pod new file mode 100644 index 000000000..6c39ccbc0 --- /dev/null +++ b/deps/openssl/openssl/doc/internal/man3/ossl_global_properties_no_mirrored.pod @@ -0,0 +1,56 @@ +=pod + +=head1 NAME + +ossl_property_list_to_string, ossl_global_properties_no_mirrored +- internal property routines + +=head1 SYNOPSIS + + #include "internal/property.h" + + size_t ossl_property_list_to_string(OSSL_LIB_CTX *ctx, + const OSSL_PROPERTY_LIST *list, char *buf, + size_t bufsize); + + int ossl_global_properties_no_mirrored(OSSL_LIB_CTX *libctx); + void ossl_global_properties_no_mirrored(OSSL_LIB_CTX *libctx); + + +=head1 DESCRIPTION + +ossl_property_list_to_string() takes a given OSSL_PROPERTY_LIST in I and +converts it to a string. If I is non NULL then the string will be stored +in I. The size of the buffer is provided in I. If I is +too short then the string will be truncated. If I is NULL then the length +of the string is still calculated and returned. If the property list has no +properties in it then the empty string will be stored in I. + +ossl_global_properties_no_mirrored() checks whether mirroring of global +properties from a parent library context is allowed for the current library +context. + +ossl_global_properties_no_mirrored() prevents future mirroring of global +properties from a parent library context for the current library context. + +=head1 RETURN VALUES + +ossl_property_list_to_string() returns the length of the string, or 0 on error. + +ossl_global_properties_no_mirrored() returns 1 if mirroring of global properties +is not allowed, or 0 otherwise. + +=head1 HISTORY + +The functions described here were all added in OpenSSL 3.0. + +=head1 COPYRIGHT + +Copyright 2021 The OpenSSL Project Authors. All Rights Reserved. + +Licensed under the Apache License 2.0 (the "License"). You may not use +this file except in compliance with the License. You can obtain a copy +in the file LICENSE in the source distribution or at +L. + +=cut diff --git a/deps/openssl/openssl/doc/internal/man3/ossl_init_thread_deregister.pod b/deps/openssl/openssl/doc/internal/man3/ossl_init_thread_deregister.pod new file mode 100644 index 000000000..6c9e0b5b8 --- /dev/null +++ b/deps/openssl/openssl/doc/internal/man3/ossl_init_thread_deregister.pod @@ -0,0 +1,66 @@ +=pod + +=head1 NAME + +OSSL_thread_stop_handler_fn, +ossl_init_thread_start, +ossl_init_thread_deregister +- internal thread routines + +=head1 SYNOPSIS + + #include "crypto/cryptlib.h" + #include + + typedef void (*OSSL_thread_stop_handler_fn)(void *arg); + + int ossl_init_thread_start(const void *index, void *arg, + OSSL_thread_stop_handler_fn handfn); + int ossl_init_thread_deregister(void *index); + +=head1 DESCRIPTION + +Thread aware code may be informed about when a thread is stopping, typically to +perform some cleanup operation. +Thread stop events may be detected by OpenSSL either automatically (using the +capabilities of the underlying threading library) where possible or explicitly +by the application calling OPENSSL_thread_stop() or OPENSSL_thread_stop_ex(). + +Thread aware code registers a "stop handler" for each new thread that it uses. +Typically, when a new thread is being used, code will add a new value to some +thread local variable and then register a stop handler. When the thread is +stopping the stop handler is called (while on that thread) and the code can +clean up the value stored in the thread local variable. + +A new stop handler is registered using the function ossl_init_thread_start(). +The I parameter should be a unique value that can be used to identify a +set of common stop handlers and is passed in a later call to +ossl_init_thread_deregister. If no later call to ossl_init_thread_deregister is +made then NULL can be passed for this parameter. The I parameter is passed +back as an argument to the stop handler when it is later invoked. Finally the +I is a function pointer to the stop handler itself. + +In the event that previously registered stop handlers need to be deregistered +then this can be done using the function ossl_init_thread_deregister(). +This will deregister all stop handlers (no matter which thread they were +registered for) which the same I value. + +=head1 RETURN VALUES + +ossl_init_thread_start() and ossl_init_thread_deregister() return 1 for success +or 0 on error. + +=head1 HISTORY + +The functions described here were all added in OpenSSL 3.0. + +=head1 COPYRIGHT + +Copyright 2019 The OpenSSL Project Authors. All Rights Reserved. + +Licensed under the Apache License 2.0 (the "License"). You may not use +this file except in compliance with the License. You can obtain a copy +in the file LICENSE in the source distribution or at +L. + +=cut diff --git a/deps/openssl/openssl/doc/internal/man3/ossl_lib_ctx_get_data.pod b/deps/openssl/openssl/doc/internal/man3/ossl_lib_ctx_get_data.pod new file mode 100644 index 000000000..faedf7275 --- /dev/null +++ b/deps/openssl/openssl/doc/internal/man3/ossl_lib_ctx_get_data.pod @@ -0,0 +1,154 @@ +=pod + +=head1 NAME + +ossl_lib_ctx_get_data, ossl_lib_ctx_run_once, ossl_lib_ctx_onfree, +ossl_lib_ctx_is_child +- internal OSSL_LIB_CTX routines + +=head1 SYNOPSIS + + #include + #include "internal/cryptlib.h" + + typedef struct ossl_lib_ctx_method { + int priority; + void *(*new_func)(OSSL_LIB_CTX *ctx); + void (*free_func)(void *); + } OSSL_LIB_CTX_METHOD; + + void *ossl_lib_ctx_get_data(OSSL_LIB_CTX *ctx, int index, + const OSSL_LIB_CTX_METHOD *meth); + + int ossl_lib_ctx_run_once(OSSL_LIB_CTX *ctx, unsigned int idx, + ossl_lib_ctx_run_once_fn run_once_fn); + int ossl_lib_ctx_onfree(OSSL_LIB_CTX *ctx, ossl_lib_ctx_onfree_fn onfreefn); + + int ossl_lib_ctx_is_child(OSSL_LIB_CTX *ctx); + +=head1 DESCRIPTION + +Internally, the OpenSSL library context B is implemented +as a B, which allows data from diverse parts of the +library to be added and removed dynamically. +Each such data item must have a corresponding CRYPTO_EX_DATA index +associated with it. Unlike normal CRYPTO_EX_DATA objects we use static indexes +to identify data items. These are mapped transparently to CRYPTO_EX_DATA dynamic +indexes internally to the implementation. +See the example further down to see how that's done. + +ossl_lib_ctx_get_data() is used to retrieve a pointer to the data in +the library context I associated with the given I. An +OSSL_LIB_CTX_METHOD must be defined and given in the I parameter. The index +for it should be defined in cryptlib.h. The functions through the method are +used to create or free items that are stored at that index whenever a library +context is created or freed, meaning that the code that use a data item of that +index doesn't have to worry about that, just use the data available. + +Deallocation of an index happens automatically when the library +context is freed. + +ossl_lib_ctx_run_once is used to run some initialisation routine I +exactly once per library context I object. Each initialisation routine +should be allocate a unique run once index in cryptlib.h. + +Any resources allocated via a run once initialisation routine can be cleaned up +using ossl_lib_ctx_onfree. This associates an "on free" routine I with +the library context I. When I is freed all associated "on free" +routines are called. + +ossl_lib_ctx_is_child() returns 1 if this library context is a child and 0 +otherwise. + +=head1 RETURN VALUES + +ossl_lib_ctx_get_data() returns a pointer on success, or NULL on +failure. + +=head1 EXAMPLES + +=head2 Initialization + +For a type C that should end up in the OpenSSL library context, a +small bit of initialization is needed, i.e. to associate a constructor +and a destructor to an index. + + typedef struct foo_st { + int i; + void *data; + } FOO; + + static void *foo_new(OSSL_LIB_CTX *ctx) + { + FOO *ptr = OPENSSL_zalloc(sizeof(*foo)); + if (ptr != NULL) + ptr->i = 42; + return ptr; + } + static void foo_free(void *ptr) + { + OPENSSL_free(ptr); + } + + /* + * Include a reference to this in the methods table in context.c + * OSSL_LIB_CTX_FOO_INDEX should be added to internal/cryptlib.h + * Priorities can be OSSL_LIB_CTX_METHOD_DEFAULT_PRIORITY, + * OSSL_LIB_CTX_METHOD_PRIORITY_1, OSSL_LIB_CTX_METHOD_PRIORITY_2, etc. + * Default priority is low (0). The higher the priority the earlier the + * method's destructor will be called when the library context is cleaned up. + */ + const OSSL_LIB_CTX_METHOD foo_method = { + OSSL_LIB_CTX_METHOD_DEFAULT_PRIORITY, + foo_new, + foo_free + }; + +=head2 Usage + +To get and use the data stored in the library context, simply do this: + + /* + * ctx is received from a caller, + */ + FOO *data = ossl_lib_ctx_get_data(ctx, OSSL_LIB_CTX_FOO_INDEX, &foo_method); + +=head2 Run Once + + void foo_cleanup(OSSL_LIB_CTX *ctx) + { + /* Free foo resources associated with ctx */ + } + + static ossl_lib_ctx_run_once_fn do_foo_init; + static int do_foo_init(OSSL_LIB_CTX *ctx) + { + /* Allocate and initialise some foo resources and associated with ctx */ + return ossl_lib_ctx_onfree(ctx, &foo_cleanup) + } + + int foo_some_function(OSSL_LIB_CTX *ctx) + { + if (!ossl_lib_ctx_run_once(ctx, + OSSL_LIB_CTX_FOO_RUN_ONCE_INDEX, + do_foo_init)) + return 0; + + /* Do some work using foo resources in ctx */ + } + + +=head1 SEE ALSO + +L + +=head1 COPYRIGHT + +Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved. + +Licensed under the Apache License 2.0 (the "License"). You may not use +this file except in compliance with the License. You can obtain a copy +in the file LICENSE in the source distribution or at +L. + +=cut diff --git a/deps/openssl/openssl/doc/internal/man3/ossl_method_construct.pod b/deps/openssl/openssl/doc/internal/man3/ossl_method_construct.pod new file mode 100644 index 000000000..3683798b0 --- /dev/null +++ b/deps/openssl/openssl/doc/internal/man3/ossl_method_construct.pod @@ -0,0 +1,158 @@ +=pod + +=head1 NAME + +OSSL_METHOD_CONSTRUCT_METHOD, ossl_method_construct +- generic method constructor + +=head1 SYNOPSIS + + #include "internal/core.h" + + struct ossl_method_construct_method_st { + /* Get a temporary store */ + void *(*get_tmp_store)(void *data); + /* Get an already existing method from a store */ + void *(*get)(void *store, const OSSL_PROVIDER *prov, void *data); + /* Store a method in a store */ + int (*put)(void *store, void *method, const OSSL_PROVIDER *prov, + const char *name, const char *propdef, void *data); + /* Construct a new method */ + void *(*construct)(const OSSL_ALGORITHM *algodef, OSSL_PROVIDER *prov, + void *data); + /* Destruct a method */ + void (*destruct)(void *method, void *data); + }; + typedef struct ossl_method_construct_method OSSL_METHOD_CONSTRUCT_METHOD; + + void *ossl_method_construct(OSSL_LIB_CTX *ctx, int operation_id, + OSSL_PROVIDER *prov, int force_cache, + OSSL_METHOD_CONSTRUCT_METHOD *mcm, void *mcm_data); + + +=head1 DESCRIPTION + +All libcrypto subsystems that want to create their own methods based +on provider dispatch tables need to do so in exactly the same way. +ossl_method_construct() does this while leaving it to the subsystems +to define more precisely how the methods are created, stored, etc. + +It's important to keep in mind that a method is identified by three things: + +=over 4 + +=item The operation identity + +=item The name of the algorithm + +=item The properties associated with the algorithm implementation + +=back + +=head2 Functions + +ossl_method_construct() creates a method by asking all available +providers for a dispatch table given an I, and then +calling the appropriate functions given by the subsystem specific +method creator through I and the data in I (which is +passed by ossl_method_construct()). +If I is not NULL, only that provider is considered, which is +useful in the case a method must be found in that particular +provider. + +This function assumes that the subsystem method creator implements +reference counting and acts accordingly (i.e. it will call the +subsystem destruct() method to decrement the reference count when +appropriate). + +=head2 Structures + +A central part of constructing a subsystem specific method is to give +ossl_method_construct a set of functions, all in the +B structure, which holds the following +function pointers: + +=over 4 + +=item get_tmp_store() + +Create a temporary method store in the scope of the library context I. +This store is used to temporarily store methods for easier lookup, for +when the provider doesn't want its dispatch table stored in a longer +term cache. + +=item get() + +Look up an already existing method from a store by name. + +The store may be given with I. +NULL is a valid value and means that a subsystem default store +must be used. +This default store should be stored in the library context I. + +The method to be looked up should be identified with data found in I +(which is the I that was passed to ossl_construct_method()). +In other words, the ossl_method_construct() caller is entirely responsible +for ensuring the necesssary data is made available. + +Optionally, I may be given as a search criterion, to narrow down the +search of a method belonging to just one provider. + +This function is expected to increment the resulting method's reference count. + +=item put() + +Places the I created by the construct() function (see below) +in a store. + +The store may be given with I. +NULL is a valid value and means that a subsystem default store +must be used. +This default store should be stored in the library context I. + +The method should be associated with the given provider I, +I and property definition I as well as any +identification data given through I (which is the I +that was passed to ossl_construct_method()). + +This function is expected to increment the I's reference count. + +=item construct() + +Constructs a subsystem method for the given I and the given +dispatch table I. + +The associated provider object I is passed as well, to make +it possible for the subsystem constructor to keep a reference, which +is recommended. +If such a reference is kept, the I reference counter +must be incremented, using ossl_provider_up_ref(). + +This function is expected to set the method's reference count to 1. + +=item destruct() + +Decrement the I's reference count, and destruct it when +the reference count reaches zero. + +=back + +=head1 RETURN VALUES + +ossl_method_construct() returns a constructed method on success, or +NULL on error. + +=head1 HISTORY + +This functionality was added to OpenSSL 3.0. + +=head1 COPYRIGHT + +Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved. + +Licensed under the Apache License 2.0 (the "License"). You may not use this +file except in compliance with the License. You can obtain a copy in the file +LICENSE in the source distribution or at +L. + +=cut diff --git a/deps/openssl/openssl/doc/internal/man3/ossl_namemap_new.pod b/deps/openssl/openssl/doc/internal/man3/ossl_namemap_new.pod new file mode 100644 index 000000000..ff247e87b --- /dev/null +++ b/deps/openssl/openssl/doc/internal/man3/ossl_namemap_new.pod @@ -0,0 +1,129 @@ +=pod + +=head1 NAME + +ossl_namemap_new, ossl_namemap_free, ossl_namemap_stored, ossl_namemap_empty, +ossl_namemap_add_name, ossl_namemap_add_name_n, ossl_namemap_add_names, +ossl_namemap_name2num, ossl_namemap_name2num_n, +ossl_namemap_doall_names +- internal number E-E name map + +=head1 SYNOPSIS + + #include "internal/cryptlib.h" + + OSSL_NAMEMAP *ossl_namemap_stored(OSSL_LIB_CTX *libctx); + + OSSL_NAMEMAP *ossl_namemap_new(void); + void ossl_namemap_free(OSSL_NAMEMAP *namemap); + int ossl_namemap_empty(OSSL_NAMEMAP *namemap); + + int ossl_namemap_add_name(OSSL_NAMEMAP *namemap, int number, const char *name); + int ossl_namemap_add_name_n(OSSL_NAMEMAP *namemap, int number, + const char *name, size_t name_len); + + int ossl_namemap_name2num(const OSSL_NAMEMAP *namemap, const char *name); + int ossl_namemap_name2num_n(const OSSL_NAMEMAP *namemap, + const char *name, size_t name_len); + int ossl_namemap_doall_names(const OSSL_NAMEMAP *namemap, int number, + void (*fn)(const char *name, void *data), + void *data); + + int ossl_namemap_add_names(OSSL_NAMEMAP *namemap, int number, + const char *names, const char separator); + +=head1 DESCRIPTION + +A B is a one-to-many number E-E names map, which +can be used to give any arbitrary set of names (any string) a unique +dynamic identity that is valid throughout the lifetime of the associated +library context. + +ossl_namemap_new() and ossl_namemap_free() construct and destruct a +new B. +This is suitable to use when the B is embedded in other +structures, or should be independent for any reason. + +ossl_namemap_empty() checks if the given B is empty or +not. + +ossl_namemap_stored() finds or auto-creates the default namemap in the +given library context. +The returned B can't be destructed using +ossl_namemap_free(). + +ossl_namemap_add_name() adds a new name to the namemap if it's not already +present. +If the given I is zero, a new number will be allocated to +identify this I. +If the given I is nonzero, the I is added to the set of +names already associated with that number. + +ossl_namemap_name2num() finds the number corresponding to the given +I. + +ossl_namemap_add_name_n() and ossl_namemap_name2num_n() do the same thing +as ossl_namemap_add_name() and ossl_namemap_name2num(), but take a string +length I as well, allowing the caller to use a fragment of +a string as a name. + +ossl_namemap_doall_names() walks through all names associated with +I in the given I and calls the function I for +each of them. +I is also passed the I argument, which allows any caller to +pass extra data for that function to use. + +ossl_namemap_add_names() divides up a set of names given in I, +separated by I, and adds each to the I, all with +the same number. If some of them already exist in the I, +they must all have the same associated number, which will be adopted +for any name that doesn't exist yet. + +=head1 RETURN VALUES + +ossl_namemap_new() and ossl_namemap_stored() return the pointer to a +B, or NULL on error. + +ossl_namemap_empty() returns 1 if the B is NULL or +empty, 0 if it's not empty, or -1 on internal error (such as inability +to lock). + +ossl_namemap_add_name() and ossl_namemap_add_name_n() return the number +associated with the added string, or zero on error. + +ossl_namemap_num2names() returns a pointer to a NULL-terminated list of +pointers to the names corresponding to the given number, or NULL if +it's undefined in the given B. + +ossl_namemap_name2num() and ossl_namemap_name2num_n() return the number +corresponding to the given name, or 0 if it's undefined in the given +B. + +ossl_namemap_doall_names() returns 1 if the callback was called for all names. A +return value of 0 means that the callback was not called for any names. + +ossl_namemap_add_names() returns the number associated with the added +names, or zero on error. + +=head1 NOTES + +The result from ossl_namemap_num2names() isn't thread safe, other threads +dealing with the same namemap may cause the list of names to change +location. +It is therefore strongly recommended to only use the result in code +guarded by a thread lock. + +=head1 HISTORY + +The functions described here were all added in OpenSSL 3.0. + +=head1 COPYRIGHT + +Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved. + +Licensed under the Apache License 2.0 (the "License"). You may not use +this file except in compliance with the License. You can obtain a copy +in the file LICENSE in the source distribution or at +L. + +=cut diff --git a/deps/openssl/openssl/doc/internal/man3/ossl_provider_add_conf_module.pod b/deps/openssl/openssl/doc/internal/man3/ossl_provider_add_conf_module.pod new file mode 100644 index 000000000..7e4d5097f --- /dev/null +++ b/deps/openssl/openssl/doc/internal/man3/ossl_provider_add_conf_module.pod @@ -0,0 +1,41 @@ +=pod + +=head1 NAME + +ossl_provider_add_conf_module - internal standard configuration module + +=head1 SYNOPSIS + + #include "internal/provider.h" + + /* Configuration */ + void ossl_provider_add_conf_module(void); + +=head1 DESCRIPTION + +ossl_provider_add_conf_module() adds the standard configuration module +for providers. +This allows providers to be configured with an OpenSSL L file. + +=head1 RETURN VALUES + +ossl_provider_add_conf_module() doesn't return any value. + +=head1 SEE ALSO + +L, L + +=head1 HISTORY + +The functions described here were all added in OpenSSL 3.0. + +=head1 COPYRIGHT + +Copyright 2019 The OpenSSL Project Authors. All Rights Reserved. + +Licensed under the Apache License 2.0 (the "License"). You may not use +this file except in compliance with the License. You can obtain a copy +in the file LICENSE in the source distribution or at +L. + +=cut diff --git a/deps/openssl/openssl/doc/internal/man3/ossl_provider_new.pod b/deps/openssl/openssl/doc/internal/man3/ossl_provider_new.pod new file mode 100644 index 000000000..8bd5594c4 --- /dev/null +++ b/deps/openssl/openssl/doc/internal/man3/ossl_provider_new.pod @@ -0,0 +1,400 @@ +=pod + +=head1 NAME + +ossl_provider_find, ossl_provider_new, ossl_provider_up_ref, +ossl_provider_free, +ossl_provider_set_fallback, ossl_provider_set_module_path, +ossl_provider_add_parameter, ossl_provider_set_child, ossl_provider_get_parent, +ossl_provider_up_ref_parent, ossl_provider_free_parent, +ossl_provider_default_props_update, ossl_provider_get0_dispatch, +ossl_provider_init_as_child, ossl_provider_deinit_child, +ossl_provider_activate, ossl_provider_deactivate, ossl_provider_add_to_store, +ossl_provider_ctx, +ossl_provider_doall_activated, +ossl_provider_name, ossl_provider_dso, +ossl_provider_module_name, ossl_provider_module_path, +ossl_provider_libctx, +ossl_provider_teardown, ossl_provider_gettable_params, +ossl_provider_get_params, +ossl_provider_query_operation, ossl_provider_unquery_operation, +ossl_provider_set_operation_bit, ossl_provider_test_operation_bit, +ossl_provider_get_capabilities +- internal provider routines + +=head1 SYNOPSIS + + #include "internal/provider.h" + + OSSL_PROVIDER *ossl_provider_find(OSSL_LIB_CTX *libctx, const char *name, + int noconfig); + OSSL_PROVIDER *ossl_provider_new(OSSL_LIB_CTX *libctx, const char *name, + ossl_provider_init_fn *init_function + int noconfig); + int ossl_provider_up_ref(OSSL_PROVIDER *prov); + void ossl_provider_free(OSSL_PROVIDER *prov); + + /* Setters */ + int ossl_provider_set_fallback(OSSL_PROVIDER *prov); + int ossl_provider_set_module_path(OSSL_PROVIDER *prov, const char *path); + int ossl_provider_add_parameter(OSSL_PROVIDER *prov, const char *name, + const char *value); + + /* Child Providers */ + int ossl_provider_set_child(OSSL_PROVIDER *prov, + const OSSL_CORE_HANDLE *handle); + const OSSL_CORE_HANDLE *ossl_provider_get_parent(OSSL_PROVIDER *prov); + int ossl_provider_up_ref_parent(OSSL_PROVIDER *prov, int activate); + int ossl_provider_free_parent(OSSL_PROVIDER *prov, int deactivate); + int ossl_provider_default_props_update(OSSL_LIB_CTX *libctx, + const char *props); + + /* + * Activate the Provider + * If the Provider is a module, the module will be loaded + */ + int ossl_provider_activate(OSSL_PROVIDER *prov, int upcalls, int aschild); + int ossl_provider_deactivate(OSSL_PROVIDER *prov, int removechildren); + int ossl_provider_add_to_store(OSSL_PROVIDER *prov, OSSL_PROVIDER **actualprov, + int retain_fallbacks); + + /* Return pointer to the provider's context */ + void *ossl_provider_ctx(const OSSL_PROVIDER *prov); + + const OSSL_DISPATCH *ossl_provider_get0_dispatch(const OSSL_PROVIDER *prov); + + /* Iterate over all loaded providers */ + int ossl_provider_doall_activated(OSSL_LIB_CTX *, + int (*cb)(OSSL_PROVIDER *provider, + void *cbdata), + void *cbdata); + + /* Getters for other library functions */ + const char *ossl_provider_name(OSSL_PROVIDER *prov); + const DSO *ossl_provider_dso(OSSL_PROVIDER *prov); + const char *ossl_provider_module_name(OSSL_PROVIDER *prov); + const char *ossl_provider_module_path(OSSL_PROVIDER *prov); + OSSL_LIB_CTX *ossl_provider_libctx(const OSSL_PROVIDER *prov); + + /* Thin wrappers around calls to the provider */ + void ossl_provider_teardown(const OSSL_PROVIDER *prov); + const OSSL_PARAM *ossl_provider_gettable_params(const OSSL_PROVIDER *prov); + int ossl_provider_get_params(const OSSL_PROVIDER *prov, OSSL_PARAM params[]); + int ossl_provider_get_capabilities(const OSSL_PROVIDER *prov, + const char *capability, + OSSL_CALLBACK *cb, + void *arg); + const OSSL_ALGORITHM *ossl_provider_query_operation(const OSSL_PROVIDER *prov, + int operation_id, + int *no_cache); + void ossl_provider_unquery_operation(const OSSL_PROVIDER *prov, + int operation_id, + const OSSL_ALGORITHM *algs); + + int ossl_provider_set_operation_bit(OSSL_PROVIDER *provider, size_t bitnum); + int ossl_provider_test_operation_bit(OSSL_PROVIDER *provider, size_t bitnum, + int *result); + + int ossl_provider_init_as_child(OSSL_LIB_CTX *ctx, + const OSSL_CORE_HANDLE *handle, + const OSSL_DISPATCH *in); + void ossl_provider_deinit_child(OSSL_LIB_CTX *ctx); + +=head1 DESCRIPTION + +I is a type that holds all the necessary information +to handle a provider, regardless of if it's built in to the +application or the OpenSSL libraries, or if it's a loadable provider +module. +Instances of this type are commonly referred to as "provider objects". + +A provider object is always stored in a set of provider objects +in the library context. + +Provider objects are reference counted. + +Provider objects are initially inactive, i.e. they are only recorded +in the store, but are not used. +They are activated with the first call to ossl_provider_activate(), +and are deactivated with the last call to ossl_provider_deactivate(). +Activation affects a separate counter. + +=head2 Functions + +ossl_provider_find() finds an existing provider object in the provider +object store by I. +The config file will be automatically loaded unless I is set. +Typically I should be 0. +We set I to 1 only when calling these functions while processing a +config file in order to avoid recursively attempting to load the file. +The provider object it finds has its reference count incremented. + +ossl_provider_new() creates a new provider object named I and +stores it in the provider object store, unless there already is one +there with the same name. +If there already is one with the same name, it's returned with its +reference count incremented. +The config file will be automatically loaded unless I is set. +Typically I should be 0. +We set I to 1 only when calling these functions while processing a +config file in order to avoid recursively attempting to load the file. +The reference count of a newly created provider object will always +be 2; one for being added to the store, and one for the returned +reference. +If I is NULL, the provider is assumed to be a +dynamically loadable module, with the symbol B as +its initialisation function. +If I isn't NULL, the provider is assumed to be built +in, with I being the pointer to its initialisation +function. +For further description of the initialisation function, see the +description of ossl_provider_activate() below. + +ossl_provider_up_ref() increments the provider object I's +reference count. + +ossl_provider_free() decrements the provider object I's +reference count; when it drops to zero, the provider object is assumed +to have fallen out of use and will be deinitialized (its I +function is called), and the associated module will be unloaded if one +was loaded, and I itself will be freed. + +ossl_provider_set_fallback() marks an available provider I as +fallback. +Note that after this call, the provider object pointer that was +used can simply be dropped, but not freed. + +ossl_provider_set_module_path() sets the module path to load the +provider module given the provider object I. +This will be used in preference to automatically trying to figure out +the path from the provider name and the default module directory (more +on this in L). + +ossl_provider_libctx() returns the library context the given +provider I is registered in. + +ossl_provider_add_parameter() adds a global parameter for the provider +to retrieve as it sees fit. +The parameters are a combination of I and I, and the +provider will use the name to find the value it wants. +Only text parameters can be given, and it's up to the provider to +interpret them. + +ossl_provider_set_child() marks this provider as a child of a provider in the +parent library context. I is the B object passed to +the provider's B function. + +ossl_provider_get_parent() obtains the handle on the parent provider. + +ossl_provider_up_ref_parent() increases the reference count on the parent +provider. If I is nonzero then the parent provider is also activated. + +ossl_provider_free_parent() decreases the reference count on the parent +provider. If I is nonzero then the parent provider is also +deactivated. + +ossl_provider_default_props_update() is responsible for informing any child +providers of an update to the default properties. The new properties are +supplied in the I string. + +ossl_provider_activate() "activates" the provider for the given +provider object I by incrementing its activation count, flagging +it as activated, and initializing it if it isn't already initialized. +Initializing means one of the following: + +=over 4 + +=item * + +If an initialization function was given with ossl_provider_new(), that +function will get called. + +=item * + +If no initialization function was given with ossl_provider_new(), a +loadable module with the I that was given to ossl_provider_new() +will be located and loaded, then the symbol B will +be located in that module, and called. + +=back + +If I is nonzero then, if this is a child provider, upcalls to the +parent libctx will be made to inform it of an up-ref. If I is nonzero +then the provider will only be activated if it is a child provider. Otherwise +no action is taken and ossl_provider_activate() returns success. + +ossl_provider_deactivate() "deactivates" the provider for the given +provider object I by decrementing its activation count. When +that count reaches zero, the activation flag is cleared. If the +I parameter is 0 then no attempt is made to remove any +associated child providers. + +ossl_provider_add_to_store() adds the provider I to the provider store and +makes it available to other threads. This will prevent future automatic loading +of fallback providers, unless I is true. If a provider of the +same name already exists in the store then it is not added but this function +still returns success. On success the I value is populated with a +pointer to the provider of the given name that is now in the store. The +reference passed in the I argument is consumed by this function. A +reference to the provider that should be used is passed back in the +I argument. + +ossl_provider_ctx() returns a context created by the provider. +Outside of the provider, it's completely opaque, but it needs to be +passed back to some of the provider functions. + +ossl_provider_get0_dispatch() returns the dispatch table that the provider +initially returned in the I parameter of its B +function. + +ossl_provider_doall_activated() iterates over all the currently +"activated" providers, and calls I for each of them. +If no providers have been "activated" yet, it tries to activate all +available fallback providers before iterating over them. + +ossl_provider_name() returns the name that was given with +ossl_provider_new(). + +ossl_provider_dso() returns a reference to the module, for providers +that come in the form of loadable modules. + +ossl_provider_module_name() returns the filename of the module, for +providers that come in the form of loadable modules. + +ossl_provider_module_path() returns the full path of the module file, +for providers that come in the form of loadable modules. + +ossl_provider_teardown() calls the provider's I function, if +the provider has one. + +ossl_provider_gettable_params() calls the provider's I +function, if the provider has one. +It should return an array of I to describe all the +parameters that the provider has for the provider object. + +ossl_provider_get_params() calls the provider's parameter request +responder. +It should treat the given I array as described in +L. + +ossl_provider_get_capabilities() calls the provider's I function, +if the provider has one. It provides the name of the I and a +callback I parameter to call for each capability that has a matching name in +the provider. The callback gets passed OSSL_PARAM details about the capability as +well as the caller supplied argument I. + +ossl_provider_query_operation() calls the provider's +I function, if the provider has one. +It should return an array of I for the given +I. + +ossl_provider_unquery_operation() informs the provider that the result of +ossl_provider_query_operation() is no longer going to be directly accessed and +that all relevant information has been copied. + +ossl_provider_set_operation_bit() registers a 1 for operation I +in a bitstring that's internal to I. + +ossl_provider_test_operation_bit() checks if the bit operation I +is set (1) or not (0) in the internal I bitstring, and sets +I<*result> to 1 or 0 accorddingly. + +ossl_provider_init_as_child() stores in the library context I references to +the necessary upcalls for managing child providers. The I and I +parameters are the B and L pointers that were +passed to the provider's B function. + +ossl_provider_deinit_child() deregisters callbacks from the parent library +context about provider creation or removal events for the child library context +I. Must only be called if I is a child library context. + +=head1 NOTES + +Locating a provider module happens as follows: + +=over 4 + +=item 1. + +If a path was given with ossl_provider_set_module_path(), use that as +module path. +Otherwise, use the provider object's name as module path, with +platform specific standard extensions added. + +=item 2. + +If the environment variable B is defined, assume its +value is a directory specification and merge it with the module path. +Otherwise, merge the value of the OpenSSL built in macro B +with the module path. + +=back + +When this process is done, the result is used when trying to load the +provider module. + +The command C can be used to find out the value +of the built in macro B. + +=head1 RETURN VALUES + +ossl_provider_find() and ossl_provider_new() return a pointer to a +provider object (I) on success, or NULL on error. + +ossl_provider_up_ref() returns the value of the reference count after +it has been incremented. + +ossl_provider_free() doesn't return any value. + +ossl_provider_doall_activated() returns 1 if the callback was called for all +activated providers. A return value of 0 means that the callback was not +called for any activated providers. + +ossl_provider_set_module_path(), ossl_provider_set_fallback(), +ossl_provider_activate(), ossl_provider_activate_leave_fallbacks() and +ossl_provider_deactivate(), ossl_provider_add_to_store(), +ossl_provider_default_props_update() return 1 on success, or 0 on error. + +ossl_provider_name(), ossl_provider_dso(), +ossl_provider_module_name(), and ossl_provider_module_path() return a +pointer to their respective data if it's available, otherwise NULL +is returned. + +ossl_provider_libctx() return a pointer to the library context. +This may be NULL, and is perfectly valid, as it denotes the default +global library context. + +ossl_provider_teardown() doesn't return any value. + +ossl_provider_gettable_params() returns a pointer to a constant +I array if this function is available in the provider, +otherwise NULL. + +ossl_provider_get_params() returns 1 on success, or 0 on error. +If this function isn't available in the provider, 0 is returned. + +ossl_provider_set_operation_bit() and ossl_provider_test_operation_bit() +return 1 on success, or 0 on error. + +ossl_provider_get_capabilities() returns 1 on success, or 0 on error. +If this function isn't available in the provider or the provider does not +support the requested capability then 0 is returned. + +=head1 SEE ALSO + +L, L, L + +=head1 HISTORY + +The functions described here were all added in OpenSSL 3.0. + +=head1 COPYRIGHT + +Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved. + +Licensed under the Apache License 2.0 (the "License"). You may not use +this file except in compliance with the License. You can obtain a copy +in the file LICENSE in the source distribution or at +L. + +=cut diff --git a/deps/openssl/openssl/doc/internal/man3/ossl_punycode_decode.pod b/deps/openssl/openssl/doc/internal/man3/ossl_punycode_decode.pod new file mode 100644 index 000000000..652626159 --- /dev/null +++ b/deps/openssl/openssl/doc/internal/man3/ossl_punycode_decode.pod @@ -0,0 +1,60 @@ +=pod + +=head1 NAME + +ossl_punycode_decode, ossl_a2ulabel, ossl_a2ucompare +- internal punycode-related functions + +=head1 SYNOPSIS + + #include "crypto/punycode.h" + + int ossl_punycode_decode(const char *pEncoded, const size_t enc_len, + unsigned int *pDecoded, unsigned int *pout_length); + + int ossl_a2ulabel(const char *in, char *out, size_t *outlen); + + int ossl_a2ucompare(const char *a, const char *u); + +=head1 DESCRIPTION + +PUNYCODE encoding introduced in RFCs 3490-3492 is widely used for +representation of host names in ASCII-only format. Some specifications, +such as RFC 8398, require comparison of host names encoded in UTF-8 charset. + +ossl_a2ulabel() decodes NUL-terminated hostname from PUNYCODE to UTF-8, +using a provided buffer for output. + +ossl_a2ucompare() accepts two NUL-terminated hostnames, decodes the 1st +from PUNYCODE to UTF-8 and compares it with the 2nd one as is. + +ossl_punycode_decode() decodes one label (one dot-separated part) from +a hostname, with stripped PUNYCODE marker I. + +=head1 RETURN VALUES + +ossl_a2ulabel() returns 1 on success, 0 on not enough buf passed, +-1 on invalid PUNYCODE string passed. When valid string is provided, it sets the +I<*outlen> to the length of required buffer to perform correct decoding. + +ossl_a2ucompare() returns 1 on non-equal strings, 0 on equal strings, +-1 when invalid PUNYCODE string passed. + +ossl_punycode_decode() returns 1 on success, 0 on error. On success, +*pout_length contains the number of codepoints decoded. + +=head1 HISTORY + +The functions described here were all added in OpenSSL 3.0. + +=head1 COPYRIGHT + +Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved. + +Licensed under the Apache License 2.0 (the "License"). You may not use +this file except in compliance with the License. You can obtain a copy +in the file LICENSE in the source distribution or at +L. + +=cut + diff --git a/deps/openssl/openssl/doc/internal/man3/ossl_rand_get_entropy.pod b/deps/openssl/openssl/doc/internal/man3/ossl_rand_get_entropy.pod new file mode 100644 index 000000000..4da3f1f4d --- /dev/null +++ b/deps/openssl/openssl/doc/internal/man3/ossl_rand_get_entropy.pod @@ -0,0 +1,66 @@ +=pod + +=head1 NAME + +ossl_rand_get_entropy, ossl_rand_cleanup_entropy, +ossl_rand_get_nonce, ossl_rand_cleanup_nonce +- get seed material from the operating system + +=head1 SYNOPSIS + + #include "crypto/rand.h" + + size_t ossl_rand_get_entropy(OSSL_CORE_HANDLE *handle, + unsigned char **pout, int entropy, + size_t min_len, size_t max_len); + void ossl_rand_cleanup_entropy(OSSL_CORE_HANDLE *handle, + unsigned char *buf, size_t len); + size_t ossl_rand_get_nonce(OSSL_CORE_HANDLE *handle, + unsigned char **pout, size_t min_len, + size_t max_len, const void *salt, size_t salt_len); + void ossl_rand_cleanup_nonce(OSSL_CORE_HANDLE *handle, + unsigned char *buf, size_t len); + +=head1 DESCRIPTION + +ossl_rand_get_entropy() retrieves seeding material from the operating system. +The seeding material will have at least I bytes of randomness and is +stored in a buffer which contains at least I and at most I +bytes. The buffer address is stored in I<*pout> and the buffer length is +returned to the caller. + +ossl_rand_cleanup_entropy() cleanses and frees any storage allocated by +ossl_rand_get_entropy(). The seeding buffer is pointed to by I and is +of length I bytes. + +ossl_rand_get_nonce() retrieves a nonce using the passed I parameter +of length I and operating system specific information. +The I should contain uniquely identifying information and this is +included, in an unspecified manner, as part of the output. +The output is stored in a buffer which contains at least I and at +most I bytes. The buffer address is stored in I<*pout> and the +buffer length returned to the caller. + +ossl_rand_cleanup_nonce() cleanses and frees any storage allocated by +ossl_rand_get_nonce(). The nonce buffer is pointed to by I and is +of length I bytes. + +=head1 RETURN VALUES + +ossl_rand_get_entropy() and ossl_rand_get_nonce() return the number of bytes +in I<*pout> or 0 on error. + +=head1 HISTORY + +The functions described here were all added in OpenSSL 3.0. + +=head1 COPYRIGHT + +Copyright 2020 The OpenSSL Project Authors. All Rights Reserved. + +Licensed under the Apache License 2.0 (the "License"). You may not use +this file except in compliance with the License. You can obtain a copy +in the file LICENSE in the source distribution or at +L. + +=cut diff --git a/deps/openssl/openssl/doc/internal/man3/ossl_random_add_conf_module.pod b/deps/openssl/openssl/doc/internal/man3/ossl_random_add_conf_module.pod new file mode 100644 index 000000000..6d4f5810d --- /dev/null +++ b/deps/openssl/openssl/doc/internal/man3/ossl_random_add_conf_module.pod @@ -0,0 +1,42 @@ +=pod + +=head1 NAME + +ossl_random_add_conf_module - internal random configuration module + +=head1 SYNOPSIS + + #include "crypto/rand.h" + + /* Configuration */ + void ossl_random_add_conf_module(void); + +=head1 DESCRIPTION + +ossl_random_add_conf_module() adds the random configuration module +for providers. +This allows the type and parameters of the stardard setup of random number +generators to be configured with an OpenSSL L file. + +=head1 RETURN VALUES + +ossl_random_add_conf_module() doesn't return any value. + +=head1 SEE ALSO + +L, L, L + +=head1 HISTORY + +The functions described here were all added in OpenSSL 3.0. + +=head1 COPYRIGHT + +Copyright 2020 The OpenSSL Project Authors. All Rights Reserved. + +Licensed under the Apache License 2.0 (the "License"). You may not use +this file except in compliance with the License. You can obtain a copy +in the file LICENSE in the source distribution or at +L. + +=cut diff --git a/deps/openssl/openssl/doc/internal/man3/ossl_rsa_get0_all_params.pod b/deps/openssl/openssl/doc/internal/man3/ossl_rsa_get0_all_params.pod new file mode 100644 index 000000000..a7ebb613b --- /dev/null +++ b/deps/openssl/openssl/doc/internal/man3/ossl_rsa_get0_all_params.pod @@ -0,0 +1,75 @@ +=pod + +=head1 NAME + +ossl_rsa_set0_all_params, ossl_rsa_get0_all_params +- Internal routines for getting and setting data in an RSA object + +=head1 SYNOPSIS + + #include "crypto/rsa.h" + + int ossl_rsa_get0_all_params(RSA *r, STACK_OF(BIGNUM_const) *primes, + STACK_OF(BIGNUM_const) *exps, + STACK_OF(BIGNUM_const) *coeffs); + int ossl_rsa_set0_all_params(RSA *r, const STACK_OF(BIGNUM) *primes, + const STACK_OF(BIGNUM) *exps, + const STACK_OF(BIGNUM) *coeffs); + +=head1 DESCRIPTION + +ossl_rsa_set0_all_params() sets all primes, CRT exponents and CRT coefficients +in the B object I to the contents of the stacks of BIGNUMs I, +I and I. The B object takes ownership of the BIGNUMs, +but not of the stacks. + +ossl_rsa_get0_all_params() gets all primes, CRT exponents and CRT coefficients +in the B object I and pushes them on the stacks of constant BIGNUMs +I, I and I. The B object retains ownership of the +BIGNUMs, but not of the stacks. + +=head1 NOTES + +For RSA_set0_all_params() and RSA_get0_all_params(): + +=over 4 + +=item * + +the I stack contains I

, I, and then the rest of the primes +if the B object is a multi-prime RSA key. + +=item * + +the I stack contains I, I, and then the rest of the exponents +if the B object is a multi-prime RSA key. + +=item * + +the I stack contains I, and then the rest of the coefficients +if the B object is a multi-prime RSA key. + +=back + +The number of primes must always be equal to the number of exponents, and +the number of coefficients must be one less than the number of primes. + +=head1 RETURN VALUES + +ossl_rsa_get0_all_params() and ossl_rsa_set0_all_params() return 1 on success, +or 0 on failure. + +=head1 SEE ALSO + +L + +=head1 COPYRIGHT + +Copyright 2019-2020 The OpenSSL Project Authors. All Rights Reserved. + +Licensed under the Apache License 2.0 (the "License"). You may not use +this file except in compliance with the License. You can obtain a copy +in the file LICENSE in the source distribution or at +L. + +=cut diff --git a/deps/openssl/openssl/doc/internal/man3/x509v3_cache_extensions.pod b/deps/openssl/openssl/doc/internal/man3/x509v3_cache_extensions.pod new file mode 100644 index 000000000..cc0aeb607 --- /dev/null +++ b/deps/openssl/openssl/doc/internal/man3/x509v3_cache_extensions.pod @@ -0,0 +1,41 @@ +=pod + +=head1 NAME + +x509v3_cache_extensions +- cache info on various X.509v3 extensions and further derived certificate data + +=head1 SYNOPSIS + + #include + + int x509v3_cache_extensions(X509 *x, OSSL_LIB_CTX *libctx, const char *propq); + +=head1 DESCRIPTION + +This function processes any X509v3 extensions present in an X509 object I +and caches the result of that processing as well as further derived info, +for instance whether the certificate is self-issued or has version X.509v1. +It computes the SHA1 digest of the certificate using the default library context +and property query string and stores the result in x->sha1_hash, +or on failure sets B in x->flags. +It sets B in x->flags if x->siginf was filled successfully, +which may not be possible if a referenced algorithm is unknown or not available. +Many OpenSSL functions that use an X509 object call this function implicitly. + +=head1 RETURN VALUES + +This function returns 0 if the extensions or other portions of the certificate +are invalid or an error occurred. +Otherwise it returns 1. + +=head1 COPYRIGHT + +Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved. + +Licensed under the Apache License 2.0 (the "License"). You may not use +this file except in compliance with the License. You can obtain a copy +in the file LICENSE in the source distribution or at +L. + +=cut diff --git a/deps/openssl/openssl/doc/internal/man7/DERlib.pod b/deps/openssl/openssl/doc/internal/man7/DERlib.pod new file mode 100644 index 000000000..24280b976 --- /dev/null +++ b/deps/openssl/openssl/doc/internal/man7/DERlib.pod @@ -0,0 +1,149 @@ +=pod + +=head1 NAME + +DERlib - internal OpenSSL DER library + +=head1 DESCRIPTION + +OpenSSL contains an internal small DER reading and writing library, +as an alternative to the publicly known i2d and d2i functions. It's +solely constituted of functions that work as building blocks to create +more similar functions to encode and decode larger structures. + +All these functions have similar function signatures (C +will vary depending on what the function will encode): + + int DER_w_something(WPACKET *pkt, int tag, ...); + +=begin comment + +When readers are added, add this: + + int DER_r_something(PACKET *pkt, int tag, ...); + +=end comment + +I is the packet context used, and I should be the +context-specific tag value of the element being handled, or -1 if there +is no tag number for that element (you may use the convenience macro +B instead of -1). Any argument following is the C +variable that's being encoded or decoded. + +=head2 DER writers / encoders + +DER writers are based in L, a generic packet writing +library, so before using any of them, I must be initialized +using L or L + +DER writers must be used in reverse order, except for the wrapping +functions that implement a constructed element. The latter are easily +recognised by their function name including the words C and +C. As an example, we can look at the DSA signature structure, +which is defined like this in ASN.1 terms: + + -- Copied from RFC 3279, section 2.2.2 + Dss-Sig-Value ::= SEQUENCE { + r INTEGER, + s INTEGER } + +With the DER library, this is the corresponding code, given two OpenSSL +Bs I and I: + + int ok = ossl_DER_w_begin_sequence(pkt, -1) + && ossl_DER_w_bn(pkg, -1, s) + && ossl_DER_w_bn(pkg, -1, r) + && ossl_DER_w_end_sequence(pkt, -1); + +As an example of the use of I, an ASN.1 element like this: + + v [1] INTEGER OPTIONAL + +Would be encoded like this: + + ossl_DER_w_bn(pkt, 1, v) + +=begin comment + +=head2 DER readers / decoders + +TBA + +=end comment + +=head1 EXAMPLES + +A more complex example, encoding the AlgorithmIdentifier with +RSASSA-PSS values. + +As a reminder, the AlgorithmIdentifier is specified like this: + + -- From RFC 3280, section 4.1.1.2 + AlgorithmIdentifier ::= SEQUENCE { + algorithm OBJECT IDENTIFIER, + parameters ANY DEFINED BY algorithm OPTIONAL } + +And the RSASSA-PSS OID and parameters are specified like this: + + -- From RFC 3279, section 3.1 + id-RSASSA-PSS OBJECT IDENTIFIER ::= { pkcs-1 10 } + + RSASSA-PSS-params ::= SEQUENCE { + hashAlgorithm [0] HashAlgorithm DEFAULT + sha1Identifier, + maskGenAlgorithm [1] MaskGenAlgorithm DEFAULT + mgf1SHA1Identifier, + saltLength [2] INTEGER DEFAULT 20, + trailerField [3] INTEGER DEFAULT 1 } + +The value we want to encode, written in ASN.1 syntax: + + { + algorithm id-RSASSA-PSS, + parameters { + hashAlgorithm sha256Identifier, + maskGenAlgorithm mgf1SHA256Identifier, + saltLength 20 -- unnecessarily explicit + } + } + +Assuming that we have precompiled constants for C, +C and C, the DER writing code +looks as follows. This is a complete function to write that specific +value: + + int DER_w_AlgorithmIdentifier_RSASSA_PSS_special(WPACKET *pkt, + int tag, + RSA *rsa) + { + return ossl_DER_w_begin_sequence(pkt, tag) + && (ossl_DER_w_begin_sequence(pkt, DER_NO_CONTEXT) + && ossl_DER_w_uint32(pkt, 2, 20) + && ossl_DER_w_precompiled(pkt, 1, + der_mgf1SHA256Identifier, + sizeof(der_mgf1SHA256Identifier)) + && ossl_DER_w_precompiled(pkt, 0, + der_sha256Identifier, + sizeof(der_sha256Identifier)) + && ossl_DER_w_end_sequence(pkt, DER_NO_CONTEXT)) + && ossl_DER_w_precompiled(pkt, DER_NO_CONTEXT, + der_id_RSASSA_PSS, + sizeof(der_id_RSASSA_PSS)) + && ossl_DER_w_end_sequence(pkt, tag); + } + +=head1 SEE ALSO + +L, L, +L + +=head1 COPYRIGHT + +Copyright 2020-2022 The OpenSSL Project Authors. All Rights Reserved. + +Licensed under the Apache License 2.0 (the "License"). You may not use +this file except in compliance with the License. You can obtain a copy +in the file LICENSE in the source distribution or at +L. + +=cut diff --git a/deps/openssl/openssl/doc/internal/man7/EVP_PKEY.pod b/deps/openssl/openssl/doc/internal/man7/EVP_PKEY.pod new file mode 100644 index 000000000..cc738b9c2 --- /dev/null +++ b/deps/openssl/openssl/doc/internal/man7/EVP_PKEY.pod @@ -0,0 +1,212 @@ +=pod + +=head1 NAME + +EVP_PKEY - an internal description + +=head1 SYNOPSIS + + #include "crypto/evp.h" + + typedef struct evp_pkey_st EVP_PKEY; + +=head1 DESCRIPTION + +I + +B is a complex type that's essentially a container for +private/public key pairs, but has had other uses as well. + +=for comment "uses" could as well be "abuses"... + +The private/public key pair that an B contains is refered to +as its "internal key" or "origin" (the reason for "origin" is +explained further down, in L), +and it can take one of the following forms: + +=over 4 + +=item legacy origin + +This is the form that an B in OpenSSL prior to 3.0 had. The +internal key in the B is a pointer to the low-level key +types, such as B, B and B, or an engine driven +structure, and is governed by an associated L and +an L. + +The functions available through those two method structures get full +access to the B and therefore have a lot of freedom to +modify whatever they want. This also means that an B is a +shared structure between libcrypto and any ENGINE that serves such +methods. + +=item provider-native origin + +This is a new form in OpenSSL 3.0, which permits providers to hold the +key data (see L). The internal key in the +B is a pointer to that key data held by the provider, and +is governed by an associated L method structure. + +The functions available through the L have no access +to the B, and can therefore not make any direct changes. +Similarly, the key data that the B points at is only known +to the functions pointed at in the L. + +=back + +These two forms can never co-exist in the same B, the main +reason being that having both at the same time will create problems +with synchronising between the two forms, and potentially make it +confusing which one of the two is the origin. + +=head2 Key mutability + +The B internal keys are mutable. + +This is especially visible with internal legacy keys, since they can +be extracted with functions like L and then +modified at will with functions like L. Note that if the +internal key is a provider key then the return value from functions such as +L is a cached copy of the key. Changes to the cached +copy are not reflected back in the provider key. + +Internal provider native keys are also possible to be modified, if the +associated L implementation allows it. This is done +with L and its specialised derivatives. The +OpenSSL providers allow it for the following: + +=over 4 + +=item DH, EC, X25519, X448: + +It's possible to set the encoded public key. This is supported in +particular through L. + +=item EC: + +It's possible to flip the ECDH cofactor mode. + +=back + +Every time the B internal key mutates, an internal dirty +count is incremented. The need for a dirty count is explained further +in L. + +For provider native origin keys, this doesn't require any help from +the L, the dirty count is maintained in the B +itself, and is incremented every time L or its +specialised derivatives are called. +For legacy origin keys, this requires the associated +L to implement the dirty_cnt() function. All +of OpenSSL's built-in L implement this +function. + +=head2 Export cache for provider operations + +OpenSSL 3.0 can handle operations such as signing, encrypting, etc in +diverse providers, potentially others than the provider of the +L. Two providers, possibly from different vendors, +can't be expected to share internal key structures. There are +therefore instances where key data will need to be exported to the +provider that is going to perform the operation (this also implies +that every provider that implements a key pair based operation must +also implement an L). + +For performance reasons, libcrypto tries to minimize the need to +perform such an export, so it maintains a cache of such exports in the +B. Each cache entry has two items, a pointer to the +provider side key data and the associated L. + +I + +The export to the operation key cache can be performed independent of +what form the origin has. +For a legacy origin, this requires that the associated +L implements the functions export_to() and +dirty_cnt(). +For a provider native origin, this requires that the associated +L implements the OSSL_FUNC_keymgmt_export() function +(see L). +In all cases, the receiving L (the one associated with +the exported key data) must implement OSSL_FUNC_keymgmt_import(). + +If such caching isn't supported, the operations that can be performed +with that key are limited to the same backend as the origin key +(ENGINE for legacy origin keys, provider for provider side origin +keys). + +=head3 Exporting implementation details + + +Exporting a key to the operation cache involves the following: + +=over 4 + +=item 1. + +Check if the dirty count for the internal origin key has changed since +the previous time. This is done by comparing it with a copy of the +dirty count, which is maintained by the export function. + +If the dirty count has changed, the export cache is cleared. + +=item 2. + +Check if there's an entry in the export cache with the same +L that's the same provider that an export is to be +made to (which is the provider that's going to perform an operation +for which the current B is going to be used). + +If such an entry is found, nothing more is done, the key data and +L found in that export cache entry will be used for +the operation to be performed. + +=item 3. + +Export the internal origin key to the provider, using the appropriate +method. + +For legacy origin keys, that's done with the help of the +L export_to() function. + +For provider native origin keys, that's done by retrieving the key +data in L form from the origin keys, using the +OSSL_FUNC_keymgmt_export() functions of the associated +L, and sending that data to the L of +the provider that's to perform the operation, using its +OSSL_FUNC_keymgmt_import() function. + +=back + +=head2 Changing a key origin + +It is never possible to change the origin of a key. An B with a legacy +origin will I be upgraded to become an B with a provider +native origin. Instead, we have the operation cache as described above, that +takes care of the needs of the diverse operation the application may want to +perform. + +Similarly an B with a provider native origin, will I be +I into an B with a legacy origin. Instead we may have a +cached copy of the provider key in legacy form. Once the cached copy is created +it is never updated. Changes made to the provider key are not reflected back in +the cached legacy copy. Similarly changes made to the cached legacy copy are not +reflected back in the provider key. + +=head1 SEE ALSO + +L + +=head1 COPYRIGHT + +Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved. + +Licensed under the Apache License 2.0 (the "License"). You may not use +this file except in compliance with the License. You can obtain a copy +in the file LICENSE in the source distribution or at +L. + +=cut diff --git a/deps/openssl/openssl/doc/internal/man7/VERSION.pod b/deps/openssl/openssl/doc/internal/man7/VERSION.pod new file mode 100644 index 000000000..4bc8ba6b9 --- /dev/null +++ b/deps/openssl/openssl/doc/internal/man7/VERSION.pod @@ -0,0 +1,149 @@ +=pod + +=head1 NAME + +VERSION - OpenSSL version information + +=head1 SYNOPSIS + + MAJOR=3 + MINOR=0 + PATCH=0 + PRE_RELEASE_TAG=dev + BUILD_METADATA= + RELEASE_DATE= + SHLIB_VERSION=3 + +=head1 DESCRIPTION + +This file is a set of keyed information looking like simple variable +assignments. When given an empty value, they are seen as unassigned. +The keys that are recognised are: + +=over 4 + +=item B, B, B + +The three parts of OpenSSL's 3 numbered version number, MAJOR.MINOR.PATCH. +These are used to compose the values for the C macros B, +B, B. + +=item B + +This is the added pre-release tag, which is added to the version separated by +a dash. For a value C, the C macro B gets +the string C<-foo> (dash added). + +=item B + +Extra metadata to be used by anyone for their own purposes. This is added to +the version and possible pre-release tag, separated by a plus sign. For a +value C, the C macro B gets the string +C<+bar>. + +=item B + +Defined in releases. When not set, it gets the value C. + +=item B + +The shared library version, which is something other than the project version. + +=back + +It is a configuration error if B, B, B and B +don't have values. Configuration will stop in that case. + +=head2 Affected configuration data + +The following items in %config from F are affected: + +=over 4 + +=item $config{major}, $config{minor}, $config{patch}, $config{shlib_version} + +These items get their values from B, B, B, and +B, respectively. + +=item $config{prerelease} + +If B is assigned a value, $config{prerelease} gets that same value, +prefixed by a dash, otherwise the empty string. + +=item $config{build_metadata} + +If B is assigned a value, $config{build_metadata} gets that same +value, prefixed by a plus sign, otherwise the empty string. + +=item $config{release_date} + +If B is assigned a value, $config{release_date} gets that same +value, otherwise the string C. + +=item $config{version} + +The minimal version number, a string composed from B, B and +B, separated by periods. For C, C and C, +the string will be C<3.0.0>. + +=item $config{full_version} + +The fully loaded version number, a string composed from $config{version}, +$config{prerelease} and $config{build_metadata}. See See L for +a few examples. + +=back + +=head1 EXAMPLES + +=over 4 + +=item 1. + + MAJOR=3 + MINOR=0 + PATCH=0 + PRE_RELEASE_TAG=dev + BUILD_METADATA= + +The fully loaded version number ($config{full_version}) will be +C<3.0.0-dev>. + +=item 2. + + MAJOR=3 + MINOR=0 + PATCH=0 + PRE_RELEASE_TAG= + BUILD_METADATA=something + +The fully loaded version number ($config{full_version}) will be +C<3.0.0+something>. + +=item 3. + + MAJOR=3 + MINOR=0 + PATCH=0 + PRE_RELEASE_TAG=alpha3 + BUILD_METADATA=something + +The fully loaded version number ($config{full_version}) will be +C<3.0.0-alpha3+something>. + +=back + +=head1 SEE ALSO + +L + +=head1 COPYRIGHT + +Copyright 2019 The OpenSSL Project Authors. All Rights Reserved. + +Licensed under the Apache License 2.0 (the "License"). You may not use +this file except in compliance with the License. You can obtain a copy +in the file LICENSE in the source distribution or at +L. + +=cut diff --git a/deps/openssl/openssl/doc/internal/man7/build.info.pod b/deps/openssl/openssl/doc/internal/man7/build.info.pod new file mode 100644 index 000000000..080c9e444 --- /dev/null +++ b/deps/openssl/openssl/doc/internal/man7/build.info.pod @@ -0,0 +1,644 @@ +=pod + +=head1 NAME + +build.info - Building information files + +=head1 SYNOPSIS + +B0|1B<]> + +B0|1B<]> + +B + +B + +B I

... + +B I ... + +B I ... + +B I ... + +B I ... + +BIB<]=> I ... + +BIB<]=> I I ... + +BIB<]=> I ... + +BIB<]=> I ... + +BIB<]=> I[B<=>I] ... + +BIB<]=> I ... + +B<$>IB<=>I + +=head1 DESCRIPTION + +OpenSSL's build system revolves around three questions: + +=over 4 + +=item What to build for? + +This is about choice of platform (combination of hardware, operating +system, and toolchain). + +=item What to build? + +This is about having all the information on what needs to be built and +from what. + +=item How to build it? + +This is about build file generation. + +=back + +This document is all about the second item, "What to build?", and most +of all, how to specify that information. + +For some terms used in this document, please see the L at +the end. + +=head2 F files + +F files are meta data files for OpenSSL's built file +generators, and are used to specify exactly what end product files +(programs, libraries, modules or scripts) are to be produced, and from +what sources. + +Intermediate files, such as object files, are seldom referred to at +all. They sometimes can be, if there's a need, but this should happen +very rarely, and support for that sort of thing is added on as-needed +basis. + +Any time a directory or file is expected in a statement value, Unix +syntax must be used, which means that the slash C must be used as +the directory separator. + +=head2 General syntax + +=head3 Comments + +Comments are any line that start with a hash sign (C<#>). The hash +sign may be preceded by any number of horizontal spaces. + +=head3 Filenames + +F files are platform agnostic. This means that there is +some information in them that is representative rather than specific. + +This is particularly visible with end product names, they work more +like a tag than as the actual filename that's going to be produced. +This is because different platforms have different decorations on +different types of files. + +For example, if we say that we want to produce a program C, it +would look like this: + + PROGRAM=foo + +However, the program filename may end up being just C (typical +for Unix), or C (typical for Windows), or even C +(possible on VMS, depending on policy). + +These platform specific decorations are not the concern of +F files. The build file generators are responsible for +transforming these platform agnostic names to their platform specific +counterparts. + +=head3 Statements + +With the exception of variables and conditions, the general statement +syntax is one of: + +=over 4 + +=item B> B<=> I ... + +=item B[>IB<]> B<=> I ... + +=back + +Every B> represents some particular type of information. + +The first form (sometimes called "plain statement") is used to specify +information on what end products need to be built, for example: + + PROGRAMS=foo bar + LIBS=libpoly libcookie + MODULES=awesome-plugin + SCRIPTS=tool1 tool2 + SUBDIRS=dir1 dir2 + +This says that we want to build programs C and C, the +libraries C and C, an awesome plugin module +C, a couple of scripts C and C, and +finally that there are more F files in subdirectories +C and C. + +The second form (sometimes called "indexed statement") is used to +specify further details for existing items, for example: + + SOURCE[foo]=foo.c details.c + DEPEND[foo]=libcookie + +This says that the program C is built from the source files +F and F, and that it depends on the library +C (in other words, the library will be included when +linking that program together). + +Multiple space separated items are allowed too: + + SOURCE[foo]=foo.c + SOURCE[details]=details.c + DEPEND[foo details]=libcookie + +For any indexed statement for which the items haven't been specified +through any plain statement, or where the items exists but the indexed +statement does not apply, the value is simply ignored by the build +file generators. + +=head3 Statement attributes + +Some statements can have attributes added to them, to allow for +variations on how they are treated. + +=over 4 + +=item B{> I | IB<=>I [,...]B<}> +B<=> I ... + +=item B[>IB<]{> I | IB<=>I +[,...]B<}> B<=> I ... + +=back + +Attributes are passed as they are to the build file generators, and +the exact interpretation of those attributes is entirely up to them +(see L below for details). + +A current example: + + LIBS{noinst,has_main}=libtestutil.a + +This says that the static library C should not be +installed (C), and that it includes an object file that has +the C
symbol (C). Most platforms don't need to know +the latter, but there are some where the program linker will not look +for C
in libraries unless it's explicitly told so, so this is +way to tell the build file generator to emit the necessary command +options to make that happen. + +Attributes are accumulated globally. This means that a library could +be given like this in different places: + + # Location 1 + LIBS=libwhatever + + # Location 2 + LIBS{noinst}=libwhatever + + # Location 3 + LIBS{has_main}=libwhatever + +The end result is that the library C will have the +attributes C and C attached to it. + +=head3 Quoting and tokens + +Statement values are normally split into a list of tokens, separated +by spaces. + +To avoid having a value split up into several tokens, they may be +quoted with double (C<">) or single (C<'>) quotes. + +For example: + + PROGRAMS=foo "space cadet" bar + +This says that we sant to build three programs, C, C +and C. + +=head3 Conditionals + +F files include a very simple condition system, involving +the following keywords: + +=over 4 + +=item B0|1B<]> + +=item B0|1B<]> + +=item B + +=item B + +=back + +This works like any condition system with similar syntax, and the +condition value in B and B can really be any literal value +that perl can interpret as true or false. + +Conditional statements are nesting. + +In itself, this is not very powerful, but together with L, +it can be. + +=head3 Variables + +F handles simple variables. They are defined by +assignment: + +=over 4 + +=item B<$>I B<=> I + +=back + +These variables can then be used as part of any statement value or +indexed statement item. This should be used with some care, as +I. + +I + +Variable references can be one of: + +=over 4 + +=item B<$>I or B<${>IB<}> + +Simple reference; the variable reference is replaced with its value, +verbatim. + +=item B<${>IBIBIB<}> + +Substitution reference; the variable reference is replaced with its +value, modified by replacing all occurrences of I with I. + +=back + +=head2 Scope + +Most of the statement values are accumulated globally from all the +F files that are digested. There are two exceptions, +F variables and B statement, for which the scope +is the F file they are in. + +=head2 Perl nuggets + +Whenever a F file is read, it is passed through the Perl +template processor L, which is a small extension of +L. + +Perl nuggets are anything between C<{-> and C<-}>, and whatever the +result from such a nugget is, that value will replace the nugget in +text form. This is useful to get dynamically generated F +statements, and is most often seen used together with the B and +B conditional statements. + +For example: + + IF[{- $disabled{something} -}] + # do whatever's needed when "something" is disabled + ELSIF[{- $somethingelse eq 'blah' -}] + # do whatever's needed to satisfy this condition + ELSE + # fallback + ENDIF + +Normal Perl scope applies, so it's possible to have an initial perl +nugget that sets diverse global variables that are used in later +nuggets. Each nugget is a Perl block of its own, so B definitions +are only in scope within the same nugget, while B definitions are +in scope within the whole F file. + +=head1 REFERENCE + +=head2 Conditionals + +=over 4 + +=item B0|1B<]> + +If the condition is true (represented as C<1> here), everything +between this B and the next corresponding B or B +applies, and the rest until the corresponding B is skipped +over. + +If the condition is false (represented as C<0> here), everything +from this B is skipped over until the next corresponding B +or B, at which point processing continues. + +=item B + +If F statements have been skipped over to this point since +the corresponding B or B, F processing starts +again following this line. + +=item B0|1B<]> + +This is B and B combined. + +=item B + +Marks the end of a conditional. + +=back + +=head2 Plain statements + +=over 4 + +=item B I ... + +This instructs the F reader to also read the F +file in every specified directory. All directories should be given +relative to the location of the current F file. + +=item B I ... + +Collects names of programs that should be built. + +B statements may have attributes, which apply to all the +programs given in such a statement. For example: + + PROGRAMS=foo + PROGRAMS{noinst}=bar + +With those two lines, the program C will not have the attribute +C, while the program C will. + +=item B I ... + +Collects names of libraries that should be built. + +The normal case is that libraries are built in both static and shared +form. However, if a name ends with C<.a>, only the static form will +be produced. + +Similarly, libraries may be referred in indexed statements as just the +plain name, or the name including the ending C<.a>. If given without +the ending C<.a>, any form available will be used, but if given with +the ending C<.a>, the static library form is used unconditionally. + +B statements may have attributes, which apply to all the +libraries given in such a statement. For example: + + LIBS=libfoo + LIBS{noinst}=libbar + +With those two lines, the library C will not have the +attribute C, while the library C will. + +=item B I + +Collects names of dynamically loadable modules that should be built. + +B statements may have attributes, which apply to all the +modules given in such a statement. For example: + + MODULES=foo + MODULES{noinst}=bar + +With those two lines, the module C will not have the attribute +C, while the module C will. + +=item B I + +Collects names of scripts that should be built, or that just exist. +That is how they differ from programs, as programs are always expected +to be compiled from multiple sources. + +B statements may have attributes, which apply to all the +scripts given in such a statement. For example: + + SCRIPTS=foo + SCRIPTS{noinst}=bar + +With those two lines, the script C will not have the attribute +C, while the script C will. + +=back + +=head2 Indexed statements + +=over 4 + +=item BIB<]> B<=> I ... + +Collects dependencies, where I depend on the given Is. + +As a special case, the I may be empty, for which the build file +generators should make the whole build depend on the given Is, +rather than the specific I. + +The I may be any program, library, module, script, or any +filename used as a value anywhere. + +The I may also be literal build file targets. Those are +recognised by being surrounded be vertical bars (also known as the +"pipe" character), C<|>. For example: + + DEPEND[|tests|]=fipsmodule.cnf + +B statements may have attributes, which apply to each +individual dependency in such a statement. For example: + + DEPEND[libfoo.a]=libmandatory.a + DEPEND[libfoo.a]{weak}=libbar.a libcookie.a + +With those statements, the dependency between C and +C is strong, while the dependency between C +and C and C is weak. See the description of +B in L for more information. + +=item BIB<]> B<=> I I ... + +This specifies that the I is generated using the I +with the Is as arguments, plus the name of the output +file as last argument. + +For Is where this is applicable, any B statement +for the same I will be given to the I as its +inclusion directories. Likewise, any B statement for the same +I will be given to the I as an extra file or module +to load, where this is applicable. + +The build file generators must be able to recognise the I. +Currently, they at least recognise files ending in C<.pl>, and will +execute them to generate the I, and files ending in C<.in>, +which will be used as input for L to generate +I (in other words, we use the exact same style of +L mechanism that is used to read F files). + +=item BIB<]> B<=> I ... + +Collects filenames that will be used as source files for I. + +The I must be a singular item, and may be any program, library, +module or script given with B, B, B and +B. + +Static libraries may be sources. In that case, its object files are +used directly when building I instead of relying on library +dependency and symbol resolution (through B statements). + +B statements may have attributes, which apply to each +individual dependency in such a statement. For example: + + SOURCE[prog]=prog_a.c + SOURCE[prog]{check}=prog_b.c prog_c.c + +With those statements, the association between C and C +comes with no extra attributes, while the association between C +and C as well as C comes with the extra attribute +C. + +=item BIB<]> B<=> I ... + +Collects filenames that will be used as source files for I. + +The I must be a singular item, and may be any library or module +given with B or B. For libraries, the given filenames +are only used for their shared form, so if the item is a library name +ending with C<.a>, the filenames will be ignored. + +B statements may have attributes, just as B +statements. + +=item BIB<]> B<=> I[B<=>I] ... + +Collects I / I pairs (or just I with no defined +value if no I is given) associated with I. + +The build file generators will decide what to do with them. For +example, these pairs should become C macro definitions whenever a +C<.c> file is built into an object file. + +=item BIB<]> B<=> I ... + +Collects inclusion directories that will be used when building the +I components (object files and whatever else). This is used at +the discretion of the build file generators. + +=back + +=head2 Known attributes + +Note: this will never be a complete list of attributes. + +=over 4 + +=item B + +This is used to specify that the end products this is set for should +not be installed, that they are only internal. This is applicable on +internal static libraries, or on test programs. + +=item B + +This is used with B, to specify that some scripts should be +installed in the "misc" directory rather than the normal program +directory. + +=item B + +This is used with B, to specify what modules are engines and +should be installed in the engines directory instead of the modules +directory. + +=item B + +This is used with B where libraries are involved, to specify +that the dependency between two libraries is weak and is only there to +infer order. + +Without this attribute, a dependency between two libraries, expressed +like this, means that if C appears in a linking command +line, so will C: + + DEPEND[libfoo.a]=libmandatory.a + +With this attribute, a dependency between two libraries, expressed +like this, means that if I C and C +appear in a linking command line (because of recursive dependencies +through other libraries), they will be ordered in such a way that this +dependency is maintained: + + DEPEND[libfoo.a]{weak}=libfoo.a libcookie.a + +This is useful in complex dependency trees where two libraries can be +used as alternatives for each other. In this example, C and +C have alternative implementations of the same thing, and +C has unresolved references to that same thing, and is +therefore depending on either of them, but not both at the same time: + + DEPEND[program1]=libmandatory.a lib1.a + DEPEND[program2]=libmandatory.a lib2.a + DEPEND[libmandatory]{weak}=lib1.a lib2.a + +=back + +=head1 GLOSSARY + +=over 4 + +=item "build file" + +This is any platform specific file that describes the complete build, +with platform specific commands. On Unix, this is typically +F; on VMS, this is typically F. + +=item "build file generator" + +Perl code that generates build files, given configuration data and +data collected from F files. + +=item "plain statement" + +Any F statement of the form B>=I, with +the exception of conditional statements and variable assignments. + +=item "indexed statement" + +Any F statement of the form B[>IB<]=>I, +with the exception of conditional statements. + +=item "intermediate file" + +Any file that's an intermediate between a source file and an end +product. + +=item "end product" + +Any file that is mentioned in the B, B, B or +B. + +=back + +=head1 SEE ALSO + +For OpenSSL::Template documentation, +C + +L + +=head1 COPYRIGHT + +Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved. + +Licensed under the Apache License 2.0 (the "License"). You may not use this +file except in compliance with the License. You can obtain a copy in the file +LICENSE in the source distribution or at +L. + +=cut diff --git a/deps/openssl/openssl/doc/internal/man7/deprecation.pod b/deps/openssl/openssl/doc/internal/man7/deprecation.pod new file mode 100644 index 000000000..13a4b059a --- /dev/null +++ b/deps/openssl/openssl/doc/internal/man7/deprecation.pod @@ -0,0 +1,140 @@ +=pod + +=head1 NAME + +OPENSSL_NO_DEPRECATED_3_0, OSSL_DEPRECATEDIN_3_0, +OPENSSL_NO_DEPRECATED_1_1_1, OSSL_DEPRECATEDIN_1_1_1, +OPENSSL_NO_DEPRECATED_1_1_0, OSSL_DEPRECATEDIN_1_1_0, +OPENSSL_NO_DEPRECATED_1_0_2, OSSL_DEPRECATEDIN_1_0_2, +OPENSSL_NO_DEPRECATED_1_0_1, OSSL_DEPRECATEDIN_1_0_1, +OPENSSL_NO_DEPRECATED_1_0_0, OSSL_DEPRECATEDIN_1_0_0, +OPENSSL_NO_DEPRECATED_0_9_8, OSSL_DEPRECATEDIN_0_9_8, +deprecation - How to do deprecation + +=head1 DESCRIPTION + +Deprecation of a symbol is adding an attribute to the declaration of that +symbol (function, type, variable, but we currently only do that for +functions in our public header files, F<< >>). + +Removal of a symbol is not the same thing as deprecation, as it actually +explicitly removes the symbol from public view. + +OpenSSL configuration supports deprecation as well as simulating removal of +symbols from public view (with the configuration option C, or +if the user chooses to do so, with L), and also +supports doing this in terms of a specified OpenSSL version (with the +configuration option C<--api>, or if the user chooses to do so, with +L). + +Deprecation is done using attribute macros named +B>, used with any declaration it applies to. + +Simulating removal is done with C<#ifndef> preprocessor guards using macros +named B>. + +B> and B> are +defined in F<< >>. + +In those macro names, B> corresponds to the OpenSSL release since +which the deprecation applies, with underscores instead of periods. Because +of the change in version scheme with OpenSSL 3.0, the B> for +versions before that are three numbers (such as C<1_1_0>), while they are +two numbers (such as C<3_0>) from 3.0 and on. + +The implementation of a deprecated symbol is kept for one of two reasons: + +=over 4 + +=item Planned to be removed + +The symbol and its implementation are planned to be removed some time in the +future, but needs to remain available until that time. +Such an implementation needs to be guarded appropriately, as shown in +L below. + +=item Planned to remain internally + +The symbol is planned to be removed from public view, but will otherwise +remain for internal purposes. In this case, the implementation doesn't need +to change or be guarded. + +However, it's necessary to ensure that the declaration remains available for +the translation unit where the symbol is used or implemented, even when the +symbol is publicly unavailable through simulated removal. That's done by +including an internal header file very early in the affected translation +units. See L below. + +In the future, when the deprecated declaration is to actually be removed +from public view, it should be moved to an internal header file, with the +deprecation attribute removed, and the translation units that implement or +use that symbol should adjust their header inclusions accordingly. + +=back + +=head1 EXAMPLES + +=head2 Header files + +In public header files (F<< >>), this is what a deprecation is +expected to look like, including the preprocessor wrapping for simulated +removal: + + # ifndef OPENSSL_NO_DEPRECATED_3_0 + /* ... */ + + OSSL_DEPRECATEDIN_3_0 RSA *RSA_new_method(ENGINE *engine); + + /* ... */ + # endif + +=head2 Implementations to be removed + +For a deprecated function that we plan to remove in the future, for example +RSA_new_method(), the following should be found very early (before including +any OpenSSL header file) in the translation unit that implements it and in +any translation unit that uses it: + + /* + * Suppress deprecation warnings for RSA low level implementations that are + * kept until removal. + */ + #define OPENSSL_SUPPRESS_DEPRECATED + +The RSA_new_method() implementation itself must be guarded the same way as +its declaration in the public header file is: + + #ifndef OPENSSL_NO_DEPRECATED_3_0 + RSA *RSA_new_method(ENGINE *engine) + { + /* ... */ + } + #endif + +=head2 Implementations to remain internally + +For a deprecated function that we plan to keep internally, for example +RSA_size(), the following should be found very early (before including any +other OpenSSL header file) in the translation unit that implements it and in +any translation unit that uses it: + + /* + * RSA low level APIs are deprecated for public use, but are kept for + * internal use. + */ + #include "internal/deprecated.h" + +=head1 SEE ALSO + +L + +=head1 COPYRIGHT + +Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved. + +Licensed under the Apache License 2.0 (the "License"). You may not use +this file except in compliance with the License. You can obtain a copy +in the file LICENSE in the source distribution or at +L. + +=cut diff --git a/deps/openssl/openssl/doc/life-cycles/Makefile b/deps/openssl/openssl/doc/life-cycles/Makefile new file mode 100644 index 000000000..4c12558e6 --- /dev/null +++ b/deps/openssl/openssl/doc/life-cycles/Makefile @@ -0,0 +1,26 @@ +GRAPHS=cipher.dot digest.dot kdf.dot mac.dot pkey.dot rand.dot +IMAGES= + +all: png txt +png: $(subst .dot,.png,$(GRAPHS)) +txt: $(subst .dot,.txt,$(GRAPHS)) + @echo + @echo Remember to check and manually fix the mistakes before merging + @echo into the man pages. + @echo + +# for the dot program: +# sudo apt install graphviz +%.png: %.dot + dot -Tpng -O $< + @mv $<.png $@ + +# for the graph-easy program: +# sudo apt install cpanminus +# sudo cpanm Graph::Easy +%.txt: %.dot + graph-easy --from=dot --as_ascii < $< > $@ + +clean: + rm -f $(wildcard *.png) $(wildcard *.txt) + diff --git a/deps/openssl/openssl/doc/life-cycles/README.md b/deps/openssl/openssl/doc/life-cycles/README.md new file mode 100644 index 000000000..e65c3d343 --- /dev/null +++ b/deps/openssl/openssl/doc/life-cycles/README.md @@ -0,0 +1,20 @@ +Algorithm Life-Cycle Diagrams +============================= + +This directory contains the algorithm life-cycle diagram sources. + +The canonical life-cycles are in the spreadsheet. + +The various .dot files are graph descriptions for the +[GraphViz](https://www.graphviz.org/) tool. These omit edges and should +be used for guidance only. + +To generate the rendered images, you need to install the following packages: + + sudo apt install graphviz cpanminus + sudo cpanm Graph::Easy + +Running `make` will produce a number of `.txt` and `.png` files. +These are the rendered `.dot` files. The `.txt` files require +additional editing before they can be added to the manual pages in +`internal/man7/life_cycle-*.pod`. diff --git a/deps/openssl/openssl/doc/life-cycles/cipher.dot b/deps/openssl/openssl/doc/life-cycles/cipher.dot new file mode 100644 index 000000000..c1d5b8346 --- /dev/null +++ b/deps/openssl/openssl/doc/life-cycles/cipher.dot @@ -0,0 +1,72 @@ +digraph cipher { + bgcolor="transparent"; + + begin [label=start, color="#deeaee", style="filled"]; + newed [fontcolor="#c94c4c", style="solid"]; + + initialised [fontcolor="#c94c4c"]; + updated [fontcolor="#c94c4c"]; + finaled [fontcolor="#c94c4c"]; + end [label="freed", color="#deeaee", style="filled"]; + + d_initialised [label="initialised\n(decryption)", fontcolor="#c94c4c"]; + d_updated [label="updated\n(decryption)", fontcolor="#c94c4c"]; + e_initialised [label="initialised\n(encryption)", fontcolor="#c94c4c"]; + e_updated [label="updated\n(encryption)", fontcolor="#c94c4c"]; + + begin -> newed [label="EVP_CIPHER_CTX_new"]; + newed -> initialised [label="EVP_CipherInit"]; + initialised -> initialised [label="EVP_CipherInit\n(not required but allowed)", + style=dashed]; + initialised -> updated [label="EVP_CipherUpdate", weight=2]; + updated -> updated [label="EVP_CipherUpdate"]; + updated -> finaled [label="EVP_CipherFinal"]; + finaled -> finaled [label="EVP_CIPHER_CTX_get_params\n(AEAD encryption)", + style=dashed]; + finaled -> end [label="EVP_CIPHER_CTX_free"]; + newed -> d_initialised [label="EVP_DecryptInit"]; + d_initialised -> d_initialised [label="EVP_DecryptInit\n(not required but allowed)", + style=dashed]; + d_initialised -> d_updated [label="EVP_DecryptUpdate", weight=2]; + d_updated -> d_updated [label="EVP_DecryptUpdate"]; + d_updated -> finaled [label="EVP_DecryptFinal"]; + newed -> e_initialised [label="EVP_EncryptInit"]; + e_initialised -> e_initialised [label="EVP_EncryptInit\n(not required but allowed)", + style=dashed]; + e_initialised -> e_updated [label="EVP_EncryptUpdate", weight=2]; + e_updated -> e_updated [label="EVP_EncryptUpdate"]; + e_updated -> finaled [label="EVP_EncryptFinal"]; + most -> newed [label="EVP_CIPHER_CTX_reset", style=dashed, + color="#034f84", fontcolor="#034f84"]; + most [label="any of the initialised\nupdated or finaled states", style=dashed, + color="#034f84", fontcolor="#034f84"]; +} + +/* This is a version with a single flavour which is easier to comprehend +digraph cipher { + bgcolor="transparent"; + + begin [label=start, color="#deeaee", style="filled"]; + newed [fontcolor="#c94c4c", style="solid"]; + initialised [fontcolor="#c94c4c"]; + updated [fontcolor="#c94c4c"]; + finaled [fontcolor="#c94c4c"]; + end [label="freed", color="#deeaee", style="filled"]; + + begin -> newed [label="EVP_CIPHER_CTX_new"]; + newed -> initialised [label="EVP_CipherInit"]; + initialised -> initialised [label="EVP_CipherInit\n(not required but allowed)", + style=dashed]; + initialised -> updated [label="EVP_CipherUpdate", weight=2]; + updated -> updated [label="EVP_CipherUpdate"]; + updated -> finaled [label="EVP_CipherFinal"]; + finaled -> finaled [label="EVP_CIPHER_CTX_get_params\n(AEAD encryption)", + style=dashed]; + finaled -> end [label="EVP_CIPHER_CTX_free"]; + finaled -> newed [label="EVP_CIPHER_CTX_reset", style=dashed, + color="#034f84", fontcolor="#034f84"]; + updated -> newed [label="EVP_CIPHER_CTX_reset", style=dashed, + color="#034f84", fontcolor="#034f84"]; +} +*/ + diff --git a/deps/openssl/openssl/doc/life-cycles/digest.dot b/deps/openssl/openssl/doc/life-cycles/digest.dot new file mode 100644 index 000000000..8d4d72480 --- /dev/null +++ b/deps/openssl/openssl/doc/life-cycles/digest.dot @@ -0,0 +1,33 @@ +digraph digest { + bgcolor="transparent"; + + begin [label=start, color="#deeaee", style="filled"]; + newed [label=newed, fontcolor="#c94c4c", style="solid"]; + initialised [label=initialised, fontcolor="#c94c4c"]; + updated [label=updated, fontcolor="#c94c4c"]; + finaled [label="finaled", fontcolor="#c94c4c"]; + end [label="freed", color="#deeaee", style="filled"]; + + begin -> newed [label="EVP_MD_CTX_new"]; + newed -> initialised [label="EVP_DigestInit"]; + initialised -> updated [label="EVP_DigestUpdate", weight=3]; + updated -> updated [label="EVP_DigestUpdate"]; + updated -> finaled [label="EVP_DigestFinal"]; + updated -> finaled [label="EVP_DigestFinalXOF", + fontcolor="#808080", color="#808080"]; + /* Once this works it should go back in: + finaled -> finaled [taillabel="EVP_DigestFinalXOF", + labeldistance=9, labelangle=345, + labelfontcolor="#808080", color="#808080"]; + */ + finaled -> end [label="EVP_MD_CTX_free"]; + finaled -> newed [label="EVP_MD_CTX_reset", style=dashed, weight=2, + color="#034f84", fontcolor="#034f84"]; + updated -> newed [label="EVP_MD_CTX_reset", style=dashed, + color="#034f84", fontcolor="#034f84"]; + updated -> initialised [label="EVP_DigestInit", weight=0, style=dashed, + color="#034f84", fontcolor="#034f84"]; + finaled -> initialised [label="EVP_DigestInit", style=dashed, + color="#034f84", fontcolor="#034f84"]; +} + diff --git a/deps/openssl/openssl/doc/life-cycles/kdf.dot b/deps/openssl/openssl/doc/life-cycles/kdf.dot new file mode 100644 index 000000000..2dce34377 --- /dev/null +++ b/deps/openssl/openssl/doc/life-cycles/kdf.dot @@ -0,0 +1,16 @@ +strict digraph kdf { + bgcolor="transparent"; + + begin [label=start, color="#deeaee", style="filled"]; + newed [label="newed", fontcolor="#c94c4c", style="solid"]; + deriving [label="deriving", fontcolor="#c94c4c"]; + end [label="freed", color="#deeaee", style="filled"]; + + begin -> newed [label="EVP_KDF_CTX_new"]; + newed -> deriving [label="EVP_KDF_derive"]; + deriving -> deriving [label="EVP_KDF_derive", style=dashed]; + deriving -> end [label="EVP_KDF_CTX_free"]; + deriving -> newed [label="EVP_KDF_CTX_reset", style=dashed, + color="#034f84", fontcolor="#034f84"]; +} + diff --git a/deps/openssl/openssl/doc/life-cycles/lifecycles.ods b/deps/openssl/openssl/doc/life-cycles/lifecycles.ods new file mode 100644 index 0000000000000000000000000000000000000000..6cc2030a9efa0f49ea8707b0e65f11f9743448c6 GIT binary patch literal 17042 zcmb8X19)Xywgwv8sMt0twr$(CZQH82V%w^qV%xTzRQyt>Z}&Ofug`t&j{U8yxpvn0 zr^j4tj`43fNnj8Z000O80AS=ngWEwsyugMz)5|*2XqYw2pQT#`;E%X2!-&a{q?;3G**O|4a$m+L)M| zIy?M<=Ez9rWNT|>pzlEUf73FtvekDo{=aH{mel!w&kOUvl+e!B&e`s_>i<$k?Ej*t zZ)j+2W&BxD+yAYc|1HPgZDOZyV{G+*%+b!l*3`k+(eeLYM@J`pC+GhUJ-q)?M{{d^ zQ)5Ru0dps7eLKhhDJ}#A#2>@y^ZtJc%xB74-^Sd;*wKmB!N_Dhaoi@59wF$GE7*8q ziH{Bx)Pa1Y)gq^xIYbSV?j{{+qbnv+MZTcyBxi27O62QiOhd-GKK4*#T}h7;lOYAk zh?rU9F%?HUZEN8w$I4O@6<#{dwMAfI4rQCG4JEs7N-zy8jMZd)9=TikEthNuVb469 zy%@|uLkt8YZnS{;{hk*l`@{~UiK@KQX>OeRBR+TJI!9@49h82PLT6|be!M?lG^Er> zkW(Obn~Y@t*OXg%_MY$OJA-<6Fh%=1Tb(r*T7jEh$z~oGh91td z{nwjBNqU)#7qTbqobDfo@3fO27(3MsE<#p(6Zxjkafb~zc*>&Ha+2T>4Uc9spnw1X zfxrL&|Cj^+t@-|#jmA#;v~Jc`(TSrrtMmxMk8e=^<0(6ROf<*|Kq$hh6dJj3Q&|Lw zQ6nj&un`e!KdQ51X5Hem*f?A-*1jig=ESnNFMMa%K=ms?CteY+jw*+~YIys*nbbAl-kUT6jA)9;1^;jEqNQa%@oDIcX;B2pHC>c!Ib0%6jR zPs@jud8KTKxm}iTBb3ye)1XQH6PjwEw&->l^YJhRYuTpR%&R?DLZ?L$>r9LyykTDO z11vr%H~4--cS}El;u0zF`?1&e!C6nDv34xMu}M|v;#{pJP9vIIhFX}m2yVca^Wy{q z349&?%=0UisYX5Obp$Dvv}&~&8*&Gd{^TUVj%7qja^$q)AcwB={Znk3rMFn;z_dca{)QuJf;jcNaY^ z4;>%huDMNzQEPZXKQu?f(7RsdFw60?q;;O9-{|nnkzX(}%#0Wp44rE*B{tjC0N{%9 z<`!s~Q;Z$w@xaOpV*n`~?@kh?D)I7O!T;#lh3|6(pFJz{zxFKD=frSya zj!~o^T|eS(jth3RZICXh363C$9~N=iO92-FLds)Kj?3b0YNQ_A?}Snz36uNzhy`%@ zQ#7Oh7>vURU^n&=AwU-DPL9ef;sJzV;01*=;(_-{=xH#zU*+mbZ^{Lal73p#vd?~M z>Rh%W%{UI4T6+Jrkz)8IRMSTF2sPL1ED1_0C$e(4wgbollz2F(OA_W(Kmdxxuu!bR z&MGU*gwv8lblc3h_K@w6B^cv-hmhp%pbTj(tfldg$SPHj^96_leTurlX@_Ri44pQE zvuXXeN)f7~2(lJDN>NEOp@EZnm_6f>5>x_UGdp9n*{8;TAJiYtN@3vt6YK=@7rBkig7U3Qdf-#wIeo=@@uQ?4N4 z2ypr`j{Hlq@BnyRosQ?D9g&p@*3YFxB_gVy(X4i`3JB2IKI;#DhDq(F*rc-47cq8u zTKa3R_s!SaMXK%ITdcDa7o*nFbS&Y8s02}bG4~6#NfoHd=L1mq116A@0H6$@%OfK~ z#i2<=wVTu-AR1x>-%tq$_$fI%OB!$Sms_Q5d{&|)rn4I&!(#a{5Ana`(<=w@IkCwE z`&9FMdm*Hr7Ux^R00X5CPHw3#cMy`K0k^qWsoPfp?Xxz8VkuM|LS0GKg?)1`&YMRJ z=~u2*J7z9N#L6;`X$5DzQw&gOgc}T?6Jpqr3gVZZBdCv(^bBAP<}vXVS$Z4u<-?by z1RfJfmY%Qew~$#&Wu$yh3k!Y?&gY>dQHnx;rUY>_#i*W+ICrM}g6HSD2P z(5HcdYZuXUT7T%}B8e@(s0E{H zs6hGs`+$8UMtqt1VpO5SFn%vd2-zRe^)Kf$wCILtNSY2P zUV$?mXdWow4@8)xmTxDz5nR!^7=*43uWUeEYb~n`V7wE@v z_(xjKvBz<~fYR{m;uoCz?Tlxv5|G^9qH-=V;m!p-vJS($4-3@+d}_~Jq9OSi%ytIk z0N}Xj4YP2=py%Pp`@M#vhKEhr`5`W=`ee~$E$4_YtESGYPE*#iitRK?IoBZ_p;o^h zw&&J!*Gh9t1T|GHS}uncnSFqc(8OTxo8gkxbXchDb4}XrOKLl{O6bd8DhzeIPCcZX zcBD+%LJrXti*rLAZx>LRtXdOVZZfOyBSi{FE_~!y(g0$B%CX4}Q3WNXWF0ob?yXZ= zOu$RL<;iuc!`A&ss>csWi@xYyP|9o6`BoR2$Fn_z>y8u0p&3)1Yubk-KPE-Mm{E(+ zM-g|57htXz&_W*GXa^~3yR5unnk&mxlaQ&0Mo2rKslbT*oOr?OukxwhmYy(a_l(w1 zHo>Rv3f-2%eyrO&S+ZuoDZY_`^+(z+RmpCketSng=Dc6*Q@4J6pyZANPzf*LNF$XH z7fjv1=QuL64}OlMx|fcV`Y@q_fWF&#etsU=AhVEYIt=O@8l`7hd~3x39K*D&EU+zG z{)lfn0xxyBcG25Txt%woL6wk)Eru`CYkvI|XSsPww*up~VCmlEmPapAAa*{;(T=|q znG^AYZKnl}CfnDBy@0_mut36GHWJ}#M&({Q@tO2M#>$E+t`Uqa)s_W&vN02S)ZLsG zdr;*AThx-kKT}J#_tzyR+Z-_o7+%)uQ_i3;^Je?0f`2UwVjpY*@tutrV<$VVRJuq2o#X69#v^zvWd= z0eM&P2#B8;3@2Er=NXOgMD|Z;bQ}>)4)zJ&V4qwJE+$iS;-6tQId96_c;G;)r&nSv z>~!6ppL)8_JY8?YyFPf?n3)x=u6P7f%Pv@r68VxStT>p$iO@b3dQ>DZH<>h@U|x(V zs19YhuZ+3Gp{8UNj*cyPz8$8Y!gah%%-m+GH@7ca*{}p+VbQhe{%|r+Kl`p)jdh@- zr_EaL@aWme?>arNESszg)9^$iS+CTf+KjGd?E0XcE;7$pT!k<+S+MPD`O{`ORoFx<2;3s+4@MfAk^yM+qWLU6 z$fFSr4(Oz1jN~7Unr#SKc2jd^rM+RU{l?T@FLzk2K3qcJv@sI)c3of~sv_m27>M%FrBwi8DFgto$A9tk> zm1KX(AhB4&g8+XKI(9bCE>Q+!yf>(<+fQ!aB-Y@daM0*#Sz2B-*yp}){dJ}HZMU%U z{sd#Y7l<^Sk-1mwD=Ro;V-MJ|znaUro(pB3&@LRZ%Zl;0UZf)J0DS)H0SmDbgn7*a zGk@_%B5|XSr(XmzFL~T;lXj|oA&P3s&#lNtO{%T4h&YBv!6$)YJ=2Tr?4ZxuyzZ>C z$AhMAF(`M&V_HY9xB{!);AbxR;Eo1FLypRVbumn{-YvJssN5;9n+?bpoUsp>SP+sq z2pCaDCeZbjFpi#^Px&WH7rF-Sui!Wo@+9L_baBE#vSuxH&OwzzUk0z32rpW%Bkp7# z>2qx-Ek`v?^}>-9?z>8s^t`wg?!g12Bt_JYRp%WXSKCvo`7+j{x7(6)mnHiWH}cTt z70?Q#c$zw+guAV^;Va8>UyM9iPN9yktAB|7;5o=!og9MIW{q9#adbXk7Ai(hA3F&b zn|#kOi!`B{9tAp+T1GtW(W`AR7GO-W1_X93-4 z6P-iZwwbkWqq521m!Tb;{wZs4rSB}Bv`in1SBEoN;es0(b`lwNM^dr9EOt7qah zb}nn|$6=go!5xQgvgT;#Utv@|$su;077yJpcvWHQF*Ro;(8Mn!8+om5ES;Sq{g``n zpiX_xQqEXgkQVu1oaz^&a~y4#X=)GIvQxI?wi5zH7)5N9MVvxsgZ$kMavCsncWCNl zLuKaFVbQIOPTV#aQ#3(N6fAg$YN|pZ)XU61WWy0VZtbQSd`6Q^rDO*_>FT5+Z5F}8 z2H`%X^z7}_>mc;gmOjViz*N2gFgFJ#{zeGR2eM}B8)Fms#!kfLE03T><-#0~D@Nw8 zzy=>q6KfY-<^DNB7!C`R%OvQ>MIh>+!O4bu_{=MFu%=M~SpspT&=nk`of{jS2`tkF zs~~&V68+G93DQi(9t+KSb)Jt$=-iAjA1zjyBZ-CBTo#d4B~ zx}o@44au9?$kRKmXuf3#b z0UFZLqBc0Bl*#s?*fTJ~GEM3!5npxaBN{`5;Fia{eTYXiPZ-m?zLbnHcHb+VWwk(w znWscNaiEfA@n*wf_kYmfS<=RzA zZo`~veO)ZKW5bq(w%EBnX$Er@19#RKPMuC(*7~xmW=xN$0gGZIk|pXYnqdz#HPFtf zrTAr_rMq;NXuwx6QU~uf=10cBhTM&>sG7+t^v}88r48!%vUb_G4dha$WHKlJ^L6^1 zA*VLpnmmSa#xdC0j?0!N^P^fadB?*&yh^l!sXik2_?x3uSs1-Drojl9?V6ukCQO*% zxIr;xvu+a0^*9k4%bu@Rp182*V#OfO`1jbMIuR0cfZv~5i39yKs%t~*xO3Wv5_Rh( zg2Gpg@`^Z|VnsezGG5|SFp+e;^R%fV=Rn>YB3JlAYZ04U) z_y=>X)!2z)rG15Zk!gk*rZsW?!DGyHM&xLznx^5@^MYiYUA{7v);k=7@Hk@`eG$@h z!gHi0v~t?HZG6sI1#MkL+RZ~R9JzpezmSZ_HkEMr>ok(Is=dM+{5D@ z?GC~HrdPi#kYYJ7s_)7J6GXwT&a<-)m2E2J#2<@DbWaNQtKxJ-sgUg|y{)Gk8A6-ZAd%7jc7<*MHWILyV8@QAR zW@%0l8+>e;c*vH(^Cs`dJ)U{YIVwhOf%4tskHTQ-U9$7_{ErRiKnK@#Z$D51cq&1Y z7Y#yy+9|MOLI4Kpx-EI>K2+d|mFeSd1VAYHqcRFG6be!jb8zxseIFkuWn+1L-;dW*iwCQJa3g~H zYKUf93b0T0dj~tBnL>KXeRHlj{Ko$J6=P=pm{msI?TI}&-G{0hGF2?a_(e4w%v7`X zd3l)F^W+lYXTnm<<*31z_0q53WR4Nhy_-0P+VA0Sjs)Apa5mO9L|R`BzkayxY>m~z zM&h&%cV^f>YmLip%uvmVFx_v z8E{sj%6d;O@U7!!O6(})htcwYv95Wa5qmHtt~_=UIM)F;AMm0&9#U#na(q#C##8Fh zTbyM$WfRv9UuY3ZFkyp`)E9Zan{9^2vjGZ_(-UQQJ`N(b0=SGgXG=+7qmwzHOtN3F zP;TKbAP)}Zg>|&_$u5%(@4AO=C~7>Skp-HwbOBQGTgj$qk|ph*#%JlLWaTz?2v($4 zw94k~p8(A;2;QgS>jWuLwVLRtr=8B+Zrufz1El0bg*?HC`gtvF%O#E;o;b~n8D4uV z&=HNU54p;uw0(|Yld-(H^bLLyr={UV_`859*Bm!-Yq(niw96Fc7wryf{R)NB=ZKgJ z3Ob3o_6Ni-2LvjyKMkGfzbVMYb~3%4mqU?7a=F2FAEA z+~t^7WtEm_e`GfIx=IFmYjG%@1@5xEI>BOc{sj(2%SqTuhKb+dAZy{8;+B5->ewoj zrC(m$N}^|2T-AHQ#k7)NQ}acGmzIw=zz5_F;u-PIF#B!j1dIey0x5}@TwE?;S>%sX zE-}A&lalxact)bv@JMLlv{`~Lz7x4$8xnQ4Z4|Hg9G1#4Cp-r9o(G{eC6n2!!gqV^ zR4AOhOPV!6B?QJbKoC~|?R^}+=#5GTs*UvB-PO@nRbjqKVBZs7c9p81>JQ8J%Bx-@ z-;D4vx5D;{@+52~%c*|7kQuOvr&x>scsqZ~X?+lGnmu_U?R|iX4kM*uy^*V+pD^H`+kqvkQtC#o!g;x^RO#B10U@>&NUZhnH}7s( zna7}qO%wUX!saEwM(wJ=TJbdG-~pz_wW)SCbd%bAc{@pktS9vB0LfXh@4n~i7ihN! zF6u*p&(S*o?M?`kA|l&FDFyuPBs#E%UrDVszp_H7uxz-dW{J5q`;Gvsnah{d*OMmOEzgcH1dlC z%@#7(*cznZZ>1tG$y~ueE`aS3$FwR8axmm7IY7V>+MN9{mmRT#sil#m(C#={%O*MRg^VhJM%e;HCx0Ll6*|W&eiAdWDfdp<_ z+Yolo;q8(Xkkht(Tc|u~*-nl|_4~TEFHSNGq?uz`GsqPnPdE540KBboS5l=Ix<`>t zMjckC`gZ3Kh}i7v9kx}L6dYDjy7;gT^utR!)*YQ{C3p;~9}K=`MB<1VELxhHk&Dzh zy9v7!v(h?oI`w(*A=-8kv%QU`=Z6Xai1(NguY=lY?T)EOtnr_xaVt7BRG~9 zdr0ELk>38P@`hCN6*kpAiVC2*r7Tr?r)D;ZXqxlHRU$jCPZaOnX55?{;1ha0B@-F3#>Xkeb*z)==6Xm-eW2^DPDo2&v;A8Bmz5fO(%g5mQWQrv9n z>%r6Fb}%4maN{JXNY~V;{lX5k?g1F8df@bClnv6qcdZSI-aU-Id8Mogz@aV7+IzLZ4sT*C_A0?GkE@d1(pfaV$icBV6zD`*o_1Qv%I zuS32c(GcSN2n+l&oq+b%m2XX9+1?s>wNjl85cbcOaObnywJEg)yRxpF$!*pe?N6Jh z2t3Kb3Hv!}?9H&%){Wj^65Io5ejZ^b=XK7Vrlh%dHqS!ibZJ>Wf$!$~wX4Od3=hSz z&Abt`_EA6xu9@&PpF_yzu>xvuOCw95<3b&El3S?2Q$^E|tf5=V%qEmaebqiOKUqXz zcoND#9zX;L9a4|j?;nX&8)Bs=N^CVKJqo`xH8u{ug3z7ed1Nf-Kl>dJFbbq>FshZqFSc?-{YfZ|aD zbclbhwIRnXT;@+At;HIe)D)OsTM40M7qo~sF7P?l-t8}if9%i1Zq;zz zJZ^vd-d?gL48$fy0s!cD1N>jSZNHtBj>b+-<~F8(cxBGDG*x#vP<(iQ^!A^s!-3L$ ztw~bfFUu!P0_xRV0UJsq%_1(`s^&EZH2tYk+d!M8h!@l}-0Yf=^>%(%km;?v^h*y8 zLo_M#5K1>`4Um|$5#d|*;j_o>mF9)#e$H2pZ}`Y5G!|_v#5-|<1V)HH_~pntEEM1H z)q9K!qyR-br2Jsr)zgem`07ek-s_#%5t`cSyTjIU4ow8u_PsW4JLop1(MF1%1WJ`g zz-3v5DGFmjz0Z>@y# zy?8s;be%(UPKqawI)Zc#>Wl`@duo{au`$vsVSsQrJ7k0!91n$tg=q=1kMe@MBVRFR zhB?KB4k6XkALS`LYph_s1LYl4E8Pd=d2uhJeoTQ)5D4%8Z9ixA9eeiCSNTnfBQR88^RAOXw%b;zZrJAIVR7-u9t4ta}~U(h{* z3kqj&*KGI%lgOH5ih|g^Po6LqoUxh!ndMO0ZwwjH^pvMY5xOy zzD0mGIHw-g-x{by`j`aO*}^cdahW`yA_5H zfN27otzBV0n8+Qh`8tu`t$$d{MG)Y(M(EK-v9pI!a3X7PXoYEFs7cY^S8b!DjgqS) z`?&|z#AVPqDxwg~O`|x(!w~#r>coNAX4(z>kqRHf$TRc{e>X6;2VC|3KvWmUYjkMq zk|fZ|J}#bL1Pm_-#%4}~(Wu5z;bPnf0hygBaFP#fc?6#*FbakT0>h~aGe77?h++1H zbE-$45tn&4Fbe+RFt9o&65e29BntjL#|!_k^nO}Vm;oNk$m$AX311S`xI8clR>3&1 zWUxoSK>N_%PKsg&d(Ps;-ImvsF`^bwZEv`~cepui73>@T2aB05UoyYlrv4Of&zHU} z7sRh2QDD!vd#16mn?-~)M@~f@u^Rblb#jgr*|?~YWDK!lTo?-|9Q#0arLC68(H>|B zYH@``1+0N`VzP-q&m=#bK}A3wQkwV~E_GV#eAK~d`L4& z?GW|LSA?|#Y>uXc1feL3vrcj%ezK&RR5!F8@p;Vx^p*}u zy?BF$G@G%R_)#ifweNP#vtVFbS9dKD5PG9ppzdfN2hj5&EXut7y3O=Q4|thX3+SCH zP9sz^d#Yv$&TuY#$ys_!vQFN!=xM8LT{@JFTij=aJFA zt~#asQR==?CS%TS1Ity;Otb!art=NWnx_lPP%tI2Z7tRsR+HtOeSwuR;6|9h|1aOxbcA$$Sb>3%@ZsThSrBfq*F zwoiql)y`%qX9pYVmLW)X)hlF!Xv*Ih;Bh&u*P0i+)ntS6r%{GEV$Rj){S7 zU9S*Ijd)-E;nSjSoASe%E#B{+mDz;%G(<>i5ix&y)V_BCzLfU~`xg$^_>Ukk1hZGS z1uOutXu}8<$S!|vlcp*=_h+9ot+Gb&yE2tXtPIR<>Ih4t%kprfJA$*rw`8;k1yg~% zd&?KRQT2jx*xV$|_D(^*?7CE&Va$KTHNOFCPT?A zK*1tT%O*g@tH{DFLc^!bBP78jtjZ~8EJ%wfM2{=NLN3C=q{K@p%*U(DN2MylY9zVId*Gkx7w>8A*}B>G2V%DXBpT--FT$gTIwWq~yn>6+~u~M`qV0r{^W*)W&>o zOwO&y%+1fpFaK83lpE)lml9c&9#xhSP?Zr}o*7k;k^DU;w=^%KsrXxIX=!dzZ9#c` zUS&slWo>13TV-8od2M4uWl3FiZF6l!V?#q~MNdxsP+nDcenVe=!%$JnU}4*Md1GHi zOJ8N%NNMMEWBbpl-i5Z_k%pd`x`CCZ;q|tk(=CI`ox`(jqiY@G+dpP@`l{3WYcq%H zvwN%adg=>%8p``yD#n`gCfkcfJ1YCy8isq?=6kE=2itZg+V-Z}2L=Xyj?GO>kBv+( z&yV*{O-?P(j4UoL_08-KEFbnSpN-6Kk1y?xuAGc+-psG>SVS-Oe05tsY#h z9^bB=J*{6q?Jo`Otj_LkEFW)7-)xNRZ_V#*ub=JAo$jq&p03|+kKgXiULUMH9?jjH ztUaHv9336)pWhr^o$X&e>|Vbd{CYXNzB{{nzWjB6_UrZLZ1?u!_~ml@;cD;x`tG1J^(HjW_0D#;hF2t|owsM{Y z=!7lmJ}B+q^3%VFX`g#$D&z{E#$0h_N`aglRwl|Gh}aq>s`fiU)2`jku@;gX(lBFq zw}5^-nb$Lx9*!R#i%9KVv)0+?cS{I;>!1}x-)}ZnY%kqGP3Ju~Rxdjz z&a$J4R|&kiM$0?Yc{kT5&aw`gzjEHbxgNZ@;CApgxnlgjfp{VU;v z)HMC2l`Bf4T3Ln8;bCYT4e04^kWtWAgQCi+KHKxMo^@$7levHy)O&QwBZZgoaWOGKB9$Z{2aIeq~K zTYKGPn(hFw?y{qia+YrTEPKJ)v%2eYY+ylYyDe6^K*fcS$9aA`l*f(%!t+|R>wOE= z63yG_rRy`+PB-HRz|j1r{v}oW#jhR529bfP3N6RS5z9w9e7v@-g~9WeO^2fxJi*~Ph!2ikh4<8tLrIy`;wauB{()Wvjfmz;h7MaQVyIj=c$lkJJy@iza2XR8h; zr{-lk`pWvo*&V9dt!wSG>MNte&G$70PWzGU^a$@|^pe{h_-;Cp{yp4v-Q;z<$J@90 zSEVS=U1b;5rPcT7erg@o%X2hqmCncwR);siW}Z9$Lz@6)-42AIvd09ns+o<?8nu=}S6TAw2#-Hz+qT53^>=OdGNOcQozLSx!D!19J&Id}q zmtIyr{dl_>LJe()uV-Pm-SDIXtNXaT?5wrhC)@Z~c6HhW(e?h}1BhTNII2x4gtoIf zBN>{y(yXrQ{yrakksch04gs@yq??Pi7)xCUd-xUFHJZ+;y%|+a$8~hw!~Xi!&(%)*-F828bG@!P`^IA3TmjAdMhdFT9j)>8 z%KYY$<+P_}$}A?B6x<%2MM|4gb6NJ<-5lq;)^YZtIUE3}_-ZDD`_%{9@Q&O^nx#E^@2K_M69ZMaZ%712>e?~YD6x=9$p&Q~w(0?nDS-6Z3duBej2+SaFI4D*crGj{6ilAHf~>7x z(Si=s9GKz8Ew=sosrSK5XuPS42hRu|v!KvZJ-C7L*(96zo=h9&gY)w}hi-{sPJjGj z3+o&%0GFf_BULe6o#SnTw?(oc7EkT2HSnXZs@*xu>okGL`*fl@{%a8!+p)m2-P8qf zq8J%N$C)a;G^=+eqeu@c{oA7ANCvOwVz4RX-kpG(pBGH{%gRFI#>*CzkjC2E;i8zQ z0Ja}CsxTH3pjhmR*&-nuu9lLR6hA{A3t@5tUFI1}^P3yu_b9YP)6+b5Z_c&qX7bSq zucH^L)Zs_5SgsnM`P4(BYG$a`vS??ylR~b&FvY}%SIYo&bVCQ1ViDJ?hEeq*NDndf zC%++nw*P78j#@q=!czyIfHWwICvg_}69BU!iu0+D8}-)4OS0~Y9XbE76zLf|ga&dB1QuBJIh$x;3E*6;j10WSb^AQa~polw-!Iw(wpl0H|CtnV; z`5yYgDiP&+zBuaqPtswwjbPK?IXtbCEq&q>_v}9~jO&ZWMu=n7&xVM-qQCX?FKDg9~tr*=73mmlhb) zk4sRglPFRwOKsrOWh+eZ1YAvtpy9ksN@op>?2+CR3F8Zrvf-P;Vkl=#d|2#xZ8L1Z zi(#a2n`7!WY4RQpdRvvaxXMNTI))_7Cwq`;-u3wD_7WUU#HXjAX9M!wk>6j+BZ#o9dr^zdsp6M z)-gr0?}fei_I}UTG443vD-Q>WZ&!Xoh?r{LOE!&pVtQbNNvYc)G&@nigJ$vPDr;4; zqxN!cd{-Fbn4@zLVr0Ip_2x_?sD;3MB9>k9LSmqZ)xoBV`e-#K3+fXgF&n9v==*|B zWEqu<3OHhNr?zH_H8;fcm~Sr^)m*cI*8qF;{yASG>$FQ=j8n@8vuPRg8Km&@%m?^S zfR=6z;+)zx5xP;R5pJ<^;)kb`$kICJul*HpK`fMOGmZ9ryHXcISp+LLVPM1Z$lWc- zf!+|@K7&|y>XiJZ@!rAF!L`y2el0du8g)-%jHfcoMFCqC>uRo3kNKl!ULPHVzp#Bm6@l z^QP4#1Uv}NjyS!UDEWcyhVITGh=wYs6k!m4nifC6kRwW_(fr5{sS*a(LrlsYks3}% zMPGRaIux6!hn;$1)xMsd4(;)-^r?3@qE;-XUf$E$tmmig{mDOn-2*w>Ji_HsVuZ6wpwYK_ zgs%Zk5qsaOSGkFLntG4fBQ(-Y%v?f@G{&`@riS}{F`Q_$T|X&pqojbLnqjoNK|?Ho zrPE8kG9DX8h@o^_LME8d9y2YdcJXF4O)e*Y-PXN~2nG*<4ohrhz1_0|xK2}nel8h1 zZKLC7(H(5&mH_OI^Hesuw^1e^OXB>vUU=Qu#VEmwWLBP`)>wjTh@7N0pIT2>HUBnf z8Zi;hY2fV-tQoSILEUxOM2dyg9S))Onm}w%lr#TrK_yohyonS3n{o;$!q&m;5JeQD z1oOD7MF=N8j@w9?W^`48&QhcT(_IXNMy;}_AQ(PbP*To5_=FehXpxu}xvCDpHr>I1 zDO)W92L!lYet|~jq74dwzBYic7Gp~=bL0T$g<9ikI0M{pX(IVv3s^{|o)H!z?1=Eu zDJVD>nt~|@iKBbb-__c6h*cB zf)-F=CQgy->i6eO7Ft!+CL6k@rW34GnicP!4EWX3Mm07NL11$7_PKCvm||b#;67jN zS?ZhWG;KWQ@3wvw+^7WWAKX;Lx=+V}fmo_yc-nPcj}NO`{-(4FMDOF^rRG6mDU`|# zC|+nSPN*<0w%IBIjyz$@_fat4m~WMSe3ewxLfP9=U8EQxB&2f9g0^OaEifHb(Xh~H z%XXW3@SN9({UTUEQBgvn9#y8(PlI?D};vFHDgo5L>1fs&P=!U?Wt&tVi_Z4=2KT+H@+qZ>IxJxIWs4TKyS*TeE zZ@Bp>(5hQ)JH94tAlg6rzVz}UQrC69;(Ip1^j3opDv7anZV*Qy&Gum_bRO|FP*jNE zvYd97G1;A5=YJbkD-y+nhJ@VvwC*q(Y;to-8WWXP$mV8tmC)H_jt3t||G zd5b-|zilS;K&FI=A>!tQ!e{>(^@!U590He}kYgNY#Ms}9bpcX}=_h6%Rf5azETiVG zf=%5-zOV^G1gNH%#K9QY+A<%J094t6BcfuKB9F;2livV2WoeaVt#5n)yA+{~E&);} z!1zp3h7kJ%iuOjVL8@s+TS+C6fgfRikV!{^s?{>}P3uy!is|GX@qr!;>#@Bax{j3A zrRQoFVA{m3??O8|tciMgKgU*642G{(*}B53bP`Rac(uvJKMDy0LB2+!2Io7Bvc_m; zG<>W8N9{8wVm|OUd1|FYwd!C&hg#WnE5bxa0$58Y)8`fSU{Wc~H=VrDp|@{W{(R%< zjMAEpCPG~HX1z?6{k;Sn2)&rwM4bQgO#C^(7WpR}OV-i?78EoY(^P5@FKP_qb(l3U z(h*?=ATc0#6d4^ti`kSU$X9zvJzkY9#L=R3@p>CO*74%pAsSEEqwWkW*I4n%R9y+z z`wYOIIpq4qpllkNVHwEA)E9`xzRzTw$Wh>^4K6Tcr`HzMmLm9;D3YK`6F294-2_e7 zMgCTkcNFaQ7>l$4047XWul=c_kiH`)jy$96M0(y_e>MTR6WT0xYOY(K`omHL;J68F z2ogJS^;VehlpQK>hN!YDP#laQRnTcST5H5I08p18c z5=_vEs8gh?*q!NruKCvCq^hf76ju0zU~Z6|^QqmVEi4qbkea)Ynww5k<|f*qF^9_c zqp4Uf6d%a|4H#S}(P_p+nC?F0wrKX+Uj-ShCD*QmL1a&IF>*r|jPL#;&- zyVKm(rXN!;tlwEmB*F+WU|u0VDvrwwO(R#s)Tx=L(ezo;cAkQ8_B;5|BqbqR0;0if zi_bB=(TPX5@Bx|DntY9y!GsZd_$bIUl@2?|_6}=Gy+*iWL}LVj^K{D!%)J!4mPaTb zD;}HF*93v$G@p=No{Txa0$EaU1B_Mfc$WktwCSOYQk*6RlR%p(BTC{(JW-$34$aH; z5Fj~ihJybzFAe7WG2TlN<@pALM2SYYHGEoh;Q=JsXY!M+AQMvf1&V-e{YP}=4(9l! zleIeKYh}6<7tK+-iVIAn$io=Dlrg%o_2`a_Url~2?f?`1YvA6903Ayc&u?_lD0v|J z^D{a@csLO(C&?d!d_w^#fTTWIZiuE)q{@cjxiprMUalIYs?buz@|l+G?mD5%kY^iM zQA2^_g)wOZs;k_wZ%ng*qQZb|i{8CApjyc2jp$ZOO@rL=-)X4^8v!De%VWn?NUIrf zWAJweAes9Ntb$-3b#xblhe+mA<7WH{C5k;EyiIO|FA}Wm@W!rhocMrDXB%RKU!exK zYCxY-C;kYDz9LK&3*iSfxvQ9!|0JnK6a%D`7%-Pvn?M~6S&sNaq=1N;?<%NOFv)g1?F;Z zIvDp`r?e?UJQS6*8Lb*f<`^GC5sN|cHa=8n5XX|1EiQ@&hIC#fDm$&wo=?(s4L!nM zjWpkqvJiikUaZG}7=6$VZ3O`XUb@aG7lJR2sPxaV(dD<4QquGt>L$<}vI@H{lh-DI zVstX(!VYJ4{=dHS{KIPh^Huu~6aN3_;)c`u1H3pYU0Lwlj^lG%4?tX4MyN_aFW~P< zk*J?{Nee6S(}>H6(EW>C`pE~VOq90i!$%N#WDo9dVr)=XCYSjV?-6hZFb4yNgo^+p z@9<(kC8MPrZ$QE66Y|InR=b?#shWjPdRnWG_nM{bSGoA5J;WQY>qNF`wTh)vz!E<` z6HJ*s^q9q3Erz^Pf<;`3n^?T^4p8oe<C0XeJ*l1GD*%B|0REmB{=0wvlz-C1|5NMFJO1J4 z`14xnGx_&K@PE(yPp$t%iTE!le-gw0|DtsN7nDDV;(w3wo4Ea_JbWhqvqpanp8iwuuinOg zuiz{0zX!AYQ}ge+SOB newed [label="EVP_MAC_CTX_new"]; + newed -> initialised [label="EVP_MAC_init"]; + initialised -> updated [label="EVP_MAC_update"]; + updated -> updated [label="EVP_MAC_update"]; + updated -> finaled [label="EVP_MAC_final"]; + updated -> finaled [label="EVP_MAC_finalXOF", + fontcolor="#808080", color="#808080"]; + /* Once this works it should go back in: + finaled -> finaled [label="EVP_MAC_final_XOF", + fontcolor="#808080", color="#808080"]; + */ + finaled -> end [label="EVP_MAC_CTX_free"]; + updated -> initialised [label="EVP_MAC_init", style=dashed, + color="#034f84", fontcolor="#034f84"]; + finaled -> initialised [label="EVP_MAC_init", style=dashed, + color="#034f84", fontcolor="#034f84"]; +} + diff --git a/deps/openssl/openssl/doc/life-cycles/pkey.dot b/deps/openssl/openssl/doc/life-cycles/pkey.dot new file mode 100644 index 000000000..58b3a0c5b --- /dev/null +++ b/deps/openssl/openssl/doc/life-cycles/pkey.dot @@ -0,0 +1,49 @@ +strict digraph pkey { + bgcolor="transparent"; + layout=circo + + begin [label=start, color="#deeaee", style="filled"]; + newed [fontcolor="#c94c4c", style="solid"]; + digestsign [label="digest sign", fontcolor="#AB3910", color="#AB3910"] + verify [fontcolor="#F8CF2C", color="#F8CF2C"] + verifyrecover [label="verify recover", fontcolor="#B19FF9", color="#B19FF9"] + encrypt [fontcolor="#63AAC0", color="#63AAC0"] + decrypt [fontcolor="#425F06", color="#425F06"] + derive [fontcolor="#FEA303", color="#FEA303"] + encapsulate [fontcolor="#D95980", color="#D95980"] + decapsulate [fontcolor="#A16AE8", color="#A16AE8"] + paramgen [label="parameter\ngeneration", fontcolor="#2879C0", color="#2879C0"] + keygen [label="key\ngeneration", fontcolor="#2F7604", color="#2F7604"] + + begin -> newed [label="EVP_PKEY_CTX_new"]; + + newed -> digestsign [label="EVP_PKEY_sign_init", color="#AB3910", fontcolor="#AB3910"]; + digestsign -> digestsign [label="EVP_PKEY_sign", color="#AB3910", fontcolor="#AB3910"]; + + newed -> verify [label="EVP_PKEY_verify_init", fontcolor="#F8CF2C", color="#F8CF2C"]; + verify -> verify [label="EVP_PKEY_verify", fontcolor="#F8CF2C", color="#F8CF2C"]; + + newed -> verifyrecover [label="EVP_PKEY_verify_recover_init", fontcolor="#B19FF9", color="#B19FF9"]; + verifyrecover -> verifyrecover [label="EVP_PKEY_verify_recover", fontcolor="#B19FF9", color="#B19FF9"]; + + newed -> encrypt [label="EVP_PKEY_encrypt_init", fontcolor="#63AAC0", color="#63AAC0"]; + encrypt -> encrypt [label="EVP_PKEY_encrypt", fontcolor="#63AAC0", color="#63AAC0"]; + + newed -> decrypt [label="EVP_PKEY_decrypt_init", fontcolor="#425F06", color="#425F06"]; + decrypt -> decrypt [label="EVP_PKEY_decrypt", fontcolor="#425F06", color="#425F06"]; + + newed -> derive [label="EVP_PKEY_derive_init", fontcolor="#FEA303", color="#FEA303"]; + derive -> derive [label="EVP_PKEY_derive\nEVP_PKEY_derive_set_peer", fontcolor="#FEA303", color="#FEA303"]; + + newed -> encapsulate [label="EVP_PKEY_encapsulate_init", fontcolor="#D95980", color="#D95980"]; + encapsulate -> encapsulate [label="EVP_PKEY_encapsulate", fontcolor="#D95980", color="#D95980"]; + + newed -> decapsulate [label="EVP_PKEY_decapsulate_init", fontcolor="#A16AE8", color="#A16AE8"]; + decapsulate -> decapsulate [label="EVP_PKEY_decapsulate", fontcolor="#A16AE8", color="#A16AE8"]; + + newed -> paramgen [label="EVP_PKEY_paramgen_init", fontcolor="#2879C0", color="#2879C0"]; + paramgen -> paramgen [label="EVP_PKEY_paramgen\nEVP_PKEY_gen", fontcolor="#2879C0", color="#2879C0"]; + + newed -> keygen [label="EVP_PKEY_keygen_init", fontcolor="#2F7604", color="#2F7604"]; + keygen -> keygen [label="EVP_PKEY_keygen\nEVP_PKEY_gen", fontcolor="#2F7604", color="#2F7604"]; +} diff --git a/deps/openssl/openssl/doc/life-cycles/rand.dot b/deps/openssl/openssl/doc/life-cycles/rand.dot new file mode 100644 index 000000000..a57cf710c --- /dev/null +++ b/deps/openssl/openssl/doc/life-cycles/rand.dot @@ -0,0 +1,17 @@ +strict digraph rand { + bgcolor="transparent"; + + begin [label=start, color="#deeaee", style="filled"]; + newed [fontcolor="#c94c4c", style="solid"]; + instantiated [fontcolor="#c94c4c"]; + uninstantiated [fontcolor="#c94c4c"]; + end [label="freed", color="#deeaee", style="filled"]; + + begin -> newed [label="EVP_RAND_CTX_new"]; + newed -> instantiated [label="EVP_RAND_instantiate"]; + instantiated -> instantiated [label="EVP_RAND_generate"]; + instantiated -> uninstantiated [label="EVP_RAND_uninstantiate"]; + uninstantiated -> end [label="EVP_RAND_CTX_free"]; + uninstantiated -> instantiated [label="EVP_RAND_instantiate", style=dashed, color="#034f84", fontcolor="#034f84"]; +} + diff --git a/deps/openssl/openssl/doc/man1/CA.pl.pod b/deps/openssl/openssl/doc/man1/CA.pl.pod new file mode 100644 index 000000000..e05775cdc --- /dev/null +++ b/deps/openssl/openssl/doc/man1/CA.pl.pod @@ -0,0 +1,199 @@ +=pod + +=head1 NAME + +CA.pl - friendlier interface for OpenSSL certificate programs + +=head1 SYNOPSIS + +B +B<-?> | +B<-h> | +B<-help> + +B +B<-newcert> | +B<-newreq> | +B<-newreq-nodes> | +B<-xsign> | +B<-sign> | +B<-signCA> | +B<-signcert> | +B<-crl> | +B<-newca> +[B<-extra-I> I] + +B B<-pkcs12> [I] + +B B<-verify> I ... + +B B<-revoke> I [I] + +=head1 DESCRIPTION + +The B script is a perl script that supplies the relevant command line +arguments to the L command for some common certificate operations. +It is intended to simplify the process of certificate creation and management +by the use of some simple options. + +The script is intended as a simple front end for the L program for +use by a beginner. Its behaviour isn't always what is wanted. For more control +over the behaviour of the certificate commands call the L command +directly. + +Most of the filenames mentioned below can be modified by editing the +B script. + +Under some environments it may not be possible to run the B script +directly (for example Win32) and the default configuration file location may +be wrong. In this case the command: + + perl -S CA.pl + +can be used and the B environment variable can be set to point to +the correct path of the configuration file. + +=head1 OPTIONS + +=over 4 + +=item B<-?>, B<-h>, B<-help> + +Prints a usage message. + +=item B<-newcert> + +Creates a new self signed certificate. The private key is written to the file +F and the request written to the file F. +Invokes L. + +=item B<-newreq> + +Creates a new certificate request. The private key is written to the file +F and the request written to the file F. +Executes L under the hood. + +=item B<-newreq-nodes> + +Is like B<-newreq> except that the private key will not be encrypted. +Uses L. + +=item B<-newca> + +Creates a new CA hierarchy for use with the B program (or the B<-signcert> +and B<-xsign> options). The user is prompted to enter the filename of the CA +certificates (which should also contain the private key) or by hitting ENTER +details of the CA will be prompted for. The relevant files and directories +are created in a directory called F in the current directory. +Uses L and L. + +If the F directory already exists then the B<-newca> command will not +overwrite it and will do nothing. This can happen if a previous call using +the B<-newca> option terminated abnormally. To get the correct behaviour +delete the directory if it already exists. + +=item B<-pkcs12> + +Create a PKCS#12 file containing the user certificate, private key and CA +certificate. It expects the user certificate and private key to be in the +file F and the CA certificate to be in the file F, +it creates a file F. This command can thus be called after the +B<-sign> option. The PKCS#12 file can be imported directly into a browser. +If there is an additional argument on the command line it will be used as the +"friendly name" for the certificate (which is typically displayed in the browser +list box), otherwise the name "My Certificate" is used. +Delegates work to L. + +=item B<-sign>, B<-signcert>, B<-xsign> + +Calls the L command to sign a certificate request. It expects the +request to be in the file F. The new certificate is written to the +file F except in the case of the B<-xsign> option when it is +written to standard output. + +=item B<-signCA> + +This option is the same as the B<-sign> option except it uses the +configuration file section B and so makes the signed request a +valid CA certificate. This is useful when creating intermediate CA from +a root CA. Extra params are passed to L. + +=item B<-signcert> + +This option is the same as B<-sign> except it expects a self signed certificate +to be present in the file F. +Extra params are passed to L and L. + +=item B<-crl> + +Generate a CRL. Executes L. + +=item B<-revoke> I [I] + +Revoke the certificate contained in the specified B. An optional +reason may be specified, and must be one of: B, +B, B, B, B, +B, B, or B. +Leverages L. + +=item B<-verify> + +Verifies certificates against the CA certificate for F. If no +certificates are specified on the command line it tries to verify the file +F. Invokes L. + +=item B<-extra-I> I + +For each option B>, pass I to the L +sub-command with the same name as I, if that sub-command is invoked. +For example, if L is invoked, the I given with +B<-extra-req> will be passed to it. +For multi-word parameters, either repeat the option or quote the I +so it looks like one word to your shell. +See the individual command documentation for more information. + +=back + +=head1 EXAMPLES + +Create a CA hierarchy: + + CA.pl -newca + +Complete certificate creation example: create a CA, create a request, sign +the request and finally create a PKCS#12 file containing it. + + CA.pl -newca + CA.pl -newreq + CA.pl -sign + CA.pl -pkcs12 "My Test Certificate" + +=head1 ENVIRONMENT + +The environment variable B may be used to specify the name of +the OpenSSL program. It can be a full pathname, or a relative one. + +The environment variable B may be used to specify a +configuration option and value to the B and B commands invoked by +this script. It's value should be the option and pathname, as in +C<-config /path/to/conf-file>. + +=head1 SEE ALSO + +L, +L, +L, +L, +L, +L + +=head1 COPYRIGHT + +Copyright 2000-2021 The OpenSSL Project Authors. All Rights Reserved. + +Licensed under the Apache License 2.0 (the "License"). You may not use +this file except in compliance with the License. You can obtain a copy +in the file LICENSE in the source distribution or at +L. + +=cut diff --git a/deps/openssl/openssl/doc/man1/build.info b/deps/openssl/openssl/doc/man1/build.info new file mode 100644 index 000000000..b796fce42 --- /dev/null +++ b/deps/openssl/openssl/doc/man1/build.info @@ -0,0 +1,57 @@ +# All .pod.in files are detected by build.info in the parent directory, and +# turned into appropriate DEPEND and GENERATE lines. All we need here are +# the additional dependencies on ../perlvars.pm. + +DEPEND[openssl-asn1parse.pod]=../perlvars.pm +DEPEND[openssl-ca.pod]=../perlvars.pm +DEPEND[openssl-ciphers.pod]=../perlvars.pm +DEPEND[openssl-cmds.pod]=../perlvars.pm +DEPEND[openssl-cmp.pod]=../perlvars.pm +DEPEND[openssl-cms.pod]=../perlvars.pm +DEPEND[openssl-crl2pkcs7.pod]=../perlvars.pm +DEPEND[openssl-crl.pod]=../perlvars.pm +DEPEND[openssl-dgst.pod]=../perlvars.pm +DEPEND[openssl-dhparam.pod]=../perlvars.pm +DEPEND[openssl-dsaparam.pod]=../perlvars.pm +DEPEND[openssl-dsa.pod]=../perlvars.pm +DEPEND[openssl-ecparam.pod]=../perlvars.pm +DEPEND[openssl-ec.pod]=../perlvars.pm +DEPEND[openssl-enc.pod]=../perlvars.pm +DEPEND[openssl-engine.pod]=../perlvars.pm +DEPEND[openssl-errstr.pod]=../perlvars.pm +DEPEND[openssl-fipsinstall.pod]=../perlvars.pm +DEPEND[openssl-gendsa.pod]=../perlvars.pm +DEPEND[openssl-genpkey.pod]=../perlvars.pm +DEPEND[openssl-genrsa.pod]=../perlvars.pm +DEPEND[openssl-info.pod]=../perlvars.pm +DEPEND[openssl-kdf.pod]=../perlvars.pm +DEPEND[openssl-list.pod]=../perlvars.pm +DEPEND[openssl-mac.pod]=../perlvars.pm +DEPEND[openssl-nseq.pod]=../perlvars.pm +DEPEND[openssl-ocsp.pod]=../perlvars.pm +DEPEND[openssl-passwd.pod]=../perlvars.pm +DEPEND[openssl-pkcs12.pod]=../perlvars.pm +DEPEND[openssl-pkcs7.pod]=../perlvars.pm +DEPEND[openssl-pkcs8.pod]=../perlvars.pm +DEPEND[openssl-pkeyparam.pod]=../perlvars.pm +DEPEND[openssl-pkey.pod]=../perlvars.pm +DEPEND[openssl-pkeyutl.pod]=../perlvars.pm +DEPEND[openssl-prime.pod]=../perlvars.pm +DEPEND[openssl-rand.pod]=../perlvars.pm +DEPEND[openssl-rehash.pod]=../perlvars.pm +DEPEND[openssl-req.pod]=../perlvars.pm +DEPEND[openssl-rsa.pod]=../perlvars.pm +DEPEND[openssl-rsautl.pod]=../perlvars.pm +DEPEND[openssl-s_client.pod]=../perlvars.pm +DEPEND[openssl-sess_id.pod]=../perlvars.pm +DEPEND[openssl-smime.pod]=../perlvars.pm +DEPEND[openssl-speed.pod]=../perlvars.pm +DEPEND[openssl-spkac.pod]=../perlvars.pm +DEPEND[openssl-srp.pod]=../perlvars.pm +DEPEND[openssl-s_server.pod]=../perlvars.pm +DEPEND[openssl-s_time.pod]=../perlvars.pm +DEPEND[openssl-storeutl.pod]=../perlvars.pm +DEPEND[openssl-ts.pod]=../perlvars.pm +DEPEND[openssl-verify.pod]=../perlvars.pm +DEPEND[openssl-version.pod]=../perlvars.pm +DEPEND[openssl-x509.pod]=../perlvars.pm diff --git a/deps/openssl/openssl/doc/man1/openssl-asn1parse.pod.in b/deps/openssl/openssl/doc/man1/openssl-asn1parse.pod.in new file mode 100644 index 000000000..f098c89c3 --- /dev/null +++ b/deps/openssl/openssl/doc/man1/openssl-asn1parse.pod.in @@ -0,0 +1,220 @@ +=pod +{- OpenSSL::safe::output_do_not_edit_headers(); -} + +=head1 NAME + +openssl-asn1parse - ASN.1 parsing command + +=head1 SYNOPSIS + +B B +[B<-help>] +[B<-inform> B|B] +[B<-in> I] +[B<-out> I] +[B<-noout>] +[B<-offset> I] +[B<-length> I] +[B<-i>] +[B<-oid> I] +[B<-dump>] +[B<-dlimit> I] +[B<-strparse> I] +[B<-genstr> I] +[B<-genconf> I] +[B<-strictpem>] +[B<-item> I] + +=head1 DESCRIPTION + +This command is a diagnostic utility that can parse ASN.1 structures. +It can also be used to extract data from ASN.1 formatted data. + +=head1 OPTIONS + +=over 4 + +=item B<-help> + +Print out a usage message. + +=item B<-inform> B|B + +The input format; the default is B. +See L for details. + +=item B<-in> I + +The input file, default is standard input. + +=item B<-out> I + +Output file to place the DER encoded data into. If this +option is not present then no data will be output. This is most useful when +combined with the B<-strparse> option. + +=item B<-noout> + +Don't output the parsed version of the input file. + +=item B<-offset> I + +Starting offset to begin parsing, default is start of file. + +=item B<-length> I + +Number of bytes to parse, default is until end of file. + +=item B<-i> + +Indents the output according to the "depth" of the structures. + +=item B<-oid> I + +A file containing additional OBJECT IDENTIFIERs (OIDs). The format of this +file is described in the NOTES section below. + +=item B<-dump> + +Dump unknown data in hex format. + +=item B<-dlimit> I + +Like B<-dump>, but only the first B bytes are output. + +=item B<-strparse> I + +Parse the contents octets of the ASN.1 object starting at B. This +option can be used multiple times to "drill down" into a nested structure. + +=item B<-genstr> I, B<-genconf> I + +Generate encoded data based on I, I or both using +L format. If I only is +present then the string is obtained from the default section using the name +B. The encoded data is passed through the ASN1 parser and printed out as +though it came from a file, the contents can thus be examined and written to a +file using the B<-out> option. + +=item B<-strictpem> + +If this option is used then B<-inform> will be ignored. Without this option any +data in a PEM format input file will be treated as being base64 encoded and +processed whether it has the normal PEM BEGIN and END markers or not. This +option will ignore any data prior to the start of the BEGIN marker, or after an +END marker in a PEM file. + +=item B<-item> I + +Attempt to decode and print the data as an B I. This can be +used to print out the fields of any supported ASN.1 structure if the type is +known. + +=back + +=head2 Output + +The output will typically contain lines like this: + + 0:d=0 hl=4 l= 681 cons: SEQUENCE + +..... + + 229:d=3 hl=3 l= 141 prim: BIT STRING + 373:d=2 hl=3 l= 162 cons: cont [ 3 ] + 376:d=3 hl=3 l= 159 cons: SEQUENCE + 379:d=4 hl=2 l= 29 cons: SEQUENCE + 381:d=5 hl=2 l= 3 prim: OBJECT :X509v3 Subject Key Identifier + 386:d=5 hl=2 l= 22 prim: OCTET STRING + 410:d=4 hl=2 l= 112 cons: SEQUENCE + 412:d=5 hl=2 l= 3 prim: OBJECT :X509v3 Authority Key Identifier + 417:d=5 hl=2 l= 105 prim: OCTET STRING + 524:d=4 hl=2 l= 12 cons: SEQUENCE + +..... + +This example is part of a self-signed certificate. Each line starts with the +offset in decimal. C specifies the current depth. The depth is increased +within the scope of any SET or SEQUENCE. C gives the header length +(tag and length octets) of the current type. C gives the length of +the contents octets. + +The B<-i> option can be used to make the output more readable. + +Some knowledge of the ASN.1 structure is needed to interpret the output. + +In this example the BIT STRING at offset 229 is the certificate public key. +The contents octets of this will contain the public key information. This can +be examined using the option C<-strparse 229> to yield: + + 0:d=0 hl=3 l= 137 cons: SEQUENCE + 3:d=1 hl=3 l= 129 prim: INTEGER :E5D21E1F5C8D208EA7A2166C7FAF9F6BDF2059669C60876DDB70840F1A5AAFA59699FE471F379F1DD6A487E7D5409AB6A88D4A9746E24B91D8CF55DB3521015460C8EDE44EE8A4189F7A7BE77D6CD3A9AF2696F486855CF58BF0EDF2B4068058C7A947F52548DDF7E15E96B385F86422BEA9064A3EE9E1158A56E4A6F47E5897 + 135:d=1 hl=2 l= 3 prim: INTEGER :010001 + +=head1 NOTES + +If an OID is not part of OpenSSL's internal table it will be represented in +numerical form (for example 1.2.3.4). The file passed to the B<-oid> option +allows additional OIDs to be included. Each line consists of three columns, +the first column is the OID in numerical format and should be followed by white +space. The second column is the "short name" which is a single word followed +by whitespace. The final column is the rest of the line and is the +"long name". Example: + +C<1.2.3.4 shortName A long name> + +For any OID with an associated short and long name, this command will display +the long name. + +=head1 EXAMPLES + +Parse a file: + + openssl asn1parse -in file.pem + +Parse a DER file: + + openssl asn1parse -inform DER -in file.der + +Generate a simple UTF8String: + + openssl asn1parse -genstr 'UTF8:Hello World' + +Generate and write out a UTF8String, don't print parsed output: + + openssl asn1parse -genstr 'UTF8:Hello World' -noout -out utf8.der + +Generate using a config file: + + openssl asn1parse -genconf asn1.cnf -noout -out asn1.der + +Example config file: + + asn1=SEQUENCE:seq_sect + + [seq_sect] + + field1=BOOL:TRUE + field2=EXP:0, UTF8:some random string + + +=head1 BUGS + +There should be options to change the format of output lines. The output of some +ASN.1 types is not well handled (if at all). + +=head1 SEE ALSO + +L, +L + +=head1 COPYRIGHT + +Copyright 2000-2020 The OpenSSL Project Authors. All Rights Reserved. + +Licensed under the Apache License 2.0 (the "License"). You may not use +this file except in compliance with the License. You can obtain a copy +in the file LICENSE in the source distribution or at +L. + +=cut diff --git a/deps/openssl/openssl/doc/man1/openssl-ca.pod.in b/deps/openssl/openssl/doc/man1/openssl-ca.pod.in new file mode 100644 index 000000000..1d497e848 --- /dev/null +++ b/deps/openssl/openssl/doc/man1/openssl-ca.pod.in @@ -0,0 +1,849 @@ +=pod +{- OpenSSL::safe::output_do_not_edit_headers(); -} + +=head1 NAME + +openssl-ca - sample minimal CA application + +=head1 SYNOPSIS + +B B +[B<-help>] +[B<-verbose>] +[B<-config> I] +[B<-name> I
] +[B<-section> I
] +[B<-gencrl>] +[B<-revoke> I] +[B<-valid> I] +[B<-status> I] +[B<-updatedb>] +[B<-crl_reason> I] +[B<-crl_hold> I] +[B<-crl_compromise> I