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

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

Issue 14522022: Update NSS libSSL to NSS_3_15_BETA2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Make the changes rsleevi suggested Created 7 years, 7 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 * NSS utility functions 2 * NSS utility functions
3 * 3 *
4 * This Source Code Form is subject to the terms of the Mozilla Public 4 * This Source Code Form is subject to the terms of the Mozilla Public
5 * License, v. 2.0. If a copy of the MPL was not distributed with this 5 * License, v. 2.0. If a copy of the MPL was not distributed with this
6 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ 6 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
7 /* $Id: authcert.c,v 1.6 2012/04/25 14:50:12 gerv%gerv.net Exp $ */ 7 /* $Id$ */
8 8
9 #include <stdio.h> 9 #include <stdio.h>
10 #include <string.h> 10 #include <string.h>
11 #include "prerror.h" 11 #include "prerror.h"
12 #include "secitem.h" 12 #include "secitem.h"
13 #include "prnetdb.h" 13 #include "prnetdb.h"
14 #include "cert.h" 14 #include "cert.h"
15 #include "nspr.h" 15 #include "nspr.h"
16 #include "secder.h" 16 #include "secder.h"
17 #include "key.h" 17 #include "key.h"
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 CERT_FreeNicknames(names); 81 CERT_FreeNicknames(names);
82 } 82 }
83 } 83 }
84 if (rv == SECSuccess) { 84 if (rv == SECSuccess) {
85 *pRetCert = cert; 85 *pRetCert = cert;
86 *pRetKey = privkey; 86 *pRetKey = privkey;
87 } 87 }
88 return rv; 88 return rv;
89 } 89 }
90 90
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698