From 8e977b4e59fc7eb933692336687baf4b9c8b5de3 Mon Sep 17 00:00:00 2001 From: terrafrost Date: Mon, 3 Dec 2018 03:47:46 -0600 Subject: [PATCH] ECDSA: CS adjustments to curves --- phpseclib/Crypt/ECDSA/Curves/sect163r2.php | 4 ++-- phpseclib/Crypt/ECDSA/Curves/sect193r1.php | 4 ++-- phpseclib/Crypt/ECDSA/Curves/sect193r2.php | 4 ++-- phpseclib/Crypt/ECDSA/Curves/sect233k1.php | 4 ++-- phpseclib/Crypt/ECDSA/Curves/sect233r1.php | 4 ++-- phpseclib/Crypt/ECDSA/Curves/sect239k1.php | 4 ++-- phpseclib/Crypt/ECDSA/Curves/sect283k1.php | 4 ++-- phpseclib/Crypt/ECDSA/Curves/sect283r1.php | 4 ++-- phpseclib/Crypt/ECDSA/Curves/sect409k1.php | 4 ++-- phpseclib/Crypt/ECDSA/Curves/sect409r1.php | 4 ++-- phpseclib/Crypt/ECDSA/Curves/sect571k1.php | 6 +++--- phpseclib/Crypt/ECDSA/Curves/sect571r1.php | 6 +++--- 12 files changed, 26 insertions(+), 26 deletions(-) diff --git a/phpseclib/Crypt/ECDSA/Curves/sect163r2.php b/phpseclib/Crypt/ECDSA/Curves/sect163r2.php index 87ec5afc..39c1e0fc 100644 --- a/phpseclib/Crypt/ECDSA/Curves/sect163r2.php +++ b/phpseclib/Crypt/ECDSA/Curves/sect163r2.php @@ -26,11 +26,11 @@ class sect163r2 extends Binary $this->setCoefficients( '000000000000000000000000000000000000000001', '020A601907B8C953CA1481EB10512F78744A3205FD' - ); + ); $this->setBasePoint( '03F0EBA16286A2D57EA0991168D4994637E8343E36', '00D51FBC6C71A0094FA2CDD545B11C5C0C797324F1' ); $this->setOrder(new BigInteger('040000000000000000000292FE77E70C12A4234C33', 16)); } -} \ No newline at end of file +} diff --git a/phpseclib/Crypt/ECDSA/Curves/sect193r1.php b/phpseclib/Crypt/ECDSA/Curves/sect193r1.php index e424229c..6cacff14 100644 --- a/phpseclib/Crypt/ECDSA/Curves/sect193r1.php +++ b/phpseclib/Crypt/ECDSA/Curves/sect193r1.php @@ -26,11 +26,11 @@ class sect193r1 extends Binary $this->setCoefficients( '0017858FEB7A98975169E171F77B4087DE098AC8A911DF7B01', '00FDFB49BFE6C3A89FACADAA7A1E5BBC7CC1C2E5D831478814' - ); + ); $this->setBasePoint( '01F481BC5F0FF84A74AD6CDF6FDEF4BF6179625372D8C0C5E1', '0025E399F2903712CCF3EA9E3A1AD17FB0B3201B6AF7CE1B05' ); $this->setOrder(new BigInteger('01000000000000000000000000C7F34A778F443ACC920EBA49', 16)); } -} \ No newline at end of file +} diff --git a/phpseclib/Crypt/ECDSA/Curves/sect193r2.php b/phpseclib/Crypt/ECDSA/Curves/sect193r2.php index 334d86db..1a8181be 100644 --- a/phpseclib/Crypt/ECDSA/Curves/sect193r2.php +++ b/phpseclib/Crypt/ECDSA/Curves/sect193r2.php @@ -26,11 +26,11 @@ class sect193r2 extends Binary $this->setCoefficients( '0163F35A5137C2CE3EA6ED8667190B0BC43ECD69977702709B', '00C9BB9E8927D4D64C377E2AB2856A5B16E3EFB7F61D4316AE' - ); + ); $this->setBasePoint( '00D9B67D192E0367C803F39E1A7E82CA14A651350AAE617E8F', '01CE94335607C304AC29E7DEFBD9CA01F596F927224CDECF6C' ); $this->setOrder(new BigInteger('010000000000000000000000015AAB561B005413CCD4EE99D5', 16)); } -} \ No newline at end of file +} diff --git a/phpseclib/Crypt/ECDSA/Curves/sect233k1.php b/phpseclib/Crypt/ECDSA/Curves/sect233k1.php index 1e171f46..7e98e1c4 100644 --- a/phpseclib/Crypt/ECDSA/Curves/sect233k1.php +++ b/phpseclib/Crypt/ECDSA/Curves/sect233k1.php @@ -26,11 +26,11 @@ class sect233k1 extends Binary $this->setCoefficients( '000000000000000000000000000000000000000000000000000000000000', '000000000000000000000000000000000000000000000000000000000001' - ); + ); $this->setBasePoint( '017232BA853A7E731AF129F22FF4149563A419C26BF50A4C9D6EEFAD6126', '01DB537DECE819B7F70F555A67C427A8CD9BF18AEB9B56E0C11056FAE6A3' ); $this->setOrder(new BigInteger('8000000000000000000000000000069D5BB915BCD46EFB1AD5F173ABDF', 16)); } -} \ No newline at end of file +} diff --git a/phpseclib/Crypt/ECDSA/Curves/sect233r1.php b/phpseclib/Crypt/ECDSA/Curves/sect233r1.php index 066e7865..38c76e2e 100644 --- a/phpseclib/Crypt/ECDSA/Curves/sect233r1.php +++ b/phpseclib/Crypt/ECDSA/Curves/sect233r1.php @@ -26,11 +26,11 @@ class sect233r1 extends Binary $this->setCoefficients( '000000000000000000000000000000000000000000000000000000000001', '0066647EDE6C332C7F8C0923BB58213B333B20E9CE4281FE115F7D8F90AD' - ); + ); $this->setBasePoint( '00FAC9DFCBAC8313BB2139F1BB755FEF65BC391F8B36F8F8EB7371FD558B', '01006A08A41903350678E58528BEBF8A0BEFF867A7CA36716F7E01F81052' ); $this->setOrder(new BigInteger('01000000000000000000000000000013E974E72F8A6922031D2603CFE0D7', 16)); } -} \ No newline at end of file +} diff --git a/phpseclib/Crypt/ECDSA/Curves/sect239k1.php b/phpseclib/Crypt/ECDSA/Curves/sect239k1.php index 92e00f6a..82fd47ae 100644 --- a/phpseclib/Crypt/ECDSA/Curves/sect239k1.php +++ b/phpseclib/Crypt/ECDSA/Curves/sect239k1.php @@ -26,11 +26,11 @@ class sect239k1 extends Binary $this->setCoefficients( '000000000000000000000000000000000000000000000000000000000000', '000000000000000000000000000000000000000000000000000000000001' - ); + ); $this->setBasePoint( '29A0B6A887A983E9730988A68727A8B2D126C44CC2CC7B2A6555193035DC', '76310804F12E549BDB011C103089E73510ACB275FC312A5DC6B76553F0CA' ); $this->setOrder(new BigInteger('2000000000000000000000000000005A79FEC67CB6E91F1C1DA800E478A5', 16)); } -} \ No newline at end of file +} diff --git a/phpseclib/Crypt/ECDSA/Curves/sect283k1.php b/phpseclib/Crypt/ECDSA/Curves/sect283k1.php index b4408009..6b4b7c88 100644 --- a/phpseclib/Crypt/ECDSA/Curves/sect283k1.php +++ b/phpseclib/Crypt/ECDSA/Curves/sect283k1.php @@ -26,11 +26,11 @@ class sect283k1 extends Binary $this->setCoefficients( '000000000000000000000000000000000000000000000000000000000000000000000000', '000000000000000000000000000000000000000000000000000000000000000000000001' - ); + ); $this->setBasePoint( '0503213F78CA44883F1A3B8162F188E553CD265F23C1567A16876913B0C2AC2458492836', '01CCDA380F1C9E318D90F95D07E5426FE87E45C0E8184698E45962364E34116177DD2259' ); $this->setOrder(new BigInteger('01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE9AE2ED07577265DFF7F94451E061E163C61', 16)); } -} \ No newline at end of file +} diff --git a/phpseclib/Crypt/ECDSA/Curves/sect283r1.php b/phpseclib/Crypt/ECDSA/Curves/sect283r1.php index 090a6401..65cd968b 100644 --- a/phpseclib/Crypt/ECDSA/Curves/sect283r1.php +++ b/phpseclib/Crypt/ECDSA/Curves/sect283r1.php @@ -26,11 +26,11 @@ class sect283r1 extends Binary $this->setCoefficients( '000000000000000000000000000000000000000000000000000000000000000000000001', '027B680AC8B8596DA5A4AF8A19A0303FCA97FD7645309FA2A581485AF6263E313B79A2F5' - ); + ); $this->setBasePoint( '05F939258DB7DD90E1934F8C70B0DFEC2EED25B8557EAC9C80E2E198F8CDBECD86B12053', '03676854FE24141CB98FE6D4B20D02B4516FF702350EDDB0826779C813F0DF45BE8112F4' ); $this->setOrder(new BigInteger('03FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEF90399660FC938A90165B042A7CEFADB307', 16)); } -} \ No newline at end of file +} diff --git a/phpseclib/Crypt/ECDSA/Curves/sect409k1.php b/phpseclib/Crypt/ECDSA/Curves/sect409k1.php index bdc779c9..6432e627 100644 --- a/phpseclib/Crypt/ECDSA/Curves/sect409k1.php +++ b/phpseclib/Crypt/ECDSA/Curves/sect409k1.php @@ -26,7 +26,7 @@ class sect409k1 extends Binary $this->setCoefficients( '00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000', '00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001' - ); + ); $this->setBasePoint( '0060F05F658F49C1AD3AB1890F7184210EFD0987E307C84C27ACCFB8F9F67CC2C460189EB5AAAA62EE222EB1B35540CFE9023746', '01E369050B7C4E42ACBA1DACBF04299C3460782F918EA427E6325165E9EA10E3DA5F6C42E9C55215AA9CA27A5863EC48D8E0286B' @@ -36,4 +36,4 @@ class sect409k1 extends Binary '83B2D4EA20400EC4557D5ED3E3E7CA5B4B5C83B8E01E5FCF', 16 )); } -} \ No newline at end of file +} diff --git a/phpseclib/Crypt/ECDSA/Curves/sect409r1.php b/phpseclib/Crypt/ECDSA/Curves/sect409r1.php index 86f5999d..641b4ae6 100644 --- a/phpseclib/Crypt/ECDSA/Curves/sect409r1.php +++ b/phpseclib/Crypt/ECDSA/Curves/sect409r1.php @@ -26,7 +26,7 @@ class sect409r1 extends Binary $this->setCoefficients( '00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001', '0021A5C2C8EE9FEB5C4B9A753B7B476B7FD6422EF1F3DD674761FA99D6AC27C8A9A197B272822F6CD57A55AA4F50AE317B13545F' - ); + ); $this->setBasePoint( '015D4860D088DDB3496B0C6064756260441CDE4AF1771D4DB01FFE5B34E59703DC255A868A1180515603AEAB60794E54BB7996A7', '0061B1CFAB6BE5F32BBFA78324ED106A7636B9C5A7BD198D0158AA4F5488D08F38514F1FDF4B4F40D2181B3681C364BA0273C706' @@ -36,4 +36,4 @@ class sect409r1 extends Binary 'AAD6A612F33307BE5FA47C3C9E052F838164CD37D9A21173', 16 )); } -} \ No newline at end of file +} diff --git a/phpseclib/Crypt/ECDSA/Curves/sect571k1.php b/phpseclib/Crypt/ECDSA/Curves/sect571k1.php index 77a112c0..8ba5f93e 100644 --- a/phpseclib/Crypt/ECDSA/Curves/sect571k1.php +++ b/phpseclib/Crypt/ECDSA/Curves/sect571k1.php @@ -28,7 +28,7 @@ class sect571k1 extends Binary '000000000000000000000000000000000000000000000000000000000000000000000000', '000000000000000000000000000000000000000000000000000000000000000000000000' . '000000000000000000000000000000000000000000000000000000000000000000000001' - ); + ); $this->setBasePoint( '026EB7A859923FBC82189631F8103FE4AC9CA2970012D5D46024804801841CA443709584' . '93B205E647DA304DB4CEB08CBBD1BA39494776FB988B47174DCA88C7E2945283A01C8972', @@ -37,7 +37,7 @@ class sect571k1 extends Binary ); $this->setOrder(new BigInteger( '020000000000000000000000000000000000000000000000000000000000000000000000' . - '131850E1F19A63E4B391A8DB917F4138B630D84BE5D639381E91DEB45CFE778F637C1001 ', 16 + '131850E1F19A63E4B391A8DB917F4138B630D84BE5D639381E91DEB45CFE778F637C1001', 16 )); } -} \ No newline at end of file +} diff --git a/phpseclib/Crypt/ECDSA/Curves/sect571r1.php b/phpseclib/Crypt/ECDSA/Curves/sect571r1.php index 020d4d77..a99e000a 100644 --- a/phpseclib/Crypt/ECDSA/Curves/sect571r1.php +++ b/phpseclib/Crypt/ECDSA/Curves/sect571r1.php @@ -28,7 +28,7 @@ class sect571r1 extends Binary '000000000000000000000000000000000000000000000000000000000000000000000001', '02F40E7E2221F295DE297117B7F3D62F5C6A97FFCB8CEFF1CD6BA8CE4A9A18AD84FFABBD' . '8EFA59332BE7AD6756A66E294AFD185A78FF12AA520E4DE739BACA0C7FFEFF7F2955727A' - ); + ); $this->setBasePoint( '0303001D34B856296C16C0D40D3CD7750A93D1D2955FA80AA5F40FC8DB7B2ABDBDE53950' . 'F4C0D293CDD711A35B67FB1499AE60038614F1394ABFA3B4C850D927E1E7769C8EEC2D19', @@ -37,7 +37,7 @@ class sect571r1 extends Binary ); $this->setOrder(new BigInteger( '03FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF' . - 'E661CE18FF55987308059B186823851EC7DD9CA1161DE93D5174D66E8382E9BB2FE84E47 ', 16 + 'E661CE18FF55987308059B186823851EC7DD9CA1161DE93D5174D66E8382E9BB2FE84E47', 16 )); } -} \ No newline at end of file +}