Skip to content

Commit f0b35d1

Browse files
authored
Merge pull request #9174 from philljj/tiny_curl
curl: support --enable-curl=tiny option.
2 parents 472605f + c60553d commit f0b35d1

2 files changed

Lines changed: 10 additions & 2 deletions

File tree

configure.ac

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8191,6 +8191,14 @@ then
81918191
ENABLED_TICKET_NONCE_MALLOC="yes"
81928192
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_TICKET_NONCE_MALLOC"
81938193
fi
8194+
elif test "$ENABLED_CURL" = "tiny"
8195+
then
8196+
if test "x$ENABLED_OPENSSLEXTRA" = "xno"
8197+
then
8198+
ENABLED_OPENSSLEXTRA="x509small"
8199+
fi
8200+
8201+
AM_CFLAGS="$AM_CFLAGS -DHAVE_CURL"
81948202
fi
81958203
81968204
if test "$ENABLED_PSK" = "no" && test "$ENABLED_LEANPSK" = "no" \

wolfssl/internal.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6529,7 +6529,7 @@ static const byte kTlsServerStr[SIZEOF_SENDER+1] = { 0x53, 0x52, 0x56, 0x52, 0x0
65296529
static const byte kTlsClientFinStr[FINISHED_LABEL_SZ + 1] = "client finished";
65306530
static const byte kTlsServerFinStr[FINISHED_LABEL_SZ + 1] = "server finished";
65316531

6532-
#if defined(OPENSSL_EXTRA) || defined(WOLFSSL_WPAS_SMALL)
6532+
#if defined(OPENSSL_EXTRA) || defined(WOLFSSL_WPAS_SMALL) || defined(HAVE_CURL)
65336533
typedef struct {
65346534
int name_len;
65356535
const char *name;
@@ -6539,7 +6539,7 @@ typedef struct {
65396539
extern const WOLF_EC_NIST_NAME kNistCurves[];
65406540
WOLFSSL_LOCAL int set_curves_list(WOLFSSL* ssl, WOLFSSL_CTX *ctx,
65416541
const char* names, byte curves_only);
6542-
#endif /* OPENSSL_EXTRA || WOLFSSL_WPAS_SMALL */
6542+
#endif /* OPENSSL_EXTRA || WOLFSSL_WPAS_SMALL || HAVE_CURL */
65436543

65446544
/* internal functions */
65456545
WOLFSSL_LOCAL int SendChangeCipher(WOLFSSL* ssl);

0 commit comments

Comments
 (0)