summaryrefslogtreecommitdiff
path: root/lib/Crypt/PK/ECC.pm
diff options
context:
space:
mode:
Diffstat (limited to 'lib/Crypt/PK/ECC.pm')
-rw-r--r--lib/Crypt/PK/ECC.pm707
1 files changed, 236 insertions, 471 deletions
diff --git a/lib/Crypt/PK/ECC.pm b/lib/Crypt/PK/ECC.pm
index 28d83589..9e2d06ab 100644
--- a/lib/Crypt/PK/ECC.pm
+++ b/lib/Crypt/PK/ECC.pm
@@ -2,7 +2,7 @@ package Crypt::PK::ECC;
use strict;
use warnings;
-our $VERSION = '0.056';
+our $VERSION = '0.059';
require Exporter; our @ISA = qw(Exporter); ### use Exporter 'import';
our %EXPORT_TAGS = ( all => [qw( ecc_encrypt ecc_decrypt ecc_sign_message ecc_verify_message ecc_sign_hash ecc_verify_hash ecc_shared_secret )] );
@@ -10,429 +10,177 @@ our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
our @EXPORT = qw();
use Carp;
+$Carp::Internal{(__PACKAGE__)}++;
use CryptX;
use Crypt::Digest qw(digest_data digest_data_b64u);
use Crypt::Misc qw(read_rawfile encode_b64u decode_b64u encode_b64 decode_b64 pem_to_der der_to_pem);
use Crypt::PK;
our %curve = (
- ### http://www.ecc-brainpool.org/download/Domain-parameters.pdf (v1.0 19.10.2005)
- brainpoolp160r1 => {
- oid => '1.3.36.3.3.2.8.1.1.1',
- prime => "E95E4A5F737059DC60DFC7AD95B3D8139515620F",
- A => "340E7BE2A280EB74E2BE61BADA745D97E8F7C300",
- B => "1E589A8595423412134FAA2DBDEC95C8D8675E58",
- Gx => "BED5AF16EA3F6A4F62938C4631EB5AF7BDBCDBC3",
- Gy => "1667CB477A1A8EC338F94741669C976316DA6321",
- order => "E95E4A5F737059DC60DF5991D45029409E60FC09",
- cofactor => 1,
+ # extra curves not recognized by libtomcrypt
+ 'wap-wsg-idm-ecid-wtls8' => {
+ prime => "FFFFFFFFFFFFFFFFFFFFFFFFFDE7",
+ A => "0000000000000000000000000000",
+ B => "0000000000000000000000000003",
+ order => "0100000000000001ECEA551AD837E9",
+ Gx => "0000000000000000000000000001",
+ Gy => "0000000000000000000000000002",
+ cofactor => 1,
+ oid => '2.23.43.1.4.8',
},
- brainpoolp192r1 => {
- oid => '1.3.36.3.3.2.8.1.1.3',
- prime => "C302F41D932A36CDA7A3463093D18DB78FCE476DE1A86297",
- A => "6A91174076B1E0E19C39C031FE8685C1CAE040E5C69A28EF",
- B => "469A28EF7C28CCA3DC721D044F4496BCCA7EF4146FBF25C9",
- Gx => "C0A0647EAAB6A48753B033C56CB0F0900A2F5C4853375FD6",
- Gy => "14B690866ABD5BB88B5F4828C1490002E6773FA2FA299B8F",
- order => "C302F41D932A36CDA7A3462F9E9E916B5BE8F1029AC4ACC1",
- cofactor => 1,
- },
- brainpoolp224r1 => {
- oid => '1.3.36.3.3.2.8.1.1.5',
- prime => "D7C134AA264366862A18302575D1D787B09F075797DA89F57EC8C0FF",
- A => "68A5E62CA9CE6C1C299803A6C1530B514E182AD8B0042A59CAD29F43",
- B => "2580F63CCFE44138870713B1A92369E33E2135D266DBB372386C400B",
- Gx => "0D9029AD2C7E5CF4340823B2A87DC68C9E4CE3174C1E6EFDEE12C07D",
- Gy => "58AA56F772C0726F24C6B89E4ECDAC24354B9E99CAA3F6D3761402CD",
- order => "D7C134AA264366862A18302575D0FB98D116BC4B6DDEBCA3A5A7939F",
- cofactor => 1,
- },
- brainpoolp256r1 => {
- oid => '1.3.36.3.3.2.8.1.1.7',
- prime => "A9FB57DBA1EEA9BC3E660A909D838D726E3BF623D52620282013481D1F6E5377",
- A => "7D5A0975FC2C3057EEF67530417AFFE7FB8055C126DC5C6CE94A4B44F330B5D9",
- B => "26DC5C6CE94A4B44F330B5D9BBD77CBF958416295CF7E1CE6BCCDC18FF8C07B6",
- Gx => "8BD2AEB9CB7E57CB2C4B482FFC81B7AFB9DE27E1E3BD23C23A4453BD9ACE3262",
- Gy => "547EF835C3DAC4FD97F8461A14611DC9C27745132DED8E545C1D54C72F046997",
- order => "A9FB57DBA1EEA9BC3E660A909D838D718C397AA3B561A6F7901E0E82974856A7",
- cofactor => 1,
- },
- brainpoolp320r1 => {
- oid => '1.3.36.3.3.2.8.1.1.9',
- prime => "D35E472036BC4FB7E13C785ED201E065F98FCFA6F6F40DEF4F92B9EC7893EC28FCD412B1F1B32E27",
- A => "3EE30B568FBAB0F883CCEBD46D3F3BB8A2A73513F5EB79DA66190EB085FFA9F492F375A97D860EB4",
- B => "520883949DFDBC42D3AD198640688A6FE13F41349554B49ACC31DCCD884539816F5EB4AC8FB1F1A6",
- Gx => "43BD7E9AFB53D8B85289BCC48EE5BFE6F20137D10A087EB6E7871E2A10A599C710AF8D0D39E20611",
- Gy => "14FDD05545EC1CC8AB4093247F77275E0743FFED117182EAA9C77877AAAC6AC7D35245D1692E8EE1",
- order => "D35E472036BC4FB7E13C785ED201E065F98FCFA5B68F12A32D482EC7EE8658E98691555B44C59311",
- cofactor => 1,
- },
- brainpoolp384r1 => {
- oid => '1.3.36.3.3.2.8.1.1.11',
- prime => "8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B412B1DA197FB71123ACD3A729901D1A71874700133107EC53",
- A => "7BC382C63D8C150C3C72080ACE05AFA0C2BEA28E4FB22787139165EFBA91F90F8AA5814A503AD4EB04A8C7DD22CE2826",
- B => "04A8C7DD22CE28268B39B55416F0447C2FB77DE107DCD2A62E880EA53EEB62D57CB4390295DBC9943AB78696FA504C11",
- Gx => "1D1C64F068CF45FFA2A63A81B7C13F6B8847A3E77EF14FE3DB7FCAFE0CBD10E8E826E03436D646AAEF87B2E247D4AF1E",
- Gy => "8ABE1D7520F9C2A45CB1EB8E95CFD55262B70B29FEEC5864E19C054FF99129280E4646217791811142820341263C5315",
- order => "8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B31F166E6CAC0425A7CF3AB6AF6B7FC3103B883202E9046565",
- cofactor => 1,
- },
- brainpoolp512r1 => {
- oid => '1.3.36.3.3.2.8.1.1.13',
- prime => "AADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA703308717D4D9B009BC66842AECDA12AE6A380E62881FF2F2D82C68528AA6056583A48F3",
- A => "7830A3318B603B89E2327145AC234CC594CBDD8D3DF91610A83441CAEA9863BC2DED5D5AA8253AA10A2EF1C98B9AC8B57F1117A72BF2C7B9E7C1AC4D77FC94CA",
- B => "3DF91610A83441CAEA9863BC2DED5D5AA8253AA10A2EF1C98B9AC8B57F1117A72BF2C7B9E7C1AC4D77FC94CADC083E67984050B75EBAE5DD2809BD638016F723",
- Gx => "81AEE4BDD82ED9645A21322E9C4C6A9385ED9F70B5D916C1B43B62EEF4D0098EFF3B1F78E2D0D48D50D1687B93B97D5F7C6D5047406A5E688B352209BCB9F822",
- Gy => "7DDE385D566332ECC0EABFA9CF7822FDF209F70024A57B1AA000C55B881F8111B2DCDE494A5F485E5BCA4BD88A2763AED1CA2B2FA8F0540678CD1E0F3AD80892",
- order => "AADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA70330870553E5C414CA92619418661197FAC10471DB1D381085DDADDB58796829CA90069",
- cofactor => 1,
- },
- ### http://www.secg.org/collateral/sec2_final.pdf (September 20, 2000 - Version 1.0)
- secp112r1 => {
- oid => '1.3.132.0.6',
- prime => "DB7C2ABF62E35E668076BEAD208B",
- A => "DB7C2ABF62E35E668076BEAD2088",
- B => "659EF8BA043916EEDE8911702B22",
- Gx => "09487239995A5EE76B55F9C2F098",
- Gy => "A89CE5AF8724C0A23E0E0FF77500",
- order => "DB7C2ABF62E35E7628DFAC6561C5",
- cofactor => 1,
- },
- secp112r2 => {
- oid => '1.3.132.0.7',
- prime => "DB7C2ABF62E35E668076BEAD208B",
- A => "6127C24C05F38A0AAAF65C0EF02C",
- B => "51DEF1815DB5ED74FCC34C85D709",
- Gx => "4BA30AB5E892B4E1649DD0928643",
- Gy => "ADCD46F5882E3747DEF36E956E97",
- order => "36DF0AAFD8B8D7597CA10520D04B",
- cofactor => 4,
- },
- secp128r1 => {
- oid => '1.3.132.0.28',
- prime => "FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFF",
- A => "FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFC",
- B => "E87579C11079F43DD824993C2CEE5ED3",
- Gx => "161FF7528B899B2D0C28607CA52C5B86",
- Gy => "CF5AC8395BAFEB13C02DA292DDED7A83",
- order => "FFFFFFFE0000000075A30D1B9038A115",
- cofactor => 1,
- },
- secp128r2 => {
- oid => '1.3.132.0.29',
- prime => "FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFF",
- A => "D6031998D1B3BBFEBF59CC9BBFF9AEE1",
- B => "5EEEFCA380D02919DC2C6558BB6D8A5D",
- Gx => "7B6AA5D85E572983E6FB32A7CDEBC140",
- Gy => "27B6916A894D3AEE7106FE805FC34B44",
- order => "3FFFFFFF7FFFFFFFBE0024720613B5A3",
- cofactor => 4,
- },
- secp160k1 => {
- oid => '1.3.132.0.9',
- prime => "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC73",
- A => "0000000000000000000000000000000000000000",
- B => "0000000000000000000000000000000000000007",
- Gx => "3B4C382CE37AA192A4019E763036F4F5DD4D7EBB",
- Gy => "938CF935318FDCED6BC28286531733C3F03C4FEE",
- order => "0100000000000000000001B8FA16DFAB9ACA16B6B3",
- cofactor => 1,
- },
- secp160r1 => {
- oid => '1.3.132.0.8',
- prime => "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFF",
- A => "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFC",
- B => "1C97BEFC54BD7A8B65ACF89F81D4D4ADC565FA45",
- Gx => "4A96B5688EF573284664698968C38BB913CBFC82",
- Gy => "23A628553168947D59DCC912042351377AC5FB32",
- order => "0100000000000000000001F4C8F927AED3CA752257",
- cofactor => 1,
- },
- secp160r2 => {
- oid => '1.3.132.0.30',
- prime => "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC73",
- A => "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC70",
- B => "B4E134D3FB59EB8BAB57274904664D5AF50388BA",
- Gx => "52DCB034293A117E1F4FF11B30F7199D3144CE6D",
- Gy => "FEAFFEF2E331F296E071FA0DF9982CFEA7D43F2E",
- order => "0100000000000000000000351EE786A818F3A1A16B",
- cofactor => 1,
- },
- secp192k1 => {
- oid => '1.3.132.0.31',
- prime => "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFEE37",
- A => "000000000000000000000000000000000000000000000000",
- B => "000000000000000000000000000000000000000000000003",
- Gx => "DB4FF10EC057E9AE26B07D0280B7F4341DA5D1B1EAE06C7D",
- Gy => "9B2F2F6D9C5628A7844163D015BE86344082AA88D95E2F9D",
- order => "FFFFFFFFFFFFFFFFFFFFFFFE26F2FC170F69466A74DEFD8D",
- cofactor => 1,
- },
- secp192r1 => { # == NIST P-192, X9.62 prime192v1
- oid => '1.2.840.10045.3.1.1',
- prime => "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF",
- A => "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC",
- B => "64210519E59C80E70FA7E9AB72243049FEB8DEECC146B9B1",
- Gx => "188DA80EB03090F67CBF20EB43A18800F4FF0AFD82FF1012",
- Gy => "07192B95FFC8DA78631011ED6B24CDD573F977A11E794811",
- order => "FFFFFFFFFFFFFFFFFFFFFFFF99DEF836146BC9B1B4D22831",
- cofactor => 1,
- },
- secp224k1 => {
- oid => '1.3.132.0.32',
- prime => "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFE56D",
- A => "00000000000000000000000000000000000000000000000000000000",
- B => "00000000000000000000000000000000000000000000000000000005",
- Gx => "A1455B334DF099DF30FC28A169A467E9E47075A90F7E650EB6B7A45C",
- Gy => "7E089FED7FBA344282CAFBD6F7E319F7C0B0BD59E2CA4BDB556D61A5",
- order => "010000000000000000000000000001DCE8D2EC6184CAF0A971769FB1F7",
- cofactor => 1,
- },
- secp224r1 => { # == NIST P-224
- oid => '1.3.132.0.33',
- prime => "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000001",
- A => "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFFFFFFFFFE",
- B => "B4050A850C04B3ABF54132565044B0B7D7BFD8BA270B39432355FFB4",
- Gx => "B70E0CBD6BB4BF7F321390B94A03C1D356C21122343280D6115C1D21",
- Gy => "BD376388B5F723FB4C22DFE6CD4375A05A07476444D5819985007E34",
- order => "FFFFFFFFFFFFFFFFFFFFFFFFFFFF16A2E0B8F03E13DD29455C5C2A3D",
- cofactor => 1,
- },
- secp256k1 => {
- oid => '1.3.132.0.10',
- prime => "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC2F",
- A => "0000000000000000000000000000000000000000000000000000000000000000",
- B => "0000000000000000000000000000000000000000000000000000000000000007",
- Gx => "79BE667EF9DCBBAC55A06295CE870B07029BFCDB2DCE28D959F2815B16F81798",
- Gy => "483ADA7726A3C4655DA4FBFC0E1108A8FD17B448A68554199C47D08FFB10D4B8",
- order => "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364141",
- cofactor => 1,
- },
- secp256r1 => { # == NIST P-256, X9.62 prime256v1
- oid => '1.2.840.10045.3.1.7',
- prime => "FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFF",
- A => "FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFC",
- B => "5AC635D8AA3A93E7B3EBBD55769886BC651D06B0CC53B0F63BCE3C3E27D2604B",
- Gx => "6B17D1F2E12C4247F8BCE6E563A440F277037D812DEB33A0F4A13945D898C296",
- Gy => "4FE342E2FE1A7F9B8EE7EB4A7C0F9E162BCE33576B315ECECBB6406837BF51F5",
- order => "FFFFFFFF00000000FFFFFFFFFFFFFFFFBCE6FAADA7179E84F3B9CAC2FC632551",
- cofactor => 1,
- },
- secp384r1 => { # == NIST P-384
- oid => '1.3.132.0.34',
- prime => "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFF0000000000000000FFFFFFFF",
- A => "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFF0000000000000000FFFFFFFC",
- B => "B3312FA7E23EE7E4988E056BE3F82D19181D9C6EFE8141120314088F5013875AC656398D8A2ED19D2A85C8EDD3EC2AEF",
- Gx => "AA87CA22BE8B05378EB1C71EF320AD746E1D3B628BA79B9859F741E082542A385502F25DBF55296C3A545E3872760AB7",
- Gy => "3617DE4A96262C6F5D9E98BF9292DC29F8F41DBD289A147CE9DA3113B5F0B8C00A60B1CE1D7E819D7A431D7C90EA0E5F",
- order => "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC7634D81F4372DDF581A0DB248B0A77AECEC196ACCC52973",
- cofactor => 1,
- },
- secp521r1 => { # == NIST P-521
- oid => '1.3.132.0.35',
- prime => "01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF",
- A => "01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC",
- B => "0051953EB9618E1C9A1F929A21A0B68540EEA2DA725B99B315F3B8B489918EF109E156193951EC7E937B1652C0BD3BB1BF073573DF883D2C34F1EF451FD46B503F00",
- Gx => "00C6858E06B70404E9CD9E3ECB662395B4429C648139053FB521F828AF606B4D3DBAA14B5E77EFE75928FE1DC127A2FFA8DE3348B3C1856A429BF97E7E31C2E5BD66",
- Gy => "011839296A789A3BC0045C8A5FB42C7D1BD998F54449579B446817AFBD17273E662C97EE72995EF42640C550B9013FAD0761353C7086A272C24088BE94769FD16650",
- order => "01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFA51868783BF2F966B7FCC0148F709A5D03BB5C9B8899C47AEBB6FB71E91386409",
- cofactor => 1
- },
- ### http://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.186-4.pdf (July 2013)
- nistp192 => { # == secp192r1, X9.62 prime192v1
- oid => '1.2.840.10045.3.1.1',
- prime => 'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF',
- A => 'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC',
- B => '64210519E59C80E70FA7E9AB72243049FEB8DEECC146B9B1',
- Gx => '188DA80EB03090F67CBF20EB43A18800F4FF0AFD82FF1012',
- Gy => '07192B95FFC8DA78631011ED6B24CDD573F977A11E794811',
- order => 'FFFFFFFFFFFFFFFFFFFFFFFF99DEF836146BC9B1B4D22831',
- cofactor => 1,
- },
- nistp224 => { # == secp224r1
- oid => '1.3.132.0.33',
- prime => 'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000001',
- A => 'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFFFFFFFFFE',
- B => 'B4050A850C04B3ABF54132565044B0B7D7BFD8BA270B39432355FFB4',
- Gx => 'B70E0CBD6BB4BF7F321390B94A03C1D356C21122343280D6115C1D21',
- Gy => 'BD376388B5F723FB4C22DFE6CD4375A05A07476444D5819985007E34',
- order => 'FFFFFFFFFFFFFFFFFFFFFFFFFFFF16A2E0B8F03E13DD29455C5C2A3D',
- cofactor => 1,
- },
- nistp256 => { # == secp256r1, X9.62 prime256v1
- oid => '1.2.840.10045.3.1.7',
- prime => 'FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFF',
- A => 'FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFC',
- B => '5AC635D8AA3A93E7B3EBBD55769886BC651D06B0CC53B0F63BCE3C3E27D2604B',
- Gx => '6B17D1F2E12C4247F8BCE6E563A440F277037D812DEB33A0F4A13945D898C296',
- Gy => '4FE342E2FE1A7F9B8EE7EB4A7C0F9E162BCE33576B315ECECBB6406837BF51F5',
- order => 'FFFFFFFF00000000FFFFFFFFFFFFFFFFBCE6FAADA7179E84F3B9CAC2FC632551',
- cofactor => 1,
- },
- nistp384 => { # == secp384r1
- oid => '1.3.132.0.34',
- prime => 'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFF0000000000000000FFFFFFFF',
- A => 'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFF0000000000000000FFFFFFFC',
- B => 'B3312FA7E23EE7E4988E056BE3F82D19181D9C6EFE8141120314088F5013875AC656398D8A2ED19D2A85C8EDD3EC2AEF',
- Gx => 'AA87CA22BE8B05378EB1C71EF320AD746E1D3B628BA79B9859F741E082542A385502F25DBF55296C3A545E3872760AB7',
- Gy => '3617DE4A96262C6F5D9E98BF9292DC29F8F41DBD289A147CE9DA3113B5F0B8C00A60B1CE1D7E819D7A431D7C90EA0E5F',
- order => 'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC7634D81F4372DDF581A0DB248B0A77AECEC196ACCC52973',
- cofactor => 1,
- },
- nistp521 => { # == secp521r1
- oid => '1.3.132.0.35',
- prime => '1FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF',
- A => '1FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC',
- B => '051953EB9618E1C9A1F929A21A0B68540EEA2DA725B99B315F3B8B489918EF109E156193951EC7E937B1652C0BD3BB1BF073573DF883D2C34F1EF451FD46B503F00',
- Gx => '0C6858E06B70404E9CD9E3ECB662395B4429C648139053FB521F828AF606B4D3DBAA14B5E77EFE75928FE1DC127A2FFA8DE3348B3C1856A429BF97E7E31C2E5BD66',
- Gy => '11839296A789A3BC0045C8A5FB42C7D1BD998F54449579B446817AFBD17273E662C97EE72995EF42640C550B9013FAD0761353C7086A272C24088BE94769FD16650',
- order => '1FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFA51868783BF2F966B7FCC0148F709A5D03BB5C9B8899C47AEBB6FB71E91386409',
- cofactor => 1,
- },
- ### ANS X9.62 elliptic curves - http://www.flexiprovider.de/CurvesGfpX962.html
- prime192v1 => { # == secp192r1, NIST P-192
- oid => '1.2.840.10045.3.1.1',
- prime => 'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF',
- A => 'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC',
- B => '64210519E59C80E70FA7E9AB72243049FEB8DEECC146B9B1',
- Gx => '188DA80EB03090F67CBF20EB43A18800F4FF0AFD82FF1012',
- Gy => '07192B95FFC8DA78631011ED6B24CDD573F977A11E794811',
- order => 'FFFFFFFFFFFFFFFFFFFFFFFF99DEF836146BC9B1B4D22831',
- cofactor => 1,
- },
- prime192v2 => {
- oid => '1.2.840.10045.3.1.2',
- prime => 'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF',
- A => 'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC',
- B => 'CC22D6DFB95C6B25E49C0D6364A4E5980C393AA21668D953',
- Gx => 'EEA2BAE7E1497842F2DE7769CFE9C989C072AD696F48034A',
- Gy => '6574D11D69B6EC7A672BB82A083DF2F2B0847DE970B2DE15',
- order => 'FFFFFFFFFFFFFFFFFFFFFFFE5FB1A724DC80418648D8DD31',
- cofactor => 1
- },
- prime192v3 => {
- oid => '1.2.840.10045.3.1.3',
- prime => 'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF',
- A => 'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC',
- B => '22123DC2395A05CAA7423DAECCC94760A7D462256BD56916',
- Gx => '7D29778100C65A1DA1783716588DCE2B8B4AEE8E228F1896',
- Gy => '38A90F22637337334B49DCB66A6DC8F9978ACA7648A943B0',
- order => 'FFFFFFFFFFFFFFFFFFFFFFFF7A62D031C83F4294F640EC13',
- cofactor => 1,
- },
- prime239v1 => {
- oid => '1.2.840.10045.3.1.4',
- prime => '7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFF',
- A => '7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFC',
- B => '6B016C3BDCF18941D0D654921475CA71A9DB2FB27D1D37796185C2942C0A',
- Gx => '0FFA963CDCA8816CCC33B8642BEDF905C3D358573D3F27FBBD3B3CB9AAAF',
- Gy => '7DEBE8E4E90A5DAE6E4054CA530BA04654B36818CE226B39FCCB7B02F1AE',
- order => '7FFFFFFFFFFFFFFFFFFFFFFF7FFFFF9E5E9A9F5D9071FBD1522688909D0B',
- cofactor => 1,
- },
- prime239v2 => {
- oid => '1.2.840.10045.3.1.5',
- prime => '7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFF',
- A => '7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFC',
- B => '617FAB6832576CBBFED50D99F0249C3FEE58B94BA0038C7AE84C8C832F2C',
- Gx => '38AF09D98727705120C921BB5E9E26296A3CDCF2F35757A0EAFD87B830E7',
- Gy => '5B0125E4DBEA0EC7206DA0FC01D9B081329FB555DE6EF460237DFF8BE4BA',
- order => '7FFFFFFFFFFFFFFFFFFFFFFF800000CFA7E8594377D414C03821BC582063',
- cofactor => 1,
- },
- prime239v3 => {
- oid => '1.2.840.10045.3.1.6',
- prime => '7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFF',
- A => '7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFC',
- B => '255705FA2A306654B1F4CB03D6A750A30C250102D4988717D9BA15AB6D3E',
- Gx => '6768AE8E18BB92CFCF005C949AA2C6D94853D0E660BBF854B1C9505FE95A',
- Gy => '1607E6898F390C06BC1D552BAD226F3B6FCFE48B6E818499AF18E3ED6CF3',
- order => '7FFFFFFFFFFFFFFFFFFFFFFF7FFFFF975DEB41B3A6057C3C432146526551',
- cofactor => 1,
- },
- prime256v1 => { # == secp256r1, NIST P-256
- oid => '1.2.840.10045.3.1.7',
- prime => 'FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFF',
- A => 'FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFC',
- B => '5AC635D8AA3A93E7B3EBBD55769886BC651D06B0CC53B0F63BCE3C3E27D2604B',
- Gx => '6B17D1F2E12C4247F8BCE6E563A440F277037D812DEB33A0F4A13945D898C296',
- Gy => '4FE342E2FE1A7F9B8EE7EB4A7C0F9E162BCE33576B315ECECBB6406837BF51F5',
- order => 'FFFFFFFF00000000FFFFFFFFFFFFFFFFBCE6FAADA7179E84F3B9CAC2FC632551',
- cofactor => 1,
+ 'wap-wsg-idm-ecid-wtls9' => {
+ prime => "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC808F",
+ A => "0000000000000000000000000000000000000000",
+ B => "0000000000000000000000000000000000000003",
+ order => "0100000000000000000001CDC98AE0E2DE574ABF33",
+ Gx => "0000000000000000000000000000000000000001",
+ Gy => "0000000000000000000000000000000000000002",
+ cofactor => 1,
+ oid => '2.23.43.1.4.9',
},
);
-my %jwkcrv = (
- 'P-192' => 'secp192r1',
- 'P-224' => 'secp224r1',
- 'P-256' => 'secp256r1',
- 'P-384' => 'secp384r1',
- 'P-521' => 'secp521r1',
+my %jwk2curve = (
+ 'P-192' => 'secp192r1',
+ 'P-224' => 'secp224r1',
+ 'P-256' => 'secp256r1',
+ 'P-384' => 'secp384r1',
+ 'P-521' => 'secp521r1',
+);
+
+my %curve2jwk = (
+ '1.2.840.10045.3.1.1' => 'P-192', # secp192r1
+ '1.3.132.0.33' => 'P-224', # secp224r1
+ '1.2.840.10045.3.1.7' => 'P-256', # secp256r1
+ '1.3.132.0.34' => 'P-384', # secp384r1
+ '1.3.132.0.35' => 'P-521', # secp521r1
+ 'nistp192' => 'P-192',
+ 'nistp224' => 'P-224',
+ 'nistp256' => 'P-256',
+ 'nistp384' => 'P-384',
+ 'nistp521' => 'P-521',
+ 'prime192v1' => 'P-192',
+ 'prime256v1' => 'P-256',
+ 'secp192r1' => 'P-192',
+ 'secp224r1' => 'P-224',
+ 'secp256r1' => 'P-256',
+ 'secp384r1' => 'P-384',
+ 'secp521r1' => 'P-521',
+);
+
+our %curve2ltc = ( # must be "our" as we use it from XS code
+ # OIDs
+ "1.2.840.10045.3.1.1" => "SECP192R1",
+ "1.2.840.10045.3.1.2" => "PRIME192V2",
+ "1.2.840.10045.3.1.3" => "PRIME192V3",
+ "1.2.840.10045.3.1.4" => "PRIME239V1",
+ "1.2.840.10045.3.1.5" => "PRIME239V2",
+ "1.2.840.10045.3.1.6" => "PRIME239V3",
+ "1.2.840.10045.3.1.7" => "SECP256R1",
+ "1.3.132.0.10" => "SECP256K1",
+ "1.3.132.0.28" => "SECP128R1",
+ "1.3.132.0.29" => "SECP128R2",
+ "1.3.132.0.30" => "SECP160R2",
+ "1.3.132.0.31" => "SECP192K1",
+ "1.3.132.0.32" => "SECP224K1",
+ "1.3.132.0.33" => "SECP224R1",
+ "1.3.132.0.34" => "SECP384R1",
+ "1.3.132.0.35" => "SECP521R1",
+ "1.3.132.0.6" => "SECP112R1",
+ "1.3.132.0.7" => "SECP112R2",
+ "1.3.132.0.8" => "SECP160R1",
+ "1.3.132.0.9" => "SECP160K1",
+ "1.3.36.3.3.2.8.1.1.1" => "BRAINPOOLP160R1",
+ "1.3.36.3.3.2.8.1.1.11" => "BRAINPOOLP384R1",
+ "1.3.36.3.3.2.8.1.1.13" => "BRAINPOOLP512R1",
+ "1.3.36.3.3.2.8.1.1.3" => "BRAINPOOLP192R1",
+ "1.3.36.3.3.2.8.1.1.5" => "BRAINPOOLP224R1",
+ "1.3.36.3.3.2.8.1.1.7" => "BRAINPOOLP256R1",
+ "1.3.36.3.3.2.8.1.1.9" => "BRAINPOOLP320R1",
+ "1.3.36.3.3.2.8.1.1.10" => "BRAINPOOLP320T1",
+ "1.3.36.3.3.2.8.1.1.12" => "BRAINPOOLP384T1",
+ "1.3.36.3.3.2.8.1.1.14" => "BRAINPOOLP512T1",
+ "1.3.36.3.3.2.8.1.1.2" => "BRAINPOOLP160T1",
+ "1.3.36.3.3.2.8.1.1.4" => "BRAINPOOLP192T1",
+ "1.3.36.3.3.2.8.1.1.6" => "BRAINPOOLP224T1",
+ "1.3.36.3.3.2.8.1.1.8" => "BRAINPOOLP256T1",
+ # JWT names
+ "P-192" => "SECP192R1",
+ "P-224" => "SECP224R1",
+ "P-256" => "SECP256R1",
+ "P-384" => "SECP384R1",
+ "P-521" => "SECP521R1",
+ # openssl names
+ "brainpoolp160r1" => "BRAINPOOLP160R1",
+ "brainpoolp192r1" => "BRAINPOOLP192R1",
+ "brainpoolp224r1" => "BRAINPOOLP224R1",
+ "brainpoolp256r1" => "BRAINPOOLP256R1",
+ "brainpoolp320r1" => "BRAINPOOLP320R1",
+ "brainpoolp384r1" => "BRAINPOOLP384R1",
+ "brainpoolp512r1" => "BRAINPOOLP512R1",
+ "brainpoolp160t1" => "BRAINPOOLP160T1",
+ "brainpoolp192t1" => "BRAINPOOLP192T1",
+ "brainpoolp224t1" => "BRAINPOOLP224T1",
+ "brainpoolp256t1" => "BRAINPOOLP256T1",
+ "brainpoolp320t1" => "BRAINPOOLP320T1",
+ "brainpoolp384t1" => "BRAINPOOLP384T1",
+ "brainpoolp512t1" => "BRAINPOOLP512T1",
+ "nistp192" => "SECP192R1",
+ "nistp224" => "SECP224R1",
+ "nistp256" => "SECP256R1",
+ "nistp384" => "SECP384R1",
+ "nistp521" => "SECP521R1",
+ "prime192v1" => "SECP192R1",
+ "prime192v2" => "PRIME192V2",
+ "prime192v3" => "PRIME192V3",
+ "prime239v1" => "PRIME239V1",
+ "prime239v2" => "PRIME239V2",
+ "prime239v3" => "PRIME239V3",
+ "prime256v1" => "SECP256R1",
+ "secp112r1" => "SECP112R1",
+ "secp112r2" => "SECP112R2",
+ "secp128r1" => "SECP128R1",
+ "secp128r2" => "SECP128R2",
+ "secp160k1" => "SECP160K1",
+ "secp160r1" => "SECP160R1",
+ "secp160r2" => "SECP160R2",
+ "secp192k1" => "SECP192K1",
+ "secp192r1" => "SECP192R1",
+ "secp224k1" => "SECP224K1",
+ "secp224r1" => "SECP224R1",
+ "secp256k1" => "SECP256K1",
+ "secp256r1" => "SECP256R1",
+ "secp384r1" => "SECP384R1",
+ "secp521r1" => "SECP521R1",
+ "wap-wsg-idm-ecid-wtls6" => 'SECP112R1',
+ "wap-wsg-idm-ecid-wtls7" => 'SECP160R2',
+ "wap-wsg-idm-ecid-wtls12" => 'SECP224R1',
);
sub _import_hex {
my ($self, $x, $y, $k, $crv) = @_;
- my $p = $curve{$crv}{prime};
- croak "FATAL: invalid or unknown curve" if !$p;
- $p =~ s/^0+//;
- my $hex_size = length($p) % 2 ? length($p) + 1 : length($p);
- if ($k) {
- $k =~ /^0+/;
- croak "FATAL: too long private key (k)" if length($k) > $hex_size;
- my $priv_hex = "0" x ($hex_size - length($k)) . $k;
- return $self->import_key_raw(pack("H*", $priv_hex), $crv);
+ croak "FATAL: no curve" if !$crv;
+ if (defined $k && length($k) > 0) {
+ croak "FATAL: invalid length (k)" if length($k) % 2;
+ return $self->import_key_raw(pack("H*", $k), $crv);
}
- elsif ($x && $y) {
- $x =~ /^0+/;
- $y =~ /^0+/;
- croak "FATAL: too long public key (x)" if length($x) > $hex_size;
- croak "FATAL: too long public key (y)" if length($y) > $hex_size;
- my $pub_hex = "04" . ("0" x ($hex_size - length($x))) . $x . ("0" x ($hex_size - length($y))) . $y;
+ elsif (defined $x && defined $y) {
+ croak "FATAL: invalid length (x)" if length($x) % 2;
+ croak "FATAL: invalid length (y)" if length($y) % 2;
+ croak "FATAL: invalid length (x,y)" if length($y) != length($x);
+ my $pub_hex = "04" . $x . $y;
return $self->import_key_raw(pack("H*", $pub_hex), $crv);
}
}
-sub _curve_name_lookup {
- my ($self, $key) = @_;
-
- return $key->{curve_name} if $key->{curve_name} && exists $curve{$key->{curve_name}};
-
- defined(my $A = $key->{curve_A}) or return;
- defined(my $B = $key->{curve_B}) or return;
- defined(my $Gx = $key->{curve_Gx}) or return;
- defined(my $Gy = $key->{curve_Gy}) or return;
- defined(my $order = $key->{curve_order}) or return;
- defined(my $prime = $key->{curve_prime}) or return;
- defined(my $cofactor = $key->{curve_cofactor}) or return;
- $A =~ s/^0+//;
- $B =~ s/^0+//;
- $Gx =~ s/^0+//;
- $Gy =~ s/^0+//;
- $order =~ s/^0+//;
- $prime =~ s/^0+//;
-
- for my $k (sort keys %curve) {
- (my $c_A = $curve{$k}{A} ) =~ s/^0+//;
- (my $c_B = $curve{$k}{B} ) =~ s/^0+//;
- (my $c_Gx = $curve{$k}{Gx} ) =~ s/^0+//;
- (my $c_Gy = $curve{$k}{Gy} ) =~ s/^0+//;
- (my $c_order = $curve{$k}{order} ) =~ s/^0+//;
- (my $c_prime = $curve{$k}{prime} ) =~ s/^0+//;
- my $c_cofactor = $curve{$k}{cofactor};
- return $k if $A eq $c_A && $B eq $c_B && $Gx eq $c_Gx && $Gy eq $c_Gy &&
- $order eq $c_order && $prime eq $c_prime && $cofactor == $c_cofactor;
- }
-}
-
sub new {
- my ($class, $f, $p) = @_;
- my $self = _new();
- $self->import_key($f, $p) if $f;
- return $self;
+ my $self = shift->_new();
+ return @_ > 0 ? $self->import_key(@_) : $self;
}
sub export_key_pem {
my ($self, $type, $password, $cipher) = @_;
+ local $SIG{__DIE__} = \&CryptX::_croak;
my $key = $self->export_key_der($type||'');
return unless $key;
return der_to_pem($key, "EC PRIVATE KEY", $password, $cipher) if substr($type, 0, 7) eq 'private';
@@ -441,13 +189,11 @@ sub export_key_pem {
sub export_key_jwk {
my ($self, $type, $wanthash) = @_;
+ local $SIG{__DIE__} = \&CryptX::_croak;
my $kh = $self->key2hash;
- my $curve = $self->_curve_name_lookup($kh);
- $curve = 'P-192' if $curve =~ /(secp192r1|nistp192|prime192v1)/;
- $curve = 'P-224' if $curve =~ /(secp224r1|nistp224)/;
- $curve = 'P-256' if $curve =~ /(secp256r1|nistp256|prime256v1)/;
- $curve = 'P-384' if $curve =~ /(secp384r1|nistp384)/;
- $curve = 'P-521' if $curve =~ /(secp521r1|nistp521)/;
+ $kh->{curve_oid} = '' if !defined $kh->{curve_oid};
+ $kh->{curve_name} = '' if !defined $kh->{curve_name};
+ my $curve_jwt = $curve2jwk{$kh->{curve_oid}} || $curve2jwk{lc $kh->{curve_name}} || $kh->{curve_name};
if ($type && $type eq 'private') {
return unless $kh->{pub_x} && $kh->{pub_y} && $kh->{k};
for (qw/pub_x pub_y k/) {
@@ -456,7 +202,7 @@ sub export_key_jwk {
# NOTE: x + y are not necessary in privkey
# but they are used in https://tools.ietf.org/html/rfc7517#appendix-A.2
my $hash = {
- kty => "EC", crv=>$curve,
+ kty => "EC", crv => $curve_jwt,
x => encode_b64u(pack("H*", $kh->{pub_x})),
y => encode_b64u(pack("H*", $kh->{pub_y})),
d => encode_b64u(pack("H*", $kh->{k})),
@@ -469,7 +215,7 @@ sub export_key_jwk {
$kh->{$_} = "0$kh->{$_}" if length($kh->{$_}) % 2;
}
my $hash = {
- kty => "EC", crv=>$curve,
+ kty => "EC", crv => $curve_jwt,
x => encode_b64u(pack("H*", $kh->{pub_x})),
y => encode_b64u(pack("H*", $kh->{pub_y})),
};
@@ -479,6 +225,7 @@ sub export_key_jwk {
sub export_key_jwk_thumbprint {
my ($self, $hash_name) = @_;
+ local $SIG{__DIE__} = \&CryptX::_croak;
$hash_name ||= 'SHA256';
my $h = $self->export_key_jwk('public', 1);
my $json = CryptX::_encode_json({crv=>$h->{crv}, kty=>$h->{kty}, x=>$h->{x}, y=>$h->{y}});
@@ -487,15 +234,15 @@ sub export_key_jwk_thumbprint {
sub import_key {
my ($self, $key, $password) = @_;
+ local $SIG{__DIE__} = \&CryptX::_croak;
croak "FATAL: undefined key" unless $key;
# special case
if (ref($key) eq 'HASH') {
if (($key->{pub_x} && $key->{pub_y}) || $key->{k}) {
# hash exported via key2hash
- my $curve = $self->_curve_name_lookup($key);
- croak "FATAL: invalid or unknown curve" if !$curve;
- return $self->_import_hex($key->{pub_x}, $key->{pub_y}, $key->{k}, $curve);
+ my $curve_name = $key->{curve_name} || $key->{curve_oid};
+ return $self->_import_hex($key->{pub_x}, $key->{pub_y}, $key->{k}, $curve_name);
}
if ($key->{crv} && $key->{kty} && $key->{kty} eq "EC" && ($key->{d} || ($key->{x} && $key->{y}))) {
# hash with items corresponding to JSON Web Key (JWK)
@@ -503,11 +250,11 @@ sub import_key {
for (qw/x y d/) {
$key->{$_} = eval { unpack("H*", decode_b64u($key->{$_})) } if exists $key->{$_};
}
- if (my $curve = $jwkcrv{$key->{crv}}) {
- return $self->_import_hex($key->{x}, $key->{y}, $key->{d}, $curve);
+ if (my $curve_name = $jwk2curve{$key->{crv}}) {
+ return $self->_import_hex($key->{x}, $key->{y}, $key->{d}, $curve_name);
}
# curve is not JWK compliant e.g. P-192 P-224 P-256 P-384 P-521 (we'll try to import anyway)
- return $self->_import_hex($key->{x}, $key->{y}, $key->{d}, lc($key->{crv}));
+ return $self->_import_hex($key->{x}, $key->{y}, $key->{d}, $key->{crv});
}
croak "FATAL: unexpected ECC key hash";
}
@@ -533,8 +280,8 @@ sub import_key {
return $self->_import_pkcs8($data, $password);
}
elsif ($data =~ /-----BEGIN ENCRYPTED PRIVATE KEY-----(.*?)-----END/sg) {
- # XXX-TODO: pkcs#8 encrypted private key
- croak "FATAL: encrypted pkcs8 EC private keys are not supported";
+ $data = pem_to_der($data, $password);
+ return $self->_import_pkcs8($data, $password);
}
elsif ($data =~ /^\s*(\{.*?\})\s*$/s) {
# JSON Web Key (JWK) - http://tools.ietf.org/html/draft-ietf-jose-json-web-key
@@ -544,13 +291,17 @@ sub import_key {
for (qw/x y d/) {
$h->{$_} = eval { unpack("H*", decode_b64u($h->{$_})) } if exists $h->{$_};
}
- if (my $curve = $jwkcrv{$h->{crv}}) {
- return $self->_import_hex($h->{x}, $h->{y}, $h->{d}, $curve);
+ if (my $curve_name = $jwk2curve{$h->{crv}}) {
+ return $self->_import_hex($h->{x}, $h->{y}, $h->{d}, $curve_name);
}
# curve is not JWK compliant e.g. P-192 P-224 P-256 P-384 P-521 (we'll try to import anyway)
- return $self->_import_hex($h->{x}, $h->{y}, $h->{d}, lc($h->{crv}));
+ return $self->_import_hex($h->{x}, $h->{y}, $h->{d}, $h->{crv});
}
}
+ elsif ($data =~ /-----BEGIN CERTIFICATE-----(.*?)-----END CERTIFICATE-----/sg) {
+ $data = pem_to_der($data);
+ return $self->_import_x509($data);
+ }
elsif ($data =~ /---- BEGIN SSH2 PUBLIC KEY ----(.*?)---- END SSH2 PUBLIC KEY ----/sg) {
$data = pem_to_der($data);
my ($typ, $skip, $pubkey) = Crypt::PK::_ssh_parse($data);
@@ -562,61 +313,12 @@ sub import_key {
return $self->import_key_raw($pubkey, "$2") if $pubkey && $typ =~ /^ecdsa-(.+?)-(.*)$/;
}
else {
- my $rv = eval { $self->_import($data) } || eval { $self->_import_pkcs8($data, $password) };
+ my $rv = eval { $self->_import($data) } || eval { $self->_import_pkcs8($data, $password) } || eval { $self->_import_x509($data) };
return $rv if $rv;
}
croak "FATAL: invalid or unsupported EC key format";
}
-sub encrypt {
- my ($self, $data, $hash_name) = @_;
- $hash_name = Crypt::Digest::_trans_digest_name($hash_name||'SHA1');
- return $self->_encrypt($data, $hash_name);
-}
-
-sub decrypt {
- my ($self, $data) = @_;
- return $self->_decrypt($data);
-}
-
-sub sign_message {
- my ($self, $data, $hash_name) = @_;
- $hash_name ||= 'SHA1';
- my $data_hash = digest_data($hash_name, $data);
- return $self->_sign($data_hash);
-}
-
-sub sign_message_rfc7518 {
- my ($self, $data, $hash_name) = @_;
- $hash_name ||= 'SHA1';
- my $data_hash = digest_data($hash_name, $data);
- return $self->_sign_rfc7518($data_hash);
-}
-
-sub verify_message {
- my ($self, $sig, $data, $hash_name) = @_;
- $hash_name ||= 'SHA1';
- my $data_hash = digest_data($hash_name, $data);
- return $self->_verify($sig, $data_hash);
-}
-
-sub verify_message_rfc7518 {
- my ($self, $sig, $data, $hash_name) = @_;
- $hash_name ||= 'SHA1';
- my $data_hash = digest_data($hash_name, $data);
- return $self->_verify_rfc7518($sig, $data_hash);
-}
-
-sub sign_hash {
- my ($self, $data_hash) = @_;
- return $self->_sign($data_hash);
-}
-
-sub verify_hash {
- my ($self, $sig, $data_hash) = @_;
- return $self->_verify($sig, $data_hash);
-}
-
sub curve2hash {
my $self = shift;
my $kh = $self->key2hash;
@@ -627,7 +329,8 @@ sub curve2hash {
Gx => $kh->{curve_Gx},
Gy => $kh->{curve_Gy},
cofactor => $kh->{curve_cofactor},
- order => $kh->{curve_order}
+ order => $kh->{curve_order},
+ oid => $kh->{curve_oid},
};
}
@@ -635,6 +338,7 @@ sub curve2hash {
sub ecc_encrypt {
my $key = shift;
+ local $SIG{__DIE__} = \&CryptX::_croak;
$key = __PACKAGE__->new($key) unless ref $key;
carp "FATAL: invalid 'key' param" unless ref($key) eq __PACKAGE__;
return $key->encrypt(@_);
@@ -642,6 +346,7 @@ sub ecc_encrypt {
sub ecc_decrypt {
my $key = shift;
+ local $SIG{__DIE__} = \&CryptX::_croak;
$key = __PACKAGE__->new($key) unless ref $key;
carp "FATAL: invalid 'key' param" unless ref($key) eq __PACKAGE__;
return $key->decrypt(@_);
@@ -649,6 +354,7 @@ sub ecc_decrypt {
sub ecc_sign_message {
my $key = shift;
+ local $SIG{__DIE__} = \&CryptX::_croak;
$key = __PACKAGE__->new($key) unless ref $key;
carp "FATAL: invalid 'key' param" unless ref($key) eq __PACKAGE__;
return $key->sign_message(@_);
@@ -656,6 +362,7 @@ sub ecc_sign_message {
sub ecc_verify_message {
my $key = shift;
+ local $SIG{__DIE__} = \&CryptX::_croak;
$key = __PACKAGE__->new($key) unless ref $key;
carp "FATAL: invalid 'key' param" unless ref($key) eq __PACKAGE__;
return $key->verify_message(@_);
@@ -663,6 +370,7 @@ sub ecc_verify_message {
sub ecc_sign_hash {
my $key = shift;
+ local $SIG{__DIE__} = \&CryptX::_croak;
$key = __PACKAGE__->new($key) unless ref $key;
carp "FATAL: invalid 'key' param" unless ref($key) eq __PACKAGE__;
return $key->sign_hash(@_);
@@ -670,6 +378,7 @@ sub ecc_sign_hash {
sub ecc_verify_hash {
my $key = shift;
+ local $SIG{__DIE__} = \&CryptX::_croak;
$key = __PACKAGE__->new($key) unless ref $key;
carp "FATAL: invalid 'key' param" unless ref($key) eq __PACKAGE__;
return $key->verify_hash(@_);
@@ -677,6 +386,7 @@ sub ecc_verify_hash {
sub ecc_shared_secret {
my ($privkey, $pubkey) = @_;
+ local $SIG{__DIE__} = \&CryptX::_croak;
$privkey = __PACKAGE__->new($privkey) unless ref $privkey;
$pubkey = __PACKAGE__->new($pubkey) unless ref $pubkey;
carp "FATAL: invalid 'privkey' param" unless ref($privkey) eq __PACKAGE__ && $privkey->is_private;
@@ -912,6 +622,13 @@ Supported key formats:
lBQ9T/RsLLc+PmpB1+7yPAR+oR5gZn3kJQ==
-----END EC PRIVATE KEY-----
+=item * EC private keys with curve defined by OID + compressed form (supported since: CryptX-0.059)
+
+ -----BEGIN EC PRIVATE KEY-----
+ MFcCAQEEIBG1c3z52T8XwMsahGVdOZWgKCQJfv+l7djuJjgetdbDoAoGCCqGSM49
+ AwEHoSQDIgADoBUyo8CQAFPeYPvv78ylh5MwFZjTCLQeb042TjiMJxE=
+ -----END EC PRIVATE KEY-----
+
=item * EC private keys in password protected PEM format
-----BEGIN EC PRIVATE KEY-----
@@ -944,6 +661,13 @@ Supported key formats:
CLQeb042TjiMJxG+9DLFmRSMlBQ9T/RsLLc+PmpB1+7yPAR+oR5gZn3kJQ==
-----END PUBLIC KEY-----
+=item * EC public keys with curve defined by OID + public point in compressed form (supported since: CryptX-0.059)
+
+ -----BEGIN PUBLIC KEY-----
+ MDkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDIgADoBUyo8CQAFPeYPvv78ylh5MwFZjT
+ CLQeb042TjiMJxE=
+ -----END PUBLIC KEY-----
+
=item * PKCS#8 private keys with all curve parameters
-----BEGIN PRIVATE KEY-----
@@ -964,7 +688,7 @@ Supported key formats:
lEHQYjWya2YnHaPq/iMFa7A=
-----END PRIVATE KEY-----
-=item * PKCS#8 encrypted private keys ARE NOT SUPPORTED YET!
+=item * PKCS#8 encrypted private keys - password protected keys (supported since: CryptX-0.059)
-----BEGIN ENCRYPTED PRIVATE KEY-----
MIGYMBwGCiqGSIb3DQEMAQMwDgQINApjTa6oFl0CAggABHi+59l4d4e6KtG9yci2
@@ -973,6 +697,19 @@ Supported key formats:
4INKZyMv/G7VpZ0=
-----END ENCRYPTED PRIVATE KEY-----
+=item * EC public key from X509 certificate
+
+ -----BEGIN CERTIFICATE-----
+ MIIBdDCCARqgAwIBAgIJAL2BBClDEnnOMAoGCCqGSM49BAMEMBcxFTATBgNVBAMM
+ DFRlc3QgQ2VydCBFQzAgFw0xNzEyMzAyMDMzNDFaGA8zMDE3MDUwMjIwMzM0MVow
+ FzEVMBMGA1UEAwwMVGVzdCBDZXJ0IEVDMFYwEAYHKoZIzj0CAQYFK4EEAAoDQgAE
+ KvkL2r5xZp7RzxLQJK+6tn/7lic+L70e1fmNbHOdxRaRvbK5G0AQWrdsbjJb92Ni
+ lCQk2+w/i+VuS2Q3MSR5TaNQME4wHQYDVR0OBBYEFGbJkDyKgaMcIGHS8/WuqIVw
+ +R8sMB8GA1UdIwQYMBaAFGbJkDyKgaMcIGHS8/WuqIVw+R8sMAwGA1UdEwQFMAMB
+ Af8wCgYIKoZIzj0EAwQDSAAwRQIhAJtOsmrM+gJpImoynAyqTN+7myL71uxd+YeC
+ 6ze4MnzWAiBQi5/BqEr/SQ1+BC2TPtswvJPRFh2ZvT/6Km3gKoNVXQ==
+ -----END CERTIFICATE-----
+
=item * SSH public EC keys
ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNT...T3xYfJIs=
@@ -1035,6 +772,13 @@ that does not explicitly contain curve parameters but only curve OID.
#or
my $public_der = $pk->export_key_der('public_short');
+Since CryptX-0.59 C<export_key_der> can also export keys in "compressed" format
+that defines curve by OID + stores public point in compressed form.
+
+ my $private_pem = $pk->export_key_der('private_compressed');
+ #or
+ my $public_pem = $pk->export_key_der('public_compressed');
+
=head2 export_key_pem
my $private_pem = $pk->export_key_pem('private');
@@ -1048,6 +792,13 @@ that does not explicitly contain curve parameters but only curve OID.
#or
my $public_pem = $pk->export_key_pem('public_short');
+Since CryptX-0.59 C<export_key_pem> can also export keys in "compressed" format
+that defines curve by OID + stores public point in compressed form.
+
+ my $private_pem = $pk->export_key_pem('private_compressed');
+ #or
+ my $public_pem = $pk->export_key_pem('public_compressed');
+
Support for password protected PEM keys
my $private_pem = $pk->export_key_pem('private', $password);
@@ -1154,11 +905,25 @@ Same as L<verify_message|/verify_message> only the signature format is as define
my $pk = Crypt::PK::ECC->new($priv_key_filename);
my $signature = $priv->sign_hash($message_hash);
+=head2 sign_hash_rfc7518
+
+I<Since: CryptX-0.059>
+
+Same as L<sign_hash|/sign_hash> only the signature format is as defined by L<https://tools.ietf.org/html/rfc7518>
+(JWA - JSON Web Algorithms).
+
=head2 verify_hash
my $pk = Crypt::PK::ECC->new($pub_key_filename);
my $valid = $pub->verify_hash($signature, $message_hash);
+=head2 verify_hash_rfc7518
+
+I<Since: CryptX-0.059>
+
+Same as L<verify_hash|/verify_hash> only the signature format is as defined by L<https://tools.ietf.org/html/rfc7518>
+(JWA - JSON Web Algorithms).
+
=head2 shared_secret
# Alice having her priv key $pk and Bob's public key $pkb
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 17:18:21 +0000