/hg/icedtea: PR2126: Synchronise elliptic curves in sun.security...
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Thu Jul 16 16:16:22 UTC 2015
changeset 8d2c9a898f50 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=8d2c9a898f50
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu Jul 16 17:16:09 2015 +0100
PR2126: Synchronise elliptic curves in sun.security.ec.NamedCurve with those listed by NSS
2014-12-05 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR2126: Synchronise elliptic curves in
sun.security.ec.NamedCurve with those listed by NSS
* fsg.sh: Moved to...
* Makefile.am:
(EXTRA_DIST): Remove fsg.sh, now generated
by configure.
(sanitise-openjdk): Fix path to new generated
fsg.sh and mark as executable
* NEWS: Updated.
* configure.ac: Add fsg.sh to AC_CONFIG_FILES.
* fsg.sh.in: ... here and added application
of PR2126 patch.
* patches/pr2126.patch: Patch to remove curves
unsupported by NSS.
diffstat:
ChangeLog | 17 +
Makefile.am | 5 +-
NEWS | 1 +
configure.ac | 2 +-
fsg.sh | 113 -----------
fsg.sh.in | 116 ++++++++++++
patches/pr2126.patch | 486 +++++++++++++++++++++++++++++++++++++++++++++++++++
7 files changed, 624 insertions(+), 116 deletions(-)
diffs (truncated from 796 to 500 lines):
diff -r 377344362073 -r 8d2c9a898f50 ChangeLog
--- a/ChangeLog Thu Jun 25 02:00:15 2015 +0100
+++ b/ChangeLog Thu Jul 16 17:16:09 2015 +0100
@@ -1,3 +1,20 @@
+2014-12-05 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR2126: Synchronise elliptic curves in
+ sun.security.ec.NamedCurve with those listed by NSS
+ * fsg.sh: Moved to...
+ * Makefile.am:
+ (EXTRA_DIST): Remove fsg.sh, now generated
+ by configure.
+ (sanitise-openjdk): Fix path to new generated
+ fsg.sh and mark as executable
+ * NEWS: Updated.
+ * configure.ac: Add fsg.sh to AC_CONFIG_FILES.
+ * fsg.sh.in: ... here and added application
+ of PR2126 patch.
+ * patches/pr2126.patch: Patch to remove curves
+ unsupported by NSS.
+
2015-06-24 Andrew John Hughes <gnu_andrew at member.fsf.org>
* Makefile.am:
diff -r 377344362073 -r 8d2c9a898f50 Makefile.am
--- a/Makefile.am Thu Jun 25 02:00:15 2015 +0100
+++ b/Makefile.am Thu Jul 16 17:16:09 2015 +0100
@@ -574,7 +574,7 @@
$(top_srcdir)/patches/jamvm/*.patch \
tools-copy contrib overlays \
$(JTREG_SRCS) $(DESKTOP_FILES) HACKING \
- $(PULSEAUDIO_SRCS) fsg.sh autogen.sh \
+ $(PULSEAUDIO_SRCS) autogen.sh \
tapset/hotspot.stp.in \
tapset/hotspot_jni.stp.in \
tapset/jstack.stp.in \
@@ -1128,7 +1128,8 @@
stamps/sanitise-openjdk.stamp: stamps/extract-openjdk.stamp \
stamps/extract-hotspot.stamp stamps/extract-nashorn.stamp
chmod -R ug+w openjdk
- sh $(srcdir)/fsg.sh
+ chmod +x $(builddir)/fsg.sh
+ sh $(builddir)/fsg.sh
touch stamps/sanitise-openjdk.stamp
clean-sanitise-openjdk:
diff -r 377344362073 -r 8d2c9a898f50 NEWS
--- a/NEWS Thu Jun 25 02:00:15 2015 +0100
+++ b/NEWS Thu Jul 16 17:16:09 2015 +0100
@@ -81,6 +81,7 @@
- PR1994: make dist broken
- PR2001: Synchronise HEAD tarball paths with release branch paths
- PR2095, RH1163501: 2048-bit DH upper bound too small for Fedora infrastructure
+ - PR2126: Synchronise elliptic curves in sun.security.ec.NamedCurve with those listed by NSS
- PR2199: Support giflib 5.1.0
- PR2212: DGifCloseFile call should check the return value, not the error code, for failure
- PR2227: giflib 5.1 conditional excludes 6.0, 7.0, etc.
diff -r 377344362073 -r 8d2c9a898f50 configure.ac
--- a/configure.ac Thu Jun 25 02:00:15 2015 +0100
+++ b/configure.ac Thu Jul 16 17:16:09 2015 +0100
@@ -13,7 +13,7 @@
AC_SUBST(abs_top_srcdir)
IT_DETERMINE_VERSION
-AC_CONFIG_FILES([hotspot.map])
+AC_CONFIG_FILES([hotspot.map fsg.sh])
AC_CANONICAL_HOST
diff -r 377344362073 -r 8d2c9a898f50 fsg.sh
--- a/fsg.sh Thu Jun 25 02:00:15 2015 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,113 +0,0 @@
-#!/bin/sh
-
-echo "Further liberating OpenJDK..."
-
-# PRx denotes bug x in the IcedTea bug database (http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=x)
-# Sx denotes bug x in the Sun bug database (http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=x)
-
-# PR146/S6713083
-# Remove binaries
-rm -vf \
- openjdk/jdk/test/sun/management/windows/revokeall.exe \
- openjdk/jdk/test/sun/management/jmxremote/bootstrap/linux-i586/launcher \
- openjdk/jdk/test/sun/management/jmxremote/bootstrap/solaris-sparc/launcher \
- openjdk/jdk/test/sun/management/jmxremote/bootstrap/solaris-i586/launcher
-
-rm -vf \
- openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/linux-i586/libLauncher.so \
- openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-i586/libLauncher.so \
- openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparc/libLauncher.so \
- openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparcv9/libLauncher.so \
- openjdk/jdk/test/tools/launcher/lib/i386/lib32/lib32/liblibrary.so \
- openjdk/jdk/test/tools/launcher/lib/i386/lib32/liblibrary.so \
- openjdk/jdk/test/tools/launcher/lib/sparc/lib32/lib32/liblibrary.so \
- openjdk/jdk/test/tools/launcher/lib/sparc/lib32/liblibrary.so \
- openjdk/jdk/test/tools/launcher/lib/sparc/lib64/lib64/liblibrary.so \
- openjdk/jdk/test/tools/launcher/lib/sparc/lib64/liblibrary.so
-
-rm -vf \
- openjdk/jdk/test/java/util/Locale/data/deflocale.exe \
- openjdk/jdk/test/java/util/Locale/data/deflocale.jds3 \
- openjdk/jdk/test/java/util/Locale/data/deflocale.rhel4 \
- openjdk/jdk/test/java/util/Locale/data/deflocale.sh \
- openjdk/jdk/test/java/util/Locale/data/deflocale.sol10 \
- openjdk/jdk/test/java/util/Locale/data/deflocale.winvista \
- openjdk/jdk/test/java/util/Locale/data/deflocale.winxp \
-
-# Remove test sources with questionable license headers.
-rm -vf \
- openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3.java \
- openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_IE.java \
- openjdk/jdk/test/java/util/ResourceBundle/Bug4165815Test.java \
- openjdk/jdk/test/java/util/ResourceBundle/Bug4177489_Resource_jf.java \
- openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_CA.java \
- openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Getter.java \
- openjdk/jdk/test/java/util/ResourceBundle/Bug4177489Test.java \
- openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource.java \
- openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource2.java \
- openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_US.java \
- openjdk/jdk/test/java/util/ResourceBundle/Bug4083270Test.java \
- openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en.java \
- openjdk/jdk/test/java/util/ResourceBundle/Bug4177489_Resource.java \
- openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Test.java \
- openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource2_en_US.java \
- openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Class.java \
- openjdk/jdk/test/java/util/Locale/Bug4175998Test.java \
- openjdk/jdk/test/java/util/ResourceBundle/RBTestFmwk.java \
- openjdk/jdk/test/java/util/ResourceBundle/TestResource_fr.java \
- openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Resource.java \
- openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Getter.java \
- openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Class.java \
- openjdk/jdk/test/java/util/ResourceBundle/TestResource.java \
- openjdk/jdk/test/java/util/ResourceBundle/FakeTestResource.java \
- openjdk/jdk/test/java/util/ResourceBundle/TestResource_de.java \
- openjdk/jdk/test/java/util/ResourceBundle/TestBug4179766.java \
- openjdk/jdk/test/java/util/ResourceBundle/TestResource_fr_CH.java \
- openjdk/jdk/test/java/util/ResourceBundle/ResourceBundleTest.java \
- openjdk/jdk/test/java/util/ResourceBundle/TestResource_it.java \
- openjdk/jdk/test/java/util/Locale/PrintDefaultLocale.java \
- openjdk/jdk/test/java/util/Locale/LocaleTest.java \
- openjdk/jdk/test/java/util/Locale/LocaleTestFmwk.java \
- openjdk/jdk/test/java/util/Locale/Bug4184873Test.java \
- openjdk/jdk/test/sun/text/resources/LocaleDataTest.java
-
-# Remove J2DBench sources, some of which have questionable license
-# headers.
-rm -rvf \
- openjdk/jdk/src/share/demo/java2d/J2DBench
-
-# BEGIN Debian/Ubuntu additions
-
-# binary files
-rm -vf \
- openjdk/jdk/test/sun/net/idn/nfscis.spp
-
-# TODO
-#$ find openjdk -name '*.jar' -o -name '*.class'|grep -v test
-
-# PR140, S6695776
-# Also see patches/icedtea-jscheme.patch
-rm -rvf openjdk/corba/src/share/classes/com/sun/tools/corba/se/logutil/lib
-rm -rvf openjdk/corba/src/share/classes/com/sun/tools/corba/se/logutil/scripts
-
-# PR139, S6710791
-rm -vf \
- openjdk/hotspot/agent/kk/src/share/lib/maf-1_0.jar \
- openjdk/hotspot/agent/kk/src/share/lib/jlfgr-1_0.jar \
-
-# END Debian/Ubuntu additions
-
-echo "Removing support for proprietary SNMP plug"
-rm -rvf openjdk/jdk/src/share/classes/sun/management/snmp
-rm -rvf openjdk/jdk/src/share/classes/com/sun/jmx/snmp
-rm -rvf openjdk/jdk/test/com/sun/jmx/snmp
-
-echo "Removing registration tests"
-rm -rvf openjdk/jdk/test/com/sun/servicetag
-
-echo "Removing EC source code we don't build"
-rm -vf openjdk/jdk/src/share/classes/sun/security/ec/ECDHKeyAgreement.java
-rm -vf openjdk/jdk/src/share/classes/sun/security/ec/ECDSASignature.java
-rm -vf openjdk/jdk/src/share/classes/sun/security/ec/ECKeyPairGenerator.java
-rm -rvf openjdk/jdk/src/share/native/sun/security/ec
-rm -rvf openjdk/jdk/make/sun/security/ec
diff -r 377344362073 -r 8d2c9a898f50 fsg.sh.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/fsg.sh.in Thu Jul 16 17:16:09 2015 +0100
@@ -0,0 +1,116 @@
+#!/bin/sh
+
+echo "Further liberating OpenJDK..."
+
+# PRx denotes bug x in the IcedTea bug database (http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=x)
+# Sx denotes bug x in the Sun bug database (http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=x)
+
+# PR146/S6713083
+# Remove binaries
+rm -vf \
+ openjdk/jdk/test/sun/management/windows/revokeall.exe \
+ openjdk/jdk/test/sun/management/jmxremote/bootstrap/linux-i586/launcher \
+ openjdk/jdk/test/sun/management/jmxremote/bootstrap/solaris-sparc/launcher \
+ openjdk/jdk/test/sun/management/jmxremote/bootstrap/solaris-i586/launcher
+
+rm -vf \
+ openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/linux-i586/libLauncher.so \
+ openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-i586/libLauncher.so \
+ openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparc/libLauncher.so \
+ openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparcv9/libLauncher.so \
+ openjdk/jdk/test/tools/launcher/lib/i386/lib32/lib32/liblibrary.so \
+ openjdk/jdk/test/tools/launcher/lib/i386/lib32/liblibrary.so \
+ openjdk/jdk/test/tools/launcher/lib/sparc/lib32/lib32/liblibrary.so \
+ openjdk/jdk/test/tools/launcher/lib/sparc/lib32/liblibrary.so \
+ openjdk/jdk/test/tools/launcher/lib/sparc/lib64/lib64/liblibrary.so \
+ openjdk/jdk/test/tools/launcher/lib/sparc/lib64/liblibrary.so
+
+rm -vf \
+ openjdk/jdk/test/java/util/Locale/data/deflocale.exe \
+ openjdk/jdk/test/java/util/Locale/data/deflocale.jds3 \
+ openjdk/jdk/test/java/util/Locale/data/deflocale.rhel4 \
+ openjdk/jdk/test/java/util/Locale/data/deflocale.sh \
+ openjdk/jdk/test/java/util/Locale/data/deflocale.sol10 \
+ openjdk/jdk/test/java/util/Locale/data/deflocale.winvista \
+ openjdk/jdk/test/java/util/Locale/data/deflocale.winxp \
+
+# Remove test sources with questionable license headers.
+rm -vf \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_IE.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4165815Test.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4177489_Resource_jf.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_CA.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Getter.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4177489Test.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource2.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_US.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4083270Test.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4177489_Resource.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Test.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource2_en_US.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Class.java \
+ openjdk/jdk/test/java/util/Locale/Bug4175998Test.java \
+ openjdk/jdk/test/java/util/ResourceBundle/RBTestFmwk.java \
+ openjdk/jdk/test/java/util/ResourceBundle/TestResource_fr.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Resource.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Getter.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Class.java \
+ openjdk/jdk/test/java/util/ResourceBundle/TestResource.java \
+ openjdk/jdk/test/java/util/ResourceBundle/FakeTestResource.java \
+ openjdk/jdk/test/java/util/ResourceBundle/TestResource_de.java \
+ openjdk/jdk/test/java/util/ResourceBundle/TestBug4179766.java \
+ openjdk/jdk/test/java/util/ResourceBundle/TestResource_fr_CH.java \
+ openjdk/jdk/test/java/util/ResourceBundle/ResourceBundleTest.java \
+ openjdk/jdk/test/java/util/ResourceBundle/TestResource_it.java \
+ openjdk/jdk/test/java/util/Locale/PrintDefaultLocale.java \
+ openjdk/jdk/test/java/util/Locale/LocaleTest.java \
+ openjdk/jdk/test/java/util/Locale/LocaleTestFmwk.java \
+ openjdk/jdk/test/java/util/Locale/Bug4184873Test.java \
+ openjdk/jdk/test/sun/text/resources/LocaleDataTest.java
+
+# Remove J2DBench sources, some of which have questionable license
+# headers.
+rm -rvf \
+ openjdk/jdk/src/share/demo/java2d/J2DBench
+
+# BEGIN Debian/Ubuntu additions
+
+# binary files
+rm -vf \
+ openjdk/jdk/test/sun/net/idn/nfscis.spp
+
+# TODO
+#$ find openjdk -name '*.jar' -o -name '*.class'|grep -v test
+
+# PR140, S6695776
+# Also see patches/icedtea-jscheme.patch
+rm -rvf openjdk/corba/src/share/classes/com/sun/tools/corba/se/logutil/lib
+rm -rvf openjdk/corba/src/share/classes/com/sun/tools/corba/se/logutil/scripts
+
+# PR139, S6710791
+rm -vf \
+ openjdk/hotspot/agent/kk/src/share/lib/maf-1_0.jar \
+ openjdk/hotspot/agent/kk/src/share/lib/jlfgr-1_0.jar \
+
+# END Debian/Ubuntu additions
+
+echo "Removing support for proprietary SNMP plug"
+rm -rvf openjdk/jdk/src/share/classes/sun/management/snmp
+rm -rvf openjdk/jdk/src/share/classes/com/sun/jmx/snmp
+rm -rvf openjdk/jdk/test/com/sun/jmx/snmp
+
+echo "Removing registration tests"
+rm -rvf openjdk/jdk/test/com/sun/servicetag
+
+echo "Removing EC source code we don't build"
+rm -vf openjdk/jdk/src/share/classes/sun/security/ec/ECDHKeyAgreement.java
+rm -vf openjdk/jdk/src/share/classes/sun/security/ec/ECDSASignature.java
+rm -vf openjdk/jdk/src/share/classes/sun/security/ec/ECKeyPairGenerator.java
+rm -rvf openjdk/jdk/src/share/native/sun/security/ec
+rm -rvf openjdk/jdk/make/sun/security/ec
+
+echo "Syncing EC list with NSS"
+patch -Np0 < @abs_top_srcdir@/patches/pr2126.patch
diff -r 377344362073 -r 8d2c9a898f50 patches/pr2126.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/pr2126.patch Thu Jul 16 17:16:09 2015 +0100
@@ -0,0 +1,486 @@
+diff -r 135101850ef1 src/share/classes/sun/security/ec/CurveDB.java
+--- openjdk/jdk/src/share/classes/sun/security/ec/CurveDB.java Wed Jun 03 20:23:19 2015 -0700
++++ openjdk/jdk/src/share/classes/sun/security/ec/CurveDB.java Thu Jul 02 01:29:07 2015 +0100
+@@ -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,367 +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",
More information about the distro-pkg-dev
mailing list