aboutsummaryrefslogtreecommitdiffstats
path: root/src/charon/testing
diff options
context:
space:
mode:
Diffstat (limited to 'src/charon/testing')
-rw-r--r--src/charon/testing/generator_test.c4
-rw-r--r--src/charon/testing/parser_test.c6
-rw-r--r--src/charon/testing/rsa_test.c2
3 files changed, 5 insertions, 7 deletions
diff --git a/src/charon/testing/generator_test.c b/src/charon/testing/generator_test.c
index ac2c4cf32..b557b5880 100644
--- a/src/charon/testing/generator_test.c
+++ b/src/charon/testing/generator_test.c
@@ -996,7 +996,7 @@ void test_generator_with_cert_payload(protected_tester_t *tester)
cert.ptr = "123456789012";
cert.len = strlen(cert.ptr);
- cert_payload->set_cert_encoding(cert_payload,PGP_CERTIFICATE);
+ cert_payload->set_cert_encoding(cert_payload, CERT_PGP);
cert_payload->set_data(cert_payload,cert);
generator->generate_payload(generator,(payload_t *)cert_payload);
@@ -1046,7 +1046,7 @@ void test_generator_with_certreq_payload(protected_tester_t *tester)
certreq.ptr = "123456789012";
certreq.len = strlen(certreq.ptr);
- certreq_payload->set_cert_encoding(certreq_payload,PGP_CERTIFICATE);
+ certreq_payload->set_cert_encoding(certreq_payload, CERT_PGP);
certreq_payload->set_data(certreq_payload,certreq);
generator->generate_payload(generator,(payload_t *)certreq_payload);
diff --git a/src/charon/testing/parser_test.c b/src/charon/testing/parser_test.c
index 87069cda0..66e65479b 100644
--- a/src/charon/testing/parser_test.c
+++ b/src/charon/testing/parser_test.c
@@ -727,7 +727,7 @@ void test_parser_with_cert_payload(protected_tester_t *tester)
return;
}
result = cert_payload->get_data_clone(cert_payload);
- tester->assert_true(tester,(cert_payload->get_cert_encoding(cert_payload) == DNS_SIGNED_KEY), "is DNS_SIGNED_KEY encoding");
+ tester->assert_true(tester,(cert_payload->get_cert_encoding(cert_payload) == CERT_DNS_SIGNED_KEY), "is DNS_SIGNED_KEY encoding");
tester->assert_true(tester,(result.len == 12), "parsed data lenght");
tester->assert_false(tester,(memcmp(cert_bytes + 5, result.ptr, result.len)), "parsed data");
cert_payload->destroy(cert_payload);
@@ -766,8 +766,8 @@ void test_parser_with_certreq_payload(protected_tester_t *tester)
return;
}
result = certreq_payload->get_data_clone(certreq_payload);
- tester->assert_true(tester,(certreq_payload->get_cert_encoding(certreq_payload) == DNS_SIGNED_KEY), "is DNS_SIGNED_KEY encoding");
- tester->assert_true(tester,(result.len == 12), "parsed data lenght");
+ tester->assert_true(tester,(certreq_payload->get_cert_encoding(certreq_payload) == CERT_DNS_SIGNED_KEY), "is DNS_SIGNED_KEY encoding");
+ tester->assert_true(tester,(result.len == 12), "parsed data length");
tester->assert_false(tester,(memcmp(certreq_bytes + 5, result.ptr, result.len)), "parsed data");
certreq_payload->destroy(certreq_payload);
chunk_free(&result);
diff --git a/src/charon/testing/rsa_test.c b/src/charon/testing/rsa_test.c
index 90baf3f5a..ee0d78259 100644
--- a/src/charon/testing/rsa_test.c
+++ b/src/charon/testing/rsa_test.c
@@ -177,7 +177,6 @@ void test_rsa(protected_tester_t *tester)
// free(signature.ptr);
//
// private_key->destroy(private_key);
-// public_key->destroy(public_key);
/* key setting */
private_key = rsa_private_key_create_from_chunk(der_private_key);
@@ -220,7 +219,6 @@ void test_rsa(protected_tester_t *tester)
free(signature.ptr);
certificate->destroy(certificate);
- public_key->destroy(public_key);
private_key->destroy(private_key);
}