External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 05:35:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: Replace deprecated ASN1 code

Browse Source 
This fixes compiler warnings when building with libtasn1 4.17.0.

Signed-off-by: Luke Yue <lukedyue@gmail.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Luke Yue 2021-05-18 09:19:26 +08:00 committed by Michal Privoznik
parent 530715bd0b
commit 88b38f685d
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/pkix_asn1_tab.c
View File

@ -5,7 +5,7 @@
#include <config.h> #include <config.h>
#include <libtasn1.h> #include <libtasn1.h>
const ASN1_ARRAY_TYPE pkix_asn1_tab[] = { const asn1_static_node pkix_asn1_tab[] = {
{ "PKIX1", 536875024, NULL }, { "PKIX1", 536875024, NULL },
{ NULL, 1073741836, NULL }, { NULL, 1073741836, NULL },
{ "id-pkix", 1879048204, NULL }, { "id-pkix", 1879048204, NULL },

12
tests/virnettlshelpers.c
View File

@ -37,8 +37,8 @@ VIR_LOG_INIT("tests.nettlshelpers");
* These store some static data that is needed when * These store 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;
extern const ASN1_ARRAY_TYPE pkix_asn1_tab[]; extern const asn1_static_node pkix_asn1_tab[];
/* /*
* To avoid consuming random entropy to generate keys, * To avoid consuming random entropy to generate keys,
@ -107,7 +107,7 @@ void testTLSCleanup(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 testTLSDerEncode(ASN1_TYPE src, static void testTLSDerEncode(asn1_node src,
const char *src_name, const char *src_name,
gnutls_datum_t * res) gnutls_datum_t * res)
{ {
@ -267,7 +267,7 @@ testTLSGenerateCert(struct testTLSCertReq *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", req->basicConstraintsIsCA ? "TRUE" : "FALSE", 1); asn1_write_value(ext, "cA", req->basicConstraintsIsCA ? "TRUE" : "FALSE", 1);
@ -292,7 +292,7 @@ testTLSGenerateCert(struct testTLSCertReq *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;
@ -321,7 +321,7 @@ testTLSGenerateCert(struct testTLSCertReq *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) {