OLD | NEW |
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 27 matching lines...) Expand all Loading... |
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" | 45 #include "base/crypto/scoped_nss_types.h" |
46 #include "base/logging.h" | 46 #include "base/logging.h" |
47 #include "base/nss_util_internal.h" | 47 #include "base/nss_util_internal.h" |
| 48 #include "base/singleton.h" |
48 #include "base/string_util.h" | 49 #include "base/string_util.h" |
49 #include "net/base/net_errors.h" | 50 #include "net/base/net_errors.h" |
50 #include "net/base/x509_certificate.h" | 51 #include "net/base/x509_certificate.h" |
51 | 52 |
52 namespace mozilla_security_manager { | 53 namespace mozilla_security_manager { |
53 | 54 |
54 namespace { | 55 namespace { |
55 | 56 |
56 // unicodeToItem | 57 // unicodeToItem |
57 // | 58 // |
(...skipping 329 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
387 finish: | 388 finish: |
388 if (srv) | 389 if (srv) |
389 LOG(ERROR) << "PKCS#12 export failed with error " << PORT_GetError(); | 390 LOG(ERROR) << "PKCS#12 export failed with error " << PORT_GetError(); |
390 if (ecx) | 391 if (ecx) |
391 SEC_PKCS12DestroyExportContext(ecx); | 392 SEC_PKCS12DestroyExportContext(ecx); |
392 SECITEM_ZfreeItem(&unicodePw, PR_FALSE); | 393 SECITEM_ZfreeItem(&unicodePw, PR_FALSE); |
393 return return_count; | 394 return return_count; |
394 } | 395 } |
395 | 396 |
396 } // namespace mozilla_security_manager | 397 } // namespace mozilla_security_manager |
OLD | NEW |