summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Eremin-Solenikov <dbaryshkov@gmail.com>2016-12-06 22:41:28 +0300
committerNikos Mavrogiannopoulos <nmav@redhat.com>2016-12-07 09:01:35 +0100
commitda413ad2f030fccc3afac9f00906c866827029af (patch)
tree42a1e27e0532afee3e134f6b072ab72f54d461a5
parentcfb9d15d56a71d30c3e20d73b5a29ca12f5b9120 (diff)
downloadgnutls-tmp-crl-updates.tar.gz
Don't trash DER CRQ output with text datatmp-crl-updates
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
-rw-r--r--src/certtool.c4
-rw-r--r--tests/cert-tests/data/arb-extensions.csr2
-rw-r--r--tests/cert-tests/data/template-tlsfeature.csr2
3 files changed, 6 insertions, 2 deletions
diff --git a/src/certtool.c b/src/certtool.c
index 91c8ba3821..f3db41874d 100644
--- a/src/certtool.c
+++ b/src/certtool.c
@@ -1828,10 +1828,10 @@ static void print_crq_info(gnutls_x509_crq_t crq, FILE * out)
ret = gnutls_x509_crq_verify(crq, 0);
if (ret < 0) {
- fprintf(outcert_format == GNUTLS_X509_FMT_DER ? out : stderr,
+ fprintf(outcert_format == GNUTLS_X509_FMT_PEM ? out : stderr,
"Self signature: FAILED\n\n");
} else {
- fprintf(outcert_format == GNUTLS_X509_FMT_DER ? out : stderr,
+ fprintf(outcert_format == GNUTLS_X509_FMT_PEM ? out : stderr,
"Self signature: verified\n\n");
}
diff --git a/tests/cert-tests/data/arb-extensions.csr b/tests/cert-tests/data/arb-extensions.csr
index 7c1f27b995..63014b86d0 100644
--- a/tests/cert-tests/data/arb-extensions.csr
+++ b/tests/cert-tests/data/arb-extensions.csr
@@ -50,6 +50,8 @@ Other Information:
sha1:5d40adf0ce9440958b7e99941d925422ca72365f
sha256:472f7ef457b70a57a585094b285fdaef7ad72553495701ecd4f2a6dcb477b50e
+Self signature: verified
+
-----BEGIN NEW CERTIFICATE REQUEST-----
MIIDIjCCAosCAQAwezEVMBMGA1UEAxMMQ2luZHkgTGF1cGVyMRcwFQYDVQQLEw5z
bGVlcGluZyBkZXB0LjESMBAGA1UEChMJS29rbyBpbmMuMQ8wDQYDVQQIEwZBdHRp
diff --git a/tests/cert-tests/data/template-tlsfeature.csr b/tests/cert-tests/data/template-tlsfeature.csr
index e22bec812c..c6fbd1772a 100644
--- a/tests/cert-tests/data/template-tlsfeature.csr
+++ b/tests/cert-tests/data/template-tlsfeature.csr
@@ -40,6 +40,8 @@ Other Information:
sha1:5d40adf0ce9440958b7e99941d925422ca72365f
sha256:472f7ef457b70a57a585094b285fdaef7ad72553495701ecd4f2a6dcb477b50e
+Self signature: verified
+
-----BEGIN NEW CERTIFICATE REQUEST-----
MIICrDCCAhUCAQAwgZoxFTATBgNVBAMTDENpbmR5IExhdXBlcjEXMBUGA1UECxMO
c2xlZXBpbmcgZGVwdC4xEjAQBgNVBAoTCUtva28gaW5jLjEPMA0GA1UECBMGQXR0