From 6343034dd12fabfa88c998eb1182cbc6394afe25 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 12 Jul 2024 13:55:26 +0200 Subject: [PATCH] tidy-up: adjust casing of project names Mostly TLS/SSH project name. Closes #14160 --- .circleci/config.yml | 2 +- .github/scripts/spellcheck.words | 4 - RELEASE-NOTES | 4 +- configure.ac | 28 +-- docs/CIPHERS.md | 2 +- docs/CURLDOWN.md | 2 +- docs/ECH.md | 34 +-- docs/FAQ | 2 +- docs/HISTORY.md | 2 +- docs/HTTP2.md | 2 +- docs/INSTALL-CMAKE.md | 2 +- docs/INSTALL.md | 2 +- docs/examples/Makefile.example | 2 +- docs/examples/usercertinmem.c | 2 +- docs/libcurl/curl_global_sslset.md | 2 +- .../libcurl/opts/CURLINFO_SSL_VERIFYRESULT.md | 2 +- docs/libcurl/opts/CURLOPT_PROXY_SSLVERSION.md | 2 +- .../opts/CURLOPT_PROXY_SSL_CIPHER_LIST.md | 2 +- docs/libcurl/opts/CURLOPT_SSLVERSION.md | 2 +- docs/libcurl/opts/CURLOPT_SSL_CIPHER_LIST.md | 2 +- include/curl/curl.h | 4 +- lib/curl_config.h.cmake | 6 +- lib/sha256.c | 2 +- lib/vtls/cipher_suite.c | 8 +- lib/vtls/gtls.c | 6 +- lib/vtls/openssl.c | 10 +- lib/vtls/wolfssl.c | 8 +- m4/curl-openssl.m4 | 6 +- m4/curl-wolfssl.m4 | 6 +- packages/vms/generate_config_vms_h_curl.com | 4 +- packages/vms/readme | 2 +- packages/vms/report_openssl_version.c | 2 +- projects/README.md | 4 +- projects/Windows/VC10/lib/libcurl.sln | 72 +++--- projects/Windows/VC10/lib/libcurl.tmpl | 188 +++++++-------- projects/Windows/VC10/src/curl.sln | 72 +++--- projects/Windows/VC10/src/curl.tmpl | 216 +++++++++--------- projects/Windows/VC11/lib/libcurl.sln | 72 +++--- projects/Windows/VC11/lib/libcurl.tmpl | 188 +++++++-------- projects/Windows/VC11/src/curl.sln | 72 +++--- projects/Windows/VC11/src/curl.tmpl | 216 +++++++++--------- projects/Windows/VC12/lib/libcurl.sln | 72 +++--- projects/Windows/VC12/lib/libcurl.tmpl | 188 +++++++-------- projects/Windows/VC12/src/curl.sln | 72 +++--- projects/Windows/VC12/src/curl.tmpl | 216 +++++++++--------- projects/build-openssl.bat | 2 +- tests/ech_tests.sh | 6 +- tests/http/test_17_ssl_use.py | 26 +-- tests/unit/unit3205.c | 6 +- winbuild/README.md | 6 +- 50 files changed, 928 insertions(+), 932 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 99667b45e7..28dc85e2de 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -159,7 +159,7 @@ commands: steps: - run: command: | - # Drop libressl as long as we're not trying to build it + # Drop LibreSSL as long as we're not trying to build it echo libtool autoconf automake pkg-config nghttp2 libssh2 openssl libssh c-ares libpsl icu4c | xargs -Ix -n1 echo brew '"x"' > /tmp/Brewfile while [ $? -eq 0 ]; do for i in 1 2 3; do brew update && brew bundle install --no-lock --file /tmp/Brewfile && break 2 || { echo Error: wait to try again; sleep 10; } done; false Too many retries; done sudo python3 -m pip install impacket diff --git a/.github/scripts/spellcheck.words b/.github/scripts/spellcheck.words index 41609d896c..be12d3c9dc 100644 --- a/.github/scripts/spellcheck.words +++ b/.github/scripts/spellcheck.words @@ -69,7 +69,6 @@ Bjørn bool boolean BoringSSL -boringssl Boukris Broadcom brotli @@ -293,7 +292,6 @@ globbed globbing gmail GnuTLS -gnutls Golemon GOST GPG @@ -441,11 +439,9 @@ libpsl Libre libre LibreSSL -libressl librtmp libs libssh -libSSH libssh2 Libtool libtool diff --git a/RELEASE-NOTES b/RELEASE-NOTES index ac99ed623a..9a26982548 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -158,7 +158,7 @@ This release includes the following bugfixes: o noproxy: test bad ipv6 net size first [82] o openssl/gnutls: rectify the TLS version checks for QUIC [61] o openssl: fix %-specifier in infof() call [57] - o openSSL: fix hostname handling when using ECH [78] + o openssl: fix hostname handling when using ECH [78] o openssl: stop duplicate ssl key logging for legacy OpenSSL [49] o os400: make it compilable again [128] o pytest: add ftp upload tests [16] @@ -199,7 +199,7 @@ This release includes the following bugfixes: o tests: include current directory when running test Perl commands [205] o tests: log "Throwing away" messages before throwing away o tests: run with "--trace-config all" to provide even more info [6] - o tests: test_17_ssl_use.py clarify mbedtls TLSv1.3 support [43] + o tests: test_17_ssl_use.py clarify mbedTLS TLSv1.3 support [43] o tests: use exec when spawning nghttpx [45] o tidy-up: use consistent casing for Windows directories [28] o TODO: remove some old, clarify, add something [31] diff --git a/configure.ac b/configure.ac index 6544b6693f..fb7e178a79 100644 --- a/configure.ac +++ b/configure.ac @@ -275,7 +275,7 @@ AS_HELP_STRING([--with-mbedtls=PATH],[where to look for mbedTLS, PATH points to OPT_WOLFSSL=no AC_ARG_WITH(wolfssl,dnl -AS_HELP_STRING([--with-wolfssl=PATH],[where to look for WolfSSL, PATH points to the installation root (default: system lib default)]),[ +AS_HELP_STRING([--with-wolfssl=PATH],[where to look for wolfSSL, PATH points to the installation root (default: system lib default)]),[ OPT_WOLFSSL=$withval if test X"$withval" != Xno; then TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }wolfSSL" @@ -418,7 +418,7 @@ Select from these: --with-bearssl --with-gnutls --with-mbedtls - --with-openssl (also works for BoringSSL and libressl) + --with-openssl (also works for BoringSSL and LibreSSL) --with-rustls --with-schannel --with-secure-transport @@ -2187,10 +2187,10 @@ AC_ARG_WITH(libmetalink,, AC_MSG_ERROR([--with-libmetalink and --without-libmetalink no longer work!])) dnl ********************************************************************** -dnl Check for the presence of LIBSSH2 libraries and headers +dnl Check for the presence of libssh2 libraries and headers dnl ********************************************************************** -dnl Default to compiler & linker defaults for LIBSSH2 files & libraries. +dnl Default to compiler & linker defaults for libssh2 files & libraries. OPT_LIBSSH2=off AC_ARG_WITH(libssh2,dnl AS_HELP_STRING([--with-libssh2=PATH],[Where to look for libssh2, PATH points to the libssh2 installation; when possible, set the PKG_CONFIG_PATH environment variable instead of using this option]) @@ -2255,15 +2255,15 @@ if test X"$OPT_LIBSSH2" != Xno; then AC_CHECK_LIB(ssh2, libssh2_session_block_directions) AC_CHECK_HEADER(libssh2.h, - curl_ssh_msg="enabled (libSSH2)" + curl_ssh_msg="enabled (libssh2)" LIBSSH2_ENABLED=1 - AC_DEFINE(USE_LIBSSH2, 1, [if libSSH2 is in use]) + AC_DEFINE(USE_LIBSSH2, 1, [if libssh2 is in use]) AC_SUBST(USE_LIBSSH2, [1]) ) if test X"$OPT_LIBSSH2" != Xoff && test "$LIBSSH2_ENABLED" != "1"; then - AC_MSG_ERROR([libSSH2 libs and/or directories were not found where specified!]) + AC_MSG_ERROR([libssh2 libs and/or directories were not found where specified!]) fi if test "$LIBSSH2_ENABLED" = "1"; then @@ -2329,15 +2329,15 @@ elif test X"$OPT_LIBSSH" != Xno; then AC_CHECK_LIB(ssh, ssh_new) AC_CHECK_HEADER(libssh/libssh.h, - curl_ssh_msg="enabled (libSSH)" + curl_ssh_msg="enabled (libssh)" LIBSSH_ENABLED=1 - AC_DEFINE(USE_LIBSSH, 1, [if libSSH is in use]) + AC_DEFINE(USE_LIBSSH, 1, [if libssh is in use]) AC_SUBST(USE_LIBSSH, [1]) ) if test X"$OPT_LIBSSH" != Xoff && test "$LIBSSH_ENABLED" != "1"; then - AC_MSG_ERROR([libSSH libs and/or directories were not found where specified!]) + AC_MSG_ERROR([libssh libs and/or directories were not found where specified!]) fi if test "$LIBSSH_ENABLED" = "1"; then @@ -3925,7 +3925,7 @@ if test "$want_pthreads" != "no"; then AC_CHECK_HEADER(pthread.h, [ AC_DEFINE(HAVE_PTHREAD_H, 1, [if you have ]) save_CFLAGS="$CFLAGS" - dnl When statically linking against boringssl, -lpthread is added to LIBS. + dnl When statically linking against BoringSSL, -lpthread is added to LIBS. dnl Make sure to that this does not pass the check below, we really want dnl -pthread in CFLAGS as recommended for GCC. This also ensures that dnl lib1541 and lib1565 tests are built with these options. Otherwise @@ -4579,15 +4579,15 @@ if test "x$want_ech" != "xno"; then ECH_SUPPORT="ECH support available via OpenSSL with SSL_ech_set1_echconfig" ECH_ENABLED=1) fi - dnl check for boringssl equivalent + dnl check for BoringSSL equivalent if test "x$OPENSSL_ENABLED" = "x1"; then AC_CHECK_FUNCS(SSL_set1_ech_config_list, - ECH_SUPPORT="ECH support available via boringssl with SSL_set1_ech_config_list" + ECH_SUPPORT="ECH support available via BoringSSL with SSL_set1_ech_config_list" ECH_ENABLED=1) fi if test "x$WOLFSSL_ENABLED" = "x1"; then AC_CHECK_FUNCS(wolfSSL_CTX_GenerateEchConfig, - ECH_SUPPORT="ECH support available via WolfSSL with wolfSSL_CTX_GenerateEchConfig" + ECH_SUPPORT="ECH support available via wolfSSL with wolfSSL_CTX_GenerateEchConfig" ECH_ENABLED=1) fi diff --git a/docs/CIPHERS.md b/docs/CIPHERS.md index d55989bfa2..7838fc0af2 100644 --- a/docs/CIPHERS.md +++ b/docs/CIPHERS.md @@ -171,7 +171,7 @@ When specifying multiple cipher names, separate them with colon (`:`). `TLS_AES_128_CCM_8_SHA256` `TLS_AES_128_CCM_SHA256` -## WolfSSL +## wolfSSL `RC4-SHA`, `RC4-MD5`, diff --git a/docs/CURLDOWN.md b/docs/CURLDOWN.md index acbff9b7e3..5dc620b7d9 100644 --- a/docs/CURLDOWN.md +++ b/docs/CURLDOWN.md @@ -97,7 +97,7 @@ option. The available TLS backends are: - `BearSSL` - `GnuTLS` - `mbedTLS` -- `OpenSSL` (also covers BoringSSL, libressl, quictls, AWS-LC and AmiSSL) +- `OpenSSL` (also covers BoringSSL, LibreSSL, quictls, AWS-LC and AmiSSL) - `rustls` - `Schannel` - `Secure Transport` diff --git a/docs/ECH.md b/docs/ECH.md index 3d35393237..9c7cbf15fb 100644 --- a/docs/ECH.md +++ b/docs/ECH.md @@ -8,7 +8,7 @@ SPDX-License-Identifier: curl We have added support for ECH to curl. It can use HTTPS RRs published in the DNS if curl uses DoH, or else can accept the relevant ECHConfigList values -from the command line. This works with OpenSSL, WolfSSL or boringssl as the +from the command line. This works with OpenSSL, wolfSSL or BoringSSL as the TLS provider. This feature is EXPERIMENTAL. DO NOT USE IN PRODUCTION. @@ -149,7 +149,7 @@ the verbose output, e.g.: ``` At that point, you could copy the base64 encoded value above and try again. -For now, this only works for the OpenSSL and boringssl builds. +For now, this only works for the OpenSSL and BoringSSL builds. ## Default settings @@ -306,7 +306,7 @@ To build with cmake, assuming our ECH-enabled OpenSSL is as before: The binary produced by the cmake build does not need any ECH-specific ``LD_LIBRARY_PATH`` setting. -## boringssl build +## BoringSSL build BoringSSL is also supported by curl and also supports ECH, so to build with that, instead of our ECH-enabled OpenSSL: @@ -334,16 +334,16 @@ Then: make ``` -The boringssl APIs are fairly similar to those in our ECH-enabled OpenSSL +The BoringSSL APIs are fairly similar to those in our ECH-enabled OpenSSL fork, so code changes are also in ``lib/vtls/openssl.c``, protected via ``#ifdef OPENSSL_IS_BORINGSSL`` and are mostly obvious API variations. -The boringssl APIs however do not support the ``--ech pn:`` command line +The BoringSSL APIs however do not support the ``--ech pn:`` command line variant as of now. -## WolfSSL build +## wolfSSL build -WolfSSL also supports ECH and can be used by curl, so here's how: +wolfSSL also supports ECH and can be used by curl, so here's how: ```bash cd $HOME/code @@ -355,7 +355,7 @@ WolfSSL also supports ECH and can be used by curl, so here's how: make install ``` -The install prefix (``inst``) in the above causes WolfSSL to be installed there +The install prefix (``inst``) in the above causes wolfSSL to be installed there and we seem to need that for the curl configure command to work out. The ``--enable-opensslextra`` turns out (after much faffing about;-) to be important or else we get build problems with curl below. @@ -369,7 +369,7 @@ important or else we get build problems with curl below. make ``` -There are some known issues with the ECH implementation in WolfSSL: +There are some known issues with the ECH implementation in wolfSSL: - The main issue is that the client currently handles HelloRetryRequest incorrectly. [HRR issue](https://github.com/wolfSSL/wolfssl/issues/6802).) @@ -379,29 +379,29 @@ There are some known issues with the ECH implementation in WolfSSL: - There is also an issue related to so-called middlebox compatibility mode. [middlebox compatibility issue](https://github.com/wolfSSL/wolfssl/issues/6774) -### Code changes to support WolfSSL +### Code changes to support wolfSSL There are what seem like oddball differences: - The DoH URL in``$HOME/.curlrc`` can use `1.1.1.1` for OpenSSL but has to be - `one.one.one.one` for WolfSSL. The latter works for both, so OK, we us that. -- There seems to be some difference in CA databases too - the WolfSSL version + `one.one.one.one` for wolfSSL. The latter works for both, so OK, we us that. +- There seems to be some difference in CA databases too - the wolfSSL version does not like ``defo.ie``, whereas the system and OpenSSL ones do. We can ignore that for our purposes via ``--insecure``/``-k`` but would need to fix for a real setup. (Browsers do like those certificates though.) Then there are some functional code changes: -- tweak to ``configure.ac`` to check if WolfSSL has ECH or not +- tweak to ``configure.ac`` to check if wolfSSL has ECH or not - added code to ``lib/vtls/wolfssl.c`` mirroring what's done in the OpenSSL equivalent above. -- WolfSSL does not support ``--ech false`` or the ``--ech pn:`` command line +- wolfSSL does not support ``--ech false`` or the ``--ech pn:`` command line argument. The lack of support for ``--ech false`` is because wolfSSL has decided to always at least GREASE if built to support ECH. In other words, GREASE is a compile time choice for wolfSSL, but a runtime choice for OpenSSL or -boringssl. (Both are reasonable.) +BoringSSL. (Both are reasonable.) ## Additional notes @@ -474,5 +474,5 @@ to get the HTTPS RR and pass the ECHConfigList from that on the command line, if needed, or one can access the value from command line output in verbose more and then re-use that in another invocation. -Both our OpenSSL fork and boringssl have APIs for both controlling GREASE and -accessing and logging ``retry_configs``, it seems WolfSSL has neither. +Both our OpenSSL fork and BoringSSL have APIs for both controlling GREASE and +accessing and logging ``retry_configs``, it seems wolfSSL has neither. diff --git a/docs/FAQ b/docs/FAQ index f7fdfcc378..12c743bb5f 100644 --- a/docs/FAQ +++ b/docs/FAQ @@ -423,7 +423,7 @@ FAQ backends. curl can be built to use one of the following SSL alternatives: OpenSSL, - libressl, BoringSSL, AWS-LC, GnuTLS, wolfSSL, mbedTLS, Secure Transport + LibreSSL, BoringSSL, AWS-LC, GnuTLS, wolfSSL, mbedTLS, Secure Transport (native iOS/OS X), Schannel (native Windows), BearSSL or Rustls. They all have their pros and cons, and we try to maintain a comparison of them here: https://curl.se/docs/ssl-compared.html diff --git a/docs/HISTORY.md b/docs/HISTORY.md index bcc472cd9f..96cf049dc6 100644 --- a/docs/HISTORY.md +++ b/docs/HISTORY.md @@ -286,7 +286,7 @@ August: February: added support for the axTLS backend -April: added the cyassl backend (later renamed to WolfSSL) +April: added the cyassl backend (later renamed to wolfSSL) 2012 ---- diff --git a/docs/HTTP2.md b/docs/HTTP2.md index aed06f5488..55d3db5887 100644 --- a/docs/HTTP2.md +++ b/docs/HTTP2.md @@ -13,7 +13,7 @@ HTTP/2 with curl Build prerequisites ------------------- - nghttp2 - - OpenSSL, libressl, BoringSSL, GnuTLS, mbedTLS, wolfSSL or Schannel + - OpenSSL, LibreSSL, BoringSSL, GnuTLS, mbedTLS, wolfSSL or Schannel with a new enough version. [nghttp2](https://nghttp2.org/) diff --git a/docs/INSTALL-CMAKE.md b/docs/INSTALL-CMAKE.md index 37231f9e45..0457efe2dc 100644 --- a/docs/INSTALL-CMAKE.md +++ b/docs/INSTALL-CMAKE.md @@ -22,7 +22,7 @@ Missing features in the CMake build: - Builds libcurl without large file support - Does not support all SSL libraries (only OpenSSL, Schannel, Secure - Transport, and mbedTLS, WolfSSL) + Transport, and mbedTLS, wolfSSL) - Does not allow different resolver backends (no c-ares build support) - No RTMP support built - Does not allow build curl and libcurl debug enabled diff --git a/docs/INSTALL.md b/docs/INSTALL.md index 16b52994c6..d00f22dcb0 100644 --- a/docs/INSTALL.md +++ b/docs/INSTALL.md @@ -140,7 +140,7 @@ These options are provided to select the TLS backend to use. - BearSSL: `--with-bearssl` - GnuTLS: `--with-gnutls`. - mbedTLS: `--with-mbedtls` - - OpenSSL: `--with-openssl` (also for BoringSSL, AWS-LC, libressl, and quictls) + - OpenSSL: `--with-openssl` (also for BoringSSL, AWS-LC, LibreSSL, and quictls) - rustls: `--with-rustls` - Schannel: `--with-schannel` - Secure Transport: `--with-secure-transport` diff --git a/docs/examples/Makefile.example b/docs/examples/Makefile.example index b10cdecf57..cfb59c94ef 100644 --- a/docs/examples/Makefile.example +++ b/docs/examples/Makefile.example @@ -36,7 +36,7 @@ CFLAGS = -c -g # This should point to a directory that holds libcurl, if it is not # in the system's standard lib dir -# We also set a -L to include the directory where we have the openssl +# We also set a -L to include the directory where we have the OpenSSL # libraries LDFLAGS = -L/home/dast/lib -L/usr/local/ssl/lib diff --git a/docs/examples/usercertinmem.c b/docs/examples/usercertinmem.c index b35d982035..7b338cd98a 100644 --- a/docs/examples/usercertinmem.c +++ b/docs/examples/usercertinmem.c @@ -157,7 +157,7 @@ static CURLcode sslctx_function(CURL *curl, void *sslctx, void *parm) printf("Use Key failed\n"); } - /* free resources that have been allocated by openssl functions */ + /* free resources that have been allocated by OpenSSL functions */ if(bio) BIO_free(bio); diff --git a/docs/libcurl/curl_global_sslset.md b/docs/libcurl/curl_global_sslset.md index f688ed2b9c..0adcb77a60 100644 --- a/docs/libcurl/curl_global_sslset.md +++ b/docs/libcurl/curl_global_sslset.md @@ -66,7 +66,7 @@ This does not just mean no other thread that is using libcurl. # OpenSSL The name "OpenSSL" is used for all versions of OpenSSL and its associated -forks/flavors in this function. OpenSSL, BoringSSL, libressl, quictls and +forks/flavors in this function. OpenSSL, BoringSSL, LibreSSL, quictls and AmiSSL are all supported by libcurl, but in the eyes of curl_global_sslset(3) they are all just "OpenSSL". They all mostly provide the same API. diff --git a/docs/libcurl/opts/CURLINFO_SSL_VERIFYRESULT.md b/docs/libcurl/opts/CURLINFO_SSL_VERIFYRESULT.md index 0e4fedf58f..fe6435edee 100644 --- a/docs/libcurl/opts/CURLINFO_SSL_VERIFYRESULT.md +++ b/docs/libcurl/opts/CURLINFO_SSL_VERIFYRESULT.md @@ -68,7 +68,7 @@ int main(void) # AVAILABILITY -Added in 7.5. Only set by the OpenSSL/libressl/boringssl and GnuTLS backends. +Added in 7.5. Only set by the OpenSSL/LibreSSL/BoringSSL and GnuTLS backends. # RETURN VALUE diff --git a/docs/libcurl/opts/CURLOPT_PROXY_SSLVERSION.md b/docs/libcurl/opts/CURLOPT_PROXY_SSLVERSION.md index bdb1f9a44d..557960ea19 100644 --- a/docs/libcurl/opts/CURLOPT_PROXY_SSLVERSION.md +++ b/docs/libcurl/opts/CURLOPT_PROXY_SSLVERSION.md @@ -65,7 +65,7 @@ TLSv1.3 The maximum TLS version can be set by using *one* of the CURL_SSLVERSION_MAX_ macros below. It is also possible to OR *one* of the CURL_SSLVERSION_ macros with *one* of the CURL_SSLVERSION_MAX_ macros. The MAX macros are not -supported for WolfSSL. +supported for wolfSSL. ## CURL_SSLVERSION_MAX_DEFAULT diff --git a/docs/libcurl/opts/CURLOPT_PROXY_SSL_CIPHER_LIST.md b/docs/libcurl/opts/CURLOPT_PROXY_SSL_CIPHER_LIST.md index 06080f3809..eb1a754a0d 100644 --- a/docs/libcurl/opts/CURLOPT_PROXY_SSL_CIPHER_LIST.md +++ b/docs/libcurl/opts/CURLOPT_PROXY_SSL_CIPHER_LIST.md @@ -47,7 +47,7 @@ For OpenSSL and GnuTLS valid examples of cipher lists include **RC4-SHA**, **SHA1+DES**, **TLSv1** and **DEFAULT**. The default list is normally set when you compile OpenSSL. -For WolfSSL, valid examples of cipher lists include **ECDHE-RSA-RC4-SHA**, +For wolfSSL, valid examples of cipher lists include **ECDHE-RSA-RC4-SHA**, **AES256-SHA:AES256-SHA256**, etc. For mbedTLS and BearSSL, valid examples of cipher lists include diff --git a/docs/libcurl/opts/CURLOPT_SSLVERSION.md b/docs/libcurl/opts/CURLOPT_SSLVERSION.md index 4689b0b3c1..90cfdf5b71 100644 --- a/docs/libcurl/opts/CURLOPT_SSLVERSION.md +++ b/docs/libcurl/opts/CURLOPT_SSLVERSION.md @@ -76,7 +76,7 @@ TLS v1.3 or later (Added in 7.52.0) The maximum TLS version can be set by using *one* of the CURL_SSLVERSION_MAX_ macros below. It is also possible to OR *one* of the CURL_SSLVERSION_ macros with *one* of the CURL_SSLVERSION_MAX_ macros. -The MAX macros are not supported for WolfSSL. +The MAX macros are not supported for wolfSSL. ## CURL_SSLVERSION_MAX_DEFAULT diff --git a/docs/libcurl/opts/CURLOPT_SSL_CIPHER_LIST.md b/docs/libcurl/opts/CURLOPT_SSL_CIPHER_LIST.md index a887fe9a16..c5d409f8ad 100644 --- a/docs/libcurl/opts/CURLOPT_SSL_CIPHER_LIST.md +++ b/docs/libcurl/opts/CURLOPT_SSL_CIPHER_LIST.md @@ -46,7 +46,7 @@ For OpenSSL and GnuTLS valid examples of cipher lists include **RC4-SHA**, **SHA1+DES**, **TLSv1** and **DEFAULT**. The default list is normally set when you compile OpenSSL. -For WolfSSL, valid examples of cipher lists include **ECDHE-RSA-RC4-SHA**, +For wolfSSL, valid examples of cipher lists include **ECDHE-RSA-RC4-SHA**, **AES256-SHA:AES256-SHA256**, etc. For mbedTLS and BearSSL, valid examples of cipher lists include diff --git a/include/curl/curl.h b/include/curl/curl.h index 079a9a7866..677bcd42ea 100644 --- a/include/curl/curl.h +++ b/include/curl/curl.h @@ -771,7 +771,7 @@ typedef CURLcode (*curl_conv_callback)(char *buffer, size_t length); typedef CURLcode (*curl_ssl_ctx_callback)(CURL *curl, /* easy handle */ void *ssl_ctx, /* actually an OpenSSL - or WolfSSL SSL_CTX, + or wolfSSL SSL_CTX, or an mbedTLS mbedtls_ssl_config */ void *userptr); @@ -1494,7 +1494,7 @@ typedef enum { CURLOPT(CURLOPT_HTTPAUTH, CURLOPTTYPE_VALUES, 107), /* Set the ssl context callback function, currently only for OpenSSL or - WolfSSL ssl_ctx, or mbedTLS mbedtls_ssl_config in the second argument. + wolfSSL ssl_ctx, or mbedTLS mbedtls_ssl_config in the second argument. The function must match the curl_ssl_ctx_callback prototype. */ CURLOPT(CURLOPT_SSL_CTX_FUNCTION, CURLOPTTYPE_FUNCTIONPOINT, 108), diff --git a/lib/curl_config.h.cmake b/lib/curl_config.h.cmake index 1dad11de31..5e5ff25d7a 100644 --- a/lib/curl_config.h.cmake +++ b/lib/curl_config.h.cmake @@ -707,13 +707,13 @@ ${SIZEOF_TIME_T_CODE} /* if wolfSSL has the wolfSSL_BIO_set_shutdown function. */ #cmakedefine HAVE_WOLFSSL_FULL_BIO 1 -/* if libSSH is in use */ +/* if libssh is in use */ #cmakedefine USE_LIBSSH 1 -/* if libSSH2 is in use */ +/* if libssh2 is in use */ #cmakedefine USE_LIBSSH2 1 -/* if libPSL is in use */ +/* if libpsl is in use */ #cmakedefine USE_LIBPSL 1 /* if you want to use OpenLDAP code instead of legacy ldap implementation */ diff --git a/lib/sha256.c b/lib/sha256.c index a972cdf042..6ff66f7418 100644 --- a/lib/sha256.c +++ b/lib/sha256.c @@ -542,4 +542,4 @@ const struct HMAC_params Curl_HMAC_SHA256[] = { }; -#endif /* AWS, DIGEST, or libSSH2 */ +#endif /* AWS, DIGEST, or libssh2 */ diff --git a/lib/vtls/cipher_suite.c b/lib/vtls/cipher_suite.c index 1e0be8ad05..83ac5ddfae 100644 --- a/lib/vtls/cipher_suite.c +++ b/lib/vtls/cipher_suite.c @@ -33,7 +33,7 @@ * To support the CURLOPT_SSL_CIPHER_LIST option on SSL backends * that do not support it natively, but do support setting a list of * IANA ids, we need a list of all supported cipher suite names - * (openssl and IANA) to be able to look up the IANA ids. + * (OpenSSL and IANA) to be able to look up the IANA ids. * * To keep the binary size of this list down we compress each entry * down to 2 + 6 bytes using the C preprocessor. @@ -42,7 +42,7 @@ /* * mbedTLS NOTE: mbedTLS has mbedtls_ssl_get_ciphersuite_id() to * convert a string representation to an IANA id, we do not use that - * because it does not support "standard" openssl cipher suite + * because it does not support "standard" OpenSSL cipher suite * names, nor IANA names. */ @@ -378,7 +378,7 @@ static const struct cs_entry cs_list [] = { CS_ENTRY(0xC0AF, ECDHE,ECDSA,AES256,CCM8,,,,), #endif #if defined(USE_SECTRANSP) - /* entries marked bc are backward compatible aliases for old openssl names */ + /* entries marked bc are backward compatible aliases for old OpenSSL names */ CS_ENTRY(0x0003, TLS,RSA,EXPORT,WITH,RC4,40,MD5,), CS_ENTRY(0x0003, EXP,RC4,MD5,,,,,), CS_ENTRY(0x0004, TLS,RSA,WITH,RC4,128,MD5,,), @@ -513,7 +513,7 @@ static const struct cs_entry cs_list [] = { CS_ENTRY(0xC019, AECDH,AES256,SHA,,,,,), #endif #if defined(USE_MBEDTLS) - /* entries marked ns are "non-standard", they are not in openssl */ + /* entries marked ns are "non-standard", they are not in OpenSSL */ CS_ENTRY(0x0041, TLS,RSA,WITH,CAMELLIA,128,CBC,SHA,), CS_ENTRY(0x0041, CAMELLIA128,SHA,,,,,,), CS_ENTRY(0x0045, TLS,DHE,RSA,WITH,CAMELLIA,128,CBC,SHA), diff --git a/lib/vtls/gtls.c b/lib/vtls/gtls.c index dc0f77ba57..39c22c2003 100644 --- a/lib/vtls/gtls.c +++ b/lib/vtls/gtls.c @@ -677,15 +677,15 @@ CURLcode Curl_gtls_client_trust_setup(struct Curl_cfilter *cf, /* Consider the X509 store cacheable if it comes exclusively from a CAfile, - or no source is provided and we are falling back to openssl's built-in - default. */ + or no source is provided and we are falling back to OpenSSL's built-in + default. */ cache_criteria_met = (data->set.general_ssl.ca_cache_timeout != 0) && conn_config->verifypeer && !conn_config->CApath && !conn_config->ca_info_blob && !ssl_config->primary.CRLfile && !ssl_config->native_ca_store && - !conn_config->clientcert; /* GNUTls adds client cert to its credentials! */ + !conn_config->clientcert; /* GnuTLS adds client cert to its credentials! */ if(cache_criteria_met) cached_creds = gtls_get_cached_creds(cf, data); diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c index f7dc9516a0..2b60f7fba8 100644 --- a/lib/vtls/openssl.c +++ b/lib/vtls/openssl.c @@ -858,7 +858,7 @@ ossl_log_tls12_secret(const SSL *ssl, bool *keylog_done) #if OPENSSL_VERSION_NUMBER >= 0x10100000L && \ !(defined(LIBRESSL_VERSION_NUMBER) && \ LIBRESSL_VERSION_NUMBER < 0x20700000L) - /* ssl->s3 is not checked in openssl 1.1.0-pre6, but let's assume that + /* ssl->s3 is not checked in OpenSSL 1.1.0-pre6, but let's assume that * we have a valid SSL context if we have a non-NULL session. */ SSL_get_client_random(ssl, client_random, SSL3_RANDOM_SIZE); master_key_length = (int) @@ -3216,7 +3216,7 @@ static CURLcode populate_x509_store(struct Curl_cfilter *cf, if(!ssl_cafile && !ssl_capath && !imported_native_ca && !imported_ca_info_blob) { /* verifying the peer without any CA certificates will not - work so use openssl's built-in default as fallback */ + work so use OpenSSL's built-in default as fallback */ X509_STORE_set_default_paths(store); } #endif @@ -3400,7 +3400,7 @@ CURLcode Curl_ssl_setup_x509_store(struct Curl_cfilter *cf, bool cache_criteria_met; /* Consider the X509 store cacheable if it comes exclusively from a CAfile, - or no source is provided and we are falling back to openssl's built-in + or no source is provided and we are falling back to OpenSSL's built-in default. */ cache_criteria_met = (data->set.general_ssl.ca_cache_timeout != 0) && conn_config->verifypeer && @@ -3901,7 +3901,7 @@ CURLcode Curl_ossl_ctx_init(struct ossl_ctx *octx, } # ifdef OPENSSL_IS_BORINGSSL if(trying_ech_now && outername) { - infof(data, "ECH: setting public_name not supported with boringssl"); + infof(data, "ECH: setting public_name not supported with BoringSSL"); return CURLE_SSL_CONNECT_ERROR; } # else @@ -3989,7 +3989,7 @@ static CURLcode ossl_connect_step1(struct Curl_cfilter *cf, /* with OpenSSL v1.1.1 we get an alternative to SSL_set_bio() that works * without backward compat quirks. Every call takes one reference, so we * up it and pass. SSL* then owns it and will free. - * We check on the function in configure, since libressl and friends + * We check on the function in configure, since LibreSSL and friends * each have their own versions to add support for this. */ BIO_up_ref(bio); SSL_set0_rbio(octx->ssl, bio); diff --git a/lib/vtls/wolfssl.c b/lib/vtls/wolfssl.c index 06601a8869..a8ae28f09b 100644 --- a/lib/vtls/wolfssl.c +++ b/lib/vtls/wolfssl.c @@ -103,7 +103,7 @@ /* * Availability note: * The TLS 1.3 secret callback (wolfSSL_set_tls13_secret_cb) was added in - * WolfSSL 4.4.0, but requires the -DHAVE_SECRET_CALLBACK build option. If that + * wolfSSL 4.4.0, but requires the -DHAVE_SECRET_CALLBACK build option. If that * option is not set, then TLS 1.3 will not be logged. * For TLS 1.2 and before, we use wolfSSL_get_keys(). * SSL_get_client_random and wolfSSL_get_keys require OPENSSL_EXTRA @@ -571,7 +571,7 @@ CURLcode Curl_wssl_setup_x509_store(struct Curl_cfilter *cf, bool cache_criteria_met; /* Consider the X509 store cacheable if it comes exclusively from a CAfile, - or no source is provided and we are falling back to openssl's built-in + or no source is provided and we are falling back to OpenSSL's built-in default. */ cache_criteria_met = (data->set.general_ssl.ca_cache_timeout != 0) && conn_config->verifypeer && @@ -913,7 +913,7 @@ wolfssl_connect_step1(struct Curl_cfilter *cf, struct Curl_easy *data) int trying_ech_now = 0; if(data->set.str[STRING_ECH_PUBLIC]) { - infof(data, "ECH: outername not (yet) supported with WolfSSL"); + infof(data, "ECH: outername not (yet) supported with wolfSSL"); return CURLE_SSL_CONNECT_ERROR; } if(data->set.tls_ech == CURLECH_GREASE) { @@ -1745,7 +1745,7 @@ static void *wolfssl_get_internals(struct ssl_connect_data *connssl, } const struct Curl_ssl Curl_ssl_wolfssl = { - { CURLSSLBACKEND_WOLFSSL, "WolfSSL" }, /* info */ + { CURLSSLBACKEND_WOLFSSL, "wolfssl" }, /* info */ #ifdef KEEP_PEER_CERT SSLSUPP_PINNEDPUBKEY | diff --git a/m4/curl-openssl.m4 b/m4/curl-openssl.m4 index 3f01645a25..76107c21a0 100644 --- a/m4/curl-openssl.m4 +++ b/m4/curl-openssl.m4 @@ -293,7 +293,7 @@ if test "x$OPT_OPENSSL" != xno; then AC_MSG_RESULT([no]) ]) - AC_MSG_CHECKING([for libressl]) + AC_MSG_CHECKING([for LibreSSL]) AC_COMPILE_IFELSE([ AC_LANG_PROGRAM([[ #include @@ -303,8 +303,8 @@ if test "x$OPT_OPENSSL" != xno; then ],[ AC_MSG_RESULT([yes]) AC_DEFINE_UNQUOTED(HAVE_LIBRESSL, 1, - [Define to 1 if using libressl.]) - ssl_msg="libressl" + [Define to 1 if using LibreSSL.]) + ssl_msg="LibreSSL" ],[ AC_MSG_RESULT([no]) ]) diff --git a/m4/curl-wolfssl.m4 b/m4/curl-wolfssl.m4 index cdee597cc1..cb3dc29028 100644 --- a/m4/curl-wolfssl.m4 +++ b/m4/curl-wolfssl.m4 @@ -91,7 +91,7 @@ if test "x$OPT_WOLFSSL" != xno; then AC_MSG_CHECKING([for wolfSSL_Init in -lwolfssl]) AC_LINK_IFELSE([ AC_LANG_PROGRAM([[ -/* These aren't needed for detection and confuse WolfSSL. +/* These are not needed for detection and confuse wolfSSL. They are set up properly later if it is detected. */ #undef SIZEOF_LONG #undef SIZEOF_LONG_LONG @@ -106,7 +106,7 @@ if test "x$OPT_WOLFSSL" != xno; then AC_SUBST(USE_WOLFSSL, [1]) WOLFSSL_ENABLED=1 USE_WOLFSSL="yes" - ssl_msg="WolfSSL" + ssl_msg="wolfSSL" QUIC_ENABLED=yes test wolfssl != "$DEFAULT_SSL_BACKEND" || VALID_DEFAULT_SSL_BACKEND=yes ], @@ -128,7 +128,7 @@ if test "x$OPT_WOLFSSL" != xno; then LIBS="$addlib -lm $LIBS" - dnl WolfSSL needs configure --enable-opensslextra to have *get_peer* + dnl wolfSSL needs configure --enable-opensslextra to have *get_peer* dnl DES* is needed for NTLM support and lives in the OpenSSL compatibility dnl layer AC_CHECK_FUNCS(wolfSSL_get_peer_certificate \ diff --git a/packages/vms/generate_config_vms_h_curl.com b/packages/vms/generate_config_vms_h_curl.com index 6081d8d340..623cd5fe73 100644 --- a/packages/vms/generate_config_vms_h_curl.com +++ b/packages/vms/generate_config_vms_h_curl.com @@ -394,7 +394,7 @@ $ endif $endif $! $! -$! LibIDN not ported to VMS at this time. +$! libidn not ported to VMS at this time. $! This is for international domain name support. $! Allow explicit experimentation. $if libidn @@ -410,7 +410,7 @@ $ write cvh "#endif" $endif $! $! -$! LibSSH2 not ported to VMS at this time. +$! libssh2 not ported to VMS at this time. $! Allow explicit experimentation. $if libssh2 $then diff --git a/packages/vms/readme b/packages/vms/readme index 0bb61663c1..eaf23e9427 100644 --- a/packages/vms/readme +++ b/packages/vms/readme @@ -138,7 +138,7 @@ pcsi_product_gnv_curl.com readme. This file. report_openssl_version.c - Program to check that the openssl version is new + Program to check that the OpenSSL version is new enough for building a shared libcurl image. setup_gnv_curl_build.com diff --git a/packages/vms/report_openssl_version.c b/packages/vms/report_openssl_version.c index 64e1ee0522..158303011a 100644 --- a/packages/vms/report_openssl_version.c +++ b/packages/vms/report_openssl_version.c @@ -1,6 +1,6 @@ /* File: report_openssl_version.c * - * This file dynamically loads the openssl shared image to report the + * This file dynamically loads the OpenSSL shared image to report the * version string. * * It will optionally place that version string in a DCL symbol. diff --git a/projects/README.md b/projects/README.md index c8aa0f24bb..0e77f50efb 100644 --- a/projects/README.md +++ b/projects/README.md @@ -97,7 +97,7 @@ use `VC10\curl-all.sln` to build curl and libcurl. ## Running DLL based configurations If you are a developer and plan to run the curl tool from Visual Studio with -any third-party libraries (such as OpenSSL, wolfSSL or LibSSH2) then you will +any third-party libraries (such as OpenSSL, wolfSSL or libssh2) then you will need to add the search path of these DLLs to the configuration's PATH environment. To do that: @@ -130,7 +130,7 @@ DLL Debug - DLL wolfSSL (x64): C:\Windows;C:\Windows\System32\Wbem If you are using a configuration that uses multiple third-party library DLLs -(such as DLL Debug - DLL OpenSSL - DLL LibSSH2) then 'Path to DLL' will need +(such as DLL Debug - DLL OpenSSL - DLL libssh2) then 'Path to DLL' will need to contain the path to both of these. ## Notes diff --git a/projects/Windows/VC10/lib/libcurl.sln b/projects/Windows/VC10/lib/libcurl.sln index 15461ef9a2..a8c8a56cd3 100644 --- a/projects/Windows/VC10/lib/libcurl.sln +++ b/projects/Windows/VC10/lib/libcurl.sln @@ -4,8 +4,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcurl", "libcurl.vcxproj" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - DLL Debug - DLL OpenSSL - DLL LibSSH2|Win32 = DLL Debug - DLL OpenSSL - DLL LibSSH2|Win32 - DLL Debug - DLL OpenSSL - DLL LibSSH2|x64 = DLL Debug - DLL OpenSSL - DLL LibSSH2|x64 + DLL Debug - DLL OpenSSL - DLL libssh2|Win32 = DLL Debug - DLL OpenSSL - DLL libssh2|Win32 + DLL Debug - DLL OpenSSL - DLL libssh2|x64 = DLL Debug - DLL OpenSSL - DLL libssh2|x64 DLL Debug - DLL OpenSSL|Win32 = DLL Debug - DLL OpenSSL|Win32 DLL Debug - DLL OpenSSL|x64 = DLL Debug - DLL OpenSSL|x64 DLL Debug - DLL Windows SSPI - DLL WinIDN|Win32 = DLL Debug - DLL Windows SSPI - DLL WinIDN|Win32 @@ -16,8 +16,8 @@ Global DLL Debug - DLL wolfSSL|x64 = DLL Debug - DLL wolfSSL|x64 DLL Debug|Win32 = DLL Debug|Win32 DLL Debug|x64 = DLL Debug|x64 - DLL Release - DLL OpenSSL - DLL LibSSH2|Win32 = DLL Release - DLL OpenSSL - DLL LibSSH2|Win32 - DLL Release - DLL OpenSSL - DLL LibSSH2|x64 = DLL Release - DLL OpenSSL - DLL LibSSH2|x64 + DLL Release - DLL OpenSSL - DLL libssh2|Win32 = DLL Release - DLL OpenSSL - DLL libssh2|Win32 + DLL Release - DLL OpenSSL - DLL libssh2|x64 = DLL Release - DLL OpenSSL - DLL libssh2|x64 DLL Release - DLL OpenSSL|Win32 = DLL Release - DLL OpenSSL|Win32 DLL Release - DLL OpenSSL|x64 = DLL Release - DLL OpenSSL|x64 DLL Release - DLL Windows SSPI - DLL WinIDN|Win32 = DLL Release - DLL Windows SSPI - DLL WinIDN|Win32 @@ -28,32 +28,32 @@ Global DLL Release - DLL wolfSSL|x64 = DLL Release - DLL wolfSSL|x64 DLL Release|Win32 = DLL Release|Win32 DLL Release|x64 = DLL Release|x64 - LIB Debug - DLL OpenSSL - DLL LibSSH2|Win32 = LIB Debug - DLL OpenSSL - DLL LibSSH2|Win32 - LIB Debug - DLL OpenSSL - DLL LibSSH2|x64 = LIB Debug - DLL OpenSSL - DLL LibSSH2|x64 + LIB Debug - DLL OpenSSL - DLL libssh2|Win32 = LIB Debug - DLL OpenSSL - DLL libssh2|Win32 + LIB Debug - DLL OpenSSL - DLL libssh2|x64 = LIB Debug - DLL OpenSSL - DLL libssh2|x64 LIB Debug - DLL OpenSSL|Win32 = LIB Debug - DLL OpenSSL|Win32 LIB Debug - DLL OpenSSL|x64 = LIB Debug - DLL OpenSSL|x64 LIB Debug - DLL Windows SSPI - DLL WinIDN|Win32 = LIB Debug - DLL Windows SSPI - DLL WinIDN|Win32 LIB Debug - DLL Windows SSPI - DLL WinIDN|x64 = LIB Debug - DLL Windows SSPI - DLL WinIDN|x64 LIB Debug - DLL Windows SSPI|Win32 = LIB Debug - DLL Windows SSPI|Win32 LIB Debug - DLL Windows SSPI|x64 = LIB Debug - DLL Windows SSPI|x64 - LIB Debug - LIB OpenSSL - LIB LibSSH2|Win32 = LIB Debug - LIB OpenSSL - LIB LibSSH2|Win32 - LIB Debug - LIB OpenSSL - LIB LibSSH2|x64 = LIB Debug - LIB OpenSSL - LIB LibSSH2|x64 + LIB Debug - LIB OpenSSL - LIB libssh2|Win32 = LIB Debug - LIB OpenSSL - LIB libssh2|Win32 + LIB Debug - LIB OpenSSL - LIB libssh2|x64 = LIB Debug - LIB OpenSSL - LIB libssh2|x64 LIB Debug - LIB OpenSSL|Win32 = LIB Debug - LIB OpenSSL|Win32 LIB Debug - LIB OpenSSL|x64 = LIB Debug - LIB OpenSSL|x64 LIB Debug - LIB wolfSSL|Win32 = LIB Debug - LIB wolfSSL|Win32 LIB Debug - LIB wolfSSL|x64 = LIB Debug - LIB wolfSSL|x64 LIB Debug|Win32 = LIB Debug|Win32 LIB Debug|x64 = LIB Debug|x64 - LIB Release - DLL OpenSSL - DLL LibSSH2|Win32 = LIB Release - DLL OpenSSL - DLL LibSSH2|Win32 - LIB Release - DLL OpenSSL - DLL LibSSH2|x64 = LIB Release - DLL OpenSSL - DLL LibSSH2|x64 + LIB Release - DLL OpenSSL - DLL libssh2|Win32 = LIB Release - DLL OpenSSL - DLL libssh2|Win32 + LIB Release - DLL OpenSSL - DLL libssh2|x64 = LIB Release - DLL OpenSSL - DLL libssh2|x64 LIB Release - DLL OpenSSL|Win32 = LIB Release - DLL OpenSSL|Win32 LIB Release - DLL OpenSSL|x64 = LIB Release - DLL OpenSSL|x64 LIB Release - DLL Windows SSPI - DLL WinIDN|Win32 = LIB Release - DLL Windows SSPI - DLL WinIDN|Win32 LIB Release - DLL Windows SSPI - DLL WinIDN|x64 = LIB Release - DLL Windows SSPI - DLL WinIDN|x64 LIB Release - DLL Windows SSPI|Win32 = LIB Release - DLL Windows SSPI|Win32 LIB Release - DLL Windows SSPI|x64 = LIB Release - DLL Windows SSPI|x64 - LIB Release - LIB OpenSSL - LIB LibSSH2|Win32 = LIB Release - LIB OpenSSL - LIB LibSSH2|Win32 - LIB Release - LIB OpenSSL - LIB LibSSH2|x64 = LIB Release - LIB OpenSSL - LIB LibSSH2|x64 + LIB Release - LIB OpenSSL - LIB libssh2|Win32 = LIB Release - LIB OpenSSL - LIB libssh2|Win32 + LIB Release - LIB OpenSSL - LIB libssh2|x64 = LIB Release - LIB OpenSSL - LIB libssh2|x64 LIB Release - LIB OpenSSL|Win32 = LIB Release - LIB OpenSSL|Win32 LIB Release - LIB OpenSSL|x64 = LIB Release - LIB OpenSSL|x64 LIB Release - LIB wolfSSL|Win32 = LIB Release - LIB wolfSSL|Win32 @@ -62,10 +62,10 @@ Global LIB Release|x64 = LIB Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Debug - DLL OpenSSL - DLL LibSSH2|Win32.ActiveCfg = DLL Debug - DLL OpenSSL - DLL LibSSH2|Win32 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Debug - DLL OpenSSL - DLL LibSSH2|Win32.Build.0 = DLL Debug - DLL OpenSSL - DLL LibSSH2|Win32 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Debug - DLL OpenSSL - DLL LibSSH2|x64.ActiveCfg = DLL Debug - DLL OpenSSL - DLL LibSSH2|x64 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Debug - DLL OpenSSL - DLL LibSSH2|x64.Build.0 = DLL Debug - DLL OpenSSL - DLL LibSSH2|x64 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Debug - DLL OpenSSL - DLL libssh2|Win32.ActiveCfg = DLL Debug - DLL OpenSSL - DLL libssh2|Win32 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Debug - DLL OpenSSL - DLL libssh2|Win32.Build.0 = DLL Debug - DLL OpenSSL - DLL libssh2|Win32 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Debug - DLL OpenSSL - DLL libssh2|x64.ActiveCfg = DLL Debug - DLL OpenSSL - DLL libssh2|x64 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Debug - DLL OpenSSL - DLL libssh2|x64.Build.0 = DLL Debug - DLL OpenSSL - DLL libssh2|x64 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Debug - DLL OpenSSL|Win32.ActiveCfg = DLL Debug - DLL OpenSSL|Win32 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Debug - DLL OpenSSL|Win32.Build.0 = DLL Debug - DLL OpenSSL|Win32 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Debug - DLL OpenSSL|x64.ActiveCfg = DLL Debug - DLL OpenSSL|x64 @@ -86,10 +86,10 @@ Global {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Release - DLL OpenSSL - DLL LibSSH2|Win32.ActiveCfg = DLL Release - DLL OpenSSL - DLL LibSSH2|Win32 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Release - DLL OpenSSL - DLL LibSSH2|Win32.Build.0 = DLL Release - DLL OpenSSL - DLL LibSSH2|Win32 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Release - DLL OpenSSL - DLL LibSSH2|x64.ActiveCfg = DLL Release - DLL OpenSSL - DLL LibSSH2|x64 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Release - DLL OpenSSL - DLL LibSSH2|x64.Build.0 = DLL Release - DLL OpenSSL - DLL LibSSH2|x64 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Release - DLL OpenSSL - DLL libssh2|Win32.ActiveCfg = DLL Release - DLL OpenSSL - DLL libssh2|Win32 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Release - DLL OpenSSL - DLL libssh2|Win32.Build.0 = DLL Release - DLL OpenSSL - DLL libssh2|Win32 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Release - DLL OpenSSL - DLL libssh2|x64.ActiveCfg = DLL Release - DLL OpenSSL - DLL libssh2|x64 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Release - DLL OpenSSL - DLL libssh2|x64.Build.0 = DLL Release - DLL OpenSSL - DLL libssh2|x64 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Release - DLL OpenSSL|Win32.ActiveCfg = DLL Release - DLL OpenSSL|Win32 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Release - DLL OpenSSL|Win32.Build.0 = DLL Release - DLL OpenSSL|Win32 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Release - DLL OpenSSL|x64.ActiveCfg = DLL Release - DLL OpenSSL|x64 @@ -110,10 +110,10 @@ Global {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Release|Win32.Build.0 = DLL Release|Win32 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Release|x64.ActiveCfg = DLL Release|x64 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Release|x64.Build.0 = DLL Release|x64 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - DLL OpenSSL - DLL LibSSH2|Win32.ActiveCfg = LIB Debug - DLL OpenSSL - DLL LibSSH2|Win32 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - DLL OpenSSL - DLL LibSSH2|Win32.Build.0 = LIB Debug - DLL OpenSSL - DLL LibSSH2|Win32 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - DLL OpenSSL - DLL LibSSH2|x64.ActiveCfg = LIB Debug - DLL OpenSSL - DLL LibSSH2|x64 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - DLL OpenSSL - DLL LibSSH2|x64.Build.0 = LIB Debug - DLL OpenSSL - DLL LibSSH2|x64 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - DLL OpenSSL - DLL libssh2|Win32.ActiveCfg = LIB Debug - DLL OpenSSL - DLL libssh2|Win32 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - DLL OpenSSL - DLL libssh2|Win32.Build.0 = LIB Debug - DLL OpenSSL - DLL libssh2|Win32 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - DLL OpenSSL - DLL libssh2|x64.ActiveCfg = LIB Debug - DLL OpenSSL - DLL libssh2|x64 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - DLL OpenSSL - DLL libssh2|x64.Build.0 = LIB Debug - DLL OpenSSL - DLL libssh2|x64 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - DLL OpenSSL|Win32.ActiveCfg = LIB Debug - DLL OpenSSL|Win32 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - DLL OpenSSL|Win32.Build.0 = LIB Debug - DLL OpenSSL|Win32 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - DLL OpenSSL|x64.ActiveCfg = LIB Debug - DLL OpenSSL|x64 @@ -126,10 +126,10 @@ Global {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - DLL Windows SSPI|Win32.Build.0 = LIB Debug - DLL Windows SSPI|Win32 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - DLL Windows SSPI|x64.ActiveCfg = LIB Debug - DLL Windows SSPI|x64 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - DLL Windows SSPI|x64.Build.0 = LIB Debug - DLL Windows SSPI|x64 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - LIB OpenSSL - LIB LibSSH2|Win32.ActiveCfg = LIB Debug - LIB OpenSSL - LIB LibSSH2|Win32 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - LIB OpenSSL - LIB LibSSH2|Win32.Build.0 = LIB Debug - LIB OpenSSL - LIB LibSSH2|Win32 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - LIB OpenSSL - LIB LibSSH2|x64.ActiveCfg = LIB Debug - LIB OpenSSL - LIB LibSSH2|x64 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - LIB OpenSSL - LIB LibSSH2|x64.Build.0 = LIB Debug - LIB OpenSSL - LIB LibSSH2|x64 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - LIB OpenSSL - LIB libssh2|Win32.ActiveCfg = LIB Debug - LIB OpenSSL - LIB libssh2|Win32 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - LIB OpenSSL - LIB libssh2|Win32.Build.0 = LIB Debug - LIB OpenSSL - LIB libssh2|Win32 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - LIB OpenSSL - LIB libssh2|x64.ActiveCfg = LIB Debug - LIB OpenSSL - LIB libssh2|x64 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - LIB OpenSSL - LIB libssh2|x64.Build.0 = LIB Debug - LIB OpenSSL - LIB libssh2|x64 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - LIB OpenSSL|Win32.ActiveCfg = LIB Debug - LIB OpenSSL|Win32 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - LIB OpenSSL|Win32.Build.0 = LIB Debug - LIB OpenSSL|Win32 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - LIB OpenSSL|x64.ActiveCfg = LIB Debug - LIB OpenSSL|x64 @@ -142,10 +142,10 @@ Global {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug|Win32.Build.0 = LIB Debug|Win32 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug|x64.ActiveCfg = LIB Debug|x64 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug|x64.Build.0 = LIB Debug|x64 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - DLL OpenSSL - DLL LibSSH2|Win32.ActiveCfg = LIB Release - DLL OpenSSL - DLL LibSSH2|Win32 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - DLL OpenSSL - DLL LibSSH2|Win32.Build.0 = LIB Release - DLL OpenSSL - DLL LibSSH2|Win32 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - DLL OpenSSL - DLL LibSSH2|x64.ActiveCfg = LIB Release - DLL OpenSSL - DLL LibSSH2|x64 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - DLL OpenSSL - DLL LibSSH2|x64.Build.0 = LIB Release - DLL OpenSSL - DLL LibSSH2|x64 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - DLL OpenSSL - DLL libssh2|Win32.ActiveCfg = LIB Release - DLL OpenSSL - DLL libssh2|Win32 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - DLL OpenSSL - DLL libssh2|Win32.Build.0 = LIB Release - DLL OpenSSL - DLL libssh2|Win32 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - DLL OpenSSL - DLL libssh2|x64.ActiveCfg = LIB Release - DLL OpenSSL - DLL libssh2|x64 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - DLL OpenSSL - DLL libssh2|x64.Build.0 = LIB Release - DLL OpenSSL - DLL libssh2|x64 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - DLL OpenSSL|Win32.ActiveCfg = LIB Release - DLL OpenSSL|Win32 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - DLL OpenSSL|Win32.Build.0 = LIB Release - DLL OpenSSL|Win32 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - DLL OpenSSL|x64.ActiveCfg = LIB Release - DLL OpenSSL|x64 @@ -158,10 +158,10 @@ Global {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - DLL Windows SSPI|Win32.Build.0 = LIB Release - DLL Windows SSPI|Win32 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - DLL Windows SSPI|x64.ActiveCfg = LIB Release - DLL Windows SSPI|x64 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - DLL Windows SSPI|x64.Build.0 = LIB Release - DLL Windows SSPI|x64 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - LIB OpenSSL - LIB LibSSH2|Win32.ActiveCfg = LIB Release - LIB OpenSSL - LIB LibSSH2|Win32 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - LIB OpenSSL - LIB LibSSH2|Win32.Build.0 = LIB Release - LIB OpenSSL - LIB LibSSH2|Win32 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - LIB OpenSSL - LIB LibSSH2|x64.ActiveCfg = LIB Release - LIB OpenSSL - LIB LibSSH2|x64 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - LIB OpenSSL - LIB LibSSH2|x64.Build.0 = LIB Release - LIB OpenSSL - LIB LibSSH2|x64 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - LIB OpenSSL - LIB libssh2|Win32.ActiveCfg = LIB Release - LIB OpenSSL - LIB libssh2|Win32 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - LIB OpenSSL - LIB libssh2|Win32.Build.0 = LIB Release - LIB OpenSSL - LIB libssh2|Win32 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - LIB OpenSSL - LIB libssh2|x64.ActiveCfg = LIB Release - LIB OpenSSL - LIB libssh2|x64 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - LIB OpenSSL - LIB libssh2|x64.Build.0 = LIB Release - LIB OpenSSL - LIB libssh2|x64 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - LIB OpenSSL|Win32.ActiveCfg = LIB Release - LIB OpenSSL|Win32 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - LIB OpenSSL|Win32.Build.0 = LIB Release - LIB OpenSSL|Win32 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - LIB OpenSSL|x64.ActiveCfg = LIB Release - LIB OpenSSL|x64 diff --git a/projects/Windows/VC10/lib/libcurl.tmpl b/projects/Windows/VC10/lib/libcurl.tmpl index 6e8c539181..1cc2453f26 100644 --- a/projects/Windows/VC10/lib/libcurl.tmpl +++ b/projects/Windows/VC10/lib/libcurl.tmpl @@ -9,12 +9,12 @@ DLL Debug - DLL wolfSSL x64 - - DLL Debug - DLL OpenSSL - DLL LibSSH2 + + DLL Debug - DLL OpenSSL - DLL libssh2 Win32 - - DLL Debug - DLL OpenSSL - DLL LibSSH2 + + DLL Debug - DLL OpenSSL - DLL libssh2 x64 @@ -57,12 +57,12 @@ DLL Release - DLL wolfSSL x64 - - DLL Release - DLL OpenSSL - DLL LibSSH2 + + DLL Release - DLL OpenSSL - DLL libssh2 Win32 - - DLL Release - DLL OpenSSL - DLL LibSSH2 + + DLL Release - DLL OpenSSL - DLL libssh2 x64 @@ -97,12 +97,12 @@ DLL Release x64 - - LIB Debug - DLL OpenSSL - DLL LibSSH2 + + LIB Debug - DLL OpenSSL - DLL libssh2 Win32 - - LIB Debug - DLL OpenSSL - DLL LibSSH2 + + LIB Debug - DLL OpenSSL - DLL libssh2 x64 @@ -137,12 +137,12 @@ LIB Debug - LIB wolfSSL x64 - - LIB Debug - LIB OpenSSL - LIB LibSSH2 + + LIB Debug - LIB OpenSSL - LIB libssh2 Win32 - - LIB Debug - LIB OpenSSL - LIB LibSSH2 + + LIB Debug - LIB OpenSSL - LIB libssh2 x64 @@ -161,12 +161,12 @@ LIB Debug x64 - - LIB Release - DLL OpenSSL - DLL LibSSH2 + + LIB Release - DLL OpenSSL - DLL libssh2 Win32 - - LIB Release - DLL OpenSSL - DLL LibSSH2 + + LIB Release - DLL OpenSSL - DLL libssh2 x64 @@ -201,12 +201,12 @@ LIB Release - LIB wolfSSL x64 - - LIB Release - LIB OpenSSL - LIB LibSSH2 + + LIB Release - LIB OpenSSL - LIB libssh2 Win32 - - LIB Release - LIB OpenSSL - LIB LibSSH2 + + LIB Release - LIB OpenSSL - LIB libssh2 x64 @@ -231,7 +231,7 @@ libcurl - + StaticLibrary false Unicode @@ -251,7 +251,7 @@ false Unicode - + StaticLibrary false Unicode @@ -261,7 +261,7 @@ false Unicode - + StaticLibrary false Unicode @@ -281,7 +281,7 @@ false Unicode - + StaticLibrary false Unicode @@ -291,12 +291,12 @@ false Unicode - + DynamicLibrary false Unicode - + DynamicLibrary false Unicode @@ -371,7 +371,7 @@ false Unicode - + StaticLibrary false Unicode @@ -391,7 +391,7 @@ false Unicode - + StaticLibrary false Unicode @@ -401,7 +401,7 @@ false Unicode - + StaticLibrary false Unicode @@ -421,7 +421,7 @@ false Unicode - + StaticLibrary false Unicode @@ -431,12 +431,12 @@ false Unicode - + DynamicLibrary false Unicode - + DynamicLibrary false Unicode @@ -514,7 +514,7 @@ - + @@ -526,13 +526,13 @@ - + - + @@ -544,16 +544,16 @@ - + - + - + @@ -598,7 +598,7 @@ - + @@ -610,13 +610,13 @@ - + - + @@ -628,16 +628,16 @@ - + - + - + @@ -761,26 +761,26 @@ $(OutDir)lib\ false false - ..\..\..\..\build\Win32\VC10\$(Configuration)\ - $(OutDir)lib\ - false - ..\..\..\..\build\Win64\VC10\$(Configuration)\ - $(OutDir)lib\ - false - ..\..\..\..\build\Win32\VC10\$(Configuration)\ - $(OutDir)lib\ - false - ..\..\..\..\build\Win64\VC10\$(Configuration)\ - $(OutDir)lib\ - false + ..\..\..\..\build\Win32\VC10\$(Configuration)\ + $(OutDir)lib\ + false + ..\..\..\..\build\Win64\VC10\$(Configuration)\ + $(OutDir)lib\ + false + ..\..\..\..\build\Win32\VC10\$(Configuration)\ + $(OutDir)lib\ + false + ..\..\..\..\build\Win64\VC10\$(Configuration)\ + $(OutDir)lib\ + false ..\..\..\..\build\Win32\VC10\$(Configuration)\ $(OutDir)lib\ ..\..\..\..\build\Win64\VC10\$(Configuration)\ $(OutDir)lib\ - ..\..\..\..\build\Win32\VC10\$(Configuration)\ - $(OutDir)lib\ - ..\..\..\..\build\Win64\VC10\$(Configuration)\ - $(OutDir)lib\ + ..\..\..\..\build\Win32\VC10\$(Configuration)\ + $(OutDir)lib\ + ..\..\..\..\build\Win64\VC10\$(Configuration)\ + $(OutDir)lib\ ..\..\..\..\build\Win32\VC10\$(Configuration)\ ..\..\..\..\build\Win32\VC10\$(Configuration)\ $(OutDir)lib\ @@ -793,18 +793,18 @@ $(OutDir)lib\ ..\..\..\..\build\Win64\VC10\$(Configuration)\ $(OutDir)lib\ - ..\..\..\..\build\Win32\VC10\$(Configuration)\ - $(OutDir)lib\ - ..\..\..\..\build\Win64\VC10\$(Configuration)\ - $(OutDir)lib\ + ..\..\..\..\build\Win32\VC10\$(Configuration)\ + $(OutDir)lib\ + ..\..\..\..\build\Win64\VC10\$(Configuration)\ + $(OutDir)lib\ ..\..\..\..\build\Win32\VC10\$(Configuration)\ $(OutDir)lib\ ..\..\..\..\build\Win64\VC10\$(Configuration)\ $(OutDir)lib\ - ..\..\..\..\build\Win32\VC10\$(Configuration)\ - $(OutDir)lib\ - ..\..\..\..\build\Win64\VC10\$(Configuration)\ - $(OutDir)lib\ + ..\..\..\..\build\Win32\VC10\$(Configuration)\ + $(OutDir)lib\ + ..\..\..\..\build\Win64\VC10\$(Configuration)\ + $(OutDir)lib\ ..\..\..\..\build\Win32\VC10\$(Configuration)\ ..\..\..\..\build\Win32\VC10\$(Configuration)\ $(OutDir)lib\ @@ -817,18 +817,18 @@ $(OutDir)lib\ ..\..\..\..\build\Win64\VC10\$(Configuration)\ $(OutDir)lib\ - ..\..\..\..\build\Win32\VC10\$(Configuration)\ - $(OutDir)lib\ - ..\..\..\..\build\Win64\VC10\$(Configuration)\ - $(OutDir)lib\ + ..\..\..\..\build\Win32\VC10\$(Configuration)\ + $(OutDir)lib\ + ..\..\..\..\build\Win64\VC10\$(Configuration)\ + $(OutDir)lib\ $(ProjectName)d $(ProjectName)d $(ProjectName)d $(ProjectName)d $(ProjectName)d $(ProjectName)d - $(ProjectName)d - $(ProjectName)d + $(ProjectName)d + $(ProjectName)d $(ProjectName)d $(ProjectName)d $(ProjectName)d @@ -839,16 +839,16 @@ $(ProjectName)d $(ProjectName)d $(ProjectName)d - $(ProjectName)d - $(ProjectName)d + $(ProjectName)d + $(ProjectName)d $(ProjectName)d $(ProjectName)d $(ProjectName)d $(ProjectName)d $(ProjectName)d $(ProjectName)d - $(ProjectName)d - $(ProjectName)d + $(ProjectName)d + $(ProjectName)d @@ -1684,7 +1684,7 @@ MachineX64 - + _DEBUG;%(PreprocessorDefinitions) true @@ -1718,7 +1718,7 @@ MachineX86 - + _DEBUG;%(PreprocessorDefinitions) true @@ -1751,7 +1751,7 @@ MachineX64 - + NDEBUG;%(PreprocessorDefinitions) true @@ -1783,7 +1783,7 @@ MachineX86 - + NDEBUG;%(PreprocessorDefinitions) true @@ -1857,7 +1857,7 @@ MachineX64 - + Disabled ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\..\openssl\include\..\build\Win32\VC10\DLL Debug\include;..\..\..\..\..\openssl\include;..\..\..\..\..\libssh2\include;%(AdditionalIncludeDirectories) @@ -1877,7 +1877,7 @@ MachineX86 - + X64 @@ -2029,7 +2029,7 @@ MachineX64 - + Disabled ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\..\openssl\include\..\build\Win32\VC10\LIB Debug\include;..\..\..\..\..\openssl\include;..\..\..\..\..\libssh2\include;%(AdditionalIncludeDirectories) @@ -2049,7 +2049,7 @@ MachineX86 - + X64 @@ -2115,7 +2115,7 @@ MachineX64 - + MaxSpeed OnlyExplicitInline @@ -2135,7 +2135,7 @@ MachineX86 - + X64 @@ -2287,7 +2287,7 @@ MachineX64 - + MaxSpeed OnlyExplicitInline @@ -2307,7 +2307,7 @@ MachineX86 - + X64 diff --git a/projects/Windows/VC10/src/curl.sln b/projects/Windows/VC10/src/curl.sln index 131f27b7a7..9b8f96a25c 100644 --- a/projects/Windows/VC10/src/curl.sln +++ b/projects/Windows/VC10/src/curl.sln @@ -4,8 +4,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "curl", "curl.vcxproj", "{52 EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - DLL Debug - DLL OpenSSL - DLL LibSSH2|Win32 = DLL Debug - DLL OpenSSL - DLL LibSSH2|Win32 - DLL Debug - DLL OpenSSL - DLL LibSSH2|x64 = DLL Debug - DLL OpenSSL - DLL LibSSH2|x64 + DLL Debug - DLL OpenSSL - DLL libssh2|Win32 = DLL Debug - DLL OpenSSL - DLL libssh2|Win32 + DLL Debug - DLL OpenSSL - DLL libssh2|x64 = DLL Debug - DLL OpenSSL - DLL libssh2|x64 DLL Debug - DLL OpenSSL|Win32 = DLL Debug - DLL OpenSSL|Win32 DLL Debug - DLL OpenSSL|x64 = DLL Debug - DLL OpenSSL|x64 DLL Debug - DLL Windows SSPI - DLL WinIDN|Win32 = DLL Debug - DLL Windows SSPI - DLL WinIDN|Win32 @@ -16,8 +16,8 @@ Global DLL Debug - DLL wolfSSL|x64 = DLL Debug - DLL wolfSSL|x64 DLL Debug|Win32 = DLL Debug|Win32 DLL Debug|x64 = DLL Debug|x64 - DLL Release - DLL OpenSSL - DLL LibSSH2|Win32 = DLL Release - DLL OpenSSL - DLL LibSSH2|Win32 - DLL Release - DLL OpenSSL - DLL LibSSH2|x64 = DLL Release - DLL OpenSSL - DLL LibSSH2|x64 + DLL Release - DLL OpenSSL - DLL libssh2|Win32 = DLL Release - DLL OpenSSL - DLL libssh2|Win32 + DLL Release - DLL OpenSSL - DLL libssh2|x64 = DLL Release - DLL OpenSSL - DLL libssh2|x64 DLL Release - DLL OpenSSL|Win32 = DLL Release - DLL OpenSSL|Win32 DLL Release - DLL OpenSSL|x64 = DLL Release - DLL OpenSSL|x64 DLL Release - DLL Windows SSPI - DLL WinIDN|Win32 = DLL Release - DLL Windows SSPI - DLL WinIDN|Win32 @@ -28,32 +28,32 @@ Global DLL Release - DLL wolfSSL|x64 = DLL Release - DLL wolfSSL|x64 DLL Release|Win32 = DLL Release|Win32 DLL Release|x64 = DLL Release|x64 - LIB Debug - DLL OpenSSL - DLL LibSSH2|Win32 = LIB Debug - DLL OpenSSL - DLL LibSSH2|Win32 - LIB Debug - DLL OpenSSL - DLL LibSSH2|x64 = LIB Debug - DLL OpenSSL - DLL LibSSH2|x64 + LIB Debug - DLL OpenSSL - DLL libssh2|Win32 = LIB Debug - DLL OpenSSL - DLL libssh2|Win32 + LIB Debug - DLL OpenSSL - DLL libssh2|x64 = LIB Debug - DLL OpenSSL - DLL libssh2|x64 LIB Debug - DLL OpenSSL|Win32 = LIB Debug - DLL OpenSSL|Win32 LIB Debug - DLL OpenSSL|x64 = LIB Debug - DLL OpenSSL|x64 LIB Debug - DLL Windows SSPI - DLL WinIDN|Win32 = LIB Debug - DLL Windows SSPI - DLL WinIDN|Win32 LIB Debug - DLL Windows SSPI - DLL WinIDN|x64 = LIB Debug - DLL Windows SSPI - DLL WinIDN|x64 LIB Debug - DLL Windows SSPI|Win32 = LIB Debug - DLL Windows SSPI|Win32 LIB Debug - DLL Windows SSPI|x64 = LIB Debug - DLL Windows SSPI|x64 - LIB Debug - LIB OpenSSL - LIB LibSSH2|Win32 = LIB Debug - LIB OpenSSL - LIB LibSSH2|Win32 - LIB Debug - LIB OpenSSL - LIB LibSSH2|x64 = LIB Debug - LIB OpenSSL - LIB LibSSH2|x64 + LIB Debug - LIB OpenSSL - LIB libssh2|Win32 = LIB Debug - LIB OpenSSL - LIB libssh2|Win32 + LIB Debug - LIB OpenSSL - LIB libssh2|x64 = LIB Debug - LIB OpenSSL - LIB libssh2|x64 LIB Debug - LIB OpenSSL|Win32 = LIB Debug - LIB OpenSSL|Win32 LIB Debug - LIB OpenSSL|x64 = LIB Debug - LIB OpenSSL|x64 LIB Debug - LIB wolfSSL|Win32 = LIB Debug - LIB wolfSSL|Win32 LIB Debug - LIB wolfSSL|x64 = LIB Debug - LIB wolfSSL|x64 LIB Debug|Win32 = LIB Debug|Win32 LIB Debug|x64 = LIB Debug|x64 - LIB Release - DLL OpenSSL - DLL LibSSH2|Win32 = LIB Release - DLL OpenSSL - DLL LibSSH2|Win32 - LIB Release - DLL OpenSSL - DLL LibSSH2|x64 = LIB Release - DLL OpenSSL - DLL LibSSH2|x64 + LIB Release - DLL OpenSSL - DLL libssh2|Win32 = LIB Release - DLL OpenSSL - DLL libssh2|Win32 + LIB Release - DLL OpenSSL - DLL libssh2|x64 = LIB Release - DLL OpenSSL - DLL libssh2|x64 LIB Release - DLL OpenSSL|Win32 = LIB Release - DLL OpenSSL|Win32 LIB Release - DLL OpenSSL|x64 = LIB Release - DLL OpenSSL|x64 LIB Release - DLL Windows SSPI - DLL WinIDN|Win32 = LIB Release - DLL Windows SSPI - DLL WinIDN|Win32 LIB Release - DLL Windows SSPI - DLL WinIDN|x64 = LIB Release - DLL Windows SSPI - DLL WinIDN|x64 LIB Release - DLL Windows SSPI|Win32 = LIB Release - DLL Windows SSPI|Win32 LIB Release - DLL Windows SSPI|x64 = LIB Release - DLL Windows SSPI|x64 - LIB Release - LIB OpenSSL - LIB LibSSH2|Win32 = LIB Release - LIB OpenSSL - LIB LibSSH2|Win32 - LIB Release - LIB OpenSSL - LIB LibSSH2|x64 = LIB Release - LIB OpenSSL - LIB LibSSH2|x64 + LIB Release - LIB OpenSSL - LIB libssh2|Win32 = LIB Release - LIB OpenSSL - LIB libssh2|Win32 + LIB Release - LIB OpenSSL - LIB libssh2|x64 = LIB Release - LIB OpenSSL - LIB libssh2|x64 LIB Release - LIB OpenSSL|Win32 = LIB Release - LIB OpenSSL|Win32 LIB Release - LIB OpenSSL|x64 = LIB Release - LIB OpenSSL|x64 LIB Release - LIB wolfSSL|Win32 = LIB Release - LIB wolfSSL|Win32 @@ -62,10 +62,10 @@ Global LIB Release|x64 = LIB Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Debug - DLL OpenSSL - DLL LibSSH2|Win32.ActiveCfg = DLL Debug - DLL OpenSSL - DLL LibSSH2|Win32 - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Debug - DLL OpenSSL - DLL LibSSH2|Win32.Build.0 = DLL Debug - DLL OpenSSL - DLL LibSSH2|Win32 - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Debug - DLL OpenSSL - DLL LibSSH2|x64.ActiveCfg = DLL Debug - DLL OpenSSL - DLL LibSSH2|x64 - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Debug - DLL OpenSSL - DLL LibSSH2|x64.Build.0 = DLL Debug - DLL OpenSSL - DLL LibSSH2|x64 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Debug - DLL OpenSSL - DLL libssh2|Win32.ActiveCfg = DLL Debug - DLL OpenSSL - DLL libssh2|Win32 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Debug - DLL OpenSSL - DLL libssh2|Win32.Build.0 = DLL Debug - DLL OpenSSL - DLL libssh2|Win32 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Debug - DLL OpenSSL - DLL libssh2|x64.ActiveCfg = DLL Debug - DLL OpenSSL - DLL libssh2|x64 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Debug - DLL OpenSSL - DLL libssh2|x64.Build.0 = DLL Debug - DLL OpenSSL - DLL libssh2|x64 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Debug - DLL OpenSSL|Win32.ActiveCfg = DLL Debug - DLL OpenSSL|Win32 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Debug - DLL OpenSSL|Win32.Build.0 = DLL Debug - DLL OpenSSL|Win32 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Debug - DLL OpenSSL|x64.ActiveCfg = DLL Debug - DLL OpenSSL|x64 @@ -86,10 +86,10 @@ Global {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Release - DLL OpenSSL - DLL LibSSH2|Win32.ActiveCfg = DLL Release - DLL OpenSSL - DLL LibSSH2|Win32 - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Release - DLL OpenSSL - DLL LibSSH2|Win32.Build.0 = DLL Release - DLL OpenSSL - DLL LibSSH2|Win32 - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Release - DLL OpenSSL - DLL LibSSH2|x64.ActiveCfg = DLL Release - DLL OpenSSL - DLL LibSSH2|x64 - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Release - DLL OpenSSL - DLL LibSSH2|x64.Build.0 = DLL Release - DLL OpenSSL - DLL LibSSH2|x64 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Release - DLL OpenSSL - DLL libssh2|Win32.ActiveCfg = DLL Release - DLL OpenSSL - DLL libssh2|Win32 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Release - DLL OpenSSL - DLL libssh2|Win32.Build.0 = DLL Release - DLL OpenSSL - DLL libssh2|Win32 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Release - DLL OpenSSL - DLL libssh2|x64.ActiveCfg = DLL Release - DLL OpenSSL - DLL libssh2|x64 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Release - DLL OpenSSL - DLL libssh2|x64.Build.0 = DLL Release - DLL OpenSSL - DLL libssh2|x64 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Release - DLL OpenSSL|Win32.ActiveCfg = DLL Release - DLL OpenSSL|Win32 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Release - DLL OpenSSL|Win32.Build.0 = DLL Release - DLL OpenSSL|Win32 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Release - DLL OpenSSL|x64.ActiveCfg = DLL Release - DLL OpenSSL|x64 @@ -110,10 +110,10 @@ Global {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Release|Win32.Build.0 = DLL Release|Win32 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Release|x64.ActiveCfg = DLL Release|x64 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Release|x64.Build.0 = DLL Release|x64 - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - DLL OpenSSL - DLL LibSSH2|Win32.ActiveCfg = LIB Debug - DLL OpenSSL - DLL LibSSH2|Win32 - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - DLL OpenSSL - DLL LibSSH2|Win32.Build.0 = LIB Debug - DLL OpenSSL - DLL LibSSH2|Win32 - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - DLL OpenSSL - DLL LibSSH2|x64.ActiveCfg = LIB Debug - DLL OpenSSL - DLL LibSSH2|x64 - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - DLL OpenSSL - DLL LibSSH2|x64.Build.0 = LIB Debug - DLL OpenSSL - DLL LibSSH2|x64 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - DLL OpenSSL - DLL libssh2|Win32.ActiveCfg = LIB Debug - DLL OpenSSL - DLL libssh2|Win32 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - DLL OpenSSL - DLL libssh2|Win32.Build.0 = LIB Debug - DLL OpenSSL - DLL libssh2|Win32 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - DLL OpenSSL - DLL libssh2|x64.ActiveCfg = LIB Debug - DLL OpenSSL - DLL libssh2|x64 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - DLL OpenSSL - DLL libssh2|x64.Build.0 = LIB Debug - DLL OpenSSL - DLL libssh2|x64 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - DLL OpenSSL|Win32.ActiveCfg = LIB Debug - DLL OpenSSL|Win32 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - DLL OpenSSL|Win32.Build.0 = LIB Debug - DLL OpenSSL|Win32 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - DLL OpenSSL|x64.ActiveCfg = LIB Debug - DLL OpenSSL|x64 @@ -126,10 +126,10 @@ Global {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - DLL Windows SSPI|Win32.Build.0 = LIB Debug - DLL Windows SSPI|Win32 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - DLL Windows SSPI|x64.ActiveCfg = LIB Debug - DLL Windows SSPI|x64 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - DLL Windows SSPI|x64.Build.0 = LIB Debug - DLL Windows SSPI|x64 - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - LIB OpenSSL - LIB LibSSH2|Win32.ActiveCfg = LIB Debug - LIB OpenSSL - LIB LibSSH2|Win32 - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - LIB OpenSSL - LIB LibSSH2|Win32.Build.0 = LIB Debug - LIB OpenSSL - LIB LibSSH2|Win32 - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - LIB OpenSSL - LIB LibSSH2|x64.ActiveCfg = LIB Debug - LIB OpenSSL - LIB LibSSH2|x64 - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - LIB OpenSSL - LIB LibSSH2|x64.Build.0 = LIB Debug - LIB OpenSSL - LIB LibSSH2|x64 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - LIB OpenSSL - LIB libssh2|Win32.ActiveCfg = LIB Debug - LIB OpenSSL - LIB libssh2|Win32 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - LIB OpenSSL - LIB libssh2|Win32.Build.0 = LIB Debug - LIB OpenSSL - LIB libssh2|Win32 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - LIB OpenSSL - LIB libssh2|x64.ActiveCfg = LIB Debug - LIB OpenSSL - LIB libssh2|x64 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - LIB OpenSSL - LIB libssh2|x64.Build.0 = LIB Debug - LIB OpenSSL - LIB libssh2|x64 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - LIB OpenSSL|Win32.ActiveCfg = LIB Debug - LIB OpenSSL|Win32 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - LIB OpenSSL|Win32.Build.0 = LIB Debug - LIB OpenSSL|Win32 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - LIB OpenSSL|x64.ActiveCfg = LIB Debug - LIB OpenSSL|x64 @@ -142,10 +142,10 @@ Global {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug|Win32.Build.0 = LIB Debug|Win32 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug|x64.ActiveCfg = LIB Debug|x64 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug|x64.Build.0 = LIB Debug|x64 - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - DLL OpenSSL - DLL LibSSH2|Win32.ActiveCfg = LIB Release - DLL OpenSSL - DLL LibSSH2|Win32 - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - DLL OpenSSL - DLL LibSSH2|Win32.Build.0 = LIB Release - DLL OpenSSL - DLL LibSSH2|Win32 - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - DLL OpenSSL - DLL LibSSH2|x64.ActiveCfg = LIB Release - DLL OpenSSL - DLL LibSSH2|x64 - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - DLL OpenSSL - DLL LibSSH2|x64.Build.0 = LIB Release - DLL OpenSSL - DLL LibSSH2|x64 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - DLL OpenSSL - DLL libssh2|Win32.ActiveCfg = LIB Release - DLL OpenSSL - DLL libssh2|Win32 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - DLL OpenSSL - DLL libssh2|Win32.Build.0 = LIB Release - DLL OpenSSL - DLL libssh2|Win32 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - DLL OpenSSL - DLL libssh2|x64.ActiveCfg = LIB Release - DLL OpenSSL - DLL libssh2|x64 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - DLL OpenSSL - DLL libssh2|x64.Build.0 = LIB Release - DLL OpenSSL - DLL libssh2|x64 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - DLL OpenSSL|Win32.ActiveCfg = LIB Release - DLL OpenSSL|Win32 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - DLL OpenSSL|Win32.Build.0 = LIB Release - DLL OpenSSL|Win32 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - DLL OpenSSL|x64.ActiveCfg = LIB Release - DLL OpenSSL|x64 @@ -158,10 +158,10 @@ Global {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - DLL Windows SSPI|Win32.Build.0 = LIB Release - DLL Windows SSPI|Win32 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - DLL Windows SSPI|x64.ActiveCfg = LIB Release - DLL Windows SSPI|x64 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - DLL Windows SSPI|x64.Build.0 = LIB Release - DLL Windows SSPI|x64 - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - LIB OpenSSL - LIB LibSSH2|Win32.ActiveCfg = LIB Release - LIB OpenSSL - LIB LibSSH2|Win32 - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - LIB OpenSSL - LIB LibSSH2|Win32.Build.0 = LIB Release - LIB OpenSSL - LIB LibSSH2|Win32 - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - LIB OpenSSL - LIB LibSSH2|x64.ActiveCfg = LIB Release - LIB OpenSSL - LIB LibSSH2|x64 - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - LIB OpenSSL - LIB LibSSH2|x64.Build.0 = LIB Release - LIB OpenSSL - LIB LibSSH2|x64 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - LIB OpenSSL - LIB libssh2|Win32.ActiveCfg = LIB Release - LIB OpenSSL - LIB libssh2|Win32 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - LIB OpenSSL - LIB libssh2|Win32.Build.0 = LIB Release - LIB OpenSSL - LIB libssh2|Win32 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - LIB OpenSSL - LIB libssh2|x64.ActiveCfg = LIB Release - LIB OpenSSL - LIB libssh2|x64 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - LIB OpenSSL - LIB libssh2|x64.Build.0 = LIB Release - LIB OpenSSL - LIB libssh2|x64 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - LIB OpenSSL|Win32.ActiveCfg = LIB Release - LIB OpenSSL|Win32 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - LIB OpenSSL|Win32.Build.0 = LIB Release - LIB OpenSSL|Win32 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - LIB OpenSSL|x64.ActiveCfg = LIB Release - LIB OpenSSL|x64 diff --git a/projects/Windows/VC10/src/curl.tmpl b/projects/Windows/VC10/src/curl.tmpl index 71a0b3ff0b..074ea24319 100644 --- a/projects/Windows/VC10/src/curl.tmpl +++ b/projects/Windows/VC10/src/curl.tmpl @@ -9,12 +9,12 @@ DLL Debug - DLL wolfSSL x64 - - DLL Debug - DLL OpenSSL - DLL LibSSH2 + + DLL Debug - DLL OpenSSL - DLL libssh2 Win32 - - DLL Debug - DLL OpenSSL - DLL LibSSH2 + + DLL Debug - DLL OpenSSL - DLL libssh2 x64 @@ -57,12 +57,12 @@ DLL Release - DLL wolfSSL x64 - - DLL Release - DLL OpenSSL - DLL LibSSH2 + + DLL Release - DLL OpenSSL - DLL libssh2 Win32 - - DLL Release - DLL OpenSSL - DLL LibSSH2 + + DLL Release - DLL OpenSSL - DLL libssh2 x64 @@ -97,12 +97,12 @@ DLL Release x64 - - LIB Debug - DLL OpenSSL - DLL LibSSH2 + + LIB Debug - DLL OpenSSL - DLL libssh2 Win32 - - LIB Debug - DLL OpenSSL - DLL LibSSH2 + + LIB Debug - DLL OpenSSL - DLL libssh2 x64 @@ -137,12 +137,12 @@ LIB Debug - LIB wolfSSL x64 - - LIB Debug - LIB OpenSSL - LIB LibSSH2 + + LIB Debug - LIB OpenSSL - LIB libssh2 Win32 - - LIB Debug - LIB OpenSSL - LIB LibSSH2 + + LIB Debug - LIB OpenSSL - LIB libssh2 x64 @@ -161,12 +161,12 @@ LIB Debug x64 - - LIB Release - DLL OpenSSL - DLL LibSSH2 + + LIB Release - DLL OpenSSL - DLL libssh2 Win32 - - LIB Release - DLL OpenSSL - DLL LibSSH2 + + LIB Release - DLL OpenSSL - DLL libssh2 x64 @@ -201,12 +201,12 @@ LIB Release - LIB wolfSSL x64 - - LIB Release - LIB OpenSSL - LIB LibSSH2 + + LIB Release - LIB OpenSSL - LIB libssh2 Win32 - - LIB Release - LIB OpenSSL - LIB LibSSH2 + + LIB Release - LIB OpenSSL - LIB libssh2 x64 @@ -251,12 +251,12 @@ false Unicode - + Application false Unicode - + Application false Unicode @@ -271,12 +271,12 @@ false Unicode - + Application false Unicode - + Application false Unicode @@ -291,12 +291,12 @@ false Unicode - + Application false Unicode - + Application false Unicode @@ -391,12 +391,12 @@ false Unicode - + Application false Unicode - + Application false Unicode @@ -411,12 +411,12 @@ false Unicode - + Application false Unicode - + Application false Unicode @@ -431,12 +431,12 @@ false Unicode - + Application false Unicode - + Application false Unicode @@ -526,10 +526,10 @@ - + - + @@ -538,10 +538,10 @@ - + - + @@ -550,10 +550,10 @@ - + - + @@ -610,10 +610,10 @@ - + - + @@ -622,10 +622,10 @@ - + - + @@ -634,10 +634,10 @@ - + - + @@ -769,18 +769,18 @@ $(OutDir)src\ false false - ..\..\..\..\build\Win32\VC10\$(Configuration)\ - $(OutDir)src\ - false - ..\..\..\..\build\Win64\VC10\$(Configuration)\ - $(OutDir)src\ - false - ..\..\..\..\build\Win32\VC10\$(Configuration)\ - $(OutDir)src\ - false - ..\..\..\..\build\Win64\VC10\$(Configuration)\ - $(OutDir)src\ - false + ..\..\..\..\build\Win32\VC10\$(Configuration)\ + $(OutDir)src\ + false + ..\..\..\..\build\Win64\VC10\$(Configuration)\ + $(OutDir)src\ + false + ..\..\..\..\build\Win32\VC10\$(Configuration)\ + $(OutDir)src\ + false + ..\..\..\..\build\Win64\VC10\$(Configuration)\ + $(OutDir)src\ + false ..\..\..\..\build\Win32\VC10\$(Configuration)\ $(OutDir)src\ false @@ -793,18 +793,18 @@ ..\..\..\..\build\Win64\VC10\$(Configuration)\ $(OutDir)src\ false - ..\..\..\..\build\Win32\VC10\$(Configuration)\ - $(OutDir)src\ - false - ..\..\..\..\build\Win64\VC10\$(Configuration)\ - $(OutDir)src\ - false - ..\..\..\..\build\Win32\VC10\$(Configuration)\ - $(OutDir)src\ - false - ..\..\..\..\build\Win64\VC10\$(Configuration)\ - $(OutDir)src\ - false + ..\..\..\..\build\Win32\VC10\$(Configuration)\ + $(OutDir)src\ + false + ..\..\..\..\build\Win64\VC10\$(Configuration)\ + $(OutDir)src\ + false + ..\..\..\..\build\Win32\VC10\$(Configuration)\ + $(OutDir)src\ + false + ..\..\..\..\build\Win64\VC10\$(Configuration)\ + $(OutDir)src\ + false ..\..\..\..\build\Win32\VC10\$(Configuration)\ $(OutDir)src\ false @@ -817,18 +817,18 @@ ..\..\..\..\build\Win64\VC10\$(Configuration)\ $(OutDir)src\ false - ..\..\..\..\build\Win32\VC10\$(Configuration)\ - $(OutDir)src\ - false - ..\..\..\..\build\Win64\VC10\$(Configuration)\ - $(OutDir)src\ - false - ..\..\..\..\build\Win32\VC10\$(Configuration)\ - $(OutDir)src\ - false - ..\..\..\..\build\Win64\VC10\$(Configuration)\ - $(OutDir)src\ - false + ..\..\..\..\build\Win32\VC10\$(Configuration)\ + $(OutDir)src\ + false + ..\..\..\..\build\Win64\VC10\$(Configuration)\ + $(OutDir)src\ + false + ..\..\..\..\build\Win32\VC10\$(Configuration)\ + $(OutDir)src\ + false + ..\..\..\..\build\Win64\VC10\$(Configuration)\ + $(OutDir)src\ + false ..\..\..\..\build\Win32\VC10\$(Configuration)\ ..\..\..\..\build\Win32\VC10\$(Configuration)\ $(OutDir)src\ @@ -859,8 +859,8 @@ $(ProjectName)d $(ProjectName)d $(ProjectName)d - $(ProjectName)d - $(ProjectName)d + $(ProjectName)d + $(ProjectName)d $(ProjectName)d $(ProjectName)d $(ProjectName)d @@ -871,41 +871,41 @@ $(ProjectName)d $(ProjectName)d $(ProjectName)d - $(ProjectName)d - $(ProjectName)d + $(ProjectName)d + $(ProjectName)d $(ProjectName)d $(ProjectName)d $(ProjectName)d $(ProjectName)d $(ProjectName)d $(ProjectName)d - $(ProjectName)d - $(ProjectName)d - $(ProjectName) + $(ProjectName)d + $(ProjectName)d + $(ProjectName) $(ProjectName) $(ProjectName) $(ProjectName) $(ProjectName) $(ProjectName) - $(ProjectName) + $(ProjectName) $(ProjectName) $(ProjectName) $(ProjectName) - $(ProjectName) + $(ProjectName) $(ProjectName) $(ProjectName) $(ProjectName) - $(ProjectName) + $(ProjectName) $(ProjectName) $(ProjectName) $(ProjectName) $(ProjectName) $(ProjectName) - $(ProjectName) + $(ProjectName) $(ProjectName) $(ProjectName) $(ProjectName) - $(ProjectName) + $(ProjectName) $(ProjectName) $(ProjectName) $(ProjectName) @@ -1772,7 +1772,7 @@ MachineX64 - + $(TargetDir)$(TargetName).tlb @@ -1803,7 +1803,7 @@ MachineX86 - + X64 $(TargetDir)$(TargetName).tlb @@ -1835,7 +1835,7 @@ MachineX64 - + $(TargetDir)$(TargetName).tlb @@ -1864,7 +1864,7 @@ MachineX86 - + X64 $(TargetDir)$(TargetName).tlb @@ -2016,7 +2016,7 @@ MachineX64 - + $(TargetDir)$(TargetName).tlb @@ -2047,7 +2047,7 @@ MachineX86 - + X64 $(TargetDir)$(TargetName).tlb @@ -2079,7 +2079,7 @@ MachineX64 - + $(TargetDir)$(TargetName).tlb @@ -2108,7 +2108,7 @@ MachineX86 - + X64 $(TargetDir)$(TargetName).tlb @@ -2260,7 +2260,7 @@ MachineX64 - + $(TargetDir)$(TargetName).tlb @@ -2291,7 +2291,7 @@ MachineX86 - + X64 $(TargetDir)$(TargetName).tlb @@ -2323,7 +2323,7 @@ MachineX64 - + $(TargetDir)$(TargetName).tlb @@ -2352,7 +2352,7 @@ MachineX86 - + X64 $(TargetDir)$(TargetName).tlb diff --git a/projects/Windows/VC11/lib/libcurl.sln b/projects/Windows/VC11/lib/libcurl.sln index 780dc91a2a..e17c4cb863 100644 --- a/projects/Windows/VC11/lib/libcurl.sln +++ b/projects/Windows/VC11/lib/libcurl.sln @@ -4,8 +4,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcurl", "libcurl.vcxproj" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - DLL Debug - DLL OpenSSL - DLL LibSSH2|Win32 = DLL Debug - DLL OpenSSL - DLL LibSSH2|Win32 - DLL Debug - DLL OpenSSL - DLL LibSSH2|x64 = DLL Debug - DLL OpenSSL - DLL LibSSH2|x64 + DLL Debug - DLL OpenSSL - DLL libssh2|Win32 = DLL Debug - DLL OpenSSL - DLL libssh2|Win32 + DLL Debug - DLL OpenSSL - DLL libssh2|x64 = DLL Debug - DLL OpenSSL - DLL libssh2|x64 DLL Debug - DLL OpenSSL|Win32 = DLL Debug - DLL OpenSSL|Win32 DLL Debug - DLL OpenSSL|x64 = DLL Debug - DLL OpenSSL|x64 DLL Debug - DLL Windows SSPI - DLL WinIDN|Win32 = DLL Debug - DLL Windows SSPI - DLL WinIDN|Win32 @@ -16,8 +16,8 @@ Global DLL Debug - DLL wolfSSL|x64 = DLL Debug - DLL wolfSSL|x64 DLL Debug|Win32 = DLL Debug|Win32 DLL Debug|x64 = DLL Debug|x64 - DLL Release - DLL OpenSSL - DLL LibSSH2|Win32 = DLL Release - DLL OpenSSL - DLL LibSSH2|Win32 - DLL Release - DLL OpenSSL - DLL LibSSH2|x64 = DLL Release - DLL OpenSSL - DLL LibSSH2|x64 + DLL Release - DLL OpenSSL - DLL libssh2|Win32 = DLL Release - DLL OpenSSL - DLL libssh2|Win32 + DLL Release - DLL OpenSSL - DLL libssh2|x64 = DLL Release - DLL OpenSSL - DLL libssh2|x64 DLL Release - DLL OpenSSL|Win32 = DLL Release - DLL OpenSSL|Win32 DLL Release - DLL OpenSSL|x64 = DLL Release - DLL OpenSSL|x64 DLL Release - DLL Windows SSPI - DLL WinIDN|Win32 = DLL Release - DLL Windows SSPI - DLL WinIDN|Win32 @@ -28,32 +28,32 @@ Global DLL Release - DLL wolfSSL|x64 = DLL Release - DLL wolfSSL|x64 DLL Release|Win32 = DLL Release|Win32 DLL Release|x64 = DLL Release|x64 - LIB Debug - DLL OpenSSL - DLL LibSSH2|Win32 = LIB Debug - DLL OpenSSL - DLL LibSSH2|Win32 - LIB Debug - DLL OpenSSL - DLL LibSSH2|x64 = LIB Debug - DLL OpenSSL - DLL LibSSH2|x64 + LIB Debug - DLL OpenSSL - DLL libssh2|Win32 = LIB Debug - DLL OpenSSL - DLL libssh2|Win32 + LIB Debug - DLL OpenSSL - DLL libssh2|x64 = LIB Debug - DLL OpenSSL - DLL libssh2|x64 LIB Debug - DLL OpenSSL|Win32 = LIB Debug - DLL OpenSSL|Win32 LIB Debug - DLL OpenSSL|x64 = LIB Debug - DLL OpenSSL|x64 LIB Debug - DLL Windows SSPI - DLL WinIDN|Win32 = LIB Debug - DLL Windows SSPI - DLL WinIDN|Win32 LIB Debug - DLL Windows SSPI - DLL WinIDN|x64 = LIB Debug - DLL Windows SSPI - DLL WinIDN|x64 LIB Debug - DLL Windows SSPI|Win32 = LIB Debug - DLL Windows SSPI|Win32 LIB Debug - DLL Windows SSPI|x64 = LIB Debug - DLL Windows SSPI|x64 - LIB Debug - LIB OpenSSL - LIB LibSSH2|Win32 = LIB Debug - LIB OpenSSL - LIB LibSSH2|Win32 - LIB Debug - LIB OpenSSL - LIB LibSSH2|x64 = LIB Debug - LIB OpenSSL - LIB LibSSH2|x64 + LIB Debug - LIB OpenSSL - LIB libssh2|Win32 = LIB Debug - LIB OpenSSL - LIB libssh2|Win32 + LIB Debug - LIB OpenSSL - LIB libssh2|x64 = LIB Debug - LIB OpenSSL - LIB libssh2|x64 LIB Debug - LIB OpenSSL|Win32 = LIB Debug - LIB OpenSSL|Win32 LIB Debug - LIB OpenSSL|x64 = LIB Debug - LIB OpenSSL|x64 LIB Debug - LIB wolfSSL|Win32 = LIB Debug - LIB wolfSSL|Win32 LIB Debug - LIB wolfSSL|x64 = LIB Debug - LIB wolfSSL|x64 LIB Debug|Win32 = LIB Debug|Win32 LIB Debug|x64 = LIB Debug|x64 - LIB Release - DLL OpenSSL - DLL LibSSH2|Win32 = LIB Release - DLL OpenSSL - DLL LibSSH2|Win32 - LIB Release - DLL OpenSSL - DLL LibSSH2|x64 = LIB Release - DLL OpenSSL - DLL LibSSH2|x64 + LIB Release - DLL OpenSSL - DLL libssh2|Win32 = LIB Release - DLL OpenSSL - DLL libssh2|Win32 + LIB Release - DLL OpenSSL - DLL libssh2|x64 = LIB Release - DLL OpenSSL - DLL libssh2|x64 LIB Release - DLL OpenSSL|Win32 = LIB Release - DLL OpenSSL|Win32 LIB Release - DLL OpenSSL|x64 = LIB Release - DLL OpenSSL|x64 LIB Release - DLL Windows SSPI - DLL WinIDN|Win32 = LIB Release - DLL Windows SSPI - DLL WinIDN|Win32 LIB Release - DLL Windows SSPI - DLL WinIDN|x64 = LIB Release - DLL Windows SSPI - DLL WinIDN|x64 LIB Release - DLL Windows SSPI|Win32 = LIB Release - DLL Windows SSPI|Win32 LIB Release - DLL Windows SSPI|x64 = LIB Release - DLL Windows SSPI|x64 - LIB Release - LIB OpenSSL - LIB LibSSH2|Win32 = LIB Release - LIB OpenSSL - LIB LibSSH2|Win32 - LIB Release - LIB OpenSSL - LIB LibSSH2|x64 = LIB Release - LIB OpenSSL - LIB LibSSH2|x64 + LIB Release - LIB OpenSSL - LIB libssh2|Win32 = LIB Release - LIB OpenSSL - LIB libssh2|Win32 + LIB Release - LIB OpenSSL - LIB libssh2|x64 = LIB Release - LIB OpenSSL - LIB libssh2|x64 LIB Release - LIB OpenSSL|Win32 = LIB Release - LIB OpenSSL|Win32 LIB Release - LIB OpenSSL|x64 = LIB Release - LIB OpenSSL|x64 LIB Release - LIB wolfSSL|Win32 = LIB Release - LIB wolfSSL|Win32 @@ -62,10 +62,10 @@ Global LIB Release|x64 = LIB Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Debug - DLL OpenSSL - DLL LibSSH2|Win32.ActiveCfg = DLL Debug - DLL OpenSSL - DLL LibSSH2|Win32 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Debug - DLL OpenSSL - DLL LibSSH2|Win32.Build.0 = DLL Debug - DLL OpenSSL - DLL LibSSH2|Win32 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Debug - DLL OpenSSL - DLL LibSSH2|x64.ActiveCfg = DLL Debug - DLL OpenSSL - DLL LibSSH2|x64 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Debug - DLL OpenSSL - DLL LibSSH2|x64.Build.0 = DLL Debug - DLL OpenSSL - DLL LibSSH2|x64 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Debug - DLL OpenSSL - DLL libssh2|Win32.ActiveCfg = DLL Debug - DLL OpenSSL - DLL libssh2|Win32 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Debug - DLL OpenSSL - DLL libssh2|Win32.Build.0 = DLL Debug - DLL OpenSSL - DLL libssh2|Win32 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Debug - DLL OpenSSL - DLL libssh2|x64.ActiveCfg = DLL Debug - DLL OpenSSL - DLL libssh2|x64 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Debug - DLL OpenSSL - DLL libssh2|x64.Build.0 = DLL Debug - DLL OpenSSL - DLL libssh2|x64 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Debug - DLL OpenSSL|Win32.ActiveCfg = DLL Debug - DLL OpenSSL|Win32 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Debug - DLL OpenSSL|Win32.Build.0 = DLL Debug - DLL OpenSSL|Win32 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Debug - DLL OpenSSL|x64.ActiveCfg = DLL Debug - DLL OpenSSL|x64 @@ -86,10 +86,10 @@ Global {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Release - DLL OpenSSL - DLL LibSSH2|Win32.ActiveCfg = DLL Release - DLL OpenSSL - DLL LibSSH2|Win32 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Release - DLL OpenSSL - DLL LibSSH2|Win32.Build.0 = DLL Release - DLL OpenSSL - DLL LibSSH2|Win32 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Release - DLL OpenSSL - DLL LibSSH2|x64.ActiveCfg = DLL Release - DLL OpenSSL - DLL LibSSH2|x64 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Release - DLL OpenSSL - DLL LibSSH2|x64.Build.0 = DLL Release - DLL OpenSSL - DLL LibSSH2|x64 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Release - DLL OpenSSL - DLL libssh2|Win32.ActiveCfg = DLL Release - DLL OpenSSL - DLL libssh2|Win32 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Release - DLL OpenSSL - DLL libssh2|Win32.Build.0 = DLL Release - DLL OpenSSL - DLL libssh2|Win32 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Release - DLL OpenSSL - DLL libssh2|x64.ActiveCfg = DLL Release - DLL OpenSSL - DLL libssh2|x64 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Release - DLL OpenSSL - DLL libssh2|x64.Build.0 = DLL Release - DLL OpenSSL - DLL libssh2|x64 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Release - DLL OpenSSL|Win32.ActiveCfg = DLL Release - DLL OpenSSL|Win32 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Release - DLL OpenSSL|Win32.Build.0 = DLL Release - DLL OpenSSL|Win32 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Release - DLL OpenSSL|x64.ActiveCfg = DLL Release - DLL OpenSSL|x64 @@ -110,10 +110,10 @@ Global {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Release|Win32.Build.0 = DLL Release|Win32 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Release|x64.ActiveCfg = DLL Release|x64 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Release|x64.Build.0 = DLL Release|x64 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - DLL OpenSSL - DLL LibSSH2|Win32.ActiveCfg = LIB Debug - DLL OpenSSL - DLL LibSSH2|Win32 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - DLL OpenSSL - DLL LibSSH2|Win32.Build.0 = LIB Debug - DLL OpenSSL - DLL LibSSH2|Win32 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - DLL OpenSSL - DLL LibSSH2|x64.ActiveCfg = LIB Debug - DLL OpenSSL - DLL LibSSH2|x64 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - DLL OpenSSL - DLL LibSSH2|x64.Build.0 = LIB Debug - DLL OpenSSL - DLL LibSSH2|x64 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - DLL OpenSSL - DLL libssh2|Win32.ActiveCfg = LIB Debug - DLL OpenSSL - DLL libssh2|Win32 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - DLL OpenSSL - DLL libssh2|Win32.Build.0 = LIB Debug - DLL OpenSSL - DLL libssh2|Win32 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - DLL OpenSSL - DLL libssh2|x64.ActiveCfg = LIB Debug - DLL OpenSSL - DLL libssh2|x64 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - DLL OpenSSL - DLL libssh2|x64.Build.0 = LIB Debug - DLL OpenSSL - DLL libssh2|x64 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - DLL OpenSSL|Win32.ActiveCfg = LIB Debug - DLL OpenSSL|Win32 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - DLL OpenSSL|Win32.Build.0 = LIB Debug - DLL OpenSSL|Win32 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - DLL OpenSSL|x64.ActiveCfg = LIB Debug - DLL OpenSSL|x64 @@ -126,10 +126,10 @@ Global {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - DLL Windows SSPI|Win32.Build.0 = LIB Debug - DLL Windows SSPI|Win32 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - DLL Windows SSPI|x64.ActiveCfg = LIB Debug - DLL Windows SSPI|x64 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - DLL Windows SSPI|x64.Build.0 = LIB Debug - DLL Windows SSPI|x64 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - LIB OpenSSL - LIB LibSSH2|Win32.ActiveCfg = LIB Debug - LIB OpenSSL - LIB LibSSH2|Win32 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - LIB OpenSSL - LIB LibSSH2|Win32.Build.0 = LIB Debug - LIB OpenSSL - LIB LibSSH2|Win32 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - LIB OpenSSL - LIB LibSSH2|x64.ActiveCfg = LIB Debug - LIB OpenSSL - LIB LibSSH2|x64 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - LIB OpenSSL - LIB LibSSH2|x64.Build.0 = LIB Debug - LIB OpenSSL - LIB LibSSH2|x64 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - LIB OpenSSL - LIB libssh2|Win32.ActiveCfg = LIB Debug - LIB OpenSSL - LIB libssh2|Win32 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - LIB OpenSSL - LIB libssh2|Win32.Build.0 = LIB Debug - LIB OpenSSL - LIB libssh2|Win32 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - LIB OpenSSL - LIB libssh2|x64.ActiveCfg = LIB Debug - LIB OpenSSL - LIB libssh2|x64 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - LIB OpenSSL - LIB libssh2|x64.Build.0 = LIB Debug - LIB OpenSSL - LIB libssh2|x64 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - LIB OpenSSL|Win32.ActiveCfg = LIB Debug - LIB OpenSSL|Win32 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - LIB OpenSSL|Win32.Build.0 = LIB Debug - LIB OpenSSL|Win32 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - LIB OpenSSL|x64.ActiveCfg = LIB Debug - LIB OpenSSL|x64 @@ -142,10 +142,10 @@ Global {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug|Win32.Build.0 = LIB Debug|Win32 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug|x64.ActiveCfg = LIB Debug|x64 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug|x64.Build.0 = LIB Debug|x64 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - DLL OpenSSL - DLL LibSSH2|Win32.ActiveCfg = LIB Release - DLL OpenSSL - DLL LibSSH2|Win32 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - DLL OpenSSL - DLL LibSSH2|Win32.Build.0 = LIB Release - DLL OpenSSL - DLL LibSSH2|Win32 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - DLL OpenSSL - DLL LibSSH2|x64.ActiveCfg = LIB Release - DLL OpenSSL - DLL LibSSH2|x64 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - DLL OpenSSL - DLL LibSSH2|x64.Build.0 = LIB Release - DLL OpenSSL - DLL LibSSH2|x64 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - DLL OpenSSL - DLL libssh2|Win32.ActiveCfg = LIB Release - DLL OpenSSL - DLL libssh2|Win32 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - DLL OpenSSL - DLL libssh2|Win32.Build.0 = LIB Release - DLL OpenSSL - DLL libssh2|Win32 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - DLL OpenSSL - DLL libssh2|x64.ActiveCfg = LIB Release - DLL OpenSSL - DLL libssh2|x64 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - DLL OpenSSL - DLL libssh2|x64.Build.0 = LIB Release - DLL OpenSSL - DLL libssh2|x64 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - DLL OpenSSL|Win32.ActiveCfg = LIB Release - DLL OpenSSL|Win32 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - DLL OpenSSL|Win32.Build.0 = LIB Release - DLL OpenSSL|Win32 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - DLL OpenSSL|x64.ActiveCfg = LIB Release - DLL OpenSSL|x64 @@ -158,10 +158,10 @@ Global {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - DLL Windows SSPI|Win32.Build.0 = LIB Release - DLL Windows SSPI|Win32 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - DLL Windows SSPI|x64.ActiveCfg = LIB Release - DLL Windows SSPI|x64 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - DLL Windows SSPI|x64.Build.0 = LIB Release - DLL Windows SSPI|x64 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - LIB OpenSSL - LIB LibSSH2|Win32.ActiveCfg = LIB Release - LIB OpenSSL - LIB LibSSH2|Win32 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - LIB OpenSSL - LIB LibSSH2|Win32.Build.0 = LIB Release - LIB OpenSSL - LIB LibSSH2|Win32 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - LIB OpenSSL - LIB LibSSH2|x64.ActiveCfg = LIB Release - LIB OpenSSL - LIB LibSSH2|x64 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - LIB OpenSSL - LIB LibSSH2|x64.Build.0 = LIB Release - LIB OpenSSL - LIB LibSSH2|x64 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - LIB OpenSSL - LIB libssh2|Win32.ActiveCfg = LIB Release - LIB OpenSSL - LIB libssh2|Win32 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - LIB OpenSSL - LIB libssh2|Win32.Build.0 = LIB Release - LIB OpenSSL - LIB libssh2|Win32 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - LIB OpenSSL - LIB libssh2|x64.ActiveCfg = LIB Release - LIB OpenSSL - LIB libssh2|x64 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - LIB OpenSSL - LIB libssh2|x64.Build.0 = LIB Release - LIB OpenSSL - LIB libssh2|x64 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - LIB OpenSSL|Win32.ActiveCfg = LIB Release - LIB OpenSSL|Win32 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - LIB OpenSSL|Win32.Build.0 = LIB Release - LIB OpenSSL|Win32 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - LIB OpenSSL|x64.ActiveCfg = LIB Release - LIB OpenSSL|x64 diff --git a/projects/Windows/VC11/lib/libcurl.tmpl b/projects/Windows/VC11/lib/libcurl.tmpl index 11b0ac487b..477310f87f 100644 --- a/projects/Windows/VC11/lib/libcurl.tmpl +++ b/projects/Windows/VC11/lib/libcurl.tmpl @@ -9,12 +9,12 @@ DLL Debug - DLL wolfSSL x64 - - DLL Debug - DLL OpenSSL - DLL LibSSH2 + + DLL Debug - DLL OpenSSL - DLL libssh2 Win32 - - DLL Debug - DLL OpenSSL - DLL LibSSH2 + + DLL Debug - DLL OpenSSL - DLL libssh2 x64 @@ -57,12 +57,12 @@ DLL Release - DLL wolfSSL x64 - - DLL Release - DLL OpenSSL - DLL LibSSH2 + + DLL Release - DLL OpenSSL - DLL libssh2 Win32 - - DLL Release - DLL OpenSSL - DLL LibSSH2 + + DLL Release - DLL OpenSSL - DLL libssh2 x64 @@ -97,12 +97,12 @@ DLL Release x64 - - LIB Debug - DLL OpenSSL - DLL LibSSH2 + + LIB Debug - DLL OpenSSL - DLL libssh2 Win32 - - LIB Debug - DLL OpenSSL - DLL LibSSH2 + + LIB Debug - DLL OpenSSL - DLL libssh2 x64 @@ -137,12 +137,12 @@ LIB Debug - LIB wolfSSL x64 - - LIB Debug - LIB OpenSSL - LIB LibSSH2 + + LIB Debug - LIB OpenSSL - LIB libssh2 Win32 - - LIB Debug - LIB OpenSSL - LIB LibSSH2 + + LIB Debug - LIB OpenSSL - LIB libssh2 x64 @@ -161,12 +161,12 @@ LIB Debug x64 - - LIB Release - DLL OpenSSL - DLL LibSSH2 + + LIB Release - DLL OpenSSL - DLL libssh2 Win32 - - LIB Release - DLL OpenSSL - DLL LibSSH2 + + LIB Release - DLL OpenSSL - DLL libssh2 x64 @@ -201,12 +201,12 @@ LIB Release - LIB wolfSSL x64 - - LIB Release - LIB OpenSSL - LIB LibSSH2 + + LIB Release - LIB OpenSSL - LIB libssh2 Win32 - - LIB Release - LIB OpenSSL - LIB LibSSH2 + + LIB Release - LIB OpenSSL - LIB libssh2 x64 @@ -231,7 +231,7 @@ libcurl - + StaticLibrary false Unicode @@ -255,7 +255,7 @@ Unicode v110 - + StaticLibrary false Unicode @@ -267,7 +267,7 @@ Unicode v110 - + StaticLibrary false Unicode @@ -291,7 +291,7 @@ Unicode v110 - + StaticLibrary false Unicode @@ -303,13 +303,13 @@ Unicode v110 - + DynamicLibrary false Unicode v110 - + DynamicLibrary false Unicode @@ -399,7 +399,7 @@ Unicode v110 - + StaticLibrary false Unicode @@ -423,7 +423,7 @@ Unicode v110 - + StaticLibrary false Unicode @@ -435,7 +435,7 @@ Unicode v110 - + StaticLibrary false Unicode @@ -459,7 +459,7 @@ Unicode v110 - + StaticLibrary false Unicode @@ -471,13 +471,13 @@ Unicode v110 - + DynamicLibrary false Unicode v110 - + DynamicLibrary false Unicode @@ -570,7 +570,7 @@ - + @@ -582,13 +582,13 @@ - + - + @@ -600,16 +600,16 @@ - + - + - + @@ -654,7 +654,7 @@ - + @@ -666,13 +666,13 @@ - + - + @@ -684,16 +684,16 @@ - + - + - + @@ -817,26 +817,26 @@ $(OutDir)lib\ false false - ..\..\..\..\build\Win32\VC11\$(Configuration)\ - $(OutDir)lib\ - false - ..\..\..\..\build\Win64\VC11\$(Configuration)\ - $(OutDir)lib\ - false - ..\..\..\..\build\Win32\VC11\$(Configuration)\ - $(OutDir)lib\ - false - ..\..\..\..\build\Win64\VC11\$(Configuration)\ - $(OutDir)lib\ - false + ..\..\..\..\build\Win32\VC11\$(Configuration)\ + $(OutDir)lib\ + false + ..\..\..\..\build\Win64\VC11\$(Configuration)\ + $(OutDir)lib\ + false + ..\..\..\..\build\Win32\VC11\$(Configuration)\ + $(OutDir)lib\ + false + ..\..\..\..\build\Win64\VC11\$(Configuration)\ + $(OutDir)lib\ + false ..\..\..\..\build\Win32\VC11\$(Configuration)\ $(OutDir)lib\ ..\..\..\..\build\Win64\VC11\$(Configuration)\ $(OutDir)lib\ - ..\..\..\..\build\Win32\VC11\$(Configuration)\ - $(OutDir)lib\ - ..\..\..\..\build\Win64\VC11\$(Configuration)\ - $(OutDir)lib\ + ..\..\..\..\build\Win32\VC11\$(Configuration)\ + $(OutDir)lib\ + ..\..\..\..\build\Win64\VC11\$(Configuration)\ + $(OutDir)lib\ ..\..\..\..\build\Win32\VC11\$(Configuration)\ ..\..\..\..\build\Win32\VC11\$(Configuration)\ $(OutDir)lib\ @@ -849,18 +849,18 @@ $(OutDir)lib\ ..\..\..\..\build\Win64\VC11\$(Configuration)\ $(OutDir)lib\ - ..\..\..\..\build\Win32\VC11\$(Configuration)\ - $(OutDir)lib\ - ..\..\..\..\build\Win64\VC11\$(Configuration)\ - $(OutDir)lib\ + ..\..\..\..\build\Win32\VC11\$(Configuration)\ + $(OutDir)lib\ + ..\..\..\..\build\Win64\VC11\$(Configuration)\ + $(OutDir)lib\ ..\..\..\..\build\Win32\VC11\$(Configuration)\ $(OutDir)lib\ ..\..\..\..\build\Win64\VC11\$(Configuration)\ $(OutDir)lib\ - ..\..\..\..\build\Win32\VC11\$(Configuration)\ - $(OutDir)lib\ - ..\..\..\..\build\Win64\VC11\$(Configuration)\ - $(OutDir)lib\ + ..\..\..\..\build\Win32\VC11\$(Configuration)\ + $(OutDir)lib\ + ..\..\..\..\build\Win64\VC11\$(Configuration)\ + $(OutDir)lib\ ..\..\..\..\build\Win32\VC11\$(Configuration)\ ..\..\..\..\build\Win32\VC11\$(Configuration)\ $(OutDir)lib\ @@ -873,18 +873,18 @@ $(OutDir)lib\ ..\..\..\..\build\Win64\VC11\$(Configuration)\ $(OutDir)lib\ - ..\..\..\..\build\Win32\VC11\$(Configuration)\ - $(OutDir)lib\ - ..\..\..\..\build\Win64\VC11\$(Configuration)\ - $(OutDir)lib\ + ..\..\..\..\build\Win32\VC11\$(Configuration)\ + $(OutDir)lib\ + ..\..\..\..\build\Win64\VC11\$(Configuration)\ + $(OutDir)lib\ $(ProjectName)d $(ProjectName)d $(ProjectName)d $(ProjectName)d $(ProjectName)d $(ProjectName)d - $(ProjectName)d - $(ProjectName)d + $(ProjectName)d + $(ProjectName)d $(ProjectName)d $(ProjectName)d $(ProjectName)d @@ -895,16 +895,16 @@ $(ProjectName)d $(ProjectName)d $(ProjectName)d - $(ProjectName)d - $(ProjectName)d + $(ProjectName)d + $(ProjectName)d $(ProjectName)d $(ProjectName)d $(ProjectName)d $(ProjectName)d $(ProjectName)d $(ProjectName)d - $(ProjectName)d - $(ProjectName)d + $(ProjectName)d + $(ProjectName)d @@ -1740,7 +1740,7 @@ MachineX64 - + _DEBUG;%(PreprocessorDefinitions) true @@ -1774,7 +1774,7 @@ MachineX86 - + _DEBUG;%(PreprocessorDefinitions) true @@ -1807,7 +1807,7 @@ MachineX64 - + NDEBUG;%(PreprocessorDefinitions) true @@ -1839,7 +1839,7 @@ MachineX86 - + NDEBUG;%(PreprocessorDefinitions) true @@ -1913,7 +1913,7 @@ MachineX64 - + Disabled ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\..\openssl\include\..\build\Win32\VC11\DLL Debug\include;..\..\..\..\..\openssl\include;..\..\..\..\..\libssh2\include;%(AdditionalIncludeDirectories) @@ -1933,7 +1933,7 @@ MachineX86 - + X64 @@ -2085,7 +2085,7 @@ MachineX64 - + Disabled ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\..\openssl\include\..\build\Win32\VC11\LIB Debug\include;..\..\..\..\..\openssl\include;..\..\..\..\..\libssh2\include;%(AdditionalIncludeDirectories) @@ -2105,7 +2105,7 @@ MachineX86 - + X64 @@ -2171,7 +2171,7 @@ MachineX64 - + MaxSpeed OnlyExplicitInline @@ -2191,7 +2191,7 @@ MachineX86 - + X64 @@ -2343,7 +2343,7 @@ MachineX64 - + MaxSpeed OnlyExplicitInline @@ -2363,7 +2363,7 @@ MachineX86 - + X64 diff --git a/projects/Windows/VC11/src/curl.sln b/projects/Windows/VC11/src/curl.sln index e12253e9b5..7996f2da22 100644 --- a/projects/Windows/VC11/src/curl.sln +++ b/projects/Windows/VC11/src/curl.sln @@ -4,8 +4,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "curl", "curl.vcxproj", "{52 EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - DLL Debug - DLL OpenSSL - DLL LibSSH2|Win32 = DLL Debug - DLL OpenSSL - DLL LibSSH2|Win32 - DLL Debug - DLL OpenSSL - DLL LibSSH2|x64 = DLL Debug - DLL OpenSSL - DLL LibSSH2|x64 + DLL Debug - DLL OpenSSL - DLL libssh2|Win32 = DLL Debug - DLL OpenSSL - DLL libssh2|Win32 + DLL Debug - DLL OpenSSL - DLL libssh2|x64 = DLL Debug - DLL OpenSSL - DLL libssh2|x64 DLL Debug - DLL OpenSSL|Win32 = DLL Debug - DLL OpenSSL|Win32 DLL Debug - DLL OpenSSL|x64 = DLL Debug - DLL OpenSSL|x64 DLL Debug - DLL Windows SSPI - DLL WinIDN|Win32 = DLL Debug - DLL Windows SSPI - DLL WinIDN|Win32 @@ -16,8 +16,8 @@ Global DLL Debug - DLL wolfSSL|x64 = DLL Debug - DLL wolfSSL|x64 DLL Debug|Win32 = DLL Debug|Win32 DLL Debug|x64 = DLL Debug|x64 - DLL Release - DLL OpenSSL - DLL LibSSH2|Win32 = DLL Release - DLL OpenSSL - DLL LibSSH2|Win32 - DLL Release - DLL OpenSSL - DLL LibSSH2|x64 = DLL Release - DLL OpenSSL - DLL LibSSH2|x64 + DLL Release - DLL OpenSSL - DLL libssh2|Win32 = DLL Release - DLL OpenSSL - DLL libssh2|Win32 + DLL Release - DLL OpenSSL - DLL libssh2|x64 = DLL Release - DLL OpenSSL - DLL libssh2|x64 DLL Release - DLL OpenSSL|Win32 = DLL Release - DLL OpenSSL|Win32 DLL Release - DLL OpenSSL|x64 = DLL Release - DLL OpenSSL|x64 DLL Release - DLL Windows SSPI - DLL WinIDN|Win32 = DLL Release - DLL Windows SSPI - DLL WinIDN|Win32 @@ -28,32 +28,32 @@ Global DLL Release - DLL wolfSSL|x64 = DLL Release - DLL wolfSSL|x64 DLL Release|Win32 = DLL Release|Win32 DLL Release|x64 = DLL Release|x64 - LIB Debug - DLL OpenSSL - DLL LibSSH2|Win32 = LIB Debug - DLL OpenSSL - DLL LibSSH2|Win32 - LIB Debug - DLL OpenSSL - DLL LibSSH2|x64 = LIB Debug - DLL OpenSSL - DLL LibSSH2|x64 + LIB Debug - DLL OpenSSL - DLL libssh2|Win32 = LIB Debug - DLL OpenSSL - DLL libssh2|Win32 + LIB Debug - DLL OpenSSL - DLL libssh2|x64 = LIB Debug - DLL OpenSSL - DLL libssh2|x64 LIB Debug - DLL OpenSSL|Win32 = LIB Debug - DLL OpenSSL|Win32 LIB Debug - DLL OpenSSL|x64 = LIB Debug - DLL OpenSSL|x64 LIB Debug - DLL Windows SSPI - DLL WinIDN|Win32 = LIB Debug - DLL Windows SSPI - DLL WinIDN|Win32 LIB Debug - DLL Windows SSPI - DLL WinIDN|x64 = LIB Debug - DLL Windows SSPI - DLL WinIDN|x64 LIB Debug - DLL Windows SSPI|Win32 = LIB Debug - DLL Windows SSPI|Win32 LIB Debug - DLL Windows SSPI|x64 = LIB Debug - DLL Windows SSPI|x64 - LIB Debug - LIB OpenSSL - LIB LibSSH2|Win32 = LIB Debug - LIB OpenSSL - LIB LibSSH2|Win32 - LIB Debug - LIB OpenSSL - LIB LibSSH2|x64 = LIB Debug - LIB OpenSSL - LIB LibSSH2|x64 + LIB Debug - LIB OpenSSL - LIB libssh2|Win32 = LIB Debug - LIB OpenSSL - LIB libssh2|Win32 + LIB Debug - LIB OpenSSL - LIB libssh2|x64 = LIB Debug - LIB OpenSSL - LIB libssh2|x64 LIB Debug - LIB OpenSSL|Win32 = LIB Debug - LIB OpenSSL|Win32 LIB Debug - LIB OpenSSL|x64 = LIB Debug - LIB OpenSSL|x64 LIB Debug - LIB wolfSSL|Win32 = LIB Debug - LIB wolfSSL|Win32 LIB Debug - LIB wolfSSL|x64 = LIB Debug - LIB wolfSSL|x64 LIB Debug|Win32 = LIB Debug|Win32 LIB Debug|x64 = LIB Debug|x64 - LIB Release - DLL OpenSSL - DLL LibSSH2|Win32 = LIB Release - DLL OpenSSL - DLL LibSSH2|Win32 - LIB Release - DLL OpenSSL - DLL LibSSH2|x64 = LIB Release - DLL OpenSSL - DLL LibSSH2|x64 + LIB Release - DLL OpenSSL - DLL libssh2|Win32 = LIB Release - DLL OpenSSL - DLL libssh2|Win32 + LIB Release - DLL OpenSSL - DLL libssh2|x64 = LIB Release - DLL OpenSSL - DLL libssh2|x64 LIB Release - DLL OpenSSL|Win32 = LIB Release - DLL OpenSSL|Win32 LIB Release - DLL OpenSSL|x64 = LIB Release - DLL OpenSSL|x64 LIB Release - DLL Windows SSPI - DLL WinIDN|Win32 = LIB Release - DLL Windows SSPI - DLL WinIDN|Win32 LIB Release - DLL Windows SSPI - DLL WinIDN|x64 = LIB Release - DLL Windows SSPI - DLL WinIDN|x64 LIB Release - DLL Windows SSPI|Win32 = LIB Release - DLL Windows SSPI|Win32 LIB Release - DLL Windows SSPI|x64 = LIB Release - DLL Windows SSPI|x64 - LIB Release - LIB OpenSSL - LIB LibSSH2|Win32 = LIB Release - LIB OpenSSL - LIB LibSSH2|Win32 - LIB Release - LIB OpenSSL - LIB LibSSH2|x64 = LIB Release - LIB OpenSSL - LIB LibSSH2|x64 + LIB Release - LIB OpenSSL - LIB libssh2|Win32 = LIB Release - LIB OpenSSL - LIB libssh2|Win32 + LIB Release - LIB OpenSSL - LIB libssh2|x64 = LIB Release - LIB OpenSSL - LIB libssh2|x64 LIB Release - LIB OpenSSL|Win32 = LIB Release - LIB OpenSSL|Win32 LIB Release - LIB OpenSSL|x64 = LIB Release - LIB OpenSSL|x64 LIB Release - LIB wolfSSL|Win32 = LIB Release - LIB wolfSSL|Win32 @@ -62,10 +62,10 @@ Global LIB Release|x64 = LIB Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Debug - DLL OpenSSL - DLL LibSSH2|Win32.ActiveCfg = DLL Debug - DLL OpenSSL - DLL LibSSH2|Win32 - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Debug - DLL OpenSSL - DLL LibSSH2|Win32.Build.0 = DLL Debug - DLL OpenSSL - DLL LibSSH2|Win32 - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Debug - DLL OpenSSL - DLL LibSSH2|x64.ActiveCfg = DLL Debug - DLL OpenSSL - DLL LibSSH2|x64 - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Debug - DLL OpenSSL - DLL LibSSH2|x64.Build.0 = DLL Debug - DLL OpenSSL - DLL LibSSH2|x64 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Debug - DLL OpenSSL - DLL libssh2|Win32.ActiveCfg = DLL Debug - DLL OpenSSL - DLL libssh2|Win32 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Debug - DLL OpenSSL - DLL libssh2|Win32.Build.0 = DLL Debug - DLL OpenSSL - DLL libssh2|Win32 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Debug - DLL OpenSSL - DLL libssh2|x64.ActiveCfg = DLL Debug - DLL OpenSSL - DLL libssh2|x64 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Debug - DLL OpenSSL - DLL libssh2|x64.Build.0 = DLL Debug - DLL OpenSSL - DLL libssh2|x64 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Debug - DLL OpenSSL|Win32.ActiveCfg = DLL Debug - DLL OpenSSL|Win32 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Debug - DLL OpenSSL|Win32.Build.0 = DLL Debug - DLL OpenSSL|Win32 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Debug - DLL OpenSSL|x64.ActiveCfg = DLL Debug - DLL OpenSSL|x64 @@ -86,10 +86,10 @@ Global {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Release - DLL OpenSSL - DLL LibSSH2|Win32.ActiveCfg = DLL Release - DLL OpenSSL - DLL LibSSH2|Win32 - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Release - DLL OpenSSL - DLL LibSSH2|Win32.Build.0 = DLL Release - DLL OpenSSL - DLL LibSSH2|Win32 - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Release - DLL OpenSSL - DLL LibSSH2|x64.ActiveCfg = DLL Release - DLL OpenSSL - DLL LibSSH2|x64 - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Release - DLL OpenSSL - DLL LibSSH2|x64.Build.0 = DLL Release - DLL OpenSSL - DLL LibSSH2|x64 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Release - DLL OpenSSL - DLL libssh2|Win32.ActiveCfg = DLL Release - DLL OpenSSL - DLL libssh2|Win32 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Release - DLL OpenSSL - DLL libssh2|Win32.Build.0 = DLL Release - DLL OpenSSL - DLL libssh2|Win32 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Release - DLL OpenSSL - DLL libssh2|x64.ActiveCfg = DLL Release - DLL OpenSSL - DLL libssh2|x64 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Release - DLL OpenSSL - DLL libssh2|x64.Build.0 = DLL Release - DLL OpenSSL - DLL libssh2|x64 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Release - DLL OpenSSL|Win32.ActiveCfg = DLL Release - DLL OpenSSL|Win32 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Release - DLL OpenSSL|Win32.Build.0 = DLL Release - DLL OpenSSL|Win32 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Release - DLL OpenSSL|x64.ActiveCfg = DLL Release - DLL OpenSSL|x64 @@ -110,10 +110,10 @@ Global {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Release|Win32.Build.0 = DLL Release|Win32 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Release|x64.ActiveCfg = DLL Release|x64 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Release|x64.Build.0 = DLL Release|x64 - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - DLL OpenSSL - DLL LibSSH2|Win32.ActiveCfg = LIB Debug - DLL OpenSSL - DLL LibSSH2|Win32 - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - DLL OpenSSL - DLL LibSSH2|Win32.Build.0 = LIB Debug - DLL OpenSSL - DLL LibSSH2|Win32 - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - DLL OpenSSL - DLL LibSSH2|x64.ActiveCfg = LIB Debug - DLL OpenSSL - DLL LibSSH2|x64 - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - DLL OpenSSL - DLL LibSSH2|x64.Build.0 = LIB Debug - DLL OpenSSL - DLL LibSSH2|x64 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - DLL OpenSSL - DLL libssh2|Win32.ActiveCfg = LIB Debug - DLL OpenSSL - DLL libssh2|Win32 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - DLL OpenSSL - DLL libssh2|Win32.Build.0 = LIB Debug - DLL OpenSSL - DLL libssh2|Win32 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - DLL OpenSSL - DLL libssh2|x64.ActiveCfg = LIB Debug - DLL OpenSSL - DLL libssh2|x64 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - DLL OpenSSL - DLL libssh2|x64.Build.0 = LIB Debug - DLL OpenSSL - DLL libssh2|x64 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - DLL OpenSSL|Win32.ActiveCfg = LIB Debug - DLL OpenSSL|Win32 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - DLL OpenSSL|Win32.Build.0 = LIB Debug - DLL OpenSSL|Win32 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - DLL OpenSSL|x64.ActiveCfg = LIB Debug - DLL OpenSSL|x64 @@ -126,10 +126,10 @@ Global {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - DLL Windows SSPI|Win32.Build.0 = LIB Debug - DLL Windows SSPI|Win32 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - DLL Windows SSPI|x64.ActiveCfg = LIB Debug - DLL Windows SSPI|x64 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - DLL Windows SSPI|x64.Build.0 = LIB Debug - DLL Windows SSPI|x64 - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - LIB OpenSSL - LIB LibSSH2|Win32.ActiveCfg = LIB Debug - LIB OpenSSL - LIB LibSSH2|Win32 - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - LIB OpenSSL - LIB LibSSH2|Win32.Build.0 = LIB Debug - LIB OpenSSL - LIB LibSSH2|Win32 - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - LIB OpenSSL - LIB LibSSH2|x64.ActiveCfg = LIB Debug - LIB OpenSSL - LIB LibSSH2|x64 - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - LIB OpenSSL - LIB LibSSH2|x64.Build.0 = LIB Debug - LIB OpenSSL - LIB LibSSH2|x64 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - LIB OpenSSL - LIB libssh2|Win32.ActiveCfg = LIB Debug - LIB OpenSSL - LIB libssh2|Win32 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - LIB OpenSSL - LIB libssh2|Win32.Build.0 = LIB Debug - LIB OpenSSL - LIB libssh2|Win32 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - LIB OpenSSL - LIB libssh2|x64.ActiveCfg = LIB Debug - LIB OpenSSL - LIB libssh2|x64 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - LIB OpenSSL - LIB libssh2|x64.Build.0 = LIB Debug - LIB OpenSSL - LIB libssh2|x64 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - LIB OpenSSL|Win32.ActiveCfg = LIB Debug - LIB OpenSSL|Win32 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - LIB OpenSSL|Win32.Build.0 = LIB Debug - LIB OpenSSL|Win32 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - LIB OpenSSL|x64.ActiveCfg = LIB Debug - LIB OpenSSL|x64 @@ -142,10 +142,10 @@ Global {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug|Win32.Build.0 = LIB Debug|Win32 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug|x64.ActiveCfg = LIB Debug|x64 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug|x64.Build.0 = LIB Debug|x64 - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - DLL OpenSSL - DLL LibSSH2|Win32.ActiveCfg = LIB Release - DLL OpenSSL - DLL LibSSH2|Win32 - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - DLL OpenSSL - DLL LibSSH2|Win32.Build.0 = LIB Release - DLL OpenSSL - DLL LibSSH2|Win32 - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - DLL OpenSSL - DLL LibSSH2|x64.ActiveCfg = LIB Release - DLL OpenSSL - DLL LibSSH2|x64 - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - DLL OpenSSL - DLL LibSSH2|x64.Build.0 = LIB Release - DLL OpenSSL - DLL LibSSH2|x64 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - DLL OpenSSL - DLL libssh2|Win32.ActiveCfg = LIB Release - DLL OpenSSL - DLL libssh2|Win32 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - DLL OpenSSL - DLL libssh2|Win32.Build.0 = LIB Release - DLL OpenSSL - DLL libssh2|Win32 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - DLL OpenSSL - DLL libssh2|x64.ActiveCfg = LIB Release - DLL OpenSSL - DLL libssh2|x64 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - DLL OpenSSL - DLL libssh2|x64.Build.0 = LIB Release - DLL OpenSSL - DLL libssh2|x64 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - DLL OpenSSL|Win32.ActiveCfg = LIB Release - DLL OpenSSL|Win32 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - DLL OpenSSL|Win32.Build.0 = LIB Release - DLL OpenSSL|Win32 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - DLL OpenSSL|x64.ActiveCfg = LIB Release - DLL OpenSSL|x64 @@ -158,10 +158,10 @@ Global {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - DLL Windows SSPI|Win32.Build.0 = LIB Release - DLL Windows SSPI|Win32 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - DLL Windows SSPI|x64.ActiveCfg = LIB Release - DLL Windows SSPI|x64 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - DLL Windows SSPI|x64.Build.0 = LIB Release - DLL Windows SSPI|x64 - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - LIB OpenSSL - LIB LibSSH2|Win32.ActiveCfg = LIB Release - LIB OpenSSL - LIB LibSSH2|Win32 - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - LIB OpenSSL - LIB LibSSH2|Win32.Build.0 = LIB Release - LIB OpenSSL - LIB LibSSH2|Win32 - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - LIB OpenSSL - LIB LibSSH2|x64.ActiveCfg = LIB Release - LIB OpenSSL - LIB LibSSH2|x64 - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - LIB OpenSSL - LIB LibSSH2|x64.Build.0 = LIB Release - LIB OpenSSL - LIB LibSSH2|x64 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - LIB OpenSSL - LIB libssh2|Win32.ActiveCfg = LIB Release - LIB OpenSSL - LIB libssh2|Win32 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - LIB OpenSSL - LIB libssh2|Win32.Build.0 = LIB Release - LIB OpenSSL - LIB libssh2|Win32 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - LIB OpenSSL - LIB libssh2|x64.ActiveCfg = LIB Release - LIB OpenSSL - LIB libssh2|x64 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - LIB OpenSSL - LIB libssh2|x64.Build.0 = LIB Release - LIB OpenSSL - LIB libssh2|x64 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - LIB OpenSSL|Win32.ActiveCfg = LIB Release - LIB OpenSSL|Win32 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - LIB OpenSSL|Win32.Build.0 = LIB Release - LIB OpenSSL|Win32 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - LIB OpenSSL|x64.ActiveCfg = LIB Release - LIB OpenSSL|x64 diff --git a/projects/Windows/VC11/src/curl.tmpl b/projects/Windows/VC11/src/curl.tmpl index b604a788c7..4405a4694a 100644 --- a/projects/Windows/VC11/src/curl.tmpl +++ b/projects/Windows/VC11/src/curl.tmpl @@ -9,12 +9,12 @@ DLL Debug - DLL wolfSSL x64 - - DLL Debug - DLL OpenSSL - DLL LibSSH2 + + DLL Debug - DLL OpenSSL - DLL libssh2 Win32 - - DLL Debug - DLL OpenSSL - DLL LibSSH2 + + DLL Debug - DLL OpenSSL - DLL libssh2 x64 @@ -57,12 +57,12 @@ DLL Release - DLL wolfSSL x64 - - DLL Release - DLL OpenSSL - DLL LibSSH2 + + DLL Release - DLL OpenSSL - DLL libssh2 Win32 - - DLL Release - DLL OpenSSL - DLL LibSSH2 + + DLL Release - DLL OpenSSL - DLL libssh2 x64 @@ -97,12 +97,12 @@ DLL Release x64 - - LIB Debug - DLL OpenSSL - DLL LibSSH2 + + LIB Debug - DLL OpenSSL - DLL libssh2 Win32 - - LIB Debug - DLL OpenSSL - DLL LibSSH2 + + LIB Debug - DLL OpenSSL - DLL libssh2 x64 @@ -137,12 +137,12 @@ LIB Debug - LIB wolfSSL x64 - - LIB Debug - LIB OpenSSL - LIB LibSSH2 + + LIB Debug - LIB OpenSSL - LIB libssh2 Win32 - - LIB Debug - LIB OpenSSL - LIB LibSSH2 + + LIB Debug - LIB OpenSSL - LIB libssh2 x64 @@ -161,12 +161,12 @@ LIB Debug x64 - - LIB Release - DLL OpenSSL - DLL LibSSH2 + + LIB Release - DLL OpenSSL - DLL libssh2 Win32 - - LIB Release - DLL OpenSSL - DLL LibSSH2 + + LIB Release - DLL OpenSSL - DLL libssh2 x64 @@ -201,12 +201,12 @@ LIB Release - LIB wolfSSL x64 - - LIB Release - LIB OpenSSL - LIB LibSSH2 + + LIB Release - LIB OpenSSL - LIB libssh2 Win32 - - LIB Release - LIB OpenSSL - LIB LibSSH2 + + LIB Release - LIB OpenSSL - LIB libssh2 x64 @@ -255,13 +255,13 @@ Unicode v110 - + Application false Unicode v110 - + Application false Unicode @@ -279,13 +279,13 @@ Unicode v110 - + Application false Unicode v110 - + Application false Unicode @@ -303,13 +303,13 @@ Unicode v110 - + Application false Unicode v110 - + Application false Unicode @@ -423,13 +423,13 @@ Unicode v110 - + Application false Unicode v110 - + Application false Unicode @@ -447,13 +447,13 @@ Unicode v110 - + Application false Unicode v110 - + Application false Unicode @@ -471,13 +471,13 @@ Unicode v110 - + Application false Unicode v110 - + Application false Unicode @@ -582,10 +582,10 @@ - + - + @@ -594,10 +594,10 @@ - + - + @@ -606,10 +606,10 @@ - + - + @@ -666,10 +666,10 @@ - + - + @@ -678,10 +678,10 @@ - + - + @@ -690,10 +690,10 @@ - + - + @@ -825,18 +825,18 @@ $(OutDir)src\ false false - ..\..\..\..\build\Win32\VC11\$(Configuration)\ - $(OutDir)src\ - false - ..\..\..\..\build\Win64\VC11\$(Configuration)\ - $(OutDir)src\ - false - ..\..\..\..\build\Win32\VC11\$(Configuration)\ - $(OutDir)src\ - false - ..\..\..\..\build\Win64\VC11\$(Configuration)\ - $(OutDir)src\ - false + ..\..\..\..\build\Win32\VC11\$(Configuration)\ + $(OutDir)src\ + false + ..\..\..\..\build\Win64\VC11\$(Configuration)\ + $(OutDir)src\ + false + ..\..\..\..\build\Win32\VC11\$(Configuration)\ + $(OutDir)src\ + false + ..\..\..\..\build\Win64\VC11\$(Configuration)\ + $(OutDir)src\ + false ..\..\..\..\build\Win32\VC11\$(Configuration)\ $(OutDir)src\ false @@ -849,18 +849,18 @@ ..\..\..\..\build\Win64\VC11\$(Configuration)\ $(OutDir)src\ false - ..\..\..\..\build\Win32\VC11\$(Configuration)\ - $(OutDir)src\ - false - ..\..\..\..\build\Win64\VC11\$(Configuration)\ - $(OutDir)src\ - false - ..\..\..\..\build\Win32\VC11\$(Configuration)\ - $(OutDir)src\ - false - ..\..\..\..\build\Win64\VC11\$(Configuration)\ - $(OutDir)src\ - false + ..\..\..\..\build\Win32\VC11\$(Configuration)\ + $(OutDir)src\ + false + ..\..\..\..\build\Win64\VC11\$(Configuration)\ + $(OutDir)src\ + false + ..\..\..\..\build\Win32\VC11\$(Configuration)\ + $(OutDir)src\ + false + ..\..\..\..\build\Win64\VC11\$(Configuration)\ + $(OutDir)src\ + false ..\..\..\..\build\Win32\VC11\$(Configuration)\ $(OutDir)src\ false @@ -873,18 +873,18 @@ ..\..\..\..\build\Win64\VC11\$(Configuration)\ $(OutDir)src\ false - ..\..\..\..\build\Win32\VC11\$(Configuration)\ - $(OutDir)src\ - false - ..\..\..\..\build\Win64\VC11\$(Configuration)\ - $(OutDir)src\ - false - ..\..\..\..\build\Win32\VC11\$(Configuration)\ - $(OutDir)src\ - false - ..\..\..\..\build\Win64\VC11\$(Configuration)\ - $(OutDir)src\ - false + ..\..\..\..\build\Win32\VC11\$(Configuration)\ + $(OutDir)src\ + false + ..\..\..\..\build\Win64\VC11\$(Configuration)\ + $(OutDir)src\ + false + ..\..\..\..\build\Win32\VC11\$(Configuration)\ + $(OutDir)src\ + false + ..\..\..\..\build\Win64\VC11\$(Configuration)\ + $(OutDir)src\ + false ..\..\..\..\build\Win32\VC11\$(Configuration)\ ..\..\..\..\build\Win32\VC11\$(Configuration)\ $(OutDir)src\ @@ -915,8 +915,8 @@ $(ProjectName)d $(ProjectName)d $(ProjectName)d - $(ProjectName)d - $(ProjectName)d + $(ProjectName)d + $(ProjectName)d $(ProjectName)d $(ProjectName)d $(ProjectName)d @@ -927,41 +927,41 @@ $(ProjectName)d $(ProjectName)d $(ProjectName)d - $(ProjectName)d - $(ProjectName)d + $(ProjectName)d + $(ProjectName)d $(ProjectName)d $(ProjectName)d $(ProjectName)d $(ProjectName)d $(ProjectName)d $(ProjectName)d - $(ProjectName)d - $(ProjectName)d - $(ProjectName) + $(ProjectName)d + $(ProjectName)d + $(ProjectName) $(ProjectName) $(ProjectName) $(ProjectName) $(ProjectName) $(ProjectName) - $(ProjectName) + $(ProjectName) $(ProjectName) $(ProjectName) $(ProjectName) - $(ProjectName) + $(ProjectName) $(ProjectName) $(ProjectName) $(ProjectName) - $(ProjectName) + $(ProjectName) $(ProjectName) $(ProjectName) $(ProjectName) $(ProjectName) $(ProjectName) - $(ProjectName) + $(ProjectName) $(ProjectName) $(ProjectName) $(ProjectName) - $(ProjectName) + $(ProjectName) $(ProjectName) $(ProjectName) $(ProjectName) @@ -1828,7 +1828,7 @@ MachineX64 - + $(TargetDir)$(TargetName).tlb @@ -1859,7 +1859,7 @@ MachineX86 - + X64 $(TargetDir)$(TargetName).tlb @@ -1891,7 +1891,7 @@ MachineX64 - + $(TargetDir)$(TargetName).tlb @@ -1920,7 +1920,7 @@ MachineX86 - + X64 $(TargetDir)$(TargetName).tlb @@ -2072,7 +2072,7 @@ MachineX64 - + $(TargetDir)$(TargetName).tlb @@ -2103,7 +2103,7 @@ MachineX86 - + X64 $(TargetDir)$(TargetName).tlb @@ -2135,7 +2135,7 @@ MachineX64 - + $(TargetDir)$(TargetName).tlb @@ -2164,7 +2164,7 @@ MachineX86 - + X64 $(TargetDir)$(TargetName).tlb @@ -2316,7 +2316,7 @@ MachineX64 - + $(TargetDir)$(TargetName).tlb @@ -2347,7 +2347,7 @@ MachineX86 - + X64 $(TargetDir)$(TargetName).tlb @@ -2379,7 +2379,7 @@ MachineX64 - + $(TargetDir)$(TargetName).tlb @@ -2408,7 +2408,7 @@ MachineX86 - + X64 $(TargetDir)$(TargetName).tlb diff --git a/projects/Windows/VC12/lib/libcurl.sln b/projects/Windows/VC12/lib/libcurl.sln index 860a06028e..0487ef8206 100644 --- a/projects/Windows/VC12/lib/libcurl.sln +++ b/projects/Windows/VC12/lib/libcurl.sln @@ -4,8 +4,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcurl", "libcurl.vcxproj" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - DLL Debug - DLL OpenSSL - DLL LibSSH2|Win32 = DLL Debug - DLL OpenSSL - DLL LibSSH2|Win32 - DLL Debug - DLL OpenSSL - DLL LibSSH2|x64 = DLL Debug - DLL OpenSSL - DLL LibSSH2|x64 + DLL Debug - DLL OpenSSL - DLL libssh2|Win32 = DLL Debug - DLL OpenSSL - DLL libssh2|Win32 + DLL Debug - DLL OpenSSL - DLL libssh2|x64 = DLL Debug - DLL OpenSSL - DLL libssh2|x64 DLL Debug - DLL OpenSSL|Win32 = DLL Debug - DLL OpenSSL|Win32 DLL Debug - DLL OpenSSL|x64 = DLL Debug - DLL OpenSSL|x64 DLL Debug - DLL Windows SSPI - DLL WinIDN|Win32 = DLL Debug - DLL Windows SSPI - DLL WinIDN|Win32 @@ -16,8 +16,8 @@ Global DLL Debug - DLL wolfSSL|x64 = DLL Debug - DLL wolfSSL|x64 DLL Debug|Win32 = DLL Debug|Win32 DLL Debug|x64 = DLL Debug|x64 - DLL Release - DLL OpenSSL - DLL LibSSH2|Win32 = DLL Release - DLL OpenSSL - DLL LibSSH2|Win32 - DLL Release - DLL OpenSSL - DLL LibSSH2|x64 = DLL Release - DLL OpenSSL - DLL LibSSH2|x64 + DLL Release - DLL OpenSSL - DLL libssh2|Win32 = DLL Release - DLL OpenSSL - DLL libssh2|Win32 + DLL Release - DLL OpenSSL - DLL libssh2|x64 = DLL Release - DLL OpenSSL - DLL libssh2|x64 DLL Release - DLL OpenSSL|Win32 = DLL Release - DLL OpenSSL|Win32 DLL Release - DLL OpenSSL|x64 = DLL Release - DLL OpenSSL|x64 DLL Release - DLL Windows SSPI - DLL WinIDN|Win32 = DLL Release - DLL Windows SSPI - DLL WinIDN|Win32 @@ -28,32 +28,32 @@ Global DLL Release - DLL wolfSSL|x64 = DLL Release - DLL wolfSSL|x64 DLL Release|Win32 = DLL Release|Win32 DLL Release|x64 = DLL Release|x64 - LIB Debug - DLL OpenSSL - DLL LibSSH2|Win32 = LIB Debug - DLL OpenSSL - DLL LibSSH2|Win32 - LIB Debug - DLL OpenSSL - DLL LibSSH2|x64 = LIB Debug - DLL OpenSSL - DLL LibSSH2|x64 + LIB Debug - DLL OpenSSL - DLL libssh2|Win32 = LIB Debug - DLL OpenSSL - DLL libssh2|Win32 + LIB Debug - DLL OpenSSL - DLL libssh2|x64 = LIB Debug - DLL OpenSSL - DLL libssh2|x64 LIB Debug - DLL OpenSSL|Win32 = LIB Debug - DLL OpenSSL|Win32 LIB Debug - DLL OpenSSL|x64 = LIB Debug - DLL OpenSSL|x64 LIB Debug - DLL Windows SSPI - DLL WinIDN|Win32 = LIB Debug - DLL Windows SSPI - DLL WinIDN|Win32 LIB Debug - DLL Windows SSPI - DLL WinIDN|x64 = LIB Debug - DLL Windows SSPI - DLL WinIDN|x64 LIB Debug - DLL Windows SSPI|Win32 = LIB Debug - DLL Windows SSPI|Win32 LIB Debug - DLL Windows SSPI|x64 = LIB Debug - DLL Windows SSPI|x64 - LIB Debug - LIB OpenSSL - LIB LibSSH2|Win32 = LIB Debug - LIB OpenSSL - LIB LibSSH2|Win32 - LIB Debug - LIB OpenSSL - LIB LibSSH2|x64 = LIB Debug - LIB OpenSSL - LIB LibSSH2|x64 + LIB Debug - LIB OpenSSL - LIB libssh2|Win32 = LIB Debug - LIB OpenSSL - LIB libssh2|Win32 + LIB Debug - LIB OpenSSL - LIB libssh2|x64 = LIB Debug - LIB OpenSSL - LIB libssh2|x64 LIB Debug - LIB OpenSSL|Win32 = LIB Debug - LIB OpenSSL|Win32 LIB Debug - LIB OpenSSL|x64 = LIB Debug - LIB OpenSSL|x64 LIB Debug - LIB wolfSSL|Win32 = LIB Debug - LIB wolfSSL|Win32 LIB Debug - LIB wolfSSL|x64 = LIB Debug - LIB wolfSSL|x64 LIB Debug|Win32 = LIB Debug|Win32 LIB Debug|x64 = LIB Debug|x64 - LIB Release - DLL OpenSSL - DLL LibSSH2|Win32 = LIB Release - DLL OpenSSL - DLL LibSSH2|Win32 - LIB Release - DLL OpenSSL - DLL LibSSH2|x64 = LIB Release - DLL OpenSSL - DLL LibSSH2|x64 + LIB Release - DLL OpenSSL - DLL libssh2|Win32 = LIB Release - DLL OpenSSL - DLL libssh2|Win32 + LIB Release - DLL OpenSSL - DLL libssh2|x64 = LIB Release - DLL OpenSSL - DLL libssh2|x64 LIB Release - DLL OpenSSL|Win32 = LIB Release - DLL OpenSSL|Win32 LIB Release - DLL OpenSSL|x64 = LIB Release - DLL OpenSSL|x64 LIB Release - DLL Windows SSPI - DLL WinIDN|Win32 = LIB Release - DLL Windows SSPI - DLL WinIDN|Win32 LIB Release - DLL Windows SSPI - DLL WinIDN|x64 = LIB Release - DLL Windows SSPI - DLL WinIDN|x64 LIB Release - DLL Windows SSPI|Win32 = LIB Release - DLL Windows SSPI|Win32 LIB Release - DLL Windows SSPI|x64 = LIB Release - DLL Windows SSPI|x64 - LIB Release - LIB OpenSSL - LIB LibSSH2|Win32 = LIB Release - LIB OpenSSL - LIB LibSSH2|Win32 - LIB Release - LIB OpenSSL - LIB LibSSH2|x64 = LIB Release - LIB OpenSSL - LIB LibSSH2|x64 + LIB Release - LIB OpenSSL - LIB libssh2|Win32 = LIB Release - LIB OpenSSL - LIB libssh2|Win32 + LIB Release - LIB OpenSSL - LIB libssh2|x64 = LIB Release - LIB OpenSSL - LIB libssh2|x64 LIB Release - LIB OpenSSL|Win32 = LIB Release - LIB OpenSSL|Win32 LIB Release - LIB OpenSSL|x64 = LIB Release - LIB OpenSSL|x64 LIB Release - LIB wolfSSL|Win32 = LIB Release - LIB wolfSSL|Win32 @@ -62,10 +62,10 @@ Global LIB Release|x64 = LIB Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Debug - DLL OpenSSL - DLL LibSSH2|Win32.ActiveCfg = DLL Debug - DLL OpenSSL - DLL LibSSH2|Win32 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Debug - DLL OpenSSL - DLL LibSSH2|Win32.Build.0 = DLL Debug - DLL OpenSSL - DLL LibSSH2|Win32 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Debug - DLL OpenSSL - DLL LibSSH2|x64.ActiveCfg = DLL Debug - DLL OpenSSL - DLL LibSSH2|x64 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Debug - DLL OpenSSL - DLL LibSSH2|x64.Build.0 = DLL Debug - DLL OpenSSL - DLL LibSSH2|x64 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Debug - DLL OpenSSL - DLL libssh2|Win32.ActiveCfg = DLL Debug - DLL OpenSSL - DLL libssh2|Win32 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Debug - DLL OpenSSL - DLL libssh2|Win32.Build.0 = DLL Debug - DLL OpenSSL - DLL libssh2|Win32 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Debug - DLL OpenSSL - DLL libssh2|x64.ActiveCfg = DLL Debug - DLL OpenSSL - DLL libssh2|x64 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Debug - DLL OpenSSL - DLL libssh2|x64.Build.0 = DLL Debug - DLL OpenSSL - DLL libssh2|x64 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Debug - DLL OpenSSL|Win32.ActiveCfg = DLL Debug - DLL OpenSSL|Win32 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Debug - DLL OpenSSL|Win32.Build.0 = DLL Debug - DLL OpenSSL|Win32 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Debug - DLL OpenSSL|x64.ActiveCfg = DLL Debug - DLL OpenSSL|x64 @@ -86,10 +86,10 @@ Global {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Release - DLL OpenSSL - DLL LibSSH2|Win32.ActiveCfg = DLL Release - DLL OpenSSL - DLL LibSSH2|Win32 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Release - DLL OpenSSL - DLL LibSSH2|Win32.Build.0 = DLL Release - DLL OpenSSL - DLL LibSSH2|Win32 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Release - DLL OpenSSL - DLL LibSSH2|x64.ActiveCfg = DLL Release - DLL OpenSSL - DLL LibSSH2|x64 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Release - DLL OpenSSL - DLL LibSSH2|x64.Build.0 = DLL Release - DLL OpenSSL - DLL LibSSH2|x64 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Release - DLL OpenSSL - DLL libssh2|Win32.ActiveCfg = DLL Release - DLL OpenSSL - DLL libssh2|Win32 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Release - DLL OpenSSL - DLL libssh2|Win32.Build.0 = DLL Release - DLL OpenSSL - DLL libssh2|Win32 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Release - DLL OpenSSL - DLL libssh2|x64.ActiveCfg = DLL Release - DLL OpenSSL - DLL libssh2|x64 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Release - DLL OpenSSL - DLL libssh2|x64.Build.0 = DLL Release - DLL OpenSSL - DLL libssh2|x64 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Release - DLL OpenSSL|Win32.ActiveCfg = DLL Release - DLL OpenSSL|Win32 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Release - DLL OpenSSL|Win32.Build.0 = DLL Release - DLL OpenSSL|Win32 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Release - DLL OpenSSL|x64.ActiveCfg = DLL Release - DLL OpenSSL|x64 @@ -110,10 +110,10 @@ Global {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Release|Win32.Build.0 = DLL Release|Win32 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Release|x64.ActiveCfg = DLL Release|x64 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.DLL Release|x64.Build.0 = DLL Release|x64 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - DLL OpenSSL - DLL LibSSH2|Win32.ActiveCfg = LIB Debug - DLL OpenSSL - DLL LibSSH2|Win32 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - DLL OpenSSL - DLL LibSSH2|Win32.Build.0 = LIB Debug - DLL OpenSSL - DLL LibSSH2|Win32 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - DLL OpenSSL - DLL LibSSH2|x64.ActiveCfg = LIB Debug - DLL OpenSSL - DLL LibSSH2|x64 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - DLL OpenSSL - DLL LibSSH2|x64.Build.0 = LIB Debug - DLL OpenSSL - DLL LibSSH2|x64 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - DLL OpenSSL - DLL libssh2|Win32.ActiveCfg = LIB Debug - DLL OpenSSL - DLL libssh2|Win32 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - DLL OpenSSL - DLL libssh2|Win32.Build.0 = LIB Debug - DLL OpenSSL - DLL libssh2|Win32 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - DLL OpenSSL - DLL libssh2|x64.ActiveCfg = LIB Debug - DLL OpenSSL - DLL libssh2|x64 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - DLL OpenSSL - DLL libssh2|x64.Build.0 = LIB Debug - DLL OpenSSL - DLL libssh2|x64 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - DLL OpenSSL|Win32.ActiveCfg = LIB Debug - DLL OpenSSL|Win32 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - DLL OpenSSL|Win32.Build.0 = LIB Debug - DLL OpenSSL|Win32 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - DLL OpenSSL|x64.ActiveCfg = LIB Debug - DLL OpenSSL|x64 @@ -126,10 +126,10 @@ Global {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - DLL Windows SSPI|Win32.Build.0 = LIB Debug - DLL Windows SSPI|Win32 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - DLL Windows SSPI|x64.ActiveCfg = LIB Debug - DLL Windows SSPI|x64 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - DLL Windows SSPI|x64.Build.0 = LIB Debug - DLL Windows SSPI|x64 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - LIB OpenSSL - LIB LibSSH2|Win32.ActiveCfg = LIB Debug - LIB OpenSSL - LIB LibSSH2|Win32 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - LIB OpenSSL - LIB LibSSH2|Win32.Build.0 = LIB Debug - LIB OpenSSL - LIB LibSSH2|Win32 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - LIB OpenSSL - LIB LibSSH2|x64.ActiveCfg = LIB Debug - LIB OpenSSL - LIB LibSSH2|x64 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - LIB OpenSSL - LIB LibSSH2|x64.Build.0 = LIB Debug - LIB OpenSSL - LIB LibSSH2|x64 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - LIB OpenSSL - LIB libssh2|Win32.ActiveCfg = LIB Debug - LIB OpenSSL - LIB libssh2|Win32 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - LIB OpenSSL - LIB libssh2|Win32.Build.0 = LIB Debug - LIB OpenSSL - LIB libssh2|Win32 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - LIB OpenSSL - LIB libssh2|x64.ActiveCfg = LIB Debug - LIB OpenSSL - LIB libssh2|x64 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - LIB OpenSSL - LIB libssh2|x64.Build.0 = LIB Debug - LIB OpenSSL - LIB libssh2|x64 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - LIB OpenSSL|Win32.ActiveCfg = LIB Debug - LIB OpenSSL|Win32 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - LIB OpenSSL|Win32.Build.0 = LIB Debug - LIB OpenSSL|Win32 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug - LIB OpenSSL|x64.ActiveCfg = LIB Debug - LIB OpenSSL|x64 @@ -142,10 +142,10 @@ Global {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug|Win32.Build.0 = LIB Debug|Win32 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug|x64.ActiveCfg = LIB Debug|x64 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Debug|x64.Build.0 = LIB Debug|x64 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - DLL OpenSSL - DLL LibSSH2|Win32.ActiveCfg = LIB Release - DLL OpenSSL - DLL LibSSH2|Win32 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - DLL OpenSSL - DLL LibSSH2|Win32.Build.0 = LIB Release - DLL OpenSSL - DLL LibSSH2|Win32 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - DLL OpenSSL - DLL LibSSH2|x64.ActiveCfg = LIB Release - DLL OpenSSL - DLL LibSSH2|x64 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - DLL OpenSSL - DLL LibSSH2|x64.Build.0 = LIB Release - DLL OpenSSL - DLL LibSSH2|x64 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - DLL OpenSSL - DLL libssh2|Win32.ActiveCfg = LIB Release - DLL OpenSSL - DLL libssh2|Win32 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - DLL OpenSSL - DLL libssh2|Win32.Build.0 = LIB Release - DLL OpenSSL - DLL libssh2|Win32 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - DLL OpenSSL - DLL libssh2|x64.ActiveCfg = LIB Release - DLL OpenSSL - DLL libssh2|x64 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - DLL OpenSSL - DLL libssh2|x64.Build.0 = LIB Release - DLL OpenSSL - DLL libssh2|x64 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - DLL OpenSSL|Win32.ActiveCfg = LIB Release - DLL OpenSSL|Win32 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - DLL OpenSSL|Win32.Build.0 = LIB Release - DLL OpenSSL|Win32 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - DLL OpenSSL|x64.ActiveCfg = LIB Release - DLL OpenSSL|x64 @@ -158,10 +158,10 @@ Global {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - DLL Windows SSPI|Win32.Build.0 = LIB Release - DLL Windows SSPI|Win32 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - DLL Windows SSPI|x64.ActiveCfg = LIB Release - DLL Windows SSPI|x64 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - DLL Windows SSPI|x64.Build.0 = LIB Release - DLL Windows SSPI|x64 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - LIB OpenSSL - LIB LibSSH2|Win32.ActiveCfg = LIB Release - LIB OpenSSL - LIB LibSSH2|Win32 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - LIB OpenSSL - LIB LibSSH2|Win32.Build.0 = LIB Release - LIB OpenSSL - LIB LibSSH2|Win32 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - LIB OpenSSL - LIB LibSSH2|x64.ActiveCfg = LIB Release - LIB OpenSSL - LIB LibSSH2|x64 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - LIB OpenSSL - LIB LibSSH2|x64.Build.0 = LIB Release - LIB OpenSSL - LIB LibSSH2|x64 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - LIB OpenSSL - LIB libssh2|Win32.ActiveCfg = LIB Release - LIB OpenSSL - LIB libssh2|Win32 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - LIB OpenSSL - LIB libssh2|Win32.Build.0 = LIB Release - LIB OpenSSL - LIB libssh2|Win32 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - LIB OpenSSL - LIB libssh2|x64.ActiveCfg = LIB Release - LIB OpenSSL - LIB libssh2|x64 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - LIB OpenSSL - LIB libssh2|x64.Build.0 = LIB Release - LIB OpenSSL - LIB libssh2|x64 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - LIB OpenSSL|Win32.ActiveCfg = LIB Release - LIB OpenSSL|Win32 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - LIB OpenSSL|Win32.Build.0 = LIB Release - LIB OpenSSL|Win32 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.LIB Release - LIB OpenSSL|x64.ActiveCfg = LIB Release - LIB OpenSSL|x64 diff --git a/projects/Windows/VC12/lib/libcurl.tmpl b/projects/Windows/VC12/lib/libcurl.tmpl index fed693ee1c..2b1db48eed 100644 --- a/projects/Windows/VC12/lib/libcurl.tmpl +++ b/projects/Windows/VC12/lib/libcurl.tmpl @@ -9,12 +9,12 @@ DLL Debug - DLL wolfSSL x64 - - DLL Debug - DLL OpenSSL - DLL LibSSH2 + + DLL Debug - DLL OpenSSL - DLL libssh2 Win32 - - DLL Debug - DLL OpenSSL - DLL LibSSH2 + + DLL Debug - DLL OpenSSL - DLL libssh2 x64 @@ -57,12 +57,12 @@ DLL Release - DLL wolfSSL x64 - - DLL Release - DLL OpenSSL - DLL LibSSH2 + + DLL Release - DLL OpenSSL - DLL libssh2 Win32 - - DLL Release - DLL OpenSSL - DLL LibSSH2 + + DLL Release - DLL OpenSSL - DLL libssh2 x64 @@ -97,12 +97,12 @@ DLL Release x64 - - LIB Debug - DLL OpenSSL - DLL LibSSH2 + + LIB Debug - DLL OpenSSL - DLL libssh2 Win32 - - LIB Debug - DLL OpenSSL - DLL LibSSH2 + + LIB Debug - DLL OpenSSL - DLL libssh2 x64 @@ -137,12 +137,12 @@ LIB Debug - LIB wolfSSL x64 - - LIB Debug - LIB OpenSSL - LIB LibSSH2 + + LIB Debug - LIB OpenSSL - LIB libssh2 Win32 - - LIB Debug - LIB OpenSSL - LIB LibSSH2 + + LIB Debug - LIB OpenSSL - LIB libssh2 x64 @@ -161,12 +161,12 @@ LIB Debug x64 - - LIB Release - DLL OpenSSL - DLL LibSSH2 + + LIB Release - DLL OpenSSL - DLL libssh2 Win32 - - LIB Release - DLL OpenSSL - DLL LibSSH2 + + LIB Release - DLL OpenSSL - DLL libssh2 x64 @@ -201,12 +201,12 @@ LIB Release - LIB wolfSSL x64 - - LIB Release - LIB OpenSSL - LIB LibSSH2 + + LIB Release - LIB OpenSSL - LIB libssh2 Win32 - - LIB Release - LIB OpenSSL - LIB LibSSH2 + + LIB Release - LIB OpenSSL - LIB libssh2 x64 @@ -231,7 +231,7 @@ libcurl - + StaticLibrary false Unicode @@ -255,7 +255,7 @@ Unicode v120 - + StaticLibrary false Unicode @@ -267,7 +267,7 @@ Unicode v120 - + StaticLibrary false Unicode @@ -291,7 +291,7 @@ Unicode v120 - + StaticLibrary false Unicode @@ -303,13 +303,13 @@ Unicode v120 - + DynamicLibrary false Unicode v120 - + DynamicLibrary false Unicode @@ -399,7 +399,7 @@ Unicode v120 - + StaticLibrary false Unicode @@ -423,7 +423,7 @@ Unicode v120 - + StaticLibrary false Unicode @@ -435,7 +435,7 @@ Unicode v120 - + StaticLibrary false Unicode @@ -459,7 +459,7 @@ Unicode v120 - + StaticLibrary false Unicode @@ -471,13 +471,13 @@ Unicode v120 - + DynamicLibrary false Unicode v120 - + DynamicLibrary false Unicode @@ -570,7 +570,7 @@ - + @@ -582,13 +582,13 @@ - + - + @@ -600,16 +600,16 @@ - + - + - + @@ -654,7 +654,7 @@ - + @@ -666,13 +666,13 @@ - + - + @@ -684,16 +684,16 @@ - + - + - + @@ -817,26 +817,26 @@ $(OutDir)lib\ false false - ..\..\..\..\build\Win32\VC12\$(Configuration)\ - $(OutDir)lib\ - false - ..\..\..\..\build\Win64\VC12\$(Configuration)\ - $(OutDir)lib\ - false - ..\..\..\..\build\Win32\VC12\$(Configuration)\ - $(OutDir)lib\ - false - ..\..\..\..\build\Win64\VC12\$(Configuration)\ - $(OutDir)lib\ - false + ..\..\..\..\build\Win32\VC12\$(Configuration)\ + $(OutDir)lib\ + false + ..\..\..\..\build\Win64\VC12\$(Configuration)\ + $(OutDir)lib\ + false + ..\..\..\..\build\Win32\VC12\$(Configuration)\ + $(OutDir)lib\ + false + ..\..\..\..\build\Win64\VC12\$(Configuration)\ + $(OutDir)lib\ + false ..\..\..\..\build\Win32\VC12\$(Configuration)\ $(OutDir)lib\ ..\..\..\..\build\Win64\VC12\$(Configuration)\ $(OutDir)lib\ - ..\..\..\..\build\Win32\VC12\$(Configuration)\ - $(OutDir)lib\ - ..\..\..\..\build\Win64\VC12\$(Configuration)\ - $(OutDir)lib\ + ..\..\..\..\build\Win32\VC12\$(Configuration)\ + $(OutDir)lib\ + ..\..\..\..\build\Win64\VC12\$(Configuration)\ + $(OutDir)lib\ ..\..\..\..\build\Win32\VC12\$(Configuration)\ ..\..\..\..\build\Win32\VC12\$(Configuration)\ $(OutDir)lib\ @@ -849,18 +849,18 @@ $(OutDir)lib\ ..\..\..\..\build\Win64\VC12\$(Configuration)\ $(OutDir)lib\ - ..\..\..\..\build\Win32\VC12\$(Configuration)\ - $(OutDir)lib\ - ..\..\..\..\build\Win64\VC12\$(Configuration)\ - $(OutDir)lib\ + ..\..\..\..\build\Win32\VC12\$(Configuration)\ + $(OutDir)lib\ + ..\..\..\..\build\Win64\VC12\$(Configuration)\ + $(OutDir)lib\ ..\..\..\..\build\Win32\VC12\$(Configuration)\ $(OutDir)lib\ ..\..\..\..\build\Win64\VC12\$(Configuration)\ $(OutDir)lib\ - ..\..\..\..\build\Win32\VC12\$(Configuration)\ - $(OutDir)lib\ - ..\..\..\..\build\Win64\VC12\$(Configuration)\ - $(OutDir)lib\ + ..\..\..\..\build\Win32\VC12\$(Configuration)\ + $(OutDir)lib\ + ..\..\..\..\build\Win64\VC12\$(Configuration)\ + $(OutDir)lib\ ..\..\..\..\build\Win32\VC12\$(Configuration)\ ..\..\..\..\build\Win32\VC12\$(Configuration)\ $(OutDir)lib\ @@ -873,18 +873,18 @@ $(OutDir)lib\ ..\..\..\..\build\Win64\VC12\$(Configuration)\ $(OutDir)lib\ - ..\..\..\..\build\Win32\VC12\$(Configuration)\ - $(OutDir)lib\ - ..\..\..\..\build\Win64\VC12\$(Configuration)\ - $(OutDir)lib\ + ..\..\..\..\build\Win32\VC12\$(Configuration)\ + $(OutDir)lib\ + ..\..\..\..\build\Win64\VC12\$(Configuration)\ + $(OutDir)lib\ $(ProjectName)d $(ProjectName)d $(ProjectName)d $(ProjectName)d $(ProjectName)d $(ProjectName)d - $(ProjectName)d - $(ProjectName)d + $(ProjectName)d + $(ProjectName)d $(ProjectName)d $(ProjectName)d $(ProjectName)d @@ -895,16 +895,16 @@ $(ProjectName)d $(ProjectName)d $(ProjectName)d - $(ProjectName)d - $(ProjectName)d + $(ProjectName)d + $(ProjectName)d $(ProjectName)d $(ProjectName)d $(ProjectName)d $(ProjectName)d $(ProjectName)d $(ProjectName)d - $(ProjectName)d - $(ProjectName)d + $(ProjectName)d + $(ProjectName)d @@ -1740,7 +1740,7 @@ MachineX64 - + _DEBUG;%(PreprocessorDefinitions) true @@ -1774,7 +1774,7 @@ MachineX86 - + _DEBUG;%(PreprocessorDefinitions) true @@ -1807,7 +1807,7 @@ MachineX64 - + NDEBUG;%(PreprocessorDefinitions) true @@ -1839,7 +1839,7 @@ MachineX86 - + NDEBUG;%(PreprocessorDefinitions) true @@ -1913,7 +1913,7 @@ MachineX64 - + Disabled ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\..\openssl\include\..\build\Win32\VC12\DLL Debug\include;..\..\..\..\..\openssl\include;..\..\..\..\..\libssh2\include;%(AdditionalIncludeDirectories) @@ -1933,7 +1933,7 @@ MachineX86 - + X64 @@ -2085,7 +2085,7 @@ MachineX64 - + Disabled ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\..\openssl\include\..\build\Win32\VC12\LIB Debug\include;..\..\..\..\..\openssl\include;..\..\..\..\..\libssh2\include;%(AdditionalIncludeDirectories) @@ -2105,7 +2105,7 @@ MachineX86 - + X64 @@ -2171,7 +2171,7 @@ MachineX64 - + MaxSpeed OnlyExplicitInline @@ -2191,7 +2191,7 @@ MachineX86 - + X64 @@ -2343,7 +2343,7 @@ MachineX64 - + MaxSpeed OnlyExplicitInline @@ -2363,7 +2363,7 @@ MachineX86 - + X64 diff --git a/projects/Windows/VC12/src/curl.sln b/projects/Windows/VC12/src/curl.sln index 7b5244c1fb..bbee81f05c 100644 --- a/projects/Windows/VC12/src/curl.sln +++ b/projects/Windows/VC12/src/curl.sln @@ -4,8 +4,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "curl", "curl.vcxproj", "{52 EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - DLL Debug - DLL OpenSSL - DLL LibSSH2|Win32 = DLL Debug - DLL OpenSSL - DLL LibSSH2|Win32 - DLL Debug - DLL OpenSSL - DLL LibSSH2|x64 = DLL Debug - DLL OpenSSL - DLL LibSSH2|x64 + DLL Debug - DLL OpenSSL - DLL libssh2|Win32 = DLL Debug - DLL OpenSSL - DLL libssh2|Win32 + DLL Debug - DLL OpenSSL - DLL libssh2|x64 = DLL Debug - DLL OpenSSL - DLL libssh2|x64 DLL Debug - DLL OpenSSL|Win32 = DLL Debug - DLL OpenSSL|Win32 DLL Debug - DLL OpenSSL|x64 = DLL Debug - DLL OpenSSL|x64 DLL Debug - DLL Windows SSPI - DLL WinIDN|Win32 = DLL Debug - DLL Windows SSPI - DLL WinIDN|Win32 @@ -16,8 +16,8 @@ Global DLL Debug - DLL wolfSSL|x64 = DLL Debug - DLL wolfSSL|x64 DLL Debug|Win32 = DLL Debug|Win32 DLL Debug|x64 = DLL Debug|x64 - DLL Release - DLL OpenSSL - DLL LibSSH2|Win32 = DLL Release - DLL OpenSSL - DLL LibSSH2|Win32 - DLL Release - DLL OpenSSL - DLL LibSSH2|x64 = DLL Release - DLL OpenSSL - DLL LibSSH2|x64 + DLL Release - DLL OpenSSL - DLL libssh2|Win32 = DLL Release - DLL OpenSSL - DLL libssh2|Win32 + DLL Release - DLL OpenSSL - DLL libssh2|x64 = DLL Release - DLL OpenSSL - DLL libssh2|x64 DLL Release - DLL OpenSSL|Win32 = DLL Release - DLL OpenSSL|Win32 DLL Release - DLL OpenSSL|x64 = DLL Release - DLL OpenSSL|x64 DLL Release - DLL Windows SSPI - DLL WinIDN|Win32 = DLL Release - DLL Windows SSPI - DLL WinIDN|Win32 @@ -28,32 +28,32 @@ Global DLL Release - DLL wolfSSL|x64 = DLL Release - DLL wolfSSL|x64 DLL Release|Win32 = DLL Release|Win32 DLL Release|x64 = DLL Release|x64 - LIB Debug - DLL OpenSSL - DLL LibSSH2|Win32 = LIB Debug - DLL OpenSSL - DLL LibSSH2|Win32 - LIB Debug - DLL OpenSSL - DLL LibSSH2|x64 = LIB Debug - DLL OpenSSL - DLL LibSSH2|x64 + LIB Debug - DLL OpenSSL - DLL libssh2|Win32 = LIB Debug - DLL OpenSSL - DLL libssh2|Win32 + LIB Debug - DLL OpenSSL - DLL libssh2|x64 = LIB Debug - DLL OpenSSL - DLL libssh2|x64 LIB Debug - DLL OpenSSL|Win32 = LIB Debug - DLL OpenSSL|Win32 LIB Debug - DLL OpenSSL|x64 = LIB Debug - DLL OpenSSL|x64 LIB Debug - DLL Windows SSPI - DLL WinIDN|Win32 = LIB Debug - DLL Windows SSPI - DLL WinIDN|Win32 LIB Debug - DLL Windows SSPI - DLL WinIDN|x64 = LIB Debug - DLL Windows SSPI - DLL WinIDN|x64 LIB Debug - DLL Windows SSPI|Win32 = LIB Debug - DLL Windows SSPI|Win32 LIB Debug - DLL Windows SSPI|x64 = LIB Debug - DLL Windows SSPI|x64 - LIB Debug - LIB OpenSSL - LIB LibSSH2|Win32 = LIB Debug - LIB OpenSSL - LIB LibSSH2|Win32 - LIB Debug - LIB OpenSSL - LIB LibSSH2|x64 = LIB Debug - LIB OpenSSL - LIB LibSSH2|x64 + LIB Debug - LIB OpenSSL - LIB libssh2|Win32 = LIB Debug - LIB OpenSSL - LIB libssh2|Win32 + LIB Debug - LIB OpenSSL - LIB libssh2|x64 = LIB Debug - LIB OpenSSL - LIB libssh2|x64 LIB Debug - LIB OpenSSL|Win32 = LIB Debug - LIB OpenSSL|Win32 LIB Debug - LIB OpenSSL|x64 = LIB Debug - LIB OpenSSL|x64 LIB Debug - LIB wolfSSL|Win32 = LIB Debug - LIB wolfSSL|Win32 LIB Debug - LIB wolfSSL|x64 = LIB Debug - LIB wolfSSL|x64 LIB Debug|Win32 = LIB Debug|Win32 LIB Debug|x64 = LIB Debug|x64 - LIB Release - DLL OpenSSL - DLL LibSSH2|Win32 = LIB Release - DLL OpenSSL - DLL LibSSH2|Win32 - LIB Release - DLL OpenSSL - DLL LibSSH2|x64 = LIB Release - DLL OpenSSL - DLL LibSSH2|x64 + LIB Release - DLL OpenSSL - DLL libssh2|Win32 = LIB Release - DLL OpenSSL - DLL libssh2|Win32 + LIB Release - DLL OpenSSL - DLL libssh2|x64 = LIB Release - DLL OpenSSL - DLL libssh2|x64 LIB Release - DLL OpenSSL|Win32 = LIB Release - DLL OpenSSL|Win32 LIB Release - DLL OpenSSL|x64 = LIB Release - DLL OpenSSL|x64 LIB Release - DLL Windows SSPI - DLL WinIDN|Win32 = LIB Release - DLL Windows SSPI - DLL WinIDN|Win32 LIB Release - DLL Windows SSPI - DLL WinIDN|x64 = LIB Release - DLL Windows SSPI - DLL WinIDN|x64 LIB Release - DLL Windows SSPI|Win32 = LIB Release - DLL Windows SSPI|Win32 LIB Release - DLL Windows SSPI|x64 = LIB Release - DLL Windows SSPI|x64 - LIB Release - LIB OpenSSL - LIB LibSSH2|Win32 = LIB Release - LIB OpenSSL - LIB LibSSH2|Win32 - LIB Release - LIB OpenSSL - LIB LibSSH2|x64 = LIB Release - LIB OpenSSL - LIB LibSSH2|x64 + LIB Release - LIB OpenSSL - LIB libssh2|Win32 = LIB Release - LIB OpenSSL - LIB libssh2|Win32 + LIB Release - LIB OpenSSL - LIB libssh2|x64 = LIB Release - LIB OpenSSL - LIB libssh2|x64 LIB Release - LIB OpenSSL|Win32 = LIB Release - LIB OpenSSL|Win32 LIB Release - LIB OpenSSL|x64 = LIB Release - LIB OpenSSL|x64 LIB Release - LIB wolfSSL|Win32 = LIB Release - LIB wolfSSL|Win32 @@ -62,10 +62,10 @@ Global LIB Release|x64 = LIB Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Debug - DLL OpenSSL - DLL LibSSH2|Win32.ActiveCfg = DLL Debug - DLL OpenSSL - DLL LibSSH2|Win32 - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Debug - DLL OpenSSL - DLL LibSSH2|Win32.Build.0 = DLL Debug - DLL OpenSSL - DLL LibSSH2|Win32 - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Debug - DLL OpenSSL - DLL LibSSH2|x64.ActiveCfg = DLL Debug - DLL OpenSSL - DLL LibSSH2|x64 - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Debug - DLL OpenSSL - DLL LibSSH2|x64.Build.0 = DLL Debug - DLL OpenSSL - DLL LibSSH2|x64 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Debug - DLL OpenSSL - DLL libssh2|Win32.ActiveCfg = DLL Debug - DLL OpenSSL - DLL libssh2|Win32 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Debug - DLL OpenSSL - DLL libssh2|Win32.Build.0 = DLL Debug - DLL OpenSSL - DLL libssh2|Win32 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Debug - DLL OpenSSL - DLL libssh2|x64.ActiveCfg = DLL Debug - DLL OpenSSL - DLL libssh2|x64 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Debug - DLL OpenSSL - DLL libssh2|x64.Build.0 = DLL Debug - DLL OpenSSL - DLL libssh2|x64 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Debug - DLL OpenSSL|Win32.ActiveCfg = DLL Debug - DLL OpenSSL|Win32 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Debug - DLL OpenSSL|Win32.Build.0 = DLL Debug - DLL OpenSSL|Win32 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Debug - DLL OpenSSL|x64.ActiveCfg = DLL Debug - DLL OpenSSL|x64 @@ -86,10 +86,10 @@ Global {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Release - DLL OpenSSL - DLL LibSSH2|Win32.ActiveCfg = DLL Release - DLL OpenSSL - DLL LibSSH2|Win32 - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Release - DLL OpenSSL - DLL LibSSH2|Win32.Build.0 = DLL Release - DLL OpenSSL - DLL LibSSH2|Win32 - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Release - DLL OpenSSL - DLL LibSSH2|x64.ActiveCfg = DLL Release - DLL OpenSSL - DLL LibSSH2|x64 - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Release - DLL OpenSSL - DLL LibSSH2|x64.Build.0 = DLL Release - DLL OpenSSL - DLL LibSSH2|x64 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Release - DLL OpenSSL - DLL libssh2|Win32.ActiveCfg = DLL Release - DLL OpenSSL - DLL libssh2|Win32 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Release - DLL OpenSSL - DLL libssh2|Win32.Build.0 = DLL Release - DLL OpenSSL - DLL libssh2|Win32 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Release - DLL OpenSSL - DLL libssh2|x64.ActiveCfg = DLL Release - DLL OpenSSL - DLL libssh2|x64 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Release - DLL OpenSSL - DLL libssh2|x64.Build.0 = DLL Release - DLL OpenSSL - DLL libssh2|x64 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Release - DLL OpenSSL|Win32.ActiveCfg = DLL Release - DLL OpenSSL|Win32 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Release - DLL OpenSSL|Win32.Build.0 = DLL Release - DLL OpenSSL|Win32 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Release - DLL OpenSSL|x64.ActiveCfg = DLL Release - DLL OpenSSL|x64 @@ -110,10 +110,10 @@ Global {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Release|Win32.Build.0 = DLL Release|Win32 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Release|x64.ActiveCfg = DLL Release|x64 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.DLL Release|x64.Build.0 = DLL Release|x64 - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - DLL OpenSSL - DLL LibSSH2|Win32.ActiveCfg = LIB Debug - DLL OpenSSL - DLL LibSSH2|Win32 - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - DLL OpenSSL - DLL LibSSH2|Win32.Build.0 = LIB Debug - DLL OpenSSL - DLL LibSSH2|Win32 - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - DLL OpenSSL - DLL LibSSH2|x64.ActiveCfg = LIB Debug - DLL OpenSSL - DLL LibSSH2|x64 - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - DLL OpenSSL - DLL LibSSH2|x64.Build.0 = LIB Debug - DLL OpenSSL - DLL LibSSH2|x64 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - DLL OpenSSL - DLL libssh2|Win32.ActiveCfg = LIB Debug - DLL OpenSSL - DLL libssh2|Win32 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - DLL OpenSSL - DLL libssh2|Win32.Build.0 = LIB Debug - DLL OpenSSL - DLL libssh2|Win32 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - DLL OpenSSL - DLL libssh2|x64.ActiveCfg = LIB Debug - DLL OpenSSL - DLL libssh2|x64 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - DLL OpenSSL - DLL libssh2|x64.Build.0 = LIB Debug - DLL OpenSSL - DLL libssh2|x64 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - DLL OpenSSL|Win32.ActiveCfg = LIB Debug - DLL OpenSSL|Win32 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - DLL OpenSSL|Win32.Build.0 = LIB Debug - DLL OpenSSL|Win32 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - DLL OpenSSL|x64.ActiveCfg = LIB Debug - DLL OpenSSL|x64 @@ -126,10 +126,10 @@ Global {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - DLL Windows SSPI|Win32.Build.0 = LIB Debug - DLL Windows SSPI|Win32 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - DLL Windows SSPI|x64.ActiveCfg = LIB Debug - DLL Windows SSPI|x64 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - DLL Windows SSPI|x64.Build.0 = LIB Debug - DLL Windows SSPI|x64 - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - LIB OpenSSL - LIB LibSSH2|Win32.ActiveCfg = LIB Debug - LIB OpenSSL - LIB LibSSH2|Win32 - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - LIB OpenSSL - LIB LibSSH2|Win32.Build.0 = LIB Debug - LIB OpenSSL - LIB LibSSH2|Win32 - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - LIB OpenSSL - LIB LibSSH2|x64.ActiveCfg = LIB Debug - LIB OpenSSL - LIB LibSSH2|x64 - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - LIB OpenSSL - LIB LibSSH2|x64.Build.0 = LIB Debug - LIB OpenSSL - LIB LibSSH2|x64 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - LIB OpenSSL - LIB libssh2|Win32.ActiveCfg = LIB Debug - LIB OpenSSL - LIB libssh2|Win32 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - LIB OpenSSL - LIB libssh2|Win32.Build.0 = LIB Debug - LIB OpenSSL - LIB libssh2|Win32 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - LIB OpenSSL - LIB libssh2|x64.ActiveCfg = LIB Debug - LIB OpenSSL - LIB libssh2|x64 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - LIB OpenSSL - LIB libssh2|x64.Build.0 = LIB Debug - LIB OpenSSL - LIB libssh2|x64 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - LIB OpenSSL|Win32.ActiveCfg = LIB Debug - LIB OpenSSL|Win32 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - LIB OpenSSL|Win32.Build.0 = LIB Debug - LIB OpenSSL|Win32 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug - LIB OpenSSL|x64.ActiveCfg = LIB Debug - LIB OpenSSL|x64 @@ -142,10 +142,10 @@ Global {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug|Win32.Build.0 = LIB Debug|Win32 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug|x64.ActiveCfg = LIB Debug|x64 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Debug|x64.Build.0 = LIB Debug|x64 - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - DLL OpenSSL - DLL LibSSH2|Win32.ActiveCfg = LIB Release - DLL OpenSSL - DLL LibSSH2|Win32 - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - DLL OpenSSL - DLL LibSSH2|Win32.Build.0 = LIB Release - DLL OpenSSL - DLL LibSSH2|Win32 - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - DLL OpenSSL - DLL LibSSH2|x64.ActiveCfg = LIB Release - DLL OpenSSL - DLL LibSSH2|x64 - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - DLL OpenSSL - DLL LibSSH2|x64.Build.0 = LIB Release - DLL OpenSSL - DLL LibSSH2|x64 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - DLL OpenSSL - DLL libssh2|Win32.ActiveCfg = LIB Release - DLL OpenSSL - DLL libssh2|Win32 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - DLL OpenSSL - DLL libssh2|Win32.Build.0 = LIB Release - DLL OpenSSL - DLL libssh2|Win32 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - DLL OpenSSL - DLL libssh2|x64.ActiveCfg = LIB Release - DLL OpenSSL - DLL libssh2|x64 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - DLL OpenSSL - DLL libssh2|x64.Build.0 = LIB Release - DLL OpenSSL - DLL libssh2|x64 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - DLL OpenSSL|Win32.ActiveCfg = LIB Release - DLL OpenSSL|Win32 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - DLL OpenSSL|Win32.Build.0 = LIB Release - DLL OpenSSL|Win32 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - DLL OpenSSL|x64.ActiveCfg = LIB Release - DLL OpenSSL|x64 @@ -158,10 +158,10 @@ Global {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - DLL Windows SSPI|Win32.Build.0 = LIB Release - DLL Windows SSPI|Win32 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - DLL Windows SSPI|x64.ActiveCfg = LIB Release - DLL Windows SSPI|x64 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - DLL Windows SSPI|x64.Build.0 = LIB Release - DLL Windows SSPI|x64 - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - LIB OpenSSL - LIB LibSSH2|Win32.ActiveCfg = LIB Release - LIB OpenSSL - LIB LibSSH2|Win32 - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - LIB OpenSSL - LIB LibSSH2|Win32.Build.0 = LIB Release - LIB OpenSSL - LIB LibSSH2|Win32 - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - LIB OpenSSL - LIB LibSSH2|x64.ActiveCfg = LIB Release - LIB OpenSSL - LIB LibSSH2|x64 - {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - LIB OpenSSL - LIB LibSSH2|x64.Build.0 = LIB Release - LIB OpenSSL - LIB LibSSH2|x64 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - LIB OpenSSL - LIB libssh2|Win32.ActiveCfg = LIB Release - LIB OpenSSL - LIB libssh2|Win32 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - LIB OpenSSL - LIB libssh2|Win32.Build.0 = LIB Release - LIB OpenSSL - LIB libssh2|Win32 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - LIB OpenSSL - LIB libssh2|x64.ActiveCfg = LIB Release - LIB OpenSSL - LIB libssh2|x64 + {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - LIB OpenSSL - LIB libssh2|x64.Build.0 = LIB Release - LIB OpenSSL - LIB libssh2|x64 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - LIB OpenSSL|Win32.ActiveCfg = LIB Release - LIB OpenSSL|Win32 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - LIB OpenSSL|Win32.Build.0 = LIB Release - LIB OpenSSL|Win32 {5228E9CE-A216-422F-A5E6-58E95E2DD71D}.LIB Release - LIB OpenSSL|x64.ActiveCfg = LIB Release - LIB OpenSSL|x64 diff --git a/projects/Windows/VC12/src/curl.tmpl b/projects/Windows/VC12/src/curl.tmpl index 3c98b676e8..2e9438dd80 100644 --- a/projects/Windows/VC12/src/curl.tmpl +++ b/projects/Windows/VC12/src/curl.tmpl @@ -9,12 +9,12 @@ DLL Debug - DLL wolfSSL x64 - - DLL Debug - DLL OpenSSL - DLL LibSSH2 + + DLL Debug - DLL OpenSSL - DLL libssh2 Win32 - - DLL Debug - DLL OpenSSL - DLL LibSSH2 + + DLL Debug - DLL OpenSSL - DLL libssh2 x64 @@ -57,12 +57,12 @@ DLL Release - DLL wolfSSL x64 - - DLL Release - DLL OpenSSL - DLL LibSSH2 + + DLL Release - DLL OpenSSL - DLL libssh2 Win32 - - DLL Release - DLL OpenSSL - DLL LibSSH2 + + DLL Release - DLL OpenSSL - DLL libssh2 x64 @@ -97,12 +97,12 @@ DLL Release x64 - - LIB Debug - DLL OpenSSL - DLL LibSSH2 + + LIB Debug - DLL OpenSSL - DLL libssh2 Win32 - - LIB Debug - DLL OpenSSL - DLL LibSSH2 + + LIB Debug - DLL OpenSSL - DLL libssh2 x64 @@ -137,12 +137,12 @@ LIB Debug - LIB wolfSSL x64 - - LIB Debug - LIB OpenSSL - LIB LibSSH2 + + LIB Debug - LIB OpenSSL - LIB libssh2 Win32 - - LIB Debug - LIB OpenSSL - LIB LibSSH2 + + LIB Debug - LIB OpenSSL - LIB libssh2 x64 @@ -161,12 +161,12 @@ LIB Debug x64 - - LIB Release - DLL OpenSSL - DLL LibSSH2 + + LIB Release - DLL OpenSSL - DLL libssh2 Win32 - - LIB Release - DLL OpenSSL - DLL LibSSH2 + + LIB Release - DLL OpenSSL - DLL libssh2 x64 @@ -201,12 +201,12 @@ LIB Release - LIB wolfSSL x64 - - LIB Release - LIB OpenSSL - LIB LibSSH2 + + LIB Release - LIB OpenSSL - LIB libssh2 Win32 - - LIB Release - LIB OpenSSL - LIB LibSSH2 + + LIB Release - LIB OpenSSL - LIB libssh2 x64 @@ -255,13 +255,13 @@ Unicode v120 - + Application false Unicode v120 - + Application false Unicode @@ -279,13 +279,13 @@ Unicode v120 - + Application false Unicode v120 - + Application false Unicode @@ -303,13 +303,13 @@ Unicode v120 - + Application false Unicode v120 - + Application false Unicode @@ -423,13 +423,13 @@ Unicode v120 - + Application false Unicode v120 - + Application false Unicode @@ -447,13 +447,13 @@ Unicode v120 - + Application false Unicode v120 - + Application false Unicode @@ -471,13 +471,13 @@ Unicode v120 - + Application false Unicode v120 - + Application false Unicode @@ -582,10 +582,10 @@ - + - + @@ -594,10 +594,10 @@ - + - + @@ -606,10 +606,10 @@ - + - + @@ -666,10 +666,10 @@ - + - + @@ -678,10 +678,10 @@ - + - + @@ -690,10 +690,10 @@ - + - + @@ -825,18 +825,18 @@ $(OutDir)src\ false false - ..\..\..\..\build\Win32\VC12\$(Configuration)\ - $(OutDir)src\ - false - ..\..\..\..\build\Win64\VC12\$(Configuration)\ - $(OutDir)src\ - false - ..\..\..\..\build\Win32\VC12\$(Configuration)\ - $(OutDir)src\ - false - ..\..\..\..\build\Win64\VC12\$(Configuration)\ - $(OutDir)src\ - false + ..\..\..\..\build\Win32\VC12\$(Configuration)\ + $(OutDir)src\ + false + ..\..\..\..\build\Win64\VC12\$(Configuration)\ + $(OutDir)src\ + false + ..\..\..\..\build\Win32\VC12\$(Configuration)\ + $(OutDir)src\ + false + ..\..\..\..\build\Win64\VC12\$(Configuration)\ + $(OutDir)src\ + false ..\..\..\..\build\Win32\VC12\$(Configuration)\ $(OutDir)src\ false @@ -849,18 +849,18 @@ ..\..\..\..\build\Win64\VC12\$(Configuration)\ $(OutDir)src\ false - ..\..\..\..\build\Win32\VC12\$(Configuration)\ - $(OutDir)src\ - false - ..\..\..\..\build\Win64\VC12\$(Configuration)\ - $(OutDir)src\ - false - ..\..\..\..\build\Win32\VC12\$(Configuration)\ - $(OutDir)src\ - false - ..\..\..\..\build\Win64\VC12\$(Configuration)\ - $(OutDir)src\ - false + ..\..\..\..\build\Win32\VC12\$(Configuration)\ + $(OutDir)src\ + false + ..\..\..\..\build\Win64\VC12\$(Configuration)\ + $(OutDir)src\ + false + ..\..\..\..\build\Win32\VC12\$(Configuration)\ + $(OutDir)src\ + false + ..\..\..\..\build\Win64\VC12\$(Configuration)\ + $(OutDir)src\ + false ..\..\..\..\build\Win32\VC12\$(Configuration)\ $(OutDir)src\ false @@ -873,18 +873,18 @@ ..\..\..\..\build\Win64\VC12\$(Configuration)\ $(OutDir)src\ false - ..\..\..\..\build\Win32\VC12\$(Configuration)\ - $(OutDir)src\ - false - ..\..\..\..\build\Win64\VC12\$(Configuration)\ - $(OutDir)src\ - false - ..\..\..\..\build\Win32\VC12\$(Configuration)\ - $(OutDir)src\ - false - ..\..\..\..\build\Win64\VC12\$(Configuration)\ - $(OutDir)src\ - false + ..\..\..\..\build\Win32\VC12\$(Configuration)\ + $(OutDir)src\ + false + ..\..\..\..\build\Win64\VC12\$(Configuration)\ + $(OutDir)src\ + false + ..\..\..\..\build\Win32\VC12\$(Configuration)\ + $(OutDir)src\ + false + ..\..\..\..\build\Win64\VC12\$(Configuration)\ + $(OutDir)src\ + false ..\..\..\..\build\Win32\VC12\$(Configuration)\ ..\..\..\..\build\Win32\VC12\$(Configuration)\ $(OutDir)src\ @@ -915,8 +915,8 @@ $(ProjectName)d $(ProjectName)d $(ProjectName)d - $(ProjectName)d - $(ProjectName)d + $(ProjectName)d + $(ProjectName)d $(ProjectName)d $(ProjectName)d $(ProjectName)d @@ -927,41 +927,41 @@ $(ProjectName)d $(ProjectName)d $(ProjectName)d - $(ProjectName)d - $(ProjectName)d + $(ProjectName)d + $(ProjectName)d $(ProjectName)d $(ProjectName)d $(ProjectName)d $(ProjectName)d $(ProjectName)d $(ProjectName)d - $(ProjectName)d - $(ProjectName)d - $(ProjectName) + $(ProjectName)d + $(ProjectName)d + $(ProjectName) $(ProjectName) $(ProjectName) $(ProjectName) $(ProjectName) $(ProjectName) - $(ProjectName) + $(ProjectName) $(ProjectName) $(ProjectName) $(ProjectName) - $(ProjectName) + $(ProjectName) $(ProjectName) $(ProjectName) $(ProjectName) - $(ProjectName) + $(ProjectName) $(ProjectName) $(ProjectName) $(ProjectName) $(ProjectName) $(ProjectName) - $(ProjectName) + $(ProjectName) $(ProjectName) $(ProjectName) $(ProjectName) - $(ProjectName) + $(ProjectName) $(ProjectName) $(ProjectName) $(ProjectName) @@ -1828,7 +1828,7 @@ MachineX64 - + $(TargetDir)$(TargetName).tlb @@ -1859,7 +1859,7 @@ MachineX86 - + X64 $(TargetDir)$(TargetName).tlb @@ -1891,7 +1891,7 @@ MachineX64 - + $(TargetDir)$(TargetName).tlb @@ -1920,7 +1920,7 @@ MachineX86 - + X64 $(TargetDir)$(TargetName).tlb @@ -2072,7 +2072,7 @@ MachineX64 - + $(TargetDir)$(TargetName).tlb @@ -2103,7 +2103,7 @@ MachineX86 - + X64 $(TargetDir)$(TargetName).tlb @@ -2135,7 +2135,7 @@ MachineX64 - + $(TargetDir)$(TargetName).tlb @@ -2164,7 +2164,7 @@ MachineX86 - + X64 $(TargetDir)$(TargetName).tlb @@ -2316,7 +2316,7 @@ MachineX64 - + $(TargetDir)$(TargetName).tlb @@ -2347,7 +2347,7 @@ MachineX86 - + X64 $(TargetDir)$(TargetName).tlb @@ -2379,7 +2379,7 @@ MachineX64 - + $(TargetDir)$(TargetName).tlb @@ -2408,7 +2408,7 @@ MachineX86 - + X64 $(TargetDir)$(TargetName).tlb diff --git a/projects/build-openssl.bat b/projects/build-openssl.bat index b645383419..f1ebbddbd6 100644 --- a/projects/build-openssl.bat +++ b/projects/build-openssl.bat @@ -241,7 +241,7 @@ rem *************************************************************************** echo. cd /d "%START_DIR%" || (echo Error: Failed cd start & exit /B 1) - rem Save the full path of the openssl source dir + rem Save the full path of the OpenSSL source dir set "SOURCE_PATH=%CD%" rem Set temporary paths for building and installing OpenSSL. If a temporary diff --git a/tests/ech_tests.sh b/tests/ech_tests.sh index 3d9bec858a..615323b485 100755 --- a/tests/ech_tests.sh +++ b/tests/ech_tests.sh @@ -105,10 +105,10 @@ declare -A neither_targets=( # Where we find OpenSSL .so's : "${OSSL:=$HOME/code/openssl-local-inst}" -# Where we find WolfSSL .so's +# Where we find wolfSSL .so's : "${WSSL:=$HOME/code/wolfssl/inst/lib}" -# Where we find boringssl .so's +# Where we find BoringSSL .so's : "${BSSL:=$HOME/code/boringssl/inst/lib}" # Where we send DoH queries when using kdig or curl @@ -539,7 +539,7 @@ fi fi # skip # Check combinations of command line options, if we're good so far -# Most of this only works for openssl, which is ok, as we're checking +# Most of this only works for OpenSSL, which is ok, as we're checking # the argument handling here, not the ECH protocol if [[ "$using_ossl" == "yes" && "$allgood" == "yes" ]] then diff --git a/tests/http/test_17_ssl_use.py b/tests/http/test_17_ssl_use.py index 42d5a9c835..813bcffd42 100644 --- a/tests/http/test_17_ssl_use.py +++ b/tests/http/test_17_ssl_use.py @@ -65,14 +65,14 @@ class TestSSLUse: xargs = ['--sessionid', '--tls-max', tls_max, f'--tlsv{tls_max}'] if env.curl_uses_lib('gnutls'): if tls_max == '1.3': - exp_resumed = 'Initial' # 1.2 works in gnutls, but 1.3 does not, TODO + exp_resumed = 'Initial' # 1.2 works in GnuTLS, but 1.3 does not, TODO if env.curl_uses_lib('libressl'): if tls_max == '1.3': - exp_resumed = 'Initial' # 1.2 works in libressl, but 1.3 does not, TODO + exp_resumed = 'Initial' # 1.2 works in LibreSSL, but 1.3 does not, TODO if env.curl_uses_lib('wolfssl'): xargs = ['--sessionid', f'--tlsv{tls_max}'] if tls_max == '1.3': - exp_resumed = 'Initial' # 1.2 works in wolfssl, but 1.3 does not, TODO + exp_resumed = 'Initial' # 1.2 works in wolfSSL, but 1.3 does not, TODO if env.curl_uses_lib('rustls-ffi'): exp_resumed = 'Initial' # rustls does not support sessions, TODO if env.curl_uses_lib('bearssl') and tls_max == '1.3': @@ -136,7 +136,7 @@ class TestSSLUse: assert r.json['SSL_TLS_SNI'] == env.domain1, f'{r.json}' assert False, f'should not have succeeded: {r.json}' # 7 - rustls rejects a servername with .. during setup - # 35 - libressl rejects setting an SNI name with trailing dot + # 35 - LibreSSL rejects setting an SNI name with trailing dot # 60 - peer name matching failed against certificate assert r.exit_code in [7, 35, 60], f'{r}' @@ -144,9 +144,9 @@ class TestSSLUse: @pytest.mark.parametrize("proto", ['http/1.1', 'h2', 'h3']) def test_17_05_ip_addr(self, env: Env, httpd, nghttpx, repeat, proto): if env.curl_uses_lib('bearssl'): - pytest.skip("bearssl does not support cert verification with IP addresses") + pytest.skip("BearSSL does not support cert verification with IP addresses") if env.curl_uses_lib('mbedtls'): - pytest.skip("mbedtls does not support cert verification with IP addresses") + pytest.skip("mbedTLS does not support cert verification with IP addresses") if proto == 'h3' and not env.have_h3(): pytest.skip("h3 not supported") curl = CurlClient(env=env) @@ -202,20 +202,20 @@ class TestSSLUse: url = f'https://{env.authority_for(env.domain1, proto)}/curltest/sslinfo' extra_args = [] if env.curl_uses_lib('gnutls'): - pytest.skip('gnutls does not support setting ciphers by name') + pytest.skip('GnuTLS does not support setting ciphers by name') if env.curl_uses_lib('rustls-ffi'): pytest.skip('rustls-ffi does not support setting ciphers') if ciphers[0] & 0xFF00 == 0x1300: # test setting TLSv1.3 ciphers if env.curl_uses_lib('bearssl'): - pytest.skip('bearssl does not support TLSv1.3') + pytest.skip('BearSSL does not support TLSv1.3') elif env.curl_uses_lib('sectransp'): - pytest.skip('sectransp does not support TLSv1.3') + pytest.skip('SecureTransport does not support TLSv1.3') elif env.curl_uses_lib('boringssl'): - pytest.skip('boringssl does not support setting TLSv1.3 ciphers') + pytest.skip('BoringSSL does not support setting TLSv1.3 ciphers') elif env.curl_uses_lib('mbedtls'): if not env.curl_lib_version_at_least('mbedtls', '3.6.0'): - pytest.skip('mbedtls TLSv1.3 support requires at least 3.6.0') + pytest.skip('mbedTLS TLSv1.3 support requires at least 3.6.0') extra_args = ['--ciphers', ':'.join(cipher_names)] elif env.curl_uses_lib('wolfssl'): extra_args = ['--ciphers', ':'.join(cipher_names)] @@ -224,7 +224,7 @@ class TestSSLUse: else: # test setting TLSv1.2 ciphers if env.curl_uses_lib('schannel'): - pytest.skip('schannel does not support setting TLSv1.2 ciphers by name') + pytest.skip('Schannel does not support setting TLSv1.2 ciphers by name') elif env.curl_uses_lib('wolfssl'): # setting tls version is botched with wolfssl: setting max (--tls-max) # is not supported, setting min (--tlsv1.*) actually also sets max @@ -248,7 +248,7 @@ class TestSSLUse: if not env.curl_uses_lib('openssl') and \ not env.curl_uses_lib('gnutls') and \ not env.curl_uses_lib('quictls'): - pytest.skip("tls library does not support --cert-status") + pytest.skip("TLS library does not support --cert-status") curl = CurlClient(env=env) domain = f'localhost' url = f'https://{env.authority_for(domain, proto)}/' diff --git a/tests/unit/unit3205.c b/tests/unit/unit3205.c index abdfdef121..6b75c28563 100644 --- a/tests/unit/unit3205.c +++ b/tests/unit/unit3205.c @@ -376,7 +376,7 @@ static const struct test_cs_entry test_cs_list[] = { "EDH-RSA-DES-CBC3-SHA" }, #endif #if defined(USE_MBEDTLS) - /* entries marked ns are non-"standard", they are not in openssl */ + /* entries marked ns are non-"standard", they are not in OpenSSL */ { 0x0041, "TLS_RSA_WITH_CAMELLIA_128_CBC_SHA", "CAMELLIA128-SHA" }, { 0x0045, "TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA", @@ -682,7 +682,7 @@ UNITTEST_START } } - /* test Curl_cipher_suite_lookup_id() for openssl name */ + /* test Curl_cipher_suite_lookup_id() for OpenSSL name */ if(test->openssl) { id = Curl_cipher_suite_lookup_id(test->openssl, strlen(test->openssl)); if(id != test->id) { @@ -706,7 +706,7 @@ UNITTEST_START unitfail++; } - /* test Curl_cipher_suite_get_str() prefer openssl name */ + /* test Curl_cipher_suite_get_str() prefer OpenSSL name */ buf[0] = '\0'; expect = test->openssl ? test->openssl : test->rfc; diff --git a/winbuild/README.md b/winbuild/README.md index 2fe60a0906..1ab5f5825e 100644 --- a/winbuild/README.md +++ b/winbuild/README.md @@ -88,8 +88,8 @@ where `` is one or many of: - `WITH_MBEDTLS=` - Enable mbedTLS support, DLL or static - `WITH_CARES=` - Enable c-ares support, DLL or static - `WITH_ZLIB=` - Enable zlib support, DLL or static - - `WITH_SSH=` - Enable libSSH support, DLL or static - - `WITH_SSH2=` - Enable libSSH2 support, DLL or static + - `WITH_SSH=` - Enable libssh support, DLL or static + - `WITH_SSH2=` - Enable libssh2 support, DLL or static - `WITH_PREFIX=` - Where to install the build - `ENABLE_SSPI=` - Enable SSPI support, defaults to yes - `ENABLE_IPV6=` - Enable IPv6, defaults to yes @@ -110,7 +110,7 @@ where `` is one or many of: - `MBEDTLS_PATH=` - Custom path for mbedTLS - `NGHTTP2_PATH=` - Custom path for nghttp2 - `MSH3_PATH=` - Custom path for msh3 - - `SSH2_PATH=` - Custom path for libSSH2 + - `SSH2_PATH=` - Custom path for libssh2 - `SSL_PATH=` - Custom path for OpenSSL - `ZLIB_PATH=` - Custom path for zlib