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

Side by Side Diff: nss/lib/pk11wrap/pk11mech.c

Issue 1843333003: Update NSPR to 4.12 and NSS to 3.23 on iOS (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/nss.git@master
Patch Set: Created 4 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
OLDNEW
1 /* This Source Code Form is subject to the terms of the Mozilla Public 1 /* This Source Code Form is subject to the terms of the Mozilla Public
2 * License, v. 2.0. If a copy of the MPL was not distributed with this 2 * License, v. 2.0. If a copy of the MPL was not distributed with this
3 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ 3 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
4 /* 4 /*
5 * This file maps various PKCS #11 Mechanisms to related mechanisms, key 5 * This file maps various PKCS #11 Mechanisms to related mechanisms, key
6 * types, and ASN.1 encodings. 6 * types, and ASN.1 encodings.
7 */ 7 */
8 #include "seccomon.h" 8 #include "seccomon.h"
9 #include "secmod.h" 9 #include "secmod.h"
10 #include "secmodi.h" 10 #include "secmodi.h"
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 case CKM_SEED_KEY_GEN: 215 case CKM_SEED_KEY_GEN:
216 return CKK_SEED; 216 return CKK_SEED;
217 case CKM_CAMELLIA_ECB: 217 case CKM_CAMELLIA_ECB:
218 case CKM_CAMELLIA_CBC: 218 case CKM_CAMELLIA_CBC:
219 case CKM_CAMELLIA_MAC: 219 case CKM_CAMELLIA_MAC:
220 case CKM_CAMELLIA_MAC_GENERAL: 220 case CKM_CAMELLIA_MAC_GENERAL:
221 case CKM_CAMELLIA_CBC_PAD: 221 case CKM_CAMELLIA_CBC_PAD:
222 case CKM_CAMELLIA_KEY_GEN: 222 case CKM_CAMELLIA_KEY_GEN:
223 return CKK_CAMELLIA; 223 return CKK_CAMELLIA;
224 case CKM_NSS_CHACHA20_POLY1305: 224 case CKM_NSS_CHACHA20_POLY1305:
225 case CKM_NSS_CHACHA20_KEY_GEN:
225 return CKK_NSS_CHACHA20; 226 return CKK_NSS_CHACHA20;
226 case CKM_AES_ECB: 227 case CKM_AES_ECB:
227 case CKM_AES_CBC: 228 case CKM_AES_CBC:
228 case CKM_AES_CCM: 229 case CKM_AES_CCM:
229 case CKM_AES_CTR: 230 case CKM_AES_CTR:
230 case CKM_AES_CTS: 231 case CKM_AES_CTS:
231 case CKM_AES_GCM: 232 case CKM_AES_GCM:
232 case CKM_AES_MAC: 233 case CKM_AES_MAC:
233 case CKM_AES_MAC_GENERAL: 234 case CKM_AES_MAC_GENERAL:
234 case CKM_AES_CBC_PAD: 235 case CKM_AES_CBC_PAD:
(...skipping 1649 matching lines...) Expand 10 before | Expand all | Expand 10 after
1884 case SEC_OID_MISSI_DSS: 1885 case SEC_OID_MISSI_DSS:
1885 case SEC_OID_MISSI_DSS_OLD: 1886 case SEC_OID_MISSI_DSS_OLD:
1886 case SEC_OID_MISSI_KEA_DSS_OLD: 1887 case SEC_OID_MISSI_KEA_DSS_OLD:
1887 case SEC_OID_BOGUS_DSA_SIGNATURE_WITH_SHA1_DIGEST: 1888 case SEC_OID_BOGUS_DSA_SIGNATURE_WITH_SHA1_DIGEST:
1888 return SEC_OID_ANSIX9_DSA_SIGNATURE; 1889 return SEC_OID_ANSIX9_DSA_SIGNATURE;
1889 default: 1890 default:
1890 break; 1891 break;
1891 } 1892 }
1892 return algTag; 1893 return algTag;
1893 } 1894 }
OLDNEW
« no previous file with comments | « nss/lib/pk11wrap/pk11load.c ('k') | nss/lib/pk11wrap/pk11obj.c » ('j') | nss/lib/util/secoid.c » ('J')

Powered by Google App Engine
This is Rietveld 408576698