diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2016-05-01 17:05:38 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2016-05-01 17:05:38 +0200 |
| commit | 283babfaf8d8f3bab9d3c63cea94eb0b84e79c37 (patch) | |
| tree | 78f3a526d4afe2c60c1e6f26dfabc5d61cd42f79 /lib/vtls/cyassl.c | |
| parent | 100c7b478fd17fd0c3ffacda7d6aa4b536bc7c6e (diff) | |
tls: make setting pinnedkey option fail if not supported
to make it obvious to users trying to use the feature with TLS backends
not supporting it.
Discussed in #781
Reported-by: Travis Burtrum
Diffstat (limited to 'lib/vtls/cyassl.c')
| -rw-r--r-- | lib/vtls/cyassl.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/lib/vtls/cyassl.c b/lib/vtls/cyassl.c index 0bd318f7c..1109a1a75 100644 --- a/lib/vtls/cyassl.c +++ b/lib/vtls/cyassl.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -51,7 +51,6 @@ and that's a problem since options.h hasn't been included yet. */ #include "urldata.h" #include "sendf.h" #include "inet_pton.h" -#include "cyassl.h" #include "vtls.h" #include "parsedate.h" #include "connect.h" /* for the connect timeout */ @@ -69,6 +68,8 @@ and that's a problem since options.h hasn't been included yet. */ #include <cyassl/ctaocrypt/random.h> #include <cyassl/ctaocrypt/sha256.h> +#include "cyassl.h" + /* The last #include files should be: */ #include "curl_memory.h" #include "memdebug.h" @@ -100,18 +101,6 @@ and that's a problem since options.h hasn't been included yet. */ #endif #endif -/* KEEP_PEER_CERT is a product of the presence of build time symbol - OPENSSL_EXTRA without NO_CERTS, depending on the version. KEEP_PEER_CERT is - in wolfSSL's settings.h, and the latter two are build time symbols in - options.h. */ -#ifndef KEEP_PEER_CERT -#if defined(HAVE_CYASSL_GET_PEER_CERTIFICATE) || \ - defined(HAVE_WOLFSSL_GET_PEER_CERTIFICATE) || \ - (defined(OPENSSL_EXTRA) && !defined(NO_CERTS)) -#define KEEP_PEER_CERT -#endif -#endif - /* HAVE_SUPPORTED_CURVES is wolfSSL's build time symbol for enabling the ECC supported curve extension in options.h. Note ECC is enabled separately. */ #ifndef HAVE_SUPPORTED_CURVES |