Skip to content

Commit bbf6a49

Browse files
jasonacoxjasonacox
committed
Updated versions
1 parent 038dfbe commit bbf6a49

File tree

13 files changed

+265
-273
lines changed

13 files changed

+265
-273
lines changed

‎build.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
# EDIT this section to Select Default Versions #
1111
################################################
1212

13-
OPENSSL="1.1.1i" # https://www.openssl.org/source/
14-
LIBCURL="7.74.0" # https://curl.haxx.se/download.html
15-
NGHTTP2="1.42.0" # https://nghttp2.org/
13+
OPENSSL="1.1.1l" # https://www.openssl.org/source/
14+
LIBCURL="7.79.0" # https://curl.haxx.se/download.html
15+
NGHTTP2="1.44.0" # https://nghttp2.org/
1616

1717
################################################
1818

‎example/iOS Test App/cacert.pem

Lines changed: 172 additions & 226 deletions
Large diffs are not rendered by default.

‎example/iOS Test App/include/curl/curl.h

Lines changed: 54 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* | (__| |_| | _ <| |___
88
* \___|\___/|_| \_\_____|
99
*
10-
* Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al.
10+
* Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al.
1111
*
1212
* This software is licensed as described in the file COPYING, which
1313
* you should have received as part of this distribution. The terms
@@ -25,9 +25,6 @@
2525
/*
2626
* If you have libcurl problems, all docs and details are found here:
2727
* https://curl.se/libcurl/
28-
*
29-
* curl-library mailing list subscription and unsubscription web interface:
30-
* https://cool.haxx.se/mailman/listinfo/curl-library/
3128
*/
3229

3330
#ifdef CURL_NO_OLDIES
@@ -74,8 +71,9 @@
7471
#if defined(_AIX) || defined(__NOVELL_LIBC__) || defined(__NetBSD__) || \
7572
defined(__minix) || defined(__SYMBIAN32__) || defined(__INTEGRITY) || \
7673
defined(ANDROID) || defined(__ANDROID__) || defined(__OpenBSD__) || \
77-
defined(__CYGWIN__) || defined(AMIGA) || \
78-
(defined(__FreeBSD_version) && (__FreeBSD_version < 800000))
74+
defined(__CYGWIN__) || defined(AMIGA) || defined(__NuttX__) || \
75+
(defined(__FreeBSD_version) && (__FreeBSD_version < 800000)) || \
76+
defined(__VXWORKS__)
7977
#include <sys/select.h>
8078
#endif
8179

@@ -155,7 +153,8 @@ typedef enum {
155153
CURLSSLBACKEND_AXTLS = 10, /* never used since 7.63.0 */
156154
CURLSSLBACKEND_MBEDTLS = 11,
157155
CURLSSLBACKEND_MESALINK = 12,
158-
CURLSSLBACKEND_BEARSSL = 13
156+
CURLSSLBACKEND_BEARSSL = 13,
157+
CURLSSLBACKEND_RUSTLS = 14
159158
} curl_sslbackend;
160159

161160
/* aliases for library clones and renames */
@@ -540,7 +539,7 @@ typedef enum {
540539
CURLE_OBSOLETE46, /* 46 - NOT USED */
541540
CURLE_TOO_MANY_REDIRECTS, /* 47 - catch endless re-direct loops */
542541
CURLE_UNKNOWN_OPTION, /* 48 - User specified an unknown option */
543-
CURLE_TELNET_OPTION_SYNTAX, /* 49 - Malformed telnet option */
542+
CURLE_SETOPT_OPTION_SYNTAX, /* 49 - Malformed setopt option */
544543
CURLE_OBSOLETE50, /* 50 - NOT USED */
545544
CURLE_OBSOLETE51, /* 51 - NOT USED */
546545
CURLE_GOT_NOTHING, /* 52 - when this is a specific error */
@@ -611,6 +610,7 @@ typedef enum {
611610
CURLE_HTTP3, /* 95 - An HTTP/3 layer problem */
612611
CURLE_QUIC_CONNECT_ERROR, /* 96 - QUIC connection error */
613612
CURLE_PROXY, /* 97 - proxy handshake error */
613+
CURLE_SSL_CLIENTCERT, /* 98 - client-side certificate required */
614614
CURL_LAST /* never use! */
615615
} CURLcode;
616616

@@ -634,6 +634,9 @@ typedef enum {
634634
/* The following were added in 7.21.5, April 2011 */
635635
#define CURLE_UNKNOWN_TELNET_OPTION CURLE_UNKNOWN_OPTION
636636

637+
/* Added for 7.78.0 */
638+
#define CURLE_TELNET_OPTION_SYNTAX CURLE_SETOPT_OPTION_SYNTAX
639+
637640
/* The following were added in 7.17.1 */
638641
/* These are scheduled to disappear by 2009 */
639642
#define CURLE_SSL_PEER_CERTIFICATE CURLE_PEER_FAILED_VERIFICATION
@@ -787,6 +790,7 @@ typedef enum {
787790
#define CURLAUTH_DIGEST_IE (((unsigned long)1)<<4)
788791
#define CURLAUTH_NTLM_WB (((unsigned long)1)<<5)
789792
#define CURLAUTH_BEARER (((unsigned long)1)<<6)
793+
#define CURLAUTH_AWS_SIGV4 (((unsigned long)1)<<7)
790794
#define CURLAUTH_ONLY (((unsigned long)1)<<31)
791795
#define CURLAUTH_ANY (~CURLAUTH_DIGEST_IE)
792796
#define CURLAUTH_ANYSAFE (~(CURLAUTH_BASIC|CURLAUTH_DIGEST_IE))
@@ -886,6 +890,10 @@ typedef enum {
886890
operating system. Currently implemented under MS-Windows. */
887891
#define CURLSSLOPT_NATIVE_CA (1<<4)
888892

893+
/* - CURLSSLOPT_AUTO_CLIENT_CERT tells libcurl to automatically locate and use
894+
a client certificate for authentication. (Schannel) */
895+
#define CURLSSLOPT_AUTO_CLIENT_CERT (1<<5)
896+
889897
/* The default connection attempt delay in milliseconds for happy eyeballs.
890898
CURLOPT_HAPPY_EYEBALLS_TIMEOUT_MS.3 and happy-eyeballs-timeout-ms.d document
891899
this value, keep them in sync. */
@@ -1015,6 +1023,7 @@ typedef CURLSTScode (*curl_hstswrite_callback)(CURL *easy,
10151023
#define CURLPROTO_SMB (1<<26)
10161024
#define CURLPROTO_SMBS (1<<27)
10171025
#define CURLPROTO_MQTT (1<<28)
1026+
#define CURLPROTO_GOPHERS (1<<29)
10181027
#define CURLPROTO_ALL (~0) /* enable everything */
10191028

10201029
/* long may be 32 or 64 bits, but we should never depend on anything else
@@ -1458,8 +1467,8 @@ typedef enum {
14581467
#define CURLOPT_SERVER_RESPONSE_TIMEOUT CURLOPT_FTP_RESPONSE_TIMEOUT
14591468

14601469
/* Set this option to one of the CURL_IPRESOLVE_* defines (see below) to
1461-
tell libcurl to resolve names to those IP versions only. This only has
1462-
affect on systems with support for more than one, i.e IPv4 _and_ IPv6. */
1470+
tell libcurl to use those IP versions only. This only has effect on
1471+
systems with support for more than one, i.e IPv4 _and_ IPv6. */
14631472
CURLOPT(CURLOPT_IPRESOLVE, CURLOPTTYPE_VALUES, 113),
14641473

14651474
/* Set this option to limit the size of a file that will be downloaded from
@@ -1614,7 +1623,7 @@ typedef enum {
16141623
CURLOPT(CURLOPT_NEW_FILE_PERMS, CURLOPTTYPE_LONG, 159),
16151624
CURLOPT(CURLOPT_NEW_DIRECTORY_PERMS, CURLOPTTYPE_LONG, 160),
16161625

1617-
/* Set the behaviour of POST when redirecting. Values must be set to one
1626+
/* Set the behavior of POST when redirecting. Values must be set to one
16181627
of CURL_REDIR* defines below. This used to be called CURLOPT_POST301 */
16191628
CURLOPT(CURLOPT_POSTREDIR, CURLOPTTYPE_VALUES, 161),
16201629

@@ -2073,6 +2082,26 @@ typedef enum {
20732082
CURLOPT(CURLOPT_HSTSWRITEFUNCTION, CURLOPTTYPE_FUNCTIONPOINT, 303),
20742083
CURLOPT(CURLOPT_HSTSWRITEDATA, CURLOPTTYPE_CBPOINT, 304),
20752084

2085+
/* Parameters for V4 signature */
2086+
CURLOPT(CURLOPT_AWS_SIGV4, CURLOPTTYPE_STRINGPOINT, 305),
2087+
2088+
/* Same as CURLOPT_SSL_VERIFYPEER but for DoH (DNS-over-HTTPS) servers. */
2089+
CURLOPT(CURLOPT_DOH_SSL_VERIFYPEER, CURLOPTTYPE_LONG, 306),
2090+
2091+
/* Same as CURLOPT_SSL_VERIFYHOST but for DoH (DNS-over-HTTPS) servers. */
2092+
CURLOPT(CURLOPT_DOH_SSL_VERIFYHOST, CURLOPTTYPE_LONG, 307),
2093+
2094+
/* Same as CURLOPT_SSL_VERIFYSTATUS but for DoH (DNS-over-HTTPS) servers. */
2095+
CURLOPT(CURLOPT_DOH_SSL_VERIFYSTATUS, CURLOPTTYPE_LONG, 308),
2096+
2097+
/* The CA certificates as "blob" used to validate the peer certificate
2098+
this option is used only if SSL_VERIFYPEER is true */
2099+
CURLOPT(CURLOPT_CAINFO_BLOB, CURLOPTTYPE_BLOB, 309),
2100+
2101+
/* The CA certificates as "blob" used to validate the proxy certificate
2102+
this option is used only if PROXY_SSL_VERIFYPEER is true */
2103+
CURLOPT(CURLOPT_PROXY_CAINFO_BLOB, CURLOPTTYPE_BLOB, 310),
2104+
20762105
CURLOPT_LASTENTRY /* the last unused */
20772106
} CURLoption;
20782107

@@ -2107,10 +2136,10 @@ typedef enum {
21072136
/* Below here follows defines for the CURLOPT_IPRESOLVE option. If a host
21082137
name resolves addresses using more than one IP protocol version, this
21092138
option might be handy to force libcurl to use a specific IP version. */
2110-
#define CURL_IPRESOLVE_WHATEVER 0 /* default, resolves addresses to all IP
2139+
#define CURL_IPRESOLVE_WHATEVER 0 /* default, uses addresses to all IP
21112140
versions that your system allows */
2112-
#define CURL_IPRESOLVE_V4 1 /* resolve to IPv4 addresses */
2113-
#define CURL_IPRESOLVE_V6 2 /* resolve to IPv6 addresses */
2141+
#define CURL_IPRESOLVE_V4 1 /* uses only IPv4 addresses/connections */
2142+
#define CURL_IPRESOLVE_V6 2 /* uses only IPv6 addresses/connections */
21142143

21152144
/* three convenient "aliases" that follow the name scheme better */
21162145
#define CURLOPT_RTSPHEADER CURLOPT_HTTPHEADER
@@ -2746,8 +2775,9 @@ typedef enum {
27462775
CURLINFO_RETRY_AFTER = CURLINFO_OFF_T + 57,
27472776
CURLINFO_EFFECTIVE_METHOD = CURLINFO_STRING + 58,
27482777
CURLINFO_PROXY_ERROR = CURLINFO_LONG + 59,
2778+
CURLINFO_REFERER = CURLINFO_STRING + 60,
27492779

2750-
CURLINFO_LASTONE = 59
2780+
CURLINFO_LASTONE = 60
27512781
} CURLINFO;
27522782

27532783
/* CURLINFO_RESPONSE_CODE is the new name for the option previously known as
@@ -2849,6 +2879,8 @@ typedef enum {
28492879
CURLVERSION_SIXTH,
28502880
CURLVERSION_SEVENTH,
28512881
CURLVERSION_EIGHTH,
2882+
CURLVERSION_NINTH,
2883+
CURLVERSION_TENTH,
28522884
CURLVERSION_LAST /* never actually use this */
28532885
} CURLversion;
28542886

@@ -2857,7 +2889,7 @@ typedef enum {
28572889
meant to be a built-in version number for what kind of struct the caller
28582890
expects. If the struct ever changes, we redefine the NOW to another enum
28592891
from above. */
2860-
#define CURLVERSION_NOW CURLVERSION_EIGHTH
2892+
#define CURLVERSION_NOW CURLVERSION_TENTH
28612893

28622894
struct curl_version_info_data {
28632895
CURLversion age; /* age of the returned struct */
@@ -2908,6 +2940,11 @@ struct curl_version_info_data {
29082940
(MAJOR << 24) | (MINOR << 12) | PATCH */
29092941
const char *zstd_version; /* human readable string. */
29102942

2943+
/* These fields were added in CURLVERSION_NINTH */
2944+
const char *hyper_version; /* human readable string. */
2945+
2946+
/* These fields were added in CURLVERSION_TENTH */
2947+
const char *gsasl_version; /* human readable string. */
29112948
};
29122949
typedef struct curl_version_info_data curl_version_info_data;
29132950

@@ -2945,6 +2982,7 @@ typedef struct curl_version_info_data curl_version_info_data;
29452982
#define CURL_VERSION_ZSTD (1<<26) /* zstd features are present */
29462983
#define CURL_VERSION_UNICODE (1<<27) /* Unicode support on Windows */
29472984
#define CURL_VERSION_HSTS (1<<28) /* HSTS is supported */
2985+
#define CURL_VERSION_GSASL (1<<29) /* libgsasl is supported */
29482986

29492987
/*
29502988
* NAME curl_version_info()

‎example/iOS Test App/include/curl/curlver.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* | (__| |_| | _ <| |___
88
* \___|\___/|_| \_\_____|
99
*
10-
* Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al.
10+
* Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al.
1111
*
1212
* This software is licensed as described in the file COPYING, which
1313
* you should have received as part of this distribution. The terms
@@ -26,16 +26,16 @@
2626
a script at release-time. This was made its own header file in 7.11.2 */
2727

2828
/* This is the global package copyright */
29-
#define LIBCURL_COPYRIGHT "1996 - 2020 Daniel Stenberg, <daniel@haxx.se>."
29+
#define LIBCURL_COPYRIGHT "1996 - 2021 Daniel Stenberg, <daniel@haxx.se>."
3030

3131
/* This is the version number of the libcurl package from which this header
3232
file origins: */
33-
#define LIBCURL_VERSION "7.74.0"
33+
#define LIBCURL_VERSION "7.79.0"
3434

3535
/* The numeric version number is also available "in parts" by using these
3636
defines: */
3737
#define LIBCURL_VERSION_MAJOR 7
38-
#define LIBCURL_VERSION_MINOR 74
38+
#define LIBCURL_VERSION_MINOR 79
3939
#define LIBCURL_VERSION_PATCH 0
4040

4141
/* This is the numeric version of the libcurl version number, meant for easier
@@ -57,7 +57,7 @@
5757
CURL_VERSION_BITS() macro since curl's own configure script greps for it
5858
and needs it to contain the full number.
5959
*/
60-
#define LIBCURL_VERSION_NUM 0x074a00
60+
#define LIBCURL_VERSION_NUM 0x074f00
6161

6262
/*
6363
* This is the date and time when the full source package was created. The
@@ -68,7 +68,7 @@
6868
*
6969
* "2007-11-23"
7070
*/
71-
#define LIBCURL_TIMESTAMP "2020-12-09"
71+
#define LIBCURL_TIMESTAMP "2021-09-15"
7272

7373
#define CURL_VERSION_BITS(x,y,z) ((x)<<16|(y)<<8|(z))
7474
#define CURL_AT_LEAST_VERSION(x,y,z) \

‎example/iOS Test App/include/curl/typecheck-gcc.h

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* | (__| |_| | _ <| |___
88
* \___|\___/|_| \_\_____|
99
*
10-
* Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al.
10+
* Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al.
1111
*
1212
* This software is licensed as described in the file COPYING, which
1313
* you should have received as part of this distribution. The terms
@@ -334,6 +334,7 @@ CURLWARNING(_curl_easy_getinfo_err_curl_off_t,
334334
(option) == CURLOPT_URL || \
335335
(option) == CURLOPT_USERAGENT || \
336336
(option) == CURLOPT_USERNAME || \
337+
(option) == CURLOPT_AWS_SIGV4 || \
337338
(option) == CURLOPT_USERPWD || \
338339
(option) == CURLOPT_XOAUTH2_BEARER || \
339340
(option) == CURLOPT_SSL_EC_CURVES || \
@@ -666,11 +667,11 @@ typedef CURLcode (*_curl_ssl_ctx_callback4)(CURL *, const void *,
666667
/* hack: if we included OpenSSL's ssl.h, we know about SSL_CTX
667668
* this will of course break if we're included before OpenSSL headers...
668669
*/
669-
typedef CURLcode (*_curl_ssl_ctx_callback5)(CURL *, SSL_CTX, void *);
670-
typedef CURLcode (*_curl_ssl_ctx_callback6)(CURL *, SSL_CTX, const void *);
671-
typedef CURLcode (*_curl_ssl_ctx_callback7)(CURL *, const SSL_CTX, void *);
672-
typedef CURLcode (*_curl_ssl_ctx_callback8)(CURL *, const SSL_CTX,
673-
const void *);
670+
typedef CURLcode (*_curl_ssl_ctx_callback5)(CURL *, SSL_CTX *, void *);
671+
typedef CURLcode (*_curl_ssl_ctx_callback6)(CURL *, SSL_CTX *, const void *);
672+
typedef CURLcode (*_curl_ssl_ctx_callback7)(CURL *, const SSL_CTX *, void *);
673+
typedef CURLcode (*_curl_ssl_ctx_callback8)(CURL *, const SSL_CTX *,
674+
const void *);
674675
#else
675676
typedef _curl_ssl_ctx_callback1 _curl_ssl_ctx_callback5;
676677
typedef _curl_ssl_ctx_callback1 _curl_ssl_ctx_callback6;

‎example/iOS Test App/include/curl/urlapi.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* | (__| |_| | _ <| |___
88
* \___|\___/|_| \_\_____|
99
*
10-
* Copyright (C) 2018 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al.
10+
* Copyright (C) 2018 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al.
1111
*
1212
* This software is licensed as described in the file COPYING, which
1313
* you should have received as part of this distribution. The terms
@@ -79,6 +79,7 @@ typedef enum {
7979
#define CURLU_GUESS_SCHEME (1<<9) /* legacy curl-style guessing */
8080
#define CURLU_NO_AUTHORITY (1<<10) /* Allow empty authority when the
8181
scheme is unknown. */
82+
#define CURLU_ALLOW_SPACE (1<<11) /* Allow spaces in the URL */
8283

8384
typedef struct Curl_URL CURLU;
8485

‎example/iOS Test App/include/openssl/e_os2.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
2+
* Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
33
*
44
* Licensed under the OpenSSL license (the "License"). You may not use
55
* this file except in compliance with the License. You can obtain a copy
@@ -279,7 +279,8 @@ typedef unsigned __int64 uint64_t;
279279
# define ossl_inline inline
280280
# endif
281281

282-
# if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
282+
# if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L && \
283+
!defined(__cplusplus)
283284
# define ossl_noreturn _Noreturn
284285
# elif defined(__GNUC__) && __GNUC__ >= 2
285286
# define ossl_noreturn __attribute__((noreturn))

‎example/iOS Test App/include/openssl/evperr.h

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Generated by util/mkerr.pl DO NOT EDIT
3-
* Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
3+
* Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
44
*
55
* Licensed under the OpenSSL license (the "License"). You may not use
66
* this file except in compliance with the License. You can obtain a copy
@@ -11,9 +11,7 @@
1111
#ifndef HEADER_EVPERR_H
1212
# define HEADER_EVPERR_H
1313

14-
# ifndef HEADER_SYMHACKS_H
15-
# include <openssl/symhacks.h>
16-
# endif
14+
# include <openssl/symhacks.h>
1715

1816
# ifdef __cplusplus
1917
extern "C"
@@ -179,6 +177,7 @@ int ERR_load_EVP_strings(void);
179177
# define EVP_R_ONLY_ONESHOT_SUPPORTED 177
180178
# define EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE 150
181179
# define EVP_R_OPERATON_NOT_INITIALIZED 151
180+
# define EVP_R_OUTPUT_WOULD_OVERFLOW 184
182181
# define EVP_R_PARTIALLY_OVERLAPPING 162
183182
# define EVP_R_PBKDF2_ERROR 181
184183
# define EVP_R_PKEY_APPLICATION_ASN1_METHOD_ALREADY_REGISTERED 179

‎example/iOS Test App/include/openssl/obj_mac.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* WARNING: do not edit!
33
* Generated by crypto/objects/objects.pl
44
*
5-
* Copyright 2000-2020 The OpenSSL Project Authors. All Rights Reserved.
5+
* Copyright 2000-2021 The OpenSSL Project Authors. All Rights Reserved.
66
* Licensed under the OpenSSL license (the "License"). You may not use
77
* this file except in compliance with the License. You can obtain a copy
88
* in the file LICENSE in the source distribution or at

‎example/iOS Test App/include/openssl/opensslv.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 1999-2020 The OpenSSL Project Authors. All Rights Reserved.
2+
* Copyright 1999-2021 The OpenSSL Project Authors. All Rights Reserved.
33
*
44
* Licensed under the OpenSSL license (the "License"). You may not use
55
* this file except in compliance with the License. You can obtain a copy
@@ -39,8 +39,8 @@ extern "C" {
3939
* (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
4040
* major minor fix final patch/beta)
4141
*/
42-
# define OPENSSL_VERSION_NUMBER 0x1010109fL
43-
# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1i 8 Dec 2020"
42+
# define OPENSSL_VERSION_NUMBER 0x101010cfL
43+
# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1l 24 Aug 2021"
4444

4545
/*-
4646
* The macros below are to be used for shared library (.so, .dll, ...)

0 commit comments

Comments
 (0)