← Back to branch summary

~ubuntu-branches/ubuntu/natty/gnutls26/natty-updates

« back to all changes in this revision

Viewing changes to lib/gnutls_x509.c

  • Committer: Bazaar Package Importer
  • Author(s): Andreas Metzler
  • Date: 2008-07-01 20:31:24 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20080701203124-6zu0d7gash9604z1
Tags: 2.4.2-1
http://bugs.debian.org/492775
* New upstream bugfix release.
* Up to date gnutls-cli manpage. Closes: #492775

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/gnutls_x509.c
354
354
      return ret;
355
355
    }
356
356
 
 
357
  tmp.data = (opaque *) input_cert;
 
358
  tmp.size = input_cert_size;
 
359
 
357
360
  if (flags & CERT_PEM)
358
361
    ret = gnutls_pkcs7_import (pkcs7, &tmp, GNUTLS_X509_FMT_PEM);
359
362
  else