diff options
| author | Dan Fandrich <dan@coneharvesters.com> | 2017-04-22 12:07:13 +0200 |
|---|---|---|
| committer | Dan Fandrich <dan@coneharvesters.com> | 2017-04-22 12:20:25 +0200 |
| commit | f761da76f6807f8f5906f3ab59872273e9472fad (patch) | |
| tree | 55878dba7c65ebaa33f691975bcdd09eebd5434d | |
| parent | cbae73e1dd95946597ea74ccb580c30f78e3fa73 (diff) | |
| download | curl-f761da76f6807f8f5906f3ab59872273e9472fad.tar.gz | |
gnutls: removed some code when --disable-verbose is configured
This reduces the binary size and fixes a compile warning.
| -rw-r--r-- | lib/vtls/gtls.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/lib/vtls/gtls.c b/lib/vtls/gtls.c index 0230778e2..4bd1683d6 100644 --- a/lib/vtls/gtls.c +++ b/lib/vtls/gtls.c @@ -211,6 +211,7 @@ int Curl_gtls_cleanup(void) return 1; } +#ifndef CURL_DISABLE_VERBOSE_STRINGS static void showtime(struct Curl_easy *data, const char *text, time_t stamp) @@ -234,6 +235,7 @@ static void showtime(struct Curl_easy *data, tm->tm_sec); infof(data, "%s\n", data->state.buffer); } +#endif static gnutls_datum_t load_file(const char *file) { @@ -962,8 +964,6 @@ gtls_connect_step3(struct connectdata *conn, gnutls_datum_t issuerp; char certbuf[256] = ""; /* big enough? */ size_t size; - unsigned int algo; - unsigned int bits; time_t certclock; const char *ptr; struct Curl_easy *data = conn->data; @@ -974,6 +974,8 @@ gtls_connect_step3(struct connectdata *conn, #endif CURLcode result = CURLE_OK; #ifndef CURL_DISABLE_VERBOSE_STRINGS + unsigned int algo; + unsigned int bits; gnutls_protocol_t version = gnutls_protocol_get_version(session); #endif const char * const hostname = SSL_IS_PROXY() ? conn->http_proxy.host.name : @@ -1344,6 +1346,7 @@ gtls_connect_step3(struct connectdata *conn, */ +#ifndef CURL_DISABLE_VERBOSE_STRINGS /* public key algorithm's parameters */ algo = gnutls_x509_crt_get_pk_algorithm(x509_cert, &bits); infof(data, "\t certificate public key: %s\n", @@ -1368,12 +1371,13 @@ gtls_connect_step3(struct connectdata *conn, gnutls_x509_crt_get_issuer_dn(x509_cert, certbuf, &size); infof(data, "\t issuer: %s\n", certbuf); - gnutls_x509_crt_deinit(x509_cert); - /* compression algorithm (if any) */ ptr = gnutls_compression_get_name(gnutls_compression_get(session)); /* the *_get_name() says "NULL" if GNUTLS_COMP_NULL is returned */ infof(data, "\t compression: %s\n", ptr); +#endif + + gnutls_x509_crt_deinit(x509_cert); #ifdef HAS_ALPN if(conn->bits.tls_enable_alpn) { |