generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

curlx.c: i2s_ASN1_IA5STRING() clashes with an openssl function

Browse Source 
Reported-By: Gisle Vanem
This commit is contained in:
Daniel Stenberg 2016-02-17 14:51:31 +01:00
parent eb083e0d39
commit 9ae7030cef
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/examples/curlx.c
View File

@ -148,7 +148,7 @@ typedef struct sslctxparm_st {
/* some helper function. */ /* some helper function. */
static char *i2s_ASN1_IA5STRING( ASN1_IA5STRING *ia5) static char *ia5string(ASN1_IA5STRING *ia5)
{ {
char *tmp; char *tmp;
if(!ia5 || !ia5->length) if(!ia5 || !ia5->length)
@ -160,7 +160,7 @@ static char *i2s_ASN1_IA5STRING( ASN1_IA5STRING *ia5)
} }
/* A conveniance routine to get an access URI. */ /* A conveniance routine to get an access URI. */
static unsigned char *my_get_ext(X509 * cert, const int type, static unsigned char *my_get_ext(X509 *cert, const int type,
int extensiontype) int extensiontype)
{ {
int i; int i;
@ -173,7 +173,7 @@ static unsigned char *my_get_ext(X509 * cert, const int type,
ACCESS_DESCRIPTION * ad = sk_ACCESS_DESCRIPTION_value(accessinfo, i); ACCESS_DESCRIPTION * ad = sk_ACCESS_DESCRIPTION_value(accessinfo, i);
if(OBJ_obj2nid(ad->method) == type) { if(OBJ_obj2nid(ad->method) == type) {
if(ad->location->type == GEN_URI) { if(ad->location->type == GEN_URI) {
return i2s_ASN1_IA5STRING(ad->location->d.ia5); return ia5string(ad->location->d.ia5);
} }
return NULL; return NULL;
} }