Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(58)

Side by Side Diff: net/third_party/nss/ssl/ssl3ext.c

Issue 9733012: Update NSS to NSS 3.13.4 pre-release snapshot 20120319. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Forgot to update the sslerr.h and SSLerrs.h files Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * SSL3 Protocol 2 * SSL3 Protocol
3 * 3 *
4 * ***** BEGIN LICENSE BLOCK ***** 4 * ***** BEGIN LICENSE BLOCK *****
5 * Version: MPL 1.1/GPL 2.0/LGPL 2.1 5 * Version: MPL 1.1/GPL 2.0/LGPL 2.1
6 * 6 *
7 * The contents of this file are subject to the Mozilla Public License Version 7 * The contents of this file are subject to the Mozilla Public License Version
8 * 1.1 (the "License"); you may not use this file except in compliance with 8 * 1.1 (the "License"); you may not use this file except in compliance with
9 * the License. You may obtain a copy of the License at 9 * the License. You may obtain a copy of the License at
10 * http://www.mozilla.org/MPL/ 10 * http://www.mozilla.org/MPL/
(...skipping 23 matching lines...) Expand all
34 * under the terms of either the GPL or the LGPL, and not to allow others to 34 * under the terms of either the GPL or the LGPL, and not to allow others to
35 * use your version of this file under the terms of the MPL, indicate your 35 * use your version of this file under the terms of the MPL, indicate your
36 * decision by deleting the provisions above and replace them with the notice 36 * decision by deleting the provisions above and replace them with the notice
37 * and other provisions required by the GPL or the LGPL. If you do not delete 37 * and other provisions required by the GPL or the LGPL. If you do not delete
38 * the provisions above, a recipient may use your version of this file under 38 * the provisions above, a recipient may use your version of this file under
39 * the terms of any one of the MPL, the GPL or the LGPL. 39 * the terms of any one of the MPL, the GPL or the LGPL.
40 * 40 *
41 * ***** END LICENSE BLOCK ***** */ 41 * ***** END LICENSE BLOCK ***** */
42 42
43 /* TLS extension code moved here from ssl3ecc.c */ 43 /* TLS extension code moved here from ssl3ecc.c */
44 /* $Id: ssl3ext.c,v 1.21 2012/02/15 21:52:08 kaie%kuix.de Exp $ */ 44 /* $Id: ssl3ext.c,v 1.22 2012/03/12 19:14:12 wtc%google.com Exp $ */
45 45
46 #include "nssrenam.h" 46 #include "nssrenam.h"
47 #include "nss.h" 47 #include "nss.h"
48 #include "ssl.h" 48 #include "ssl.h"
49 #include "sslimpl.h" 49 #include "sslimpl.h"
50 #include "sslproto.h" 50 #include "sslproto.h"
51 #include "pk11pub.h" 51 #include "pk11pub.h"
52 #include "blapi.h" 52 #include "blapi.h"
53 #include "prinit.h" 53 #include "prinit.h"
54 54
(...skipping 1806 matching lines...) Expand 10 before | Expand all | Expand 10 after
1861 1861
1862 /* The echoed extension must be empty. */ 1862 /* The echoed extension must be empty. */
1863 if (data->len != 0) 1863 if (data->len != 0)
1864 return SECFailure; 1864 return SECFailure;
1865 1865
1866 /* Keep track of negotiated extensions. */ 1866 /* Keep track of negotiated extensions. */
1867 ss->xtnData.negotiated[ss->xtnData.numNegotiated++] = ex_type; 1867 ss->xtnData.negotiated[ss->xtnData.numNegotiated++] = ex_type;
1868 1868
1869 return SECSuccess; 1869 return SECSuccess;
1870 } 1870 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698