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

Side by Side Diff: net/third_party/mozilla_security_manager/nsPKCS12Blob.cpp

Issue 6805019: Move crypto files out of base, to a top level directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 8 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 /* ***** BEGIN LICENSE BLOCK ***** 1 /* ***** BEGIN LICENSE BLOCK *****
2 * Version: MPL 1.1/GPL 2.0/LGPL 2.1 2 * Version: MPL 1.1/GPL 2.0/LGPL 2.1
3 * 3 *
4 * The contents of this file are subject to the Mozilla Public License Version 4 * The contents of this file are subject to the Mozilla Public License Version
5 * 1.1 (the "License"); you may not use this file except in compliance with 5 * 1.1 (the "License"); you may not use this file except in compliance with
6 * the License. You may obtain a copy of the License at 6 * the License. You may obtain a copy of the License at
7 * http://www.mozilla.org/MPL/ 7 * http://www.mozilla.org/MPL/
8 * 8 *
9 * Software distributed under the License is distributed on an "AS IS" basis, 9 * Software distributed under the License is distributed on an "AS IS" basis,
10 * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License 10 * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
(...skipping 24 matching lines...) Expand all
35 * 35 *
36 * ***** END LICENSE BLOCK ***** */ 36 * ***** END LICENSE BLOCK ***** */
37 37
38 #include "net/third_party/mozilla_security_manager/nsPKCS12Blob.h" 38 #include "net/third_party/mozilla_security_manager/nsPKCS12Blob.h"
39 39
40 #include <pk11pub.h> 40 #include <pk11pub.h>
41 #include <pkcs12.h> 41 #include <pkcs12.h>
42 #include <p12plcy.h> 42 #include <p12plcy.h>
43 #include <secerr.h> 43 #include <secerr.h>
44 44
45 #include "base/crypto/scoped_nss_types.h"
46 #include "base/lazy_instance.h" 45 #include "base/lazy_instance.h"
47 #include "base/logging.h" 46 #include "base/logging.h"
48 #include "base/nss_util_internal.h" 47 #include "base/nss_util_internal.h"
49 #include "base/string_util.h" 48 #include "base/string_util.h"
50 #include "net/base/net_errors.h" 49 #include "net/base/net_errors.h"
51 #include "net/base/x509_certificate.h" 50 #include "net/base/x509_certificate.h"
52 51
53 namespace mozilla_security_manager { 52 namespace mozilla_security_manager {
54 53
55 namespace { 54 namespace {
(...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after
387 finish: 386 finish:
388 if (srv) 387 if (srv)
389 LOG(ERROR) << "PKCS#12 export failed with error " << PORT_GetError(); 388 LOG(ERROR) << "PKCS#12 export failed with error " << PORT_GetError();
390 if (ecx) 389 if (ecx)
391 SEC_PKCS12DestroyExportContext(ecx); 390 SEC_PKCS12DestroyExportContext(ecx);
392 SECITEM_ZfreeItem(&unicodePw, PR_FALSE); 391 SECITEM_ZfreeItem(&unicodePw, PR_FALSE);
393 return return_count; 392 return return_count;
394 } 393 }
395 394
396 } // namespace mozilla_security_manager 395 } // namespace mozilla_security_manager
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698