~ubuntu-branches/ubuntu/karmic/nss/karmic-updates

« back to all changes in this revision

Viewing changes to mozilla/security/nss/lib/ssl/ssl3ecc.c

  • Committer: Bazaar Package Importer
  • Author(s): Chris Coulson
  • Date: 2010-10-04 23:18:57 UTC
  • mfrom: (1.1.12 upstream)
  • Revision ID: james.westby@ubuntu.com-20101004231857-grfx62qbg6gknih1
Tags: 3.12.8-0ubuntu0.9.10.1
* New upstream release v3.12.8 (NSS_3_12_8_RTM)
  - Fix browser wildcard certificate validation issue
  - Update root certs
  - Fix SSL deadlocks
* Refresh patches:
  - update debian/patches/38_kbsd.patch
  - update debian/patches/97_SSL_RENEGOTIATE_TRANSITIONAL.patch
* Bump minimum nspr version to 4.8.6
  - update debian/control
* Add new API to symbols file
  - update debian/libnss3-1d.symbols

Show diffs side-by-side

added added

removed removed

Lines of Context:
40
40
 * ***** END LICENSE BLOCK ***** */
41
41
 
42
42
/* ECC code moved here from ssl3con.c */
43
 
/* $Id: ssl3ecc.c,v 1.23 2010/01/28 16:14:25 kaie%kuix.de Exp $ */
 
43
/* $Id: ssl3ecc.c,v 1.24 2010/03/15 08:03:14 nelson%bolyard.com Exp $ */
44
44
 
45
45
#include "nss.h"
46
46
#include "cert.h"
288
288
    PRINT_BUF(95, (NULL, "ECDHkey hash: MD5 result", hashes->md5, MD5_LENGTH));
289
289
    PRINT_BUF(95, (NULL, "ECDHkey hash: SHA1 result", hashes->sha, SHA1_LENGTH));
290
290
 
291
 
    if (hashBuf != buf && hashBuf != NULL)
 
291
    if (hashBuf != buf)
292
292
        PORT_Free(hashBuf);
293
293
    return rv;
294
294
}