← Back to branch summary

~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-03-31 02:23:43 UTC
  • mfrom: (1.1.11 upstream)
  • Revision ID: james.westby@ubuntu.com-20100331022343-ck07ylqk8q474x26
Tags: 3.12.6-0ubuntu0.9.10.1
* New upstream release 3.12.6 RTM (NSS_3_12_6_RTM)
  - fixes CVE-2009-3555 aka US-CERT VU#120541
* Adjust patches to changed upstream code base
  - update debian/patches/38_kbsd.patch
  - update debian/patches/38_mips64_build.patch
  - update debian/patches/85_security_load.patch
* Remove patches that are merged upstream
  - delete debian/patches/91_nonexec_stack.patch
  - update debian/patches/series
* Bump nspr dependency to 4.8
  - update debian/control
* Add new symbols for 3.12.6
  - update debian/libnss3-1d.symbols 
* Enable transitional scheme for SSL renegotiation
  - add 97_SSL_RENEGOTIATE_TRANSITIONAL.patch
  - update debian/patches/series

Show diffs side-by-side

added added

removed removed

Lines of Context:
mozilla/security/nss/lib/ssl/ssl3ecc.c
40
40
 * ***** END LICENSE BLOCK ***** */
41
41
 
42
42
/* ECC code moved here from ssl3con.c */
43
 
/* $Id: ssl3ecc.c,v 1.22 2008/03/10 00:01:28 wtc%google.com Exp $ */
 
43
/* $Id: ssl3ecc.c,v 1.23 2010/01/28 16:14:25 kaie%kuix.de Exp $ */
44
44
 
45
45
#include "nss.h"
46
46
#include "cert.h"
1059
1059
        if (!ss->sec.isServer) {
1060
1060
            TLSExtensionData *xtnData = &ss->xtnData;
1061
1061
            xtnData->advertised[xtnData->numAdvertised++] =
1062
 
                elliptic_curves_xtn;
 
1062
                ssl_elliptic_curves_xtn;
1063
1063
        }
1064
1064
    }
1065
1065
    return (sizeof EClist);
1083
1083
        if (!ss->sec.isServer) {
1084
1084
            TLSExtensionData *xtnData = &ss->xtnData;
1085
1085
            xtnData->advertised[xtnData->numAdvertised++] =
1086
 
                ec_point_formats_xtn;
 
1086
                ssl_ec_point_formats_xtn;
1087
1087
        }
1088
1088
    }
1089
1089
    return (sizeof ECPtFmt);