← Back to branch summary

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

« back to all changes in this revision

Viewing changes to lib/getinfo.c

  • 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/getinfo.c
285
285
      struct curl_tlssessioninfo *tsi = &data->tsi;
286
286
      struct connectdata *conn = data->easy_conn;
287
287
      unsigned int sockindex = 0;
 
288
      void *internals = NULL;
288
289
 
289
290
      *tsip = tsi;
290
291
      tsi->backend = CURLSSLBACKEND_NONE;
303
304
 
304
305
      /* Return the TLS session information from the relevant backend */
305
306
#ifdef USE_SSLEAY
306
 
      tsi->backend = CURLSSLBACKEND_OPENSSL;
307
 
      tsi->internals = conn->ssl[sockindex].ctx;
 
307
      internals = conn->ssl[sockindex].ctx;
308
308
#endif
309
309
#ifdef USE_GNUTLS
310
 
      tsi->backend = CURLSSLBACKEND_GNUTLS;
311
 
      tsi->internals = conn->ssl[sockindex].session;
 
310
      internals = conn->ssl[sockindex].session;
312
311
#endif
313
312
#ifdef USE_NSS
314
 
      tsi->backend = CURLSSLBACKEND_NSS;
315
 
      tsi->internals = conn->ssl[sockindex].handle;
 
313
      internals = conn->ssl[sockindex].handle;
316
314
#endif
317
315
#ifdef USE_QSOSSL
318
 
      tsi->backend = CURLSSLBACKEND_QSOSSL;
319
 
      tsi->internals = conn->ssl[sockindex].handle;
 
316
      internals = conn->ssl[sockindex].handle;
320
317
#endif
321
318
#ifdef USE_GSKIT
322
 
      tsi->backend = CURLSSLBACKEND_GSKIT;
323
 
      tsi->internals = conn->ssl[sockindex].handle;
 
319
      internals = conn->ssl[sockindex].handle;
324
320
#endif
 
321
      if(internals) {
 
322
        tsi->backend = Curl_ssl_backend();
 
323
        tsi->internals = internals;
 
324
      }
325
325
      /* NOTE: For other SSL backends, it is not immediately clear what data
326
326
         to return from 'struct ssl_connect_data'; thus, for now we keep the
327
327
         backend as CURLSSLBACKEND_NONE in those cases, which should be