Skip to content

Commit 40ce811

Browse files
olszomalmtrojnar
authored andcommitted
Fixed conditional compilation for CURL and proxy support
1 parent db5b4c4 commit 40ce811

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

osslsigncode.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -533,6 +533,8 @@ static int attach_authenticode_response(PKCS7 *p7, PKCS7 *resp, int verbose)
533533
return 0; /* OK */
534534
}
535535

536+
#if defined(ENABLE_CURL) || OPENSSL_VERSION_NUMBER >= 0x30000000L
537+
536538
static void print_proxy(char *proxy)
537539
{
538540
if (proxy) {
@@ -553,6 +555,8 @@ static void print_proxy(char *proxy)
553555
}
554556
}
555557

558+
#endif /* ENABLE_CURL || OPENSSL_VERSION_NUMBER < 0x30000000L */
559+
556560
#if OPENSSL_VERSION_NUMBER<0x30000000L
557561
#ifdef ENABLE_CURL
558562

@@ -1004,7 +1008,7 @@ static int add_timestamp(PKCS7 *p7, FILE_FORMAT_CTX *ctx, char *url, int rfc3161
10041008
(void)rfc3161;
10051009
fprintf(stderr, "Could NOT find CURL\n");
10061010
BIO_free_all(req);
1007-
return NULL; /* FAILED */
1011+
return 1; /* FAILED */
10081012
#else /* ENABLE_CURL */
10091013
if (rfc3161) {
10101014
resp = bio_get_http_curl(&http_code, url, req, ctx->options->proxy,
@@ -2045,6 +2049,7 @@ static X509_CRL *x509_crl_get(FILE_FORMAT_CTX *ctx, char *url)
20452049

20462050
#if OPENSSL_VERSION_NUMBER<0x30000000L
20472051
#ifndef ENABLE_CURL
2052+
(void)ctx;
20482053
fprintf(stderr, "Could NOT find CURL\n");
20492054
return NULL; /* FAILED */
20502055
#else /* ENABLE_CURL */

0 commit comments

Comments
 (0)