aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/tests/data/pubkey/dlies.vec323
-rw-r--r--src/tests/data/pubkey/dsa_prob.vec12
-rw-r--r--src/tests/data/pubkey/dsa_rfc6979.vec6
-rw-r--r--src/tests/data/pubkey/ecdsa_prob.vec12
-rw-r--r--src/tests/data/pubkey/ecdsa_rfc6979.vec15
-rw-r--r--src/tests/data/pubkey/rsa_sig.vec9
-rw-r--r--src/tests/test_dlies.cpp18
7 files changed, 141 insertions, 254 deletions
diff --git a/src/tests/data/pubkey/dlies.vec b/src/tests/data/pubkey/dlies.vec
index 245cdeddc..769e3ff04 100644
--- a/src/tests/data/pubkey/dlies.vec
+++ b/src/tests/data/pubkey/dlies.vec
@@ -50,16 +50,15 @@
#
# System.out.println( Hex.toHexString( out ) );
+[AES-256/CBC]
+
####### KDF2
Kdf = KDF2(SHA-512)
Mac = HMAC(SHA-512)
MacKeyLen = 64
-Cipher = AES-256/CBC
-CipherKeyLen = 32
+Group = modp/ietf/2048
IV = 00000000000000000000000000000000
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -68,11 +67,8 @@ Ciphertext = 57dfafa0d81ac3aaca2570ad13cccd127239f4ee04843bb738234588f0daea53ccd
Kdf = KDF2(SHA-512)
Mac = HMAC(SHA-512)
MacKeyLen = 32
-Cipher = AES-256/CBC
-CipherKeyLen = 32
+Group = modp/ietf/2048
IV = 00000000000000000000000000000000
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -81,11 +77,8 @@ Ciphertext = 57dfafa0d81ac3aaca2570ad13cccd127239f4ee04843bb738234588f0daea53ccd
Kdf = KDF2(SHA-512)
Mac = HMAC(SHA-512)
MacKeyLen = 20
-Cipher = AES-256/CBC
-CipherKeyLen = 32
+Group = modp/ietf/2048
IV = 00000000000000000000000000000000
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -94,11 +87,8 @@ Ciphertext = 57dfafa0d81ac3aaca2570ad13cccd127239f4ee04843bb738234588f0daea53ccd
Kdf = KDF2(SHA-512)
Mac = HMAC(SHA-512)
MacKeyLen = 64
-Cipher = AES-256/CBC
-CipherKeyLen = 32
+Group = modp/ietf/2048
IV = 00112233445566778899aabbccddeeff
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -107,11 +97,8 @@ Ciphertext = 57dfafa0d81ac3aaca2570ad13cccd127239f4ee04843bb738234588f0daea53ccd
Kdf = KDF2(SHA-512)
Mac = HMAC(SHA-512)
MacKeyLen = 32
-Cipher = AES-256/CBC
-CipherKeyLen = 32
+Group = modp/ietf/2048
IV = 00112233445566778899aabbccddeeff
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -120,11 +107,8 @@ Ciphertext = 57dfafa0d81ac3aaca2570ad13cccd127239f4ee04843bb738234588f0daea53ccd
Kdf = KDF2(SHA-512)
Mac = HMAC(SHA-512)
MacKeyLen = 20
-Cipher = AES-256/CBC
-CipherKeyLen = 32
+Group = modp/ietf/2048
IV = 00112233445566778899aabbccddeeff
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -133,11 +117,8 @@ Ciphertext = 57dfafa0d81ac3aaca2570ad13cccd127239f4ee04843bb738234588f0daea53ccd
Kdf = KDF2(SHA-256)
Mac = HMAC(SHA-256)
MacKeyLen = 32
-Cipher = AES-256/CBC
-CipherKeyLen = 32
+Group = modp/ietf/2048
IV = 00000000000000000000000000000000
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -146,11 +127,8 @@ Ciphertext = 57dfafa0d81ac3aaca2570ad13cccd127239f4ee04843bb738234588f0daea53ccd
Kdf = KDF2(SHA-256)
Mac = HMAC(SHA-256)
MacKeyLen = 16
-Cipher = AES-256/CBC
-CipherKeyLen = 32
+Group = modp/ietf/2048
IV = 00000000000000000000000000000000
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -159,11 +137,8 @@ Ciphertext = 57dfafa0d81ac3aaca2570ad13cccd127239f4ee04843bb738234588f0daea53ccd
Kdf = KDF2(SHA-256)
Mac = HMAC(SHA-256)
MacKeyLen = 32
-Cipher = AES-256/CBC
-CipherKeyLen = 32
+Group = modp/ietf/2048
IV = 00112233445566778899aabbccddeeff
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -172,11 +147,8 @@ Ciphertext = 57dfafa0d81ac3aaca2570ad13cccd127239f4ee04843bb738234588f0daea53ccd
Kdf = KDF2(SHA-256)
Mac = HMAC(SHA-256)
MacKeyLen = 20
-Cipher = AES-256/CBC
-CipherKeyLen = 32
+Group = modp/ietf/2048
IV = 00112233445566778899aabbccddeeff
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -185,11 +157,8 @@ Ciphertext = 57dfafa0d81ac3aaca2570ad13cccd127239f4ee04843bb738234588f0daea53ccd
Kdf = KDF2(SHA-1)
Mac = HMAC(SHA-1)
MacKeyLen = 20
-Cipher = AES-256/CBC
-CipherKeyLen = 32
+Group = modp/ietf/2048
IV = 00000000000000000000000000000000
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -198,11 +167,8 @@ Ciphertext = 57dfafa0d81ac3aaca2570ad13cccd127239f4ee04843bb738234588f0daea53ccd
Kdf = KDF2(SHA-1)
Mac = HMAC(SHA-1)
MacKeyLen = 16
-Cipher = AES-256/CBC
-CipherKeyLen = 32
+Group = modp/ietf/2048
IV = 00000000000000000000000000000000
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -211,11 +177,8 @@ Ciphertext = 57dfafa0d81ac3aaca2570ad13cccd127239f4ee04843bb738234588f0daea53ccd
Kdf = KDF2(SHA-1)
Mac = HMAC(SHA-1)
MacKeyLen = 20
-Cipher = AES-256/CBC
-CipherKeyLen = 32
+Group = modp/ietf/2048
IV = 00112233445566778899aabbccddeeff
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -224,11 +187,8 @@ Ciphertext = 57dfafa0d81ac3aaca2570ad13cccd127239f4ee04843bb738234588f0daea53ccd
Kdf = KDF2(SHA-1)
Mac = HMAC(SHA-1)
MacKeyLen = 16
-Cipher = AES-256/CBC
-CipherKeyLen = 32
+Group = modp/ietf/2048
IV = 00112233445566778899aabbccddeeff
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -237,11 +197,8 @@ Ciphertext = 57dfafa0d81ac3aaca2570ad13cccd127239f4ee04843bb738234588f0daea53ccd
Kdf = KDF2(SHA-512)
Mac = CMAC(AES-256)
MacKeyLen = 32
-Cipher = AES-256/CBC
-CipherKeyLen = 32
+Group = modp/ietf/2048
IV = 00000000000000000000000000000000
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -250,11 +207,8 @@ Ciphertext = 57dfafa0d81ac3aaca2570ad13cccd127239f4ee04843bb738234588f0daea53ccd
Kdf = KDF2(SHA-512)
Mac = CMAC(AES-256)
MacKeyLen = 32
-Cipher = AES-256/CBC
-CipherKeyLen = 32
+Group = modp/ietf/2048
IV = 00112233445566778899aabbccddeeff
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -263,11 +217,8 @@ Ciphertext = 57dfafa0d81ac3aaca2570ad13cccd127239f4ee04843bb738234588f0daea53ccd
Kdf = KDF2(SHA-256)
Mac = CMAC(AES-256)
MacKeyLen = 32
-Cipher = AES-256/CBC
-CipherKeyLen = 32
+Group = modp/ietf/2048
IV = 00000000000000000000000000000000
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -276,11 +227,8 @@ Ciphertext = 57dfafa0d81ac3aaca2570ad13cccd127239f4ee04843bb738234588f0daea53ccd
Kdf = KDF2(SHA-256)
Mac = CMAC(AES-256)
MacKeyLen = 32
-Cipher = AES-256/CBC
-CipherKeyLen = 32
+Group = modp/ietf/2048
IV = 00112233445566778899aabbccddeeff
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -290,11 +238,8 @@ Ciphertext = 57dfafa0d81ac3aaca2570ad13cccd127239f4ee04843bb738234588f0daea53ccd
Kdf = KDF2(SHA-1)
Mac = CMAC(AES-256)
MacKeyLen = 32
-Cipher = AES-256/CBC
-CipherKeyLen = 32
+Group = modp/ietf/2048
IV = 00000000000000000000000000000000
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -303,11 +248,8 @@ Ciphertext = 57dfafa0d81ac3aaca2570ad13cccd127239f4ee04843bb738234588f0daea53ccd
Kdf = KDF2(SHA-1)
Mac = CMAC(AES-256)
MacKeyLen = 32
-Cipher = AES-256/CBC
-CipherKeyLen = 32
+Group = modp/ietf/2048
IV = 00112233445566778899aabbccddeeff
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -318,11 +260,8 @@ Ciphertext = 57dfafa0d81ac3aaca2570ad13cccd127239f4ee04843bb738234588f0daea53ccd
Kdf = KDF1-18033(SHA-512)
Mac = HMAC(SHA-512)
MacKeyLen = 64
-Cipher = AES-256/CBC
-CipherKeyLen = 32
+Group = modp/ietf/2048
IV = 00000000000000000000000000000000
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -331,11 +270,8 @@ Ciphertext = 57dfafa0d81ac3aaca2570ad13cccd127239f4ee04843bb738234588f0daea53ccd
Kdf = KDF1-18033(SHA-512)
Mac = HMAC(SHA-512)
MacKeyLen = 32
-Cipher = AES-256/CBC
-CipherKeyLen = 32
+Group = modp/ietf/2048
IV = 00000000000000000000000000000000
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -344,11 +280,8 @@ Ciphertext = 57dfafa0d81ac3aaca2570ad13cccd127239f4ee04843bb738234588f0daea53ccd
Kdf = KDF1-18033(SHA-512)
Mac = HMAC(SHA-512)
MacKeyLen = 20
-Cipher = AES-256/CBC
-CipherKeyLen = 32
+Group = modp/ietf/2048
IV = 00000000000000000000000000000000
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -357,11 +290,8 @@ Ciphertext = 57dfafa0d81ac3aaca2570ad13cccd127239f4ee04843bb738234588f0daea53ccd
Kdf = KDF1-18033(SHA-512)
Mac = HMAC(SHA-512)
MacKeyLen = 64
-Cipher = AES-256/CBC
-CipherKeyLen = 32
+Group = modp/ietf/2048
IV = 00112233445566778899aabbccddeeff
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -370,11 +300,8 @@ Ciphertext = 57dfafa0d81ac3aaca2570ad13cccd127239f4ee04843bb738234588f0daea53ccd
Kdf = KDF1-18033(SHA-512)
Mac = HMAC(SHA-512)
MacKeyLen = 32
-Cipher = AES-256/CBC
-CipherKeyLen = 32
+Group = modp/ietf/2048
IV = 00112233445566778899aabbccddeeff
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -383,11 +310,8 @@ Ciphertext = 57dfafa0d81ac3aaca2570ad13cccd127239f4ee04843bb738234588f0daea53ccd
Kdf = KDF1-18033(SHA-512)
Mac = HMAC(SHA-512)
MacKeyLen = 20
-Cipher = AES-256/CBC
-CipherKeyLen = 32
+Group = modp/ietf/2048
IV = 00112233445566778899aabbccddeeff
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -396,11 +320,8 @@ Ciphertext = 57dfafa0d81ac3aaca2570ad13cccd127239f4ee04843bb738234588f0daea53ccd
Kdf = KDF1-18033(SHA-256)
Mac = HMAC(SHA-256)
MacKeyLen = 32
-Cipher = AES-256/CBC
-CipherKeyLen = 32
+Group = modp/ietf/2048
IV = 00000000000000000000000000000000
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -409,11 +330,8 @@ Ciphertext = 57dfafa0d81ac3aaca2570ad13cccd127239f4ee04843bb738234588f0daea53ccd
Kdf = KDF1-18033(SHA-256)
Mac = HMAC(SHA-256)
MacKeyLen = 20
-Cipher = AES-256/CBC
-CipherKeyLen = 32
+Group = modp/ietf/2048
IV = 00000000000000000000000000000000
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -422,11 +340,8 @@ Ciphertext = 57dfafa0d81ac3aaca2570ad13cccd127239f4ee04843bb738234588f0daea53ccd
Kdf = KDF1-18033(SHA-256)
Mac = HMAC(SHA-256)
MacKeyLen = 16
-Cipher = AES-256/CBC
-CipherKeyLen = 32
+Group = modp/ietf/2048
IV = 00000000000000000000000000000000
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -435,11 +350,8 @@ Ciphertext = 57dfafa0d81ac3aaca2570ad13cccd127239f4ee04843bb738234588f0daea53ccd
Kdf = KDF1-18033(SHA-256)
Mac = HMAC(SHA-256)
MacKeyLen = 32
-Cipher = AES-256/CBC
-CipherKeyLen = 32
+Group = modp/ietf/2048
IV = 00112233445566778899aabbccddeeff
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -448,11 +360,8 @@ Ciphertext = 57dfafa0d81ac3aaca2570ad13cccd127239f4ee04843bb738234588f0daea53ccd
Kdf = KDF1-18033(SHA-256)
Mac = HMAC(SHA-256)
MacKeyLen = 20
-Cipher = AES-256/CBC
-CipherKeyLen = 32
+Group = modp/ietf/2048
IV = 00112233445566778899aabbccddeeff
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -461,11 +370,8 @@ Ciphertext = 57dfafa0d81ac3aaca2570ad13cccd127239f4ee04843bb738234588f0daea53ccd
Kdf = KDF1-18033(SHA-256)
Mac = HMAC(SHA-256)
MacKeyLen = 16
-Cipher = AES-256/CBC
-CipherKeyLen = 32
+Group = modp/ietf/2048
IV = 00112233445566778899aabbccddeeff
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -474,11 +380,8 @@ Ciphertext = 57dfafa0d81ac3aaca2570ad13cccd127239f4ee04843bb738234588f0daea53ccd
Kdf = KDF1-18033(SHA-1)
Mac = HMAC(SHA-1)
MacKeyLen = 20
-Cipher = AES-256/CBC
-CipherKeyLen = 32
+Group = modp/ietf/2048
IV = 00000000000000000000000000000000
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -487,11 +390,8 @@ Ciphertext = 57dfafa0d81ac3aaca2570ad13cccd127239f4ee04843bb738234588f0daea53ccd
Kdf = KDF1-18033(SHA-1)
Mac = HMAC(SHA-1)
MacKeyLen = 16
-Cipher = AES-256/CBC
-CipherKeyLen = 32
+Group = modp/ietf/2048
IV = 00000000000000000000000000000000
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -500,11 +400,8 @@ Ciphertext = 57dfafa0d81ac3aaca2570ad13cccd127239f4ee04843bb738234588f0daea53ccd
Kdf = KDF1-18033(SHA-1)
Mac = HMAC(SHA-1)
MacKeyLen = 20
-Cipher = AES-256/CBC
-CipherKeyLen = 32
+Group = modp/ietf/2048
IV = 00112233445566778899aabbccddeeff
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -513,11 +410,8 @@ Ciphertext = 57dfafa0d81ac3aaca2570ad13cccd127239f4ee04843bb738234588f0daea53ccd
Kdf = KDF1-18033(SHA-1)
Mac = HMAC(SHA-1)
MacKeyLen = 16
-Cipher = AES-256/CBC
-CipherKeyLen = 32
+Group = modp/ietf/2048
IV = 00112233445566778899aabbccddeeff
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -526,11 +420,8 @@ Ciphertext = 57dfafa0d81ac3aaca2570ad13cccd127239f4ee04843bb738234588f0daea53ccd
Kdf = KDF1-18033(SHA-512)
Mac = CMAC(AES-256)
MacKeyLen = 32
-Cipher = AES-256/CBC
-CipherKeyLen = 32
+Group = modp/ietf/2048
IV = 00112233445566778899aabbccddeeff
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -539,11 +430,8 @@ Ciphertext = 57dfafa0d81ac3aaca2570ad13cccd127239f4ee04843bb738234588f0daea53ccd
Kdf = KDF1-18033(SHA-512)
Mac = CMAC(AES-256)
MacKeyLen = 32
-Cipher = AES-256/CBC
-CipherKeyLen = 32
+Group = modp/ietf/2048
IV = 00000000000000000000000000000000
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -552,11 +440,8 @@ Ciphertext = 57dfafa0d81ac3aaca2570ad13cccd127239f4ee04843bb738234588f0daea53ccd
Kdf = KDF1-18033(SHA-256)
Mac = CMAC(AES-256)
MacKeyLen = 32
-Cipher = AES-256/CBC
-CipherKeyLen = 32
+Group = modp/ietf/2048
IV = 00112233445566778899aabbccddeeff
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -565,11 +450,8 @@ Ciphertext = 57dfafa0d81ac3aaca2570ad13cccd127239f4ee04843bb738234588f0daea53ccd
Kdf = KDF1-18033(SHA-256)
Mac = CMAC(AES-256)
MacKeyLen = 32
-Cipher = AES-256/CBC
-CipherKeyLen = 32
+Group = modp/ietf/2048
IV = 00000000000000000000000000000000
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -578,11 +460,8 @@ Ciphertext = 57dfafa0d81ac3aaca2570ad13cccd127239f4ee04843bb738234588f0daea53ccd
Kdf = KDF1-18033(SHA-1)
Mac = CMAC(AES-256)
MacKeyLen = 32
-Cipher = AES-256/CBC
-CipherKeyLen = 32
+Group = modp/ietf/2048
IV = 00112233445566778899aabbccddeeff
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -591,11 +470,8 @@ Ciphertext = 57dfafa0d81ac3aaca2570ad13cccd127239f4ee04843bb738234588f0daea53ccd
Kdf = KDF1-18033(SHA-1)
Mac = CMAC(AES-256)
MacKeyLen = 32
-Cipher = AES-256/CBC
-CipherKeyLen = 32
+Group = modp/ietf/2048
IV = 00000000000000000000000000000000
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -603,8 +479,9 @@ Ciphertext = 57dfafa0d81ac3aaca2570ad13cccd127239f4ee04843bb738234588f0daea53ccd
########### Stream mode (XOR enc/dec) ###########
+[XOR]
+
#public static void main(String[] args) throws InvalidCipherTextException {
-# // 2048-bit MODP Group. RFC3526
# BigInteger g = new BigInteger( "2", 10 );
# BigInteger p = new BigInteger( "FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74020BBEA63B139B22514A0879"
# + "8E3404DDEF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED"
@@ -656,8 +533,7 @@ Ciphertext = 57dfafa0d81ac3aaca2570ad13cccd127239f4ee04843bb738234588f0daea53ccd
Kdf = KDF2(SHA-512)
Mac = HMAC(SHA-512)
MacKeyLen = 64
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
+Group = modp/ietf/2048
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -666,8 +542,7 @@ Ciphertext = 57dfafa0d81ac3aaca2570ad13cccd127239f4ee04843bb738234588f0daea53ccd
Kdf = KDF2(SHA-512)
Mac = HMAC(SHA-512)
MacKeyLen = 32
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
+Group = modp/ietf/2048
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -676,8 +551,7 @@ Ciphertext = 57dfafa0d81ac3aaca2570ad13cccd127239f4ee04843bb738234588f0daea53ccd
Kdf = KDF2(SHA-512)
Mac = HMAC(SHA-512)
MacKeyLen = 20
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
+Group = modp/ietf/2048
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -686,8 +560,7 @@ Ciphertext = 57dfafa0d81ac3aaca2570ad13cccd127239f4ee04843bb738234588f0daea53ccd
Kdf = KDF2(SHA-256)
Mac = HMAC(SHA-256)
MacKeyLen = 32
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
+Group = modp/ietf/2048
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -696,8 +569,7 @@ Ciphertext = 57dfafa0d81ac3aaca2570ad13cccd127239f4ee04843bb738234588f0daea53ccd
Kdf = KDF2(SHA-256)
Mac = HMAC(SHA-256)
MacKeyLen = 20
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
+Group = modp/ietf/2048
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -706,8 +578,7 @@ Ciphertext = 57dfafa0d81ac3aaca2570ad13cccd127239f4ee04843bb738234588f0daea53ccd
Kdf = KDF2(SHA-256)
Mac = HMAC(SHA-256)
MacKeyLen = 16
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
+Group = modp/ietf/2048
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -716,8 +587,7 @@ Ciphertext = 57dfafa0d81ac3aaca2570ad13cccd127239f4ee04843bb738234588f0daea53ccd
Kdf = KDF2(SHA-1)
Mac = HMAC(SHA-1)
MacKeyLen = 20
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
+Group = modp/ietf/2048
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -726,8 +596,7 @@ Ciphertext = 57dfafa0d81ac3aaca2570ad13cccd127239f4ee04843bb738234588f0daea53ccd
Kdf = KDF2(SHA-1)
Mac = HMAC(SHA-1)
MacKeyLen = 16
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
+Group = modp/ietf/2048
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -736,8 +605,7 @@ Ciphertext = 57dfafa0d81ac3aaca2570ad13cccd127239f4ee04843bb738234588f0daea53ccd
Kdf = KDF2(SHA-512)
Mac = CMAC(AES-256)
MacKeyLen = 32
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
+Group = modp/ietf/2048
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -746,8 +614,7 @@ Ciphertext = 57dfafa0d81ac3aaca2570ad13cccd127239f4ee04843bb738234588f0daea53ccd
Kdf = KDF2(SHA-256)
Mac = CMAC(AES-256)
MacKeyLen = 32
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
+Group = modp/ietf/2048
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -756,8 +623,7 @@ Ciphertext = 57dfafa0d81ac3aaca2570ad13cccd127239f4ee04843bb738234588f0daea53ccd
Kdf = KDF2(SHA-1)
Mac = CMAC(AES-256)
MacKeyLen = 32
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
+Group = modp/ietf/2048
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -768,8 +634,7 @@ Ciphertext = 57dfafa0d81ac3aaca2570ad13cccd127239f4ee04843bb738234588f0daea53ccd
Kdf = KDF1-18033(SHA-512)
Mac = HMAC(SHA-512)
MacKeyLen = 64
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
+Group = modp/ietf/2048
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -778,8 +643,7 @@ Ciphertext = 57dfafa0d81ac3aaca2570ad13cccd127239f4ee04843bb738234588f0daea53ccd
Kdf = KDF1-18033(SHA-512)
Mac = HMAC(SHA-512)
MacKeyLen = 32
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
+Group = modp/ietf/2048
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -788,8 +652,7 @@ Ciphertext = 57dfafa0d81ac3aaca2570ad13cccd127239f4ee04843bb738234588f0daea53ccd
Kdf = KDF1-18033(SHA-512)
Mac = HMAC(SHA-512)
MacKeyLen = 20
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
+Group = modp/ietf/2048
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -798,8 +661,7 @@ Ciphertext = 57dfafa0d81ac3aaca2570ad13cccd127239f4ee04843bb738234588f0daea53ccd
Kdf = KDF1-18033(SHA-256)
Mac = HMAC(SHA-256)
MacKeyLen = 32
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
+Group = modp/ietf/2048
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -808,8 +670,7 @@ Ciphertext = 57dfafa0d81ac3aaca2570ad13cccd127239f4ee04843bb738234588f0daea53ccd
Kdf = KDF1-18033(SHA-256)
Mac = HMAC(SHA-256)
MacKeyLen = 20
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
+Group = modp/ietf/2048
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -818,8 +679,7 @@ Ciphertext = 57dfafa0d81ac3aaca2570ad13cccd127239f4ee04843bb738234588f0daea53ccd
Kdf = KDF1-18033(SHA-256)
Mac = HMAC(SHA-256)
MacKeyLen = 16
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
+Group = modp/ietf/2048
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -828,8 +688,7 @@ Ciphertext = 57dfafa0d81ac3aaca2570ad13cccd127239f4ee04843bb738234588f0daea53ccd
Kdf = KDF1-18033(SHA-1)
Mac = HMAC(SHA-1)
MacKeyLen = 20
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
+Group = modp/ietf/2048
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -838,8 +697,7 @@ Ciphertext = 57dfafa0d81ac3aaca2570ad13cccd127239f4ee04843bb738234588f0daea53ccd
Kdf = KDF1-18033(SHA-1)
Mac = HMAC(SHA-1)
MacKeyLen = 16
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
+Group = modp/ietf/2048
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -848,8 +706,7 @@ Ciphertext = 57dfafa0d81ac3aaca2570ad13cccd127239f4ee04843bb738234588f0daea53ccd
Kdf = KDF1-18033(SHA-512)
Mac = CMAC(AES-256)
MacKeyLen = 32
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
+Group = modp/ietf/2048
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -858,8 +715,7 @@ Ciphertext = 57dfafa0d81ac3aaca2570ad13cccd127239f4ee04843bb738234588f0daea53ccd
Kdf = KDF1-18033(SHA-256)
Mac = CMAC(AES-256)
MacKeyLen = 32
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
+Group = modp/ietf/2048
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -868,8 +724,7 @@ Ciphertext = 57dfafa0d81ac3aaca2570ad13cccd127239f4ee04843bb738234588f0daea53ccd
Kdf = KDF1-18033(SHA-1)
Mac = CMAC(AES-256)
MacKeyLen = 32
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
+Group = modp/ietf/2048
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -877,14 +732,13 @@ Ciphertext = 57dfafa0d81ac3aaca2570ad13cccd127239f4ee04843bb738234588f0daea53ccd
########################### Test vectors created with botan for AES-GCM tests ###########################
+[AES-256/GCM]
+
Kdf = KDF2(SHA-512)
Mac = HMAC(SHA-512)
MacKeyLen = 64
-Cipher = AES-256/GCM
-CipherKeyLen = 32
+Group = modp/ietf/2048
IV = 00000000000000000000000000000000
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -893,11 +747,8 @@ Ciphertext = 57DFAFA0D81AC3AACA2570AD13CCCD127239F4EE04843BB738234588F0DAEA53CCD
Kdf = KDF2(SHA-512)
Mac = HMAC(SHA-512)
MacKeyLen = 64
-Cipher = AES-256/GCM
-CipherKeyLen = 32
+Group = modp/ietf/2048
IV = 00112233445566778899aabbccddeeff
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -906,11 +757,8 @@ Ciphertext = 57DFAFA0D81AC3AACA2570AD13CCCD127239F4EE04843BB738234588F0DAEA53CCD
Kdf = KDF2(SHA-512)
Mac = CMAC(AES-256)
MacKeyLen = 32
-Cipher = AES-256/GCM
-CipherKeyLen = 32
+Group = modp/ietf/2048
IV = 00000000000000000000000000000000
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -919,11 +767,8 @@ Ciphertext = 57DFAFA0D81AC3AACA2570AD13CCCD127239F4EE04843BB738234588F0DAEA53CCD
Kdf = KDF2(SHA-512)
Mac = CMAC(AES-256)
MacKeyLen = 32
-Cipher = AES-256/GCM
-CipherKeyLen = 32
+Group = modp/ietf/2048
IV = 00112233445566778899aabbccddeeff
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -932,11 +777,8 @@ Ciphertext = 57DFAFA0D81AC3AACA2570AD13CCCD127239F4EE04843BB738234588F0DAEA53CCD
Kdf = KDF1-18033(SHA-512)
Mac = HMAC(SHA-512)
MacKeyLen = 64
-Cipher = AES-256/GCM
-CipherKeyLen = 32
+Group = modp/ietf/2048
IV = 00112233445566778899aabbccddeeff
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -945,11 +787,8 @@ Ciphertext = 57DFAFA0D81AC3AACA2570AD13CCCD127239F4EE04843BB738234588F0DAEA53CCD
Kdf = KDF1-18033(SHA-512)
Mac = HMAC(SHA-512)
MacKeyLen = 64
-Cipher = AES-256/GCM
-CipherKeyLen = 32
+Group = modp/ietf/2048
IV = 00000000000000000000000000000000
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -958,11 +797,8 @@ Ciphertext = 57DFAFA0D81AC3AACA2570AD13CCCD127239F4EE04843BB738234588F0DAEA53CCD
Kdf = KDF1-18033(SHA-512)
Mac = CMAC(AES-256)
MacKeyLen = 32
-Cipher = AES-256/GCM
-CipherKeyLen = 32
+Group = modp/ietf/2048
IV = 00000000000000000000000000000000
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
@@ -971,11 +807,8 @@ Ciphertext = 57DFAFA0D81AC3AACA2570AD13CCCD127239F4EE04843BB738234588F0DAEA53CCD
Kdf = KDF1-18033(SHA-512)
Mac = CMAC(AES-256)
MacKeyLen = 32
-Cipher = AES-256/GCM
-CipherKeyLen = 32
+Group = modp/ietf/2048
IV = 00112233445566778899aabbccddeeff
-P = 32317006071311007300338913926423828248817941241140239112842009751400741706634354222619689417363569347117901737909704191754605873209195028853758986185622153212175412514901774520270235796078236248884246189477587641105928646099411723245426622522193230540919037680524235519125679715870117001058055877651038861847280257976054903569732561526167081339361799541336476559160368317896729073178384589680639671900977202194168647225871031411336429319536193471636533209717077448227988588565369208645296636077250268955505928362751121174096972998068410554359584866583291642136218231078990999448652468262416972035911852507045361090559
-G = 2
X1 = 4316760088048858173826993660634587631078362099236037980378049883427191
X2 = 3824157470039532100357278938102046076290169354062923298804711018976423
Msg = 75dad921764736e389c4224daf7b278ec291e682044742e2e9c7a025b54dd62f
diff --git a/src/tests/data/pubkey/dsa_prob.vec b/src/tests/data/pubkey/dsa_prob.vec
index 9d0559604..6af484b61 100644
--- a/src/tests/data/pubkey/dsa_prob.vec
+++ b/src/tests/data/pubkey/dsa_prob.vec
@@ -436,6 +436,12 @@ X = 0x6132e551cdac88409183bd37ee1452cd247d4834b08814b275be3ff5
Nonce = 7197392d32d0af6a7183cc3398556f8f687d86a8ff742be6ad38562f
Signature = 45df2f423e94bf155dd4e1d9e63f315ea606dd38527d4cf6328738c859b3e8efa5bc0ccbf4a3cbb6515c4b9bf784cfacdcc101dc9f81d31f
+# Msg that produces a hash with leading zeros. Test created with BouncyCastle
+Msg = FCABA2CF434AC8DCFCEC
+X = 0x6132e551cdac88409183bd37ee1452cd247d4834b08814b275be3ff5
+Nonce = 7197392d32d0af6a7183cc3398556f8f687d86a8ff742be6ad38562f
+Signature = 45DF2F423E94BF155DD4E1D9E63F315EA606DD38527D4CF6328738C83F3FF396FACFB75BDF18FFE0ABF1CDB3950B4AF63F1DE756713F15E6
+
Msg = 3bd2ab08217878e6774ec7797deb75d5c94c40e24ddf1fac8dde3a29c86b26f57157d329aac31a6622e1d6dac97e22695d7d1f8e20aa26b06795c2f878ba5d2b9cc4b16d5fa60a5fa5c24c09031de2f970a9b57ea24af17192ece21a4d120fdb52e62b8238f778ff8552fa453c0a8891243fc8757188e9c4e0e749f7e9cdf1c1
X = 0x32d53ad2620c156e4617a8680c543839c9be93103e80cc0fefa44ce5
Nonce = 2e8e4625de74e31bea9e480a5de92890095b6ce36897a2337ff97d53
@@ -1274,6 +1280,12 @@ X = 0x433cfd0532ccfd8cdd1b25920d2bb7396987b766240379035b0e86527ce9c52d
Nonce = 40f503abd70fd49a76c67a83e08b062b3fd465ad92be433c080e5f295bb9f559
Signature = 21ca148cdf44be4ae93b2f353b8e512d03ad96dafa80623fde4922a95f03273273e48b77a3aa44307483c2dd895cb51db2112177c185c59cb1dcff32fda02a4f
+# Msg that produces a hash with leading zeros. Test created with BouncyCastle
+Msg = FCABA2CF434AC8DCFCEC
+X = 0x433cfd0532ccfd8cdd1b25920d2bb7396987b766240379035b0e86527ce9c52d
+Nonce = 40f503abd70fd49a76c67a83e08b062b3fd465ad92be433c080e5f295bb9f559
+Signature = 21CA148CDF44BE4AE93B2F353B8E512D03AD96DAFA80623FDE4922A95F0327322913AFF8C187C277143A690BAA5DC4531D467D214F3DE3C1EDCCAC0F408CB91B
+
Msg = 3ccad0018519a898f87d8ce5f28c0d93ab16c51addf4173322cbc49d48ca9ea37ebe8bc9d8c1b3f783f8cf59cf3fcba10a393eb2ddd989ce258e73788ce74b0ce8223d24e993cfeafa49cc8ec1b8ecee017d83a11bb7034c779206c364ac463cfed3047e1a2bf5c591773b1d882b310bfba2db87893c89a5442c0845bf644e21
X = 0x306c1304b380b7c3e09e7a4b489c64a295582bb3e03ce526f13d7482ef8263f0
Nonce = 223e52fc516c0a79f55a5474321264fcce78c050cf79b3d9961b37e24d7f32d3
diff --git a/src/tests/data/pubkey/dsa_rfc6979.vec b/src/tests/data/pubkey/dsa_rfc6979.vec
index a366e5574..d1651615b 100644
--- a/src/tests/data/pubkey/dsa_rfc6979.vec
+++ b/src/tests/data/pubkey/dsa_rfc6979.vec
@@ -85,3 +85,9 @@ Signature = 239E66DDBE8F8C230A3D071D601B6FFBDFB5901F94D444C6AF56F732BEB954BE6BD7
Hash = SHA-512
Signature = 89EC4BB1400ECCFF8E7D9AA515CD1DE7803F2DAFF09693EE7FD1353E90A68307C9F0BDABCC0D880BB137A994CC7F3980CE91CC10FAF529FC46565B15CEA854E1
+
+# Msg that produces a hash with leading zeros. Test created with BouncyCastle
+Msg = FCABA2CF434AC8DCFCEC
+
+Hash = SHA-1
+Signature = 98158AC13279EA8059872EBEEA4E5F334208FF361B2898667C151F8CC883E0728C333DB65612570200D7911EBF1C89C2932FB95399CB0CC533EC172B5CEAA08B \ No newline at end of file
diff --git a/src/tests/data/pubkey/ecdsa_prob.vec b/src/tests/data/pubkey/ecdsa_prob.vec
index f400ccd33..17bea592e 100644
--- a/src/tests/data/pubkey/ecdsa_prob.vec
+++ b/src/tests/data/pubkey/ecdsa_prob.vec
@@ -973,3 +973,15 @@ Msg = dbd8ddc02771a5ff7359d5216536b2e524a2d0b6ff180fa29a41a8847b6f45f1b1d52344d3
X = 0x5da87be7af63fdaf40662bd2ba87597f54d7d52fae4b298308956cddbe5664f1e3c48cc6fd3c99291b0ce7a62a99a855
Nonce = 1b686b45a31b31f6de9ed5362e18a3f8c8feded3d3b251b134835843b7ae8ede57c61dc61a30993123ac7699de4b6eac
Signature = 9dbfa147375767dde81b014f1e3bf579c44dd22486998a9b6f9e0920e53faa11eed29a4e2356e393afd1f5c1b060a958e4d318391f7cbfe70da78908d42db85225c85f4f2ff413ecad50aad5833abe91bdd5f6d64b0cd281398eab19452087dd
+
+# [P-384,SHA-1]
+
+Group = secp384r1
+Hash = SHA-1
+
+# Msg that produces a hash with leading zeros. Test created with BouncyCastle
+Msg = FCABA2CF434AC8DCFCEC
+
+X = 0xc602bc74a34592c311a6569661e0832c84f7207274676cc42a89f058162630184b52f0d99b855a7783c987476d7f9e6b
+Nonce = c10b5c25c4683d0b7827d0d88697cdc0932496b5299b798c0dd1e7af6cc757ccb30fcd3d36ead4a804877e24f3a32443
+Signature = B11DB00CDAF53286D4483F38CD02785948477ED7EBC2AD609054551DA0AB0359978C61851788AA2EC3267946D440E8789ECD85E3F062E0713ACC8A1CD6FA22BB4C5F99868D6780C3CD4F91899513F09017E3AD4CFF7A08F35421C488E1E0A1D2
diff --git a/src/tests/data/pubkey/ecdsa_rfc6979.vec b/src/tests/data/pubkey/ecdsa_rfc6979.vec
index a9fafadc6..98c2e2f6c 100644
--- a/src/tests/data/pubkey/ecdsa_rfc6979.vec
+++ b/src/tests/data/pubkey/ecdsa_rfc6979.vec
@@ -161,6 +161,7 @@ Msg = 73616D706C65
Hash = SHA-1
Signature = 00343B6EC45728975EA5CBA6659BBB6062A5FF89EEA58BE3C80B619F322C87910FE092F7D45BB0F8EEE01ED3F20BABEC079D202AE677B243AB40B5431D497C55D75D00E7B0E675A9B24413D448B8CC119D2BF7B2D2DF032741C096634D6D65D0DBE3D5694625FB9E8104D3B842C1B0E2D0B98BEA19341E8676AEF66AE4EBA3D5475D5D16
+
Hash = SHA-224
Signature = 01776331CFCDF927D666E032E00CF776187BC9FDD8E69D0DABB4109FFE1B5E2A30715F4CC923A4A5E94D2503E9ACFED92857B7F31D7152E0F8C00C15FF3D87E2ED2E0050CB5265417FE2320BBB5A122B8E1A32BD699089851128E360E620A30C7E17BA41A666AF126CE100E5799B153B60528D5300D08489CA9178FB610A2006C254B41F
@@ -361,3 +362,17 @@ Signature = 0E1F2F0E298D5D281B69D211792C464D4AB540C1A998BAB13855C852C25BEF3D0C8C
Hash = SHA-512
Signature = 0A818869A89433DB9E5838D6934FA7C15259250B8FE025DB3DC41036B120288A6DFB2464BF9062D035A6FBEC2B8B298A53F228DD7E8501BA479C008B060F0DEC
+
+# Msg that produces a hash with leading zeros. Test created with BouncyCastle
+
+Group = secp521r1
+X = 0x0FAD06DAA62BA3B25D2FB40133DA757205DE67F5BB0018FEE8C86E1B68C7E75CAA896EB32F1F47C70855836A6D16FCC1466F6D8FBEC67DB89EC0C08B0E996B83538
+
+Msg = FCABA2CF434AC8DCFCEC
+
+Hash = SHA-1
+
+# For P-521 signature BouncyCastle does not include the leading 0
+# nibbles in (r,s) leading to a 1 byte shorter signature. Botan
+# doesn't handle this, so this was modified to insert 0s where needed
+Signature = 019F10F75FA90A9129D596F3461829B3FE24DA8344C09CABA4F5BBEE36F246C356ED95C609E76D2B3B17480D45CBF11FAF395846BD3978657F8932345EE284ED32D101C07B02B74254F6F1C715D1A63B9FAA30E43C72645D20F30525EB88BB675C3BAEE1D20BAFA463F899253F5557033EDFC41F9748010FEDF73612774AC99A3B21082D
diff --git a/src/tests/data/pubkey/rsa_sig.vec b/src/tests/data/pubkey/rsa_sig.vec
index a5420fc33..18a9b55d4 100644
--- a/src/tests/data/pubkey/rsa_sig.vec
+++ b/src/tests/data/pubkey/rsa_sig.vec
@@ -7,6 +7,15 @@ Msg = 4161436445664768496A4B
Signature = 3A3B7502D85F05128CFB74608205031339753DA50D0DB7E268C3951F04A1981EDE22613BFC38DB9FFEBE183A4F11B0B0F8D7BEB668F7C1C385A801C2DDD7C08CB2E56082F80AD1105E930ED96DB6A0309639A51F5379B682C7F75C601BD4ADE5
Padding = EMSA1(SHA-1)
+E = 5
+P = 29325971601394553435876545177861015867159370596202565748032715224855053574888335295064118595233157878850644746476053
+Q = 36340726116985810749584556273749590346658800038386619768155308882211829358443758608966414537457415767576889158645019
+
+# Msg that produces a hash with leading zeros. Test created with BouncyCastle
+Msg = FCABA2CF434AC8DCFCEC
+Signature = 39ED15BA0A0A5546A634A8D94CB9750FFB968C4DF184DA76B6ACDF89D8E0C37475E2DB053F75DF9AE3FB317B199E4ABAD3C9279EEAD5481C8F3B1B5EEBBE3A95137234AB8C6D04E9ECE72A20DC7759B1836F392B99F5F095A4591639B63B6999
+
+Padding = EMSA1(SHA-1)
E = 79
P = 12623509009920451943188704532558549088394176932350155718346677596667742587560163977859877379200333095446158075633025630956096613873547787137410366502605473
Q = 10058994615186918965498012083239602676614988922192055472853974106579876551963188584799215667527538830845937432743673569788902953125963992649722735254207979
diff --git a/src/tests/test_dlies.cpp b/src/tests/test_dlies.cpp
index 75d751eaa..2aa9b9b70 100644
--- a/src/tests/test_dlies.cpp
+++ b/src/tests/test_dlies.cpp
@@ -25,13 +25,11 @@ class DLIES_KAT_Tests : public Text_Based_Test
public:
DLIES_KAT_Tests() : Text_Based_Test(
"pubkey/dlies.vec",
- {"Kdf", "Mac", "MacKeyLen", "Cipher", "CipherKeyLen", "IV", "P", "G", "X1", "X2", "Msg", "Ciphertext"})
+ {"Kdf", "Mac", "MacKeyLen", "IV", "Group", "X1", "X2", "Msg", "Ciphertext"})
{}
- Test::Result run_one_test(const std::string&, const VarMap& vars) override
+ Test::Result run_one_test(const std::string& cipher_algo, const VarMap& vars) override
{
- const Botan::BigInt p = get_req_bn(vars, "P");
- const Botan::BigInt g = get_req_bn(vars, "G");
const Botan::BigInt x1 = get_req_bn(vars, "X1");
const Botan::BigInt x2 = get_req_bn(vars, "X2");
@@ -41,12 +39,11 @@ class DLIES_KAT_Tests : public Text_Based_Test
const std::string kdf_algo = get_req_str(vars, "Kdf");
const std::string mac_algo = get_req_str(vars, "Mac");
const size_t mac_key_len = get_req_sz(vars, "MacKeyLen");
+ const std::string group_name = get_req_str(vars, "Group");
- const std::string cipher_algo = get_opt_str(vars, "Cipher", "");
- const size_t cipher_key_len = get_opt_sz(vars, "CipherKeyLen", 0);
const std::vector<uint8_t> iv = get_opt_bin(vars, "IV");
- Test::Result result("DLIES");
+ Test::Result result("DLIES " + cipher_algo);
std::unique_ptr<Botan::KDF> kdf(Botan::KDF::create(kdf_algo));
if(!kdf)
@@ -64,14 +61,17 @@ class DLIES_KAT_Tests : public Text_Based_Test
std::unique_ptr<Botan::Cipher_Mode> enc;
std::unique_ptr<Botan::Cipher_Mode> dec;
+ size_t cipher_key_len = 0;
- if(! cipher_algo.empty())
+ if(cipher_algo != "XOR")
{
enc.reset(Botan::get_cipher_mode(cipher_algo, Botan::ENCRYPTION));
dec.reset(Botan::get_cipher_mode(cipher_algo, Botan::DECRYPTION));
+
+ cipher_key_len = enc->key_spec().maximum_keylength();
}
- Botan::DL_Group domain(p, g);
+ Botan::DL_Group domain(group_name);
Botan::DH_PrivateKey from(Test::rng(), domain, x1);
Botan::DH_PrivateKey to(Test::rng(), domain, x2);
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-23 13:31:18 +0000