security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-03 22:56:33 +02:00
Code Activity

* curl-shim.c (curl_easy_perform): Fix compile warning.

Browse source 
* curl-shim.h, gpgkeys_curl.c (main), gpgkeys_ldap.c (main): Add
ca-cert-file option, to pass in the SSL cert.
This commit is contained in:
David Shaw 2005-02-12 03:15:02 +00:00
parent 25001837e9
commit 2833a0eadc
5 changed files with 67 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

35
keyserver/gpgkeys_ldap.c
View file

@ -1549,6 +1549,7 @@ main(int argc,char *argv[])
int version,failed=0,use_ssl=0,use_tls=0,bound=0,check_cert=1;
struct keylist *keylist=NULL,*keyptr=NULL;
unsigned int timeout=DEFAULT_KEYSERVER_TIMEOUT;
char *ca_cert_file=NULL;
console=stderr;
@ -1776,6 +1777,26 @@ main(int argc,char *argv[])
else if(start[7]=='\0')
timeout=DEFAULT_KEYSERVER_TIMEOUT;
}
else if(strncasecmp(start,"ca-cert-file",12)==0)
{
if(no)
{
free(ca_cert_file);
ca_cert_file=NULL;
}
else if(start[12]=='=')
{
free(ca_cert_file);
ca_cert_file=strdup(&start[13]);
if(!ca_cert_file)
{
fprintf(console,"gpgkeys: out of memory while creating "
"ca_cert_file\n");
ret=KEYSERVER_NO_MEMORY;
goto fail;
}
}
}
continue;
}
@ -1787,6 +1808,20 @@ main(int argc,char *argv[])
return KEYSERVER_INTERNAL_ERROR;
}
#if defined(HAVE_LDAP_SET_OPTION) && defined(LDAP_OPT_X_TLS_CACERTFILE)
if(ca_cert_file)
{
err=ldap_set_option(NULL,LDAP_OPT_X_TLS_CACERTFILE,ca_cert_file);
if(err!=LDAP_SUCCESS)
{
fprintf(console,"gpgkeys: unable to set ca-cert-file: %s\n",
ldap_err2string(err));
ret=KEYSERVER_INTERNAL_ERROR;
goto fail;
}
}
#endif /* HAVE_LDAP_SET_OPTION && LDAP_OPT_X_TLS_CACERTFILE */
/* SSL trumps TLS */
if(use_ssl)
use_tls=0;