diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 81f6145f2..ed638f243 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -2,7 +2,7 @@ name: Performance Regression Test on: pull_request: - branches: [main, v6] + branches: [main] jobs: benchmark: diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index a8b7941c6..a9632e4ea 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -4,7 +4,7 @@ on: push: branches: [main] pull_request: - branches: [main, v6] + branches: [main] jobs: lint: diff --git a/.github/workflows/sop-test-suite.yml b/.github/workflows/sop-test-suite.yml index 16b56829f..97a9581d9 100644 --- a/.github/workflows/sop-test-suite.yml +++ b/.github/workflows/sop-test-suite.yml @@ -2,7 +2,7 @@ name: SOP interoperability test suite on: pull_request: - branches: [ main, v6 ] + branches: [ main ] jobs: diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 291c02b30..f467f1789 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -4,7 +4,7 @@ on: push: branches: [main] pull_request: - branches: [main, v6] + branches: [main] jobs: build: # cache both dist and tests (non-lightweight only), based on commit hash diff --git a/docs/AEADEncryptedDataPacket.html b/docs/AEADEncryptedDataPacket.html index 89e6eb80b..7945f1f72 100644 --- a/docs/AEADEncryptedDataPacket.html +++ b/docs/AEADEncryptedDataPacket.html @@ -98,7 +98,7 @@

Source:
@@ -200,7 +200,7 @@
Type:
Source:
@@ -270,7 +270,7 @@
Type:
Source:
@@ -475,7 +475,7 @@
Parameters:
Source:
@@ -717,7 +717,7 @@
Parameters:
Source:
@@ -888,7 +888,7 @@
Parameters:
Source:
@@ -1007,7 +1007,7 @@

writeSource:
diff --git a/docs/Argon2S2K.html b/docs/Argon2S2K.html index 9816949a3..01c3551b5 100644 --- a/docs/Argon2S2K.html +++ b/docs/Argon2S2K.html @@ -152,7 +152,7 @@
Parameters:
Source:
@@ -258,7 +258,7 @@
Type:
Source:
@@ -332,7 +332,7 @@
Type:
Source:
@@ -406,7 +406,7 @@
Type:
Source:
@@ -480,7 +480,7 @@
Type:
Source:
@@ -612,7 +612,7 @@
Parameters:
Source:
@@ -791,7 +791,7 @@
Parameters:
Source:
@@ -903,7 +903,7 @@

writeSource:
diff --git a/docs/CleartextMessage.html b/docs/CleartextMessage.html index d514a841b..0c82abe59 100644 --- a/docs/CleartextMessage.html +++ b/docs/CleartextMessage.html @@ -168,7 +168,7 @@
Parameters:
Source:
@@ -346,7 +346,7 @@
Parameters:
Source:
@@ -461,7 +461,7 @@

getSi
Source:
@@ -573,7 +573,7 @@

getTextSource:
@@ -1046,7 +1046,7 @@
Parameters:
Source:
@@ -1283,7 +1283,7 @@
Parameters:
Source:
diff --git a/docs/CompressedDataPacket.html b/docs/CompressedDataPacket.html index 715ec0cc4..4c88e78a0 100644 --- a/docs/CompressedDataPacket.html +++ b/docs/CompressedDataPacket.html @@ -160,7 +160,7 @@
Parameters:
Source:
@@ -266,7 +266,7 @@
Type:
Source:
@@ -343,7 +343,7 @@
Type:
Source:
@@ -417,7 +417,7 @@
Type:
Source:
@@ -499,7 +499,7 @@

compressSource:
@@ -651,7 +651,7 @@
Parameters:
Source:
@@ -836,7 +836,7 @@
Parameters:
Source:
@@ -926,7 +926,7 @@

writeSource:
diff --git a/docs/Key.html b/docs/Key.html index 592c360ba..39e31a417 100644 --- a/docs/Key.html +++ b/docs/Key.html @@ -96,7 +96,7 @@

new KeySource:
@@ -333,7 +333,7 @@
Parameters:
Source:
@@ -514,7 +514,7 @@
Parameters:
Source:
@@ -626,7 +626,7 @@

getAl
Source:
@@ -738,7 +738,7 @@

getCre
Source:
@@ -1006,7 +1006,7 @@

Parameters:
Source:
@@ -1225,7 +1225,7 @@
Parameters:
Source:
@@ -1333,7 +1333,7 @@

getFing
Source:
@@ -1445,7 +1445,7 @@

getKeyIDSource:
@@ -1557,7 +1557,7 @@

getKeyIDsSource:
@@ -1735,7 +1735,7 @@
Parameters:
Source:
@@ -1977,7 +1977,7 @@
Parameters:
Source:
@@ -2220,7 +2220,7 @@
Parameters:
Source:
@@ -2425,7 +2425,7 @@
Parameters:
Source:
@@ -2717,7 +2717,7 @@
Parameters:
Source:
@@ -2911,7 +2911,7 @@
Parameters:
Source:
@@ -3023,7 +3023,7 @@

getUserIDs<
Source:
@@ -3135,7 +3135,7 @@

h
Source:
@@ -3412,7 +3412,7 @@

Parameters:
Source:
@@ -3596,7 +3596,7 @@
Parameters:
Source:
@@ -3811,7 +3811,7 @@
Parameters:
Source:
@@ -4081,7 +4081,7 @@
Parameters:
Source:
@@ -4193,7 +4193,7 @@

toPacketL
Source:
@@ -4434,7 +4434,7 @@

Parameters:
Source:
@@ -4677,7 +4677,7 @@
Parameters:
Source:
@@ -4918,7 +4918,7 @@
Parameters:
Source:
@@ -5201,7 +5201,7 @@
Parameters:
Source:
@@ -5314,7 +5314,7 @@

writeSource:
diff --git a/docs/LiteralDataPacket.html b/docs/LiteralDataPacket.html index 14870d200..90f6cd0e6 100644 --- a/docs/LiteralDataPacket.html +++ b/docs/LiteralDataPacket.html @@ -147,7 +147,7 @@
Parameters:
Source:
@@ -326,7 +326,7 @@
Parameters:
Source:
@@ -441,7 +441,7 @@

getFilenam
Source:
@@ -623,7 +623,7 @@

Parameters:
Source:
@@ -790,7 +790,7 @@
Parameters:
Source:
@@ -977,7 +977,7 @@
Parameters:
Source:
@@ -1116,7 +1116,7 @@
Parameters:
Source:
@@ -1302,7 +1302,7 @@
Parameters:
Source:
@@ -1392,7 +1392,7 @@

writeSource:
@@ -1507,7 +1507,7 @@

writeHeade
Source:
diff --git a/docs/MarkerPacket.html b/docs/MarkerPacket.html index cbe36d196..73791ed87 100644 --- a/docs/MarkerPacket.html +++ b/docs/MarkerPacket.html @@ -106,7 +106,7 @@

new Marke
Source:
@@ -265,7 +265,7 @@

Parameters:
Source:
diff --git a/docs/Message.html b/docs/Message.html index b0433107b..674a133f5 100644 --- a/docs/Message.html +++ b/docs/Message.html @@ -146,7 +146,7 @@
Parameters:
Source:
@@ -661,7 +661,7 @@
Parameters:
Source:
@@ -933,7 +933,7 @@
Parameters:
Source:
@@ -1140,7 +1140,7 @@
Parameters:
Source:
@@ -1291,7 +1291,7 @@
Parameters:
Source:
@@ -1495,7 +1495,7 @@
Parameters:
Source:
@@ -1800,7 +1800,7 @@
Parameters:
Source:
@@ -2105,7 +2105,7 @@
Parameters:
Source:
@@ -2545,7 +2545,7 @@
Parameters:
Source:
@@ -2657,7 +2657,7 @@

ge
Source:
@@ -2769,7 +2769,7 @@

getFilenam
Source:
@@ -2884,7 +2884,7 @@

getLite
Source:
@@ -2999,7 +2999,7 @@

getSi
Source:
@@ -3111,7 +3111,7 @@

getTextSource:
@@ -3587,7 +3587,7 @@
Parameters:
Source:
@@ -4060,7 +4060,7 @@
Parameters:
Source:
@@ -4172,7 +4172,7 @@

unwra
Source:
@@ -4409,7 +4409,7 @@

Parameters:
Source:
@@ -4675,7 +4675,7 @@
Parameters:
Source:
@@ -4787,7 +4787,7 @@

writeSource:
diff --git a/docs/OnePassSignaturePacket.html b/docs/OnePassSignaturePacket.html index c311d3563..9a4e55bc0 100644 --- a/docs/OnePassSignaturePacket.html +++ b/docs/OnePassSignaturePacket.html @@ -101,7 +101,7 @@

Source:
@@ -199,7 +199,7 @@

flagsSource:
@@ -273,7 +273,7 @@
Type:
Source:
@@ -344,7 +344,7 @@

issu
Source:
@@ -408,7 +408,7 @@

issuerKeyI
Source:
@@ -482,7 +482,7 @@

Type:
Source:
@@ -553,7 +553,7 @@

saltSource:
@@ -629,7 +629,7 @@
Type:
Source:
@@ -693,7 +693,7 @@

versionSource:
@@ -824,7 +824,7 @@
Parameters:
Source:
@@ -936,7 +936,7 @@

writeSource:
diff --git a/docs/PacketList.html b/docs/PacketList.html index c486d91d5..e4201b5bd 100644 --- a/docs/PacketList.html +++ b/docs/PacketList.html @@ -97,7 +97,7 @@

new PacketL
Source:
@@ -345,7 +345,7 @@

Parameters:
Source:
@@ -530,7 +530,7 @@
Parameters:
Source:
@@ -687,7 +687,7 @@
Parameters:
Source:
@@ -859,7 +859,7 @@
Parameters:
Source:
@@ -1097,7 +1097,7 @@
Parameters:
Source:
@@ -1200,7 +1200,7 @@

writeSource:
diff --git a/docs/PaddingPacket.html b/docs/PaddingPacket.html index 5fdbb0bae..c98c5bc14 100644 --- a/docs/PaddingPacket.html +++ b/docs/PaddingPacket.html @@ -97,7 +97,7 @@

new Padd
Source:
@@ -256,7 +256,7 @@

Parameters:
Source:
@@ -427,7 +427,7 @@
Parameters:
Source:
@@ -517,7 +517,7 @@

writeSource:
diff --git a/docs/PrivateKey.html b/docs/PrivateKey.html index 5e0b53ade..25901aae5 100644 --- a/docs/PrivateKey.html +++ b/docs/PrivateKey.html @@ -144,7 +144,7 @@
Parameters:
Source:
@@ -453,7 +453,7 @@
Parameters:
Source:
@@ -622,7 +622,7 @@
Parameters:
Source:
@@ -734,7 +734,7 @@

cle
Source:
@@ -979,7 +979,7 @@

Parameters:
Source:
@@ -1121,7 +1121,7 @@

isDecrypte
Source:
@@ -1211,7 +1211,7 @@

isPrivateSource:
@@ -1514,7 +1514,7 @@
Properties
Source:
@@ -1626,7 +1626,7 @@

toPublicSource:
@@ -1803,7 +1803,7 @@
Parameters:
Source:
diff --git a/docs/PublicKey.html b/docs/PublicKey.html index 88674e47c..6b45c389f 100644 --- a/docs/PublicKey.html +++ b/docs/PublicKey.html @@ -144,7 +144,7 @@
Parameters:
Source:
@@ -315,7 +315,7 @@
Parameters:
Source:
@@ -427,7 +427,7 @@

isPrivateSource:
@@ -535,7 +535,7 @@

toPublicSource:
diff --git a/docs/PublicKeyEncryptedSessionKeyPacket.html b/docs/PublicKeyEncryptedSessionKeyPacket.html index 825f88c51..039c82335 100644 --- a/docs/PublicKeyEncryptedSessionKeyPacket.html +++ b/docs/PublicKeyEncryptedSessionKeyPacket.html @@ -107,7 +107,7 @@

Source:
@@ -209,7 +209,7 @@
Type:
Source:
@@ -283,7 +283,7 @@
Type:
Source:
@@ -458,7 +458,7 @@
Parameters:
Source:
@@ -626,7 +626,7 @@
Parameters:
Source:
@@ -794,7 +794,7 @@
Parameters:
Source:
@@ -884,7 +884,7 @@

writeSource:
diff --git a/docs/PublicKeyPacket.html b/docs/PublicKeyPacket.html index 1cd076879..97d6adcae 100644 --- a/docs/PublicKeyPacket.html +++ b/docs/PublicKeyPacket.html @@ -195,7 +195,7 @@
Parameters:
Source:
@@ -301,7 +301,7 @@
Type:
Source:
@@ -375,7 +375,7 @@
Type:
Source:
@@ -449,7 +449,7 @@
Type:
Source:
@@ -523,7 +523,7 @@
Type:
Source:
@@ -597,7 +597,7 @@
Type:
Source:
@@ -671,7 +671,7 @@
Type:
Source:
@@ -735,7 +735,7 @@

readPubl
Source:
@@ -816,7 +816,7 @@

Type:
Source:
@@ -880,7 +880,7 @@

writePu
Source:
@@ -1018,7 +1018,7 @@

Parameters:
Source:
@@ -1130,7 +1130,7 @@

(async) Source:
@@ -1220,7 +1220,7 @@

(a
Source:
@@ -1310,7 +1310,7 @@

getAl
Source:
@@ -1422,7 +1422,7 @@

getCre
Source:
@@ -1530,7 +1530,7 @@

getFing
Source:
@@ -1642,7 +1642,7 @@

ge
Source:
@@ -1754,7 +1754,7 @@

getKeyIDSource:
@@ -1866,7 +1866,7 @@

h
Source:
@@ -1978,7 +1978,7 @@

isDecrypte
Source:
@@ -2138,7 +2138,7 @@

Parameters:
Source:
@@ -2250,7 +2250,7 @@

writeSource:
@@ -2411,7 +2411,7 @@
Parameters:
Source:
diff --git a/docs/PublicSubkeyPacket.html b/docs/PublicSubkeyPacket.html index 0d3636790..957b69f7f 100644 --- a/docs/PublicSubkeyPacket.html +++ b/docs/PublicSubkeyPacket.html @@ -193,7 +193,7 @@
Parameters:
Source:
@@ -315,7 +315,7 @@
Type:
Source:
@@ -394,7 +394,7 @@
Type:
Source:
@@ -473,7 +473,7 @@
Type:
Source:
@@ -552,7 +552,7 @@
Type:
Source:
@@ -631,7 +631,7 @@
Type:
Source:
@@ -710,7 +710,7 @@
Type:
Source:
@@ -779,7 +779,7 @@

readPubl
Source:
@@ -865,7 +865,7 @@

Type:
Source:
@@ -934,7 +934,7 @@

writePu
Source:
@@ -1072,7 +1072,7 @@

Parameters:
Source:
@@ -1189,7 +1189,7 @@

(async) Source:
@@ -1284,7 +1284,7 @@

(a
Source:
@@ -1379,7 +1379,7 @@

getAl
Source:
@@ -1496,7 +1496,7 @@

getCre
Source:
@@ -1609,7 +1609,7 @@

getFing
Source:
@@ -1726,7 +1726,7 @@

ge
Source:
@@ -1843,7 +1843,7 @@

getKeyIDSource:
@@ -1960,7 +1960,7 @@

h
Source:
@@ -2077,7 +2077,7 @@

isDecrypte
Source:
@@ -2242,7 +2242,7 @@

Parameters:
Source:
@@ -2359,7 +2359,7 @@

writeSource:
@@ -2525,7 +2525,7 @@
Parameters:
Source:
diff --git a/docs/SecretKeyPacket.html b/docs/SecretKeyPacket.html index cbcf7c3c1..e6e8f7bcf 100644 --- a/docs/SecretKeyPacket.html +++ b/docs/SecretKeyPacket.html @@ -191,7 +191,7 @@
Parameters:
Source:
@@ -308,7 +308,7 @@
Type:
Source:
@@ -387,7 +387,7 @@
Type:
Source:
@@ -466,7 +466,7 @@
Type:
Source:
@@ -545,7 +545,7 @@
Type:
Source:
@@ -624,7 +624,7 @@
Type:
Source:
@@ -688,7 +688,7 @@

isEncrypte
Source:
@@ -767,7 +767,7 @@

Type:
Source:
@@ -831,7 +831,7 @@

keyMateria
Source:
@@ -905,7 +905,7 @@

Type:
Source:
@@ -984,7 +984,7 @@
Type:
Source:
@@ -1053,7 +1053,7 @@

readPubl
Source:
@@ -1134,7 +1134,7 @@

Type:
Source:
@@ -1208,7 +1208,7 @@
Type:
Source:
@@ -1282,7 +1282,7 @@
Type:
Source:
@@ -1361,7 +1361,7 @@
Type:
Source:
@@ -1430,7 +1430,7 @@

writePu
Source:
@@ -1519,7 +1519,7 @@

cle
Source:
@@ -1614,7 +1614,7 @@

(async) Source:
@@ -1709,7 +1709,7 @@

(a
Source:
@@ -1851,7 +1851,7 @@
Parameters:
Source:
@@ -2065,7 +2065,7 @@
Parameters:
Source:
@@ -2189,7 +2189,7 @@

getAl
Source:
@@ -2306,7 +2306,7 @@

getCre
Source:
@@ -2419,7 +2419,7 @@

getFing
Source:
@@ -2536,7 +2536,7 @@

ge
Source:
@@ -2653,7 +2653,7 @@

getKeyIDSource:
@@ -2770,7 +2770,7 @@

h
Source:
@@ -2888,7 +2888,7 @@

isDecrypte
Source:
@@ -2999,7 +2999,7 @@

isDummySource:
@@ -3114,7 +3114,7 @@

Source:
@@ -3266,7 +3266,7 @@
Parameters:
Source:
@@ -3411,7 +3411,7 @@
Parameters:
Source:
@@ -3501,7 +3501,7 @@

(async) valid
Source:
@@ -3625,7 +3625,7 @@

writeSource:
@@ -3791,7 +3791,7 @@
Parameters:
Source:
diff --git a/docs/SecretSubkeyPacket.html b/docs/SecretSubkeyPacket.html index bd3548126..32c044f11 100644 --- a/docs/SecretSubkeyPacket.html +++ b/docs/SecretSubkeyPacket.html @@ -190,7 +190,7 @@
Parameters:
Source:
@@ -312,7 +312,7 @@
Type:
Source:
@@ -391,7 +391,7 @@
Type:
Source:
@@ -470,7 +470,7 @@
Type:
Source:
@@ -549,7 +549,7 @@
Type:
Source:
@@ -628,7 +628,7 @@
Type:
Source:
@@ -697,7 +697,7 @@

isEncrypte
Source:
@@ -776,7 +776,7 @@

Type:
Source:
@@ -845,7 +845,7 @@

keyMateria
Source:
@@ -924,7 +924,7 @@

Type:
Source:
@@ -1003,7 +1003,7 @@
Type:
Source:
@@ -1072,7 +1072,7 @@

readPubl
Source:
@@ -1158,7 +1158,7 @@

Type:
Source:
@@ -1237,7 +1237,7 @@
Type:
Source:
@@ -1316,7 +1316,7 @@
Type:
Source:
@@ -1395,7 +1395,7 @@
Type:
Source:
@@ -1464,7 +1464,7 @@

writePu
Source:
@@ -1558,7 +1558,7 @@

cle
Source:
@@ -1653,7 +1653,7 @@

(async) Source:
@@ -1748,7 +1748,7 @@

(a
Source:
@@ -1895,7 +1895,7 @@
Parameters:
Source:
@@ -2114,7 +2114,7 @@
Parameters:
Source:
@@ -2238,7 +2238,7 @@

getAl
Source:
@@ -2355,7 +2355,7 @@

getCre
Source:
@@ -2468,7 +2468,7 @@

getFing
Source:
@@ -2585,7 +2585,7 @@

ge
Source:
@@ -2702,7 +2702,7 @@

getKeyIDSource:
@@ -2819,7 +2819,7 @@

h
Source:
@@ -2937,7 +2937,7 @@

isDecrypte
Source:
@@ -3053,7 +3053,7 @@

isDummySource:
@@ -3173,7 +3173,7 @@

Source:
@@ -3330,7 +3330,7 @@
Parameters:
Source:
@@ -3475,7 +3475,7 @@
Parameters:
Source:
@@ -3570,7 +3570,7 @@

(async) valid
Source:
@@ -3694,7 +3694,7 @@

writeSource:
@@ -3860,7 +3860,7 @@
Parameters:
Source:
diff --git a/docs/Signature.html b/docs/Signature.html index 1215c0a2c..75d2928cd 100644 --- a/docs/Signature.html +++ b/docs/Signature.html @@ -144,7 +144,7 @@
Parameters:
Source:
@@ -322,7 +322,7 @@
Parameters:
Source:
@@ -434,7 +434,7 @@

getSi
Source:
@@ -546,7 +546,7 @@

writeSource:
diff --git a/docs/SignaturePacket.html b/docs/SignaturePacket.html index 75111021d..ad3cbbdec 100644 --- a/docs/SignaturePacket.html +++ b/docs/SignaturePacket.html @@ -99,7 +99,7 @@

new Si
Source:
@@ -201,7 +201,7 @@

Type:
Source:
@@ -271,7 +271,7 @@
Type:
Source:
@@ -341,7 +341,7 @@
Type:
Source:
@@ -423,7 +423,7 @@

getE
Source:
@@ -599,7 +599,7 @@

Parameters:
Source:
@@ -760,7 +760,7 @@
Parameters:
Source:
@@ -1048,7 +1048,7 @@
Parameters:
Source:
@@ -1427,7 +1427,7 @@
Parameters:
Source:
@@ -1546,7 +1546,7 @@

Source:
@@ -1654,7 +1654,7 @@

writeParam
Source:
@@ -1765,7 +1765,7 @@

Source:
diff --git a/docs/SymEncryptedIntegrityProtectedDataPacket.html b/docs/SymEncryptedIntegrityProtectedDataPacket.html index ef67ec952..5c6eacc03 100644 --- a/docs/SymEncryptedIntegrityProtectedDataPacket.html +++ b/docs/SymEncryptedIntegrityProtectedDataPacket.html @@ -101,7 +101,7 @@

Source:
@@ -203,7 +203,7 @@
Type:
Source:
@@ -273,7 +273,7 @@
Type:
Source:
@@ -478,7 +478,7 @@
Parameters:
Source:
@@ -738,7 +738,7 @@
Parameters:
Source:
diff --git a/docs/SymEncryptedSessionKeyPacket.html b/docs/SymEncryptedSessionKeyPacket.html index 3ab8e0e16..d932fcf42 100644 --- a/docs/SymEncryptedSessionKeyPacket.html +++ b/docs/SymEncryptedSessionKeyPacket.html @@ -165,7 +165,7 @@
Parameters:
Source:
@@ -271,7 +271,7 @@
Type:
Source:
@@ -345,7 +345,7 @@
Type:
Source:
@@ -419,7 +419,7 @@
Type:
Source:
@@ -550,7 +550,7 @@
Parameters:
Source:
@@ -761,7 +761,7 @@
Parameters:
Source:
@@ -929,7 +929,7 @@
Parameters:
Source:
@@ -1019,7 +1019,7 @@

writeSource:
diff --git a/docs/SymmetricallyEncryptedDataPacket.html b/docs/SymmetricallyEncryptedDataPacket.html index 3524b8a3b..0bd5ace24 100644 --- a/docs/SymmetricallyEncryptedDataPacket.html +++ b/docs/SymmetricallyEncryptedDataPacket.html @@ -101,7 +101,7 @@

Source:
@@ -197,7 +197,7 @@

encryptedSource:
@@ -271,7 +271,7 @@
Type:
Source:
@@ -477,7 +477,7 @@
Parameters:
Source:
@@ -720,7 +720,7 @@
Parameters:
Source:
diff --git a/docs/TrustPacket.html b/docs/TrustPacket.html index 248bd09a8..d5bd10b09 100644 --- a/docs/TrustPacket.html +++ b/docs/TrustPacket.html @@ -105,7 +105,7 @@

new TrustP
Source:
@@ -216,7 +216,7 @@

readSource:
diff --git a/docs/UserAttributePacket.html b/docs/UserAttributePacket.html index 9bab19e42..c8e05fcdb 100644 --- a/docs/UserAttributePacket.html +++ b/docs/UserAttributePacket.html @@ -107,7 +107,7 @@

ne
Source:
@@ -266,7 +266,7 @@

Parameters:
Source:
@@ -427,7 +427,7 @@
Parameters:
Source:
@@ -517,7 +517,7 @@

writeSource:
diff --git a/docs/UserIDPacket.html b/docs/UserIDPacket.html index 604333df6..33167dc67 100644 --- a/docs/UserIDPacket.html +++ b/docs/UserIDPacket.html @@ -100,7 +100,7 @@

new UserI
Source:
@@ -207,7 +207,7 @@

Type:
Source:
@@ -338,7 +338,7 @@
Parameters:
Source:
@@ -495,7 +495,7 @@
Parameters:
Source:
@@ -585,7 +585,7 @@

writeSource:
diff --git a/docs/global.html b/docs/global.html index 5e9e62543..8f2543ffd 100644 --- a/docs/global.html +++ b/docs/global.html @@ -419,7 +419,7 @@
Parameters:
Source:
@@ -632,7 +632,7 @@
Properties
Source:
@@ -771,7 +771,7 @@
Parameters:
Source:
@@ -1180,7 +1180,7 @@
Properties
Source:
@@ -1761,7 +1761,7 @@
Properties
Source:
@@ -2064,7 +2064,7 @@
Properties
Source:
@@ -2423,7 +2423,7 @@
Properties
Source:
@@ -3227,7 +3227,7 @@
Properties
Source:
@@ -3515,7 +3515,7 @@
Properties
Source:
@@ -4135,7 +4135,7 @@
Properties
Source:
@@ -4351,7 +4351,7 @@
Parameters:
Source:
@@ -4952,7 +4952,7 @@
Properties
Source:
@@ -5302,7 +5302,7 @@
Properties
Source:
@@ -5463,7 +5463,7 @@
Parameters:
Source:
@@ -5602,7 +5602,7 @@
Parameters:
Source:
@@ -5741,7 +5741,7 @@
Parameters:
Source:
@@ -5891,7 +5891,7 @@
Parameters:
Source:
@@ -6071,7 +6071,7 @@
Parameters:
Source:
@@ -6215,7 +6215,7 @@

newS2
Source:
@@ -6405,7 +6405,7 @@

Parameters:
Source:
@@ -6797,7 +6797,7 @@
Parameters:
Source:
@@ -7038,7 +7038,7 @@
Properties
Source:
@@ -7326,7 +7326,7 @@
Properties
Source:
@@ -7614,7 +7614,7 @@
Properties
Source:
@@ -7908,7 +7908,7 @@
Properties
Source:
@@ -8196,7 +8196,7 @@
Properties
Source:
@@ -8484,7 +8484,7 @@
Properties
Source:
@@ -8772,7 +8772,7 @@
Properties
Source:
@@ -9234,7 +9234,7 @@
Properties
Source:
@@ -9763,7 +9763,7 @@
Properties
Source:
@@ -9978,7 +9978,7 @@
Parameters:
Source:
@@ -10607,7 +10607,7 @@
Properties
Source:
@@ -10769,7 +10769,7 @@
Parameters:
Source:
@@ -11231,7 +11231,7 @@
Properties
Source:
@@ -11476,7 +11476,7 @@
Parameters:
Source:
@@ -11656,7 +11656,7 @@
Parameters:
Source:
diff --git a/docs/module-config.html b/docs/module-config.html index 9a214e8f6..a6f2e538f 100644 --- a/docs/module-config.html +++ b/docs/module-config.html @@ -89,7 +89,7 @@

Module: config

Source:
@@ -247,7 +247,7 @@
Properties:
Source:
@@ -365,7 +365,7 @@
Properties:
Source:
@@ -489,7 +489,7 @@
Properties:
Source:
@@ -614,7 +614,7 @@
Properties:
Source:
@@ -733,7 +733,7 @@
Properties:
Source:
@@ -854,7 +854,7 @@
Properties:
Source:
@@ -979,7 +979,7 @@
Properties:
Source:
@@ -1091,7 +1091,7 @@
Properties:
Source:
@@ -1213,7 +1213,7 @@
Properties:
Source:
@@ -1331,7 +1331,7 @@
Properties:
Source:
@@ -1443,7 +1443,7 @@
Properties:
Source:
@@ -1555,7 +1555,7 @@
Properties:
Source:
@@ -1672,7 +1672,7 @@
Properties:
Source:
@@ -1788,7 +1788,7 @@
Properties:
Source:
@@ -1905,7 +1905,7 @@
Properties:
Source:
@@ -2022,7 +2022,7 @@
Properties:
Source:
@@ -2139,7 +2139,7 @@
Properties:
Source:
@@ -2251,7 +2251,7 @@
Properties:
Source:
@@ -2363,7 +2363,7 @@
Properties:
Source:
@@ -2475,7 +2475,7 @@
Properties:
Source:
@@ -2591,7 +2591,7 @@
Properties:
Source:
@@ -2707,7 +2707,7 @@
Properties:
Source:
@@ -2823,7 +2823,7 @@
Properties:
Source:
@@ -2939,7 +2939,7 @@
Properties:
Source:
@@ -3154,7 +3154,7 @@
Properties
Source:
@@ -3273,7 +3273,7 @@
Properties:
Source:
@@ -3395,7 +3395,7 @@
Properties:
Source:
@@ -3507,7 +3507,7 @@
Properties:
Source:
@@ -3619,7 +3619,7 @@
Properties:
Source:
@@ -3736,7 +3736,7 @@
Properties:
Source:
@@ -3854,7 +3854,7 @@
Properties:
Source:
@@ -3966,7 +3966,7 @@
Properties:
Source:
diff --git a/docs/module-crypto.html b/docs/module-crypto.html index 0a6eefd81..cb95e2fda 100644 --- a/docs/module-crypto.html +++ b/docs/module-crypto.html @@ -89,7 +89,7 @@

Module: crypto

Source:
diff --git a/docs/module-crypto_aes_kw.html b/docs/module-crypto_aes_kw.html index 0afc8d30e..f7bc5ea31 100644 --- a/docs/module-crypto_aes_kw.html +++ b/docs/module-crypto_aes_kw.html @@ -89,7 +89,7 @@

Module: crypto/aes_kw

Source:
@@ -308,7 +308,7 @@
Parameters:
Source:
@@ -521,7 +521,7 @@
Parameters:
Source:
diff --git a/docs/module-crypto_cmac.html b/docs/module-crypto_cmac.html index 0b8996727..ccd342e9e 100644 --- a/docs/module-crypto_cmac.html +++ b/docs/module-crypto_cmac.html @@ -90,7 +90,7 @@

Module: crypto/cmac

Source:
@@ -195,7 +195,7 @@

(inner, constant
Source:
@@ -352,7 +352,7 @@
Parameters:
Source:
diff --git a/docs/module-crypto_crypto.html b/docs/module-crypto_crypto.html index 1d3e93916..78a882bf0 100644 --- a/docs/module-crypto_crypto.html +++ b/docs/module-crypto_crypto.html @@ -90,7 +90,7 @@

Module: crypto/crypto

Source:
@@ -296,7 +296,7 @@
Parameters:
Source:
@@ -458,7 +458,7 @@
Parameters:
Source:
@@ -619,7 +619,7 @@
Parameters:
Source:
@@ -848,7 +848,7 @@
Parameters:
Source:
@@ -1030,7 +1030,7 @@
Parameters:
Source:
@@ -1170,7 +1170,7 @@
Parameters:
Source:
@@ -1354,7 +1354,7 @@
Parameters:
Source:
@@ -1561,7 +1561,7 @@
Parameters:
Source:
@@ -1745,7 +1745,7 @@
Parameters:
Source:
@@ -2075,7 +2075,7 @@
Parameters:
Source:
@@ -2361,7 +2361,7 @@
Parameters:
Source:
@@ -2545,7 +2545,7 @@
Parameters:
Source:
@@ -2752,7 +2752,7 @@
Parameters:
Source:
@@ -2913,7 +2913,7 @@
Parameters:
Source:
diff --git a/docs/module-crypto_hash.html b/docs/module-crypto_hash.html index c53435597..6aa49062e 100644 --- a/docs/module-crypto_hash.html +++ b/docs/module-crypto_hash.html @@ -89,7 +89,7 @@

Module: crypto/hash

Source:
@@ -191,7 +191,7 @@

(static) md5Source:
@@ -352,7 +352,7 @@
Parameters:
Source:
@@ -513,7 +513,7 @@
Parameters:
Source:
diff --git a/docs/module-crypto_hkdf.html b/docs/module-crypto_hkdf.html index ea221dada..dc9a15034 100644 --- a/docs/module-crypto_hkdf.html +++ b/docs/module-crypto_hkdf.html @@ -89,7 +89,7 @@

Module: crypto/hkdf

Source:
diff --git a/docs/module-crypto_mode.html b/docs/module-crypto_mode.html index e6d2c5566..88ea03cf7 100644 --- a/docs/module-crypto_mode.html +++ b/docs/module-crypto_mode.html @@ -89,7 +89,7 @@

Module: crypto/mode

Source:
@@ -182,7 +182,7 @@

(static) cfbSource:
@@ -249,7 +249,7 @@

(static) eaxSource:
@@ -316,7 +316,7 @@

(static) gcmSource:
@@ -383,7 +383,7 @@

(static) ocbSource:
diff --git a/docs/module-crypto_mode_cfb.html b/docs/module-crypto_mode_cfb.html index 882a4eeee..ada890e41 100644 --- a/docs/module-crypto_mode_cfb.html +++ b/docs/module-crypto_mode_cfb.html @@ -236,7 +236,7 @@
Parameters:
Source:
@@ -477,7 +477,7 @@
Parameters:
Source:
diff --git a/docs/module-crypto_mode_eax.html b/docs/module-crypto_mode_eax.html index a03060b6b..b767a0785 100644 --- a/docs/module-crypto_mode_eax.html +++ b/docs/module-crypto_mode_eax.html @@ -90,7 +90,7 @@

Module: crypto/mode/eax

Source:
@@ -296,7 +296,7 @@
Parameters:
Source:
@@ -480,7 +480,7 @@
Parameters:
Source:
@@ -665,7 +665,7 @@
Parameters:
Source:
diff --git a/docs/module-crypto_mode_gcm.html b/docs/module-crypto_mode_gcm.html index cf4c9a9dd..b0797f522 100644 --- a/docs/module-crypto_mode_gcm.html +++ b/docs/module-crypto_mode_gcm.html @@ -90,7 +90,7 @@

Module: crypto/mode/gcm

Source:
@@ -273,7 +273,7 @@
Parameters:
Source:
diff --git a/docs/module-crypto_mode_ocb.html b/docs/module-crypto_mode_ocb.html index 01d34eec6..e01d6e9f1 100644 --- a/docs/module-crypto_mode_ocb.html +++ b/docs/module-crypto_mode_ocb.html @@ -89,7 +89,7 @@

Module: crypto/mode/ocb

Source:
@@ -295,7 +295,7 @@
Parameters:
Source:
@@ -502,7 +502,7 @@
Parameters:
Source:
@@ -686,7 +686,7 @@
Parameters:
Source:
diff --git a/docs/module-crypto_pkcs1.html b/docs/module-crypto_pkcs1.html index 65b28dbe9..91d12fcdf 100644 --- a/docs/module-crypto_pkcs1.html +++ b/docs/module-crypto_pkcs1.html @@ -89,7 +89,7 @@

Module: crypto/pkcs1

Source:
@@ -197,7 +197,7 @@

(inner, constan
Source:
@@ -358,7 +358,7 @@
Parameters:
Source:
@@ -578,7 +578,7 @@
Parameters:
Source:
@@ -792,7 +792,7 @@
Parameters:
Source:
diff --git a/docs/module-crypto_public_key.html b/docs/module-crypto_public_key.html index 8ee532c1f..9b67dee6e 100644 --- a/docs/module-crypto_public_key.html +++ b/docs/module-crypto_public_key.html @@ -89,7 +89,7 @@

Module: crypto/public_key

Source:
@@ -182,7 +182,7 @@

(static) dsaSource:
@@ -249,7 +249,7 @@

(static) elga
Source:
@@ -316,7 +316,7 @@

(static) ell
Source:
@@ -383,7 +383,7 @@

(static) rsaSource:
diff --git a/docs/module-crypto_public_key_dsa.html b/docs/module-crypto_public_key_dsa.html index 55050bcf3..65c3264d9 100644 --- a/docs/module-crypto_public_key_dsa.html +++ b/docs/module-crypto_public_key_dsa.html @@ -89,7 +89,7 @@

Module: crypto/public_key/dsa

Source:
@@ -188,7 +188,7 @@

(inner) xSource:
@@ -434,7 +434,7 @@
Parameters:
Source:
@@ -683,7 +683,7 @@
Parameters:
Source:
@@ -1005,7 +1005,7 @@
Parameters:
Source:
diff --git a/docs/module-crypto_public_key_elgamal.html b/docs/module-crypto_public_key_elgamal.html index 93dd3c18a..27f952573 100644 --- a/docs/module-crypto_public_key_elgamal.html +++ b/docs/module-crypto_public_key_elgamal.html @@ -89,7 +89,7 @@

Module: crypto/public_key/elgamal

Source:
@@ -188,7 +188,7 @@

(inner) xSource:
@@ -412,7 +412,7 @@
Parameters:
Source:
@@ -672,7 +672,7 @@
Parameters:
Source:
@@ -898,7 +898,7 @@
Parameters:
Source:
diff --git a/docs/module-crypto_public_key_elliptic.html b/docs/module-crypto_public_key_elliptic.html index 988cdaaed..89181da09 100644 --- a/docs/module-crypto_public_key_elliptic.html +++ b/docs/module-crypto_public_key_elliptic.html @@ -89,7 +89,7 @@

Module: crypto/public_key/elliptic

Source:
diff --git a/docs/module-crypto_public_key_elliptic_curve.html b/docs/module-crypto_public_key_elliptic_curve.html index f44e400c6..22c2196f2 100644 --- a/docs/module-crypto_public_key_elliptic_curve.html +++ b/docs/module-crypto_public_key_elliptic_curve.html @@ -89,7 +89,7 @@

Module: crypto/public_key/elliptic/curve

Source:
@@ -201,7 +201,7 @@

(i
Source:
@@ -340,7 +340,7 @@
Parameters:
Source:
@@ -497,7 +497,7 @@
Parameters:
Source:
@@ -723,7 +723,7 @@
Parameters:
Source:
@@ -926,7 +926,7 @@
Parameters:
Source:
@@ -1157,7 +1157,7 @@
Parameters:
Source:
diff --git a/docs/module-crypto_public_key_elliptic_ecdh.html b/docs/module-crypto_public_key_elliptic_ecdh.html index d886f4dd6..8ac536a6f 100644 --- a/docs/module-crypto_public_key_elliptic_ecdh.html +++ b/docs/module-crypto_public_key_elliptic_ecdh.html @@ -91,7 +91,7 @@

Module: crypto/public_key/elliptic/ecdh

Source:
@@ -169,7 +169,7 @@

Module: crypto/public_key/elliptic/ecdh

Source:
@@ -467,7 +467,7 @@
Parameters:
Source:
@@ -720,7 +720,7 @@
Parameters:
Source:
@@ -973,7 +973,7 @@
Parameters:
Source:
@@ -1176,7 +1176,7 @@
Parameters:
Source:
@@ -1337,7 +1337,7 @@
Parameters:
Source:
@@ -1445,7 +1445,7 @@

Source:
@@ -1652,7 +1652,7 @@
Parameters:
Source:
@@ -1859,7 +1859,7 @@
Parameters:
Source:
@@ -2022,7 +2022,7 @@
Parameters:
Source:
@@ -2230,7 +2230,7 @@
Parameters:
Source:
@@ -2410,7 +2410,7 @@
Parameters:
Source:
@@ -2613,7 +2613,7 @@
Parameters:
Source:
@@ -2793,7 +2793,7 @@
Parameters:
Source:
@@ -3019,7 +3019,7 @@
Parameters:
Source:
@@ -3199,7 +3199,7 @@
Parameters:
Source:
@@ -3330,7 +3330,7 @@
Returns:
Source:
@@ -3408,7 +3408,7 @@
Returns:
Source:
@@ -3706,7 +3706,7 @@
Parameters:
Source:
@@ -3959,7 +3959,7 @@
Parameters:
Source:
@@ -4212,7 +4212,7 @@
Parameters:
Source:
@@ -4415,7 +4415,7 @@
Parameters:
Source:
@@ -4576,7 +4576,7 @@
Parameters:
Source:
@@ -4684,7 +4684,7 @@

Source:
@@ -4891,7 +4891,7 @@
Parameters:
Source:
@@ -5098,7 +5098,7 @@
Parameters:
Source:
@@ -5261,7 +5261,7 @@
Parameters:
Source:
@@ -5469,7 +5469,7 @@
Parameters:
Source:
@@ -5649,7 +5649,7 @@
Parameters:
Source:
@@ -5852,7 +5852,7 @@
Parameters:
Source:
@@ -6032,7 +6032,7 @@
Parameters:
Source:
@@ -6258,7 +6258,7 @@
Parameters:
Source:
@@ -6438,7 +6438,7 @@
Parameters:
Source:
diff --git a/docs/module-crypto_public_key_elliptic_ecdsa.html b/docs/module-crypto_public_key_elliptic_ecdsa.html index 0eb1c0a18..757049578 100644 --- a/docs/module-crypto_public_key_elliptic_ecdsa.html +++ b/docs/module-crypto_public_key_elliptic_ecdsa.html @@ -89,7 +89,7 @@

Module: crypto/public_key/elliptic/ecdsa

Source:
@@ -364,7 +364,7 @@
Parameters:
Source:
@@ -571,7 +571,7 @@
Parameters:
Source:
@@ -847,7 +847,7 @@
Parameters:
Source:
@@ -956,7 +956,7 @@

(async, inner) Source:
diff --git a/docs/module-crypto_public_key_elliptic_eddsa.html b/docs/module-crypto_public_key_elliptic_eddsa.html index e33bc6b06..f1bf5df52 100644 --- a/docs/module-crypto_public_key_elliptic_eddsa.html +++ b/docs/module-crypto_public_key_elliptic_eddsa.html @@ -89,7 +89,7 @@

Module: crypto/public_key/elliptic/eddsa

Source:
@@ -249,7 +249,7 @@
Parameters:
Source:
@@ -521,7 +521,7 @@
Parameters:
Source:
@@ -751,7 +751,7 @@
Parameters:
Source:
@@ -1027,7 +1027,7 @@
Parameters:
Source:
diff --git a/docs/module-crypto_public_key_elliptic_eddsa_legacy.html b/docs/module-crypto_public_key_elliptic_eddsa_legacy.html index 7624cfca8..6adf0e1ca 100644 --- a/docs/module-crypto_public_key_elliptic_eddsa_legacy.html +++ b/docs/module-crypto_public_key_elliptic_eddsa_legacy.html @@ -90,7 +90,7 @@

Module: crypto/public_key/elliptic/eddsa_legacy

Source:
@@ -365,7 +365,7 @@
Parameters:
Source:
@@ -572,7 +572,7 @@
Parameters:
Source:
@@ -848,7 +848,7 @@
Parameters:
Source:
diff --git a/docs/module-crypto_public_key_rsa.html b/docs/module-crypto_public_key_rsa.html index 91671fb14..d72191725 100644 --- a/docs/module-crypto_public_key_rsa.html +++ b/docs/module-crypto_public_key_rsa.html @@ -89,7 +89,7 @@

Module: crypto/public_key/rsa

Source:
@@ -411,7 +411,7 @@
Parameters:
Source:
@@ -647,7 +647,7 @@
Parameters:
Source:
@@ -833,7 +833,7 @@
Parameters:
Source:
@@ -1186,7 +1186,7 @@
Parameters:
Source:
@@ -1462,7 +1462,7 @@
Parameters:
Source:
@@ -1738,7 +1738,7 @@
Parameters:
Source:
@@ -1846,7 +1846,7 @@

(inner)
Source:
@@ -2123,7 +2123,7 @@

Parameters:
Source:
@@ -2308,7 +2308,7 @@
Parameters:
Source:
diff --git a/docs/module-crypto_random.html b/docs/module-crypto_random.html index 7766a5946..cee44423e 100644 --- a/docs/module-crypto_random.html +++ b/docs/module-crypto_random.html @@ -89,7 +89,7 @@

Module: crypto/random

Source:
@@ -272,7 +272,7 @@
Parameters:
Source:
@@ -433,7 +433,7 @@
Parameters:
Source:
diff --git a/docs/module-crypto_signature.html b/docs/module-crypto_signature.html index fb79baa7f..1af7f4bab 100644 --- a/docs/module-crypto_signature.html +++ b/docs/module-crypto_signature.html @@ -89,7 +89,7 @@

Module: crypto/signature

Source:
@@ -276,7 +276,7 @@
Parameters:
Source:
@@ -555,7 +555,7 @@
Parameters:
Source:
@@ -834,7 +834,7 @@
Parameters:
Source:
diff --git a/docs/module-encoding_base64.html b/docs/module-encoding_base64.html index b039e7026..8b34d6c9d 100644 --- a/docs/module-encoding_base64.html +++ b/docs/module-encoding_base64.html @@ -168,7 +168,7 @@
Parameters:
Source:
@@ -332,7 +332,7 @@
Parameters:
Source:
@@ -499,7 +499,7 @@
Parameters:
Source:
@@ -686,7 +686,7 @@
Parameters:
Source:
diff --git a/docs/module-enums.html b/docs/module-enums.html index 48b370dd9..1623ffa39 100644 --- a/docs/module-enums.html +++ b/docs/module-enums.html @@ -235,7 +235,7 @@
Properties:
Source:
@@ -499,7 +499,7 @@
Properties:
Source:
@@ -694,7 +694,7 @@
Properties:
Source:
@@ -1119,7 +1119,7 @@
Properties:
Source:
@@ -1323,7 +1323,7 @@
Properties:
Source:
@@ -1633,7 +1633,7 @@
Properties:
Source:
@@ -1899,7 +1899,7 @@
Properties:
Source:
@@ -2094,7 +2094,7 @@
Properties:
Source:
@@ -2634,7 +2634,7 @@
Properties:
Source:
@@ -3060,7 +3060,7 @@
Properties:
Source:
@@ -3278,7 +3278,7 @@
Properties:
Source:
@@ -3496,7 +3496,7 @@
Properties:
Source:
@@ -4013,7 +4013,7 @@
Properties:
Source:
@@ -4737,7 +4737,7 @@
Properties:
Source:
@@ -5024,7 +5024,7 @@
Properties:
Source:
@@ -5220,7 +5220,7 @@
Properties:
Source:
@@ -5374,7 +5374,7 @@
Parameters:
Source:
@@ -5590,7 +5590,7 @@
Parameters:
Source:
diff --git a/docs/module-key_Subkey-Subkey.html b/docs/module-key_Subkey-Subkey.html index bee33fb6f..fdeccffc6 100644 --- a/docs/module-key_Subkey-Subkey.html +++ b/docs/module-key_Subkey-Subkey.html @@ -171,7 +171,7 @@
Parameters:
Source:
@@ -281,7 +281,7 @@

cloneSource:
@@ -394,7 +394,7 @@

getAl
Source:
@@ -511,7 +511,7 @@

getAl
Source:
@@ -628,7 +628,7 @@

getCre
Source:
@@ -741,7 +741,7 @@

getCre
Source:
@@ -942,7 +942,7 @@

Parameters:
Source:
@@ -1055,7 +1055,7 @@

getFing
Source:
@@ -1172,7 +1172,7 @@

getFing
Source:
@@ -1289,7 +1289,7 @@

getKeyIDSource:
@@ -1406,7 +1406,7 @@

getKeyIDSource:
@@ -1523,7 +1523,7 @@

h
Source:
@@ -1640,7 +1640,7 @@

h
Source:
@@ -1757,7 +1757,7 @@

isDecrypte
Source:
@@ -1873,7 +1873,7 @@

isDecrypte
Source:
@@ -2149,7 +2149,7 @@

Parameters:
Source:
@@ -2487,7 +2487,7 @@
Properties
Source:
@@ -2599,7 +2599,7 @@

toPacketL
Source:
@@ -2832,7 +2832,7 @@

Parameters:
Source:
@@ -3044,7 +3044,7 @@
Parameters:
Source:
diff --git a/docs/module-key_User-User.html b/docs/module-key_User-User.html index a6bb089aa..f26b5d557 100644 --- a/docs/module-key_User-User.html +++ b/docs/module-key_User-User.html @@ -171,7 +171,7 @@
Parameters:
Source:
@@ -404,7 +404,7 @@
Parameters:
Source:
@@ -516,7 +516,7 @@

cloneSource:
@@ -789,7 +789,7 @@
Parameters:
Source:
@@ -1127,7 +1127,7 @@
Properties
Source:
@@ -1239,7 +1239,7 @@

toPacketL
Source:
@@ -1442,7 +1442,7 @@

Parameters:
Source:
@@ -1623,7 +1623,7 @@
Parameters:
Source:
@@ -1887,7 +1887,7 @@
Parameters:
Source:
@@ -2154,7 +2154,7 @@
Parameters:
Source:
diff --git a/docs/module-key_helper.html b/docs/module-key_helper.html index 56d7acec3..d49c4965b 100644 --- a/docs/module-key_helper.html +++ b/docs/module-key_helper.html @@ -89,7 +89,7 @@

Module: key/helper

Source:
@@ -281,7 +281,7 @@
Parameters:
Source:
@@ -518,7 +518,7 @@
Parameters:
Source:
@@ -928,7 +928,7 @@
Parameters:
Source:
@@ -1116,7 +1116,7 @@
Parameters:
Source:
@@ -1376,7 +1376,7 @@
Parameters:
Source:
@@ -1648,7 +1648,7 @@
Parameters:
Source:
@@ -1920,7 +1920,7 @@
Parameters:
Source:
@@ -2224,7 +2224,7 @@
Parameters:
Source:
@@ -2531,7 +2531,7 @@
Parameters:
Source:
@@ -2830,7 +2830,7 @@
Parameters:
Source:
diff --git a/docs/module-packet_packet.html b/docs/module-packet_packet.html index c3ae1e19c..082bbd33e 100644 --- a/docs/module-packet_packet.html +++ b/docs/module-packet_packet.html @@ -89,7 +89,7 @@

Module: packet/packet

Source:
@@ -275,7 +275,7 @@
Parameters:
Source:
@@ -436,7 +436,7 @@
Parameters:
Source:
@@ -621,7 +621,7 @@
Parameters:
Source:
@@ -783,7 +783,7 @@
Parameters:
Source:
diff --git a/docs/module-type_ecdh_symkey.html b/docs/module-type_ecdh_symkey.html index 6426f71e3..adce1ae31 100644 --- a/docs/module-type_ecdh_symkey.html +++ b/docs/module-type_ecdh_symkey.html @@ -89,7 +89,7 @@

Module: type/ecdh_symkey

Source:
diff --git a/docs/module-type_kdf_params-KDFParams.html b/docs/module-type_kdf_params-KDFParams.html index 02e0adb15..df48fd62f 100644 --- a/docs/module-type_kdf_params-KDFParams.html +++ b/docs/module-type_kdf_params-KDFParams.html @@ -163,7 +163,7 @@
Parameters:
Source:
@@ -322,7 +322,7 @@
Parameters:
Source:
@@ -434,7 +434,7 @@

writeSource:
diff --git a/docs/module-type_keyid-KeyID.html b/docs/module-type_keyid-KeyID.html index 97404c0b6..618152e2b 100644 --- a/docs/module-type_keyid-KeyID.html +++ b/docs/module-type_keyid-KeyID.html @@ -101,7 +101,7 @@

new KeyIDSource:
@@ -295,7 +295,7 @@
Parameters:
Source:
@@ -385,7 +385,7 @@

isNullSource:
@@ -497,7 +497,7 @@

isWildcard<
Source:
@@ -658,7 +658,7 @@

Parameters:
Source:
@@ -748,7 +748,7 @@

toHexSource:
@@ -860,7 +860,7 @@

writeSource:
diff --git a/docs/module-type_oid.html b/docs/module-type_oid.html index 7cb3799d3..1af63b917 100644 --- a/docs/module-type_oid.html +++ b/docs/module-type_oid.html @@ -100,7 +100,7 @@

Module: type/oid

Source:
diff --git a/docs/module-type_s2k-GenericS2K.html b/docs/module-type_s2k-GenericS2K.html index 6a24ca4e3..26804042c 100644 --- a/docs/module-type_s2k-GenericS2K.html +++ b/docs/module-type_s2k-GenericS2K.html @@ -153,7 +153,7 @@
Parameters:
Source:
@@ -262,7 +262,7 @@
Type:
Source:
@@ -332,7 +332,7 @@
Type:
Source:
@@ -406,7 +406,7 @@
Type:
Source:
@@ -480,7 +480,7 @@
Type:
Source:
@@ -612,7 +612,7 @@
Parameters:
Source:
@@ -774,7 +774,7 @@
Parameters:
Source:
@@ -886,7 +886,7 @@

writeSource:
diff --git a/docs/module-type_s2k.html b/docs/module-type_s2k.html index 9e24f7bb9..3c5f2368e 100644 --- a/docs/module-type_s2k.html +++ b/docs/module-type_s2k.html @@ -95,7 +95,7 @@

Module: type/s2k

Source:
diff --git a/docs/module-type_x25519x448_symkey.html b/docs/module-type_x25519x448_symkey.html index 2741d7494..adee867ac 100644 --- a/docs/module-type_x25519x448_symkey.html +++ b/docs/module-type_x25519x448_symkey.html @@ -91,7 +91,7 @@

Module: type/x25519x448_symkey

Source:
diff --git a/docs/module-util.html b/docs/module-util.html index 98d1b8741..fa8bd9979 100644 --- a/docs/module-util.html +++ b/docs/module-util.html @@ -89,7 +89,7 @@

Module: util

Source:
diff --git a/openpgp.d.ts b/openpgp.d.ts index b4d54b5b3..57d416726 100644 --- a/openpgp.d.ts +++ b/openpgp.d.ts @@ -94,7 +94,7 @@ export class PrivateKey extends PublicKey { public revoke(reason?: ReasonForRevocation, date?: Date, config?: Config): Promise; public isDecrypted(): boolean; public addSubkey(options: SubkeyOptions): Promise; - public getDecryptionKeys(keyID?: KeyID, date?: Date | null, userID?: UserID, config?: Config): Promise; + public getDecryptionKeys(keyID?: KeyID, date?: Date | null, userID?: UserID, config?: Config): Promise<(PrivateKey | Subkey)[]>; public update(sourceKey: PublicKey, date?: Date, config?: Config): Promise; } @@ -702,7 +702,7 @@ export type EllipticCurveName = 'ed25519Legacy' | 'curve25519Legacy' | 'nistP256 interface GenerateKeyOptions { userIDs: MaybeArray; passphrase?: string; - type?: 'ecc' | 'rsa'; + type?: 'ecc' | 'rsa' | 'curve25519' | 'curve448'; curve?: EllipticCurveName; rsaBits?: number; keyExpirationTime?: number; @@ -713,14 +713,8 @@ interface GenerateKeyOptions { } export type KeyOptions = GenerateKeyOptions; -export interface SubkeyOptions { - type?: 'ecc' | 'rsa'; - curve?: EllipticCurveName; - rsaBits?: number; - keyExpirationTime?: number; - date?: Date; +export interface SubkeyOptions extends Pick { sign?: boolean; - config?: PartialConfig; } export declare class KeyID { diff --git a/package-lock.json b/package-lock.json index 9f857ab74..89da32a90 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "openpgp", - "version": "6.0.0", + "version": "6.0.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "openpgp", - "version": "6.0.0", + "version": "6.0.1", "license": "LGPL-3.0+", "devDependencies": { "@noble/ciphers": "^1.0.0", diff --git a/package.json b/package.json index d2a21b578..3a144487e 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "openpgp", "description": "OpenPGP.js is a Javascript implementation of the OpenPGP protocol. This is defined in RFC 4880.", - "version": "6.0.0", + "version": "6.0.1", "license": "LGPL-3.0+", "homepage": "https://openpgpjs.org/", "engines": { @@ -22,9 +22,9 @@ "exports": { ".": { "types": "./openpgp.d.ts", + "browser": "./dist/openpgp.min.mjs", "import": "./dist/node/openpgp.mjs", - "require": "./dist/node/openpgp.min.cjs", - "browser": "./dist/openpgp.min.mjs" + "require": "./dist/node/openpgp.min.cjs" }, "./lightweight": { "types": "./openpgp.d.ts", diff --git a/src/key/factory.js b/src/key/factory.js index 68cdfb95b..955802a3d 100644 --- a/src/key/factory.js +++ b/src/key/factory.js @@ -214,11 +214,10 @@ async function wrapKeyObject(secretKeyPacket, secretSubkeyPackets, options, conf }); } signatureProperties.preferredHashAlgorithms = createPreferredAlgos([ - // prefer fast asm.js implementations (SHA-256) - enums.hash.sha256, enums.hash.sha512, - enums.hash.sha3_256, - enums.hash.sha3_512 + enums.hash.sha256, + enums.hash.sha3_512, + enums.hash.sha3_256 ], config.preferredHashAlgorithm); signatureProperties.preferredCompressionAlgorithms = createPreferredAlgos([ enums.compression.uncompressed, diff --git a/src/openpgp.js b/src/openpgp.js index 22ac9077d..c360098aa 100644 --- a/src/openpgp.js +++ b/src/openpgp.js @@ -369,6 +369,7 @@ export async function decrypt({ message, decryptionKeys, passwords, sessionKeys, result.data, stream.fromAsync(async () => { await util.anyPromise(result.signatures.map(sig => sig.verified)); + return format === 'binary' ? new Uint8Array() : ''; }) ]); } @@ -500,6 +501,7 @@ export async function verify({ message, verificationKeys, expectSigned = false, result.data, stream.fromAsync(async () => { await util.anyPromise(result.signatures.map(sig => sig.verified)); + return format === 'binary' ? new Uint8Array() : ''; }) ]); } diff --git a/test/general/key.js b/test/general/key.js index ff94ecab1..46e566e2d 100644 --- a/test/general/key.js +++ b/test/general/key.js @@ -2261,7 +2261,7 @@ function versionSpecificTests() { ]); } const hash = openpgp.enums.hash; - expect(selfSignature.preferredHashAlgorithms).to.eql([hash.sha512, hash.sha256, hash.sha3_256, hash.sha3_512]); + expect(selfSignature.preferredHashAlgorithms).to.eql([hash.sha512, hash.sha256, hash.sha3_512, hash.sha3_256]); const compr = openpgp.enums.compression; expect(selfSignature.preferredCompressionAlgorithms).to.eql([compr.uncompressed, compr.zlib, compr.zip]); @@ -2316,7 +2316,7 @@ function versionSpecificTests() { ]); } const hash = openpgp.enums.hash; - expect(selfSignature.preferredHashAlgorithms).to.eql([hash.sha224, hash.sha256, hash.sha512, hash.sha3_256, hash.sha3_512]); + expect(selfSignature.preferredHashAlgorithms).to.eql([hash.sha224, hash.sha512, hash.sha256, hash.sha3_512, hash.sha3_256]); const compr = openpgp.enums.compression; expect(selfSignature.preferredCompressionAlgorithms).to.eql([compr.zlib, compr.uncompressed, compr.zip]); @@ -3806,7 +3806,7 @@ CNa5yq6lyexhsn2Vs8DsX+SOSUyNJiy5FyIJ const passphrase = 'hello world'; const key = await openpgp.readKey({ armoredKey: priv_key_rsa }); expect(key.keyPacket.isDummy()).to.be.false; - expect(key.keyPacket.makeDummy()).to.not.throw; + key.keyPacket.makeDummy(); expect(key.keyPacket.isDummy()).to.be.true; // dummy primary key should always be marked as not decrypted const decryptedKey = await openpgp.decryptKey({ privateKey: key, passphrase }); @@ -3825,7 +3825,7 @@ CNa5yq6lyexhsn2Vs8DsX+SOSUyNJiy5FyIJ it('makeDummy() - should work for encrypted keys with unknown s2k (unparseableKeyMaterial)', async function() { const key = await openpgp.readKey({ armoredKey: encryptedKeyUnknownS2K }); expect(key.keyPacket.isDummy()).to.be.false; - expect(key.keyPacket.makeDummy()).to.not.throw; + key.keyPacket.makeDummy(); expect(key.keyPacket.isDummy()).to.be.true; expect(key.keyPacket.unparseableKeyMaterial).to.not.exist; }); diff --git a/test/general/openpgp.js b/test/general/openpgp.js index 0a420b7b8..df105dc49 100644 --- a/test/general/openpgp.js +++ b/test/general/openpgp.js @@ -1480,170 +1480,186 @@ VFBLG8uc9IiaKann/DYBAJcZNZHRSfpDoV2pUA5EAEi2MdjxkRysFQnYPRAu await expect(openpgp.decrypt(decOpt)).to.be.rejectedWith('Error decrypting message: Decryption key is not decrypted.'); }); - it('decrypt/verify should succeed with valid signature (expectSigned=true)', async function () { - const publicKey = await openpgp.readKey({ armoredKey: pub_key }); - const privateKey = await openpgp.decryptKey({ - privateKey: await openpgp.readKey({ armoredKey: priv_key }), - passphrase - }); + ['binary', 'text'].forEach(format => { + describe(`decrypt/verify with expectSigned=true, format=${format}`, function() { + const message = + format === 'binary' ? util.encodeUTF8(plaintext) : + plaintext; + + it('decrypt/verify should succeed with valid signature (expectSigned=true)', async function () { + const publicKey = await openpgp.readKey({ armoredKey: pub_key }); + const privateKey = await openpgp.decryptKey({ + privateKey: await openpgp.readKey({ armoredKey: priv_key }), + passphrase + }); - const encrypted = await openpgp.encrypt({ - message: await openpgp.createMessage({ text: plaintext }), - signingKeys: privateKey, - encryptionKeys: publicKey - }); - const { data, signatures } = await openpgp.decrypt({ - message: await openpgp.readMessage({ armoredMessage: encrypted }), - decryptionKeys: privateKey, - verificationKeys: publicKey, - expectSigned: true - }); - expect(data).to.equal(plaintext); - expect(await signatures[0].verified).to.be.true; - }); + const encrypted = await openpgp.encrypt({ + message: await openpgp.createMessage({ [format]: message }), + signingKeys: privateKey, + encryptionKeys: publicKey + }); + const { data, signatures } = await openpgp.decrypt({ + message: await openpgp.readMessage({ armoredMessage: encrypted }), + decryptionKeys: privateKey, + verificationKeys: publicKey, + expectSigned: true, + format + }); + expect(data).to.deep.equal(message); + expect(await signatures[0].verified).to.be.true; + }); - it('decrypt/verify should throw on missing public keys (expectSigned=true)', async function () { - const publicKey = await openpgp.readKey({ armoredKey: pub_key }); - const privateKey = await openpgp.decryptKey({ - privateKey: await openpgp.readKey({ armoredKey: priv_key }), - passphrase - }); + it('decrypt/verify should throw on missing public keys (expectSigned=true)', async function () { + const publicKey = await openpgp.readKey({ armoredKey: pub_key }); + const privateKey = await openpgp.decryptKey({ + privateKey: await openpgp.readKey({ armoredKey: priv_key }), + passphrase + }); - const encrypted = await openpgp.encrypt({ - message: await openpgp.createMessage({ text: plaintext }), - encryptionKeys: publicKey, - signingKeys: privateKey - }); - await expect(openpgp.decrypt({ - message: await openpgp.readMessage({ armoredMessage: encrypted }), - decryptionKeys: privateKey, - expectSigned: true - })).to.be.eventually.rejectedWith(/Verification keys are required/); - }); + const encrypted = await openpgp.encrypt({ + message: await openpgp.createMessage({ [format]: message }), + encryptionKeys: publicKey, + signingKeys: privateKey + }); + await expect(openpgp.decrypt({ + message: await openpgp.readMessage({ armoredMessage: encrypted }), + decryptionKeys: privateKey, + expectSigned: true, + format + })).to.be.eventually.rejectedWith(/Verification keys are required/); + }); - it('decrypt/verify should throw on missing signature (expectSigned=true)', async function () { - const publicKey = await openpgp.readKey({ armoredKey: pub_key }); - const privateKey = await openpgp.decryptKey({ - privateKey: await openpgp.readKey({ armoredKey: priv_key }), - passphrase - }); + it('decrypt/verify should throw on missing signature (expectSigned=true)', async function () { + const publicKey = await openpgp.readKey({ armoredKey: pub_key }); + const privateKey = await openpgp.decryptKey({ + privateKey: await openpgp.readKey({ armoredKey: priv_key }), + passphrase + }); - const encrypted = await openpgp.encrypt({ - message: await openpgp.createMessage({ text: plaintext }), - encryptionKeys: publicKey - }); - await expect(openpgp.decrypt({ - message: await openpgp.readMessage({ armoredMessage: encrypted }), - decryptionKeys: privateKey, - verificationKeys: publicKey, - expectSigned: true - })).to.be.eventually.rejectedWith(/Message is not signed/); - }); + const encrypted = await openpgp.encrypt({ + message: await openpgp.createMessage({ [format]: message }), + encryptionKeys: publicKey + }); + await expect(openpgp.decrypt({ + message: await openpgp.readMessage({ armoredMessage: encrypted }), + decryptionKeys: privateKey, + verificationKeys: publicKey, + expectSigned: true, + format + })).to.be.eventually.rejectedWith(/Message is not signed/); + }); - it('decrypt/verify should throw on invalid signature (expectSigned=true)', async function () { - const publicKey = await openpgp.readKey({ armoredKey: pub_key }); - const wrongPublicKey = (await openpgp.readKey({ armoredKey: priv_key_2000_2008 })).toPublic(); - const privateKey = await openpgp.decryptKey({ - privateKey: await openpgp.readKey({ armoredKey: priv_key }), - passphrase - }); + it('decrypt/verify should throw on invalid signature (expectSigned=true)', async function () { + const publicKey = await openpgp.readKey({ armoredKey: pub_key }); + const wrongPublicKey = (await openpgp.readKey({ armoredKey: priv_key_2000_2008 })).toPublic(); + const privateKey = await openpgp.decryptKey({ + privateKey: await openpgp.readKey({ armoredKey: priv_key }), + passphrase + }); - const encrypted = await openpgp.encrypt({ - message: await openpgp.createMessage({ text: plaintext }), - encryptionKeys: publicKey, - signingKeys: privateKey - }); - await expect(openpgp.decrypt({ - message: await openpgp.readMessage({ armoredMessage: encrypted }), - decryptionKeys: privateKey, - verificationKeys: wrongPublicKey, - expectSigned: true - })).to.be.eventually.rejectedWith(/Could not find signing key/); - }); + const encrypted = await openpgp.encrypt({ + message: await openpgp.createMessage({ [format]: message }), + encryptionKeys: publicKey, + signingKeys: privateKey + }); + await expect(openpgp.decrypt({ + message: await openpgp.readMessage({ armoredMessage: encrypted }), + decryptionKeys: privateKey, + verificationKeys: wrongPublicKey, + expectSigned: true, + format + })).to.be.eventually.rejectedWith(/Could not find signing key/); + }); - it('decrypt/verify should succeed with valid signature (expectSigned=true, with streaming)', async function () { - const publicKey = await openpgp.readKey({ armoredKey: pub_key }); - const privateKey = await openpgp.decryptKey({ - privateKey: await openpgp.readKey({ armoredKey: priv_key }), - passphrase - }); + it('decrypt/verify should succeed with valid signature (expectSigned=true, with streaming)', async function () { + const publicKey = await openpgp.readKey({ armoredKey: pub_key }); + const privateKey = await openpgp.decryptKey({ + privateKey: await openpgp.readKey({ armoredKey: priv_key }), + passphrase + }); - const encrypted = await openpgp.encrypt({ - message: await openpgp.createMessage({ text: plaintext }), - signingKeys: privateKey, - encryptionKeys: publicKey - }); - const { data: streamedData, signatures } = await openpgp.decrypt({ - message: await openpgp.readMessage({ armoredMessage: stream.toStream(encrypted) }), - decryptionKeys: privateKey, - verificationKeys: publicKey, - expectSigned: true - }); - const data = await stream.readToEnd(streamedData); - expect(data).to.equal(plaintext); - expect(await signatures[0].verified).to.be.true; - }); + const encrypted = await openpgp.encrypt({ + message: await openpgp.createMessage({ [format]: message }), + signingKeys: privateKey, + encryptionKeys: publicKey + }); + const { data: streamedData, signatures } = await openpgp.decrypt({ + message: await openpgp.readMessage({ armoredMessage: stream.toStream(encrypted) }), + decryptionKeys: privateKey, + verificationKeys: publicKey, + expectSigned: true, + format + }); + const data = await stream.readToEnd(streamedData); + expect(data).to.deep.equal(message); + expect(await signatures[0].verified).to.be.true; + }); - it('decrypt/verify should throw on missing public keys (expectSigned=true, with streaming)', async function () { - const publicKey = await openpgp.readKey({ armoredKey: pub_key }); - const privateKey = await openpgp.decryptKey({ - privateKey: await openpgp.readKey({ armoredKey: priv_key }), - passphrase - }); + it('decrypt/verify should throw on missing public keys (expectSigned=true, with streaming)', async function () { + const publicKey = await openpgp.readKey({ armoredKey: pub_key }); + const privateKey = await openpgp.decryptKey({ + privateKey: await openpgp.readKey({ armoredKey: priv_key }), + passphrase + }); - const encrypted = await openpgp.encrypt({ - message: await openpgp.createMessage({ text: plaintext }), - encryptionKeys: publicKey, - signingKeys: privateKey - }); - await expect(openpgp.decrypt({ - message: await openpgp.readMessage({ armoredMessage: stream.toStream(encrypted) }), - decryptionKeys: privateKey, - expectSigned: true - })).to.be.eventually.rejectedWith(/Verification keys are required/); - }); + const encrypted = await openpgp.encrypt({ + message: await openpgp.createMessage({ [format]: message }), + encryptionKeys: publicKey, + signingKeys: privateKey + }); + await expect(openpgp.decrypt({ + message: await openpgp.readMessage({ armoredMessage: stream.toStream(encrypted) }), + decryptionKeys: privateKey, + expectSigned: true, + format + })).to.be.eventually.rejectedWith(/Verification keys are required/); + }); - it('decrypt/verify should throw on missing signature (expectSigned=true, with streaming)', async function () { - const publicKey = await openpgp.readKey({ armoredKey: pub_key }); - const privateKey = await openpgp.decryptKey({ - privateKey: await openpgp.readKey({ armoredKey: priv_key }), - passphrase - }); + it('decrypt/verify should throw on missing signature (expectSigned=true, with streaming)', async function () { + const publicKey = await openpgp.readKey({ armoredKey: pub_key }); + const privateKey = await openpgp.decryptKey({ + privateKey: await openpgp.readKey({ armoredKey: priv_key }), + passphrase + }); - const encrypted = await openpgp.encrypt({ - message: await openpgp.createMessage({ text: plaintext }), - encryptionKeys: publicKey - }); - await expect(openpgp.decrypt({ - message: await openpgp.readMessage({ armoredMessage: stream.toStream(encrypted) }), - decryptionKeys: privateKey, - verificationKeys: publicKey, - expectSigned: true - })).to.be.eventually.rejectedWith(/Message is not signed/); - }); + const encrypted = await openpgp.encrypt({ + message: await openpgp.createMessage({ [format]: message }), + encryptionKeys: publicKey + }); + await expect(openpgp.decrypt({ + message: await openpgp.readMessage({ armoredMessage: stream.toStream(encrypted) }), + decryptionKeys: privateKey, + verificationKeys: publicKey, + expectSigned: true, + format + })).to.be.eventually.rejectedWith(/Message is not signed/); + }); - it('decrypt/verify should throw on invalid signature (expectSigned=true, with streaming)', async function () { - const publicKey = await openpgp.readKey({ armoredKey: pub_key }); - const wrongPublicKey = (await openpgp.readKey({ armoredKey: priv_key_2000_2008 })).toPublic(); - const privateKey = await openpgp.decryptKey({ - privateKey: await openpgp.readKey({ armoredKey: priv_key }), - passphrase - }); + it('decrypt/verify should throw on invalid signature (expectSigned=true, with streaming)', async function () { + const publicKey = await openpgp.readKey({ armoredKey: pub_key }); + const wrongPublicKey = (await openpgp.readKey({ armoredKey: priv_key_2000_2008 })).toPublic(); + const privateKey = await openpgp.decryptKey({ + privateKey: await openpgp.readKey({ armoredKey: priv_key }), + passphrase + }); - const encrypted = await openpgp.encrypt({ - message: await openpgp.createMessage({ text: plaintext }), - encryptionKeys: publicKey, - signingKeys: privateKey - }); - const { data: streamedData } = await openpgp.decrypt({ - message: await openpgp.readMessage({ armoredMessage: stream.toStream(encrypted) }), - decryptionKeys: privateKey, - verificationKeys: wrongPublicKey, - expectSigned: true + const encrypted = await openpgp.encrypt({ + message: await openpgp.createMessage({ [format]: message }), + encryptionKeys: publicKey, + signingKeys: privateKey + }); + const { data: streamedData } = await openpgp.decrypt({ + message: await openpgp.readMessage({ armoredMessage: stream.toStream(encrypted) }), + decryptionKeys: privateKey, + verificationKeys: wrongPublicKey, + expectSigned: true, + format + }); + await expect( + stream.readToEnd(streamedData) + ).to.be.eventually.rejectedWith(/Could not find signing key/); + }); }); - await expect( - stream.readToEnd(streamedData) - ).to.be.eventually.rejectedWith(/Could not find signing key/); }); it('Supports decrypting with GnuPG dummy key', async function() { @@ -1792,151 +1808,158 @@ aOU= openpgp.config.minRSABits = minRSABitsVal; }); - describe('message', function() { - verifyTests(false); - - it('verify should succeed with valid signature (expectSigned=true, with streaming)', async function () { - const publicKey = await openpgp.readKey({ armoredKey: pub_key }); - const privateKey = await openpgp.decryptKey({ - privateKey: await openpgp.readKey({ armoredKey: priv_key }), - passphrase - }); + ['binary', 'text', 'cleartext'].forEach(format => { + describe(`verify ${format} message`, function() { + const createMessage = format === 'cleartext' ? openpgp.createCleartextMessage : openpgp.createMessage; + const readMessage = ({ armoredMessage }) => ( + format === 'cleartext' ? + openpgp.readCleartextMessage({ cleartextMessage: armoredMessage }) : + openpgp.readMessage({ armoredMessage }) + ); + const message = + format === 'cleartext' ? util.removeTrailingSpaces(plaintext) : + format === 'binary' ? util.encodeUTF8(plaintext) : + plaintext; + + const property = format === 'cleartext' ? 'text' : format; + + it('verify should succeed with valid signature (expectSigned=true)', async function () { + const publicKey = await openpgp.readKey({ armoredKey: pub_key }); + const privateKey = await openpgp.decryptKey({ + privateKey: await openpgp.readKey({ armoredKey: priv_key }), + passphrase + }); - const signed = await openpgp.sign({ - message: await openpgp.createMessage({ text: plaintext }), - signingKeys: privateKey - }); - const { data: streamedData, signatures } = await openpgp.verify({ - message: await openpgp.readMessage({ armoredMessage: stream.toStream(signed) }), - verificationKeys: publicKey, - expectSigned: true + const signed = await openpgp.sign({ + message: await createMessage({ [property]: message }), + signingKeys: privateKey + }); + const { data, signatures } = await openpgp.verify({ + message: await readMessage({ armoredMessage: signed }), + verificationKeys: publicKey, + expectSigned: true, + format + }); + expect(data).to.deep.equal(message); + expect(await signatures[0].verified).to.be.true; }); - const data = await stream.readToEnd(streamedData); - expect(data).to.equal(plaintext); - expect(await signatures[0].verified).to.be.true; - }); - it('verify should throw on missing signature (expectSigned=true, with streaming)', async function () { + it('verify should throw on missing signature (expectSigned=true)', async function () { + const publicKey = await openpgp.readKey({ armoredKey: pub_key }); - const publicKey = await openpgp.readKey({ armoredKey: pub_key }); - - await expect(openpgp.verify({ - message: await openpgp.createMessage({ text: stream.toStream(plaintext) }), - verificationKeys: publicKey, - expectSigned: true - })).to.be.eventually.rejectedWith(/Message is not signed/); - }); - - it('verify should throw on invalid signature (expectSigned=true, with streaming)', async function () { - const wrongPublicKey = (await openpgp.readKey({ armoredKey: priv_key_2000_2008 })).toPublic(); - const privateKey = await openpgp.decryptKey({ - privateKey: await openpgp.readKey({ armoredKey: priv_key }), - passphrase - }); - - const signed = await openpgp.sign({ - message: await openpgp.createMessage({ text: plaintext }), - signingKeys: privateKey - }); - const { data: streamedData } = await openpgp.verify({ - message: await openpgp.readMessage({ armoredMessage: stream.toStream(signed) }), - verificationKeys: wrongPublicKey, - expectSigned: true + await expect(openpgp.verify({ + message: await createMessage({ [property]: message }), + verificationKeys: publicKey, + expectSigned: true, + format + })).to.be.eventually.rejectedWith(/Message is not signed/); }); - await expect( - stream.readToEnd(streamedData) - ).to.be.eventually.rejectedWith(/Could not find signing key/); - }); - it('verify should fail if the signature is re-used with a different message', async function () { - const privateKey = await openpgp.decryptKey({ - privateKey: await openpgp.readKey({ armoredKey: priv_key }), - passphrase - }); + it('verify should throw on invalid signature (expectSigned=true)', async function () { + const wrongPublicKey = (await openpgp.readKey({ armoredKey: priv_key_2000_2008 })).toPublic(); + const privateKey = await openpgp.decryptKey({ + privateKey: await openpgp.readKey({ armoredKey: priv_key }), + passphrase + }); - const message = await openpgp.createMessage({ text: 'a message' }); - const armoredSignature = await openpgp.sign({ - message, - signingKeys: privateKey, - detached: true - }); - const { signatures } = await openpgp.verify({ - message, - signature: await openpgp.readSignature({ armoredSignature }), - verificationKeys: privateKey.toPublic() + const signed = await openpgp.sign({ + message: await createMessage({ [property]: message }), + signingKeys: privateKey + }); + await expect(openpgp.verify({ + message: await readMessage({ armoredMessage: signed }), + verificationKeys: wrongPublicKey, + expectSigned: true, + format + })).to.be.eventually.rejectedWith(/Could not find signing key/); }); - expect(await signatures[0].verified).to.be.true; - // pass a different message - await expect(openpgp.verify({ - message: await openpgp.createMessage({ text: 'a different message' }), - signature: await openpgp.readSignature({ armoredSignature }), - verificationKeys: privateKey.toPublic(), - expectSigned: true - })).to.be.rejectedWith(/digest did not match/); - }); - }); - describe('cleartext message', function() { - verifyTests(true); - }); + if (format !== 'cleartext') { + it('verify should succeed with valid signature (expectSigned=true, with streaming)', async function () { + const publicKey = await openpgp.readKey({ armoredKey: pub_key }); + const privateKey = await openpgp.decryptKey({ + privateKey: await openpgp.readKey({ armoredKey: priv_key }), + passphrase + }); - function verifyTests(useCleartext) { - const createMessage = useCleartext ? openpgp.createCleartextMessage : openpgp.createMessage; - const readMessage = ({ armoredMessage }) => ( - useCleartext ? - openpgp.readCleartextMessage({ cleartextMessage: armoredMessage }) : - openpgp.readMessage({ armoredMessage }) - ); - const text = useCleartext ? util.removeTrailingSpaces(plaintext) : plaintext; + const signed = await openpgp.sign({ + message: await openpgp.createMessage({ [property]: stream.toStream(message) }), + signingKeys: privateKey + }); + const { data: streamedData, signatures } = await openpgp.verify({ + message: await openpgp.readMessage({ armoredMessage: stream.toStream(signed) }), + verificationKeys: publicKey, + expectSigned: true, + format + }); + const data = await stream.readToEnd(streamedData); + expect(data).to.deep.equal(message); + expect(await signatures[0].verified).to.be.true; + }); - it('verify should succeed with valid signature (expectSigned=true)', async function () { - const publicKey = await openpgp.readKey({ armoredKey: pub_key }); - const privateKey = await openpgp.decryptKey({ - privateKey: await openpgp.readKey({ armoredKey: priv_key }), - passphrase - }); + it('verify should throw on missing signature (expectSigned=true, with streaming)', async function () { + const publicKey = await openpgp.readKey({ armoredKey: pub_key }); - const signed = await openpgp.sign({ - message: await createMessage({ text }), - signingKeys: privateKey - }); - const { data, signatures } = await openpgp.verify({ - message: await readMessage({ armoredMessage: signed }), - verificationKeys: publicKey, - expectSigned: true - }); - expect(data).to.equal(text); - expect(await signatures[0].verified).to.be.true; - }); + await expect(openpgp.verify({ + message: await openpgp.createMessage({ [property]: stream.toStream(message) }), + verificationKeys: publicKey, + expectSigned: true + })).to.be.eventually.rejectedWith(/Message is not signed/); + }); - it('verify should throw on missing signature (expectSigned=true)', async function () { - const publicKey = await openpgp.readKey({ armoredKey: pub_key }); + it('verify should throw on invalid signature (expectSigned=true, with streaming)', async function () { + const wrongPublicKey = (await openpgp.readKey({ armoredKey: priv_key_2000_2008 })).toPublic(); + const privateKey = await openpgp.decryptKey({ + privateKey: await openpgp.readKey({ armoredKey: priv_key }), + passphrase + }); - await expect(openpgp.verify({ - message: await createMessage({ text }), - verificationKeys: publicKey, - expectSigned: true - })).to.be.eventually.rejectedWith(/Message is not signed/); - }); + const signed = await openpgp.sign({ + message: await openpgp.createMessage({ [property]: stream.toStream(message) }), + signingKeys: privateKey + }); + const { data: streamedData } = await openpgp.verify({ + message: await openpgp.readMessage({ armoredMessage: stream.toStream(signed) }), + verificationKeys: wrongPublicKey, + expectSigned: true + }); + await expect( + stream.readToEnd(streamedData) + ).to.be.eventually.rejectedWith(/Could not find signing key/); + }); - it('verify should throw on invalid signature (expectSigned=true)', async function () { - const wrongPublicKey = (await openpgp.readKey({ armoredKey: priv_key_2000_2008 })).toPublic(); - const privateKey = await openpgp.decryptKey({ - privateKey: await openpgp.readKey({ armoredKey: priv_key }), - passphrase - }); + it('verify should fail if the signature is re-used with a different message', async function () { + const privateKey = await openpgp.decryptKey({ + privateKey: await openpgp.readKey({ armoredKey: priv_key }), + passphrase + }); - const signed = await openpgp.sign({ - message: await createMessage({ text }), - signingKeys: privateKey - }); - await expect(openpgp.verify({ - message: await readMessage({ armoredMessage: signed }), - verificationKeys: wrongPublicKey, - expectSigned: true - })).to.be.eventually.rejectedWith(/Could not find signing key/); + const correctMessage = await createMessage({ [property]: message }); + const armoredSignature = await openpgp.sign({ + message: correctMessage, + signingKeys: privateKey, + detached: true + }); + const { signatures } = await openpgp.verify({ + message: correctMessage, + signature: await openpgp.readSignature({ armoredSignature }), + verificationKeys: privateKey.toPublic() + }); + expect(await signatures[0].verified).to.be.true; + // pass a different message + const wrongMessage = + format === 'binary' ? util.encodeUTF8('a different message') : + 'a different message'; + await expect(openpgp.verify({ + message: await createMessage({ [property]: wrongMessage }), + signature: await openpgp.readSignature({ armoredSignature }), + verificationKeys: privateKey.toPublic(), + expectSigned: true + })).to.be.rejectedWith(/digest did not match/); + }); + } }); - } + }); }); describe('sign - unit tests', function() { diff --git a/test/typescript/definitions.ts b/test/typescript/definitions.ts index 5258154dd..2d74b77cc 100644 --- a/test/typescript/definitions.ts +++ b/test/typescript/definitions.ts @@ -22,7 +22,12 @@ import { (async () => { // Generate keys - const keyOptions = { userIDs: [{ email: 'user@corp.co' }], config: { v6Keys: true } }; + const keyOptions = { + type: 'curve25519' as const, + userIDs: [{ email: 'user@corp.co' }], + subkeys: [{ type: 'rsa' as const, sign: false }], + config: { v6Keys: true } + }; const { privateKey: privateKeyArmored, publicKey: publicKeyArmored } = await generateKey(keyOptions); const { privateKey: privateKeyBinary } = await generateKey({ ...keyOptions, format: 'binary' }); const { privateKey, publicKey, revocationCertificate } = await generateKey({ ...keyOptions, format: 'object' });