ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tests: Replace deprecated ASN1 code 

This fixes several compiler warnings on MacOS with Homebrew. The
git development branch for forthcoming libtasn1 4.17.0 has introduced
deprecation warnings for several macros/types that we use.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Stefan Weil 2021-01-28 18:15:23 +01:00 committed by Daniel P. Berrangé
parent a07e9fdd33
commit ecb98f5c75
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/crypto-tls-x509-helpers.c
View File

@ -30,7 +30,7 @@
* This stores some static data that is needed when * This stores some static data that is needed when
* encoding extensions in the x509 certs * encoding extensions in the x509 certs
*/ */
ASN1_TYPE pkix_asn1; asn1_node pkix_asn1;
/* /*
* To avoid consuming random entropy to generate keys, * 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 * 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, const char *src_name,
gnutls_datum_t *res) gnutls_datum_t *res)
{ {
@ -317,7 +317,7 @@ test_tls_generate_cert(QCryptoTLSTestCertReq *req,
* the 'critical' field which we want control over * the 'critical' field which we want control over
*/ */
if (req->basicConstraintsEnable) { if (req->basicConstraintsEnable) {
ASN1_TYPE ext = ASN1_TYPE_EMPTY; asn1_node ext = NULL;
asn1_create_element(pkix_asn1, "PKIX1.BasicConstraints", &ext); asn1_create_element(pkix_asn1, "PKIX1.BasicConstraints", &ext);
asn1_write_value(ext, "cA", asn1_write_value(ext, "cA",
@ -344,7 +344,7 @@ test_tls_generate_cert(QCryptoTLSTestCertReq *req,
* to be 'critical' * to be 'critical'
*/ */
if (req->keyUsageEnable) { if (req->keyUsageEnable) {
ASN1_TYPE ext = ASN1_TYPE_EMPTY; asn1_node ext = NULL;
char str[2]; char str[2];
str[0] = req->keyUsageValue & 0xff; 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 * set this the hard way building up ASN1 data ourselves
*/ */
if (req->keyPurposeEnable) { if (req->keyPurposeEnable) {
ASN1_TYPE ext = ASN1_TYPE_EMPTY; asn1_node ext = NULL;
asn1_create_element(pkix_asn1, "PKIX1.ExtKeyUsageSyntax", &ext); asn1_create_element(pkix_asn1, "PKIX1.ExtKeyUsageSyntax", &ext);
if (req->keyPurposeOID1) { if (req->keyPurposeOID1) {

2
tests/crypto-tls-x509-helpers.h
View File

@ -125,7 +125,7 @@ void test_tls_cleanup(const char *keyfile);
}; \ }; \
test_tls_generate_cert(&varname, NULL) 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 */ #endif /* QCRYPTO_HAVE_TLS_TEST_SUPPORT */

2
tests/pkix_asn1_tab.c
View File

@ -8,7 +8,7 @@
#ifdef QCRYPTO_HAVE_TLS_TEST_SUPPORT #ifdef QCRYPTO_HAVE_TLS_TEST_SUPPORT
const ASN1_ARRAY_TYPE pkix_asn1_tab[] = { const asn1_static_node pkix_asn1_tab[] = {
{"PKIX1", 536875024, 0}, {"PKIX1", 536875024, 0},
{0, 1073741836, 0}, {0, 1073741836, 0},
{"id-ce", 1879048204, 0}, {"id-ce", 1879048204, 0},