security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-24 15:17:02 +01:00
Code Activity

* curl-shim.h, curl-shim.c, gpgkeys_hkp.c: Rename curl_escape() to

Browse Source 
curl_easy_escape() to match cURL.
This commit is contained in:
David Shaw 2007-01-16 18:12:43 +00:00
parent 5af8d68211
commit b8bd7b6186
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
keyserver/ChangeLog
View File

@ -1,3 +1,8 @@
2007-01-16 David Shaw <dshaw@jabberwocky.com>
* curl-shim.h, curl-shim.c, gpgkeys_hkp.c: Rename curl_escape() to
curl_easy_escape() to match cURL.
2007-01-15 David Shaw <dshaw@jabberwocky.com> 2007-01-15 David Shaw <dshaw@jabberwocky.com>
* gpgkeys_hkp.c (send_key): Allow GPG to send any armored key line * gpgkeys_hkp.c (send_key): Allow GPG to send any armored key line

4
keyserver/curl-shim.c
View File

@ -1,7 +1,7 @@
/* curl-shim.c - Implement a small subset of the curl API in terms of /* curl-shim.c - Implement a small subset of the curl API in terms of
* the iobuf HTTP API * the iobuf HTTP API
* *
* Copyright (C) 2005, 2006 Free Software Foundation, Inc. * Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
* *
* This file is part of GnuPG. * This file is part of GnuPG.
* *
@ -265,7 +265,7 @@ curl_easy_perform(CURL *curl)
"0123456789" "0123456789"
char * char *
curl_escape(char *str,int length) curl_easy_escape(CURL *curl,char *str,int length)
{ {
int len,max,idx,enc_idx=0; int len,max,idx,enc_idx=0;
char *enc; char *enc;

4
keyserver/curl-shim.h
View File

@ -1,5 +1,5 @@
/* curl-shim.h /* curl-shim.h
* Copyright (C) 2005, 2006 Free Software Foundation, Inc. * Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
* *
* This file is part of GNUPG. * This file is part of GNUPG.
* *
@ -85,7 +85,7 @@ CURL *curl_easy_init(void);
CURLcode curl_easy_setopt(CURL *curl,CURLoption option,...); CURLcode curl_easy_setopt(CURL *curl,CURLoption option,...);
CURLcode curl_easy_perform(CURL *curl); CURLcode curl_easy_perform(CURL *curl);
void curl_easy_cleanup(CURL *curl); void curl_easy_cleanup(CURL *curl);
char *curl_escape(char *str,int len); char *curl_easy_escape(CURL *curl,char *str,int len);
void curl_free(char *ptr); void curl_free(char *ptr);
#define curl_version() "GnuPG curl-shim "VERSION #define curl_version() "GnuPG curl-shim "VERSION

6
keyserver/gpgkeys_hkp.c
View File

@ -166,7 +166,7 @@ send_key(int *eof)
goto fail; goto fail;
} }
encoded_key=curl_escape(key,keysize); encoded_key=curl_easy_escape(curl,key,keysize);
if(!encoded_key) if(!encoded_key)
{ {
fprintf(console,"gpgkeys: out of memory\n"); fprintf(console,"gpgkeys: out of memory\n");
@ -317,7 +317,7 @@ get_name(const char *getkey)
memset(&ctx,0,sizeof(ctx)); memset(&ctx,0,sizeof(ctx));
searchkey_encoded=curl_escape((char *)getkey,0); searchkey_encoded=curl_easy_escape(curl,(char *)getkey,0);
if(!searchkey_encoded) if(!searchkey_encoded)
{ {
fprintf(console,"gpgkeys: out of memory\n"); fprintf(console,"gpgkeys: out of memory\n");
@ -403,7 +403,7 @@ search_key(const char *searchkey)
fprintf(console,"gpgkeys: search type is %d, and key is \"%s\"\n", fprintf(console,"gpgkeys: search type is %d, and key is \"%s\"\n",
search_type,searchkey); search_type,searchkey);
searchkey_encoded=curl_escape((char *)searchkey,0); searchkey_encoded=curl_easy_escape(curl,(char *)searchkey,0);
if(!searchkey_encoded) if(!searchkey_encoded)
{ {
fprintf(console,"gpgkeys: out of memory\n"); fprintf(console,"gpgkeys: out of memory\n");