merging
authorVolker Birk <vb@pep-project.org>
Tue, 26 Apr 2016 10:58:43 +0200
changeset 55428e92b31326d
parent 553 0a08c1068060
parent 540 032fcf6d5940
child 555 a46143ed6c45
merging
build-mac/build-libcurl-ios.sh
build-mac/curl/curlbuild32.h
build-mac/curl/curlbuild64.h
build-mac/curl/curlbuild_.h
build-mac/libcurl.a
src/pEpEngine.h
     1.1 --- a/.hgignore	Fri Apr 01 17:33:42 2016 +0200
     1.2 +++ b/.hgignore	Tue Apr 26 10:58:43 2016 +0200
     1.3 @@ -1,11 +1,12 @@
     1.4  syntax: glob
     1.5 +*.orig
     1.6  *.d
     1.7  *.o
     1.8  *~
     1.9  *.swp
    1.10  db/*.csv
    1.11  db/*.db
    1.12 -*.a
    1.13 +#*.a
    1.14  *.so
    1.15  test/pEpEngineTest
    1.16  *.exe
    1.17 @@ -19,5 +20,6 @@
    1.18  build-android/third-party
    1.19  build-android/pEpEngine-android-1
    1.20  
    1.21 +pEpEngine.vcxproj.user
    1.22  syntax: regexp
    1.23  .*xcuserdata/
     2.1 --- a/README.txt	Fri Apr 01 17:33:42 2016 +0200
     2.2 +++ b/README.txt	Tue Apr 26 10:58:43 2016 +0200
     2.3 @@ -71,7 +71,8 @@
     2.4  
     2.5  On Windows, use Visual Studio.
     2.6  
     2.7 -1. How to cross-build
     2.8 +
     2.9 +3. How to cross-build
    2.10  ---------------------
    2.11  
    2.12  For cross-building, BUILD_FOR is being used. I.e.:
    2.13 @@ -79,7 +80,7 @@
    2.14  $ BUILD_FOR=yourOS make -e
    2.15  
    2.16  
    2.17 -2. How to build the databases
    2.18 +4. How to build the databases
    2.19  -----------------------------
    2.20  
    2.21  p≡p Engine uses two databases: ~/.pEp_management (on *NIX) or
    2.22 @@ -100,3 +101,12 @@
    2.23  You can test the Trustwords in system.db using db/trustwords.py
    2.24  Both Python tools have a switch --help
    2.25  
    2.26 +
    2.27 +5. How to run the tests
    2.28 +-----------------------
    2.29 +
    2.30 +You have to import all the test keys into your local gpg instance:
    2.31 +
    2.32 +	cd test
    2.33 +	cat *.asc | gpg --import
    2.34 +
     3.1 --- a/build-mac/build-libcurl-ios.sh	Fri Apr 01 17:33:42 2016 +0200
     3.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.3 @@ -1,53 +0,0 @@
     3.4 -#!/bin/bash
     3.5 -
     3.6 -export IPHONEOS_DEPLOYMENT_TARGET="6.0"
     3.7 -export CC="/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang"
     3.8 -
     3.9 -ARCH="armv7"
    3.10 -export CFLAGS="-arch ${ARCH} -pipe -Os -gdwarf-2 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk"
    3.11 -export LDFLAGS="-arch ${ARCH} -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk"
    3.12 -make distclean
    3.13 -./configure --disable-shared --enable-static --host="${ARCH}-apple-darwin" --enable-threaded-resolver --with-darwinssl
    3.14 -make -j `sysctl -n hw.logicalcpu_max`
    3.15 -cp lib/.libs/libcurl.a "${HOME}/Desktop/libcurl-${ARCH}.a"
    3.16 -cp include/curl/curlbuild.h ~/Desktop/curlbuild32.h
    3.17 -
    3.18 -ARCH="armv7s"
    3.19 -export CFLAGS="-arch ${ARCH} -pipe -Os -gdwarf-2 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk"
    3.20 -export LDFLAGS="-arch ${ARCH} -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk"
    3.21 -make distclean
    3.22 -./configure --disable-shared --enable-static --host="${ARCH}-apple-darwin" --enable-threaded-resolver --with-darwinssl
    3.23 -make -j `sysctl -n hw.logicalcpu_max`
    3.24 -cp lib/.libs/libcurl.a "${HOME}/Desktop/libcurl-${ARCH}.a"
    3.25 -
    3.26 -ARCH="arm64"
    3.27 -export IPHONEOS_DEPLOYMENT_TARGET="7.0"
    3.28 -export CFLAGS="-arch ${ARCH} -pipe -Os -gdwarf-2 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk"
    3.29 -export LDFLAGS="-arch ${ARCH} -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk"
    3.30 -make distclean
    3.31 -./configure --disable-shared --enable-static --host="aarch64-apple-darwin" --enable-threaded-resolver --with-darwinssl
    3.32 -make -j `sysctl -n hw.logicalcpu_max`
    3.33 -cp lib/.libs/libcurl.a "${HOME}/Desktop/libcurl-${ARCH}.a"
    3.34 -cp include/curl/curlbuild.h ~/Desktop/curlbuild64.h
    3.35 -
    3.36 -ARCH="i386"
    3.37 -export IPHONEOS_DEPLOYMENT_TARGET="6.0"
    3.38 -export CFLAGS="-arch ${ARCH} -pipe -Os -gdwarf-2 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk"
    3.39 -export CPPFLAGS="-D__IPHONE_OS_VERSION_MIN_REQUIRED=${IPHONEOS_DEPLOYMENT_TARGET%%.*}0000"
    3.40 -export LDFLAGS="-arch ${ARCH} -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk"
    3.41 -make distclean
    3.42 -./configure --disable-shared --enable-static --host="${ARCH}-apple-darwin" --enable-threaded-resolver --with-darwinssl
    3.43 -make -j `sysctl -n hw.logicalcpu_max`
    3.44 -cp lib/.libs/libcurl.a "${HOME}/Desktop/libcurl-${ARCH}.a"
    3.45 -
    3.46 -ARCH="x86_64"
    3.47 -export IPHONEOS_DEPLOYMENT_TARGET="7.0"
    3.48 -export CFLAGS="-arch ${ARCH} -pipe -Os -gdwarf-2 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk"
    3.49 -export CPPFLAGS="-D__IPHONE_OS_VERSION_MIN_REQUIRED=${IPHONEOS_DEPLOYMENT_TARGET%%.*}0000"
    3.50 -export LDFLAGS="-arch ${ARCH} -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk"
    3.51 -make distclean
    3.52 -./configure --disable-shared --enable-static --host="${ARCH}-apple-darwin" --enable-threaded-resolver --with-darwinssl
    3.53 -make -j `sysctl -n hw.logicalcpu_max`
    3.54 -cp lib/.libs/libcurl.a "${HOME}/Desktop/libcurl-${ARCH}.a"
    3.55 -
    3.56 -lipo -create -output "${HOME}/Desktop/libcurl.a" "${HOME}/Desktop/libcurl-armv7.a" "${HOME}/Desktop/libcurl-armv7s.a" "${HOME}/Desktop/libcurl-arm64.a" "${HOME}/Desktop/libcurl-i386.a" "${HOME}/Desktop/libcurl-x86_64.a"
     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/build-mac/build.sh	Tue Apr 26 10:58:43 2016 +0200
     4.3 @@ -0,0 +1,25 @@
     4.4 +#!/bin/bash
     4.5 +
     4.6 +#
     4.7 +# Invoke with `sh build.sh`
     4.8 +#
     4.9 +
    4.10 +set -e
    4.11 +
    4.12 +rm -f libcurl.a
    4.13 +rm -fr curl
    4.14 +
    4.15 +wget https://curl.haxx.se/download/curl-7.48.0.tar.gz
    4.16 +gpg2 --verify curl-7.48.0.tar.gz.asc
    4.17 +tar xf curl-7.48.0.tar.gz
    4.18 +pushd curl-7.48.0
    4.19 +bash ../build_libcurl_dist.sh
    4.20 +popd
    4.21 +mv libcurl-ios-dist/lib/libcurl.a .
    4.22 +
    4.23 +#exit 1
    4.24 +
    4.25 +mv libcurl-ios-dist/include/curl .
    4.26 +rm -fr libcurl-ios-dist/
    4.27 +rm -fr curl-7.48.0
    4.28 +rm curl-7.48.0.tar.gz
     5.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.2 +++ b/build-mac/build_libcurl_dist.sh	Tue Apr 26 10:58:43 2016 +0200
     5.3 @@ -0,0 +1,62 @@
     5.4 +#!/bin/bash
     5.5 +
     5.6 +export DEVROOT=/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain
     5.7 +DFT_DIST_DIR=../libcurl-ios-dist
     5.8 +DIST_DIR=${DIST_DIR:-$DFT_DIST_DIR}
     5.9 +
    5.10 +function check_curl_ver() {
    5.11 +echo "#include \"include/curl/curlver.h\"
    5.12 +#if LIBCURL_VERSION_MAJOR < 7 || LIBCURL_VERSION_MINOR < 40
    5.13 +#error Required curl 7.40.0+; See http://curl.haxx.se/docs/adv_20150108A.html
    5.14 +#endif"|gcc -c -o /dev/null -xc -||exit 9
    5.15 +}
    5.16 +
    5.17 +function build_for_arch() {
    5.18 +  ARCH=$1
    5.19 +  HOST=$2
    5.20 +  SYSROOT=$3
    5.21 +  PREFIX=$4
    5.22 +  IPHONEOS_DEPLOYMENT_TARGET="6.0"
    5.23 +  export PATH="${DEVROOT}/usr/bin/:${PATH}"
    5.24 +  export CFLAGS="-arch ${ARCH} -pipe -Os -gdwarf-2 -isysroot ${SYSROOT} -miphoneos-version-min=${IPHONEOS_DEPLOYMENT_TARGET} -fembed-bitcode"
    5.25 +  export LDFLAGS="-arch ${ARCH} -isysroot ${SYSROOT}"
    5.26 +  ./configure --disable-shared --enable-static ${SSL_FLAG} --host="${HOST}" --prefix=${PREFIX} && make -j8 && make install
    5.27 +}
    5.28 +
    5.29 +if [ "$1" == "openssl" ]
    5.30 +then
    5.31 +  if [ ! -d ${HOME}/Desktop/openssl-ios-dist ]
    5.32 +  then
    5.33 +    echo "Please use https://github.com/sinofool/build-openssl-ios/ to build OpenSSL for iOS first"
    5.34 +    exit 8
    5.35 +  fi
    5.36 +  export SSL_FLAG=--with-ssl=${HOME}/Desktop/openssl-ios-dist
    5.37 +else
    5.38 +  check_curl_ver
    5.39 +  export SSL_FLAG=--with-darwinssl
    5.40 +fi
    5.41 +
    5.42 +TMP_DIR=/tmp/build_libcurl_$$
    5.43 +
    5.44 +build_for_arch i386 i386-apple-darwin /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk ${TMP_DIR}/i386 || exit 1
    5.45 +build_for_arch x86_64 x86_64-apple-darwin /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk ${TMP_DIR}/x86_64 || exit 2
    5.46 +build_for_arch arm64 arm-apple-darwin /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk ${TMP_DIR}/arm64 || exit 3
    5.47 +build_for_arch armv7s armv7s-apple-darwin /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk ${TMP_DIR}/armv7s || exit 4
    5.48 +build_for_arch armv7 armv7-apple-darwin /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk ${TMP_DIR}/armv7 || exit 5
    5.49 +
    5.50 +mkdir -p ${TMP_DIR}/lib/
    5.51 +${DEVROOT}/usr/bin/lipo \
    5.52 +	-arch i386 ${TMP_DIR}/i386/lib/libcurl.a \
    5.53 +	-arch x86_64 ${TMP_DIR}/x86_64/lib/libcurl.a \
    5.54 +	-arch armv7 ${TMP_DIR}/armv7/lib/libcurl.a \
    5.55 +	-arch armv7s ${TMP_DIR}/armv7s/lib/libcurl.a \
    5.56 +	-arch arm64 ${TMP_DIR}/arm64/lib/libcurl.a \
    5.57 +	-output ${TMP_DIR}/lib/libcurl.a -create
    5.58 +
    5.59 +cp -r ${TMP_DIR}/armv7s/include ${TMP_DIR}/
    5.60 +curl -O https://raw.githubusercontent.com/sinofool/build-libcurl-ios/master/patch-include.patch
    5.61 +patch ${TMP_DIR}/include/curl/curlbuild.h < patch-include.patch
    5.62 +
    5.63 +mkdir -p ${DIST_DIR}
    5.64 +cp -r ${TMP_DIR}/include ${TMP_DIR}/lib ${DIST_DIR}
    5.65 +
     6.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.2 +++ b/build-mac/curl-7.48.0.tar.gz.asc	Tue Apr 26 10:58:43 2016 +0200
     6.3 @@ -0,0 +1,7 @@
     6.4 +-----BEGIN PGP SIGNATURE-----
     6.5 +Version: GnuPG v1
     6.6 +
     6.7 +iEYEABECAAYFAlbyPpsACgkQeOEcayedXJHUPwCg3XT9+/cTF0vSBZo6fA9T2PC0
     6.8 +WdAAnArdVGI5GVP7SW0wPogEb03qSXPJ
     6.9 +=H/Vf
    6.10 +-----END PGP SIGNATURE-----
     7.1 --- a/build-mac/curl/curl.h	Fri Apr 01 17:33:42 2016 +0200
     7.2 +++ b/build-mac/curl/curl.h	Tue Apr 26 10:58:43 2016 +0200
     7.3 @@ -11,7 +11,7 @@
     7.4   *
     7.5   * This software is licensed as described in the file COPYING, which
     7.6   * you should have received as part of this distribution. The terms
     7.7 - * are also available at http://curl.haxx.se/docs/copyright.html.
     7.8 + * are also available at https://curl.haxx.se/docs/copyright.html.
     7.9   *
    7.10   * You may opt to use, copy, modify, merge, publish, distribute and/or sell
    7.11   * copies of the Software, and permit persons to whom the Software is
    7.12 @@ -24,10 +24,10 @@
    7.13  
    7.14  /*
    7.15   * If you have libcurl problems, all docs and details are found here:
    7.16 - *   http://curl.haxx.se/libcurl/
    7.17 + *   https://curl.haxx.se/libcurl/
    7.18   *
    7.19   * curl-library mailing list subscription and unsubscription web interface:
    7.20 - *   http://cool.haxx.se/mailman/listinfo/curl-library/
    7.21 + *   https://cool.haxx.se/mailman/listinfo/curl-library/
    7.22   */
    7.23  
    7.24  #include "curlver.h"         /* libcurl version defines   */
    7.25 @@ -56,7 +56,8 @@
    7.26  #include <time.h>
    7.27  
    7.28  #if defined(WIN32) && !defined(_WIN32_WCE) && !defined(__CYGWIN__)
    7.29 -#if !(defined(_WINSOCKAPI_) || defined(_WINSOCK_H) || defined(__LWIP_OPT_H__))
    7.30 +#if !(defined(_WINSOCKAPI_) || defined(_WINSOCK_H) || \
    7.31 +      defined(__LWIP_OPT_H__) || defined(LWIP_HDR_OPT_H))
    7.32  /* The check above prevents the winsock2 inclusion if winsock.h already was
    7.33     included, since they can't co-exist without problems */
    7.34  #include <winsock2.h>
    7.35 @@ -112,7 +113,7 @@
    7.36  
    7.37  #ifndef curl_socket_typedef
    7.38  /* socket typedef */
    7.39 -#if defined(WIN32) && !defined(__LWIP_OPT_H__)
    7.40 +#if defined(WIN32) && !defined(__LWIP_OPT_H__) && !defined(LWIP_HDR_OPT_H)
    7.41  typedef SOCKET curl_socket_t;
    7.42  #define CURL_SOCKET_BAD INVALID_SOCKET
    7.43  #else
    7.44 @@ -127,7 +128,8 @@
    7.45    char *name;                       /* pointer to allocated name */
    7.46    long namelength;                  /* length of name length */
    7.47    char *contents;                   /* pointer to allocated data contents */
    7.48 -  long contentslength;              /* length of contents field */
    7.49 +  long contentslength;              /* length of contents field, see also
    7.50 +                                       CURL_HTTPPOST_LARGE */
    7.51    char *buffer;                     /* pointer to allocated buffer contents */
    7.52    long bufferlength;                /* length of buffer field */
    7.53    char *contenttype;                /* Content-Type */
    7.54 @@ -136,24 +138,33 @@
    7.55                                         file, this link should link to following
    7.56                                         files */
    7.57    long flags;                       /* as defined below */
    7.58 -#define HTTPPOST_FILENAME (1<<0)    /* specified content is a file name */
    7.59 -#define HTTPPOST_READFILE (1<<1)    /* specified content is a file name */
    7.60 -#define HTTPPOST_PTRNAME (1<<2)     /* name is only stored pointer
    7.61 -                                       do not free in formfree */
    7.62 -#define HTTPPOST_PTRCONTENTS (1<<3) /* contents is only stored pointer
    7.63 -                                       do not free in formfree */
    7.64 -#define HTTPPOST_BUFFER (1<<4)      /* upload file from buffer */
    7.65 -#define HTTPPOST_PTRBUFFER (1<<5)   /* upload file from pointer contents */
    7.66 -#define HTTPPOST_CALLBACK (1<<6)    /* upload file contents by using the
    7.67 -                                       regular read callback to get the data
    7.68 -                                       and pass the given pointer as custom
    7.69 -                                       pointer */
    7.70 +
    7.71 +/* specified content is a file name */
    7.72 +#define CURL_HTTPPOST_FILENAME (1<<0)
    7.73 +/* specified content is a file name */
    7.74 +#define CURL_HTTPPOST_READFILE (1<<1)
    7.75 +/* name is only stored pointer do not free in formfree */
    7.76 +#define CURL_HTTPPOST_PTRNAME (1<<2)
    7.77 +/* contents is only stored pointer do not free in formfree */
    7.78 +#define CURL_HTTPPOST_PTRCONTENTS (1<<3)
    7.79 +/* upload file from buffer */
    7.80 +#define CURL_HTTPPOST_BUFFER (1<<4)
    7.81 +/* upload file from pointer contents */
    7.82 +#define CURL_HTTPPOST_PTRBUFFER (1<<5)
    7.83 +/* upload file contents by using the regular read callback to get the data and
    7.84 +   pass the given pointer as custom pointer */
    7.85 +#define CURL_HTTPPOST_CALLBACK (1<<6)
    7.86 +/* use size in 'contentlen', added in 7.46.0 */
    7.87 +#define CURL_HTTPPOST_LARGE (1<<7)
    7.88  
    7.89    char *showfilename;               /* The file name to show. If not set, the
    7.90                                         actual file name will be used (if this
    7.91                                         is a file part) */
    7.92    void *userp;                      /* custom pointer used for
    7.93                                         HTTPPOST_CALLBACK posts */
    7.94 +  curl_off_t contentlen;            /* alternative length of contents
    7.95 +                                       field. Used if CURL_HTTPPOST_LARGE is
    7.96 +                                       set. Added in 7.46.0 */
    7.97  };
    7.98  
    7.99  /* This is the CURLOPT_PROGRESSFUNCTION callback proto. It is now considered
   7.100 @@ -725,6 +736,10 @@
   7.101     servers, a user can this way allow the vulnerability back. */
   7.102  #define CURLSSLOPT_ALLOW_BEAST (1<<0)
   7.103  
   7.104 +/* - NO_REVOKE tells libcurl to disable certificate revocation checks for those
   7.105 +   SSL backends where such behavior is present. */
   7.106 +#define CURLSSLOPT_NO_REVOKE (1<<1)
   7.107 +
   7.108  #ifndef CURL_NO_OLDIES /* define this to test if your app builds with all
   7.109                            the obsolete stuff removed! */
   7.110  
   7.111 @@ -814,9 +829,13 @@
   7.112     but 32 */
   7.113  #define CURLOPTTYPE_LONG          0
   7.114  #define CURLOPTTYPE_OBJECTPOINT   10000
   7.115 +#define CURLOPTTYPE_STRINGPOINT   10000
   7.116  #define CURLOPTTYPE_FUNCTIONPOINT 20000
   7.117  #define CURLOPTTYPE_OFF_T         30000
   7.118  
   7.119 +/* *STRINGPOINT is an alias for OBJECTPOINT to allow tools to extract the
   7.120 +   string options from the header file */
   7.121 +
   7.122  /* name is uppercase CURLOPT_<name>,
   7.123     type is one of the defined CURLOPTTYPE_<type>
   7.124     number is unique identifier */
   7.125 @@ -830,6 +849,7 @@
   7.126  /* The macro "##" is ISO C, we assume pre-ISO C doesn't support it. */
   7.127  #define LONG          CURLOPTTYPE_LONG
   7.128  #define OBJECTPOINT   CURLOPTTYPE_OBJECTPOINT
   7.129 +#define STRINGPOINT   CURLOPTTYPE_OBJECTPOINT
   7.130  #define FUNCTIONPOINT CURLOPTTYPE_FUNCTIONPOINT
   7.131  #define OFF_T         CURLOPTTYPE_OFF_T
   7.132  #define CINIT(name,type,number) CURLOPT_/**/name = type + number
   7.133 @@ -846,22 +866,22 @@
   7.134    CINIT(WRITEDATA, OBJECTPOINT, 1),
   7.135  
   7.136    /* The full URL to get/put */
   7.137 -  CINIT(URL, OBJECTPOINT, 2),
   7.138 +  CINIT(URL, STRINGPOINT, 2),
   7.139  
   7.140    /* Port number to connect to, if other than default. */
   7.141    CINIT(PORT, LONG, 3),
   7.142  
   7.143    /* Name of proxy to use. */
   7.144 -  CINIT(PROXY, OBJECTPOINT, 4),
   7.145 +  CINIT(PROXY, STRINGPOINT, 4),
   7.146  
   7.147    /* "user:password;options" to use when fetching. */
   7.148 -  CINIT(USERPWD, OBJECTPOINT, 5),
   7.149 +  CINIT(USERPWD, STRINGPOINT, 5),
   7.150  
   7.151    /* "user:password" to use with proxy. */
   7.152 -  CINIT(PROXYUSERPWD, OBJECTPOINT, 6),
   7.153 +  CINIT(PROXYUSERPWD, STRINGPOINT, 6),
   7.154  
   7.155    /* Range to get, specified as an ASCII string. */
   7.156 -  CINIT(RANGE, OBJECTPOINT, 7),
   7.157 +  CINIT(RANGE, STRINGPOINT, 7),
   7.158  
   7.159    /* not used */
   7.160  
   7.161 @@ -898,14 +918,14 @@
   7.162    CINIT(POSTFIELDS, OBJECTPOINT, 15),
   7.163  
   7.164    /* Set the referrer page (needed by some CGIs) */
   7.165 -  CINIT(REFERER, OBJECTPOINT, 16),
   7.166 +  CINIT(REFERER, STRINGPOINT, 16),
   7.167  
   7.168    /* Set the FTP PORT string (interface name, named or numerical IP address)
   7.169       Use i.e '-' to use default address. */
   7.170 -  CINIT(FTPPORT, OBJECTPOINT, 17),
   7.171 +  CINIT(FTPPORT, STRINGPOINT, 17),
   7.172  
   7.173    /* Set the User-Agent string (examined by some CGIs) */
   7.174 -  CINIT(USERAGENT, OBJECTPOINT, 18),
   7.175 +  CINIT(USERAGENT, STRINGPOINT, 18),
   7.176  
   7.177    /* If the download receives less than "low speed limit" bytes/second
   7.178     * during "low speed time" seconds, the operations is aborted.
   7.179 @@ -928,7 +948,7 @@
   7.180    CINIT(RESUME_FROM, LONG, 21),
   7.181  
   7.182    /* Set cookie in request: */
   7.183 -  CINIT(COOKIE, OBJECTPOINT, 22),
   7.184 +  CINIT(COOKIE, STRINGPOINT, 22),
   7.185  
   7.186    /* This points to a linked list of headers, struct curl_slist kind. This
   7.187       list is also used for RTSP (in spite of its name) */
   7.188 @@ -938,10 +958,10 @@
   7.189    CINIT(HTTPPOST, OBJECTPOINT, 24),
   7.190  
   7.191    /* name of the file keeping your private SSL-certificate */
   7.192 -  CINIT(SSLCERT, OBJECTPOINT, 25),
   7.193 +  CINIT(SSLCERT, STRINGPOINT, 25),
   7.194  
   7.195    /* password for the SSL or SSH private key */
   7.196 -  CINIT(KEYPASSWD, OBJECTPOINT, 26),
   7.197 +  CINIT(KEYPASSWD, STRINGPOINT, 26),
   7.198  
   7.199    /* send TYPE parameter? */
   7.200    CINIT(CRLF, LONG, 27),
   7.201 @@ -955,7 +975,7 @@
   7.202  
   7.203    /* point to a file to read the initial cookies from, also enables
   7.204       "cookie awareness" */
   7.205 -  CINIT(COOKIEFILE, OBJECTPOINT, 31),
   7.206 +  CINIT(COOKIEFILE, STRINGPOINT, 31),
   7.207  
   7.208    /* What version to specifically try to use.
   7.209       See CURL_SSLVERSION defines below. */
   7.210 @@ -974,9 +994,9 @@
   7.211       HTTP: DELETE, TRACE and others
   7.212       FTP: to use a different list command
   7.213       */
   7.214 -  CINIT(CUSTOMREQUEST, OBJECTPOINT, 36),
   7.215 -
   7.216 -  /* HTTP request, for odd commands like DELETE, TRACE and others */
   7.217 +  CINIT(CUSTOMREQUEST, STRINGPOINT, 36),
   7.218 +
   7.219 +  /* FILE handle to use instead of stderr */
   7.220    CINIT(STDERR, OBJECTPOINT, 37),
   7.221  
   7.222    /* 38 is not used */
   7.223 @@ -1033,19 +1053,19 @@
   7.224    CINIT(HTTPPROXYTUNNEL, LONG, 61),
   7.225  
   7.226    /* Set the interface string to use as outgoing network interface */
   7.227 -  CINIT(INTERFACE, OBJECTPOINT, 62),
   7.228 +  CINIT(INTERFACE, STRINGPOINT, 62),
   7.229  
   7.230    /* Set the krb4/5 security level, this also enables krb4/5 awareness.  This
   7.231     * is a string, 'clear', 'safe', 'confidential' or 'private'.  If the string
   7.232     * is set but doesn't match one of these, 'private' will be used.  */
   7.233 -  CINIT(KRBLEVEL, OBJECTPOINT, 63),
   7.234 +  CINIT(KRBLEVEL, STRINGPOINT, 63),
   7.235  
   7.236    /* Set if we should verify the peer in ssl handshake, set 1 to verify. */
   7.237    CINIT(SSL_VERIFYPEER, LONG, 64),
   7.238  
   7.239    /* The CApath or CAfile used to validate the peer certificate
   7.240       this option is used only if SSL_VERIFYPEER is true */
   7.241 -  CINIT(CAINFO, OBJECTPOINT, 65),
   7.242 +  CINIT(CAINFO, STRINGPOINT, 65),
   7.243  
   7.244    /* 66 = OBSOLETE */
   7.245    /* 67 = OBSOLETE */
   7.246 @@ -1079,10 +1099,10 @@
   7.247  
   7.248    /* Set to a file name that contains random data for libcurl to use to
   7.249       seed the random engine when doing SSL connects. */
   7.250 -  CINIT(RANDOM_FILE, OBJECTPOINT, 76),
   7.251 +  CINIT(RANDOM_FILE, STRINGPOINT, 76),
   7.252  
   7.253    /* Set to the Entropy Gathering Daemon socket pathname */
   7.254 -  CINIT(EGDSOCKET, OBJECTPOINT, 77),
   7.255 +  CINIT(EGDSOCKET, STRINGPOINT, 77),
   7.256  
   7.257    /* Time-out connect operations after this amount of seconds, if connects are
   7.258       OK within this time, then fine... This only aborts the connect phase. */
   7.259 @@ -1104,10 +1124,10 @@
   7.260  
   7.261    /* Specify which file name to write all known cookies in after completed
   7.262       operation. Set file name to "-" (dash) to make it go to stdout. */
   7.263 -  CINIT(COOKIEJAR, OBJECTPOINT, 82),
   7.264 +  CINIT(COOKIEJAR, STRINGPOINT, 82),
   7.265  
   7.266    /* Specify which SSL ciphers to use */
   7.267 -  CINIT(SSL_CIPHER_LIST, OBJECTPOINT, 83),
   7.268 +  CINIT(SSL_CIPHER_LIST, STRINGPOINT, 83),
   7.269  
   7.270    /* Specify which HTTP version to use! This must be set to one of the
   7.271       CURL_HTTP_VERSION* enums set below. */
   7.272 @@ -1119,16 +1139,16 @@
   7.273    CINIT(FTP_USE_EPSV, LONG, 85),
   7.274  
   7.275    /* type of the file keeping your SSL-certificate ("DER", "PEM", "ENG") */
   7.276 -  CINIT(SSLCERTTYPE, OBJECTPOINT, 86),
   7.277 +  CINIT(SSLCERTTYPE, STRINGPOINT, 86),
   7.278  
   7.279    /* name of the file keeping your private SSL-key */
   7.280 -  CINIT(SSLKEY, OBJECTPOINT, 87),
   7.281 +  CINIT(SSLKEY, STRINGPOINT, 87),
   7.282  
   7.283    /* type of the file keeping your private SSL-key ("DER", "PEM", "ENG") */
   7.284 -  CINIT(SSLKEYTYPE, OBJECTPOINT, 88),
   7.285 +  CINIT(SSLKEYTYPE, STRINGPOINT, 88),
   7.286  
   7.287    /* crypto engine for the SSL-sub system */
   7.288 -  CINIT(SSLENGINE, OBJECTPOINT, 89),
   7.289 +  CINIT(SSLENGINE, STRINGPOINT, 89),
   7.290  
   7.291    /* set the crypto engine for the SSL-sub system as default
   7.292       the param has no meaning...
   7.293 @@ -1155,7 +1175,7 @@
   7.294  
   7.295    /* The CApath directory used to validate the peer certificate
   7.296       this option is used only if SSL_VERIFYPEER is true */
   7.297 -  CINIT(CAPATH, OBJECTPOINT, 97),
   7.298 +  CINIT(CAPATH, STRINGPOINT, 97),
   7.299  
   7.300    /* Instruct libcurl to use a smaller receive buffer */
   7.301    CINIT(BUFFERSIZE, LONG, 98),
   7.302 @@ -1175,7 +1195,7 @@
   7.303    /* Set the Accept-Encoding string. Use this to tell a server you would like
   7.304       the response to be compressed. Before 7.21.6, this was known as
   7.305       CURLOPT_ENCODING */
   7.306 -  CINIT(ACCEPT_ENCODING, OBJECTPOINT, 102),
   7.307 +  CINIT(ACCEPT_ENCODING, STRINGPOINT, 102),
   7.308  
   7.309    /* Set pointer to private data */
   7.310    CINIT(PRIVATE, OBJECTPOINT, 103),
   7.311 @@ -1256,7 +1276,7 @@
   7.312       to parse (using the CURLOPT_NETRC option). If not set, libcurl will do
   7.313       a poor attempt to find the user's home directory and check for a .netrc
   7.314       file in there. */
   7.315 -  CINIT(NETRC_FILE, OBJECTPOINT, 118),
   7.316 +  CINIT(NETRC_FILE, STRINGPOINT, 118),
   7.317  
   7.318    /* Enable SSL/TLS for FTP, pick one of:
   7.319       CURLUSESSL_TRY     - try using SSL, proceed anyway otherwise
   7.320 @@ -1299,10 +1319,10 @@
   7.321  
   7.322    /* zero terminated string for pass on to the FTP server when asked for
   7.323       "account" info */
   7.324 -  CINIT(FTP_ACCOUNT, OBJECTPOINT, 134),
   7.325 -
   7.326 -  /* feed cookies into cookie engine */
   7.327 -  CINIT(COOKIELIST, OBJECTPOINT, 135),
   7.328 +  CINIT(FTP_ACCOUNT, STRINGPOINT, 134),
   7.329 +
   7.330 +  /* feed cookie into cookie engine */
   7.331 +  CINIT(COOKIELIST, STRINGPOINT, 135),
   7.332  
   7.333    /* ignore Content-Length */
   7.334    CINIT(IGNORE_CONTENT_LENGTH, LONG, 136),
   7.335 @@ -1348,7 +1368,7 @@
   7.336    CINIT(MAX_RECV_SPEED_LARGE, OFF_T, 146),
   7.337  
   7.338    /* Pointer to command string to send if USER/PASS fails. */
   7.339 -  CINIT(FTP_ALTERNATIVE_TO_USER, OBJECTPOINT, 147),
   7.340 +  CINIT(FTP_ALTERNATIVE_TO_USER, STRINGPOINT, 147),
   7.341  
   7.342    /* callback function for setting socket options */
   7.343    CINIT(SOCKOPTFUNCTION, FUNCTIONPOINT, 148),
   7.344 @@ -1362,8 +1382,8 @@
   7.345    CINIT(SSH_AUTH_TYPES, LONG, 151),
   7.346  
   7.347    /* Used by scp/sftp to do public/private key authentication */
   7.348 -  CINIT(SSH_PUBLIC_KEYFILE, OBJECTPOINT, 152),
   7.349 -  CINIT(SSH_PRIVATE_KEYFILE, OBJECTPOINT, 153),
   7.350 +  CINIT(SSH_PUBLIC_KEYFILE, STRINGPOINT, 152),
   7.351 +  CINIT(SSH_PRIVATE_KEYFILE, STRINGPOINT, 153),
   7.352  
   7.353    /* Send CCC (Clear Command Channel) after authentication */
   7.354    CINIT(FTP_SSL_CCC, LONG, 154),
   7.355 @@ -1387,7 +1407,7 @@
   7.356    CINIT(POSTREDIR, LONG, 161),
   7.357  
   7.358    /* used by scp/sftp to verify the host's public key */
   7.359 -  CINIT(SSH_HOST_PUBLIC_KEY_MD5, OBJECTPOINT, 162),
   7.360 +  CINIT(SSH_HOST_PUBLIC_KEY_MD5, STRINGPOINT, 162),
   7.361  
   7.362    /* Callback function for opening socket (instead of socket(2)). Optionally,
   7.363       callback is able change the address or refuse to connect returning
   7.364 @@ -1407,10 +1427,10 @@
   7.365    CINIT(SEEKDATA, OBJECTPOINT, 168),
   7.366  
   7.367    /* CRL file */
   7.368 -  CINIT(CRLFILE, OBJECTPOINT, 169),
   7.369 +  CINIT(CRLFILE, STRINGPOINT, 169),
   7.370  
   7.371    /* Issuer certificate */
   7.372 -  CINIT(ISSUERCERT, OBJECTPOINT, 170),
   7.373 +  CINIT(ISSUERCERT, STRINGPOINT, 170),
   7.374  
   7.375    /* (IPv6) Address scope */
   7.376    CINIT(ADDRESS_SCOPE, LONG, 171),
   7.377 @@ -1420,12 +1440,12 @@
   7.378    CINIT(CERTINFO, LONG, 172),
   7.379  
   7.380    /* "name" and "pwd" to use when fetching. */
   7.381 -  CINIT(USERNAME, OBJECTPOINT, 173),
   7.382 -  CINIT(PASSWORD, OBJECTPOINT, 174),
   7.383 +  CINIT(USERNAME, STRINGPOINT, 173),
   7.384 +  CINIT(PASSWORD, STRINGPOINT, 174),
   7.385  
   7.386      /* "name" and "pwd" to use with Proxy when fetching. */
   7.387 -  CINIT(PROXYUSERNAME, OBJECTPOINT, 175),
   7.388 -  CINIT(PROXYPASSWORD, OBJECTPOINT, 176),
   7.389 +  CINIT(PROXYUSERNAME, STRINGPOINT, 175),
   7.390 +  CINIT(PROXYPASSWORD, STRINGPOINT, 176),
   7.391  
   7.392    /* Comma separated list of hostnames defining no-proxy zones. These should
   7.393       match both hostnames directly, and hostnames within a domain. For
   7.394 @@ -1434,13 +1454,13 @@
   7.395       implementations of this, .local.com will be considered to be the same as
   7.396       local.com. A single * is the only valid wildcard, and effectively
   7.397       disables the use of proxy. */
   7.398 -  CINIT(NOPROXY, OBJECTPOINT, 177),
   7.399 +  CINIT(NOPROXY, STRINGPOINT, 177),
   7.400  
   7.401    /* block size for TFTP transfers */
   7.402    CINIT(TFTP_BLKSIZE, LONG, 178),
   7.403  
   7.404    /* Socks Service */
   7.405 -  CINIT(SOCKS5_GSSAPI_SERVICE, OBJECTPOINT, 179),
   7.406 +  CINIT(SOCKS5_GSSAPI_SERVICE, STRINGPOINT, 179),
   7.407  
   7.408    /* Socks Service */
   7.409    CINIT(SOCKS5_GSSAPI_NEC, LONG, 180),
   7.410 @@ -1458,7 +1478,7 @@
   7.411    CINIT(REDIR_PROTOCOLS, LONG, 182),
   7.412  
   7.413    /* set the SSH knownhost file name to use */
   7.414 -  CINIT(SSH_KNOWNHOSTS, OBJECTPOINT, 183),
   7.415 +  CINIT(SSH_KNOWNHOSTS, STRINGPOINT, 183),
   7.416  
   7.417    /* set the SSH host key callback, must point to a curl_sshkeycallback
   7.418       function */
   7.419 @@ -1468,9 +1488,9 @@
   7.420    CINIT(SSH_KEYDATA, OBJECTPOINT, 185),
   7.421  
   7.422    /* set the SMTP mail originator */
   7.423 -  CINIT(MAIL_FROM, OBJECTPOINT, 186),
   7.424 -
   7.425 -  /* set the SMTP mail receiver(s) */
   7.426 +  CINIT(MAIL_FROM, STRINGPOINT, 186),
   7.427 +
   7.428 +  /* set the list of SMTP mail receiver(s) */
   7.429    CINIT(MAIL_RCPT, OBJECTPOINT, 187),
   7.430  
   7.431    /* FTP: send PRET before PASV */
   7.432 @@ -1480,13 +1500,13 @@
   7.433    CINIT(RTSP_REQUEST, LONG, 189),
   7.434  
   7.435    /* The RTSP session identifier */
   7.436 -  CINIT(RTSP_SESSION_ID, OBJECTPOINT, 190),
   7.437 +  CINIT(RTSP_SESSION_ID, STRINGPOINT, 190),
   7.438  
   7.439    /* The RTSP stream URI */
   7.440 -  CINIT(RTSP_STREAM_URI, OBJECTPOINT, 191),
   7.441 +  CINIT(RTSP_STREAM_URI, STRINGPOINT, 191),
   7.442  
   7.443    /* The Transport: header to use in RTSP requests */
   7.444 -  CINIT(RTSP_TRANSPORT, OBJECTPOINT, 192),
   7.445 +  CINIT(RTSP_TRANSPORT, STRINGPOINT, 192),
   7.446  
   7.447    /* Manually initialize the client RTSP CSeq for this handle */
   7.448    CINIT(RTSP_CLIENT_CSEQ, LONG, 193),
   7.449 @@ -1524,13 +1544,13 @@
   7.450    CINIT(RESOLVE, OBJECTPOINT, 203),
   7.451  
   7.452    /* Set a username for authenticated TLS */
   7.453 -  CINIT(TLSAUTH_USERNAME, OBJECTPOINT, 204),
   7.454 +  CINIT(TLSAUTH_USERNAME, STRINGPOINT, 204),
   7.455  
   7.456    /* Set a password for authenticated TLS */
   7.457 -  CINIT(TLSAUTH_PASSWORD, OBJECTPOINT, 205),
   7.458 +  CINIT(TLSAUTH_PASSWORD, STRINGPOINT, 205),
   7.459  
   7.460    /* Set authentication type for authenticated TLS */
   7.461 -  CINIT(TLSAUTH_TYPE, OBJECTPOINT, 206),
   7.462 +  CINIT(TLSAUTH_TYPE, STRINGPOINT, 206),
   7.463  
   7.464    /* Set to 1 to enable the "TE:" header in HTTP requests to ask for
   7.465       compressed transfer-encoded responses. Set to 0 to disable the use of TE:
   7.466 @@ -1553,7 +1573,7 @@
   7.467    CINIT(GSSAPI_DELEGATION, LONG, 210),
   7.468  
   7.469    /* Set the name servers to use for DNS resolution */
   7.470 -  CINIT(DNS_SERVERS, OBJECTPOINT, 211),
   7.471 +  CINIT(DNS_SERVERS, STRINGPOINT, 211),
   7.472  
   7.473    /* Time-out accept operations (currently for FTP only) after this amount
   7.474       of miliseconds. */
   7.475 @@ -1570,7 +1590,7 @@
   7.476    CINIT(SSL_OPTIONS, LONG, 216),
   7.477  
   7.478    /* Set the SMTP auth originator */
   7.479 -  CINIT(MAIL_AUTH, OBJECTPOINT, 217),
   7.480 +  CINIT(MAIL_AUTH, STRINGPOINT, 217),
   7.481  
   7.482    /* Enable/disable SASL initial response */
   7.483    CINIT(SASL_IR, LONG, 218),
   7.484 @@ -1581,23 +1601,23 @@
   7.485    CINIT(XFERINFOFUNCTION, FUNCTIONPOINT, 219),
   7.486  
   7.487    /* The XOAUTH2 bearer token */
   7.488 -  CINIT(XOAUTH2_BEARER, OBJECTPOINT, 220),
   7.489 +  CINIT(XOAUTH2_BEARER, STRINGPOINT, 220),
   7.490  
   7.491    /* Set the interface string to use as outgoing network
   7.492     * interface for DNS requests.
   7.493     * Only supported by the c-ares DNS backend */
   7.494 -  CINIT(DNS_INTERFACE, OBJECTPOINT, 221),
   7.495 +  CINIT(DNS_INTERFACE, STRINGPOINT, 221),
   7.496  
   7.497    /* Set the local IPv4 address to use for outgoing DNS requests.
   7.498     * Only supported by the c-ares DNS backend */
   7.499 -  CINIT(DNS_LOCAL_IP4, OBJECTPOINT, 222),
   7.500 +  CINIT(DNS_LOCAL_IP4, STRINGPOINT, 222),
   7.501  
   7.502    /* Set the local IPv4 address to use for outgoing DNS requests.
   7.503     * Only supported by the c-ares DNS backend */
   7.504 -  CINIT(DNS_LOCAL_IP6, OBJECTPOINT, 223),
   7.505 +  CINIT(DNS_LOCAL_IP6, STRINGPOINT, 223),
   7.506  
   7.507    /* Set authentication options directly */
   7.508 -  CINIT(LOGIN_OPTIONS, OBJECTPOINT, 224),
   7.509 +  CINIT(LOGIN_OPTIONS, STRINGPOINT, 224),
   7.510  
   7.511    /* Enable/disable TLS NPN extension (http2 over ssl might fail without) */
   7.512    CINIT(SSL_ENABLE_NPN, LONG, 225),
   7.513 @@ -1618,10 +1638,10 @@
   7.514  
   7.515    /* The public key in DER form used to validate the peer public key
   7.516       this option is used only if SSL_VERIFYPEER is true */
   7.517 -  CINIT(PINNEDPUBLICKEY, OBJECTPOINT, 230),
   7.518 +  CINIT(PINNEDPUBLICKEY, STRINGPOINT, 230),
   7.519  
   7.520    /* Path to Unix domain socket */
   7.521 -  CINIT(UNIX_SOCKET_PATH, OBJECTPOINT, 231),
   7.522 +  CINIT(UNIX_SOCKET_PATH, STRINGPOINT, 231),
   7.523  
   7.524    /* Set if we should verify the certificate status. */
   7.525    CINIT(SSL_VERIFYSTATUS, LONG, 232),
   7.526 @@ -1633,14 +1653,29 @@
   7.527    CINIT(PATH_AS_IS, LONG, 234),
   7.528  
   7.529    /* Proxy Service Name */
   7.530 -  CINIT(PROXY_SERVICE_NAME, OBJECTPOINT, 235),
   7.531 +  CINIT(PROXY_SERVICE_NAME, STRINGPOINT, 235),
   7.532  
   7.533    /* Service Name */
   7.534 -  CINIT(SERVICE_NAME, OBJECTPOINT, 236),
   7.535 +  CINIT(SERVICE_NAME, STRINGPOINT, 236),
   7.536  
   7.537    /* Wait/don't wait for pipe/mutex to clarify */
   7.538    CINIT(PIPEWAIT, LONG, 237),
   7.539  
   7.540 +  /* Set the protocol used when curl is given a URL without a protocol */
   7.541 +  CINIT(DEFAULT_PROTOCOL, STRINGPOINT, 238),
   7.542 +
   7.543 +  /* Set stream weight, 1 - 256 (default is 16) */
   7.544 +  CINIT(STREAM_WEIGHT, LONG, 239),
   7.545 +
   7.546 +  /* Set stream dependency on another CURL handle */
   7.547 +  CINIT(STREAM_DEPENDS, OBJECTPOINT, 240),
   7.548 +
   7.549 +  /* Set E-xclusive stream dependency on another CURL handle */
   7.550 +  CINIT(STREAM_DEPENDS_E, OBJECTPOINT, 241),
   7.551 +
   7.552 +  /* Do not send any tftp option requests to the server */
   7.553 +  CINIT(TFTP_NO_OPTIONS, LONG, 242),
   7.554 +
   7.555    CURLOPT_LASTENTRY /* the last unused */
   7.556  } CURLoption;
   7.557  
   7.558 @@ -1690,7 +1725,8 @@
   7.559                               for us! */
   7.560    CURL_HTTP_VERSION_1_0,  /* please use HTTP 1.0 in the request */
   7.561    CURL_HTTP_VERSION_1_1,  /* please use HTTP 1.1 in the request */
   7.562 -  CURL_HTTP_VERSION_2_0,  /* please use HTTP 2.0 in the request */
   7.563 +  CURL_HTTP_VERSION_2_0,  /* please use HTTP 2 in the request */
   7.564 +  CURL_HTTP_VERSION_2TLS, /* use version 2 for HTTPS, version 1.1 for HTTP */
   7.565  
   7.566    CURL_HTTP_VERSION_LAST /* *ILLEGAL* http version */
   7.567  };
   7.568 @@ -1815,6 +1851,7 @@
   7.569    CFINIT(OBSOLETE2),
   7.570  
   7.571    CFINIT(STREAM),
   7.572 +  CFINIT(CONTENTLEN), /* added in 7.46.0, provide a curl_off_t length */
   7.573  
   7.574    CURLFORM_LASTENTRY /* the last unused */
   7.575  } CURLformoption;
   7.576 @@ -2069,12 +2106,13 @@
   7.577    CURLSSLBACKEND_CYASSL = 7,
   7.578    CURLSSLBACKEND_SCHANNEL = 8,
   7.579    CURLSSLBACKEND_DARWINSSL = 9,
   7.580 -  CURLSSLBACKEND_AXTLS = 10
   7.581 +  CURLSSLBACKEND_AXTLS = 10,
   7.582 +  CURLSSLBACKEND_MBEDTLS = 11
   7.583  } curl_sslbackend;
   7.584  
   7.585  /* Information about the SSL library used and the respective internal SSL
   7.586     handle, which can be used to obtain further information regarding the
   7.587 -   connection. Asked for with CURLINFO_TLS_SESSION. */
   7.588 +   connection. Asked for with CURLINFO_TLS_SSL_PTR or CURLINFO_TLS_SESSION. */
   7.589  struct curl_tlssessioninfo {
   7.590    curl_sslbackend backend;
   7.591    void *internals;
   7.592 @@ -2084,6 +2122,7 @@
   7.593  #define CURLINFO_LONG     0x200000
   7.594  #define CURLINFO_DOUBLE   0x300000
   7.595  #define CURLINFO_SLIST    0x400000
   7.596 +#define CURLINFO_SOCKET   0x500000
   7.597  #define CURLINFO_MASK     0x0fffff
   7.598  #define CURLINFO_TYPEMASK 0xf00000
   7.599  
   7.600 @@ -2132,9 +2171,11 @@
   7.601    CURLINFO_LOCAL_IP         = CURLINFO_STRING + 41,
   7.602    CURLINFO_LOCAL_PORT       = CURLINFO_LONG   + 42,
   7.603    CURLINFO_TLS_SESSION      = CURLINFO_SLIST  + 43,
   7.604 +  CURLINFO_ACTIVESOCKET     = CURLINFO_SOCKET + 44,
   7.605 +  CURLINFO_TLS_SSL_PTR      = CURLINFO_SLIST  + 45,
   7.606    /* Fill in new entries below here! */
   7.607  
   7.608 -  CURLINFO_LASTONE          = 43
   7.609 +  CURLINFO_LASTONE          = 45
   7.610  } CURLINFO;
   7.611  
   7.612  /* CURLINFO_RESPONSE_CODE is the new name for the option previously known as
   7.613 @@ -2294,6 +2335,8 @@
   7.614  #define CURL_VERSION_GSSAPI       (1<<17) /* Built against a GSS-API library */
   7.615  #define CURL_VERSION_KERBEROS5    (1<<18) /* Kerberos V5 auth is supported */
   7.616  #define CURL_VERSION_UNIX_SOCKETS (1<<19) /* Unix domain sockets support */
   7.617 +#define CURL_VERSION_PSL          (1<<20) /* Mozilla's Public Suffix List, used
   7.618 +                                             for cookie domain verification */
   7.619  
   7.620   /*
   7.621   * NAME curl_version_info()
     8.1 --- a/build-mac/curl/curlbuild.h	Fri Apr 01 17:33:42 2016 +0200
     8.2 +++ b/build-mac/curl/curlbuild.h	Tue Apr 26 10:58:43 2016 +0200
     8.3 @@ -1,12 +1,234 @@
     8.4 -#ifdef __LP64__
     8.5 +/* include/curl/curlbuild.h.  Generated from curlbuild.h.in by configure.  */
     8.6 +#ifndef __CURL_CURLBUILD_H
     8.7 +#define __CURL_CURLBUILD_H
     8.8 +/***************************************************************************
     8.9 + *                                  _   _ ____  _
    8.10 + *  Project                     ___| | | |  _ \| |
    8.11 + *                             / __| | | | |_) | |
    8.12 + *                            | (__| |_| |  _ <| |___
    8.13 + *                             \___|\___/|_| \_\_____|
    8.14 + *
    8.15 + * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
    8.16 + *
    8.17 + * This software is licensed as described in the file COPYING, which
    8.18 + * you should have received as part of this distribution. The terms
    8.19 + * are also available at https://curl.haxx.se/docs/copyright.html.
    8.20 + *
    8.21 + * You may opt to use, copy, modify, merge, publish, distribute and/or sell
    8.22 + * copies of the Software, and permit persons to whom the Software is
    8.23 + * furnished to do so, under the terms of the COPYING file.
    8.24 + *
    8.25 + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
    8.26 + * KIND, either express or implied.
    8.27 + *
    8.28 + ***************************************************************************/
    8.29  
    8.30 -// 64-bit code
    8.31 -#include "curlbuild64.h"
    8.32 +/* ================================================================ */
    8.33 +/*               NOTES FOR CONFIGURE CAPABLE SYSTEMS                */
    8.34 +/* ================================================================ */
    8.35  
    8.36 -#else
    8.37 +/*
    8.38 + * NOTE 1:
    8.39 + * -------
    8.40 + *
    8.41 + * Nothing in this file is intended to be modified or adjusted by the
    8.42 + * curl library user nor by the curl library builder.
    8.43 + *
    8.44 + * If you think that something actually needs to be changed, adjusted
    8.45 + * or fixed in this file, then, report it on the libcurl development
    8.46 + * mailing list: https://cool.haxx.se/mailman/listinfo/curl-library/
    8.47 + *
    8.48 + * This header file shall only export symbols which are 'curl' or 'CURL'
    8.49 + * prefixed, otherwise public name space would be polluted.
    8.50 + *
    8.51 + * NOTE 2:
    8.52 + * -------
    8.53 + *
    8.54 + * Right now you might be staring at file include/curl/curlbuild.h.in or
    8.55 + * at file include/curl/curlbuild.h, this is due to the following reason:
    8.56 + *
    8.57 + * On systems capable of running the configure script, the configure process
    8.58 + * will overwrite the distributed include/curl/curlbuild.h file with one that
    8.59 + * is suitable and specific to the library being configured and built, which
    8.60 + * is generated from the include/curl/curlbuild.h.in template file.
    8.61 + *
    8.62 + */
    8.63  
    8.64 -// 32-bit code
    8.65 -#include "curlbuild32.h"
    8.66 +/* ================================================================ */
    8.67 +/*  DEFINITION OF THESE SYMBOLS SHALL NOT TAKE PLACE ANYWHERE ELSE  */
    8.68 +/* ================================================================ */
    8.69  
    8.70 +#ifdef CURL_SIZEOF_LONG
    8.71 +#error "CURL_SIZEOF_LONG shall not be defined except in curlbuild.h"
    8.72 +   Error Compilation_aborted_CURL_SIZEOF_LONG_already_defined
    8.73  #endif
    8.74  
    8.75 +#ifdef CURL_TYPEOF_CURL_SOCKLEN_T
    8.76 +#error "CURL_TYPEOF_CURL_SOCKLEN_T shall not be defined except in curlbuild.h"
    8.77 +   Error Compilation_aborted_CURL_TYPEOF_CURL_SOCKLEN_T_already_defined
    8.78 +#endif
    8.79 +
    8.80 +#ifdef CURL_SIZEOF_CURL_SOCKLEN_T
    8.81 +#error "CURL_SIZEOF_CURL_SOCKLEN_T shall not be defined except in curlbuild.h"
    8.82 +   Error Compilation_aborted_CURL_SIZEOF_CURL_SOCKLEN_T_already_defined
    8.83 +#endif
    8.84 +
    8.85 +#ifdef CURL_TYPEOF_CURL_OFF_T
    8.86 +#error "CURL_TYPEOF_CURL_OFF_T shall not be defined except in curlbuild.h"
    8.87 +   Error Compilation_aborted_CURL_TYPEOF_CURL_OFF_T_already_defined
    8.88 +#endif
    8.89 +
    8.90 +#ifdef CURL_FORMAT_CURL_OFF_T
    8.91 +#error "CURL_FORMAT_CURL_OFF_T shall not be defined except in curlbuild.h"
    8.92 +   Error Compilation_aborted_CURL_FORMAT_CURL_OFF_T_already_defined
    8.93 +#endif
    8.94 +
    8.95 +#ifdef CURL_FORMAT_CURL_OFF_TU
    8.96 +#error "CURL_FORMAT_CURL_OFF_TU shall not be defined except in curlbuild.h"
    8.97 +   Error Compilation_aborted_CURL_FORMAT_CURL_OFF_TU_already_defined
    8.98 +#endif
    8.99 +
   8.100 +#ifdef CURL_FORMAT_OFF_T
   8.101 +#error "CURL_FORMAT_OFF_T shall not be defined except in curlbuild.h"
   8.102 +   Error Compilation_aborted_CURL_FORMAT_OFF_T_already_defined
   8.103 +#endif
   8.104 +
   8.105 +#ifdef CURL_SIZEOF_CURL_OFF_T
   8.106 +#error "CURL_SIZEOF_CURL_OFF_T shall not be defined except in curlbuild.h"
   8.107 +   Error Compilation_aborted_CURL_SIZEOF_CURL_OFF_T_already_defined
   8.108 +#endif
   8.109 +
   8.110 +#ifdef CURL_SUFFIX_CURL_OFF_T
   8.111 +#error "CURL_SUFFIX_CURL_OFF_T shall not be defined except in curlbuild.h"
   8.112 +   Error Compilation_aborted_CURL_SUFFIX_CURL_OFF_T_already_defined
   8.113 +#endif
   8.114 +
   8.115 +#ifdef CURL_SUFFIX_CURL_OFF_TU
   8.116 +#error "CURL_SUFFIX_CURL_OFF_TU shall not be defined except in curlbuild.h"
   8.117 +   Error Compilation_aborted_CURL_SUFFIX_CURL_OFF_TU_already_defined
   8.118 +#endif
   8.119 +
   8.120 +/* ================================================================ */
   8.121 +/*  EXTERNAL INTERFACE SETTINGS FOR CONFIGURE CAPABLE SYSTEMS ONLY  */
   8.122 +/* ================================================================ */
   8.123 +
   8.124 +/* Configure process defines this to 1 when it finds out that system  */
   8.125 +/* header file ws2tcpip.h must be included by the external interface. */
   8.126 +/* #undef CURL_PULL_WS2TCPIP_H */
   8.127 +#ifdef CURL_PULL_WS2TCPIP_H
   8.128 +#  ifndef WIN32_LEAN_AND_MEAN
   8.129 +#    define WIN32_LEAN_AND_MEAN
   8.130 +#  endif
   8.131 +#  include <windows.h>
   8.132 +#  include <winsock2.h>
   8.133 +#  include <ws2tcpip.h>
   8.134 +#endif
   8.135 +
   8.136 +/* Configure process defines this to 1 when it finds out that system   */
   8.137 +/* header file sys/types.h must be included by the external interface. */
   8.138 +#define CURL_PULL_SYS_TYPES_H 1
   8.139 +#ifdef CURL_PULL_SYS_TYPES_H
   8.140 +#  include <sys/types.h>
   8.141 +#endif
   8.142 +
   8.143 +/* Configure process defines this to 1 when it finds out that system */
   8.144 +/* header file stdint.h must be included by the external interface.  */
   8.145 +#ifdef __LP64__
   8.146 +/* #undef CURL_PULL_STDINT_H */
   8.147 +#else
   8.148 +#define CURL_PULL_STDINT_H 1
   8.149 +#endif
   8.150 +#ifdef CURL_PULL_STDINT_H
   8.151 +#  include <stdint.h>
   8.152 +#endif
   8.153 +
   8.154 +/* Configure process defines this to 1 when it finds out that system  */
   8.155 +/* header file inttypes.h must be included by the external interface. */
   8.156 +#ifdef __LP64__
   8.157 +/* #undef CURL_PULL_INTTYPES_H */
   8.158 +#else
   8.159 +#define CURL_PULL_INTTYPES_H 1
   8.160 +#endif
   8.161 +#ifdef CURL_PULL_INTTYPES_H
   8.162 +#  include <inttypes.h>
   8.163 +#endif
   8.164 +
   8.165 +/* Configure process defines this to 1 when it finds out that system    */
   8.166 +/* header file sys/socket.h must be included by the external interface. */
   8.167 +#define CURL_PULL_SYS_SOCKET_H 1
   8.168 +#ifdef CURL_PULL_SYS_SOCKET_H
   8.169 +#  include <sys/socket.h>
   8.170 +#endif
   8.171 +
   8.172 +/* Configure process defines this to 1 when it finds out that system  */
   8.173 +/* header file sys/poll.h must be included by the external interface. */
   8.174 +/* #undef CURL_PULL_SYS_POLL_H */
   8.175 +#ifdef CURL_PULL_SYS_POLL_H
   8.176 +#  include <sys/poll.h>
   8.177 +#endif
   8.178 +
   8.179 +/* The size of `long', as computed by sizeof. */
   8.180 +#ifdef __LP64__
   8.181 +#define CURL_SIZEOF_LONG 8
   8.182 +#else
   8.183 +#define CURL_SIZEOF_LONG 4
   8.184 +#endif
   8.185 +
   8.186 +/* Integral data type used for curl_socklen_t. */
   8.187 +#define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t
   8.188 +
   8.189 +/* The size of `curl_socklen_t', as computed by sizeof. */
   8.190 +#define CURL_SIZEOF_CURL_SOCKLEN_T 4
   8.191 +
   8.192 +/* Data type definition of curl_socklen_t. */
   8.193 +typedef CURL_TYPEOF_CURL_SOCKLEN_T curl_socklen_t;
   8.194 +
   8.195 +/* Signed integral data type used for curl_off_t. */
   8.196 +#ifdef __LP64__
   8.197 +#define CURL_TYPEOF_CURL_OFF_T long
   8.198 +#else
   8.199 +#define CURL_TYPEOF_CURL_OFF_T int64_t
   8.200 +#endif
   8.201 +
   8.202 +/* Data type definition of curl_off_t. */
   8.203 +typedef CURL_TYPEOF_CURL_OFF_T curl_off_t;
   8.204 +
   8.205 +/* curl_off_t formatting string directive without "%" conversion specifier. */
   8.206 +#ifdef __LP64__
   8.207 +#define CURL_FORMAT_CURL_OFF_T "ld"
   8.208 +#else
   8.209 +#define CURL_FORMAT_CURL_OFF_T "lld"
   8.210 +#endif
   8.211 +
   8.212 +/* unsigned curl_off_t formatting string without "%" conversion specifier. */
   8.213 +#ifdef __LP64__
   8.214 +#define CURL_FORMAT_CURL_OFF_TU "lu"
   8.215 +#else
   8.216 +#define CURL_FORMAT_CURL_OFF_TU "llu"
   8.217 +#endif
   8.218 +
   8.219 +/* curl_off_t formatting string directive with "%" conversion specifier. */
   8.220 +#ifdef __LP64__
   8.221 +#define CURL_FORMAT_OFF_T "%ld"
   8.222 +#else
   8.223 +#define CURL_FORMAT_OFF_T "%lld"
   8.224 +#endif
   8.225 +
   8.226 +/* The size of `curl_off_t', as computed by sizeof. */
   8.227 +#define CURL_SIZEOF_CURL_OFF_T 8
   8.228 +
   8.229 +/* curl_off_t constant suffix. */
   8.230 +#ifdef __LP64__
   8.231 +#define CURL_SUFFIX_CURL_OFF_T L
   8.232 +#else
   8.233 +#define CURL_SUFFIX_CURL_OFF_T LL
   8.234 +#endif
   8.235 +
   8.236 +/* unsigned curl_off_t constant suffix. */
   8.237 +#ifdef __LP64__
   8.238 +#define CURL_SUFFIX_CURL_OFF_TU UL
   8.239 +#else
   8.240 +#define CURL_SUFFIX_CURL_OFF_TU ULL
   8.241 +#endif
   8.242 +
   8.243 +#endif /* __CURL_CURLBUILD_H */
     9.1 --- a/build-mac/curl/curlbuild32.h	Fri Apr 01 17:33:42 2016 +0200
     9.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     9.3 @@ -1,198 +0,0 @@
     9.4 -/* include/curl/curlbuild.h.  Generated from curlbuild.h.in by configure.  */
     9.5 -#ifndef __CURL_CURLBUILD_H
     9.6 -#define __CURL_CURLBUILD_H
     9.7 -/***************************************************************************
     9.8 - *                                  _   _ ____  _
     9.9 - *  Project                     ___| | | |  _ \| |
    9.10 - *                             / __| | | | |_) | |
    9.11 - *                            | (__| |_| |  _ <| |___
    9.12 - *                             \___|\___/|_| \_\_____|
    9.13 - *
    9.14 - * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
    9.15 - *
    9.16 - * This software is licensed as described in the file COPYING, which
    9.17 - * you should have received as part of this distribution. The terms
    9.18 - * are also available at http://curl.haxx.se/docs/copyright.html.
    9.19 - *
    9.20 - * You may opt to use, copy, modify, merge, publish, distribute and/or sell
    9.21 - * copies of the Software, and permit persons to whom the Software is
    9.22 - * furnished to do so, under the terms of the COPYING file.
    9.23 - *
    9.24 - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
    9.25 - * KIND, either express or implied.
    9.26 - *
    9.27 - ***************************************************************************/
    9.28 -
    9.29 -/* ================================================================ */
    9.30 -/*               NOTES FOR CONFIGURE CAPABLE SYSTEMS                */
    9.31 -/* ================================================================ */
    9.32 -
    9.33 -/*
    9.34 - * NOTE 1:
    9.35 - * -------
    9.36 - *
    9.37 - * Nothing in this file is intended to be modified or adjusted by the
    9.38 - * curl library user nor by the curl library builder.
    9.39 - *
    9.40 - * If you think that something actually needs to be changed, adjusted
    9.41 - * or fixed in this file, then, report it on the libcurl development
    9.42 - * mailing list: http://cool.haxx.se/mailman/listinfo/curl-library/
    9.43 - *
    9.44 - * This header file shall only export symbols which are 'curl' or 'CURL'
    9.45 - * prefixed, otherwise public name space would be polluted.
    9.46 - *
    9.47 - * NOTE 2:
    9.48 - * -------
    9.49 - *
    9.50 - * Right now you might be staring at file include/curl/curlbuild.h.in or
    9.51 - * at file include/curl/curlbuild.h, this is due to the following reason:
    9.52 - *
    9.53 - * On systems capable of running the configure script, the configure process
    9.54 - * will overwrite the distributed include/curl/curlbuild.h file with one that
    9.55 - * is suitable and specific to the library being configured and built, which
    9.56 - * is generated from the include/curl/curlbuild.h.in template file.
    9.57 - *
    9.58 - */
    9.59 -
    9.60 -/* ================================================================ */
    9.61 -/*  DEFINITION OF THESE SYMBOLS SHALL NOT TAKE PLACE ANYWHERE ELSE  */
    9.62 -/* ================================================================ */
    9.63 -
    9.64 -#ifdef CURL_SIZEOF_LONG
    9.65 -#error "CURL_SIZEOF_LONG shall not be defined except in curlbuild.h"
    9.66 -   Error Compilation_aborted_CURL_SIZEOF_LONG_already_defined
    9.67 -#endif
    9.68 -
    9.69 -#ifdef CURL_TYPEOF_CURL_SOCKLEN_T
    9.70 -#error "CURL_TYPEOF_CURL_SOCKLEN_T shall not be defined except in curlbuild.h"
    9.71 -   Error Compilation_aborted_CURL_TYPEOF_CURL_SOCKLEN_T_already_defined
    9.72 -#endif
    9.73 -
    9.74 -#ifdef CURL_SIZEOF_CURL_SOCKLEN_T
    9.75 -#error "CURL_SIZEOF_CURL_SOCKLEN_T shall not be defined except in curlbuild.h"
    9.76 -   Error Compilation_aborted_CURL_SIZEOF_CURL_SOCKLEN_T_already_defined
    9.77 -#endif
    9.78 -
    9.79 -#ifdef CURL_TYPEOF_CURL_OFF_T
    9.80 -#error "CURL_TYPEOF_CURL_OFF_T shall not be defined except in curlbuild.h"
    9.81 -   Error Compilation_aborted_CURL_TYPEOF_CURL_OFF_T_already_defined
    9.82 -#endif
    9.83 -
    9.84 -#ifdef CURL_FORMAT_CURL_OFF_T
    9.85 -#error "CURL_FORMAT_CURL_OFF_T shall not be defined except in curlbuild.h"
    9.86 -   Error Compilation_aborted_CURL_FORMAT_CURL_OFF_T_already_defined
    9.87 -#endif
    9.88 -
    9.89 -#ifdef CURL_FORMAT_CURL_OFF_TU
    9.90 -#error "CURL_FORMAT_CURL_OFF_TU shall not be defined except in curlbuild.h"
    9.91 -   Error Compilation_aborted_CURL_FORMAT_CURL_OFF_TU_already_defined
    9.92 -#endif
    9.93 -
    9.94 -#ifdef CURL_FORMAT_OFF_T
    9.95 -#error "CURL_FORMAT_OFF_T shall not be defined except in curlbuild.h"
    9.96 -   Error Compilation_aborted_CURL_FORMAT_OFF_T_already_defined
    9.97 -#endif
    9.98 -
    9.99 -#ifdef CURL_SIZEOF_CURL_OFF_T
   9.100 -#error "CURL_SIZEOF_CURL_OFF_T shall not be defined except in curlbuild.h"
   9.101 -   Error Compilation_aborted_CURL_SIZEOF_CURL_OFF_T_already_defined
   9.102 -#endif
   9.103 -
   9.104 -#ifdef CURL_SUFFIX_CURL_OFF_T
   9.105 -#error "CURL_SUFFIX_CURL_OFF_T shall not be defined except in curlbuild.h"
   9.106 -   Error Compilation_aborted_CURL_SUFFIX_CURL_OFF_T_already_defined
   9.107 -#endif
   9.108 -
   9.109 -#ifdef CURL_SUFFIX_CURL_OFF_TU
   9.110 -#error "CURL_SUFFIX_CURL_OFF_TU shall not be defined except in curlbuild.h"
   9.111 -   Error Compilation_aborted_CURL_SUFFIX_CURL_OFF_TU_already_defined
   9.112 -#endif
   9.113 -
   9.114 -/* ================================================================ */
   9.115 -/*  EXTERNAL INTERFACE SETTINGS FOR CONFIGURE CAPABLE SYSTEMS ONLY  */
   9.116 -/* ================================================================ */
   9.117 -
   9.118 -/* Configure process defines this to 1 when it finds out that system  */
   9.119 -/* header file ws2tcpip.h must be included by the external interface. */
   9.120 -/* #undef CURL_PULL_WS2TCPIP_H */
   9.121 -#ifdef CURL_PULL_WS2TCPIP_H
   9.122 -#  ifndef WIN32_LEAN_AND_MEAN
   9.123 -#    define WIN32_LEAN_AND_MEAN
   9.124 -#  endif
   9.125 -#  include <windows.h>
   9.126 -#  include <winsock2.h>
   9.127 -#  include <ws2tcpip.h>
   9.128 -#endif
   9.129 -
   9.130 -/* Configure process defines this to 1 when it finds out that system   */
   9.131 -/* header file sys/types.h must be included by the external interface. */
   9.132 -#define CURL_PULL_SYS_TYPES_H 1
   9.133 -#ifdef CURL_PULL_SYS_TYPES_H
   9.134 -#  include <sys/types.h>
   9.135 -#endif
   9.136 -
   9.137 -/* Configure process defines this to 1 when it finds out that system */
   9.138 -/* header file stdint.h must be included by the external interface.  */
   9.139 -#define CURL_PULL_STDINT_H 1
   9.140 -#ifdef CURL_PULL_STDINT_H
   9.141 -#  include <stdint.h>
   9.142 -#endif
   9.143 -
   9.144 -/* Configure process defines this to 1 when it finds out that system  */
   9.145 -/* header file inttypes.h must be included by the external interface. */
   9.146 -#define CURL_PULL_INTTYPES_H 1
   9.147 -#ifdef CURL_PULL_INTTYPES_H
   9.148 -#  include <inttypes.h>
   9.149 -#endif
   9.150 -
   9.151 -/* Configure process defines this to 1 when it finds out that system    */
   9.152 -/* header file sys/socket.h must be included by the external interface. */
   9.153 -#define CURL_PULL_SYS_SOCKET_H 1
   9.154 -#ifdef CURL_PULL_SYS_SOCKET_H
   9.155 -#  include <sys/socket.h>
   9.156 -#endif
   9.157 -
   9.158 -/* Configure process defines this to 1 when it finds out that system  */
   9.159 -/* header file sys/poll.h must be included by the external interface. */
   9.160 -/* #undef CURL_PULL_SYS_POLL_H */
   9.161 -#ifdef CURL_PULL_SYS_POLL_H
   9.162 -#  include <sys/poll.h>
   9.163 -#endif
   9.164 -
   9.165 -/* The size of `long', as computed by sizeof. */
   9.166 -#define CURL_SIZEOF_LONG 4
   9.167 -
   9.168 -/* Integral data type used for curl_socklen_t. */
   9.169 -#define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t
   9.170 -
   9.171 -/* The size of `curl_socklen_t', as computed by sizeof. */
   9.172 -#define CURL_SIZEOF_CURL_SOCKLEN_T 4
   9.173 -
   9.174 -/* Data type definition of curl_socklen_t. */
   9.175 -typedef CURL_TYPEOF_CURL_SOCKLEN_T curl_socklen_t;
   9.176 -
   9.177 -/* Signed integral data type used for curl_off_t. */
   9.178 -#define CURL_TYPEOF_CURL_OFF_T int64_t
   9.179 -
   9.180 -/* Data type definition of curl_off_t. */
   9.181 -typedef CURL_TYPEOF_CURL_OFF_T curl_off_t;
   9.182 -
   9.183 -/* curl_off_t formatting string directive without "%" conversion specifier. */
   9.184 -#define CURL_FORMAT_CURL_OFF_T "lld"
   9.185 -
   9.186 -/* unsigned curl_off_t formatting string without "%" conversion specifier. */
   9.187 -#define CURL_FORMAT_CURL_OFF_TU "llu"
   9.188 -
   9.189 -/* curl_off_t formatting string directive with "%" conversion specifier. */
   9.190 -#define CURL_FORMAT_OFF_T "%lld"
   9.191 -
   9.192 -/* The size of `curl_off_t', as computed by sizeof. */
   9.193 -#define CURL_SIZEOF_CURL_OFF_T 8
   9.194 -
   9.195 -/* curl_off_t constant suffix. */
   9.196 -#define CURL_SUFFIX_CURL_OFF_T LL
   9.197 -
   9.198 -/* unsigned curl_off_t constant suffix. */
   9.199 -#define CURL_SUFFIX_CURL_OFF_TU ULL
   9.200 -
   9.201 -#endif /* __CURL_CURLBUILD_H */
    10.1 --- a/build-mac/curl/curlbuild64.h	Fri Apr 01 17:33:42 2016 +0200
    10.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    10.3 @@ -1,198 +0,0 @@
    10.4 -/* include/curl/curlbuild.h.  Generated from curlbuild.h.in by configure.  */
    10.5 -#ifndef __CURL_CURLBUILD_H
    10.6 -#define __CURL_CURLBUILD_H
    10.7 -/***************************************************************************
    10.8 - *                                  _   _ ____  _
    10.9 - *  Project                     ___| | | |  _ \| |
   10.10 - *                             / __| | | | |_) | |
   10.11 - *                            | (__| |_| |  _ <| |___
   10.12 - *                             \___|\___/|_| \_\_____|
   10.13 - *
   10.14 - * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
   10.15 - *
   10.16 - * This software is licensed as described in the file COPYING, which
   10.17 - * you should have received as part of this distribution. The terms
   10.18 - * are also available at http://curl.haxx.se/docs/copyright.html.
   10.19 - *
   10.20 - * You may opt to use, copy, modify, merge, publish, distribute and/or sell
   10.21 - * copies of the Software, and permit persons to whom the Software is
   10.22 - * furnished to do so, under the terms of the COPYING file.
   10.23 - *
   10.24 - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
   10.25 - * KIND, either express or implied.
   10.26 - *
   10.27 - ***************************************************************************/
   10.28 -
   10.29 -/* ================================================================ */
   10.30 -/*               NOTES FOR CONFIGURE CAPABLE SYSTEMS                */
   10.31 -/* ================================================================ */
   10.32 -
   10.33 -/*
   10.34 - * NOTE 1:
   10.35 - * -------
   10.36 - *
   10.37 - * Nothing in this file is intended to be modified or adjusted by the
   10.38 - * curl library user nor by the curl library builder.
   10.39 - *
   10.40 - * If you think that something actually needs to be changed, adjusted
   10.41 - * or fixed in this file, then, report it on the libcurl development
   10.42 - * mailing list: http://cool.haxx.se/mailman/listinfo/curl-library/
   10.43 - *
   10.44 - * This header file shall only export symbols which are 'curl' or 'CURL'
   10.45 - * prefixed, otherwise public name space would be polluted.
   10.46 - *
   10.47 - * NOTE 2:
   10.48 - * -------
   10.49 - *
   10.50 - * Right now you might be staring at file include/curl/curlbuild.h.in or
   10.51 - * at file include/curl/curlbuild.h, this is due to the following reason:
   10.52 - *
   10.53 - * On systems capable of running the configure script, the configure process
   10.54 - * will overwrite the distributed include/curl/curlbuild.h file with one that
   10.55 - * is suitable and specific to the library being configured and built, which
   10.56 - * is generated from the include/curl/curlbuild.h.in template file.
   10.57 - *
   10.58 - */
   10.59 -
   10.60 -/* ================================================================ */
   10.61 -/*  DEFINITION OF THESE SYMBOLS SHALL NOT TAKE PLACE ANYWHERE ELSE  */
   10.62 -/* ================================================================ */
   10.63 -
   10.64 -#ifdef CURL_SIZEOF_LONG
   10.65 -#error "CURL_SIZEOF_LONG shall not be defined except in curlbuild.h"
   10.66 -   Error Compilation_aborted_CURL_SIZEOF_LONG_already_defined
   10.67 -#endif
   10.68 -
   10.69 -#ifdef CURL_TYPEOF_CURL_SOCKLEN_T
   10.70 -#error "CURL_TYPEOF_CURL_SOCKLEN_T shall not be defined except in curlbuild.h"
   10.71 -   Error Compilation_aborted_CURL_TYPEOF_CURL_SOCKLEN_T_already_defined
   10.72 -#endif
   10.73 -
   10.74 -#ifdef CURL_SIZEOF_CURL_SOCKLEN_T
   10.75 -#error "CURL_SIZEOF_CURL_SOCKLEN_T shall not be defined except in curlbuild.h"
   10.76 -   Error Compilation_aborted_CURL_SIZEOF_CURL_SOCKLEN_T_already_defined
   10.77 -#endif
   10.78 -
   10.79 -#ifdef CURL_TYPEOF_CURL_OFF_T
   10.80 -#error "CURL_TYPEOF_CURL_OFF_T shall not be defined except in curlbuild.h"
   10.81 -   Error Compilation_aborted_CURL_TYPEOF_CURL_OFF_T_already_defined
   10.82 -#endif
   10.83 -
   10.84 -#ifdef CURL_FORMAT_CURL_OFF_T
   10.85 -#error "CURL_FORMAT_CURL_OFF_T shall not be defined except in curlbuild.h"
   10.86 -   Error Compilation_aborted_CURL_FORMAT_CURL_OFF_T_already_defined
   10.87 -#endif
   10.88 -
   10.89 -#ifdef CURL_FORMAT_CURL_OFF_TU
   10.90 -#error "CURL_FORMAT_CURL_OFF_TU shall not be defined except in curlbuild.h"
   10.91 -   Error Compilation_aborted_CURL_FORMAT_CURL_OFF_TU_already_defined
   10.92 -#endif
   10.93 -
   10.94 -#ifdef CURL_FORMAT_OFF_T
   10.95 -#error "CURL_FORMAT_OFF_T shall not be defined except in curlbuild.h"
   10.96 -   Error Compilation_aborted_CURL_FORMAT_OFF_T_already_defined
   10.97 -#endif
   10.98 -
   10.99 -#ifdef CURL_SIZEOF_CURL_OFF_T
  10.100 -#error "CURL_SIZEOF_CURL_OFF_T shall not be defined except in curlbuild.h"
  10.101 -   Error Compilation_aborted_CURL_SIZEOF_CURL_OFF_T_already_defined
  10.102 -#endif
  10.103 -
  10.104 -#ifdef CURL_SUFFIX_CURL_OFF_T
  10.105 -#error "CURL_SUFFIX_CURL_OFF_T shall not be defined except in curlbuild.h"
  10.106 -   Error Compilation_aborted_CURL_SUFFIX_CURL_OFF_T_already_defined
  10.107 -#endif
  10.108 -
  10.109 -#ifdef CURL_SUFFIX_CURL_OFF_TU
  10.110 -#error "CURL_SUFFIX_CURL_OFF_TU shall not be defined except in curlbuild.h"
  10.111 -   Error Compilation_aborted_CURL_SUFFIX_CURL_OFF_TU_already_defined
  10.112 -#endif
  10.113 -
  10.114 -/* ================================================================ */
  10.115 -/*  EXTERNAL INTERFACE SETTINGS FOR CONFIGURE CAPABLE SYSTEMS ONLY  */
  10.116 -/* ================================================================ */
  10.117 -
  10.118 -/* Configure process defines this to 1 when it finds out that system  */
  10.119 -/* header file ws2tcpip.h must be included by the external interface. */
  10.120 -/* #undef CURL_PULL_WS2TCPIP_H */
  10.121 -#ifdef CURL_PULL_WS2TCPIP_H
  10.122 -#  ifndef WIN32_LEAN_AND_MEAN
  10.123 -#    define WIN32_LEAN_AND_MEAN
  10.124 -#  endif
  10.125 -#  include <windows.h>
  10.126 -#  include <winsock2.h>
  10.127 -#  include <ws2tcpip.h>
  10.128 -#endif
  10.129 -
  10.130 -/* Configure process defines this to 1 when it finds out that system   */
  10.131 -/* header file sys/types.h must be included by the external interface. */
  10.132 -#define CURL_PULL_SYS_TYPES_H 1
  10.133 -#ifdef CURL_PULL_SYS_TYPES_H
  10.134 -#  include <sys/types.h>
  10.135 -#endif
  10.136 -
  10.137 -/* Configure process defines this to 1 when it finds out that system */
  10.138 -/* header file stdint.h must be included by the external interface.  */
  10.139 -/* #undef CURL_PULL_STDINT_H */
  10.140 -#ifdef CURL_PULL_STDINT_H
  10.141 -#  include <stdint.h>
  10.142 -#endif
  10.143 -
  10.144 -/* Configure process defines this to 1 when it finds out that system  */
  10.145 -/* header file inttypes.h must be included by the external interface. */
  10.146 -/* #undef CURL_PULL_INTTYPES_H */
  10.147 -#ifdef CURL_PULL_INTTYPES_H
  10.148 -#  include <inttypes.h>
  10.149 -#endif
  10.150 -
  10.151 -/* Configure process defines this to 1 when it finds out that system    */
  10.152 -/* header file sys/socket.h must be included by the external interface. */
  10.153 -#define CURL_PULL_SYS_SOCKET_H 1
  10.154 -#ifdef CURL_PULL_SYS_SOCKET_H
  10.155 -#  include <sys/socket.h>
  10.156 -#endif
  10.157 -
  10.158 -/* Configure process defines this to 1 when it finds out that system  */
  10.159 -/* header file sys/poll.h must be included by the external interface. */
  10.160 -/* #undef CURL_PULL_SYS_POLL_H */
  10.161 -#ifdef CURL_PULL_SYS_POLL_H
  10.162 -#  include <sys/poll.h>
  10.163 -#endif
  10.164 -
  10.165 -/* The size of `long', as computed by sizeof. */
  10.166 -#define CURL_SIZEOF_LONG 8
  10.167 -
  10.168 -/* Integral data type used for curl_socklen_t. */
  10.169 -#define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t
  10.170 -
  10.171 -/* The size of `curl_socklen_t', as computed by sizeof. */
  10.172 -#define CURL_SIZEOF_CURL_SOCKLEN_T 4
  10.173 -
  10.174 -/* Data type definition of curl_socklen_t. */
  10.175 -typedef CURL_TYPEOF_CURL_SOCKLEN_T curl_socklen_t;
  10.176 -
  10.177 -/* Signed integral data type used for curl_off_t. */
  10.178 -#define CURL_TYPEOF_CURL_OFF_T long
  10.179 -
  10.180 -/* Data type definition of curl_off_t. */
  10.181 -typedef CURL_TYPEOF_CURL_OFF_T curl_off_t;
  10.182 -
  10.183 -/* curl_off_t formatting string directive without "%" conversion specifier. */
  10.184 -#define CURL_FORMAT_CURL_OFF_T "ld"
  10.185 -
  10.186 -/* unsigned curl_off_t formatting string without "%" conversion specifier. */
  10.187 -#define CURL_FORMAT_CURL_OFF_TU "lu"
  10.188 -
  10.189 -/* curl_off_t formatting string directive with "%" conversion specifier. */
  10.190 -#define CURL_FORMAT_OFF_T "%ld"
  10.191 -
  10.192 -/* The size of `curl_off_t', as computed by sizeof. */
  10.193 -#define CURL_SIZEOF_CURL_OFF_T 8
  10.194 -
  10.195 -/* curl_off_t constant suffix. */
  10.196 -#define CURL_SUFFIX_CURL_OFF_T L
  10.197 -
  10.198 -/* unsigned curl_off_t constant suffix. */
  10.199 -#define CURL_SUFFIX_CURL_OFF_TU UL
  10.200 -
  10.201 -#endif /* __CURL_CURLBUILD_H */
    11.1 --- a/build-mac/curl/curlbuild_.h	Fri Apr 01 17:33:42 2016 +0200
    11.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    11.3 @@ -1,198 +0,0 @@
    11.4 -/* include/curl/curlbuild.h.  Generated from curlbuild.h.in by configure.  */
    11.5 -#ifndef __CURL_CURLBUILD_H
    11.6 -#define __CURL_CURLBUILD_H
    11.7 -/***************************************************************************
    11.8 - *                                  _   _ ____  _
    11.9 - *  Project                     ___| | | |  _ \| |
   11.10 - *                             / __| | | | |_) | |
   11.11 - *                            | (__| |_| |  _ <| |___
   11.12 - *                             \___|\___/|_| \_\_____|
   11.13 - *
   11.14 - * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
   11.15 - *
   11.16 - * This software is licensed as described in the file COPYING, which
   11.17 - * you should have received as part of this distribution. The terms
   11.18 - * are also available at http://curl.haxx.se/docs/copyright.html.
   11.19 - *
   11.20 - * You may opt to use, copy, modify, merge, publish, distribute and/or sell
   11.21 - * copies of the Software, and permit persons to whom the Software is
   11.22 - * furnished to do so, under the terms of the COPYING file.
   11.23 - *
   11.24 - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
   11.25 - * KIND, either express or implied.
   11.26 - *
   11.27 - ***************************************************************************/
   11.28 -
   11.29 -/* ================================================================ */
   11.30 -/*               NOTES FOR CONFIGURE CAPABLE SYSTEMS                */
   11.31 -/* ================================================================ */
   11.32 -
   11.33 -/*
   11.34 - * NOTE 1:
   11.35 - * -------
   11.36 - *
   11.37 - * Nothing in this file is intended to be modified or adjusted by the
   11.38 - * curl library user nor by the curl library builder.
   11.39 - *
   11.40 - * If you think that something actually needs to be changed, adjusted
   11.41 - * or fixed in this file, then, report it on the libcurl development
   11.42 - * mailing list: http://cool.haxx.se/mailman/listinfo/curl-library/
   11.43 - *
   11.44 - * This header file shall only export symbols which are 'curl' or 'CURL'
   11.45 - * prefixed, otherwise public name space would be polluted.
   11.46 - *
   11.47 - * NOTE 2:
   11.48 - * -------
   11.49 - *
   11.50 - * Right now you might be staring at file include/curl/curlbuild.h.in or
   11.51 - * at file include/curl/curlbuild.h, this is due to the following reason:
   11.52 - *
   11.53 - * On systems capable of running the configure script, the configure process
   11.54 - * will overwrite the distributed include/curl/curlbuild.h file with one that
   11.55 - * is suitable and specific to the library being configured and built, which
   11.56 - * is generated from the include/curl/curlbuild.h.in template file.
   11.57 - *
   11.58 - */
   11.59 -
   11.60 -/* ================================================================ */
   11.61 -/*  DEFINITION OF THESE SYMBOLS SHALL NOT TAKE PLACE ANYWHERE ELSE  */
   11.62 -/* ================================================================ */
   11.63 -
   11.64 -#ifdef CURL_SIZEOF_LONG
   11.65 -#error "CURL_SIZEOF_LONG shall not be defined except in curlbuild.h"
   11.66 -   Error Compilation_aborted_CURL_SIZEOF_LONG_already_defined
   11.67 -#endif
   11.68 -
   11.69 -#ifdef CURL_TYPEOF_CURL_SOCKLEN_T
   11.70 -#error "CURL_TYPEOF_CURL_SOCKLEN_T shall not be defined except in curlbuild.h"
   11.71 -   Error Compilation_aborted_CURL_TYPEOF_CURL_SOCKLEN_T_already_defined
   11.72 -#endif
   11.73 -
   11.74 -#ifdef CURL_SIZEOF_CURL_SOCKLEN_T
   11.75 -#error "CURL_SIZEOF_CURL_SOCKLEN_T shall not be defined except in curlbuild.h"
   11.76 -   Error Compilation_aborted_CURL_SIZEOF_CURL_SOCKLEN_T_already_defined
   11.77 -#endif
   11.78 -
   11.79 -#ifdef CURL_TYPEOF_CURL_OFF_T
   11.80 -#error "CURL_TYPEOF_CURL_OFF_T shall not be defined except in curlbuild.h"
   11.81 -   Error Compilation_aborted_CURL_TYPEOF_CURL_OFF_T_already_defined
   11.82 -#endif
   11.83 -
   11.84 -#ifdef CURL_FORMAT_CURL_OFF_T
   11.85 -#error "CURL_FORMAT_CURL_OFF_T shall not be defined except in curlbuild.h"
   11.86 -   Error Compilation_aborted_CURL_FORMAT_CURL_OFF_T_already_defined
   11.87 -#endif
   11.88 -
   11.89 -#ifdef CURL_FORMAT_CURL_OFF_TU
   11.90 -#error "CURL_FORMAT_CURL_OFF_TU shall not be defined except in curlbuild.h"
   11.91 -   Error Compilation_aborted_CURL_FORMAT_CURL_OFF_TU_already_defined
   11.92 -#endif
   11.93 -
   11.94 -#ifdef CURL_FORMAT_OFF_T
   11.95 -#error "CURL_FORMAT_OFF_T shall not be defined except in curlbuild.h"
   11.96 -   Error Compilation_aborted_CURL_FORMAT_OFF_T_already_defined
   11.97 -#endif
   11.98 -
   11.99 -#ifdef CURL_SIZEOF_CURL_OFF_T
  11.100 -#error "CURL_SIZEOF_CURL_OFF_T shall not be defined except in curlbuild.h"
  11.101 -   Error Compilation_aborted_CURL_SIZEOF_CURL_OFF_T_already_defined
  11.102 -#endif
  11.103 -
  11.104 -#ifdef CURL_SUFFIX_CURL_OFF_T
  11.105 -#error "CURL_SUFFIX_CURL_OFF_T shall not be defined except in curlbuild.h"
  11.106 -   Error Compilation_aborted_CURL_SUFFIX_CURL_OFF_T_already_defined
  11.107 -#endif
  11.108 -
  11.109 -#ifdef CURL_SUFFIX_CURL_OFF_TU
  11.110 -#error "CURL_SUFFIX_CURL_OFF_TU shall not be defined except in curlbuild.h"
  11.111 -   Error Compilation_aborted_CURL_SUFFIX_CURL_OFF_TU_already_defined
  11.112 -#endif
  11.113 -
  11.114 -/* ================================================================ */
  11.115 -/*  EXTERNAL INTERFACE SETTINGS FOR CONFIGURE CAPABLE SYSTEMS ONLY  */
  11.116 -/* ================================================================ */
  11.117 -
  11.118 -/* Configure process defines this to 1 when it finds out that system  */
  11.119 -/* header file ws2tcpip.h must be included by the external interface. */
  11.120 -/* #undef CURL_PULL_WS2TCPIP_H */
  11.121 -#ifdef CURL_PULL_WS2TCPIP_H
  11.122 -#  ifndef WIN32_LEAN_AND_MEAN
  11.123 -#    define WIN32_LEAN_AND_MEAN
  11.124 -#  endif
  11.125 -#  include <windows.h>
  11.126 -#  include <winsock2.h>
  11.127 -#  include <ws2tcpip.h>
  11.128 -#endif
  11.129 -
  11.130 -/* Configure process defines this to 1 when it finds out that system   */
  11.131 -/* header file sys/types.h must be included by the external interface. */
  11.132 -#define CURL_PULL_SYS_TYPES_H 1
  11.133 -#ifdef CURL_PULL_SYS_TYPES_H
  11.134 -#  include <sys/types.h>
  11.135 -#endif
  11.136 -
  11.137 -/* Configure process defines this to 1 when it finds out that system */
  11.138 -/* header file stdint.h must be included by the external interface.  */
  11.139 -#define CURL_PULL_STDINT_H 1
  11.140 -#ifdef CURL_PULL_STDINT_H
  11.141 -#  include <stdint.h>
  11.142 -#endif
  11.143 -
  11.144 -/* Configure process defines this to 1 when it finds out that system  */
  11.145 -/* header file inttypes.h must be included by the external interface. */
  11.146 -#define CURL_PULL_INTTYPES_H 1
  11.147 -#ifdef CURL_PULL_INTTYPES_H
  11.148 -#  include <inttypes.h>
  11.149 -#endif
  11.150 -
  11.151 -/* Configure process defines this to 1 when it finds out that system    */
  11.152 -/* header file sys/socket.h must be included by the external interface. */
  11.153 -#define CURL_PULL_SYS_SOCKET_H 1
  11.154 -#ifdef CURL_PULL_SYS_SOCKET_H
  11.155 -#  include <sys/socket.h>
  11.156 -#endif
  11.157 -
  11.158 -/* Configure process defines this to 1 when it finds out that system  */
  11.159 -/* header file sys/poll.h must be included by the external interface. */
  11.160 -/* #undef CURL_PULL_SYS_POLL_H */
  11.161 -#ifdef CURL_PULL_SYS_POLL_H
  11.162 -#  include <sys/poll.h>
  11.163 -#endif
  11.164 -
  11.165 -/* The size of `long', as computed by sizeof. */
  11.166 -#define CURL_SIZEOF_LONG 4
  11.167 -
  11.168 -/* Integral data type used for curl_socklen_t. */
  11.169 -#define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t
  11.170 -
  11.171 -/* The size of `curl_socklen_t', as computed by sizeof. */
  11.172 -#define CURL_SIZEOF_CURL_SOCKLEN_T 4
  11.173 -
  11.174 -/* Data type definition of curl_socklen_t. */
  11.175 -typedef CURL_TYPEOF_CURL_SOCKLEN_T curl_socklen_t;
  11.176 -
  11.177 -/* Signed integral data type used for curl_off_t. */
  11.178 -#define CURL_TYPEOF_CURL_OFF_T int64_t
  11.179 -
  11.180 -/* Data type definition of curl_off_t. */
  11.181 -typedef CURL_TYPEOF_CURL_OFF_T curl_off_t;
  11.182 -
  11.183 -/* curl_off_t formatting string directive without "%" conversion specifier. */
  11.184 -#define CURL_FORMAT_CURL_OFF_T "lld"
  11.185 -
  11.186 -/* unsigned curl_off_t formatting string without "%" conversion specifier. */
  11.187 -#define CURL_FORMAT_CURL_OFF_TU "llu"
  11.188 -
  11.189 -/* curl_off_t formatting string directive with "%" conversion specifier. */
  11.190 -#define CURL_FORMAT_OFF_T "%lld"
  11.191 -
  11.192 -/* The size of `curl_off_t', as computed by sizeof. */
  11.193 -#define CURL_SIZEOF_CURL_OFF_T 8
  11.194 -
  11.195 -/* curl_off_t constant suffix. */
  11.196 -#define CURL_SUFFIX_CURL_OFF_T LL
  11.197 -
  11.198 -/* unsigned curl_off_t constant suffix. */
  11.199 -#define CURL_SUFFIX_CURL_OFF_TU ULL
  11.200 -
  11.201 -#endif /* __CURL_CURLBUILD_H */
    12.1 --- a/build-mac/curl/curlrules.h	Fri Apr 01 17:33:42 2016 +0200
    12.2 +++ b/build-mac/curl/curlrules.h	Tue Apr 26 10:58:43 2016 +0200
    12.3 @@ -11,7 +11,7 @@
    12.4   *
    12.5   * This software is licensed as described in the file COPYING, which
    12.6   * you should have received as part of this distribution. The terms
    12.7 - * are also available at http://curl.haxx.se/docs/copyright.html.
    12.8 + * are also available at https://curl.haxx.se/docs/copyright.html.
    12.9   *
   12.10   * You may opt to use, copy, modify, merge, publish, distribute and/or sell
   12.11   * copies of the Software, and permit persons to whom the Software is
   12.12 @@ -47,7 +47,7 @@
   12.13   * library is properly built and used.
   12.14   *
   12.15   * You can find further help on the libcurl development mailing list:
   12.16 - * http://cool.haxx.se/mailman/listinfo/curl-library/
   12.17 + * https://cool.haxx.se/mailman/listinfo/curl-library/
   12.18   *
   12.19   * NOTE 2
   12.20   * ------
    13.1 --- a/build-mac/curl/curlver.h	Fri Apr 01 17:33:42 2016 +0200
    13.2 +++ b/build-mac/curl/curlver.h	Tue Apr 26 10:58:43 2016 +0200
    13.3 @@ -7,11 +7,11 @@
    13.4   *                            | (__| |_| |  _ <| |___
    13.5   *                             \___|\___/|_| \_\_____|
    13.6   *
    13.7 - * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.
    13.8 + * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.
    13.9   *
   13.10   * This software is licensed as described in the file COPYING, which
   13.11   * you should have received as part of this distribution. The terms
   13.12 - * are also available at http://curl.haxx.se/docs/copyright.html.
   13.13 + * are also available at https://curl.haxx.se/docs/copyright.html.
   13.14   *
   13.15   * You may opt to use, copy, modify, merge, publish, distribute and/or sell
   13.16   * copies of the Software, and permit persons to whom the Software is
   13.17 @@ -26,16 +26,16 @@
   13.18     a script at release-time. This was made its own header file in 7.11.2 */
   13.19  
   13.20  /* This is the global package copyright */
   13.21 -#define LIBCURL_COPYRIGHT "1996 - 2015 Daniel Stenberg, <daniel@haxx.se>."
   13.22 +#define LIBCURL_COPYRIGHT "1996 - 2016 Daniel Stenberg, <daniel@haxx.se>."
   13.23  
   13.24  /* This is the version number of the libcurl package from which this header
   13.25     file origins: */
   13.26 -#define LIBCURL_VERSION "7.43.0"
   13.27 +#define LIBCURL_VERSION "7.48.0"
   13.28  
   13.29  /* The numeric version number is also available "in parts" by using these
   13.30     defines: */
   13.31  #define LIBCURL_VERSION_MAJOR 7
   13.32 -#define LIBCURL_VERSION_MINOR 43
   13.33 +#define LIBCURL_VERSION_MINOR 48
   13.34  #define LIBCURL_VERSION_PATCH 0
   13.35  
   13.36  /* This is the numeric version of the libcurl version number, meant for easier
   13.37 @@ -57,7 +57,7 @@
   13.38     CURL_VERSION_BITS() macro since curl's own configure script greps for it
   13.39     and needs it to contain the full number.
   13.40  */
   13.41 -#define LIBCURL_VERSION_NUM 0x072b00
   13.42 +#define LIBCURL_VERSION_NUM 0x073000
   13.43  
   13.44  /*
   13.45   * This is the date and time when the full source package was created. The
   13.46 @@ -68,7 +68,7 @@
   13.47   *
   13.48   * "Mon Feb 12 11:35:33 UTC 2007"
   13.49   */
   13.50 -#define LIBCURL_TIMESTAMP "Wed Jun 17 05:56:00 UTC 2015"
   13.51 +#define LIBCURL_TIMESTAMP "Wed Mar 23 06:57:50 UTC 2016"
   13.52  
   13.53  #define CURL_VERSION_BITS(x,y,z) ((x)<<16|(y)<<8|z)
   13.54  #define CURL_AT_LEAST_VERSION(x,y,z) \
    14.1 --- a/build-mac/curl/easy.h	Fri Apr 01 17:33:42 2016 +0200
    14.2 +++ b/build-mac/curl/easy.h	Tue Apr 26 10:58:43 2016 +0200
    14.3 @@ -11,7 +11,7 @@
    14.4   *
    14.5   * This software is licensed as described in the file COPYING, which
    14.6   * you should have received as part of this distribution. The terms
    14.7 - * are also available at http://curl.haxx.se/docs/copyright.html.
    14.8 + * are also available at https://curl.haxx.se/docs/copyright.html.
    14.9   *
   14.10   * You may opt to use, copy, modify, merge, publish, distribute and/or sell
   14.11   * copies of the Software, and permit persons to whom the Software is
    15.1 --- a/build-mac/curl/mprintf.h	Fri Apr 01 17:33:42 2016 +0200
    15.2 +++ b/build-mac/curl/mprintf.h	Tue Apr 26 10:58:43 2016 +0200
    15.3 @@ -11,7 +11,7 @@
    15.4   *
    15.5   * This software is licensed as described in the file COPYING, which
    15.6   * you should have received as part of this distribution. The terms
    15.7 - * are also available at http://curl.haxx.se/docs/copyright.html.
    15.8 + * are also available at https://curl.haxx.se/docs/copyright.html.
    15.9   *
   15.10   * You may opt to use, copy, modify, merge, publish, distribute and/or sell
   15.11   * copies of the Software, and permit persons to whom the Software is
    16.1 --- a/build-mac/curl/multi.h	Fri Apr 01 17:33:42 2016 +0200
    16.2 +++ b/build-mac/curl/multi.h	Tue Apr 26 10:58:43 2016 +0200
    16.3 @@ -11,7 +11,7 @@
    16.4   *
    16.5   * This software is licensed as described in the file COPYING, which
    16.6   * you should have received as part of this distribution. The terms
    16.7 - * are also available at http://curl.haxx.se/docs/copyright.html.
    16.8 + * are also available at https://curl.haxx.se/docs/copyright.html.
    16.9   *
   16.10   * You may opt to use, copy, modify, merge, publish, distribute and/or sell
   16.11   * copies of the Software, and permit persons to whom the Software is
   16.12 @@ -370,6 +370,12 @@
   16.13    /* maximum number of open connections in total */
   16.14    CINIT(MAX_TOTAL_CONNECTIONS, LONG, 13),
   16.15  
   16.16 +   /* This is the server push callback function pointer */
   16.17 +  CINIT(PUSHFUNCTION, FUNCTIONPOINT, 14),
   16.18 +
   16.19 +  /* This is the argument passed to the server push callback */
   16.20 +  CINIT(PUSHDATA, OBJECTPOINT, 15),
   16.21 +
   16.22    CURLMOPT_LASTENTRY /* the last unused */
   16.23  } CURLMoption;
   16.24  
   16.25 @@ -397,6 +403,31 @@
   16.26  CURL_EXTERN CURLMcode curl_multi_assign(CURLM *multi_handle,
   16.27                                          curl_socket_t sockfd, void *sockp);
   16.28  
   16.29 +
   16.30 +/*
   16.31 + * Name: curl_push_callback
   16.32 + *
   16.33 + * Desc: This callback gets called when a new stream is being pushed by the
   16.34 + *       server. It approves or denies the new stream.
   16.35 + *
   16.36 + * Returns: CURL_PUSH_OK or CURL_PUSH_DENY.
   16.37 + */
   16.38 +#define CURL_PUSH_OK   0
   16.39 +#define CURL_PUSH_DENY 1
   16.40 +
   16.41 +struct curl_pushheaders;  /* forward declaration only */
   16.42 +
   16.43 +CURL_EXTERN char *curl_pushheader_bynum(struct curl_pushheaders *h,
   16.44 +                                        size_t num);
   16.45 +CURL_EXTERN char *curl_pushheader_byname(struct curl_pushheaders *h,
   16.46 +                                         const char *name);
   16.47 +
   16.48 +typedef int (*curl_push_callback)(CURL *parent,
   16.49 +                                  CURL *easy,
   16.50 +                                  size_t num_headers,
   16.51 +                                  struct curl_pushheaders *headers,
   16.52 +                                  void *userp);
   16.53 +
   16.54  #ifdef __cplusplus
   16.55  } /* end of extern "C" */
   16.56  #endif
    17.1 --- a/build-mac/curl/stdcheaders.h	Fri Apr 01 17:33:42 2016 +0200
    17.2 +++ b/build-mac/curl/stdcheaders.h	Tue Apr 26 10:58:43 2016 +0200
    17.3 @@ -11,7 +11,7 @@
    17.4   *
    17.5   * This software is licensed as described in the file COPYING, which
    17.6   * you should have received as part of this distribution. The terms
    17.7 - * are also available at http://curl.haxx.se/docs/copyright.html.
    17.8 + * are also available at https://curl.haxx.se/docs/copyright.html.
    17.9   *
   17.10   * You may opt to use, copy, modify, merge, publish, distribute and/or sell
   17.11   * copies of the Software, and permit persons to whom the Software is
    18.1 --- a/build-mac/curl/typecheck-gcc.h	Fri Apr 01 17:33:42 2016 +0200
    18.2 +++ b/build-mac/curl/typecheck-gcc.h	Tue Apr 26 10:58:43 2016 +0200
    18.3 @@ -7,11 +7,11 @@
    18.4   *                            | (__| |_| |  _ <| |___
    18.5   *                             \___|\___/|_| \_\_____|
    18.6   *
    18.7 - * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.
    18.8 + * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.
    18.9   *
   18.10   * This software is licensed as described in the file COPYING, which
   18.11   * you should have received as part of this distribution. The terms
   18.12 - * are also available at http://curl.haxx.se/docs/copyright.html.
   18.13 + * are also available at https://curl.haxx.se/docs/copyright.html.
   18.14   *
   18.15   * You may opt to use, copy, modify, merge, publish, distribute and/or sell
   18.16   * copies of the Software, and permit persons to whom the Software is
   18.17 @@ -218,60 +218,67 @@
   18.18  
   18.19  /* evaluates to true if option takes a char* argument */
   18.20  #define _curl_is_string_option(option)                                        \
   18.21 -  ((option) == CURLOPT_URL ||                                                 \
   18.22 -   (option) == CURLOPT_PROXY ||                                               \
   18.23 -   (option) == CURLOPT_INTERFACE ||                                           \
   18.24 -   (option) == CURLOPT_NETRC_FILE ||                                          \
   18.25 -   (option) == CURLOPT_USERPWD ||                                             \
   18.26 -   (option) == CURLOPT_USERNAME ||                                            \
   18.27 -   (option) == CURLOPT_PASSWORD ||                                            \
   18.28 -   (option) == CURLOPT_PROXYUSERPWD ||                                        \
   18.29 -   (option) == CURLOPT_PROXYUSERNAME ||                                       \
   18.30 -   (option) == CURLOPT_PROXYPASSWORD ||                                       \
   18.31 -   (option) == CURLOPT_NOPROXY ||                                             \
   18.32 -   (option) == CURLOPT_ACCEPT_ENCODING ||                                     \
   18.33 -   (option) == CURLOPT_REFERER ||                                             \
   18.34 -   (option) == CURLOPT_USERAGENT ||                                           \
   18.35 +  ((option) == CURLOPT_ACCEPT_ENCODING ||                                     \
   18.36 +   (option) == CURLOPT_CAINFO ||                                              \
   18.37 +   (option) == CURLOPT_CAPATH ||                                              \
   18.38     (option) == CURLOPT_COOKIE ||                                              \
   18.39     (option) == CURLOPT_COOKIEFILE ||                                          \
   18.40     (option) == CURLOPT_COOKIEJAR ||                                           \
   18.41     (option) == CURLOPT_COOKIELIST ||                                          \
   18.42 +   (option) == CURLOPT_CRLFILE ||                                             \
   18.43 +   (option) == CURLOPT_CUSTOMREQUEST ||                                       \
   18.44 +   (option) == CURLOPT_DEFAULT_PROTOCOL ||                                    \
   18.45 +   (option) == CURLOPT_DNS_INTERFACE ||                                       \
   18.46 +   (option) == CURLOPT_DNS_LOCAL_IP4 ||                                       \
   18.47 +   (option) == CURLOPT_DNS_LOCAL_IP6 ||                                       \
   18.48 +   (option) == CURLOPT_DNS_SERVERS ||                                         \
   18.49 +   (option) == CURLOPT_EGDSOCKET ||                                           \
   18.50     (option) == CURLOPT_FTPPORT ||                                             \
   18.51 +   (option) == CURLOPT_FTP_ACCOUNT ||                                         \
   18.52     (option) == CURLOPT_FTP_ALTERNATIVE_TO_USER ||                             \
   18.53 -   (option) == CURLOPT_FTP_ACCOUNT ||                                         \
   18.54 +   (option) == CURLOPT_INTERFACE ||                                           \
   18.55 +   (option) == CURLOPT_ISSUERCERT ||                                          \
   18.56 +   (option) == CURLOPT_KEYPASSWD ||                                           \
   18.57 +   (option) == CURLOPT_KRBLEVEL ||                                            \
   18.58 +   (option) == CURLOPT_LOGIN_OPTIONS ||                                       \
   18.59 +   (option) == CURLOPT_MAIL_AUTH ||                                           \
   18.60 +   (option) == CURLOPT_MAIL_FROM ||                                           \
   18.61 +   (option) == CURLOPT_NETRC_FILE ||                                          \
   18.62 +   (option) == CURLOPT_NOPROXY ||                                             \
   18.63 +   (option) == CURLOPT_PASSWORD ||                                            \
   18.64 +   (option) == CURLOPT_PINNEDPUBLICKEY ||                                     \
   18.65 +   (option) == CURLOPT_PROXY ||                                               \
   18.66 +   (option) == CURLOPT_PROXYPASSWORD ||                                       \
   18.67 +   (option) == CURLOPT_PROXYUSERNAME ||                                       \
   18.68 +   (option) == CURLOPT_PROXYUSERPWD ||                                        \
   18.69 +   (option) == CURLOPT_PROXY_SERVICE_NAME ||                                  \
   18.70 +   (option) == CURLOPT_RANDOM_FILE ||                                         \
   18.71     (option) == CURLOPT_RANGE ||                                               \
   18.72 -   (option) == CURLOPT_CUSTOMREQUEST ||                                       \
   18.73 -   (option) == CURLOPT_SSLCERT ||                                             \
   18.74 -   (option) == CURLOPT_SSLCERTTYPE ||                                         \
   18.75 -   (option) == CURLOPT_SSLKEY ||                                              \
   18.76 -   (option) == CURLOPT_SSLKEYTYPE ||                                          \
   18.77 -   (option) == CURLOPT_KEYPASSWD ||                                           \
   18.78 -   (option) == CURLOPT_SSLENGINE ||                                           \
   18.79 -   (option) == CURLOPT_CAINFO ||                                              \
   18.80 -   (option) == CURLOPT_CAPATH ||                                              \
   18.81 -   (option) == CURLOPT_RANDOM_FILE ||                                         \
   18.82 -   (option) == CURLOPT_EGDSOCKET ||                                           \
   18.83 -   (option) == CURLOPT_SSL_CIPHER_LIST ||                                     \
   18.84 -   (option) == CURLOPT_KRBLEVEL ||                                            \
   18.85 -   (option) == CURLOPT_SSH_HOST_PUBLIC_KEY_MD5 ||                             \
   18.86 -   (option) == CURLOPT_SSH_PUBLIC_KEYFILE ||                                  \
   18.87 -   (option) == CURLOPT_SSH_PRIVATE_KEYFILE ||                                 \
   18.88 -   (option) == CURLOPT_CRLFILE ||                                             \
   18.89 -   (option) == CURLOPT_ISSUERCERT ||                                          \
   18.90 -   (option) == CURLOPT_SOCKS5_GSSAPI_SERVICE ||                               \
   18.91 -   (option) == CURLOPT_SSH_KNOWNHOSTS ||                                      \
   18.92 -   (option) == CURLOPT_MAIL_FROM ||                                           \
   18.93 +   (option) == CURLOPT_REFERER ||                                             \
   18.94     (option) == CURLOPT_RTSP_SESSION_ID ||                                     \
   18.95     (option) == CURLOPT_RTSP_STREAM_URI ||                                     \
   18.96     (option) == CURLOPT_RTSP_TRANSPORT ||                                      \
   18.97 +   (option) == CURLOPT_SERVICE_NAME ||                                        \
   18.98 +   (option) == CURLOPT_SOCKS5_GSSAPI_SERVICE ||                               \
   18.99 +   (option) == CURLOPT_SSH_HOST_PUBLIC_KEY_MD5 ||                             \
  18.100 +   (option) == CURLOPT_SSH_KNOWNHOSTS ||                                      \
  18.101 +   (option) == CURLOPT_SSH_PRIVATE_KEYFILE ||                                 \
  18.102 +   (option) == CURLOPT_SSH_PUBLIC_KEYFILE ||                                  \
  18.103 +   (option) == CURLOPT_SSLCERT ||                                             \
  18.104 +   (option) == CURLOPT_SSLCERTTYPE ||                                         \
  18.105 +   (option) == CURLOPT_SSLENGINE ||                                           \
  18.106 +   (option) == CURLOPT_SSLKEY ||                                              \
  18.107 +   (option) == CURLOPT_SSLKEYTYPE ||                                          \
  18.108 +   (option) == CURLOPT_SSL_CIPHER_LIST ||                                     \
  18.109 +   (option) == CURLOPT_TLSAUTH_PASSWORD ||                                    \
  18.110 +   (option) == CURLOPT_TLSAUTH_TYPE ||                                        \
  18.111 +   (option) == CURLOPT_TLSAUTH_USERNAME ||                                    \
  18.112 +   (option) == CURLOPT_UNIX_SOCKET_PATH ||                                    \
  18.113 +   (option) == CURLOPT_URL ||                                                 \
  18.114 +   (option) == CURLOPT_USERAGENT ||                                           \
  18.115 +   (option) == CURLOPT_USERNAME ||                                            \
  18.116 +   (option) == CURLOPT_USERPWD ||                                             \
  18.117     (option) == CURLOPT_XOAUTH2_BEARER ||                                      \
  18.118 -   (option) == CURLOPT_DNS_SERVERS ||                                         \
  18.119 -   (option) == CURLOPT_DNS_INTERFACE ||                                       \
  18.120 -   (option) == CURLOPT_DNS_LOCAL_IP4 ||                                       \
  18.121 -   (option) == CURLOPT_DNS_LOCAL_IP6 ||                                       \
  18.122 -   (option) == CURLOPT_LOGIN_OPTIONS ||                                       \
  18.123 -   (option) == CURLOPT_PROXY_SERVICE_NAME ||                                  \
  18.124 -   (option) == CURLOPT_SERVICE_NAME ||                                        \
  18.125     0)
  18.126  
  18.127  /* evaluates to true if option takes a curl_write_callback argument */
  18.128 @@ -287,21 +294,22 @@
  18.129  
  18.130  /* evaluates to true if option takes a data argument to pass to a callback */
  18.131  #define _curl_is_cb_data_option(option)                                       \
  18.132 -  ((option) == CURLOPT_WRITEDATA ||                                           \
  18.133 +  ((option) == CURLOPT_CHUNK_DATA ||                                          \
  18.134 +   (option) == CURLOPT_CLOSESOCKETDATA ||                                     \
  18.135 +   (option) == CURLOPT_DEBUGDATA ||                                           \
  18.136 +   (option) == CURLOPT_FNMATCH_DATA ||                                        \
  18.137 +   (option) == CURLOPT_HEADERDATA ||                                          \
  18.138 +   (option) == CURLOPT_INTERLEAVEDATA ||                                      \
  18.139 +   (option) == CURLOPT_IOCTLDATA ||                                           \
  18.140 +   (option) == CURLOPT_OPENSOCKETDATA ||                                      \
  18.141 +   (option) == CURLOPT_PRIVATE ||                                             \
  18.142 +   (option) == CURLOPT_PROGRESSDATA ||                                        \
  18.143     (option) == CURLOPT_READDATA ||                                            \
  18.144 -   (option) == CURLOPT_IOCTLDATA ||                                           \
  18.145 +   (option) == CURLOPT_SEEKDATA ||                                            \
  18.146     (option) == CURLOPT_SOCKOPTDATA ||                                         \
  18.147 -   (option) == CURLOPT_OPENSOCKETDATA ||                                      \
  18.148 -   (option) == CURLOPT_PROGRESSDATA ||                                        \
  18.149 -   (option) == CURLOPT_HEADERDATA ||                                         \
  18.150 -   (option) == CURLOPT_DEBUGDATA ||                                           \
  18.151 +   (option) == CURLOPT_SSH_KEYDATA ||                                         \
  18.152     (option) == CURLOPT_SSL_CTX_DATA ||                                        \
  18.153 -   (option) == CURLOPT_SEEKDATA ||                                            \
  18.154 -   (option) == CURLOPT_PRIVATE ||                                             \
  18.155 -   (option) == CURLOPT_SSH_KEYDATA ||                                         \
  18.156 -   (option) == CURLOPT_INTERLEAVEDATA ||                                      \
  18.157 -   (option) == CURLOPT_CHUNK_DATA ||                                          \
  18.158 -   (option) == CURLOPT_FNMATCH_DATA ||                                        \
  18.159 +   (option) == CURLOPT_WRITEDATA ||                                           \
  18.160     0)
  18.161  
  18.162  /* evaluates to true if option takes a POST data argument (void* or char*) */
  18.163 @@ -312,13 +320,15 @@
  18.164  
  18.165  /* evaluates to true if option takes a struct curl_slist * argument */
  18.166  #define _curl_is_slist_option(option)                                         \
  18.167 -  ((option) == CURLOPT_HTTPHEADER ||                                          \
  18.168 -   (option) == CURLOPT_HTTP200ALIASES ||                                      \
  18.169 -   (option) == CURLOPT_QUOTE ||                                               \
  18.170 +  ((option) == CURLOPT_HTTP200ALIASES ||                                      \
  18.171 +   (option) == CURLOPT_HTTPHEADER ||                                          \
  18.172 +   (option) == CURLOPT_MAIL_RCPT ||                                           \
  18.173     (option) == CURLOPT_POSTQUOTE ||                                           \
  18.174     (option) == CURLOPT_PREQUOTE ||                                            \
  18.175 +   (option) == CURLOPT_PROXYHEADER ||                                         \
  18.176 +   (option) == CURLOPT_QUOTE ||                                               \
  18.177 +   (option) == CURLOPT_RESOLVE ||                                             \
  18.178     (option) == CURLOPT_TELNETOPTIONS ||                                       \
  18.179 -   (option) == CURLOPT_MAIL_RCPT ||                                           \
  18.180     0)
  18.181  
  18.182  /* groups of curl_easy_getinfo infos that take the same type of argument */
    19.1 Binary file build-mac/libcurl.a has changed
    20.1 --- a/build-mac/pEpEngine.xcodeproj/project.pbxproj	Fri Apr 01 17:33:42 2016 +0200
    20.2 +++ b/build-mac/pEpEngine.xcodeproj/project.pbxproj	Tue Apr 26 10:58:43 2016 +0200
    20.3 @@ -97,7 +97,6 @@
    20.4  		64796A3F1B455AA5004B1C24 /* libpEpEngine.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libpEpEngine.a; sourceTree = BUILT_PRODUCTS_DIR; };
    20.5  		64951A1B1BE0FCD800B10E71 /* system.db */ = {isa = PBXFileReference; lastKnownFileType = file; name = system.db; path = ../db/system.db; sourceTree = "<group>"; };
    20.6  		649DE08A1B45C19100912F72 /* libcurl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libcurl.a; sourceTree = "<group>"; };
    20.7 -		649DE08C1B45D3B700912F72 /* build-libcurl-ios.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = "build-libcurl-ios.sh"; sourceTree = "<group>"; };
    20.8  		64A8264C1B455D0800EECAF0 /* bloblist.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = bloblist.c; path = ../src/bloblist.c; sourceTree = "<group>"; };
    20.9  		64A8264D1B455D0800EECAF0 /* bloblist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = bloblist.h; path = ../src/bloblist.h; sourceTree = "<group>"; };
   20.10  		64A8264E1B455D0800EECAF0 /* cryptotech.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = cryptotech.c; path = ../src/cryptotech.c; sourceTree = "<group>"; };
   20.11 @@ -197,7 +196,6 @@
   20.12  				64951A1B1BE0FCD800B10E71 /* system.db */,
   20.13  				64DA24121B832EBA000BEE80 /* libetpan.xcodeproj */,
   20.14  				64DA240C1B832EA0000BEE80 /* netpgp.xcodeproj */,
   20.15 -				649DE08C1B45D3B700912F72 /* build-libcurl-ios.sh */,
   20.16  				649DE08A1B45C19100912F72 /* libcurl.a */,
   20.17  				64A8264B1B455C5600EECAF0 /* srcref */,
   20.18  				644297C01BE11C65002BC73B /* pEpTrustWords */,
   20.19 @@ -323,7 +321,7 @@
   20.20  		64796A371B455AA5004B1C24 /* Project object */ = {
   20.21  			isa = PBXProject;
   20.22  			attributes = {
   20.23 -				LastUpgradeCheck = 0720;
   20.24 +				LastUpgradeCheck = 0730;
   20.25  				ORGANIZATIONNAME = "Edouard Tisserant";
   20.26  				TargetAttributes = {
   20.27  					644297BE1BE11C65002BC73B = {
   20.28 @@ -542,11 +540,13 @@
   20.29  				GCC_WARN_UNUSED_VARIABLE = YES;
   20.30  				HEADER_SEARCH_PATHS = (
   20.31  					"$(inherited)",
   20.32 -					"$(OPENSSL_SRC)/include",
   20.33  					"$(SRCROOT)",
   20.34 +					"$(SRCROOT)/../../netpgp-et/include/",
   20.35 +					"$(SRCROOT)/../../netpgp-et/src/",
   20.36 +					"$(SRCROOT)/../../netpgp-et/netpgp-xcode/openssl/include/",
   20.37  				);
   20.38  				MTL_ENABLE_DEBUG_INFO = YES;
   20.39 -				ONLY_ACTIVE_ARCH = NO;
   20.40 +				ONLY_ACTIVE_ARCH = YES;
   20.41  				SDKROOT = iphoneos;
   20.42  			};
   20.43  			name = Debug;
   20.44 @@ -583,8 +583,10 @@
   20.45  				GCC_WARN_UNUSED_VARIABLE = YES;
   20.46  				HEADER_SEARCH_PATHS = (
   20.47  					"$(inherited)",
   20.48 -					"$(OPENSSL_SRC)/include",
   20.49  					"$(SRCROOT)",
   20.50 +					"$(SRCROOT)/../../netpgp-et/include/",
   20.51 +					"$(SRCROOT)/../../netpgp-et/src/",
   20.52 +					"$(SRCROOT)/../../netpgp-et/netpgp-xcode/openssl/include/",
   20.53  				);
   20.54  				MTL_ENABLE_DEBUG_INFO = NO;
   20.55  				ONLY_ACTIVE_ARCH = NO;
    21.1 --- a/db/en.csv	Fri Apr 01 17:33:42 2016 +0200
    21.2 +++ b/db/en.csv	Tue Apr 26 10:58:43 2016 +0200
    21.3 @@ -1891,7 +1891,7 @@
    21.4  en,1890,ANESTHETIC,0
    21.5  en,1891,ANESTHETIST,0
    21.6  en,1892,ANESTHETIZE,0
    21.7 -en,1893,ANESTHETIZER,0
    21.8 +en,1893,STAPLE,0
    21.9  en,1894,ANET,0
   21.10  en,1895,ANET,0
   21.11  en,1896,ANETT,0
   21.12 @@ -7845,7 +7845,7 @@
   21.13  en,7844,CASSANDRE,0
   21.14  en,7845,CASSANDRY,0
   21.15  en,7846,CASSATT,0
   21.16 -en,7847,CASSAUNDRA,0
   21.17 +en,7847,HORSE,0
   21.18  en,7848,CASSAVA,0
   21.19  en,7849,CASSEROLE,0
   21.20  en,7850,CASSETTE,0
   21.21 @@ -11681,7 +11681,7 @@
   21.22  en,11680,CUCKOO,0
   21.23  en,11681,CUCUMBER,0
   21.24  en,11682,CUDDLE,0
   21.25 -en,11683,CUDDLY,0
   21.26 +en,11683,BATTERY,0
   21.27  en,11684,CUDGEL,0
   21.28  en,11685,CUE,0
   21.29  en,11686,CUFF,0
   21.30 @@ -16555,7 +16555,7 @@
   21.31  en,16554,EVERYPLACE,0
   21.32  en,16555,EVERYTHING,0
   21.33  en,16556,EVERYWHERE,0
   21.34 -en,16557,EVICT,0
   21.35 +en,16557,CORRECT,0
   21.36  en,16558,EVICTION,0
   21.37  en,16559,EVIDENCE,0
   21.38  en,16560,EVIDENT,0
   21.39 @@ -22884,7 +22884,7 @@
   21.40  en,22883,HORRIFYING,0
   21.41  en,22884,HORROR,0
   21.42  en,22885,HORS,0
   21.43 -en,22886,HORSE,0
   21.44 +en,22886,CASSAUNDRA,0
   21.45  en,22887,HORSEBACK,0
   21.46  en,22888,HORSEDOM,0
   21.47  en,22889,HORSEFLESH,0
   21.48 @@ -31918,7 +31918,7 @@
   21.49  en,31917,NAMER,0
   21.50  en,31918,NAMESAKE,0
   21.51  en,31919,NAMIBIA,0
   21.52 -en,31920,NAMIBIAN,0
   21.53 +en,31920,XKCD,0
   21.54  en,31921,NAMING,0
   21.55  en,31922,NAN,0
   21.56  en,31923,NANA,0
   21.57 @@ -44371,7 +44371,7 @@
   21.58  en,44370,STANZA,0
   21.59  en,44371,STAPH,0
   21.60  en,44372,STAPHS,0
   21.61 -en,44373,STAPLE,0
   21.62 +en,44373,ANESTHETIZER,0
   21.63  en,44374,STAPLED,0
   21.64  en,44375,STAPLER,0
   21.65  en,44376,STAPLETON,0
   21.66 @@ -54021,7 +54021,7 @@
   21.67  en,54020,ANESTHETIC,0
   21.68  en,54021,ANESTHETIST,0
   21.69  en,54022,ANESTHETIZE,0
   21.70 -en,54023,ANESTHETIZER,0
   21.71 +en,54023,STAPLE,0
   21.72  en,54024,ANET,0
   21.73  en,54025,ANET,0
   21.74  en,54026,ANETT,0
   21.75 @@ -56428,7 +56428,7 @@
   21.76  en,56427,BATTED,0
   21.77  en,56428,BATTEN,0
   21.78  en,56429,BATTER,0
   21.79 -en,56430,BATTERY,0
   21.80 +en,56430,CUDDLY,0
   21.81  en,56431,BATTING,0
   21.82  en,56432,BATTLE,0
   21.83  en,56433,BATTLEDORE,0
   21.84 @@ -63034,7 +63034,7 @@
   21.85  en,63033,CORRAL,0
   21.86  en,63034,CORRALLED,0
   21.87  en,63035,CORRALLING,0
   21.88 -en,63036,CORRECT,0
   21.89 +en,63036,EVICT,0
   21.90  en,63037,CORRECTABLE,0
   21.91  en,63038,CORRECTED,0
   21.92  en,63039,CORRECTION,0
   21.93 @@ -63811,7 +63811,7 @@
   21.94  en,63810,CUCKOO,0
   21.95  en,63811,CUCUMBER,0
   21.96  en,63812,CUDDLE,0
   21.97 -en,63813,CUDDLY,0
   21.98 +en,63813,BATTERY,0
   21.99  en,63814,CUDGEL,0
  21.100  en,63815,CUE,0
  21.101  en,63816,CUFF,0
    22.1 --- a/pEpEngine.vcxproj	Fri Apr 01 17:33:42 2016 +0200
    22.2 +++ b/pEpEngine.vcxproj	Tue Apr 26 10:58:43 2016 +0200
    22.3 @@ -83,6 +83,7 @@
    22.4      </Link>
    22.5    </ItemDefinitionGroup>
    22.6    <ItemGroup>
    22.7 +    <ClCompile Include="src\blacklist.c" />
    22.8      <ClCompile Include="src\bloblist.c" />
    22.9      <ClCompile Include="src\cryptotech.c" />
   22.10      <ClCompile Include="src\email.c" />
    23.1 --- a/pEpEngine.vcxproj.filters	Fri Apr 01 17:33:42 2016 +0200
    23.2 +++ b/pEpEngine.vcxproj.filters	Tue Apr 26 10:58:43 2016 +0200
    23.3 @@ -69,6 +69,9 @@
    23.4      <ClCompile Include="src\mime.c">
    23.5        <Filter>Quelldateien</Filter>
    23.6      </ClCompile>
    23.7 +    <ClCompile Include="src\blacklist.c">
    23.8 +      <Filter>Quelldateien</Filter>
    23.9 +    </ClCompile>
   23.10    </ItemGroup>
   23.11    <ItemGroup>
   23.12      <ClInclude Include="src\keymanagement.h">
    24.1 --- a/src/blacklist.c	Fri Apr 01 17:33:42 2016 +0200
    24.2 +++ b/src/blacklist.c	Tue Apr 26 10:58:43 2016 +0200
    24.3 @@ -1,5 +1,5 @@
    24.4 +#include "pEp_internal.h"
    24.5  #include "blacklist.h"
    24.6 -#include "pEp_internal.h"
    24.7  
    24.8  DYNAMIC_API PEP_STATUS blacklist_add(PEP_SESSION session, const char *fpr)
    24.9  {
    25.1 --- a/src/message_api.h	Fri Apr 01 17:33:42 2016 +0200
    25.2 +++ b/src/message_api.h	Tue Apr 26 10:58:43 2016 +0200
    25.3 @@ -139,7 +139,7 @@
    25.4  //  parameters:
    25.5  //      tech (in)           cryptotech to get the binary for
    25.6  //      path (out)          path to cryptotech binary or NULL if not available
    25.7 -
    25.8 +//                          **path is owned by the library, do not change it!
    25.9  DYNAMIC_API PEP_STATUS get_binary_path(PEP_cryptotech tech, const char **path);
   25.10  
   25.11  
    26.1 --- a/src/pEpEngine.c	Fri Apr 01 17:33:42 2016 +0200
    26.2 +++ b/src/pEpEngine.c	Tue Apr 26 10:58:43 2016 +0200
    26.3 @@ -9,14 +9,14 @@
    26.4  DYNAMIC_API PEP_STATUS init(PEP_SESSION *session)
    26.5  {
    26.6      PEP_STATUS status = PEP_STATUS_OK;
    26.7 -	int int_result;
    26.8 -	static const char *sql_log;
    26.9 -	static const char *sql_trustword;
   26.10 -	static const char *sql_get_identity;
   26.11 -	static const char *sql_set_person;
   26.12 -	static const char *sql_set_pgp_keypair;
   26.13 -	static const char *sql_set_identity;
   26.14 -	static const char *sql_set_trust;
   26.15 +    int int_result;
   26.16 +    static const char *sql_log;
   26.17 +    static const char *sql_trustword;
   26.18 +    static const char *sql_get_identity;
   26.19 +    static const char *sql_set_person;
   26.20 +    static const char *sql_set_pgp_keypair;
   26.21 +    static const char *sql_set_identity;
   26.22 +    static const char *sql_set_trust;
   26.23      static const char *sql_get_trust;
   26.24      static const char *sql_least_trust;
   26.25      static const char *sql_mark_as_compromized;
   26.26 @@ -43,18 +43,18 @@
   26.27      if (init_count == 0)
   26.28          in_first = true;
   26.29  
   26.30 -	assert(session);
   26.31 +    assert(session);
   26.32      if (session == NULL)
   26.33          return PEP_ILLEGAL_VALUE;
   26.34  
   26.35 -	*session = NULL;
   26.36 +    *session = NULL;
   26.37  
   26.38      pEpSession *_session = calloc(1, sizeof(pEpSession));
   26.39 -	assert(_session);
   26.40 -	if (_session == NULL)
   26.41 -		goto enomem;
   26.42 +    assert(_session);
   26.43 +    if (_session == NULL)
   26.44 +        goto enomem;
   26.45  
   26.46 -	_session->version = PEP_ENGINE_VERSION;
   26.47 +    _session->version = PEP_ENGINE_VERSION;
   26.48  
   26.49      assert(LOCAL_DB);
   26.50      if (LOCAL_DB == NULL) {
   26.51 @@ -62,43 +62,43 @@
   26.52          goto pep_error;
   26.53      }
   26.54  
   26.55 -	int_result = sqlite3_open_v2(
   26.56 -			LOCAL_DB,
   26.57 -			&_session->db,
   26.58 -			SQLITE_OPEN_READWRITE
   26.59 -				| SQLITE_OPEN_CREATE
   26.60 -				| SQLITE_OPEN_FULLMUTEX
   26.61 -				| SQLITE_OPEN_PRIVATECACHE,
   26.62 -			NULL 
   26.63 -		);
   26.64 +    int_result = sqlite3_open_v2(
   26.65 +            LOCAL_DB,
   26.66 +            &_session->db,
   26.67 +            SQLITE_OPEN_READWRITE
   26.68 +                | SQLITE_OPEN_CREATE
   26.69 +                | SQLITE_OPEN_FULLMUTEX
   26.70 +                | SQLITE_OPEN_PRIVATECACHE,
   26.71 +            NULL 
   26.72 +        );
   26.73  
   26.74 -	if (int_result != SQLITE_OK) {
   26.75 -		status = PEP_INIT_CANNOT_OPEN_DB;
   26.76 +    if (int_result != SQLITE_OK) {
   26.77 +        status = PEP_INIT_CANNOT_OPEN_DB;
   26.78          goto pep_error;
   26.79 -	}
   26.80 +    }
   26.81  
   26.82 -	sqlite3_busy_timeout(_session->db, BUSY_WAIT_TIME);
   26.83 +    sqlite3_busy_timeout(_session->db, BUSY_WAIT_TIME);
   26.84  
   26.85      assert(SYSTEM_DB);
   26.86      if (SYSTEM_DB == NULL) {
   26.87 -		status = PEP_INIT_CANNOT_OPEN_SYSTEM_DB;
   26.88 +        status = PEP_INIT_CANNOT_OPEN_SYSTEM_DB;
   26.89          goto pep_error;
   26.90      }
   26.91  
   26.92 -	int_result = sqlite3_open_v2(
   26.93 -			SYSTEM_DB, &_session->system_db,
   26.94 -			SQLITE_OPEN_READONLY
   26.95 -				| SQLITE_OPEN_FULLMUTEX
   26.96 -				| SQLITE_OPEN_SHAREDCACHE,
   26.97 -			NULL
   26.98 -		);
   26.99 +    int_result = sqlite3_open_v2(
  26.100 +            SYSTEM_DB, &_session->system_db,
  26.101 +            SQLITE_OPEN_READONLY
  26.102 +                | SQLITE_OPEN_FULLMUTEX
  26.103 +                | SQLITE_OPEN_SHAREDCACHE,
  26.104 +            NULL
  26.105 +        );
  26.106  
  26.107 -	if (int_result != SQLITE_OK) {
  26.108 -		status = PEP_INIT_CANNOT_OPEN_SYSTEM_DB;
  26.109 +    if (int_result != SQLITE_OK) {
  26.110 +        status = PEP_INIT_CANNOT_OPEN_SYSTEM_DB;
  26.111          goto pep_error;
  26.112 -	}
  26.113 +    }
  26.114  
  26.115 -	sqlite3_busy_timeout(_session->system_db, 1000);
  26.116 +    sqlite3_busy_timeout(_session->system_db, 1000);
  26.117  
  26.118      if (in_first) {
  26.119          int_result = sqlite3_exec(
  26.120 @@ -186,7 +186,7 @@
  26.121          sql_log = "insert into log (title, entity, description, comment)"
  26.122                    "values (?1, ?2, ?3, ?4);";
  26.123  
  26.124 -        sql_get_identity =	"select fpr, identity.user_id, username, comm_type, lang"
  26.125 +        sql_get_identity =    "select fpr, identity.user_id, username, comm_type, lang"
  26.126                              "   from identity"
  26.127                              "   join person on id = identity.user_id"
  26.128                              "   join pgp_keypair on fpr = identity.main_key_id"
  26.129 @@ -239,15 +239,15 @@
  26.130  
  26.131      int_result = sqlite3_prepare_v2(_session->db, sql_log, (int)strlen(sql_log),
  26.132              &_session->log, NULL);
  26.133 -	assert(int_result == SQLITE_OK);
  26.134 +    assert(int_result == SQLITE_OK);
  26.135  
  26.136      int_result = sqlite3_prepare_v2(_session->system_db, sql_trustword,
  26.137              (int)strlen(sql_trustword), &_session->trustword, NULL);
  26.138 -	assert(int_result == SQLITE_OK);
  26.139 +    assert(int_result == SQLITE_OK);
  26.140  
  26.141      int_result = sqlite3_prepare_v2(_session->db, sql_get_identity,
  26.142              (int)strlen(sql_get_identity), &_session->get_identity, NULL);
  26.143 -	assert(int_result == SQLITE_OK);
  26.144 +    assert(int_result == SQLITE_OK);
  26.145  
  26.146      int_result = sqlite3_prepare_v2(_session->db, sql_set_person,
  26.147              (int)strlen(sql_set_person), &_session->set_person, NULL);
  26.148 @@ -255,15 +255,15 @@
  26.149  
  26.150      int_result = sqlite3_prepare_v2(_session->db, sql_set_pgp_keypair,
  26.151              (int)strlen(sql_set_pgp_keypair), &_session->set_pgp_keypair, NULL);
  26.152 -	assert(int_result == SQLITE_OK);
  26.153 +    assert(int_result == SQLITE_OK);
  26.154  
  26.155      int_result = sqlite3_prepare_v2(_session->db, sql_set_identity,
  26.156              (int)strlen(sql_set_identity), &_session->set_identity, NULL);
  26.157 -	assert(int_result == SQLITE_OK);
  26.158 +    assert(int_result == SQLITE_OK);
  26.159  
  26.160      int_result = sqlite3_prepare_v2(_session->db, sql_set_trust,
  26.161              (int)strlen(sql_set_trust), &_session->set_trust, NULL);
  26.162 -	assert(int_result == SQLITE_OK);
  26.163 +    assert(int_result == SQLITE_OK);
  26.164  
  26.165      int_result = sqlite3_prepare_v2(_session->db, sql_get_trust,
  26.166              (int)strlen(sql_get_trust), &_session->get_trust, NULL);
  26.167 @@ -283,11 +283,11 @@
  26.168  
  26.169      int_result = sqlite3_prepare_v2(_session->system_db, sql_languagelist,
  26.170              (int)strlen(sql_languagelist), &_session->languagelist, NULL);
  26.171 -	assert(int_result == SQLITE_OK);
  26.172 +    assert(int_result == SQLITE_OK);
  26.173  
  26.174      int_result = sqlite3_prepare_v2(_session->system_db, sql_i18n_token,
  26.175              (int)strlen(sql_i18n_token), &_session->i18n_token, NULL);
  26.176 -	assert(int_result == SQLITE_OK);
  26.177 +    assert(int_result == SQLITE_OK);
  26.178  
  26.179      // blacklist
  26.180  
  26.181 @@ -324,8 +324,8 @@
  26.182      _session->passive_mode = false;
  26.183      _session->unencrypted_subject = false;
  26.184  
  26.185 -	*session = _session;
  26.186 -	return PEP_STATUS_OK;
  26.187 +    *session = _session;
  26.188 +    return PEP_STATUS_OK;
  26.189  
  26.190  enomem:
  26.191      status = PEP_OUT_OF_MEMORY;
  26.192 @@ -340,7 +340,7 @@
  26.193      bool out_last = false;
  26.194  
  26.195      assert(init_count >= 0);
  26.196 -	assert(session);
  26.197 +    assert(session);
  26.198  
  26.199      if (!((init_count >= 0) && session))
  26.200          return;
  26.201 @@ -352,8 +352,8 @@
  26.202          out_last = true;
  26.203      --init_count;
  26.204  
  26.205 -	if (session) {
  26.206 -		if (session->db) {
  26.207 +    if (session) {
  26.208 +        if (session->db) {
  26.209              if (session->log)
  26.210                  sqlite3_finalize(session->log);
  26.211              if (session->trustword)
  26.212 @@ -393,7 +393,7 @@
  26.213                  sqlite3_close_v2(session->db);
  26.214              if (session->system_db)
  26.215                  sqlite3_close_v2(session->system_db);
  26.216 -		}
  26.217 +        }
  26.218  
  26.219          release_transport_system(session, out_last);
  26.220          release_cryptotech(session, out_last);
  26.221 @@ -422,36 +422,36 @@
  26.222          const char *comment
  26.223      )
  26.224  {
  26.225 -	PEP_STATUS status = PEP_STATUS_OK;
  26.226 -	int result;
  26.227 +    PEP_STATUS status = PEP_STATUS_OK;
  26.228 +    int result;
  26.229  
  26.230 -	assert(session);
  26.231 -	assert(title);
  26.232 -	assert(entity);
  26.233 +    assert(session);
  26.234 +    assert(title);
  26.235 +    assert(entity);
  26.236  
  26.237      if (!(session && title && entity))
  26.238          return PEP_ILLEGAL_VALUE;
  26.239  
  26.240 -	sqlite3_reset(session->log);
  26.241 -	sqlite3_bind_text(session->log, 1, title, -1, SQLITE_STATIC);
  26.242 -	sqlite3_bind_text(session->log, 2, entity, -1, SQLITE_STATIC);
  26.243 -	if (description)
  26.244 +    sqlite3_reset(session->log);
  26.245 +    sqlite3_bind_text(session->log, 1, title, -1, SQLITE_STATIC);
  26.246 +    sqlite3_bind_text(session->log, 2, entity, -1, SQLITE_STATIC);
  26.247 +    if (description)
  26.248          sqlite3_bind_text(session->log, 3, description, -1, SQLITE_STATIC);
  26.249 -	else
  26.250 -		sqlite3_bind_null(session->log, 3);
  26.251 -	if (comment)
  26.252 -		sqlite3_bind_text(session->log, 4, comment, -1, SQLITE_STATIC);
  26.253 -	else
  26.254 -		sqlite3_bind_null(session->log, 4);
  26.255 -	do {
  26.256 -		result = sqlite3_step(session->log);
  26.257 -		assert(result == SQLITE_DONE || result == SQLITE_BUSY);
  26.258 -		if (result != SQLITE_DONE && result != SQLITE_BUSY)
  26.259 -			status = PEP_UNKNOWN_ERROR;
  26.260 -	} while (result == SQLITE_BUSY);
  26.261 -	sqlite3_reset(session->log);
  26.262 +    else
  26.263 +        sqlite3_bind_null(session->log, 3);
  26.264 +    if (comment)
  26.265 +        sqlite3_bind_text(session->log, 4, comment, -1, SQLITE_STATIC);
  26.266 +    else
  26.267 +        sqlite3_bind_null(session->log, 4);
  26.268 +    do {
  26.269 +        result = sqlite3_step(session->log);
  26.270 +        assert(result == SQLITE_DONE || result == SQLITE_BUSY);
  26.271 +        if (result != SQLITE_DONE && result != SQLITE_BUSY)
  26.272 +            status = PEP_UNKNOWN_ERROR;
  26.273 +    } while (result == SQLITE_BUSY);
  26.274 +    sqlite3_reset(session->log);
  26.275  
  26.276 -	return status;
  26.277 +    return status;
  26.278  }
  26.279  
  26.280  DYNAMIC_API PEP_STATUS trustword(
  26.281 @@ -459,45 +459,45 @@
  26.282              char **word, size_t *wsize
  26.283          )
  26.284  {
  26.285 -	PEP_STATUS status = PEP_STATUS_OK;
  26.286 -	int result;
  26.287 +    PEP_STATUS status = PEP_STATUS_OK;
  26.288 +    int result;
  26.289  
  26.290 -	assert(session);
  26.291 -	assert(word);
  26.292 -	assert(wsize);
  26.293 +    assert(session);
  26.294 +    assert(word);
  26.295 +    assert(wsize);
  26.296  
  26.297      if (!(session && word && wsize))
  26.298          return PEP_ILLEGAL_VALUE;
  26.299  
  26.300 -	*word = NULL;
  26.301 -	*wsize = 0;
  26.302 +    *word = NULL;
  26.303 +    *wsize = 0;
  26.304  
  26.305 -	if (lang == NULL)
  26.306 -		lang = "en";
  26.307 +    if (lang == NULL)
  26.308 +        lang = "en";
  26.309  
  26.310 -	assert((lang[0] >= 'A' && lang[0] <= 'Z')
  26.311 +    assert((lang[0] >= 'A' && lang[0] <= 'Z')
  26.312              || (lang[0] >= 'a' && lang[0] <= 'z'));
  26.313 -	assert((lang[1] >= 'A' && lang[1] <= 'Z')
  26.314 +    assert((lang[1] >= 'A' && lang[1] <= 'Z')
  26.315              || (lang[1] >= 'a' && lang[1] <= 'z'));
  26.316 -	assert(lang[2] == 0);
  26.317 +    assert(lang[2] == 0);
  26.318  
  26.319 -	sqlite3_reset(session->trustword);
  26.320 +    sqlite3_reset(session->trustword);
  26.321      sqlite3_bind_text(session->trustword, 1, lang, -1, SQLITE_STATIC);
  26.322 -	sqlite3_bind_int(session->trustword, 2, value);
  26.323 +    sqlite3_bind_int(session->trustword, 2, value);
  26.324  
  26.325 -	result = sqlite3_step(session->trustword);
  26.326 -	if (result == SQLITE_ROW) {
  26.327 +    result = sqlite3_step(session->trustword);
  26.328 +    if (result == SQLITE_ROW) {
  26.329          *word = strdup((const char *) sqlite3_column_text(session->trustword,
  26.330                      1));
  26.331 -		if (*word)
  26.332 +        if (*word)
  26.333              *wsize = sqlite3_column_bytes(session->trustword, 1);
  26.334 -		else
  26.335 -			status = PEP_TRUSTWORD_NOT_FOUND;
  26.336 -	} else
  26.337 -		status = PEP_TRUSTWORD_NOT_FOUND;
  26.338 +        else
  26.339 +            status = PEP_TRUSTWORD_NOT_FOUND;
  26.340 +    } else
  26.341 +        status = PEP_TRUSTWORD_NOT_FOUND;
  26.342  
  26.343 -	sqlite3_reset(session->trustword);
  26.344 -	return status;
  26.345 +    sqlite3_reset(session->trustword);
  26.346 +    return status;
  26.347  }
  26.348  
  26.349  DYNAMIC_API PEP_STATUS trustwords(
  26.350 @@ -505,23 +505,23 @@
  26.351          char **words, size_t *wsize, int max_words
  26.352      )
  26.353  {
  26.354 -	const char *source = fingerprint;
  26.355 -	char *buffer;
  26.356 -	char *dest;
  26.357 -	size_t fsize;
  26.358 +    const char *source = fingerprint;
  26.359 +    char *buffer;
  26.360 +    char *dest;
  26.361 +    size_t fsize;
  26.362      PEP_STATUS _status;
  26.363  
  26.364 -	assert(session);
  26.365 -	assert(fingerprint);
  26.366 -	assert(words);
  26.367 -	assert(wsize);
  26.368 -	assert(max_words >= 0);
  26.369 +    assert(session);
  26.370 +    assert(fingerprint);
  26.371 +    assert(words);
  26.372 +    assert(wsize);
  26.373 +    assert(max_words >= 0);
  26.374  
  26.375      if (!(session && fingerprint && words && wsize && max_words >= 0))
  26.376          return PEP_ILLEGAL_VALUE;
  26.377  
  26.378 -	*words = NULL;
  26.379 -	*wsize = 0;
  26.380 +    *words = NULL;
  26.381 +    *wsize = 0;
  26.382  
  26.383      buffer = calloc(1, MAX_TRUSTWORDS_SPACE);
  26.384      assert(buffer);
  26.385 @@ -529,67 +529,67 @@
  26.386          return PEP_OUT_OF_MEMORY;
  26.387      dest = buffer;
  26.388  
  26.389 -	fsize = strlen(fingerprint);
  26.390 +    fsize = strlen(fingerprint);
  26.391  
  26.392 -	if (!lang || !lang[0])
  26.393 -		lang = "en";
  26.394 +    if (!lang || !lang[0])
  26.395 +        lang = "en";
  26.396  
  26.397 -	assert((lang[0] >= 'A' && lang[0] <= 'Z')
  26.398 +    assert((lang[0] >= 'A' && lang[0] <= 'Z')
  26.399              || (lang[0] >= 'a' && lang[0] <= 'z'));
  26.400 -	assert((lang[1] >= 'A' && lang[1] <= 'Z')
  26.401 +    assert((lang[1] >= 'A' && lang[1] <= 'Z')
  26.402              || (lang[1] >= 'a' && lang[1] <= 'z'));
  26.403 -	assert(lang[2] == 0);
  26.404 +    assert(lang[2] == 0);
  26.405  
  26.406 -	int n_words = 0;
  26.407 -	while (source < fingerprint + fsize) {
  26.408 -		uint16_t value;
  26.409 -		char *word;
  26.410 -		size_t _wsize;
  26.411 -		int j;
  26.412 +    int n_words = 0;
  26.413 +    while (source < fingerprint + fsize) {
  26.414 +        uint16_t value;
  26.415 +        char *word;
  26.416 +        size_t _wsize;
  26.417 +        int j;
  26.418  
  26.419          for (value=0, j=0; j < 4 && source < fingerprint + fsize; ) {
  26.420 -			if (*source >= 'a' && *source <= 'f')
  26.421 -				value += (*source - 'a' + 10) << (3 - j++) * 4;
  26.422 -			else if (*source >= 'A' && *source <= 'F')
  26.423 -				value += (*source - 'A' + 10) << (3 - j++) * 4;
  26.424 -			else if (*source >= '0' && *source <= '9')
  26.425 -				value += (*source - '0') << (3 - j++) * 4;
  26.426 -			
  26.427 -			source++;
  26.428 -		}
  26.429 +            if (*source >= 'a' && *source <= 'f')
  26.430 +                value += (*source - 'a' + 10) << (3 - j++) * 4;
  26.431 +            else if (*source >= 'A' && *source <= 'F')
  26.432 +                value += (*source - 'A' + 10) << (3 - j++) * 4;
  26.433 +            else if (*source >= '0' && *source <= '9')
  26.434 +                value += (*source - '0') << (3 - j++) * 4;
  26.435 +            
  26.436 +            source++;
  26.437 +        }
  26.438  
  26.439 -		_status = trustword(session, value, lang, &word, &_wsize);
  26.440 +        _status = trustword(session, value, lang, &word, &_wsize);
  26.441          if (_status == PEP_OUT_OF_MEMORY) {
  26.442              free(buffer);
  26.443              return PEP_OUT_OF_MEMORY;
  26.444          }
  26.445 -		if (word == NULL) {
  26.446 +        if (word == NULL) {
  26.447              free(buffer);
  26.448 -			return PEP_TRUSTWORD_NOT_FOUND;
  26.449 +            return PEP_TRUSTWORD_NOT_FOUND;
  26.450          }
  26.451  
  26.452 -		if (dest + _wsize < buffer + MAX_TRUSTWORDS_SPACE - 1) {
  26.453 -			strncpy(dest, word, _wsize);
  26.454 +        if (dest + _wsize < buffer + MAX_TRUSTWORDS_SPACE - 1) {
  26.455 +            strncpy(dest, word, _wsize);
  26.456              free(word);
  26.457 -			dest += _wsize;
  26.458 -		}
  26.459 -		else {
  26.460 +            dest += _wsize;
  26.461 +        }
  26.462 +        else {
  26.463              free(word);
  26.464 -			break; // buffer full
  26.465 +            break; // buffer full
  26.466          }
  26.467  
  26.468 -		if (source < fingerprint + fsize
  26.469 +        if (source < fingerprint + fsize
  26.470                  && dest + _wsize < buffer + MAX_TRUSTWORDS_SPACE - 1)
  26.471 -			*dest++ = ' ';
  26.472 +            *dest++ = ' ';
  26.473  
  26.474 -		++n_words;
  26.475 -		if (max_words && n_words >= max_words)
  26.476 -			break;
  26.477 -	}
  26.478 +        ++n_words;
  26.479 +        if (max_words && n_words >= max_words)
  26.480 +            break;
  26.481 +    }
  26.482  
  26.483 -	*words = buffer;
  26.484 -	*wsize = dest - buffer;
  26.485 -	return PEP_STATUS_OK;
  26.486 +    *words = buffer;
  26.487 +    *wsize = dest - buffer;
  26.488 +    return PEP_STATUS_OK;
  26.489  }
  26.490  
  26.491  pEp_identity *new_identity(
  26.492 @@ -675,13 +675,13 @@
  26.493          pEp_identity **identity
  26.494      )
  26.495  {
  26.496 -	PEP_STATUS status = PEP_STATUS_OK;
  26.497 -	static pEp_identity *_identity;
  26.498 -	int result;
  26.499 -	const char *_lang;
  26.500 +    PEP_STATUS status = PEP_STATUS_OK;
  26.501 +    static pEp_identity *_identity;
  26.502 +    int result;
  26.503 +    const char *_lang;
  26.504  
  26.505 -	assert(session);
  26.506 -	assert(address);
  26.507 +    assert(session);
  26.508 +    assert(address);
  26.509      assert(address[0]);
  26.510  
  26.511      if (!(session && address && address[0]))
  26.512 @@ -691,8 +691,8 @@
  26.513      sqlite3_bind_text(session->get_identity, 1, address, -1, SQLITE_STATIC);
  26.514  
  26.515      result = sqlite3_step(session->get_identity);
  26.516 -	switch (result) {
  26.517 -	case SQLITE_ROW:
  26.518 +    switch (result) {
  26.519 +    case SQLITE_ROW:
  26.520          _identity = new_identity(
  26.521                  address,
  26.522                  (const char *) sqlite3_column_text(session->get_identity, 0),
  26.523 @@ -706,36 +706,36 @@
  26.524          _identity->comm_type = (PEP_comm_type) sqlite3_column_int(session->get_identity, 3);
  26.525          _lang = (const char *) sqlite3_column_text(session->get_identity, 4);
  26.526          if (_lang && _lang[0]) {
  26.527 -			assert(_lang[0] >= 'a' && _lang[0] <= 'z');
  26.528 -			assert(_lang[1] >= 'a' && _lang[1] <= 'z');
  26.529 -			assert(_lang[2] == 0);
  26.530 -			_identity->lang[0] = _lang[0];
  26.531 -			_identity->lang[1] = _lang[1];
  26.532 +            assert(_lang[0] >= 'a' && _lang[0] <= 'z');
  26.533 +            assert(_lang[1] >= 'a' && _lang[1] <= 'z');
  26.534 +            assert(_lang[2] == 0);
  26.535 +            _identity->lang[0] = _lang[0];
  26.536 +            _identity->lang[1] = _lang[1];
  26.537              _identity->lang[2] = 0;
  26.538 -		}
  26.539 -		*identity = _identity;
  26.540 -		break;
  26.541 -	default:
  26.542 +        }
  26.543 +        *identity = _identity;
  26.544 +        break;
  26.545 +    default:
  26.546          status = PEP_CANNOT_FIND_IDENTITY;
  26.547 -		*identity = NULL;
  26.548 -	}
  26.549 +        *identity = NULL;
  26.550 +    }
  26.551  
  26.552      sqlite3_reset(session->get_identity);
  26.553 -	return status;
  26.554 +    return status;
  26.555  }
  26.556  
  26.557  DYNAMIC_API PEP_STATUS set_identity(
  26.558          PEP_SESSION session, const pEp_identity *identity
  26.559      )
  26.560  {
  26.561 -	int result;
  26.562 +    int result;
  26.563  
  26.564 -	assert(session);
  26.565 -	assert(identity);
  26.566 -	assert(identity->address);
  26.567 -	assert(identity->fpr);
  26.568 -	assert(identity->user_id);
  26.569 -	assert(identity->username);
  26.570 +    assert(session);
  26.571 +    assert(identity);
  26.572 +    assert(identity->address);
  26.573 +    assert(identity->fpr);
  26.574 +    assert(identity->user_id);
  26.575 +    assert(identity->username);
  26.576  
  26.577      if (!(session && identity && identity->address && identity->fpr &&
  26.578                  identity->user_id && identity->username))
  26.579 @@ -750,67 +750,67 @@
  26.580      if (listed)
  26.581          return PEP_KEY_BLACKLISTED;
  26.582  
  26.583 -	sqlite3_exec(session->db, "BEGIN ;", NULL, NULL, NULL);
  26.584 +    sqlite3_exec(session->db, "BEGIN ;", NULL, NULL, NULL);
  26.585  
  26.586 -	sqlite3_reset(session->set_person);
  26.587 +    sqlite3_reset(session->set_person);
  26.588      sqlite3_bind_text(session->set_person, 1, identity->user_id, -1,
  26.589              SQLITE_STATIC);
  26.590      sqlite3_bind_text(session->set_person, 2, identity->username, -1,
  26.591              SQLITE_STATIC);
  26.592 -	if (identity->lang[0])
  26.593 +    if (identity->lang[0])
  26.594          sqlite3_bind_text(session->set_person, 3, identity->lang, 1,
  26.595                  SQLITE_STATIC);
  26.596 -	else
  26.597 -		sqlite3_bind_null(session->set_person, 3);
  26.598 -	result = sqlite3_step(session->set_person);
  26.599 -	sqlite3_reset(session->set_person);
  26.600 -	if (result != SQLITE_DONE) {
  26.601 -		sqlite3_exec(session->db, "ROLLBACK ;", NULL, NULL, NULL);
  26.602 -		return PEP_CANNOT_SET_PERSON;
  26.603 -	}
  26.604 +    else
  26.605 +        sqlite3_bind_null(session->set_person, 3);
  26.606 +    result = sqlite3_step(session->set_person);
  26.607 +    sqlite3_reset(session->set_person);
  26.608 +    if (result != SQLITE_DONE) {
  26.609 +        sqlite3_exec(session->db, "ROLLBACK ;", NULL, NULL, NULL);
  26.610 +        return PEP_CANNOT_SET_PERSON;
  26.611 +    }
  26.612  
  26.613 -	sqlite3_reset(session->set_pgp_keypair);
  26.614 +    sqlite3_reset(session->set_pgp_keypair);
  26.615      sqlite3_bind_text(session->set_pgp_keypair, 1, identity->fpr, -1,
  26.616              SQLITE_STATIC);
  26.617 -	result = sqlite3_step(session->set_pgp_keypair);
  26.618 -	sqlite3_reset(session->set_pgp_keypair);
  26.619 -	if (result != SQLITE_DONE) {
  26.620 -		sqlite3_exec(session->db, "ROLLBACK ;", NULL, NULL, NULL);
  26.621 -		return PEP_CANNOT_SET_PGP_KEYPAIR;
  26.622 -	}
  26.623 +    result = sqlite3_step(session->set_pgp_keypair);
  26.624 +    sqlite3_reset(session->set_pgp_keypair);
  26.625 +    if (result != SQLITE_DONE) {
  26.626 +        sqlite3_exec(session->db, "ROLLBACK ;", NULL, NULL, NULL);
  26.627 +        return PEP_CANNOT_SET_PGP_KEYPAIR;
  26.628 +    }
  26.629  
  26.630 -	sqlite3_reset(session->set_identity);
  26.631 +    sqlite3_reset(session->set_identity);
  26.632      sqlite3_bind_text(session->set_identity, 1, identity->address, -1,
  26.633              SQLITE_STATIC);
  26.634      sqlite3_bind_text(session->set_identity, 2, identity->fpr, -1,
  26.635              SQLITE_STATIC);
  26.636      sqlite3_bind_text(session->set_identity, 3, identity->user_id, -1,
  26.637              SQLITE_STATIC);
  26.638 -	result = sqlite3_step(session->set_identity);
  26.639 -	sqlite3_reset(session->set_identity);
  26.640 -	if (result != SQLITE_DONE) {
  26.641 -		sqlite3_exec(session->db, "ROLLBACK ;", NULL, NULL, NULL);
  26.642 -		return PEP_CANNOT_SET_IDENTITY;
  26.643 -	}
  26.644 +    result = sqlite3_step(session->set_identity);
  26.645 +    sqlite3_reset(session->set_identity);
  26.646 +    if (result != SQLITE_DONE) {
  26.647 +        sqlite3_exec(session->db, "ROLLBACK ;", NULL, NULL, NULL);
  26.648 +        return PEP_CANNOT_SET_IDENTITY;
  26.649 +    }
  26.650  
  26.651 -	sqlite3_reset(session->set_trust);
  26.652 +    sqlite3_reset(session->set_trust);
  26.653      sqlite3_bind_text(session->set_trust, 1, identity->user_id, -1,
  26.654              SQLITE_STATIC);
  26.655      sqlite3_bind_text(session->set_trust, 2, identity->fpr, -1,
  26.656              SQLITE_STATIC);
  26.657 -	sqlite3_bind_int(session->set_trust, 3, identity->comm_type);
  26.658 -	result = sqlite3_step(session->set_trust);
  26.659 -	sqlite3_reset(session->set_trust);
  26.660 -	if (result != SQLITE_DONE) {
  26.661 -		sqlite3_exec(session->db, "ROLLBACK ;", NULL, NULL, NULL);
  26.662 -		return PEP_CANNOT_SET_IDENTITY;
  26.663 -	}
  26.664 +    sqlite3_bind_int(session->set_trust, 3, identity->comm_type);
  26.665 +    result = sqlite3_step(session->set_trust);
  26.666 +    sqlite3_reset(session->set_trust);
  26.667 +    if (result != SQLITE_DONE) {
  26.668 +        sqlite3_exec(session->db, "ROLLBACK ;", NULL, NULL, NULL);
  26.669 +        return PEP_CANNOT_SET_IDENTITY;
  26.670 +    }
  26.671  
  26.672      result = sqlite3_exec(session->db, "COMMIT ;", NULL, NULL, NULL);
  26.673 -	if (result == SQLITE_OK)
  26.674 -		return PEP_STATUS_OK;
  26.675 -	else
  26.676 -		return PEP_COMMIT_FAILED;
  26.677 +    if (result == SQLITE_OK)
  26.678 +        return PEP_STATUS_OK;
  26.679 +    else
  26.680 +        return PEP_COMMIT_FAILED;
  26.681  }
  26.682  
  26.683  DYNAMIC_API PEP_STATUS mark_as_compromized(
  26.684 @@ -818,19 +818,19 @@
  26.685          const char *fpr
  26.686      )
  26.687  {
  26.688 -	int result;
  26.689 +    int result;
  26.690  
  26.691 -	assert(session);
  26.692 +    assert(session);
  26.693      assert(fpr && fpr[0]);
  26.694  
  26.695      if (!(session && fpr && fpr[0]))
  26.696          return PEP_ILLEGAL_VALUE;
  26.697  
  26.698 -	sqlite3_reset(session->mark_compromized);
  26.699 +    sqlite3_reset(session->mark_compromized);
  26.700      sqlite3_bind_text(session->mark_compromized, 1, fpr, -1,
  26.701              SQLITE_STATIC);
  26.702      result = sqlite3_step(session->mark_compromized);
  26.703 -	sqlite3_reset(session->mark_compromized);
  26.704 +    sqlite3_reset(session->mark_compromized);
  26.705  
  26.706      if (result != SQLITE_DONE)
  26.707          return PEP_CANNOT_SET_IDENTITY;
  26.708 @@ -1328,8 +1328,8 @@
  26.709          return PEP_ILLEGAL_VALUE;
  26.710  
  26.711      sqlite3_reset(session->i18n_token);
  26.712 -	sqlite3_bind_text(session->i18n_token, 1, lang, -1, SQLITE_STATIC);
  26.713 -	sqlite3_bind_int(session->i18n_token, 2, phrase_id);
  26.714 +    sqlite3_bind_text(session->i18n_token, 1, lang, -1, SQLITE_STATIC);
  26.715 +    sqlite3_bind_int(session->i18n_token, 2, phrase_id);
  26.716  
  26.717      const char *_phrase = NULL;
  26.718      int result;
    27.1 --- a/src/pEpEngine.h	Fri Apr 01 17:33:42 2016 +0200
    27.2 +++ b/src/pEpEngine.h	Tue Apr 26 10:58:43 2016 +0200
    27.3 @@ -25,72 +25,72 @@
    27.4  typedef struct _pEpSession * PEP_SESSION;
    27.5  
    27.6  typedef enum {
    27.7 -	PEP_STATUS_OK									= 0,
    27.8 +    PEP_STATUS_OK                                   = 0,
    27.9  
   27.10 -	PEP_INIT_CANNOT_LOAD_GPGME						= 0x0110,
   27.11 -	PEP_INIT_GPGME_INIT_FAILED						= 0x0111,
   27.12 -	PEP_INIT_NO_GPG_HOME							= 0x0112,
   27.13 -	PEP_INIT_NETPGP_INIT_FAILED						= 0x0113,
   27.14 +    PEP_INIT_CANNOT_LOAD_GPGME                      = 0x0110,
   27.15 +    PEP_INIT_GPGME_INIT_FAILED                      = 0x0111,
   27.16 +    PEP_INIT_NO_GPG_HOME                            = 0x0112,
   27.17 +    PEP_INIT_NETPGP_INIT_FAILED                     = 0x0113,
   27.18  
   27.19 -	PEP_INIT_SQLITE3_WITHOUT_MUTEX					= 0x0120,
   27.20 -	PEP_INIT_CANNOT_OPEN_DB							= 0x0121,
   27.21 -	PEP_INIT_CANNOT_OPEN_SYSTEM_DB					= 0x0122,
   27.22 -	
   27.23 -	PEP_KEY_NOT_FOUND						        = 0x0201,
   27.24 -	PEP_KEY_HAS_AMBIG_NAME					        = 0x0202,
   27.25 -	PEP_GET_KEY_FAILED						        = 0x0203,
   27.26 -	
   27.27 -	PEP_CANNOT_FIND_IDENTITY						= 0x0301,
   27.28 -	PEP_CANNOT_SET_PERSON							= 0x0381,
   27.29 -	PEP_CANNOT_SET_PGP_KEYPAIR						= 0x0382,
   27.30 -	PEP_CANNOT_SET_IDENTITY							= 0x0383,
   27.31 +    PEP_INIT_SQLITE3_WITHOUT_MUTEX                  = 0x0120,
   27.32 +    PEP_INIT_CANNOT_OPEN_DB                         = 0x0121,
   27.33 +    PEP_INIT_CANNOT_OPEN_SYSTEM_DB                  = 0x0122,
   27.34 +    
   27.35 +    PEP_KEY_NOT_FOUND                               = 0x0201,
   27.36 +    PEP_KEY_HAS_AMBIG_NAME                          = 0x0202,
   27.37 +    PEP_GET_KEY_FAILED                              = 0x0203,
   27.38 +    
   27.39 +    PEP_CANNOT_FIND_IDENTITY                        = 0x0301,
   27.40 +    PEP_CANNOT_SET_PERSON                           = 0x0381,
   27.41 +    PEP_CANNOT_SET_PGP_KEYPAIR                      = 0x0382,
   27.42 +    PEP_CANNOT_SET_IDENTITY                         = 0x0383,
   27.43      PEP_CANNOT_SET_TRUST                            = 0x0384,
   27.44      PEP_KEY_BLACKLISTED                             = 0x0385,
   27.45 -	
   27.46 -	PEP_UNENCRYPTED									= 0x0400,
   27.47 -	PEP_VERIFIED									= 0x0401,
   27.48 -	PEP_DECRYPTED									= 0x0402,
   27.49 -	PEP_DECRYPTED_AND_VERIFIED						= 0x0403,
   27.50 -	PEP_DECRYPT_WRONG_FORMAT						= 0x0404,
   27.51 -	PEP_DECRYPT_NO_KEY								= 0x0405,
   27.52 -	PEP_DECRYPT_SIGNATURE_DOES_NOT_MATCH			= 0x0406,
   27.53 +    
   27.54 +    PEP_UNENCRYPTED                                 = 0x0400,
   27.55 +    PEP_VERIFIED                                    = 0x0401,
   27.56 +    PEP_DECRYPTED                                   = 0x0402,
   27.57 +    PEP_DECRYPTED_AND_VERIFIED                      = 0x0403,
   27.58 +    PEP_DECRYPT_WRONG_FORMAT                        = 0x0404,
   27.59 +    PEP_DECRYPT_NO_KEY                              = 0x0405,
   27.60 +    PEP_DECRYPT_SIGNATURE_DOES_NOT_MATCH            = 0x0406,
   27.61      PEP_VERIFY_NO_KEY                               = 0x0407,
   27.62      PEP_VERIFIED_AND_TRUSTED                        = 0x0408,
   27.63 -	PEP_CANNOT_DECRYPT_UNKNOWN						= 0x04ff,
   27.64 +    PEP_CANNOT_DECRYPT_UNKNOWN                      = 0x04ff,
   27.65  
   27.66 -	PEP_TRUSTWORD_NOT_FOUND							= 0x0501,
   27.67 +    PEP_TRUSTWORD_NOT_FOUND                         = 0x0501,
   27.68  
   27.69      PEP_CANNOT_CREATE_KEY                           = 0x0601,
   27.70      PEP_CANNOT_SEND_KEY                             = 0x0602,
   27.71  
   27.72      PEP_PHRASE_NOT_FOUND                            = 0x0701,
   27.73  
   27.74 -	PEP_COMMIT_FAILED								= 0xff01,
   27.75 +    PEP_COMMIT_FAILED                               = 0xff01,
   27.76  
   27.77      PEP_CANNOT_CREATE_TEMP_FILE                     = -5,
   27.78      PEP_ILLEGAL_VALUE                               = -4,
   27.79      PEP_BUFFER_TOO_SMALL                            = -3,
   27.80 -	PEP_OUT_OF_MEMORY								= -2,
   27.81 -	PEP_UNKNOWN_ERROR								= -1
   27.82 +    PEP_OUT_OF_MEMORY                               = -2,
   27.83 +    PEP_UNKNOWN_ERROR                               = -1
   27.84  } PEP_STATUS;
   27.85  
   27.86  
   27.87  // INIT_STATUS init() - initialize pEpEngine for a thread
   27.88  //
   27.89  //  parameters:
   27.90 -//		session (out)	init() allocates session memory and returns a pointer
   27.91 -//		                as a handle
   27.92 +//        session (out)   init() allocates session memory and returns a pointer
   27.93 +//                        as a handle
   27.94  //
   27.95  //  return value:
   27.96 -//		PEP_STATUS_OK = 0					if init() succeeds
   27.97 -//		PEP_INIT_SQLITE3_WITHOUT_MUTEX		if SQLite3 was compiled with
   27.98 -//		                                    SQLITE_THREADSAFE 0
   27.99 -//		PEP_INIT_CANNOT_LOAD_GPGME			if libgpgme.dll cannot be found
  27.100 -//		PEP_INIT_GPGME_INIT_FAILED			if GPGME init fails
  27.101 -//		PEP_INIT_CANNOT_OPEN_DB				if user's management db cannot be
  27.102 -//		                                    opened
  27.103 -//		PEP_INIT_CANNOT_OPEN_SYSTEM_DB		if system's management db cannot be
  27.104 -//		                                    opened
  27.105 +//        PEP_STATUS_OK = 0                 if init() succeeds
  27.106 +//        PEP_INIT_SQLITE3_WITHOUT_MUTEX    if SQLite3 was compiled with
  27.107 +//                                            SQLITE_THREADSAFE 0
  27.108 +//        PEP_INIT_CANNOT_LOAD_GPGME        if libgpgme.dll cannot be found
  27.109 +//        PEP_INIT_GPGME_INIT_FAILED        if GPGME init fails
  27.110 +//        PEP_INIT_CANNOT_OPEN_DB           if user's management db cannot be
  27.111 +//                                            opened
  27.112 +//        PEP_INIT_CANNOT_OPEN_SYSTEM_DB    if system's management db cannot be
  27.113 +//                                            opened
  27.114  //
  27.115  //  caveat:
  27.116  //      the pointer is valid only if the return value is PEP_STATUS_OK
  27.117 @@ -106,11 +106,11 @@
  27.118  // void release() - release thread session handle
  27.119  //
  27.120  //  parameters:
  27.121 -//		session (in)	session handle to release
  27.122 +//        session (in)    session handle to release
  27.123  //
  27.124 -//	caveat:
  27.125 -//	    the last release() can be called only when all other release() calls
  27.126 -//	    are done
  27.127 +//    caveat:
  27.128 +//        the last release() can be called only when all other release() calls
  27.129 +//        are done
  27.130  
  27.131  DYNAMIC_API void release(PEP_SESSION session);
  27.132  
  27.133 @@ -135,27 +135,27 @@
  27.134  
  27.135  // decrypt_and_verify() - decrypt and/or verify a message
  27.136  //
  27.137 -//	parameters:
  27.138 -//		session (in)	session handle
  27.139 -//		ctext (in)		cipher text to decrypt and/or verify
  27.140 -//		csize (in)		size of cipher text
  27.141 -//		ptext (out)		pointer to internal buffer with plain text
  27.142 -//		psize (out)		size of plain text
  27.143 -//		keylist (out)	list of key ids which where used to encrypt
  27.144 +//    parameters:
  27.145 +//        session (in)    session handle
  27.146 +//        ctext (in)      cipher text to decrypt and/or verify
  27.147 +//        csize (in)      size of cipher text
  27.148 +//        ptext (out)     pointer to internal buffer with plain text
  27.149 +//        psize (out)     size of plain text
  27.150 +//        keylist (out)   list of key ids which where used to encrypt
  27.151  //
  27.152 -//	return value:
  27.153 -//		PEP_UNENCRYPTED				message was unencrypted and not signed
  27.154 -//		PEP_VERIFIED				message was unencrypted, signature matches
  27.155 -//		PEP_DECRYPTED				message is decrypted now, no signature
  27.156 -//		PEP_DECRYPTED_AND_VERIFIED	message is decrypted now and verified
  27.157 -//		PEP_DECRYPT_WRONG_FORMAT	message has wrong format to handle
  27.158 -//		PEP_DECRYPT_NO_KEY			key not available to decrypt and/or verify
  27.159 -//		PEP_DECRYPT_SIGNATURE_DOES_NOT_MATCH	wrong signature
  27.160 +//    return value:
  27.161 +//        PEP_UNENCRYPTED               message was unencrypted and not signed
  27.162 +//        PEP_VERIFIED                  message was unencrypted, signature matches
  27.163 +//        PEP_DECRYPTED                 message is decrypted now, no signature
  27.164 +//        PEP_DECRYPTED_AND_VERIFIED    message is decrypted now and verified
  27.165 +//        PEP_DECRYPT_WRONG_FORMAT      message has wrong format to handle
  27.166 +//        PEP_DECRYPT_NO_KEY            key not available to decrypt and/or verify
  27.167 +//        PEP_DECRYPT_SIGNATURE_DOES_NOT_MATCH    wrong signature
  27.168  //
  27.169 -//	caveat:
  27.170 -//	    the ownerships of ptext as well as keylist are going to the caller
  27.171 -//	    the caller must use free() (or an Windoze pEp_free()) and
  27.172 -//	    free_stringlist() to free them
  27.173 +//    caveat:
  27.174 +//        the ownerships of ptext as well as keylist are going to the caller
  27.175 +//        the caller must use free() (or an Windoze pEp_free()) and
  27.176 +//        free_stringlist() to free them
  27.177  //
  27.178  //      if this function failes an error message may be the first element of
  27.179  //      keylist and the other elements may be the keys used for encryption
  27.180 @@ -174,13 +174,13 @@
  27.181  //      size (in)       size of text
  27.182  //      signature (in)  signature text
  27.183  //      sig_size (in)   size of signature
  27.184 -//		keylist (out)	list of key ids which where used to encrypt or NULL on
  27.185 -//		                error
  27.186 +//      keylist (out)   list of key ids which where used to encrypt or NULL on
  27.187 +//                        error
  27.188  //
  27.189  //  return value:
  27.190 -//		PEP_VERIFIED				message was unencrypted, signature matches
  27.191 -//		PEP_DECRYPT_NO_KEY			key not available to decrypt and/or verify
  27.192 -//		PEP_DECRYPT_SIGNATURE_DOES_NOT_MATCH	wrong signature
  27.193 +//        PEP_VERIFIED                message was unencrypted, signature matches
  27.194 +//        PEP_DECRYPT_NO_KEY          key not available to decrypt and/or verify
  27.195 +//        PEP_DECRYPT_SIGNATURE_DOES_NOT_MATCH    wrong signature
  27.196  
  27.197  DYNAMIC_API PEP_STATUS verify_text(
  27.198          PEP_SESSION session, const char *text, size_t size,
  27.199 @@ -190,24 +190,24 @@
  27.200  
  27.201  // encrypt_and_sign() - encrypt and sign a message
  27.202  //
  27.203 -//	parameters:
  27.204 -//		session (in)	session handle
  27.205 -//		keylist (in)	list of key ids to encrypt with as C strings
  27.206 -//		ptext (in)		plain text to decrypt and/or verify
  27.207 -//		psize (in)		size of plain text
  27.208 -//		ctext (out)		pointer to internal buffer with cipher text
  27.209 -//		csize (out)		size of cipher text
  27.210 +//    parameters:
  27.211 +//        session (in)    session handle
  27.212 +//        keylist (in)    list of key ids to encrypt with as C strings
  27.213 +//        ptext (in)      plain text to decrypt and/or verify
  27.214 +//        psize (in)      size of plain text
  27.215 +//        ctext (out)     pointer to internal buffer with cipher text
  27.216 +//        csize (out)     size of cipher text
  27.217  //
  27.218 -//	return value:
  27.219 -//		PEP_STATUS_OK = 0				encryption and signing succeeded
  27.220 -//		PEP_KEY_NOT_FOUND	            at least one of the receipient keys
  27.221 -//		                                could not be found
  27.222 -//		PEP_KEY_HAS_AMBIG_NAME          at least one of the receipient keys has
  27.223 -//		                                an ambiguous name
  27.224 -//		PEP_GET_KEY_FAILED		        cannot retrieve key
  27.225 +//    return value:
  27.226 +//        PEP_STATUS_OK = 0            encryption and signing succeeded
  27.227 +//        PEP_KEY_NOT_FOUND            at least one of the receipient keys
  27.228 +//                                     could not be found
  27.229 +//        PEP_KEY_HAS_AMBIG_NAME       at least one of the receipient keys has
  27.230 +//                                     an ambiguous name
  27.231 +//        PEP_GET_KEY_FAILED           cannot retrieve key
  27.232  //
  27.233 -//	caveat:
  27.234 -//	    the ownership of ctext is going to the caller
  27.235 +//    caveat:
  27.236 +//      the ownership of ctext is going to the caller
  27.237  //      the caller is responsible to free() it (on Windoze use pEp_free())
  27.238  //      the first key in keylist is being used to sign the message
  27.239  //      this implies there has to be a private key for that keypair
  27.240 @@ -221,17 +221,17 @@
  27.241  // log_event() - log a user defined event defined by UTF-8 encoded strings into
  27.242  // management log
  27.243  //
  27.244 -//	parameters:
  27.245 -//		session (in)		session handle
  27.246 -//		title (in)			C string with event name
  27.247 -//		entity (in)			C string with name of entity which is logging
  27.248 -//		description (in)	C string with long description for event or NULL if
  27.249 -//		                    omitted
  27.250 -//		comment (in)		C string with user defined comment or NULL if
  27.251 -//		                    omitted
  27.252 +//    parameters:
  27.253 +//        session (in)        session handle
  27.254 +//        title (in)          C string with event name
  27.255 +//        entity (in)         C string with name of entity which is logging
  27.256 +//        description (in)    C string with long description for event or NULL if
  27.257 +//                            omitted
  27.258 +//        comment (in)        C string with user defined comment or NULL if
  27.259 +//                            omitted
  27.260  //
  27.261 -//	return value:
  27.262 -//	    PEP_STATUS_OK       log entry created
  27.263 +//    return value:
  27.264 +//        PEP_STATUS_OK       log entry created
  27.265  
  27.266  DYNAMIC_API PEP_STATUS log_event(
  27.267          PEP_SESSION session,
  27.268 @@ -244,21 +244,21 @@
  27.269  
  27.270  // trustword() - get the corresponding trustword for a 16 bit value
  27.271  //
  27.272 -//	parameters:
  27.273 -//		session (in)		    session handle
  27.274 -//		value (in)			    value to find a trustword for
  27.275 -//		lang (in)			    C string with ISO 639-1 language code
  27.276 -//		word (out)			    pointer to C string with trustword UTF-8 encoded
  27.277 -//							    NULL if language is not supported or trustword
  27.278 -//							    wordlist is damaged or unavailable
  27.279 -//		wsize (out)			    length of trustword
  27.280 +//    parameters:
  27.281 +//        session (in)            session handle
  27.282 +//        value (in)              value to find a trustword for
  27.283 +//        lang (in)               C string with ISO 639-1 language code
  27.284 +//        word (out)              pointer to C string with trustword UTF-8 encoded
  27.285 +//                                NULL if language is not supported or trustword
  27.286 +//                                wordlist is damaged or unavailable
  27.287 +//        wsize (out)             length of trustword
  27.288  //
  27.289 -//	return value:
  27.290 -//	    PEP_STATUS_OK           trustword retrieved
  27.291 -//	    PEP_TRUSTWORD_NOT_FOUND  trustword not found
  27.292 +//    return value:
  27.293 +//        PEP_STATUS_OK            trustword retrieved
  27.294 +//        PEP_TRUSTWORD_NOT_FOUND  trustword not found
  27.295  //
  27.296 -//	caveat:
  27.297 -//		the word pointer goes to the ownership of the caller
  27.298 +//    caveat:
  27.299 +//        the word pointer goes to the ownership of the caller
  27.300  //      the caller is responsible to free() it (on Windoze use pEp_free())
  27.301  
  27.302  DYNAMIC_API PEP_STATUS trustword(
  27.303 @@ -269,25 +269,25 @@
  27.304  
  27.305  // trustwords() - get trustwords for a string of hex values of a fingerprint
  27.306  //
  27.307 -//	parameters:
  27.308 -//		session (in)		session handle
  27.309 -//		fingerprint (in)	C string with hex values to find trustwords for
  27.310 -//		lang (in)			C string with ISO 639-1 language code
  27.311 -//		words (out)			pointer to C string with trustwords UTF-8 encoded,
  27.312 -//		                    separated by a blank each
  27.313 -//							NULL if language is not supported or trustword
  27.314 -//							wordlist is damaged or unavailable
  27.315 -//		wsize (out)			length of trustwords string
  27.316 -//		max_words (in)		only generate a string with max_words;
  27.317 -//							if max_words == 0 there is no such limit
  27.318 +//    parameters:
  27.319 +//        session (in)        session handle
  27.320 +//        fingerprint (in)    C string with hex values to find trustwords for
  27.321 +//        lang (in)           C string with ISO 639-1 language code
  27.322 +//        words (out)         pointer to C string with trustwords UTF-8 encoded,
  27.323 +//                            separated by a blank each
  27.324 +//                            NULL if language is not supported or trustword
  27.325 +//                            wordlist is damaged or unavailable
  27.326 +//        wsize (out)         length of trustwords string
  27.327 +//        max_words (in)      only generate a string with max_words;
  27.328 +//                            if max_words == 0 there is no such limit
  27.329  //
  27.330 -//	return value:
  27.331 -//	    PEP_STATUS_OK           trustwords retrieved
  27.332 -//      PEP_OUT_OF_MEMORY       out of memory
  27.333 -//	    PEP_TRUSTWORD_NOT_FOUND at least one trustword not found
  27.334 +//    return value:
  27.335 +//        PEP_STATUS_OK            trustwords retrieved
  27.336 +//        PEP_OUT_OF_MEMORY        out of memory
  27.337 +//        PEP_TRUSTWORD_NOT_FOUND  at least one trustword not found
  27.338  //
  27.339 -//	caveat:
  27.340 -//		the word pointer goes to the ownership of the caller
  27.341 +//    caveat:
  27.342 +//        the word pointer goes to the ownership of the caller
  27.343  //      the caller is responsible to free() it (on Windoze use pEp_free())
  27.344  //
  27.345  //  DON'T USE THIS FUNCTION FROM HIGH LEVEL LANGUAGES!
  27.346 @@ -325,7 +325,7 @@
  27.347      // range 0x10 to 0x3f: unconfirmed encryption
  27.348  
  27.349      PEP_ct_unconfirmed_encryption = 0x10,       // generic
  27.350 -    PEP_ct_OpenPGP_weak_unconfirmed = 0x11,	    // RSA 1024 is weak
  27.351 +    PEP_ct_OpenPGP_weak_unconfirmed = 0x11,     // RSA 1024 is weak
  27.352  
  27.353      PEP_ct_to_be_checked = 0x20,                // generic
  27.354      PEP_ct_SMIME_unconfirmed = 0x21,
  27.355 @@ -346,34 +346,34 @@
  27.356      // range 0x90 to 0xbf: confirmed encryption
  27.357  
  27.358      PEP_ct_confirmed_encryption = 0x90,         // generic
  27.359 -	PEP_ct_OpenPGP_weak = 0x91,                 // RSA 1024 is weak
  27.360 +    PEP_ct_OpenPGP_weak = 0x91,                 // RSA 1024 is weak
  27.361  
  27.362      PEP_ct_to_be_checked_confirmed = 0xa0,      //generic
  27.363      PEP_ct_SMIME = 0xa1,
  27.364      PEP_ct_CMS = 0xa2,
  27.365  
  27.366      PEP_ct_strong_encryption = 0xb0,            // generic
  27.367 -	PEP_ct_OpenPGP = 0xb8,                      // key at least 2048 bit RSA or EC
  27.368 -	PEP_ct_OTR = 0xba,
  27.369 +    PEP_ct_OpenPGP = 0xb8,                      // key at least 2048 bit RSA or EC
  27.370 +    PEP_ct_OTR = 0xba,
  27.371  
  27.372      // range 0xc0 to 0xff: confirmed encryption and anonymization
  27.373  
  27.374      PEP_ct_confirmed_enc_anon = 0xc0,           // generic
  27.375 -	PEP_ct_pEp = 0xff
  27.376 +    PEP_ct_pEp = 0xff
  27.377  } PEP_comm_type;
  27.378  
  27.379  typedef struct _pEp_identity {
  27.380 -	size_t struct_size;			// size of whole struct
  27.381 -	char *address;		        // C string with address UTF-8 encoded
  27.382 -	size_t address_size;		// size of address
  27.383 -	char *fpr;			        // C string with fingerprint UTF-8 encoded
  27.384 -	size_t fpr_size;			// size of fingerprint
  27.385 -	char *user_id;		        // C string with user ID UTF-8 encoded
  27.386 -	size_t user_id_size;		// size of user ID
  27.387 -	char *username;		        // C string with user name UTF-8 encoded
  27.388 -	size_t username_size;		// size of user name
  27.389 -	PEP_comm_type comm_type;	// type of communication with this ID
  27.390 -    char lang[3];				// language of conversation
  27.391 +    size_t struct_size;         // size of whole struct
  27.392 +    char *address;              // C string with address UTF-8 encoded
  27.393 +    size_t address_size;        // size of address
  27.394 +    char *fpr;                  // C string with fingerprint UTF-8 encoded
  27.395 +    size_t fpr_size;            // size of fingerprint
  27.396 +    char *user_id;              // C string with user ID UTF-8 encoded
  27.397 +    size_t user_id_size;        // size of user ID
  27.398 +    char *username;             // C string with user name UTF-8 encoded
  27.399 +    size_t username_size;       // size of user name
  27.400 +    PEP_comm_type comm_type;    // type of communication with this ID
  27.401 +    char lang[3];               // language of conversation
  27.402                                  // ISO 639-1 ALPHA-2, last byte is 0
  27.403      bool me;                    // if this is the local user herself/himself
  27.404  } pEp_identity;
  27.405 @@ -429,18 +429,18 @@
  27.406  
  27.407  // get_identity() - get identity information
  27.408  //
  27.409 -//	parameters:
  27.410 -//		session (in)		session handle
  27.411 -//		address (in)		C string with communication address, UTF-8 encoded
  27.412 -//		identity (out)		pointer to pEp_identity structure with results or
  27.413 -//		                    NULL if failure
  27.414 +//    parameters:
  27.415 +//        session (in)        session handle
  27.416 +//        address (in)        C string with communication address, UTF-8 encoded
  27.417 +//        identity (out)      pointer to pEp_identity structure with results or
  27.418 +//                            NULL if failure
  27.419  //
  27.420 -//	caveat:
  27.421 -//	    the address string is being copied; the original string remains in the
  27.422 -//	    ownership of the caller
  27.423 -//		the resulting pEp_identity structure goes to the ownership of the
  27.424 -//		caller and has to be freed with free_identity() when not in use any
  27.425 -//		more
  27.426 +//    caveat:
  27.427 +//        the address string is being copied; the original string remains in the
  27.428 +//        ownership of the caller
  27.429 +//        the resulting pEp_identity structure goes to the ownership of the
  27.430 +//        caller and has to be freed with free_identity() when not in use any
  27.431 +//        more
  27.432  
  27.433  DYNAMIC_API PEP_STATUS get_identity(
  27.434          PEP_SESSION session, const char *address,
  27.435 @@ -450,22 +450,22 @@
  27.436  
  27.437  // set_identity() - set identity information
  27.438  //
  27.439 -//	parameters:
  27.440 -//		session (in)		session handle
  27.441 -//		identity (in)		pointer to pEp_identity structure
  27.442 +//    parameters:
  27.443 +//        session (in)        session handle
  27.444 +//        identity (in)       pointer to pEp_identity structure
  27.445  //
  27.446 -//	return value:
  27.447 -//		PEP_STATUS_OK = 0			    encryption and signing succeeded
  27.448 -//		PEP_CANNOT_SET_PERSON		    writing to table person failed
  27.449 -//		PEP_CANNOT_SET_PGP_KEYPAIR	    writing to table pgp_keypair failed
  27.450 -//		PEP_CANNOT_SET_IDENTITY		    writing to table identity failed
  27.451 -//		PEP_COMMIT_FAILED			    SQL commit failed
  27.452 +//    return value:
  27.453 +//        PEP_STATUS_OK = 0             encryption and signing succeeded
  27.454 +//        PEP_CANNOT_SET_PERSON         writing to table person failed
  27.455 +//        PEP_CANNOT_SET_PGP_KEYPAIR    writing to table pgp_keypair failed
  27.456 +//        PEP_CANNOT_SET_IDENTITY       writing to table identity failed
  27.457 +//        PEP_COMMIT_FAILED             SQL commit failed
  27.458  //      PEP_KEY_BLACKLISTED             Key blacklisted, cannot set identity
  27.459  //
  27.460 -//	caveat:
  27.461 -//		in the identity structure you need to set the const char * fields to
  27.462 -//		UTF-8 C strings
  27.463 -//		the size fields are ignored
  27.464 +//    caveat:
  27.465 +//        in the identity structure you need to set the const char * fields to
  27.466 +//        UTF-8 C strings
  27.467 +//        the size fields are ignored
  27.468  
  27.469  DYNAMIC_API PEP_STATUS set_identity(
  27.470          PEP_SESSION session, const pEp_identity *identity
  27.471 @@ -474,9 +474,9 @@
  27.472  
  27.473  // mark_as_compromized() - mark key in trust db as compromized
  27.474  //
  27.475 -//	parameters:
  27.476 -//		session (in)		session handle
  27.477 -//		fpr (in)            fingerprint of key to mark
  27.478 +//    parameters:
  27.479 +//        session (in)        session handle
  27.480 +//        fpr (in)            fingerprint of key to mark
  27.481  
  27.482  DYNAMIC_API PEP_STATUS mark_as_compromized(
  27.483          PEP_SESSION session,
  27.484 @@ -488,12 +488,12 @@
  27.485  //
  27.486  //  parameters:
  27.487  //      session (in)            session handle
  27.488 -//		identity (inout)	    pointer to pEp_identity structure
  27.489 +//        identity (inout)      pointer to pEp_identity structure
  27.490  //
  27.491 -//	return value:
  27.492 -//		PEP_STATUS_OK = 0	    encryption and signing succeeded
  27.493 -//		PEP_ILLEGAL_VALUE       illegal values for identity fields given
  27.494 -//		PEP_CANNOT_CREATE_KEY   key engine is on strike
  27.495 +//    return value:
  27.496 +//        PEP_STATUS_OK = 0       encryption and signing succeeded
  27.497 +//        PEP_ILLEGAL_VALUE       illegal values for identity fields given
  27.498 +//        PEP_CANNOT_CREATE_KEY   key engine is on strike
  27.499  //
  27.500  //  caveat:
  27.501  //      address and username fields must be set to UTF-8 strings
  27.502 @@ -546,7 +546,7 @@
  27.503  //      session (in)            session handle
  27.504  //      fpr (in)                key id or fingerprint of key
  27.505  //      key_data (out)          ASCII armored OpenPGP key
  27.506 -//      size (out)               amount of data to handle
  27.507 +//      size (out)              amount of data to handle
  27.508  //
  27.509  //  return value:
  27.510  //      PEP_STATUS_OK = 0       key was successfully exported
  27.511 @@ -581,8 +581,8 @@
  27.512  //      keylist (out)           list of fingerprints found or NULL on error
  27.513  //
  27.514  //  caveat:
  27.515 -//	    the ownerships of keylist isgoing to the caller
  27.516 -//	    the caller must use free_stringlist() to free it
  27.517 +//        the ownerships of keylist isgoing to the caller
  27.518 +//        the caller must use free_stringlist() to free it
  27.519  
  27.520  
  27.521  DYNAMIC_API PEP_STATUS find_keys(
  27.522 @@ -753,7 +753,7 @@
  27.523  //
  27.524  //  parameters:
  27.525  //      session (in)            session handle
  27.526 -//		lang (in)			    C string with ISO 639-1 language code
  27.527 +//      lang (in)               C string with ISO 639-1 language code
  27.528  //      phrase_id (in)          id of phrase in i18n
  27.529  //      phrase (out)            phrase as UTF-8 string
  27.530  //
    28.1 --- a/test/blacklist_test.cc	Fri Apr 01 17:33:42 2016 +0200
    28.2 +++ b/test/blacklist_test.cc	Tue Apr 26 10:58:43 2016 +0200
    28.3 @@ -1,5 +1,6 @@
    28.4  #include <iostream>
    28.5  #include <string>
    28.6 +#include <cstring> // for strcmp()
    28.7  #include <assert.h>
    28.8  #include "blacklist.h"
    28.9  
   28.10 @@ -38,7 +39,7 @@
   28.11      cout << "the blacklist contains now: ";
   28.12      for (stringlist_t *bl = blacklist; bl && bl->value; bl = bl->next) {
   28.13          cout << bl->value << ", ";
   28.14 -        if (strcmp(bl->value, "23") == 0)
   28.15 +        if (std::strcmp(bl->value, "23") == 0)
   28.16              in23 = true;
   28.17      }
   28.18      cout << "END\n";
    29.1 --- a/test/pEpEngineTest.cc	Fri Apr 01 17:33:42 2016 +0200
    29.2 +++ b/test/pEpEngineTest.cc	Tue Apr 26 10:58:43 2016 +0200
    29.3 @@ -1,4 +1,4 @@
    29.4 -#include <iostream>
    29.5 +#include <iostream>
    29.6  #include <fstream>
    29.7  #include <string>
    29.8  
    29.9 @@ -108,7 +108,7 @@
   29.10      cout << "calling decrypt_and_verify()\n";
   29.11      PEP_STATUS decrypt_result = decrypt_and_verify(session, cipher_buffer, cipher_length, &buf_text, &buf_size, &keylist);
   29.12  
   29.13 -    cout << "returning from decrypt_and_verify() with result == " << decrypt_result << "\n";
   29.14 +    cout << "returning from decrypt_and_verify() with result == 0x" << std::hex << decrypt_result << "\n";
   29.15      assert(decrypt_result == PEP_DECRYPTED_AND_VERIFIED);
   29.16      assert(buf_text);
   29.17      assert(keylist);