← Back to branch summary

~ubuntu-branches/ubuntu/saucy/curl/saucy

« back to all changes in this revision

Viewing changes to lib/gtls.h

  • Committer: Package Import Robot
  • Author(s): Ubuntu Merge-o-Matic
  • Date: 2013-08-12 15:39:32 UTC
  • mfrom: (3.4.41 sid)
  • Revision ID: package-import@ubuntu.com-20130812153932-pmn0qwvy9vghe66x
Tags: 7.32.0-1ubuntu1
https://launchpad.net/bugs/1220928
* Merge from Debian unstable.  Remaining changes:
  - Drop dependencies not in main:
    + Build-Depends: Drop stunnel4 and libssh2-1-dev.
    + Drop libssh2-1-dev from binary package Depends.
  - Add new libcurl3-udeb package.
  - Add new curl-udeb package.
* Fixes freeipa-client join. (LP: #1220928)

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/gtls.h
7
7
 *                            | (__| |_| |  _ <| |___
8
8
 *                             \___|\___/|_| \_\_____|
9
9
 *
10
 
 * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
 
10
 * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
11
11
 *
12
12
 * This software is licensed as described in the file COPYING, which
13
13
 * you should have received as part of this distribution. The terms
55
55
                      unsigned char *md5sum, /* output */
56
56
                      size_t md5len);
57
57
 
 
58
/* this backend provides these functions: */
 
59
#define have_curlssl_random 1
 
60
#define have_curlssl_md5sum 1
 
61
 
58
62
/* API setup for GnuTLS */
59
63
#define curlssl_init Curl_gtls_init
60
64
#define curlssl_cleanup Curl_gtls_cleanup