← Back to branch summary

~ubuntu-branches/ubuntu/quantal/gnutls26/quantal-security

« back to all changes in this revision

Viewing changes to lib/gnutls_psk_netconf.c

  • Committer: Package Import Robot
  • Author(s): Andreas Metzler
  • Date: 2011-10-01 15:28:13 UTC
  • mfrom: (12.1.20 sid)
  • Revision ID: package-import@ubuntu.com-20111001152813-yygm1c4cxonfxhzy
Tags: 2.12.11-1
http://bugs.debian.org/640639
* New upstream version.
  + Allow CA importing of 0 certificates to succeed. Closes: #640639
* Add libp11-kit-dev to libgnutls-dev dependencies. (see #643811)
* [20_guiledocstring.diff] guile: Fix docstring extraction with CPP 4.5+.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/gnutls_psk_netconf.c
44
44
 * Returns: %GNUTLS_E_SUCCESS on success, or an error code.
45
45
 *
46
46
 * Since: 2.4.0
47
 
 **/
 
47
 *
 
48
 * Deprecated: The need for this interface was dropped from the
 
49
 * standard on publication as a RFC.  The function works now but will
 
50
 * return a hard failure in a future release.
 
51
 */
48
52
int
49
53
gnutls_psk_netconf_derive_key (const char *password,
50
 
                               const char *psk_identity,
51
 
                               const char *psk_identity_hint,
52
 
                               gnutls_datum_t * output_key)
 
54
                               const char *psk_identity,
 
55
                               const char *psk_identity_hint,
 
56
                               gnutls_datum_t * output_key)
53
57
{
54
58
  const char netconf_key_pad[] = "Key Pad for Netconf";
55
59
  size_t sha1len = _gnutls_hash_get_algo_len (GNUTLS_DIG_SHA1);