denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scepclient: Avoid name conflict with global PKCS#7 chunk

Browse Source 
Use the same name as further down below in the file.

Fixes: 04ff78aa33 ("scepclient: Store received RA certificates, using CA cert name as base.")
This commit is contained in:
Tobias Brunner
2020-01-28 15:32:43 +01:00
parent 42928551ab
commit d493dc18d6
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/scepclient/scepclient.c
+6 -6
View File
@@ -959,7 +959,7 @@ int main(int argc, char **argv)
{ {
char ca_path[PATH_MAX]; char ca_path[PATH_MAX];
container_t *container; container_t *container;
pkcs7_t *pkcs7; pkcs7_t *p7;
if (!scep_http_request(scep_url, chunk_create(ca_name, strlen(ca_name)), if (!scep_http_request(scep_url, chunk_create(ca_name, strlen(ca_name)),
SCEP_GET_CA_CERT, http_get_request, SCEP_GET_CA_CERT, http_get_request,
@@ -970,10 +970,10 @@ int main(int argc, char **argv)
join_paths(ca_path, sizeof(ca_path), CA_CERT_PATH, file_out_ca_cert); join_paths(ca_path, sizeof(ca_path), CA_CERT_PATH, file_out_ca_cert);
pkcs7 = lib->creds->create(lib->creds, CRED_CONTAINER, CONTAINER_PKCS7, p7 = lib->creds->create(lib->creds, CRED_CONTAINER, CONTAINER_PKCS7,
BUILD_BLOB_ASN1_DER, scep_response, BUILD_END); BUILD_BLOB_ASN1_DER, scep_response, BUILD_END);
if (!pkcs7) if (!p7)
{ /* no PKCS#7 encoded CA+RA certificates, assume simple CA cert */ { /* no PKCS#7 encoded CA+RA certificates, assume simple CA cert */
DBG1(DBG_APP, "unable to parse PKCS#7, assuming plain CA cert"); DBG1(DBG_APP, "unable to parse PKCS#7, assuming plain CA cert");
@@ -990,7 +990,7 @@ int main(int argc, char **argv)
int ra_certs = 0, ca_certs = 0; int ra_certs = 0, ca_certs = 0;
int ra_index = 1, ca_index = 1; int ra_index = 1, ca_index = 1;
enumerator = pkcs7->create_cert_enumerator(pkcs7); enumerator = p7->create_cert_enumerator(p7);
while (enumerator->enumerate(enumerator, &cert)) while (enumerator->enumerate(enumerator, &cert))
{ {
x509_t *x509 = (x509_t*)cert; x509_t *x509 = (x509_t*)cert;
@@ -1005,7 +1005,7 @@ int main(int argc, char **argv)
} }
enumerator->destroy(enumerator); enumerator->destroy(enumerator);
enumerator = pkcs7->create_cert_enumerator(pkcs7); enumerator = p7->create_cert_enumerator(p7);
while (enumerator->enumerate(enumerator, &cert)) while (enumerator->enumerate(enumerator, &cert))
{ {
x509_t *x509 = (x509_t*)cert; x509_t *x509 = (x509_t*)cert;
@@ -1042,7 +1042,7 @@ int main(int argc, char **argv)
chunk_free(&encoding); chunk_free(&encoding);
} }
enumerator->destroy(enumerator); enumerator->destroy(enumerator);
container = &pkcs7->container; container = &p7->container;
container->destroy(container); container->destroy(container);
} }
exit_scepclient(NULL); /* no further output required */ exit_scepclient(NULL); /* no further output required */