# HG changeset patch # User Andrew John Hughes # Date 1597960741 -3600 # Node ID cf679deb93d4377cb6789cbc467bf51bc51ddd42 # Parent 3c695acbaf51ec1451d8f8e46a5ebf31536bc16f PR3796: Allow the number of curves supported to be specified 2020-08-19 Andrew John Hughes PR3796: Allow the number of curves supported to be specified * INSTALL: Rename --enable-non-nss-curves to --with-curves and provide additional section documenting its use. Use "Mercurial" in the description of --with-hg-revision, rather than the command name, "hg". * acinclude.m4: (IT_WITH_CURVES): Renamed from IT_ENABLE_NON_NSS_CURVES. Allow the curve set to be chosen from 3/nist, 4/nist+ or all. * configure.ac: Invoke IT_WITH_CURVES instead of IT_ENABLE_NON_NSS_CURVES. * fsg.sh.in: Use CURVES instead of the obsolete ENABLE_NON_NSS_CURVES. Apply either the 3 curve or 4 curve patch, depending on the value of CURVES. * patches/pr3667.patch: Resurrect the 3 curve version of the patch from PR3756. diff -r 3c695acbaf51 -r cf679deb93d4 ChangeLog --- a/ChangeLog Mon Aug 17 15:51:41 2020 +0100 +++ b/ChangeLog Thu Aug 20 22:59:01 2020 +0100 @@ -1,3 +1,24 @@ +2020-08-19 Andrew John Hughes + + PR3796: Allow the number of curves supported to be specified + * INSTALL: + Rename --enable-non-nss-curves to --with-curves and + provide additional section documenting its use. + Use "Mercurial" in the description of --with-hg-revision, + rather than the command name, "hg". + * acinclude.m4: + (IT_WITH_CURVES): Renamed from IT_ENABLE_NON_NSS_CURVES. + Allow the curve set to be chosen from 3/nist, 4/nist+ or + all. + * configure.ac: Invoke IT_WITH_CURVES instead of + IT_ENABLE_NON_NSS_CURVES. + * fsg.sh.in: + Use CURVES instead of the obsolete ENABLE_NON_NSS_CURVES. + Apply either the 3 curve or 4 curve patch, depending on the + value of CURVES. + * patches/pr3667.patch: Resurrect the 3 curve version + of the patch from PR3756. + 2020-08-16 Andrew John Hughes Bump aarch32 to jdk8u262-b01-aarch32-20200429. diff -r 3c695acbaf51 -r cf679deb93d4 INSTALL --- a/INSTALL Mon Aug 17 15:51:41 2020 +0100 +++ b/INSTALL Thu Aug 20 22:59:01 2020 +0100 @@ -199,7 +199,7 @@ checksum, while --without-jamvm-checksum doesn't check the tarball specified by --with-jamvm-src-zip at all. This option allows a locally modified version of the source tarball to be used instead of the standard versions. -* --with-hg-revision: Specify a hg revision to use (as opposed to tip) with the --enable-hg option. +* --with-hg-revision: Specify a Mercurial revision to use (as opposed to tip) with the --enable-hg option. * --with-tzdata-dir: Specify the location of Java timezone data, defaulting to /usr/share/javazi. * --with-tapset-dir: Specify the location of system SystemTap tapsets, defaulting to ${datarootdir}/systemtap/tapset. * --with-llvm-config: Specify the location of the llvm-config binary. @@ -234,7 +234,7 @@ * --with-additional-vms=vm-list: Additional VMs to build using the system described below. * --with-hotspot-build: The HotSpot to use, as listed in hotspot.map.in. -* --enable-non-nss-curves: Define curves beyond the three specified by NSS (NIST P-{256,384,521}) +* --with-curves: Define the number of curves to support for elliptic curve cryptography * --enable-improved-font-rendering: Use fontconfig for better font rendering * --enable-headless: Build OpenJDK without graphical UI support * --disable-cache: Don't use ccache to speed up recompilations (default is to use if available) @@ -437,3 +437,38 @@ of the VM as would enabling it in the default full bootstrap mode, which compiles IcedTea and then recompiles it using the just-built image. + +Elliptic Curve Cryptography Support +=================================== + +As some distributors may not wish to include the full set of elliptic +curves supported by OpenJDK, we currently provide two reduced sets of +curves, available via the --with-curves option: + +1. NIST + +This includes the three NIST curves, NIST P-{256,384,521} +For this, specify --with-curves=nist or --with-curves=3. + +2. NIST+ + +This includes the three curves from option one, along with secp256k1. +For this, specify --with-curves=nist+ or --with-curves=4 + +3. All curves +Leave the OpenJDK sources as is and provide all curves. +For this, specify --with-curves=all or simply --with-curves. + +The current default is option 2 (NIST+), as used in the Fedora and Red +Hat Enterprise Linux OpenJDK packages. + +For compatibility with the old --enable-non-nss-curves option, +--with-curves or --with-curves=yes will be interpreted like +--enable-non-nss-curves as desiring all curves (option three). +Similarly, --without-curves will be interpreted as +--disable-non-nss-curves would, providing the default set. + +We currently don't support the more obvious interpretation of +--without-curves in supporting no elliptic curve cryptography, as this +would severely hampered real world usage of the resulting JDK. + diff -r 3c695acbaf51 -r cf679deb93d4 acinclude.m4 --- a/acinclude.m4 Mon Aug 17 15:51:41 2020 +0100 +++ b/acinclude.m4 Thu Aug 20 22:59:01 2020 +0100 @@ -2612,27 +2612,38 @@ AC_SUBST(ENABLE_SYSTEM_SCTP) ]) -AC_DEFUN_ONCE([IT_ENABLE_NON_NSS_CURVES], +AC_DEFUN_ONCE([IT_WITH_CURVES], [ - AC_MSG_CHECKING([whether to enable elliptic curves beyond those supported by NSS]) - AC_ARG_ENABLE([non-nss-curves], - [AS_HELP_STRING(--enable-non-nss-curves,register curves beyond the 3 NSS defines [[default=no]])], + CURVE_DEFAULT=nist+ + AC_MSG_CHECKING([which set of elliptic curves to enable]) + AC_ARG_WITH([curves], + [AS_HELP_STRING(--with-curves,register the specified number of ECC curves [[default=nist+]])], [ - case "${enableval}" in - no) - ENABLE_NON_NSS_CURVES=no - ;; - *) - ENABLE_NON_NSS_CURVES=yes - ;; - esac + if test "x${withval}" = x || test "x${withval}" = xyes; then + CURVE_SET=all; + elif test "x${withval}" = xno; then + CURVE_SET="${CURVE_DEFAULT}"; + else + CURVE_SET="${withval}"; + fi ], [ - ENABLE_NON_NSS_CURVES="no" + CURVE_SET="${CURVE_DEFAULT}"; ]) - AC_MSG_RESULT(${ENABLE_NON_NSS_CURVES}) - AM_CONDITIONAL(USE_NON_NSS_CURVES, test x"${ENABLE_NON_NSS_CURVES}" = "xyes") - AC_SUBST(ENABLE_NON_NSS_CURVES) + AC_MSG_RESULT(${CURVE_SET}) + if test "x${CURVE_SET}" = "xnist" || test "x${CURVE_SET}" = "x3"; then + CURVES=3; + elif test "x${CURVE_SET}" = "xnist+" || test "x${CURVE_SET}" = "x4"; then + CURVES=4; + elif test "x${CURVE_SET}" = "xall"; then + CURVES=all + else + AC_MSG_ERROR([Invalid value specified for curve set: "${CURVE_SET}"]) + fi + AM_CONDITIONAL(USE_NIST_CURVES, test x"${CURVES}" = "x3") + AM_CONDITIONAL(USE_NISTPLUS_CURVES, test x"${CURVES}" = "x4") + AM_CONDITIONAL(USE_ALL_CURVES, test x"${CURVES}" = "xall") + AC_SUBST(CURVES) ]) AC_DEFUN([IT_ENABLE_SPLIT_DEBUGINFO], diff -r 3c695acbaf51 -r cf679deb93d4 configure.ac --- a/configure.ac Mon Aug 17 15:51:41 2020 +0100 +++ b/configure.ac Thu Aug 20 22:59:01 2020 +0100 @@ -136,7 +136,7 @@ IT_CHECK_ADDITIONAL_VMS IT_WITH_TZDATA_DIR IT_WITH_TAPSET_DIR -IT_ENABLE_NON_NSS_CURVES +IT_WITH_CURVES IT_ENABLE_HEADLESS IT_ENABLE_CCACHE IT_ENABLE_SPLIT_DEBUGINFO diff -r 3c695acbaf51 -r cf679deb93d4 fsg.sh.in --- a/fsg.sh.in Mon Aug 17 15:51:41 2020 +0100 +++ b/fsg.sh.in Thu Aug 20 22:59:01 2020 +0100 @@ -10,7 +10,7 @@ rm -rvf openjdk/jdk/src/share/classes/com/sun/jmx/snmp rm -rvf openjdk/jdk/test/com/sun/jmx/snmp -if test "x@ENABLE_NON_NSS_CURVES@" = "xno"; then +if test "x@CURVES@" != "xall"; then echo "Removing non-NSS ECC curves" rm -vf openjdk/jdk/src/share/native/sun/security/ec/impl/ec2.h rm -vf openjdk/jdk/src/share/native/sun/security/ec/impl/ec2_163.c @@ -20,5 +20,11 @@ rm -vf openjdk/jdk/src/share/native/sun/security/ec/impl/ec2_mont.c rm -vf openjdk/jdk/src/share/native/sun/security/ec/impl/ecp_192.c rm -vf openjdk/jdk/src/share/native/sun/security/ec/impl/ecp_224.c - patch -Np0 < @abs_top_srcdir@/patches/pr3756.patch + if test "x@CURVES@" = "x3"; then + PATCH_FILE="@abs_top_srcdir@/patches/pr3667.patch" + else + PATCH_FILE="@abs_top_srcdir@/patches/pr3756.patch" + fi + echo "Applying ${PATCH_FILE}..." + patch -Np0 < ${PATCH_FILE} fi diff -r 3c695acbaf51 -r cf679deb93d4 patches/pr3667.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/pr3667.patch Thu Aug 20 22:59:01 2020 +0100 @@ -0,0 +1,1872 @@ +diff --git a/src/share/classes/sun/security/ec/CurveDB.java b/src/share/classes/sun/security/ec/CurveDB.java +--- openjdk/jdk/src/share/classes/sun/security/ec/CurveDB.java ++++ openjdk/jdk/src/share/classes/sun/security/ec/CurveDB.java +@@ -168,114 +168,6 @@ + Pattern nameSplitPattern = Pattern.compile(SPLIT_PATTERN); + + /* SEC2 prime curves */ +- add("secp112r1", "1.3.132.0.6", P, +- "DB7C2ABF62E35E668076BEAD208B", +- "DB7C2ABF62E35E668076BEAD2088", +- "659EF8BA043916EEDE8911702B22", +- "09487239995A5EE76B55F9C2F098", +- "A89CE5AF8724C0A23E0E0FF77500", +- "DB7C2ABF62E35E7628DFAC6561C5", +- 1, nameSplitPattern); +- +- add("secp112r2", "1.3.132.0.7", P, +- "DB7C2ABF62E35E668076BEAD208B", +- "6127C24C05F38A0AAAF65C0EF02C", +- "51DEF1815DB5ED74FCC34C85D709", +- "4BA30AB5E892B4E1649DD0928643", +- "adcd46f5882e3747def36e956e97", +- "36DF0AAFD8B8D7597CA10520D04B", +- 4, nameSplitPattern); +- +- add("secp128r1", "1.3.132.0.28", P, +- "FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFF", +- "FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFC", +- "E87579C11079F43DD824993C2CEE5ED3", +- "161FF7528B899B2D0C28607CA52C5B86", +- "CF5AC8395BAFEB13C02DA292DDED7A83", +- "FFFFFFFE0000000075A30D1B9038A115", +- 1, nameSplitPattern); +- +- add("secp128r2", "1.3.132.0.29", P, +- "FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFF", +- "D6031998D1B3BBFEBF59CC9BBFF9AEE1", +- "5EEEFCA380D02919DC2C6558BB6D8A5D", +- "7B6AA5D85E572983E6FB32A7CDEBC140", +- "27B6916A894D3AEE7106FE805FC34B44", +- "3FFFFFFF7FFFFFFFBE0024720613B5A3", +- 4, nameSplitPattern); +- +- add("secp160k1", "1.3.132.0.9", P, +- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC73", +- "0000000000000000000000000000000000000000", +- "0000000000000000000000000000000000000007", +- "3B4C382CE37AA192A4019E763036F4F5DD4D7EBB", +- "938CF935318FDCED6BC28286531733C3F03C4FEE", +- "0100000000000000000001B8FA16DFAB9ACA16B6B3", +- 1, nameSplitPattern); +- +- add("secp160r1", "1.3.132.0.8", P, +- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFF", +- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFC", +- "1C97BEFC54BD7A8B65ACF89F81D4D4ADC565FA45", +- "4A96B5688EF573284664698968C38BB913CBFC82", +- "23A628553168947D59DCC912042351377AC5FB32", +- "0100000000000000000001F4C8F927AED3CA752257", +- 1, nameSplitPattern); +- +- add("secp160r2", "1.3.132.0.30", P, +- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC73", +- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC70", +- "B4E134D3FB59EB8BAB57274904664D5AF50388BA", +- "52DCB034293A117E1F4FF11B30F7199D3144CE6D", +- "FEAFFEF2E331F296E071FA0DF9982CFEA7D43F2E", +- "0100000000000000000000351EE786A818F3A1A16B", +- 1, nameSplitPattern); +- +- add("secp192k1", "1.3.132.0.31", P, +- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFEE37", +- "000000000000000000000000000000000000000000000000", +- "000000000000000000000000000000000000000000000003", +- "DB4FF10EC057E9AE26B07D0280B7F4341DA5D1B1EAE06C7D", +- "9B2F2F6D9C5628A7844163D015BE86344082AA88D95E2F9D", +- "FFFFFFFFFFFFFFFFFFFFFFFE26F2FC170F69466A74DEFD8D", +- 1, nameSplitPattern); +- +- add("secp192r1 [NIST P-192, X9.62 prime192v1]", "1.2.840.10045.3.1.1", PD, +- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF", +- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC", +- "64210519E59C80E70FA7E9AB72243049FEB8DEECC146B9B1", +- "188DA80EB03090F67CBF20EB43A18800F4FF0AFD82FF1012", +- "07192B95FFC8DA78631011ED6B24CDD573F977A11E794811", +- "FFFFFFFFFFFFFFFFFFFFFFFF99DEF836146BC9B1B4D22831", +- 1, nameSplitPattern); +- +- add("secp224k1", "1.3.132.0.32", P, +- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFE56D", +- "00000000000000000000000000000000000000000000000000000000", +- "00000000000000000000000000000000000000000000000000000005", +- "A1455B334DF099DF30FC28A169A467E9E47075A90F7E650EB6B7A45C", +- "7E089FED7FBA344282CAFBD6F7E319F7C0B0BD59E2CA4BDB556D61A5", +- "010000000000000000000000000001DCE8D2EC6184CAF0A971769FB1F7", +- 1, nameSplitPattern); +- +- add("secp224r1 [NIST P-224]", "1.3.132.0.33", PD, +- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000001", +- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFFFFFFFFFE", +- "B4050A850C04B3ABF54132565044B0B7D7BFD8BA270B39432355FFB4", +- "B70E0CBD6BB4BF7F321390B94A03C1D356C21122343280D6115C1D21", +- "BD376388B5F723FB4C22DFE6CD4375A05A07476444D5819985007E34", +- "FFFFFFFFFFFFFFFFFFFFFFFFFFFF16A2E0B8F03E13DD29455C5C2A3D", +- 1, nameSplitPattern); +- +- add("secp256k1", "1.3.132.0.10", P, +- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC2F", +- "0000000000000000000000000000000000000000000000000000000000000000", +- "0000000000000000000000000000000000000000000000000000000000000007", +- "79BE667EF9DCBBAC55A06295CE870B07029BFCDB2DCE28D959F2815B16F81798", +- "483ADA7726A3C4655DA4FBFC0E1108A8FD17B448A68554199C47D08FFB10D4B8", +- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364141", +- 1, nameSplitPattern); +- + add("secp256r1 [NIST P-256, X9.62 prime256v1]", "1.2.840.10045.3.1.7", PD, + "FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFF", + "FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFC", +@@ -303,435 +195,6 @@ + "01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFA51868783BF2F966B7FCC0148F709A5D03BB5C9B8899C47AEBB6FB71E91386409", + 1, nameSplitPattern); + +- /* ANSI X9.62 prime curves */ +- add("X9.62 prime192v2", "1.2.840.10045.3.1.2", P, +- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF", +- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC", +- "CC22D6DFB95C6B25E49C0D6364A4E5980C393AA21668D953", +- "EEA2BAE7E1497842F2DE7769CFE9C989C072AD696F48034A", +- "6574D11D69B6EC7A672BB82A083DF2F2B0847DE970B2DE15", +- "FFFFFFFFFFFFFFFFFFFFFFFE5FB1A724DC80418648D8DD31", +- 1, nameSplitPattern); +- +- add("X9.62 prime192v3", "1.2.840.10045.3.1.3", P, +- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF", +- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC", +- "22123DC2395A05CAA7423DAECCC94760A7D462256BD56916", +- "7D29778100C65A1DA1783716588DCE2B8B4AEE8E228F1896", +- "38A90F22637337334B49DCB66A6DC8F9978ACA7648A943B0", +- "FFFFFFFFFFFFFFFFFFFFFFFF7A62D031C83F4294F640EC13", +- 1, nameSplitPattern); +- +- add("X9.62 prime239v1", "1.2.840.10045.3.1.4", P, +- "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFF", +- "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFC", +- "6B016C3BDCF18941D0D654921475CA71A9DB2FB27D1D37796185C2942C0A", +- "0FFA963CDCA8816CCC33B8642BEDF905C3D358573D3F27FBBD3B3CB9AAAF", +- "7DEBE8E4E90A5DAE6E4054CA530BA04654B36818CE226B39FCCB7B02F1AE", +- "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFF9E5E9A9F5D9071FBD1522688909D0B", +- 1, nameSplitPattern); +- +- add("X9.62 prime239v2", "1.2.840.10045.3.1.5", P, +- "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFF", +- "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFC", +- "617FAB6832576CBBFED50D99F0249C3FEE58B94BA0038C7AE84C8C832F2C", +- "38AF09D98727705120C921BB5E9E26296A3CDCF2F35757A0EAFD87B830E7", +- "5B0125E4DBEA0EC7206DA0FC01D9B081329FB555DE6EF460237DFF8BE4BA", +- "7FFFFFFFFFFFFFFFFFFFFFFF800000CFA7E8594377D414C03821BC582063", +- 1, nameSplitPattern); +- +- add("X9.62 prime239v3", "1.2.840.10045.3.1.6", P, +- "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFF", +- "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFC", +- "255705FA2A306654B1F4CB03D6A750A30C250102D4988717D9BA15AB6D3E", +- "6768AE8E18BB92CFCF005C949AA2C6D94853D0E660BBF854B1C9505FE95A", +- "1607E6898F390C06BC1D552BAD226F3B6FCFE48B6E818499AF18E3ED6CF3", +- "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFF975DEB41B3A6057C3C432146526551", +- 1, nameSplitPattern); +- +- /* SEC2 binary curves */ +- add("sect113r1", "1.3.132.0.4", B, +- "020000000000000000000000000201", +- "003088250CA6E7C7FE649CE85820F7", +- "00E8BEE4D3E2260744188BE0E9C723", +- "009D73616F35F4AB1407D73562C10F", +- "00A52830277958EE84D1315ED31886", +- "0100000000000000D9CCEC8A39E56F", +- 2, nameSplitPattern); +- +- add("sect113r2", "1.3.132.0.5", B, +- "020000000000000000000000000201", +- "00689918DBEC7E5A0DD6DFC0AA55C7", +- "0095E9A9EC9B297BD4BF36E059184F", +- "01A57A6A7B26CA5EF52FCDB8164797", +- "00B3ADC94ED1FE674C06E695BABA1D", +- "010000000000000108789B2496AF93", +- 2, nameSplitPattern); +- +- add("sect131r1", "1.3.132.0.22", B, +- "080000000000000000000000000000010D", +- "07A11B09A76B562144418FF3FF8C2570B8", +- "0217C05610884B63B9C6C7291678F9D341", +- "0081BAF91FDF9833C40F9C181343638399", +- "078C6E7EA38C001F73C8134B1B4EF9E150", +- "0400000000000000023123953A9464B54D", +- 2, nameSplitPattern); +- +- add("sect131r2", "1.3.132.0.23", B, +- "080000000000000000000000000000010D", +- "03E5A88919D7CAFCBF415F07C2176573B2", +- "04B8266A46C55657AC734CE38F018F2192", +- "0356DCD8F2F95031AD652D23951BB366A8", +- "0648F06D867940A5366D9E265DE9EB240F", +- "0400000000000000016954A233049BA98F", +- 2, nameSplitPattern); +- +- add("sect163k1 [NIST K-163]", "1.3.132.0.1", BD, +- "0800000000000000000000000000000000000000C9", +- "000000000000000000000000000000000000000001", +- "000000000000000000000000000000000000000001", +- "02FE13C0537BBC11ACAA07D793DE4E6D5E5C94EEE8", +- "0289070FB05D38FF58321F2E800536D538CCDAA3D9", +- "04000000000000000000020108A2E0CC0D99F8A5EF", +- 2, nameSplitPattern); +- +- add("sect163r1", "1.3.132.0.2", B, +- "0800000000000000000000000000000000000000C9", +- "07B6882CAAEFA84F9554FF8428BD88E246D2782AE2", +- "0713612DCDDCB40AAB946BDA29CA91F73AF958AFD9", +- "0369979697AB43897789566789567F787A7876A654", +- "00435EDB42EFAFB2989D51FEFCE3C80988F41FF883", +- "03FFFFFFFFFFFFFFFFFFFF48AAB689C29CA710279B", +- 2, nameSplitPattern); +- +- add("sect163r2 [NIST B-163]", "1.3.132.0.15", BD, +- "0800000000000000000000000000000000000000C9", +- "000000000000000000000000000000000000000001", +- "020A601907B8C953CA1481EB10512F78744A3205FD", +- "03F0EBA16286A2D57EA0991168D4994637E8343E36", +- "00D51FBC6C71A0094FA2CDD545B11C5C0C797324F1", +- "040000000000000000000292FE77E70C12A4234C33", +- 2, nameSplitPattern); +- +- add("sect193r1", "1.3.132.0.24", B, +- "02000000000000000000000000000000000000000000008001", +- "0017858FEB7A98975169E171F77B4087DE098AC8A911DF7B01", +- "00FDFB49BFE6C3A89FACADAA7A1E5BBC7CC1C2E5D831478814", +- "01F481BC5F0FF84A74AD6CDF6FDEF4BF6179625372D8C0C5E1", +- "0025E399F2903712CCF3EA9E3A1AD17FB0B3201B6AF7CE1B05", +- "01000000000000000000000000C7F34A778F443ACC920EBA49", +- 2, nameSplitPattern); +- +- add("sect193r2", "1.3.132.0.25", B, +- "02000000000000000000000000000000000000000000008001", +- "0163F35A5137C2CE3EA6ED8667190B0BC43ECD69977702709B", +- "00C9BB9E8927D4D64C377E2AB2856A5B16E3EFB7F61D4316AE", +- "00D9B67D192E0367C803F39E1A7E82CA14A651350AAE617E8F", +- "01CE94335607C304AC29E7DEFBD9CA01F596F927224CDECF6C", +- "010000000000000000000000015AAB561B005413CCD4EE99D5", +- 2, nameSplitPattern); +- +- add("sect233k1 [NIST K-233]", "1.3.132.0.26", BD, +- "020000000000000000000000000000000000000004000000000000000001", +- "000000000000000000000000000000000000000000000000000000000000", +- "000000000000000000000000000000000000000000000000000000000001", +- "017232BA853A7E731AF129F22FF4149563A419C26BF50A4C9D6EEFAD6126", +- "01DB537DECE819B7F70F555A67C427A8CD9BF18AEB9B56E0C11056FAE6A3", +- "008000000000000000000000000000069D5BB915BCD46EFB1AD5F173ABDF", +- 4, nameSplitPattern); +- +- add("sect233r1 [NIST B-233]", "1.3.132.0.27", B, +- "020000000000000000000000000000000000000004000000000000000001", +- "000000000000000000000000000000000000000000000000000000000001", +- "0066647EDE6C332C7F8C0923BB58213B333B20E9CE4281FE115F7D8F90AD", +- "00FAC9DFCBAC8313BB2139F1BB755FEF65BC391F8B36F8F8EB7371FD558B", +- "01006A08A41903350678E58528BEBF8A0BEFF867A7CA36716F7E01F81052", +- "01000000000000000000000000000013E974E72F8A6922031D2603CFE0D7", +- 2, nameSplitPattern); +- +- add("sect239k1", "1.3.132.0.3", B, +- "800000000000000000004000000000000000000000000000000000000001", +- "000000000000000000000000000000000000000000000000000000000000", +- "000000000000000000000000000000000000000000000000000000000001", +- "29A0B6A887A983E9730988A68727A8B2D126C44CC2CC7B2A6555193035DC", +- "76310804F12E549BDB011C103089E73510ACB275FC312A5DC6B76553F0CA", +- "2000000000000000000000000000005A79FEC67CB6E91F1C1DA800E478A5", +- 4, nameSplitPattern); +- +- add("sect283k1 [NIST K-283]", "1.3.132.0.16", BD, +- "0800000000000000000000000000000000000000000000000000000000000000000010A1", +- "000000000000000000000000000000000000000000000000000000000000000000000000", +- "000000000000000000000000000000000000000000000000000000000000000000000001", +- "0503213F78CA44883F1A3B8162F188E553CD265F23C1567A16876913B0C2AC2458492836", +- "01CCDA380F1C9E318D90F95D07E5426FE87E45C0E8184698E45962364E34116177DD2259", +- "01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE9AE2ED07577265DFF7F94451E061E163C61", +- 4, nameSplitPattern); +- +- add("sect283r1 [NIST B-283]", "1.3.132.0.17", B, +- "0800000000000000000000000000000000000000000000000000000000000000000010A1", +- "000000000000000000000000000000000000000000000000000000000000000000000001", +- "027B680AC8B8596DA5A4AF8A19A0303FCA97FD7645309FA2A581485AF6263E313B79A2F5", +- "05F939258DB7DD90E1934F8C70B0DFEC2EED25B8557EAC9C80E2E198F8CDBECD86B12053", +- "03676854FE24141CB98FE6D4B20D02B4516FF702350EDDB0826779C813F0DF45BE8112F4", +- "03FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEF90399660FC938A90165B042A7CEFADB307", +- 2, nameSplitPattern); +- +- add("sect409k1 [NIST K-409]", "1.3.132.0.36", BD, +- "02000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000001", +- "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", +- "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001", +- "0060F05F658F49C1AD3AB1890F7184210EFD0987E307C84C27ACCFB8F9F67CC2C460189EB5AAAA62EE222EB1B35540CFE9023746", +- "01E369050B7C4E42ACBA1DACBF04299C3460782F918EA427E6325165E9EA10E3DA5F6C42E9C55215AA9CA27A5863EC48D8E0286B", +- "007FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE5F83B2D4EA20400EC4557D5ED3E3E7CA5B4B5C83B8E01E5FCF", +- 4, nameSplitPattern); +- +- add("sect409r1 [NIST B-409]", "1.3.132.0.37", B, +- "02000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000001", +- "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001", +- "0021A5C2C8EE9FEB5C4B9A753B7B476B7FD6422EF1F3DD674761FA99D6AC27C8A9A197B272822F6CD57A55AA4F50AE317B13545F", +- "015D4860D088DDB3496B0C6064756260441CDE4AF1771D4DB01FFE5B34E59703DC255A868A1180515603AEAB60794E54BB7996A7", +- "0061B1CFAB6BE5F32BBFA78324ED106A7636B9C5A7BD198D0158AA4F5488D08F38514F1FDF4B4F40D2181B3681C364BA0273C706", +- "010000000000000000000000000000000000000000000000000001E2AAD6A612F33307BE5FA47C3C9E052F838164CD37D9A21173", +- 2, nameSplitPattern); +- +- add("sect571k1 [NIST K-571]", "1.3.132.0.38", BD, +- "080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000425", +- "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", +- "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001", +- "026EB7A859923FBC82189631F8103FE4AC9CA2970012D5D46024804801841CA44370958493B205E647DA304DB4CEB08CBBD1BA39494776FB988B47174DCA88C7E2945283A01C8972", +- "0349DC807F4FBF374F4AEADE3BCA95314DD58CEC9F307A54FFC61EFC006D8A2C9D4979C0AC44AEA74FBEBBB9F772AEDCB620B01A7BA7AF1B320430C8591984F601CD4C143EF1C7A3", +- "020000000000000000000000000000000000000000000000000000000000000000000000131850E1F19A63E4B391A8DB917F4138B630D84BE5D639381E91DEB45CFE778F637C1001", +- 4, nameSplitPattern); +- +- add("sect571r1 [NIST B-571]", "1.3.132.0.39", B, +- "080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000425", +- "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001", +- "02F40E7E2221F295DE297117B7F3D62F5C6A97FFCB8CEFF1CD6BA8CE4A9A18AD84FFABBD8EFA59332BE7AD6756A66E294AFD185A78FF12AA520E4DE739BACA0C7FFEFF7F2955727A", +- "0303001D34B856296C16C0D40D3CD7750A93D1D2955FA80AA5F40FC8DB7B2ABDBDE53950F4C0D293CDD711A35B67FB1499AE60038614F1394ABFA3B4C850D927E1E7769C8EEC2D19", +- "037BF27342DA639B6DCCFFFEB73D69D78C6C27A6009CBBCA1980F8533921E8A684423E43BAB08A576291AF8F461BB2A8B3531D2F0485C19B16E2F1516E23DD3C1A4827AF1B8AC15B", +- "03FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE661CE18FF55987308059B186823851EC7DD9CA1161DE93D5174D66E8382E9BB2FE84E47", +- 2, nameSplitPattern); +- +- /* ANSI X9.62 binary curves */ +- add("X9.62 c2tnb191v1", "1.2.840.10045.3.0.5", B, +- "800000000000000000000000000000000000000000000201", +- "2866537B676752636A68F56554E12640276B649EF7526267", +- "2E45EF571F00786F67B0081B9495A3D95462F5DE0AA185EC", +- "36B3DAF8A23206F9C4F299D7B21A9C369137F2C84AE1AA0D", +- "765BE73433B3F95E332932E70EA245CA2418EA0EF98018FB", +- "40000000000000000000000004A20E90C39067C893BBB9A5", +- 2, nameSplitPattern); +- +- add("X9.62 c2tnb191v2", "1.2.840.10045.3.0.6", B, +- "800000000000000000000000000000000000000000000201", +- "401028774D7777C7B7666D1366EA432071274F89FF01E718", +- "0620048D28BCBD03B6249C99182B7C8CD19700C362C46A01", +- "3809B2B7CC1B28CC5A87926AAD83FD28789E81E2C9E3BF10", +- "17434386626D14F3DBF01760D9213A3E1CF37AEC437D668A", +- "20000000000000000000000050508CB89F652824E06B8173", +- 4, nameSplitPattern); +- +- add("X9.62 c2tnb191v3", "1.2.840.10045.3.0.7", B, +- "800000000000000000000000000000000000000000000201", +- "6C01074756099122221056911C77D77E77A777E7E7E77FCB", +- "71FE1AF926CF847989EFEF8DB459F66394D90F32AD3F15E8", +- "375D4CE24FDE434489DE8746E71786015009E66E38A926DD", +- "545A39176196575D985999366E6AD34CE0A77CD7127B06BE", +- "155555555555555555555555610C0B196812BFB6288A3EA3", +- 6, nameSplitPattern); +- +- add("X9.62 c2tnb239v1", "1.2.840.10045.3.0.11", B, +- "800000000000000000000000000000000000000000000000001000000001", +- "32010857077C5431123A46B808906756F543423E8D27877578125778AC76", +- "790408F2EEDAF392B012EDEFB3392F30F4327C0CA3F31FC383C422AA8C16", +- "57927098FA932E7C0A96D3FD5B706EF7E5F5C156E16B7E7C86038552E91D", +- "61D8EE5077C33FECF6F1A16B268DE469C3C7744EA9A971649FC7A9616305", +- "2000000000000000000000000000000F4D42FFE1492A4993F1CAD666E447", +- 4, nameSplitPattern); +- +- add("X9.62 c2tnb239v2", "1.2.840.10045.3.0.12", B, +- "800000000000000000000000000000000000000000000000001000000001", +- "4230017757A767FAE42398569B746325D45313AF0766266479B75654E65F", +- "5037EA654196CFF0CD82B2C14A2FCF2E3FF8775285B545722F03EACDB74B", +- "28F9D04E900069C8DC47A08534FE76D2B900B7D7EF31F5709F200C4CA205", +- "5667334C45AFF3B5A03BAD9DD75E2C71A99362567D5453F7FA6E227EC833", +- "1555555555555555555555555555553C6F2885259C31E3FCDF154624522D", +- 6, nameSplitPattern); +- +- add("X9.62 c2tnb239v3", "1.2.840.10045.3.0.13", B, +- "800000000000000000000000000000000000000000000000001000000001", +- "01238774666A67766D6676F778E676B66999176666E687666D8766C66A9F", +- "6A941977BA9F6A435199ACFC51067ED587F519C5ECB541B8E44111DE1D40", +- "70F6E9D04D289C4E89913CE3530BFDE903977D42B146D539BF1BDE4E9C92", +- "2E5A0EAF6E5E1305B9004DCE5C0ED7FE59A35608F33837C816D80B79F461", +- "0CCCCCCCCCCCCCCCCCCCCCCCCCCCCCAC4912D2D9DF903EF9888B8A0E4CFF", +- 0xA, nameSplitPattern); +- +- add("X9.62 c2tnb359v1", "1.2.840.10045.3.0.18", B, +- "800000000000000000000000000000000000000000000000000000000000000000000000100000000000000001", +- "5667676A654B20754F356EA92017D946567C46675556F19556A04616B567D223A5E05656FB549016A96656A557", +- "2472E2D0197C49363F1FE7F5B6DB075D52B6947D135D8CA445805D39BC345626089687742B6329E70680231988", +- "3C258EF3047767E7EDE0F1FDAA79DAEE3841366A132E163ACED4ED2401DF9C6BDCDE98E8E707C07A2239B1B097", +- "53D7E08529547048121E9C95F3791DD804963948F34FAE7BF44EA82365DC7868FE57E4AE2DE211305A407104BD", +- "01AF286BCA1AF286BCA1AF286BCA1AF286BCA1AF286BC9FB8F6B85C556892C20A7EB964FE7719E74F490758D3B", +- 0x4C, nameSplitPattern); +- +- add("X9.62 c2tnb431r1", "1.2.840.10045.3.0.20", B, +- "800000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000001", +- "1A827EF00DD6FC0E234CAF046C6A5D8A85395B236CC4AD2CF32A0CADBDC9DDF620B0EB9906D0957F6C6FEACD615468DF104DE296CD8F", +- "10D9B4A3D9047D8B154359ABFB1B7F5485B04CEB868237DDC9DEDA982A679A5A919B626D4E50A8DD731B107A9962381FB5D807BF2618", +- "120FC05D3C67A99DE161D2F4092622FECA701BE4F50F4758714E8A87BBF2A658EF8C21E7C5EFE965361F6C2999C0C247B0DBD70CE6B7", +- "20D0AF8903A96F8D5FA2C255745D3C451B302C9346D9B7E485E7BCE41F6B591F3E8F6ADDCBB0BC4C2F947A7DE1A89B625D6A598B3760", +- "0340340340340340340340340340340340340340340340340340340323C313FAB50589703B5EC68D3587FEC60D161CC149C1AD4A91", +- 0x2760, nameSplitPattern); +- +- /* ANSI X9.62 binary curves from the 1998 standard but forbidden +- * in the 2005 version of the standard. +- * We don't register them but leave them here for the time being in +- * case we need to support them after all. +- */ +-/* +- add("X9.62 c2pnb163v1", "1.2.840.10045.3.0.1", B, +- "080000000000000000000000000000000000000107", +- "072546B5435234A422E0789675F432C89435DE5242", +- "00C9517D06D5240D3CFF38C74B20B6CD4D6F9DD4D9", +- "07AF69989546103D79329FCC3D74880F33BBE803CB", +- "01EC23211B5966ADEA1D3F87F7EA5848AEF0B7CA9F", +- "0400000000000000000001E60FC8821CC74DAEAFC1", +- 2, nameSplitPattern); +- +- add("X9.62 c2pnb163v2", "1.2.840.10045.3.0.2", B, +- "080000000000000000000000000000000000000107", +- "0108B39E77C4B108BED981ED0E890E117C511CF072", +- "0667ACEB38AF4E488C407433FFAE4F1C811638DF20", +- "0024266E4EB5106D0A964D92C4860E2671DB9B6CC5", +- "079F684DDF6684C5CD258B3890021B2386DFD19FC5", +- "03FFFFFFFFFFFFFFFFFFFDF64DE1151ADBB78F10A7", +- 2, nameSplitPattern); +- +- add("X9.62 c2pnb163v3", "1.2.840.10045.3.0.3", B, +- "080000000000000000000000000000000000000107", +- "07A526C63D3E25A256A007699F5447E32AE456B50E", +- "03F7061798EB99E238FD6F1BF95B48FEEB4854252B", +- "02F9F87B7C574D0BDECF8A22E6524775F98CDEBDCB", +- "05B935590C155E17EA48EB3FF3718B893DF59A05D0", +- "03FFFFFFFFFFFFFFFFFFFE1AEE140F110AFF961309", +- 2, nameSplitPattern); +- +- add("X9.62 c2pnb176w1", "1.2.840.10045.3.0.4", B, +- "0100000000000000000000000000000000080000000007", +- "E4E6DB2995065C407D9D39B8D0967B96704BA8E9C90B", +- "5DDA470ABE6414DE8EC133AE28E9BBD7FCEC0AE0FFF2", +- "8D16C2866798B600F9F08BB4A8E860F3298CE04A5798", +- "6FA4539C2DADDDD6BAB5167D61B436E1D92BB16A562C", +- "00010092537397ECA4F6145799D62B0A19CE06FE26AD", +- 0xFF6E, nameSplitPattern); +- +- add("X9.62 c2pnb208w1", "1.2.840.10045.3.0.10", B, +- "010000000000000000000000000000000800000000000000000007", +- "0000000000000000000000000000000000000000000000000000", +- "C8619ED45A62E6212E1160349E2BFA844439FAFC2A3FD1638F9E", +- "89FDFBE4ABE193DF9559ECF07AC0CE78554E2784EB8C1ED1A57A", +- "0F55B51A06E78E9AC38A035FF520D8B01781BEB1A6BB08617DE3", +- "000101BAF95C9723C57B6C21DA2EFF2D5ED588BDD5717E212F9D", +- 0xFE48, nameSplitPattern); +- +- add("X9.62 c2pnb272w1", "1.2.840.10045.3.0.16", B, +- "010000000000000000000000000000000000000000000000000000010000000000000B", +- "91A091F03B5FBA4AB2CCF49C4EDD220FB028712D42BE752B2C40094DBACDB586FB20", +- "7167EFC92BB2E3CE7C8AAAFF34E12A9C557003D7C73A6FAF003F99F6CC8482E540F7", +- "6108BABB2CEEBCF787058A056CBE0CFE622D7723A289E08A07AE13EF0D10D171DD8D", +- "10C7695716851EEF6BA7F6872E6142FBD241B830FF5EFCACECCAB05E02005DDE9D23", +- "000100FAF51354E0E39E4892DF6E319C72C8161603FA45AA7B998A167B8F1E629521", +- 0xFF06, nameSplitPattern); +- +- add("X9.62 c2pnb304w1", "1.2.840.10045.3.0.17", B, +- "010000000000000000000000000000000000000000000000000000000000000000000000000807", +- "FD0D693149A118F651E6DCE6802085377E5F882D1B510B44160074C1288078365A0396C8E681", +- "BDDB97E555A50A908E43B01C798EA5DAA6788F1EA2794EFCF57166B8C14039601E55827340BE", +- "197B07845E9BE2D96ADB0F5F3C7F2CFFBD7A3EB8B6FEC35C7FD67F26DDF6285A644F740A2614", +- "E19FBEB76E0DA171517ECF401B50289BF014103288527A9B416A105E80260B549FDC1B92C03B", +- "000101D556572AABAC800101D556572AABAC8001022D5C91DD173F8FB561DA6899164443051D", +- 0xFE2E, nameSplitPattern); +- +- add("X9.62 c2pnb368w1", "1.2.840.10045.3.0.19", B, +- "0100000000000000000000000000000000000000000000000000000000000000000000002000000000000000000007", +- "E0D2EE25095206F5E2A4F9ED229F1F256E79A0E2B455970D8D0D865BD94778C576D62F0AB7519CCD2A1A906AE30D", +- "FC1217D4320A90452C760A58EDCD30C8DD069B3C34453837A34ED50CB54917E1C2112D84D164F444F8F74786046A", +- "1085E2755381DCCCE3C1557AFA10C2F0C0C2825646C5B34A394CBCFA8BC16B22E7E789E927BE216F02E1FB136A5F", +- "7B3EB1BDDCBA62D5D8B2059B525797FC73822C59059C623A45FF3843CEE8F87CD1855ADAA81E2A0750B80FDA2310", +- "00010090512DA9AF72B08349D98A5DD4C7B0532ECA51CE03E2D10F3B7AC579BD87E909AE40A6F131E9CFCE5BD967", +- 0xFF70, nameSplitPattern); +-*/ +- +- /* +- * Brainpool curves (RFC 5639) +- * (Twisted curves are not included) +- */ +- +- add("brainpoolP160r1", "1.3.36.3.3.2.8.1.1.1", P, +- "E95E4A5F737059DC60DFC7AD95B3D8139515620F", +- "340E7BE2A280EB74E2BE61BADA745D97E8F7C300", +- "1E589A8595423412134FAA2DBDEC95C8D8675E58", +- "BED5AF16EA3F6A4F62938C4631EB5AF7BDBCDBC3", +- "1667CB477A1A8EC338F94741669C976316DA6321", +- "E95E4A5F737059DC60DF5991D45029409E60FC09", +- 1, nameSplitPattern); +- +- add("brainpoolP192r1", "1.3.36.3.3.2.8.1.1.3", P, +- "C302F41D932A36CDA7A3463093D18DB78FCE476DE1A86297", +- "6A91174076B1E0E19C39C031FE8685C1CAE040E5C69A28EF", +- "469A28EF7C28CCA3DC721D044F4496BCCA7EF4146FBF25C9", +- "C0A0647EAAB6A48753B033C56CB0F0900A2F5C4853375FD6", +- "14B690866ABD5BB88B5F4828C1490002E6773FA2FA299B8F", +- "C302F41D932A36CDA7A3462F9E9E916B5BE8F1029AC4ACC1", +- 1, nameSplitPattern); +- +- add("brainpoolP224r1", "1.3.36.3.3.2.8.1.1.5", P, +- "D7C134AA264366862A18302575D1D787B09F075797DA89F57EC8C0FF", +- "68A5E62CA9CE6C1C299803A6C1530B514E182AD8B0042A59CAD29F43", +- "2580F63CCFE44138870713B1A92369E33E2135D266DBB372386C400B", +- "0D9029AD2C7E5CF4340823B2A87DC68C9E4CE3174C1E6EFDEE12C07D", +- "58AA56F772C0726F24C6B89E4ECDAC24354B9E99CAA3F6D3761402CD", +- "D7C134AA264366862A18302575D0FB98D116BC4B6DDEBCA3A5A7939F", +- 1, nameSplitPattern); +- +- add("brainpoolP256r1", "1.3.36.3.3.2.8.1.1.7", P, +- "A9FB57DBA1EEA9BC3E660A909D838D726E3BF623D52620282013481D1F6E5377", +- "7D5A0975FC2C3057EEF67530417AFFE7FB8055C126DC5C6CE94A4B44F330B5D9", +- "26DC5C6CE94A4B44F330B5D9BBD77CBF958416295CF7E1CE6BCCDC18FF8C07B6", +- "8BD2AEB9CB7E57CB2C4B482FFC81B7AFB9DE27E1E3BD23C23A4453BD9ACE3262", +- "547EF835C3DAC4FD97F8461A14611DC9C27745132DED8E545C1D54C72F046997", +- "A9FB57DBA1EEA9BC3E660A909D838D718C397AA3B561A6F7901E0E82974856A7", +- 1, nameSplitPattern); +- +- add("brainpoolP320r1", "1.3.36.3.3.2.8.1.1.9", P, +- "D35E472036BC4FB7E13C785ED201E065F98FCFA6F6F40DEF4F92B9EC7893EC28FCD412B1F1B32E27", +- "3EE30B568FBAB0F883CCEBD46D3F3BB8A2A73513F5EB79DA66190EB085FFA9F492F375A97D860EB4", +- "520883949DFDBC42D3AD198640688A6FE13F41349554B49ACC31DCCD884539816F5EB4AC8FB1F1A6", +- "43BD7E9AFB53D8B85289BCC48EE5BFE6F20137D10A087EB6E7871E2A10A599C710AF8D0D39E20611", +- "14FDD05545EC1CC8AB4093247F77275E0743FFED117182EAA9C77877AAAC6AC7D35245D1692E8EE1", +- "D35E472036BC4FB7E13C785ED201E065F98FCFA5B68F12A32D482EC7EE8658E98691555B44C59311", +- 1, nameSplitPattern); +- +- add("brainpoolP384r1", "1.3.36.3.3.2.8.1.1.11", P, +- "8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B412B1DA197FB71123ACD3A729901D1A71874700133107EC53", +- "7BC382C63D8C150C3C72080ACE05AFA0C2BEA28E4FB22787139165EFBA91F90F8AA5814A503AD4EB04A8C7DD22CE2826", +- "04A8C7DD22CE28268B39B55416F0447C2FB77DE107DCD2A62E880EA53EEB62D57CB4390295DBC9943AB78696FA504C11", +- "1D1C64F068CF45FFA2A63A81B7C13F6B8847A3E77EF14FE3DB7FCAFE0CBD10E8E826E03436D646AAEF87B2E247D4AF1E", +- "8ABE1D7520F9C2A45CB1EB8E95CFD55262B70B29FEEC5864E19C054FF99129280E4646217791811142820341263C5315", +- "8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B31F166E6CAC0425A7CF3AB6AF6B7FC3103B883202E9046565", +- 1, nameSplitPattern); +- +- add("brainpoolP512r1", "1.3.36.3.3.2.8.1.1.13", P, +- "AADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA703308717D4D9B009BC66842AECDA12AE6A380E62881FF2F2D82C68528AA6056583A48F3", +- "7830A3318B603B89E2327145AC234CC594CBDD8D3DF91610A83441CAEA9863BC2DED5D5AA8253AA10A2EF1C98B9AC8B57F1117A72BF2C7B9E7C1AC4D77FC94CA", +- "3DF91610A83441CAEA9863BC2DED5D5AA8253AA10A2EF1C98B9AC8B57F1117A72BF2C7B9E7C1AC4D77FC94CADC083E67984050B75EBAE5DD2809BD638016F723", +- "81AEE4BDD82ED9645A21322E9C4C6A9385ED9F70B5D916C1B43B62EEF4D0098EFF3B1F78E2D0D48D50D1687B93B97D5F7C6D5047406A5E688B352209BCB9F822", +- "7DDE385D566332ECC0EABFA9CF7822FDF209F70024A57B1AA000C55B881F8111B2DCDE494A5F485E5BCA4BD88A2763AED1CA2B2FA8F0540678CD1E0F3AD80892", +- "AADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA70330870553E5C414CA92619418661197FAC10471DB1D381085DDADDB58796829CA90069", +- 1, nameSplitPattern); +- + specCollection = Collections.unmodifiableCollection(oidMap.values()); + } + } +diff --git a/src/share/classes/sun/security/ssl/EllipticCurvesExtension.java b/src/share/classes/sun/security/ssl/EllipticCurvesExtension.java +--- openjdk/jdk/src/share/classes/sun/security/ssl/EllipticCurvesExtension.java ++++ openjdk/jdk/src/share/classes/sun/security/ssl/EllipticCurvesExtension.java +@@ -65,29 +65,6 @@ + + // See sun.security.util.CurveDB for the OIDs + private static enum NamedEllipticCurve { +- T163_K1(1, "sect163k1", "1.3.132.0.1", true), // NIST K-163 +- T163_R1(2, "sect163r1", "1.3.132.0.2", false), +- T163_R2(3, "sect163r2", "1.3.132.0.15", true), // NIST B-163 +- T193_R1(4, "sect193r1", "1.3.132.0.24", false), +- T193_R2(5, "sect193r2", "1.3.132.0.25", false), +- T233_K1(6, "sect233k1", "1.3.132.0.26", true), // NIST K-233 +- T233_R1(7, "sect233r1", "1.3.132.0.27", true), // NIST B-233 +- T239_K1(8, "sect239k1", "1.3.132.0.3", false), +- T283_K1(9, "sect283k1", "1.3.132.0.16", true), // NIST K-283 +- T283_R1(10, "sect283r1", "1.3.132.0.17", true), // NIST B-283 +- T409_K1(11, "sect409k1", "1.3.132.0.36", true), // NIST K-409 +- T409_R1(12, "sect409r1", "1.3.132.0.37", true), // NIST B-409 +- T571_K1(13, "sect571k1", "1.3.132.0.38", true), // NIST K-571 +- T571_R1(14, "sect571r1", "1.3.132.0.39", true), // NIST B-571 +- +- P160_K1(15, "secp160k1", "1.3.132.0.9", false), +- P160_R1(16, "secp160r1", "1.3.132.0.8", false), +- P160_R2(17, "secp160r2", "1.3.132.0.30", false), +- P192_K1(18, "secp192k1", "1.3.132.0.31", false), +- P192_R1(19, "secp192r1", "1.2.840.10045.3.1.1", true), // NIST P-192 +- P224_K1(20, "secp224k1", "1.3.132.0.32", false), +- P224_R1(21, "secp224r1", "1.3.132.0.33", true), // NIST P-224 +- P256_K1(22, "secp256k1", "1.3.132.0.10", false), + P256_R1(23, "secp256r1", "1.2.840.10045.3.1.7", true), // NIST P-256 + P384_R1(24, "secp384r1", "1.3.132.0.34", true), // NIST P-384 + P521_R1(25, "secp521r1", "1.3.132.0.35", true); // NIST P-521 +diff --git a/test/sun/security/ec/TestEC.java b/test/sun/security/ec/TestEC.java +--- openjdk/jdk/test/sun/security/ec/TestEC.java ++++ openjdk/jdk/test/sun/security/ec/TestEC.java +@@ -35,7 +35,7 @@ + * @library ../pkcs11/sslecc + * @library ../../../java/security/testlibrary + * @compile -XDignore.symbol.file TestEC.java +- * @run main/othervm -Djdk.tls.namedGroups="secp256r1,sect193r1" TestEC ++ * @run main/othervm -Djdk.tls.namedGroups="secp256r1" TestEC + */ + + import java.security.NoSuchProviderException; +diff --git openjdk.orig/jdk/make/lib/SecurityLibraries.gmk openjdk/jdk/make/lib/SecurityLibraries.gmk +--- openjdk.orig/jdk/make/lib/SecurityLibraries.gmk ++++ openjdk/jdk/make/lib/SecurityLibraries.gmk +@@ -241,7 +241,7 @@ + OPTIMIZATION := LOW, \ + CFLAGS := $(filter-out $(ECC_JNI_SOLSPARC_FILTER), $(CFLAGS_JDKLIB)) \ + $(BUILD_LIBSUNEC_FLAGS) \ +- -DMP_API_COMPATIBLE -DNSS_ECC_MORE_THAN_SUITE_B, \ ++ -DMP_API_COMPATIBLE, \ + CXXFLAGS := $(filter-out $(ECC_JNI_SOLSPARC_FILTER), $(CXXFLAGS_JDKLIB)) \ + $(BUILD_LIBSUNEC_FLAGS), \ + MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libsunec/mapfile-vers, \ +diff --git openjdk.orig/jdk/src/share/native/sun/security/ec/impl/ecl-curve.h openjdk/jdk/src/share/native/sun/security/ec/impl/ecl-curve.h +--- openjdk.orig/jdk/src/share/native/sun/security/ec/impl/ecl-curve.h ++++ openjdk/jdk/src/share/native/sun/security/ec/impl/ecl-curve.h +@@ -44,25 +44,6 @@ + #endif + + /* NIST prime curves */ +-static const ECCurveParams ecCurve_NIST_P192 = { +- "NIST-P192", ECField_GFp, 192, +- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF", +- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC", +- "64210519E59C80E70FA7E9AB72243049FEB8DEECC146B9B1", +- "188DA80EB03090F67CBF20EB43A18800F4FF0AFD82FF1012", +- "07192B95FFC8DA78631011ED6B24CDD573F977A11E794811", +- "FFFFFFFFFFFFFFFFFFFFFFFF99DEF836146BC9B1B4D22831", 1 +-}; +- +-static const ECCurveParams ecCurve_NIST_P224 = { +- "NIST-P224", ECField_GFp, 224, +- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000001", +- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFFFFFFFFFE", +- "B4050A850C04B3ABF54132565044B0B7D7BFD8BA270B39432355FFB4", +- "B70E0CBD6BB4BF7F321390B94A03C1D356C21122343280D6115C1D21", +- "BD376388B5F723FB4C22DFE6CD4375A05A07476444D5819985007E34", +- "FFFFFFFFFFFFFFFFFFFFFFFFFFFF16A2E0B8F03E13DD29455C5C2A3D", 1 +-}; + + static const ECCurveParams ecCurve_NIST_P256 = { + "NIST-P256", ECField_GFp, 256, +@@ -96,593 +77,66 @@ + 1 + }; + +-/* NIST binary curves */ +-static const ECCurveParams ecCurve_NIST_K163 = { +- "NIST-K163", ECField_GF2m, 163, +- "0800000000000000000000000000000000000000C9", +- "000000000000000000000000000000000000000001", +- "000000000000000000000000000000000000000001", +- "02FE13C0537BBC11ACAA07D793DE4E6D5E5C94EEE8", +- "0289070FB05D38FF58321F2E800536D538CCDAA3D9", +- "04000000000000000000020108A2E0CC0D99F8A5EF", 2 +-}; +- +-static const ECCurveParams ecCurve_NIST_B163 = { +- "NIST-B163", ECField_GF2m, 163, +- "0800000000000000000000000000000000000000C9", +- "000000000000000000000000000000000000000001", +- "020A601907B8C953CA1481EB10512F78744A3205FD", +- "03F0EBA16286A2D57EA0991168D4994637E8343E36", +- "00D51FBC6C71A0094FA2CDD545B11C5C0C797324F1", +- "040000000000000000000292FE77E70C12A4234C33", 2 +-}; +- +-static const ECCurveParams ecCurve_NIST_K233 = { +- "NIST-K233", ECField_GF2m, 233, +- "020000000000000000000000000000000000000004000000000000000001", +- "000000000000000000000000000000000000000000000000000000000000", +- "000000000000000000000000000000000000000000000000000000000001", +- "017232BA853A7E731AF129F22FF4149563A419C26BF50A4C9D6EEFAD6126", +- "01DB537DECE819B7F70F555A67C427A8CD9BF18AEB9B56E0C11056FAE6A3", +- "008000000000000000000000000000069D5BB915BCD46EFB1AD5F173ABDF", 4 +-}; +- +-static const ECCurveParams ecCurve_NIST_B233 = { +- "NIST-B233", ECField_GF2m, 233, +- "020000000000000000000000000000000000000004000000000000000001", +- "000000000000000000000000000000000000000000000000000000000001", +- "0066647EDE6C332C7F8C0923BB58213B333B20E9CE4281FE115F7D8F90AD", +- "00FAC9DFCBAC8313BB2139F1BB755FEF65BC391F8B36F8F8EB7371FD558B", +- "01006A08A41903350678E58528BEBF8A0BEFF867A7CA36716F7E01F81052", +- "01000000000000000000000000000013E974E72F8A6922031D2603CFE0D7", 2 +-}; +- +-static const ECCurveParams ecCurve_NIST_K283 = { +- "NIST-K283", ECField_GF2m, 283, +- "0800000000000000000000000000000000000000000000000000000000000000000010A1", +- "000000000000000000000000000000000000000000000000000000000000000000000000", +- "000000000000000000000000000000000000000000000000000000000000000000000001", +- "0503213F78CA44883F1A3B8162F188E553CD265F23C1567A16876913B0C2AC2458492836", +- "01CCDA380F1C9E318D90F95D07E5426FE87E45C0E8184698E45962364E34116177DD2259", +- "01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE9AE2ED07577265DFF7F94451E061E163C61", 4 +-}; +- +-static const ECCurveParams ecCurve_NIST_B283 = { +- "NIST-B283", ECField_GF2m, 283, +- "0800000000000000000000000000000000000000000000000000000000000000000010A1", +- "000000000000000000000000000000000000000000000000000000000000000000000001", +- "027B680AC8B8596DA5A4AF8A19A0303FCA97FD7645309FA2A581485AF6263E313B79A2F5", +- "05F939258DB7DD90E1934F8C70B0DFEC2EED25B8557EAC9C80E2E198F8CDBECD86B12053", +- "03676854FE24141CB98FE6D4B20D02B4516FF702350EDDB0826779C813F0DF45BE8112F4", +- "03FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEF90399660FC938A90165B042A7CEFADB307", 2 +-}; +- +-static const ECCurveParams ecCurve_NIST_K409 = { +- "NIST-K409", ECField_GF2m, 409, +- "02000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000001", +- "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", +- "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001", +- "0060F05F658F49C1AD3AB1890F7184210EFD0987E307C84C27ACCFB8F9F67CC2C460189EB5AAAA62EE222EB1B35540CFE9023746", +- "01E369050B7C4E42ACBA1DACBF04299C3460782F918EA427E6325165E9EA10E3DA5F6C42E9C55215AA9CA27A5863EC48D8E0286B", +- "007FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE5F83B2D4EA20400EC4557D5ED3E3E7CA5B4B5C83B8E01E5FCF", 4 +-}; +- +-static const ECCurveParams ecCurve_NIST_B409 = { +- "NIST-B409", ECField_GF2m, 409, +- "02000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000001", +- "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001", +- "0021A5C2C8EE9FEB5C4B9A753B7B476B7FD6422EF1F3DD674761FA99D6AC27C8A9A197B272822F6CD57A55AA4F50AE317B13545F", +- "015D4860D088DDB3496B0C6064756260441CDE4AF1771D4DB01FFE5B34E59703DC255A868A1180515603AEAB60794E54BB7996A7", +- "0061B1CFAB6BE5F32BBFA78324ED106A7636B9C5A7BD198D0158AA4F5488D08F38514F1FDF4B4F40D2181B3681C364BA0273C706", +- "010000000000000000000000000000000000000000000000000001E2AAD6A612F33307BE5FA47C3C9E052F838164CD37D9A21173", 2 +-}; +- +-static const ECCurveParams ecCurve_NIST_K571 = { +- "NIST-K571", ECField_GF2m, 571, +- "080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000425", +- "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", +- "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001", +- "026EB7A859923FBC82189631F8103FE4AC9CA2970012D5D46024804801841CA44370958493B205E647DA304DB4CEB08CBBD1BA39494776FB988B47174DCA88C7E2945283A01C8972", +- "0349DC807F4FBF374F4AEADE3BCA95314DD58CEC9F307A54FFC61EFC006D8A2C9D4979C0AC44AEA74FBEBBB9F772AEDCB620B01A7BA7AF1B320430C8591984F601CD4C143EF1C7A3", +- "020000000000000000000000000000000000000000000000000000000000000000000000131850E1F19A63E4B391A8DB917F4138B630D84BE5D639381E91DEB45CFE778F637C1001", 4 +-}; +- +-static const ECCurveParams ecCurve_NIST_B571 = { +- "NIST-B571", ECField_GF2m, 571, +- "080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000425", +- "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001", +- "02F40E7E2221F295DE297117B7F3D62F5C6A97FFCB8CEFF1CD6BA8CE4A9A18AD84FFABBD8EFA59332BE7AD6756A66E294AFD185A78FF12AA520E4DE739BACA0C7FFEFF7F2955727A", +- "0303001D34B856296C16C0D40D3CD7750A93D1D2955FA80AA5F40FC8DB7B2ABDBDE53950F4C0D293CDD711A35B67FB1499AE60038614F1394ABFA3B4C850D927E1E7769C8EEC2D19", +- "037BF27342DA639B6DCCFFFEB73D69D78C6C27A6009CBBCA1980F8533921E8A684423E43BAB08A576291AF8F461BB2A8B3531D2F0485C19B16E2F1516E23DD3C1A4827AF1B8AC15B", +- "03FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE661CE18FF55987308059B186823851EC7DD9CA1161DE93D5174D66E8382E9BB2FE84E47", 2 +-}; +- +-/* ANSI X9.62 prime curves */ +-static const ECCurveParams ecCurve_X9_62_PRIME_192V2 = { +- "X9.62 P-192V2", ECField_GFp, 192, +- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF", +- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC", +- "CC22D6DFB95C6B25E49C0D6364A4E5980C393AA21668D953", +- "EEA2BAE7E1497842F2DE7769CFE9C989C072AD696F48034A", +- "6574D11D69B6EC7A672BB82A083DF2F2B0847DE970B2DE15", +- "FFFFFFFFFFFFFFFFFFFFFFFE5FB1A724DC80418648D8DD31", 1 +-}; +- +-static const ECCurveParams ecCurve_X9_62_PRIME_192V3 = { +- "X9.62 P-192V3", ECField_GFp, 192, +- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF", +- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC", +- "22123DC2395A05CAA7423DAECCC94760A7D462256BD56916", +- "7D29778100C65A1DA1783716588DCE2B8B4AEE8E228F1896", +- "38A90F22637337334B49DCB66A6DC8F9978ACA7648A943B0", +- "FFFFFFFFFFFFFFFFFFFFFFFF7A62D031C83F4294F640EC13", 1 +-}; +- +-static const ECCurveParams ecCurve_X9_62_PRIME_239V1 = { +- "X9.62 P-239V1", ECField_GFp, 239, +- "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFF", +- "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFC", +- "6B016C3BDCF18941D0D654921475CA71A9DB2FB27D1D37796185C2942C0A", +- "0FFA963CDCA8816CCC33B8642BEDF905C3D358573D3F27FBBD3B3CB9AAAF", +- "7DEBE8E4E90A5DAE6E4054CA530BA04654B36818CE226B39FCCB7B02F1AE", +- "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFF9E5E9A9F5D9071FBD1522688909D0B", 1 +-}; +- +-static const ECCurveParams ecCurve_X9_62_PRIME_239V2 = { +- "X9.62 P-239V2", ECField_GFp, 239, +- "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFF", +- "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFC", +- "617FAB6832576CBBFED50D99F0249C3FEE58B94BA0038C7AE84C8C832F2C", +- "38AF09D98727705120C921BB5E9E26296A3CDCF2F35757A0EAFD87B830E7", +- "5B0125E4DBEA0EC7206DA0FC01D9B081329FB555DE6EF460237DFF8BE4BA", +- "7FFFFFFFFFFFFFFFFFFFFFFF800000CFA7E8594377D414C03821BC582063", 1 +-}; +- +-static const ECCurveParams ecCurve_X9_62_PRIME_239V3 = { +- "X9.62 P-239V3", ECField_GFp, 239, +- "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFF", +- "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFC", +- "255705FA2A306654B1F4CB03D6A750A30C250102D4988717D9BA15AB6D3E", +- "6768AE8E18BB92CFCF005C949AA2C6D94853D0E660BBF854B1C9505FE95A", +- "1607E6898F390C06BC1D552BAD226F3B6FCFE48B6E818499AF18E3ED6CF3", +- "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFF975DEB41B3A6057C3C432146526551", 1 +-}; +- +-/* ANSI X9.62 binary curves */ +-static const ECCurveParams ecCurve_X9_62_CHAR2_PNB163V1 = { +- "X9.62 C2-PNB163V1", ECField_GF2m, 163, +- "080000000000000000000000000000000000000107", +- "072546B5435234A422E0789675F432C89435DE5242", +- "00C9517D06D5240D3CFF38C74B20B6CD4D6F9DD4D9", +- "07AF69989546103D79329FCC3D74880F33BBE803CB", +- "01EC23211B5966ADEA1D3F87F7EA5848AEF0B7CA9F", +- "0400000000000000000001E60FC8821CC74DAEAFC1", 2 +-}; +- +-static const ECCurveParams ecCurve_X9_62_CHAR2_PNB163V2 = { +- "X9.62 C2-PNB163V2", ECField_GF2m, 163, +- "080000000000000000000000000000000000000107", +- "0108B39E77C4B108BED981ED0E890E117C511CF072", +- "0667ACEB38AF4E488C407433FFAE4F1C811638DF20", +- "0024266E4EB5106D0A964D92C4860E2671DB9B6CC5", +- "079F684DDF6684C5CD258B3890021B2386DFD19FC5", +- "03FFFFFFFFFFFFFFFFFFFDF64DE1151ADBB78F10A7", 2 +-}; +- +-static const ECCurveParams ecCurve_X9_62_CHAR2_PNB163V3 = { +- "X9.62 C2-PNB163V3", ECField_GF2m, 163, +- "080000000000000000000000000000000000000107", +- "07A526C63D3E25A256A007699F5447E32AE456B50E", +- "03F7061798EB99E238FD6F1BF95B48FEEB4854252B", +- "02F9F87B7C574D0BDECF8A22E6524775F98CDEBDCB", +- "05B935590C155E17EA48EB3FF3718B893DF59A05D0", +- "03FFFFFFFFFFFFFFFFFFFE1AEE140F110AFF961309", 2 +-}; +- +-static const ECCurveParams ecCurve_X9_62_CHAR2_PNB176V1 = { +- "X9.62 C2-PNB176V1", ECField_GF2m, 176, +- "0100000000000000000000000000000000080000000007", +- "E4E6DB2995065C407D9D39B8D0967B96704BA8E9C90B", +- "5DDA470ABE6414DE8EC133AE28E9BBD7FCEC0AE0FFF2", +- "8D16C2866798B600F9F08BB4A8E860F3298CE04A5798", +- "6FA4539C2DADDDD6BAB5167D61B436E1D92BB16A562C", +- "00010092537397ECA4F6145799D62B0A19CE06FE26AD", 0xFF6E +-}; +- +-static const ECCurveParams ecCurve_X9_62_CHAR2_TNB191V1 = { +- "X9.62 C2-TNB191V1", ECField_GF2m, 191, +- "800000000000000000000000000000000000000000000201", +- "2866537B676752636A68F56554E12640276B649EF7526267", +- "2E45EF571F00786F67B0081B9495A3D95462F5DE0AA185EC", +- "36B3DAF8A23206F9C4F299D7B21A9C369137F2C84AE1AA0D", +- "765BE73433B3F95E332932E70EA245CA2418EA0EF98018FB", +- "40000000000000000000000004A20E90C39067C893BBB9A5", 2 +-}; +- +-static const ECCurveParams ecCurve_X9_62_CHAR2_TNB191V2 = { +- "X9.62 C2-TNB191V2", ECField_GF2m, 191, +- "800000000000000000000000000000000000000000000201", +- "401028774D7777C7B7666D1366EA432071274F89FF01E718", +- "0620048D28BCBD03B6249C99182B7C8CD19700C362C46A01", +- "3809B2B7CC1B28CC5A87926AAD83FD28789E81E2C9E3BF10", +- "17434386626D14F3DBF01760D9213A3E1CF37AEC437D668A", +- "20000000000000000000000050508CB89F652824E06B8173", 4 +-}; +- +-static const ECCurveParams ecCurve_X9_62_CHAR2_TNB191V3 = { +- "X9.62 C2-TNB191V3", ECField_GF2m, 191, +- "800000000000000000000000000000000000000000000201", +- "6C01074756099122221056911C77D77E77A777E7E7E77FCB", +- "71FE1AF926CF847989EFEF8DB459F66394D90F32AD3F15E8", +- "375D4CE24FDE434489DE8746E71786015009E66E38A926DD", +- "545A39176196575D985999366E6AD34CE0A77CD7127B06BE", +- "155555555555555555555555610C0B196812BFB6288A3EA3", 6 +-}; +- +-static const ECCurveParams ecCurve_X9_62_CHAR2_PNB208W1 = { +- "X9.62 C2-PNB208W1", ECField_GF2m, 208, +- "010000000000000000000000000000000800000000000000000007", +- "0000000000000000000000000000000000000000000000000000", +- "C8619ED45A62E6212E1160349E2BFA844439FAFC2A3FD1638F9E", +- "89FDFBE4ABE193DF9559ECF07AC0CE78554E2784EB8C1ED1A57A", +- "0F55B51A06E78E9AC38A035FF520D8B01781BEB1A6BB08617DE3", +- "000101BAF95C9723C57B6C21DA2EFF2D5ED588BDD5717E212F9D", 0xFE48 +-}; +- +-static const ECCurveParams ecCurve_X9_62_CHAR2_TNB239V1 = { +- "X9.62 C2-TNB239V1", ECField_GF2m, 239, +- "800000000000000000000000000000000000000000000000001000000001", +- "32010857077C5431123A46B808906756F543423E8D27877578125778AC76", +- "790408F2EEDAF392B012EDEFB3392F30F4327C0CA3F31FC383C422AA8C16", +- "57927098FA932E7C0A96D3FD5B706EF7E5F5C156E16B7E7C86038552E91D", +- "61D8EE5077C33FECF6F1A16B268DE469C3C7744EA9A971649FC7A9616305", +- "2000000000000000000000000000000F4D42FFE1492A4993F1CAD666E447", 4 +-}; +- +-static const ECCurveParams ecCurve_X9_62_CHAR2_TNB239V2 = { +- "X9.62 C2-TNB239V2", ECField_GF2m, 239, +- "800000000000000000000000000000000000000000000000001000000001", +- "4230017757A767FAE42398569B746325D45313AF0766266479B75654E65F", +- "5037EA654196CFF0CD82B2C14A2FCF2E3FF8775285B545722F03EACDB74B", +- "28F9D04E900069C8DC47A08534FE76D2B900B7D7EF31F5709F200C4CA205", +- "5667334C45AFF3B5A03BAD9DD75E2C71A99362567D5453F7FA6E227EC833", +- "1555555555555555555555555555553C6F2885259C31E3FCDF154624522D", 6 +-}; +- +-static const ECCurveParams ecCurve_X9_62_CHAR2_TNB239V3 = { +- "X9.62 C2-TNB239V3", ECField_GF2m, 239, +- "800000000000000000000000000000000000000000000000001000000001", +- "01238774666A67766D6676F778E676B66999176666E687666D8766C66A9F", +- "6A941977BA9F6A435199ACFC51067ED587F519C5ECB541B8E44111DE1D40", +- "70F6E9D04D289C4E89913CE3530BFDE903977D42B146D539BF1BDE4E9C92", +- "2E5A0EAF6E5E1305B9004DCE5C0ED7FE59A35608F33837C816D80B79F461", +- "0CCCCCCCCCCCCCCCCCCCCCCCCCCCCCAC4912D2D9DF903EF9888B8A0E4CFF", 0xA +-}; +- +-static const ECCurveParams ecCurve_X9_62_CHAR2_PNB272W1 = { +- "X9.62 C2-PNB272W1", ECField_GF2m, 272, +- "010000000000000000000000000000000000000000000000000000010000000000000B", +- "91A091F03B5FBA4AB2CCF49C4EDD220FB028712D42BE752B2C40094DBACDB586FB20", +- "7167EFC92BB2E3CE7C8AAAFF34E12A9C557003D7C73A6FAF003F99F6CC8482E540F7", +- "6108BABB2CEEBCF787058A056CBE0CFE622D7723A289E08A07AE13EF0D10D171DD8D", +- "10C7695716851EEF6BA7F6872E6142FBD241B830FF5EFCACECCAB05E02005DDE9D23", +- "000100FAF51354E0E39E4892DF6E319C72C8161603FA45AA7B998A167B8F1E629521", +- 0xFF06 +-}; +- +-static const ECCurveParams ecCurve_X9_62_CHAR2_PNB304W1 = { +- "X9.62 C2-PNB304W1", ECField_GF2m, 304, +- "010000000000000000000000000000000000000000000000000000000000000000000000000807", +- "FD0D693149A118F651E6DCE6802085377E5F882D1B510B44160074C1288078365A0396C8E681", +- "BDDB97E555A50A908E43B01C798EA5DAA6788F1EA2794EFCF57166B8C14039601E55827340BE", +- "197B07845E9BE2D96ADB0F5F3C7F2CFFBD7A3EB8B6FEC35C7FD67F26DDF6285A644F740A2614", +- "E19FBEB76E0DA171517ECF401B50289BF014103288527A9B416A105E80260B549FDC1B92C03B", +- "000101D556572AABAC800101D556572AABAC8001022D5C91DD173F8FB561DA6899164443051D", 0xFE2E +-}; +- +-static const ECCurveParams ecCurve_X9_62_CHAR2_TNB359V1 = { +- "X9.62 C2-TNB359V1", ECField_GF2m, 359, +- "800000000000000000000000000000000000000000000000000000000000000000000000100000000000000001", +- "5667676A654B20754F356EA92017D946567C46675556F19556A04616B567D223A5E05656FB549016A96656A557", +- "2472E2D0197C49363F1FE7F5B6DB075D52B6947D135D8CA445805D39BC345626089687742B6329E70680231988", +- "3C258EF3047767E7EDE0F1FDAA79DAEE3841366A132E163ACED4ED2401DF9C6BDCDE98E8E707C07A2239B1B097", +- "53D7E08529547048121E9C95F3791DD804963948F34FAE7BF44EA82365DC7868FE57E4AE2DE211305A407104BD", +- "01AF286BCA1AF286BCA1AF286BCA1AF286BCA1AF286BC9FB8F6B85C556892C20A7EB964FE7719E74F490758D3B", 0x4C +-}; +- +-static const ECCurveParams ecCurve_X9_62_CHAR2_PNB368W1 = { +- "X9.62 C2-PNB368W1", ECField_GF2m, 368, +- "0100000000000000000000000000000000000000000000000000000000000000000000002000000000000000000007", +- "E0D2EE25095206F5E2A4F9ED229F1F256E79A0E2B455970D8D0D865BD94778C576D62F0AB7519CCD2A1A906AE30D", +- "FC1217D4320A90452C760A58EDCD30C8DD069B3C34453837A34ED50CB54917E1C2112D84D164F444F8F74786046A", +- "1085E2755381DCCCE3C1557AFA10C2F0C0C2825646C5B34A394CBCFA8BC16B22E7E789E927BE216F02E1FB136A5F", +- "7B3EB1BDDCBA62D5D8B2059B525797FC73822C59059C623A45FF3843CEE8F87CD1855ADAA81E2A0750B80FDA2310", +- "00010090512DA9AF72B08349D98A5DD4C7B0532ECA51CE03E2D10F3B7AC579BD87E909AE40A6F131E9CFCE5BD967", 0xFF70 +-}; +- +-static const ECCurveParams ecCurve_X9_62_CHAR2_TNB431R1 = { +- "X9.62 C2-TNB431R1", ECField_GF2m, 431, +- "800000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000001", +- "1A827EF00DD6FC0E234CAF046C6A5D8A85395B236CC4AD2CF32A0CADBDC9DDF620B0EB9906D0957F6C6FEACD615468DF104DE296CD8F", +- "10D9B4A3D9047D8B154359ABFB1B7F5485B04CEB868237DDC9DEDA982A679A5A919B626D4E50A8DD731B107A9962381FB5D807BF2618", +- "120FC05D3C67A99DE161D2F4092622FECA701BE4F50F4758714E8A87BBF2A658EF8C21E7C5EFE965361F6C2999C0C247B0DBD70CE6B7", +- "20D0AF8903A96F8D5FA2C255745D3C451B302C9346D9B7E485E7BCE41F6B591F3E8F6ADDCBB0BC4C2F947A7DE1A89B625D6A598B3760", +- "0340340340340340340340340340340340340340340340340340340323C313FAB50589703B5EC68D3587FEC60D161CC149C1AD4A91", 0x2760 +-}; +- +-/* SEC2 prime curves */ +-static const ECCurveParams ecCurve_SECG_PRIME_112R1 = { +- "SECP-112R1", ECField_GFp, 112, +- "DB7C2ABF62E35E668076BEAD208B", +- "DB7C2ABF62E35E668076BEAD2088", +- "659EF8BA043916EEDE8911702B22", +- "09487239995A5EE76B55F9C2F098", +- "A89CE5AF8724C0A23E0E0FF77500", +- "DB7C2ABF62E35E7628DFAC6561C5", 1 +-}; +- +-static const ECCurveParams ecCurve_SECG_PRIME_112R2 = { +- "SECP-112R2", ECField_GFp, 112, +- "DB7C2ABF62E35E668076BEAD208B", +- "6127C24C05F38A0AAAF65C0EF02C", +- "51DEF1815DB5ED74FCC34C85D709", +- "4BA30AB5E892B4E1649DD0928643", +- "adcd46f5882e3747def36e956e97", +- "36DF0AAFD8B8D7597CA10520D04B", 4 +-}; +- +-static const ECCurveParams ecCurve_SECG_PRIME_128R1 = { +- "SECP-128R1", ECField_GFp, 128, +- "FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFF", +- "FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFC", +- "E87579C11079F43DD824993C2CEE5ED3", +- "161FF7528B899B2D0C28607CA52C5B86", +- "CF5AC8395BAFEB13C02DA292DDED7A83", +- "FFFFFFFE0000000075A30D1B9038A115", 1 +-}; +- +-static const ECCurveParams ecCurve_SECG_PRIME_128R2 = { +- "SECP-128R2", ECField_GFp, 128, +- "FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFF", +- "D6031998D1B3BBFEBF59CC9BBFF9AEE1", +- "5EEEFCA380D02919DC2C6558BB6D8A5D", +- "7B6AA5D85E572983E6FB32A7CDEBC140", +- "27B6916A894D3AEE7106FE805FC34B44", +- "3FFFFFFF7FFFFFFFBE0024720613B5A3", 4 +-}; +- +-static const ECCurveParams ecCurve_SECG_PRIME_160K1 = { +- "SECP-160K1", ECField_GFp, 160, +- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC73", +- "0000000000000000000000000000000000000000", +- "0000000000000000000000000000000000000007", +- "3B4C382CE37AA192A4019E763036F4F5DD4D7EBB", +- "938CF935318FDCED6BC28286531733C3F03C4FEE", +- "0100000000000000000001B8FA16DFAB9ACA16B6B3", 1 +-}; +- +-static const ECCurveParams ecCurve_SECG_PRIME_160R1 = { +- "SECP-160R1", ECField_GFp, 160, +- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFF", +- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFC", +- "1C97BEFC54BD7A8B65ACF89F81D4D4ADC565FA45", +- "4A96B5688EF573284664698968C38BB913CBFC82", +- "23A628553168947D59DCC912042351377AC5FB32", +- "0100000000000000000001F4C8F927AED3CA752257", 1 +-}; +- +-static const ECCurveParams ecCurve_SECG_PRIME_160R2 = { +- "SECP-160R2", ECField_GFp, 160, +- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC73", +- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC70", +- "B4E134D3FB59EB8BAB57274904664D5AF50388BA", +- "52DCB034293A117E1F4FF11B30F7199D3144CE6D", +- "FEAFFEF2E331F296E071FA0DF9982CFEA7D43F2E", +- "0100000000000000000000351EE786A818F3A1A16B", 1 +-}; +- +-static const ECCurveParams ecCurve_SECG_PRIME_192K1 = { +- "SECP-192K1", ECField_GFp, 192, +- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFEE37", +- "000000000000000000000000000000000000000000000000", +- "000000000000000000000000000000000000000000000003", +- "DB4FF10EC057E9AE26B07D0280B7F4341DA5D1B1EAE06C7D", +- "9B2F2F6D9C5628A7844163D015BE86344082AA88D95E2F9D", +- "FFFFFFFFFFFFFFFFFFFFFFFE26F2FC170F69466A74DEFD8D", 1 +-}; +- +-static const ECCurveParams ecCurve_SECG_PRIME_224K1 = { +- "SECP-224K1", ECField_GFp, 224, +- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFE56D", +- "00000000000000000000000000000000000000000000000000000000", +- "00000000000000000000000000000000000000000000000000000005", +- "A1455B334DF099DF30FC28A169A467E9E47075A90F7E650EB6B7A45C", +- "7E089FED7FBA344282CAFBD6F7E319F7C0B0BD59E2CA4BDB556D61A5", +- "010000000000000000000000000001DCE8D2EC6184CAF0A971769FB1F7", 1 +-}; +- +-static const ECCurveParams ecCurve_SECG_PRIME_256K1 = { +- "SECP-256K1", ECField_GFp, 256, +- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC2F", +- "0000000000000000000000000000000000000000000000000000000000000000", +- "0000000000000000000000000000000000000000000000000000000000000007", +- "79BE667EF9DCBBAC55A06295CE870B07029BFCDB2DCE28D959F2815B16F81798", +- "483ADA7726A3C4655DA4FBFC0E1108A8FD17B448A68554199C47D08FFB10D4B8", +- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364141", 1 +-}; +- +-/* SEC2 binary curves */ +-static const ECCurveParams ecCurve_SECG_CHAR2_113R1 = { +- "SECT-113R1", ECField_GF2m, 113, +- "020000000000000000000000000201", +- "003088250CA6E7C7FE649CE85820F7", +- "00E8BEE4D3E2260744188BE0E9C723", +- "009D73616F35F4AB1407D73562C10F", +- "00A52830277958EE84D1315ED31886", +- "0100000000000000D9CCEC8A39E56F", 2 +-}; +- +-static const ECCurveParams ecCurve_SECG_CHAR2_113R2 = { +- "SECT-113R2", ECField_GF2m, 113, +- "020000000000000000000000000201", +- "00689918DBEC7E5A0DD6DFC0AA55C7", +- "0095E9A9EC9B297BD4BF36E059184F", +- "01A57A6A7B26CA5EF52FCDB8164797", +- "00B3ADC94ED1FE674C06E695BABA1D", +- "010000000000000108789B2496AF93", 2 +-}; +- +-static const ECCurveParams ecCurve_SECG_CHAR2_131R1 = { +- "SECT-131R1", ECField_GF2m, 131, +- "080000000000000000000000000000010D", +- "07A11B09A76B562144418FF3FF8C2570B8", +- "0217C05610884B63B9C6C7291678F9D341", +- "0081BAF91FDF9833C40F9C181343638399", +- "078C6E7EA38C001F73C8134B1B4EF9E150", +- "0400000000000000023123953A9464B54D", 2 +-}; +- +-static const ECCurveParams ecCurve_SECG_CHAR2_131R2 = { +- "SECT-131R2", ECField_GF2m, 131, +- "080000000000000000000000000000010D", +- "03E5A88919D7CAFCBF415F07C2176573B2", +- "04B8266A46C55657AC734CE38F018F2192", +- "0356DCD8F2F95031AD652D23951BB366A8", +- "0648F06D867940A5366D9E265DE9EB240F", +- "0400000000000000016954A233049BA98F", 2 +-}; +- +-static const ECCurveParams ecCurve_SECG_CHAR2_163R1 = { +- "SECT-163R1", ECField_GF2m, 163, +- "0800000000000000000000000000000000000000C9", +- "07B6882CAAEFA84F9554FF8428BD88E246D2782AE2", +- "0713612DCDDCB40AAB946BDA29CA91F73AF958AFD9", +- "0369979697AB43897789566789567F787A7876A654", +- "00435EDB42EFAFB2989D51FEFCE3C80988F41FF883", +- "03FFFFFFFFFFFFFFFFFFFF48AAB689C29CA710279B", 2 +-}; +- +-static const ECCurveParams ecCurve_SECG_CHAR2_193R1 = { +- "SECT-193R1", ECField_GF2m, 193, +- "02000000000000000000000000000000000000000000008001", +- "0017858FEB7A98975169E171F77B4087DE098AC8A911DF7B01", +- "00FDFB49BFE6C3A89FACADAA7A1E5BBC7CC1C2E5D831478814", +- "01F481BC5F0FF84A74AD6CDF6FDEF4BF6179625372D8C0C5E1", +- "0025E399F2903712CCF3EA9E3A1AD17FB0B3201B6AF7CE1B05", +- "01000000000000000000000000C7F34A778F443ACC920EBA49", 2 +-}; +- +-static const ECCurveParams ecCurve_SECG_CHAR2_193R2 = { +- "SECT-193R2", ECField_GF2m, 193, +- "02000000000000000000000000000000000000000000008001", +- "0163F35A5137C2CE3EA6ED8667190B0BC43ECD69977702709B", +- "00C9BB9E8927D4D64C377E2AB2856A5B16E3EFB7F61D4316AE", +- "00D9B67D192E0367C803F39E1A7E82CA14A651350AAE617E8F", +- "01CE94335607C304AC29E7DEFBD9CA01F596F927224CDECF6C", +- "010000000000000000000000015AAB561B005413CCD4EE99D5", 2 +-}; +- +-static const ECCurveParams ecCurve_SECG_CHAR2_239K1 = { +- "SECT-239K1", ECField_GF2m, 239, +- "800000000000000000004000000000000000000000000000000000000001", +- "000000000000000000000000000000000000000000000000000000000000", +- "000000000000000000000000000000000000000000000000000000000001", +- "29A0B6A887A983E9730988A68727A8B2D126C44CC2CC7B2A6555193035DC", +- "76310804F12E549BDB011C103089E73510ACB275FC312A5DC6B76553F0CA", +- "2000000000000000000000000000005A79FEC67CB6E91F1C1DA800E478A5", 4 +-}; +- +-/* WTLS curves */ +-static const ECCurveParams ecCurve_WTLS_1 = { +- "WTLS-1", ECField_GF2m, 113, +- "020000000000000000000000000201", +- "000000000000000000000000000001", +- "000000000000000000000000000001", +- "01667979A40BA497E5D5C270780617", +- "00F44B4AF1ECC2630E08785CEBCC15", +- "00FFFFFFFFFFFFFFFDBF91AF6DEA73", 2 +-}; +- +-static const ECCurveParams ecCurve_WTLS_8 = { +- "WTLS-8", ECField_GFp, 112, +- "FFFFFFFFFFFFFFFFFFFFFFFFFDE7", +- "0000000000000000000000000000", +- "0000000000000000000000000003", +- "0000000000000000000000000001", +- "0000000000000000000000000002", +- "0100000000000001ECEA551AD837E9", 1 +-}; +- +-static const ECCurveParams ecCurve_WTLS_9 = { +- "WTLS-9", ECField_GFp, 160, +- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC808F", +- "0000000000000000000000000000000000000000", +- "0000000000000000000000000000000000000003", +- "0000000000000000000000000000000000000001", +- "0000000000000000000000000000000000000002", +- "0100000000000000000001CDC98AE0E2DE574ABF33", 1 +-}; +- + /* mapping between ECCurveName enum and pointers to ECCurveParams */ + static const ECCurveParams *ecCurve_map[] = { + NULL, /* ECCurve_noName */ +- &ecCurve_NIST_P192, /* ECCurve_NIST_P192 */ +- &ecCurve_NIST_P224, /* ECCurve_NIST_P224 */ ++ NULL, /* ECCurve_noName */ ++ NULL, /* ECCurve_noName */ + &ecCurve_NIST_P256, /* ECCurve_NIST_P256 */ + &ecCurve_NIST_P384, /* ECCurve_NIST_P384 */ + &ecCurve_NIST_P521, /* ECCurve_NIST_P521 */ +- &ecCurve_NIST_K163, /* ECCurve_NIST_K163 */ +- &ecCurve_NIST_B163, /* ECCurve_NIST_B163 */ +- &ecCurve_NIST_K233, /* ECCurve_NIST_K233 */ +- &ecCurve_NIST_B233, /* ECCurve_NIST_B233 */ +- &ecCurve_NIST_K283, /* ECCurve_NIST_K283 */ +- &ecCurve_NIST_B283, /* ECCurve_NIST_B283 */ +- &ecCurve_NIST_K409, /* ECCurve_NIST_K409 */ +- &ecCurve_NIST_B409, /* ECCurve_NIST_B409 */ +- &ecCurve_NIST_K571, /* ECCurve_NIST_K571 */ +- &ecCurve_NIST_B571, /* ECCurve_NIST_B571 */ +- &ecCurve_X9_62_PRIME_192V2, /* ECCurve_X9_62_PRIME_192V2 */ +- &ecCurve_X9_62_PRIME_192V3, /* ECCurve_X9_62_PRIME_192V3 */ +- &ecCurve_X9_62_PRIME_239V1, /* ECCurve_X9_62_PRIME_239V1 */ +- &ecCurve_X9_62_PRIME_239V2, /* ECCurve_X9_62_PRIME_239V2 */ +- &ecCurve_X9_62_PRIME_239V3, /* ECCurve_X9_62_PRIME_239V3 */ +- &ecCurve_X9_62_CHAR2_PNB163V1, /* ECCurve_X9_62_CHAR2_PNB163V1 */ +- &ecCurve_X9_62_CHAR2_PNB163V2, /* ECCurve_X9_62_CHAR2_PNB163V2 */ +- &ecCurve_X9_62_CHAR2_PNB163V3, /* ECCurve_X9_62_CHAR2_PNB163V3 */ +- &ecCurve_X9_62_CHAR2_PNB176V1, /* ECCurve_X9_62_CHAR2_PNB176V1 */ +- &ecCurve_X9_62_CHAR2_TNB191V1, /* ECCurve_X9_62_CHAR2_TNB191V1 */ +- &ecCurve_X9_62_CHAR2_TNB191V2, /* ECCurve_X9_62_CHAR2_TNB191V2 */ +- &ecCurve_X9_62_CHAR2_TNB191V3, /* ECCurve_X9_62_CHAR2_TNB191V3 */ +- &ecCurve_X9_62_CHAR2_PNB208W1, /* ECCurve_X9_62_CHAR2_PNB208W1 */ +- &ecCurve_X9_62_CHAR2_TNB239V1, /* ECCurve_X9_62_CHAR2_TNB239V1 */ +- &ecCurve_X9_62_CHAR2_TNB239V2, /* ECCurve_X9_62_CHAR2_TNB239V2 */ +- &ecCurve_X9_62_CHAR2_TNB239V3, /* ECCurve_X9_62_CHAR2_TNB239V3 */ +- &ecCurve_X9_62_CHAR2_PNB272W1, /* ECCurve_X9_62_CHAR2_PNB272W1 */ +- &ecCurve_X9_62_CHAR2_PNB304W1, /* ECCurve_X9_62_CHAR2_PNB304W1 */ +- &ecCurve_X9_62_CHAR2_TNB359V1, /* ECCurve_X9_62_CHAR2_TNB359V1 */ +- &ecCurve_X9_62_CHAR2_PNB368W1, /* ECCurve_X9_62_CHAR2_PNB368W1 */ +- &ecCurve_X9_62_CHAR2_TNB431R1, /* ECCurve_X9_62_CHAR2_TNB431R1 */ +- &ecCurve_SECG_PRIME_112R1, /* ECCurve_SECG_PRIME_112R1 */ +- &ecCurve_SECG_PRIME_112R2, /* ECCurve_SECG_PRIME_112R2 */ +- &ecCurve_SECG_PRIME_128R1, /* ECCurve_SECG_PRIME_128R1 */ +- &ecCurve_SECG_PRIME_128R2, /* ECCurve_SECG_PRIME_128R2 */ +- &ecCurve_SECG_PRIME_160K1, /* ECCurve_SECG_PRIME_160K1 */ +- &ecCurve_SECG_PRIME_160R1, /* ECCurve_SECG_PRIME_160R1 */ +- &ecCurve_SECG_PRIME_160R2, /* ECCurve_SECG_PRIME_160R2 */ +- &ecCurve_SECG_PRIME_192K1, /* ECCurve_SECG_PRIME_192K1 */ +- &ecCurve_SECG_PRIME_224K1, /* ECCurve_SECG_PRIME_224K1 */ +- &ecCurve_SECG_PRIME_256K1, /* ECCurve_SECG_PRIME_256K1 */ +- &ecCurve_SECG_CHAR2_113R1, /* ECCurve_SECG_CHAR2_113R1 */ +- &ecCurve_SECG_CHAR2_113R2, /* ECCurve_SECG_CHAR2_113R2 */ +- &ecCurve_SECG_CHAR2_131R1, /* ECCurve_SECG_CHAR2_131R1 */ +- &ecCurve_SECG_CHAR2_131R2, /* ECCurve_SECG_CHAR2_131R2 */ +- &ecCurve_SECG_CHAR2_163R1, /* ECCurve_SECG_CHAR2_163R1 */ +- &ecCurve_SECG_CHAR2_193R1, /* ECCurve_SECG_CHAR2_193R1 */ +- &ecCurve_SECG_CHAR2_193R2, /* ECCurve_SECG_CHAR2_193R2 */ +- &ecCurve_SECG_CHAR2_239K1, /* ECCurve_SECG_CHAR2_239K1 */ +- &ecCurve_WTLS_1, /* ECCurve_WTLS_1 */ +- &ecCurve_WTLS_8, /* ECCurve_WTLS_8 */ +- &ecCurve_WTLS_9, /* ECCurve_WTLS_9 */ ++ NULL, /* ECCurve_noName */ ++ NULL, /* ECCurve_noName */ ++ NULL, /* ECCurve_noName */ ++ NULL, /* ECCurve_noName */ ++ NULL, /* ECCurve_noName */ ++ NULL, /* ECCurve_noName */ ++ NULL, /* ECCurve_noName */ ++ NULL, /* ECCurve_noName */ ++ NULL, /* ECCurve_noName */ ++ NULL, /* ECCurve_noName */ ++ NULL, /* ECCurve_noName */ ++ NULL, /* ECCurve_noName */ ++ NULL, /* ECCurve_noName */ ++ NULL, /* ECCurve_noName */ ++ NULL, /* ECCurve_noName */ ++ NULL, /* ECCurve_noName */ ++ NULL, /* ECCurve_noName */ ++ NULL, /* ECCurve_noName */ ++ NULL, /* ECCurve_noName */ ++ NULL, /* ECCurve_noName */ ++ NULL, /* ECCurve_noName */ ++ NULL, /* ECCurve_noName */ ++ NULL, /* ECCurve_noName */ ++ NULL, /* ECCurve_noName */ ++ NULL, /* ECCurve_noName */ ++ NULL, /* ECCurve_noName */ ++ NULL, /* ECCurve_noName */ ++ NULL, /* ECCurve_noName */ ++ NULL, /* ECCurve_noName */ ++ NULL, /* ECCurve_noName */ ++ NULL, /* ECCurve_noName */ ++ NULL, /* ECCurve_noName */ ++ NULL, /* ECCurve_noName */ ++ NULL, /* ECCurve_noName */ ++ NULL, /* ECCurve_noName */ ++ NULL, /* ECCurve_noName */ ++ NULL, /* ECCurve_noName */ ++ NULL, /* ECCurve_noName */ ++ NULL, /* ECCurve_noName */ ++ NULL, /* ECCurve_noName */ ++ NULL, /* ECCurve_noName */ ++ NULL, /* ECCurve_noName */ ++ NULL, /* ECCurve_noName */ ++ NULL, /* ECCurve_noName */ ++ NULL, /* ECCurve_noName */ ++ NULL, /* ECCurve_noName */ ++ NULL, /* ECCurve_noName */ ++ NULL, /* ECCurve_noName */ ++ NULL, /* ECCurve_noName */ ++ NULL, /* ECCurve_noName */ ++ NULL, /* ECCurve_noName */ ++ NULL, /* ECCurve_noName */ + NULL /* ECCurve_pastLastCurve */ + }; + +diff --git openjdk.orig/jdk/src/share/native/sun/security/ec/impl/ecl.c openjdk/jdk/src/share/native/sun/security/ec/impl/ecl.c +--- openjdk.orig/jdk/src/share/native/sun/security/ec/impl/ecl.c ++++ openjdk/jdk/src/share/native/sun/security/ec/impl/ecl.c +@@ -39,7 +39,6 @@ + #include "mplogic.h" + #include "ecl.h" + #include "ecl-priv.h" +-#include "ec2.h" + #include "ecp.h" + #ifndef _KERNEL + #include +@@ -170,50 +169,6 @@ + return group; + } + +-#ifdef NSS_ECC_MORE_THAN_SUITE_B +-/* Construct a generic ECGroup for elliptic curves over binary polynomial +- * fields. */ +-ECGroup * +-ECGroup_consGF2m(const mp_int *irr, const unsigned int irr_arr[5], +- const mp_int *curvea, const mp_int *curveb, +- const mp_int *genx, const mp_int *geny, +- const mp_int *order, int cofactor) +-{ +- mp_err res = MP_OKAY; +- ECGroup *group = NULL; +- +- group = ECGroup_new(FLAG(irr)); +- if (group == NULL) +- return NULL; +- +- group->meth = GFMethod_consGF2m(irr, irr_arr); +- if (group->meth == NULL) { +- res = MP_MEM; +- goto CLEANUP; +- } +- MP_CHECKOK(mp_copy(curvea, &group->curvea)); +- MP_CHECKOK(mp_copy(curveb, &group->curveb)); +- MP_CHECKOK(mp_copy(genx, &group->genx)); +- MP_CHECKOK(mp_copy(geny, &group->geny)); +- MP_CHECKOK(mp_copy(order, &group->order)); +- group->cofactor = cofactor; +- group->point_add = &ec_GF2m_pt_add_aff; +- group->point_sub = &ec_GF2m_pt_sub_aff; +- group->point_dbl = &ec_GF2m_pt_dbl_aff; +- group->point_mul = &ec_GF2m_pt_mul_mont; +- group->base_point_mul = NULL; +- group->points_mul = &ec_pts_mul_basic; +- group->validate_point = &ec_GF2m_validate_point; +- +- CLEANUP: +- if (res != MP_OKAY) { +- ECGroup_free(group); +- return NULL; +- } +- return group; +-} +-#endif +- + /* Construct ECGroup from hex parameters and name, if any. Called by + * ECGroup_fromHex and ECGroup_fromName. */ + ECGroup * +@@ -254,85 +209,10 @@ + + /* determine which optimizations (if any) to use */ + if (params->field == ECField_GFp) { +-#ifdef NSS_ECC_MORE_THAN_SUITE_B +- switch (name) { +-#ifdef ECL_USE_FP +- case ECCurve_SECG_PRIME_160R1: +- group = +- ECGroup_consGFp(&irr, &curvea, &curveb, &genx, &geny, +- &order, params->cofactor); +- if (group == NULL) { res = MP_UNDEF; goto CLEANUP; } +- MP_CHECKOK(ec_group_set_secp160r1_fp(group)); +- break; +-#endif +- case ECCurve_SECG_PRIME_192R1: +-#ifdef ECL_USE_FP +- group = +- ECGroup_consGFp(&irr, &curvea, &curveb, &genx, &geny, +- &order, params->cofactor); +- if (group == NULL) { res = MP_UNDEF; goto CLEANUP; } +- MP_CHECKOK(ec_group_set_nistp192_fp(group)); +-#else +- group = +- ECGroup_consGFp(&irr, &curvea, &curveb, &genx, &geny, +- &order, params->cofactor); +- if (group == NULL) { res = MP_UNDEF; goto CLEANUP; } +- MP_CHECKOK(ec_group_set_gfp192(group, name)); +-#endif +- break; +- case ECCurve_SECG_PRIME_224R1: +-#ifdef ECL_USE_FP +- group = +- ECGroup_consGFp(&irr, &curvea, &curveb, &genx, &geny, +- &order, params->cofactor); +- if (group == NULL) { res = MP_UNDEF; goto CLEANUP; } +- MP_CHECKOK(ec_group_set_nistp224_fp(group)); +-#else +- group = +- ECGroup_consGFp(&irr, &curvea, &curveb, &genx, &geny, +- &order, params->cofactor); +- if (group == NULL) { res = MP_UNDEF; goto CLEANUP; } +- MP_CHECKOK(ec_group_set_gfp224(group, name)); +-#endif +- break; +- case ECCurve_SECG_PRIME_256R1: +- group = +- ECGroup_consGFp(&irr, &curvea, &curveb, &genx, &geny, +- &order, params->cofactor); +- if (group == NULL) { res = MP_UNDEF; goto CLEANUP; } +- MP_CHECKOK(ec_group_set_gfp256(group, name)); +- break; +- case ECCurve_SECG_PRIME_521R1: +- group = +- ECGroup_consGFp(&irr, &curvea, &curveb, &genx, &geny, +- &order, params->cofactor); +- if (group == NULL) { res = MP_UNDEF; goto CLEANUP; } +- MP_CHECKOK(ec_group_set_gfp521(group, name)); +- break; +- default: +- /* use generic arithmetic */ +-#endif + group = + ECGroup_consGFp_mont(&irr, &curvea, &curveb, &genx, &geny, + &order, params->cofactor); + if (group == NULL) { res = MP_UNDEF; goto CLEANUP; } +-#ifdef NSS_ECC_MORE_THAN_SUITE_B +- } +- } else if (params->field == ECField_GF2m) { +- group = ECGroup_consGF2m(&irr, NULL, &curvea, &curveb, &genx, &geny, &order, params->cofactor); +- if (group == NULL) { res = MP_UNDEF; goto CLEANUP; } +- if ((name == ECCurve_NIST_K163) || +- (name == ECCurve_NIST_B163) || +- (name == ECCurve_SECG_CHAR2_163R1)) { +- MP_CHECKOK(ec_group_set_gf2m163(group, name)); +- } else if ((name == ECCurve_SECG_CHAR2_193R1) || +- (name == ECCurve_SECG_CHAR2_193R2)) { +- MP_CHECKOK(ec_group_set_gf2m193(group, name)); +- } else if ((name == ECCurve_NIST_K233) || +- (name == ECCurve_NIST_B233)) { +- MP_CHECKOK(ec_group_set_gf2m233(group, name)); +- } +-#endif + } else { + res = MP_UNDEF; + goto CLEANUP; +diff --git openjdk.orig/jdk/src/share/native/sun/security/ec/impl/oid.c openjdk/jdk/src/share/native/sun/security/ec/impl/oid.c +--- openjdk.orig/jdk/src/share/native/sun/security/ec/impl/oid.c ++++ openjdk/jdk/src/share/native/sun/security/ec/impl/oid.c +@@ -69,71 +69,12 @@ + /* NOTE: prime192v1 is the same as secp192r1, prime256v1 is the + * same as secp256r1 + */ +-CONST_OID ansiX962prime192v1[] = { ANSI_X962_GFp_OID, 0x01 }; +-CONST_OID ansiX962prime192v2[] = { ANSI_X962_GFp_OID, 0x02 }; +-CONST_OID ansiX962prime192v3[] = { ANSI_X962_GFp_OID, 0x03 }; +-CONST_OID ansiX962prime239v1[] = { ANSI_X962_GFp_OID, 0x04 }; +-CONST_OID ansiX962prime239v2[] = { ANSI_X962_GFp_OID, 0x05 }; +-CONST_OID ansiX962prime239v3[] = { ANSI_X962_GFp_OID, 0x06 }; + CONST_OID ansiX962prime256v1[] = { ANSI_X962_GFp_OID, 0x07 }; + + /* SECG prime curve OIDs */ +-CONST_OID secgECsecp112r1[] = { SECG_OID, 0x06 }; +-CONST_OID secgECsecp112r2[] = { SECG_OID, 0x07 }; +-CONST_OID secgECsecp128r1[] = { SECG_OID, 0x1c }; +-CONST_OID secgECsecp128r2[] = { SECG_OID, 0x1d }; +-CONST_OID secgECsecp160k1[] = { SECG_OID, 0x09 }; +-CONST_OID secgECsecp160r1[] = { SECG_OID, 0x08 }; +-CONST_OID secgECsecp160r2[] = { SECG_OID, 0x1e }; +-CONST_OID secgECsecp192k1[] = { SECG_OID, 0x1f }; +-CONST_OID secgECsecp224k1[] = { SECG_OID, 0x20 }; +-CONST_OID secgECsecp224r1[] = { SECG_OID, 0x21 }; +-CONST_OID secgECsecp256k1[] = { SECG_OID, 0x0a }; + CONST_OID secgECsecp384r1[] = { SECG_OID, 0x22 }; + CONST_OID secgECsecp521r1[] = { SECG_OID, 0x23 }; + +-/* SECG characterisitic two curve OIDs */ +-CONST_OID secgECsect113r1[] = {SECG_OID, 0x04 }; +-CONST_OID secgECsect113r2[] = {SECG_OID, 0x05 }; +-CONST_OID secgECsect131r1[] = {SECG_OID, 0x16 }; +-CONST_OID secgECsect131r2[] = {SECG_OID, 0x17 }; +-CONST_OID secgECsect163k1[] = {SECG_OID, 0x01 }; +-CONST_OID secgECsect163r1[] = {SECG_OID, 0x02 }; +-CONST_OID secgECsect163r2[] = {SECG_OID, 0x0f }; +-CONST_OID secgECsect193r1[] = {SECG_OID, 0x18 }; +-CONST_OID secgECsect193r2[] = {SECG_OID, 0x19 }; +-CONST_OID secgECsect233k1[] = {SECG_OID, 0x1a }; +-CONST_OID secgECsect233r1[] = {SECG_OID, 0x1b }; +-CONST_OID secgECsect239k1[] = {SECG_OID, 0x03 }; +-CONST_OID secgECsect283k1[] = {SECG_OID, 0x10 }; +-CONST_OID secgECsect283r1[] = {SECG_OID, 0x11 }; +-CONST_OID secgECsect409k1[] = {SECG_OID, 0x24 }; +-CONST_OID secgECsect409r1[] = {SECG_OID, 0x25 }; +-CONST_OID secgECsect571k1[] = {SECG_OID, 0x26 }; +-CONST_OID secgECsect571r1[] = {SECG_OID, 0x27 }; +- +-/* ANSI X9.62 characteristic two curve OIDs */ +-CONST_OID ansiX962c2pnb163v1[] = { ANSI_X962_GF2m_OID, 0x01 }; +-CONST_OID ansiX962c2pnb163v2[] = { ANSI_X962_GF2m_OID, 0x02 }; +-CONST_OID ansiX962c2pnb163v3[] = { ANSI_X962_GF2m_OID, 0x03 }; +-CONST_OID ansiX962c2pnb176v1[] = { ANSI_X962_GF2m_OID, 0x04 }; +-CONST_OID ansiX962c2tnb191v1[] = { ANSI_X962_GF2m_OID, 0x05 }; +-CONST_OID ansiX962c2tnb191v2[] = { ANSI_X962_GF2m_OID, 0x06 }; +-CONST_OID ansiX962c2tnb191v3[] = { ANSI_X962_GF2m_OID, 0x07 }; +-CONST_OID ansiX962c2onb191v4[] = { ANSI_X962_GF2m_OID, 0x08 }; +-CONST_OID ansiX962c2onb191v5[] = { ANSI_X962_GF2m_OID, 0x09 }; +-CONST_OID ansiX962c2pnb208w1[] = { ANSI_X962_GF2m_OID, 0x0a }; +-CONST_OID ansiX962c2tnb239v1[] = { ANSI_X962_GF2m_OID, 0x0b }; +-CONST_OID ansiX962c2tnb239v2[] = { ANSI_X962_GF2m_OID, 0x0c }; +-CONST_OID ansiX962c2tnb239v3[] = { ANSI_X962_GF2m_OID, 0x0d }; +-CONST_OID ansiX962c2onb239v4[] = { ANSI_X962_GF2m_OID, 0x0e }; +-CONST_OID ansiX962c2onb239v5[] = { ANSI_X962_GF2m_OID, 0x0f }; +-CONST_OID ansiX962c2pnb272w1[] = { ANSI_X962_GF2m_OID, 0x10 }; +-CONST_OID ansiX962c2pnb304w1[] = { ANSI_X962_GF2m_OID, 0x11 }; +-CONST_OID ansiX962c2tnb359v1[] = { ANSI_X962_GF2m_OID, 0x12 }; +-CONST_OID ansiX962c2pnb368w1[] = { ANSI_X962_GF2m_OID, 0x13 }; +-CONST_OID ansiX962c2tnb431r1[] = { ANSI_X962_GF2m_OID, 0x14 }; +- + #define OI(x) { siDEROID, (unsigned char *)x, sizeof x } + #ifndef SECOID_NO_STRINGS + #define OD(oid,tag,desc,mech,ext) { OI(oid), tag, desc, mech, ext } +@@ -154,30 +95,18 @@ + { { siDEROID, NULL, 0 }, ECCurve_noName, + "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION }, + +- OD( ansiX962prime192v1, ECCurve_NIST_P192, +- "ANSI X9.62 elliptic curve prime192v1 (aka secp192r1, NIST P-192)", +- CKM_INVALID_MECHANISM, +- INVALID_CERT_EXTENSION ), +- OD( ansiX962prime192v2, ECCurve_X9_62_PRIME_192V2, +- "ANSI X9.62 elliptic curve prime192v2", +- CKM_INVALID_MECHANISM, +- INVALID_CERT_EXTENSION ), +- OD( ansiX962prime192v3, ECCurve_X9_62_PRIME_192V3, +- "ANSI X9.62 elliptic curve prime192v3", +- CKM_INVALID_MECHANISM, +- INVALID_CERT_EXTENSION ), +- OD( ansiX962prime239v1, ECCurve_X9_62_PRIME_239V1, +- "ANSI X9.62 elliptic curve prime239v1", +- CKM_INVALID_MECHANISM, +- INVALID_CERT_EXTENSION ), +- OD( ansiX962prime239v2, ECCurve_X9_62_PRIME_239V2, +- "ANSI X9.62 elliptic curve prime239v2", +- CKM_INVALID_MECHANISM, +- INVALID_CERT_EXTENSION ), +- OD( ansiX962prime239v3, ECCurve_X9_62_PRIME_239V3, +- "ANSI X9.62 elliptic curve prime239v3", +- CKM_INVALID_MECHANISM, +- INVALID_CERT_EXTENSION ), ++ { { siDEROID, NULL, 0 }, ECCurve_noName, ++ "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION }, ++ { { siDEROID, NULL, 0 }, ECCurve_noName, ++ "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION }, ++ { { siDEROID, NULL, 0 }, ECCurve_noName, ++ "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION }, ++ { { siDEROID, NULL, 0 }, ECCurve_noName, ++ "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION }, ++ { { siDEROID, NULL, 0 }, ECCurve_noName, ++ "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION }, ++ { { siDEROID, NULL, 0 }, ECCurve_noName, ++ "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION }, + OD( ansiX962prime256v1, ECCurve_NIST_P256, + "ANSI X9.62 elliptic curve prime256v1 (aka secp256r1, NIST P-256)", + CKM_INVALID_MECHANISM, +@@ -188,46 +117,34 @@ + { { siDEROID, NULL, 0 }, ECCurve_noName, + "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION }, + +- OD( secgECsect163k1, ECCurve_NIST_K163, +- "SECG elliptic curve sect163k1 (aka NIST K-163)", +- CKM_INVALID_MECHANISM, +- INVALID_CERT_EXTENSION ), +- OD( secgECsect163r1, ECCurve_SECG_CHAR2_163R1, +- "SECG elliptic curve sect163r1", +- CKM_INVALID_MECHANISM, +- INVALID_CERT_EXTENSION ), +- OD( secgECsect239k1, ECCurve_SECG_CHAR2_239K1, +- "SECG elliptic curve sect239k1", +- CKM_INVALID_MECHANISM, +- INVALID_CERT_EXTENSION ), +- OD( secgECsect113r1, ECCurve_SECG_CHAR2_113R1, +- "SECG elliptic curve sect113r1", +- CKM_INVALID_MECHANISM, +- INVALID_CERT_EXTENSION ), +- OD( secgECsect113r2, ECCurve_SECG_CHAR2_113R2, +- "SECG elliptic curve sect113r2", +- CKM_INVALID_MECHANISM, +- INVALID_CERT_EXTENSION ), +- OD( secgECsecp112r1, ECCurve_SECG_PRIME_112R1, +- "SECG elliptic curve secp112r1", +- CKM_INVALID_MECHANISM, +- INVALID_CERT_EXTENSION ), +- OD( secgECsecp112r2, ECCurve_SECG_PRIME_112R2, +- "SECG elliptic curve secp112r2", +- CKM_INVALID_MECHANISM, +- INVALID_CERT_EXTENSION ), +- OD( secgECsecp160r1, ECCurve_SECG_PRIME_160R1, +- "SECG elliptic curve secp160r1", +- CKM_INVALID_MECHANISM, +- INVALID_CERT_EXTENSION ), +- OD( secgECsecp160k1, ECCurve_SECG_PRIME_160K1, +- "SECG elliptic curve secp160k1", +- CKM_INVALID_MECHANISM, +- INVALID_CERT_EXTENSION ), +- OD( secgECsecp256k1, ECCurve_SECG_PRIME_256K1, +- "SECG elliptic curve secp256k1", +- CKM_INVALID_MECHANISM, +- INVALID_CERT_EXTENSION ), ++ { { siDEROID, NULL, 0 }, ECCurve_noName, ++ "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION }, ++ { { siDEROID, NULL, 0 }, ECCurve_noName, ++ "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION }, ++ { { siDEROID, NULL, 0 }, ECCurve_noName, ++ "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION }, ++ { { siDEROID, NULL, 0 }, ECCurve_noName, ++ "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION }, ++ { { siDEROID, NULL, 0 }, ECCurve_noName, ++ "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION }, ++ { { siDEROID, NULL, 0 }, ECCurve_noName, ++ "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION }, ++ { { siDEROID, NULL, 0 }, ECCurve_noName, ++ "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION }, ++ { { siDEROID, NULL, 0 }, ECCurve_noName, ++ "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION }, ++ { { siDEROID, NULL, 0 }, ECCurve_noName, ++ "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION }, ++ { { siDEROID, NULL, 0 }, ECCurve_noName, ++ "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION }, ++ { { siDEROID, NULL, 0 }, ECCurve_noName, ++ "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION }, ++ { { siDEROID, NULL, 0 }, ECCurve_noName, ++ "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION }, ++ { { siDEROID, NULL, 0 }, ECCurve_noName, ++ "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION }, ++ { { siDEROID, NULL, 0 }, ECCurve_noName, ++ "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION }, + { { siDEROID, NULL, 0 }, ECCurve_noName, + "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION }, + { { siDEROID, NULL, 0 }, ECCurve_noName, +@@ -236,16 +153,42 @@ + "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION }, + { { siDEROID, NULL, 0 }, ECCurve_noName, + "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION }, +- OD( secgECsect163r2, ECCurve_NIST_B163, +- "SECG elliptic curve sect163r2 (aka NIST B-163)", ++ { { siDEROID, NULL, 0 }, ECCurve_noName, ++ "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION }, ++ { { siDEROID, NULL, 0 }, ECCurve_noName, ++ "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION }, ++ { { siDEROID, NULL, 0 }, ECCurve_noName, ++ "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION }, ++ { { siDEROID, NULL, 0 }, ECCurve_noName, ++ "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION }, ++ { { siDEROID, NULL, 0 }, ECCurve_noName, ++ "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION }, ++ { { siDEROID, NULL, 0 }, ECCurve_noName, ++ "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION }, ++ { { siDEROID, NULL, 0 }, ECCurve_noName, ++ "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION }, ++ { { siDEROID, NULL, 0 }, ECCurve_noName, ++ "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION }, ++ { { siDEROID, NULL, 0 }, ECCurve_noName, ++ "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION }, ++ { { siDEROID, NULL, 0 }, ECCurve_noName, ++ "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION }, ++ { { siDEROID, NULL, 0 }, ECCurve_noName, ++ "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION }, ++ { { siDEROID, NULL, 0 }, ECCurve_noName, ++ "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION }, ++ { { siDEROID, NULL, 0 }, ECCurve_noName, ++ "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION }, ++ { { siDEROID, NULL, 0 }, ECCurve_noName, ++ "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION }, ++ { { siDEROID, NULL, 0 }, ECCurve_noName, ++ "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION }, ++ OD( secgECsecp384r1, ECCurve_NIST_P384, ++ "SECG elliptic curve secp384r1 (aka NIST P-384)", + CKM_INVALID_MECHANISM, + INVALID_CERT_EXTENSION ), +- OD( secgECsect283k1, ECCurve_NIST_K283, +- "SECG elliptic curve sect283k1 (aka NIST K-283)", +- CKM_INVALID_MECHANISM, +- INVALID_CERT_EXTENSION ), +- OD( secgECsect283r1, ECCurve_NIST_B283, +- "SECG elliptic curve sect283r1 (aka NIST B-283)", ++ OD( secgECsecp521r1, ECCurve_NIST_P521, ++ "SECG elliptic curve secp521r1 (aka NIST P-521)", + CKM_INVALID_MECHANISM, + INVALID_CERT_EXTENSION ), + { { siDEROID, NULL, 0 }, ECCurve_noName, +@@ -255,79 +198,7 @@ + { { siDEROID, NULL, 0 }, ECCurve_noName, + "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION }, + { { siDEROID, NULL, 0 }, ECCurve_noName, +- "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION }, +- OD( secgECsect131r1, ECCurve_SECG_CHAR2_131R1, +- "SECG elliptic curve sect131r1", +- CKM_INVALID_MECHANISM, +- INVALID_CERT_EXTENSION ), +- OD( secgECsect131r2, ECCurve_SECG_CHAR2_131R2, +- "SECG elliptic curve sect131r2", +- CKM_INVALID_MECHANISM, +- INVALID_CERT_EXTENSION ), +- OD( secgECsect193r1, ECCurve_SECG_CHAR2_193R1, +- "SECG elliptic curve sect193r1", +- CKM_INVALID_MECHANISM, +- INVALID_CERT_EXTENSION ), +- OD( secgECsect193r2, ECCurve_SECG_CHAR2_193R2, +- "SECG elliptic curve sect193r2", +- CKM_INVALID_MECHANISM, +- INVALID_CERT_EXTENSION ), +- OD( secgECsect233k1, ECCurve_NIST_K233, +- "SECG elliptic curve sect233k1 (aka NIST K-233)", +- CKM_INVALID_MECHANISM, +- INVALID_CERT_EXTENSION ), +- OD( secgECsect233r1, ECCurve_NIST_B233, +- "SECG elliptic curve sect233r1 (aka NIST B-233)", +- CKM_INVALID_MECHANISM, +- INVALID_CERT_EXTENSION ), +- OD( secgECsecp128r1, ECCurve_SECG_PRIME_128R1, +- "SECG elliptic curve secp128r1", +- CKM_INVALID_MECHANISM, +- INVALID_CERT_EXTENSION ), +- OD( secgECsecp128r2, ECCurve_SECG_PRIME_128R2, +- "SECG elliptic curve secp128r2", +- CKM_INVALID_MECHANISM, +- INVALID_CERT_EXTENSION ), +- OD( secgECsecp160r2, ECCurve_SECG_PRIME_160R2, +- "SECG elliptic curve secp160r2", +- CKM_INVALID_MECHANISM, +- INVALID_CERT_EXTENSION ), +- OD( secgECsecp192k1, ECCurve_SECG_PRIME_192K1, +- "SECG elliptic curve secp192k1", +- CKM_INVALID_MECHANISM, +- INVALID_CERT_EXTENSION ), +- OD( secgECsecp224k1, ECCurve_SECG_PRIME_224K1, +- "SECG elliptic curve secp224k1", +- CKM_INVALID_MECHANISM, +- INVALID_CERT_EXTENSION ), +- OD( secgECsecp224r1, ECCurve_NIST_P224, +- "SECG elliptic curve secp224r1 (aka NIST P-224)", +- CKM_INVALID_MECHANISM, +- INVALID_CERT_EXTENSION ), +- OD( secgECsecp384r1, ECCurve_NIST_P384, +- "SECG elliptic curve secp384r1 (aka NIST P-384)", +- CKM_INVALID_MECHANISM, +- INVALID_CERT_EXTENSION ), +- OD( secgECsecp521r1, ECCurve_NIST_P521, +- "SECG elliptic curve secp521r1 (aka NIST P-521)", +- CKM_INVALID_MECHANISM, +- INVALID_CERT_EXTENSION ), +- OD( secgECsect409k1, ECCurve_NIST_K409, +- "SECG elliptic curve sect409k1 (aka NIST K-409)", +- CKM_INVALID_MECHANISM, +- INVALID_CERT_EXTENSION ), +- OD( secgECsect409r1, ECCurve_NIST_B409, +- "SECG elliptic curve sect409r1 (aka NIST B-409)", +- CKM_INVALID_MECHANISM, +- INVALID_CERT_EXTENSION ), +- OD( secgECsect571k1, ECCurve_NIST_K571, +- "SECG elliptic curve sect571k1 (aka NIST K-571)", +- CKM_INVALID_MECHANISM, +- INVALID_CERT_EXTENSION ), +- OD( secgECsect571r1, ECCurve_NIST_B571, +- "SECG elliptic curve sect571r1 (aka NIST B-571)", +- CKM_INVALID_MECHANISM, +- INVALID_CERT_EXTENSION ) ++ "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION } + }; + + static SECOidData ANSI_oids[] = { +@@ -335,78 +206,46 @@ + "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION }, + + /* ANSI X9.62 named elliptic curves (characteristic two field) */ +- OD( ansiX962c2pnb163v1, ECCurve_X9_62_CHAR2_PNB163V1, +- "ANSI X9.62 elliptic curve c2pnb163v1", +- CKM_INVALID_MECHANISM, +- INVALID_CERT_EXTENSION ), +- OD( ansiX962c2pnb163v2, ECCurve_X9_62_CHAR2_PNB163V2, +- "ANSI X9.62 elliptic curve c2pnb163v2", +- CKM_INVALID_MECHANISM, +- INVALID_CERT_EXTENSION ), +- OD( ansiX962c2pnb163v3, ECCurve_X9_62_CHAR2_PNB163V3, +- "ANSI X9.62 elliptic curve c2pnb163v3", +- CKM_INVALID_MECHANISM, +- INVALID_CERT_EXTENSION ), +- OD( ansiX962c2pnb176v1, ECCurve_X9_62_CHAR2_PNB176V1, +- "ANSI X9.62 elliptic curve c2pnb176v1", +- CKM_INVALID_MECHANISM, +- INVALID_CERT_EXTENSION ), +- OD( ansiX962c2tnb191v1, ECCurve_X9_62_CHAR2_TNB191V1, +- "ANSI X9.62 elliptic curve c2tnb191v1", +- CKM_INVALID_MECHANISM, +- INVALID_CERT_EXTENSION ), +- OD( ansiX962c2tnb191v2, ECCurve_X9_62_CHAR2_TNB191V2, +- "ANSI X9.62 elliptic curve c2tnb191v2", +- CKM_INVALID_MECHANISM, +- INVALID_CERT_EXTENSION ), +- OD( ansiX962c2tnb191v3, ECCurve_X9_62_CHAR2_TNB191V3, +- "ANSI X9.62 elliptic curve c2tnb191v3", +- CKM_INVALID_MECHANISM, +- INVALID_CERT_EXTENSION ), ++ { { siDEROID, NULL, 0 }, ECCurve_noName, ++ "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION }, ++ { { siDEROID, NULL, 0 }, ECCurve_noName, ++ "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION }, ++ { { siDEROID, NULL, 0 }, ECCurve_noName, ++ "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION }, ++ { { siDEROID, NULL, 0 }, ECCurve_noName, ++ "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION }, ++ { { siDEROID, NULL, 0 }, ECCurve_noName, ++ "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION }, ++ { { siDEROID, NULL, 0 }, ECCurve_noName, ++ "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION }, ++ { { siDEROID, NULL, 0 }, ECCurve_noName, ++ "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION }, ++ { { siDEROID, NULL, 0 }, ECCurve_noName, ++ "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION }, + { { siDEROID, NULL, 0 }, ECCurve_noName, + "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION }, + { { siDEROID, NULL, 0 }, ECCurve_noName, + "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION }, +- OD( ansiX962c2pnb208w1, ECCurve_X9_62_CHAR2_PNB208W1, +- "ANSI X9.62 elliptic curve c2pnb208w1", +- CKM_INVALID_MECHANISM, +- INVALID_CERT_EXTENSION ), +- OD( ansiX962c2tnb239v1, ECCurve_X9_62_CHAR2_TNB239V1, +- "ANSI X9.62 elliptic curve c2tnb239v1", +- CKM_INVALID_MECHANISM, +- INVALID_CERT_EXTENSION ), +- OD( ansiX962c2tnb239v2, ECCurve_X9_62_CHAR2_TNB239V2, +- "ANSI X9.62 elliptic curve c2tnb239v2", +- CKM_INVALID_MECHANISM, +- INVALID_CERT_EXTENSION ), +- OD( ansiX962c2tnb239v3, ECCurve_X9_62_CHAR2_TNB239V3, +- "ANSI X9.62 elliptic curve c2tnb239v3", +- CKM_INVALID_MECHANISM, +- INVALID_CERT_EXTENSION ), ++ { { siDEROID, NULL, 0 }, ECCurve_noName, ++ "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION }, ++ { { siDEROID, NULL, 0 }, ECCurve_noName, ++ "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION }, ++ { { siDEROID, NULL, 0 }, ECCurve_noName, ++ "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION }, + { { siDEROID, NULL, 0 }, ECCurve_noName, + "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION }, + { { siDEROID, NULL, 0 }, ECCurve_noName, + "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION }, +- OD( ansiX962c2pnb272w1, ECCurve_X9_62_CHAR2_PNB272W1, +- "ANSI X9.62 elliptic curve c2pnb272w1", +- CKM_INVALID_MECHANISM, +- INVALID_CERT_EXTENSION ), +- OD( ansiX962c2pnb304w1, ECCurve_X9_62_CHAR2_PNB304W1, +- "ANSI X9.62 elliptic curve c2pnb304w1", +- CKM_INVALID_MECHANISM, +- INVALID_CERT_EXTENSION ), +- OD( ansiX962c2tnb359v1, ECCurve_X9_62_CHAR2_TNB359V1, +- "ANSI X9.62 elliptic curve c2tnb359v1", +- CKM_INVALID_MECHANISM, +- INVALID_CERT_EXTENSION ), +- OD( ansiX962c2pnb368w1, ECCurve_X9_62_CHAR2_PNB368W1, +- "ANSI X9.62 elliptic curve c2pnb368w1", +- CKM_INVALID_MECHANISM, +- INVALID_CERT_EXTENSION ), +- OD( ansiX962c2tnb431r1, ECCurve_X9_62_CHAR2_TNB431R1, +- "ANSI X9.62 elliptic curve c2tnb431r1", +- CKM_INVALID_MECHANISM, +- INVALID_CERT_EXTENSION ) ++ { { siDEROID, NULL, 0 }, ECCurve_noName, ++ "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION }, ++ { { siDEROID, NULL, 0 }, ECCurve_noName, ++ "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION }, ++ { { siDEROID, NULL, 0 }, ECCurve_noName, ++ "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION }, ++ { { siDEROID, NULL, 0 }, ECCurve_noName, ++ "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION }, ++ { { siDEROID, NULL, 0 }, ECCurve_noName, ++ "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION } + }; + + SECOidData *