mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
From STABLE-BRANCH-1-4
* gpgkeys_curl.c (main): Use curl_version_info to verify that the protocol we're about to use is actually available. * curl-shim.h, curl-shim.c (curl_free): Make into a macro. (curl_version_info): New. Only advertises "http" for our shim, of course.
This commit is contained in:
parent
24feaa4f8a
commit
458efc1d6f
4 changed files with 45 additions and 6 deletions
|
@ -76,8 +76,14 @@ typedef struct
|
|||
http_t hd;
|
||||
} CURL;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
const char **protocols;
|
||||
} curl_version_info_data;
|
||||
|
||||
#define CURL_ERROR_SIZE 256
|
||||
#define CURL_GLOBAL_DEFAULT 0
|
||||
#define CURLVERSION_NOW 0
|
||||
|
||||
CURLcode curl_global_init(long flags);
|
||||
void curl_global_cleanup(void);
|
||||
|
@ -86,7 +92,8 @@ CURLcode curl_easy_setopt(CURL *curl,CURLoption option,...);
|
|||
CURLcode curl_easy_perform(CURL *curl);
|
||||
void curl_easy_cleanup(CURL *curl);
|
||||
char *curl_escape(char *str,int len);
|
||||
void curl_free(char *ptr);
|
||||
#define curl_free(x) free(x)
|
||||
#define curl_version() "GnuPG curl-shim "VERSION
|
||||
curl_version_info_data *curl_version_info(int type);
|
||||
|
||||
#endif /* !_CURL_SHIM_H_ */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue