diff options
Diffstat (limited to 'lib/x509/ocsp_output.c')
-rw-r--r-- | lib/x509/ocsp_output.c | 78 |
1 files changed, 34 insertions, 44 deletions
diff --git a/lib/x509/ocsp_output.c b/lib/x509/ocsp_output.c index 8ead90c466..cdab4e866b 100644 --- a/lib/x509/ocsp_output.c +++ b/lib/x509/ocsp_output.c @@ -114,9 +114,7 @@ static void print_req(gnutls_buffer_st * str, gnutls_ocsp_req_const_t req) gnutls_datum_t nonce; unsigned int ncrit; - ret = - gnutls_ocsp_req_get_nonce(req, &ncrit, - &nonce); + ret = gnutls_ocsp_req_get_nonce(req, &ncrit, &nonce); if (ret != GNUTLS_E_SUCCESS) { addf(str, "error: get_nonce: %s\n", gnutls_strerror(ret)); @@ -130,16 +128,15 @@ static void print_req(gnutls_buffer_st * str, gnutls_ocsp_req_const_t req) } } else { addf(str, "\t\tUnknown extension %s (%s):\n", - oid.data, - critical ? "critical" : "not critical"); + oid.data, critical ? "critical" : "not critical"); adds(str, _("\t\t\tASCII: ")); - _gnutls_buffer_asciiprint(str, (char *) data.data, + _gnutls_buffer_asciiprint(str, (char *)data.data, data.size); addf(str, "\n"); adds(str, _("\t\t\tHexdump: ")); - _gnutls_buffer_hexprint(str, (char *) data.data, + _gnutls_buffer_hexprint(str, (char *)data.data, data.size); adds(str, "\n"); } @@ -170,8 +167,7 @@ static void print_req(gnutls_buffer_st * str, gnutls_ocsp_req_const_t req) **/ int gnutls_ocsp_req_print(gnutls_ocsp_req_const_t req, - gnutls_ocsp_print_formats_t format, - gnutls_datum_t * out) + gnutls_ocsp_print_formats_t format, gnutls_datum_t * out) { gnutls_buffer_st str; int rc; @@ -278,16 +274,20 @@ print_resp(gnutls_buffer_st * str, gnutls_ocsp_resp_const_t resp, /* responderID */ { - gnutls_datum_t dn = {NULL, 0}; + gnutls_datum_t dn = { NULL, 0 }; ret = gnutls_ocsp_resp_get_responder2(resp, &dn, 0); if (ret < 0) { if (ret == GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE) { - ret = gnutls_ocsp_resp_get_responder_raw_id(resp, GNUTLS_OCSP_RESP_ID_KEY, &dn); + ret = + gnutls_ocsp_resp_get_responder_raw_id(resp, + GNUTLS_OCSP_RESP_ID_KEY, + &dn); if (ret >= 0) { addf(str, _("\tResponder Key ID: ")); - _gnutls_buffer_hexprint(str, dn.data, dn.size); + _gnutls_buffer_hexprint(str, dn.data, + dn.size); adds(str, "\n"); } gnutls_free(dn.data); @@ -311,11 +311,11 @@ print_resp(gnutls_buffer_st * str, gnutls_ocsp_resp_const_t resp, addf(str, "error: ocsp_resp_get_produced\n"); else if (gmtime_r(&tim, &t) == NULL) addf(str, "error: gmtime_r (%ld)\n", - (unsigned long) tim); + (unsigned long)tim); else if (strftime(s, max, "%a %b %d %H:%M:%S UTC %Y", &t) == 0) addf(str, "error: strftime (%ld)\n", - (unsigned long) tim); + (unsigned long)tim); else addf(str, _("\tProduced At: %s\n"), s); } @@ -389,8 +389,7 @@ print_resp(gnutls_buffer_st * str, gnutls_ocsp_resp_const_t resp, } if (p) - addf(str, "\t\tCertificate Status: %s\n", - p); + addf(str, "\t\tCertificate Status: %s\n", p); } /* XXX revocation reason */ @@ -404,15 +403,13 @@ print_resp(gnutls_buffer_st * str, gnutls_ocsp_resp_const_t resp, addf(str, "error: revocation_time\n"); else if (gmtime_r(&revocation_time, &t) == NULL) addf(str, "error: gmtime_r (%ld)\n", - (unsigned long) revocation_time); + (unsigned long)revocation_time); else if (strftime - (s, max, "%a %b %d %H:%M:%S UTC %Y", - &t) == 0) + (s, max, "%a %b %d %H:%M:%S UTC %Y", &t) == 0) addf(str, "error: strftime (%ld)\n", - (unsigned long) revocation_time); + (unsigned long)revocation_time); else - addf(str, _("\t\tRevocation time: %s\n"), - s); + addf(str, _("\t\tRevocation time: %s\n"), s); } { @@ -424,12 +421,11 @@ print_resp(gnutls_buffer_st * str, gnutls_ocsp_resp_const_t resp, addf(str, "error: this_update\n"); else if (gmtime_r(&this_update, &t) == NULL) addf(str, "error: gmtime_r (%ld)\n", - (unsigned long) this_update); + (unsigned long)this_update); else if (strftime - (s, max, "%a %b %d %H:%M:%S UTC %Y", - &t) == 0) + (s, max, "%a %b %d %H:%M:%S UTC %Y", &t) == 0) addf(str, "error: strftime (%ld)\n", - (unsigned long) this_update); + (unsigned long)this_update); else addf(str, _("\t\tThis Update: %s\n"), s); } @@ -442,14 +438,15 @@ print_resp(gnutls_buffer_st * str, gnutls_ocsp_resp_const_t resp, if (next_update != (time_t) - 1) { if (gmtime_r(&next_update, &t) == NULL) addf(str, "error: gmtime_r (%ld)\n", - (unsigned long) next_update); + (unsigned long)next_update); else if (strftime (s, max, "%a %b %d %H:%M:%S UTC %Y", &t) == 0) addf(str, "error: strftime (%ld)\n", - (unsigned long) next_update); + (unsigned long)next_update); else - addf(str, _("\t\tNext Update: %s\n"), s); + addf(str, _("\t\tNext Update: %s\n"), + s); } } @@ -478,9 +475,7 @@ print_resp(gnutls_buffer_st * str, gnutls_ocsp_resp_const_t resp, gnutls_datum_t nonce; unsigned int ncrit; - ret = - gnutls_ocsp_resp_get_nonce(resp, &ncrit, - &nonce); + ret = gnutls_ocsp_resp_get_nonce(resp, &ncrit, &nonce); if (ret != GNUTLS_E_SUCCESS) { addf(str, "error: get_nonce: %s\n", gnutls_strerror(ret)); @@ -494,16 +489,15 @@ print_resp(gnutls_buffer_st * str, gnutls_ocsp_resp_const_t resp, } } else { addf(str, "\t\tUnknown extension %s (%s):\n", - oid.data, - critical ? "critical" : "not critical"); + oid.data, critical ? "critical" : "not critical"); adds(str, _("\t\t\tASCII: ")); - _gnutls_buffer_asciiprint(str, (char *) data.data, + _gnutls_buffer_asciiprint(str, (char *)data.data, data.size); addf(str, "\n"); adds(str, _("\t\t\tHexdump: ")); - _gnutls_buffer_hexprint(str, (char *) data.data, + _gnutls_buffer_hexprint(str, (char *)data.data, data.size); adds(str, "\n"); } @@ -518,8 +512,7 @@ print_resp(gnutls_buffer_st * str, gnutls_ocsp_resp_const_t resp, addf(str, "error: get_signature_algorithm: %s\n", gnutls_strerror(ret)); else { - const char *name = - gnutls_sign_algorithm_get_name(ret); + const char *name = gnutls_sign_algorithm_get_name(ret); if (name == NULL) name = _("unknown"); addf(str, _("\tSignature Algorithm: %s\n"), name); @@ -543,8 +536,7 @@ print_resp(gnutls_buffer_st * str, gnutls_ocsp_resp_const_t resp, gnutls_strerror(ret)); else { adds(str, _("\tSignature:\n")); - _gnutls_buffer_hexdump(str, sig.data, sig.size, - "\t\t"); + _gnutls_buffer_hexdump(str, sig.data, sig.size, "\t\t"); gnutls_free(sig.data); } @@ -569,8 +561,7 @@ print_resp(gnutls_buffer_st * str, gnutls_ocsp_resp_const_t resp, addf(str, "error: crt_print: %s\n", gnutls_strerror(ret)); else { - addf(str, "%.*s", out.size, - out.data); + addf(str, "%.*s", out.size, out.data); gnutls_free(out.data); } @@ -636,8 +627,7 @@ print_resp(gnutls_buffer_st * str, gnutls_ocsp_resp_const_t resp, **/ int gnutls_ocsp_resp_print(gnutls_ocsp_resp_const_t resp, - gnutls_ocsp_print_formats_t format, - gnutls_datum_t * out) + gnutls_ocsp_print_formats_t format, gnutls_datum_t * out) { gnutls_buffer_st str; int rc; |