From 6494889e3ba6b1432258f0a8ed402723607cff21 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 7 Oct 2003 21:46:47 +0000 Subject: Neil Dunbar provided a patch that now makes libcurl check SSL subjectAltNames when matching certs. This is apparently detailed in RFC2818 as the right thing to do. I had to add configure checks for inet_pton() and our own (strictly speaking, code from BIND written by Paul Vixie) provided code for the function for platforms that miss it. --- lib/inet_pton.h | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 lib/inet_pton.h (limited to 'lib/inet_pton.h') diff --git a/lib/inet_pton.h b/lib/inet_pton.h new file mode 100644 index 000000000..d758e06d2 --- /dev/null +++ b/lib/inet_pton.h @@ -0,0 +1,34 @@ +#ifndef __INET_PTON_H +#define __INET_PTON_H +/*************************************************************************** + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ + * \___|\___/|_| \_\_____| + * + * Copyright (C) 1998 - 2003, Daniel Stenberg, , et al. + * + * This software is licensed as described in the file COPYING, which + * you should have received as part of this distribution. The terms + * are also available at http://curl.haxx.se/docs/copyright.html. + * + * You may opt to use, copy, modify, merge, publish, distribute and/or sell + * copies of the Software, and permit persons to whom the Software is + * furnished to do so, under the terms of the COPYING file. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + * $Id$ + ***************************************************************************/ + +#include "setup.h" + +#ifdef HAVE_INET_PTON +#define Curl_inet_pton(x,y,z) inet_pton(x,y,z) +#else +int Curl_inet_pton(int, const char *, void *); +#endif + +#endif /* __INET_PTON_H */ -- cgit v1.2.1 From e612f73374d25ba290e3fe27758bb6084851450f Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Wed, 8 Oct 2003 13:07:08 +0000 Subject: include file fixes --- lib/inet_pton.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lib/inet_pton.h') diff --git a/lib/inet_pton.h b/lib/inet_pton.h index d758e06d2..019cd3269 100644 --- a/lib/inet_pton.h +++ b/lib/inet_pton.h @@ -27,6 +27,9 @@ #ifdef HAVE_INET_PTON #define Curl_inet_pton(x,y,z) inet_pton(x,y,z) +#ifdef HAVE_ARPA_INET_H +#include +#endif #else int Curl_inet_pton(int, const char *, void *); #endif -- cgit v1.2.1 From 053f6c85efd0bf698f73343989474d672d0563a8 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Wed, 7 Jan 2004 09:19:33 +0000 Subject: updated year in the copyright string --- lib/inet_pton.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/inet_pton.h') diff --git a/lib/inet_pton.h b/lib/inet_pton.h index 019cd3269..b0a70d457 100644 --- a/lib/inet_pton.h +++ b/lib/inet_pton.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2003, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2004, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms -- cgit v1.2.1 From 61133545f6790f3d6ae4fcfdb4bc7a3156a17cdd Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Wed, 16 Mar 2005 22:01:39 +0000 Subject: - Tru64 and some IRIX boxes seem to not like test 237 as it is. Their inet_addr() functions seems to use &255 on all numericals in a ipv4 dotted address which makes a different failure... Now I've modified the ipv4 resolve code to use inet_pton() instead in an attempt to make these systems better detect this as a bad IP address rather than creating a toally bogus address that is then passed on and used. --- lib/inet_pton.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'lib/inet_pton.h') diff --git a/lib/inet_pton.h b/lib/inet_pton.h index b0a70d457..6d911eb7b 100644 --- a/lib/inet_pton.h +++ b/lib/inet_pton.h @@ -1,10 +1,10 @@ #ifndef __INET_PTON_H #define __INET_PTON_H /*************************************************************************** - * _ _ ____ _ - * Project ___| | | | _ \| | - * / __| | | | |_) | | - * | (__| |_| | _ <| |___ + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * * Copyright (C) 1998 - 2004, Daniel Stenberg, , et al. @@ -12,7 +12,7 @@ * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms * are also available at http://curl.haxx.se/docs/copyright.html. - * + * * You may opt to use, copy, modify, merge, publish, distribute and/or sell * copies of the Software, and permit persons to whom the Software is * furnished to do so, under the terms of the COPYING file. -- cgit v1.2.1 From ab4086bc244bf3267976e9f0193e5ed4430190d8 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Thu, 31 Mar 2005 07:02:02 +0000 Subject: Updated the copyright year since changes have been this year. --- lib/inet_pton.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/inet_pton.h') diff --git a/lib/inet_pton.h b/lib/inet_pton.h index 6d911eb7b..918a4dc1f 100644 --- a/lib/inet_pton.h +++ b/lib/inet_pton.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2004, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2005, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms -- cgit v1.2.1 From 01cbf08064ff11486df847aea4548abb828841fb Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Fri, 25 Nov 2005 22:20:02 +0000 Subject: Yang Tse: fixes the use of Curl_inet_ntop and Curl_inet_pton with no prototypes on some platforms, ie IRIX 6.2 MIPS C 6.2 --- lib/inet_pton.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/inet_pton.h') diff --git a/lib/inet_pton.h b/lib/inet_pton.h index 918a4dc1f..8331ba9dc 100644 --- a/lib/inet_pton.h +++ b/lib/inet_pton.h @@ -25,13 +25,13 @@ #include "setup.h" +int Curl_inet_pton(int, const char *, void *); + #ifdef HAVE_INET_PTON -#define Curl_inet_pton(x,y,z) inet_pton(x,y,z) #ifdef HAVE_ARPA_INET_H #include #endif -#else -int Curl_inet_pton(int, const char *, void *); +#define Curl_inet_pton(x,y,z) inet_pton(x,y,z) #endif #endif /* __INET_PTON_H */ -- cgit v1.2.1 From b222b2304eb3ee8b169f6ef3efaffe71eb0fde13 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Mon, 28 Nov 2005 20:21:35 +0000 Subject: Yang Tse's changes to provide an inet_pton() proto for the platforms who don't have one in order to fix a remaining warning on IRIX 6.2. --- lib/inet_pton.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'lib/inet_pton.h') diff --git a/lib/inet_pton.h b/lib/inet_pton.h index 8331ba9dc..a659a9774 100644 --- a/lib/inet_pton.h +++ b/lib/inet_pton.h @@ -28,6 +28,11 @@ int Curl_inet_pton(int, const char *, void *); #ifdef HAVE_INET_PTON + +#if defined(HAVE_NO_INET_PTON_PROTO) +int inet_pton(int af, const char *src, void *dst); +#endif + #ifdef HAVE_ARPA_INET_H #include #endif -- cgit v1.2.1 From 4d437416daee0f626988b8c056ae9cd22486c655 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Wed, 24 Sep 2008 19:13:01 +0000 Subject: HAVE_INET_PTON will only be defined when an IPv6 capable working inet_pton function is available. --- lib/inet_pton.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'lib/inet_pton.h') diff --git a/lib/inet_pton.h b/lib/inet_pton.h index a659a9774..8331ba9dc 100644 --- a/lib/inet_pton.h +++ b/lib/inet_pton.h @@ -28,11 +28,6 @@ int Curl_inet_pton(int, const char *, void *); #ifdef HAVE_INET_PTON - -#if defined(HAVE_NO_INET_PTON_PROTO) -int inet_pton(int af, const char *src, void *dst); -#endif - #ifdef HAVE_ARPA_INET_H #include #endif -- cgit v1.2.1 From 2309b4e330b96bc2e1f8e36b6184015e59544037 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Wed, 24 Mar 2010 11:02:54 +0100 Subject: remove the CVSish $Id$ lines --- lib/inet_pton.h | 1 - 1 file changed, 1 deletion(-) (limited to 'lib/inet_pton.h') diff --git a/lib/inet_pton.h b/lib/inet_pton.h index 8331ba9dc..d53fddff8 100644 --- a/lib/inet_pton.h +++ b/lib/inet_pton.h @@ -20,7 +20,6 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * - * $Id$ ***************************************************************************/ #include "setup.h" -- cgit v1.2.1