← Back to branch summary

~ubuntu-branches/ubuntu/vivid/curl/vivid-proposed

« back to all changes in this revision

Viewing changes to lib/vtls/nssg.h

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2014-11-10 08:48:21 UTC
  • mfrom: (3.4.52 sid)
  • Revision ID: package-import@ubuntu.com-20141110084821-inwi9tek417xe4te
Tags: 7.38.0-3ubuntu1
* Merge from Debian. 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.
* Dropped patches:
  - debian/patches/09_fix-timeout-in-poll-and-wait.patch: upstream
  - debian/patches/CVE-2014-3613.patch: upstream
  - debian/patches/CVE-2014-3620.patch: upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/vtls/nssg.h
7
7
 *                            | (__| |_| |  _ <| |___
8
8
 *                             \___|\___/|_| \_\_____|
9
9
 *
10
 
 * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
 
10
 * Copyright (C) 1998 - 2014, 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
51
51
/* initialize NSS library if not already */
52
52
CURLcode Curl_nss_force_init(struct SessionHandle *data);
53
53
 
54
 
void Curl_nss_random(struct SessionHandle *data,
55
 
                     unsigned char *entropy,
56
 
                     size_t length);
 
54
int Curl_nss_random(struct SessionHandle *data,
 
55
                    unsigned char *entropy,
 
56
                    size_t length);
57
57
 
58
58
void Curl_nss_md5sum(unsigned char *tmp, /* input */
59
59
                     size_t tmplen,
61
61
                     size_t md5len);
62
62
 
63
63
/* this backend provides these functions: */
64
 
#define have_curlssl_random 1
65
64
#define have_curlssl_md5sum 1
66
65
 
67
66
/* API setup for NSS */
84
83
#define curlssl_data_pending(x,y) (x=x, y=y, 0)
85
84
#define curlssl_random(x,y,z) Curl_nss_random(x,y,z)
86
85
#define curlssl_md5sum(a,b,c,d) Curl_nss_md5sum(a,b,c,d)
 
86
#define CURL_SSL_BACKEND CURLSSLBACKEND_NSS
87
87
 
88
88
#endif /* USE_NSS */
89
89
#endif /* HEADER_CURL_NSSG_H */