deprecated ASN1 macros from libtasn1.h
cover deprecated ASN1 macros from libtasn1.h
Some macros in libtasn1.h are deprecated and produce warning that brake compilation (with -Werror).
See fae39782 in libtasn1:
Author: Tim Rühsen <[email protected]>
Date: Thu Mar 12 15:16:40 2020 +0100
Print deprecation warning for deprecated macros
Use _Pragma to print warning for using deprecated macros. This is enabled for gcc >= 3.1.
Signed-off-by Tim Rühsen <[email protected]>
Petr Ovtchenkov (1):
replace ASN1 deprecated macros
tests/crypto-tls-x509-helpers.c | 10 +++++----- tests/crypto-tls-x509-helpers.h | 2 +- tests/pkix_asn1_tab.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-)
Signature · 1 line
2.29.2.1.g08c1adf7b9
PATCH 1/1 replace ASN1 deprecated macros
Follow recommendation from libtasn1.h for deprecated macros.
Signed-off-by Petr Ovtchenkov <[email protected]>
--- tests/crypto-tls-x509-helpers.c | 10 +++++----- tests/crypto-tls-x509-helpers.h | 2 +- tests/pkix_asn1_tab.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-)
tests/crypto-tls-x509-helpers.c +5 -5
@@ -30,7 +30,7 @@* This stores some static data that is needed when * encoding extensions in the x509 certs */ -ASN1_TYPE pkix_asn1; +asn1_node pkix_asn1;/* * To avoid consuming random entropy to generate keys,
@@ -139,7 +139,7 @@ void test_tls_cleanup(const char *keyfile)/* * Turns an ASN1 object into a DER encoded byte array */ -static void test_tls_der_encode (ASN1_TYPE src, +static void test_tls_der_encode (asn1_node src,const char *src_name,gnutls_datum_t *res) {
@@ -317,7 +317,7 @@ test_tls_generate_cert(QCryptoTLSTestCertReq *req,* the 'critical' field which we want control over */ if (req->basicConstraintsEnable) { -ASN1_TYPE ext =ASN1_TYPE_EMPTY ; +asn1_node ext =NULL ;asn1_create_element (pkix_asn1,"PKIX1.BasicConstraints" , &ext); asn1_write_value(ext, "cA",
@@ -344,7 +344,7 @@ test_tls_generate_cert(QCryptoTLSTestCertReq *req,* to be 'critical' */ if (req->keyUsageEnable) { -ASN1_TYPE ext =ASN1_TYPE_EMPTY ; +asn1_node ext =NULL ;char str[2 ]; str[0 ] = req->keyUsageValue &0xff ;
@@ -374,7 +374,7 @@ test_tls_generate_cert(QCryptoTLSTestCertReq *req,* set this the hard way building up ASN1 data ourselves */ if (req->keyPurposeEnable) { -ASN1_TYPE ext =ASN1_TYPE_EMPTY ; +asn1_node ext =NULL ;asn1_create_element (pkix_asn1,"PKIX1.ExtKeyUsageSyntax" , &ext);if (req->keyPurposeOID1) {
tests/crypto-tls-x509-helpers.h +1 -1
@@ -125,7 +125,7 @@ void test_tls_cleanup(const char *keyfile); }; \ test_tls_generate_cert(&varname, NULL) -extern const ASN1_ARRAY_TYPE pkix_asn1_tab[]; +extern const asn1_static_node pkix_asn1_tab[];#endif /* QCRYPTO_HAVE_TLS_TEST_SUPPORT */
tests/pkix_asn1_tab.c +1 -1
@@ -8,7 +8,7 @@#ifdef QCRYPTO_HAVE_TLS_TEST_SUPPORT -const ASN1_ARRAY_TYPE pkix_asn1_tab[] = { +const asn1_static_node pkix_asn1_tab[] = { {"PKIX1" ,536875024 ,0 }, {0 ,1073741836 ,0 }, {"id-ce", 1879048204, 0},
Signature · 1 line
2.29.2.1.g08c1adf7b9