8 files changed, 31 insertions, 31 deletions

diff --git a/src/tests/data/tls/alert.vec b/src/tests/data/tls/alert.vec
index 19ec8839b..cd5058212 100644
--- a/src/tests/data/tls/alert.vec
+++ b/src/tests/data/tls/alert.vec
@@ -14,11 +14,11 @@ Exception =
 
 Buffer = 0030
 Protocol = 0303
-Exception = Invalid argument Decoding error: Alert: Bad code for alert level
+Exception = Alert: Bad code for alert level
 
 Buffer = 02
-Exception = Invalid argument Decoding error: Alert: Bad size 1 for alert message
+Exception = Alert: Bad size 1 for alert message
 
 Buffer = 020101
-Exception = Invalid argument Decoding error: Alert: Bad size 3 for alert message
+Exception = Alert: Bad size 3 for alert message
 
diff --git a/src/tests/data/tls/cert_status.vec b/src/tests/data/tls/cert_status.vec
index d93f800ab..c01c10951 100644
--- a/src/tests/data/tls/cert_status.vec
+++ b/src/tests/data/tls/cert_status.vec
@@ -1,16 +1,16 @@
 
 [cert_status]
 Buffer = 00
-Exception = Invalid argument Decoding error: Invalid Certificate_Status message: too small
+Exception = Invalid Certificate_Status message: too small
 
 Buffer = 01
-Exception = Invalid argument Decoding error: Invalid Certificate_Status message: too small
+Exception = Invalid Certificate_Status message: too small
 
 Buffer = 01000000
-Exception = Invalid argument Decoding error: Invalid Certificate_Status message: too small
+Exception = Invalid Certificate_Status message: too small
 
 Buffer = 010FFFF000
-Exception = Invalid argument Decoding error: Invalid Certificate_Status: invalid length field
+Exception = Invalid Certificate_Status: invalid length field
 
 Buffer = 0100020F3082020B0A0100A08202043082020006092B0601050507300101048201F1308201ED3081D6A14C304A310B300906035504061302555331163014060355040A130D4C6574277320456E6372797074312330210603550403131A4C6574277320456E637279707420417574686F72697479205833180F32303136313131383132313630305A30753073304B300906052B0E03021A050004147EE66AE7729AB3FCF8A220646C16A12D6071085D0414A84A6A63047DDDBAE6D139B7A64565EFF3A8ECA1021203E89ED07A424B72A35FAD167F48A4F25AD28000180F32303136313131383132303030305AA011180F32303136313132353132303030305A300D06092A864886F70D01010B050003820101007CB8774D813E6E0FBFA816BE53F5F3131EF9DED7B0928BBE50AC628C90C811DBBFE0E43A98BF3FB608CC230EFE31FE98BE99016D98DE73028F6C1AE8C34B0F20DD7E688604322538E721EF9D0D353EADE8818BFB63DA8078A7E2BF9E637282DE6C79B2289F0C13807A9D3B7532970FF0AA77CE06A06299B02274ED6C62DFC672485405C1859FEBDFC3B5B2D81A0A45382FFABBF75D6EAC1AD1AF12701DCDF87F0EFEB41933AED08EF78B35F48362A792E55027F00B3EE4571F30212A3EB7BE4B934F67685A4AF2BBF428280BC20D1A42E75DBE42C459541B4E1EE5BB99E0CCA166C2E9C2E6054F147F2FDF33F104E9076061640EDDB12B62BEAA82E0D60ED128
 Name = Let's Encrypt Authority X3
diff --git a/src/tests/data/tls/cert_verify.vec b/src/tests/data/tls/cert_verify.vec
index d36156cc2..335cb8353 100644
--- a/src/tests/data/tls/cert_verify.vec
+++ b/src/tests/data/tls/cert_verify.vec
@@ -24,17 +24,17 @@ Exception =
 #Incomplete algorithm
 Buffer = 06
 Protocol = 0303
-Exception = Invalid argument Decoding error: Invalid CertificateVerify: Expected 2 bytes remaining, only 1 left
+Exception = Invalid CertificateVerify: Expected 2 bytes remaining, only 1 left
 
 #Incomplete certificate
 Buffer = 0601000500
 Protocol = 0303
-Exception = Invalid argument Decoding error: Invalid CertificateVerify: Expected 5 bytes remaining, only 1 left
+Exception = Invalid CertificateVerify: Expected 5 bytes remaining, only 1 left
 
 Buffer = 000200
 Protocol = 0302
-Exception = Invalid argument Decoding error: Invalid CertificateVerify: Expected 2 bytes remaining, only 1 left
+Exception = Invalid CertificateVerify: Expected 2 bytes remaining, only 1 left
 
 Buffer = 000200
 Protocol = 0301
-Exception = Invalid argument Decoding error: Invalid CertificateVerify: Expected 2 bytes remaining, only 1 left
+Exception = Invalid CertificateVerify: Expected 2 bytes remaining, only 1 left
diff --git a/src/tests/data/tls/client_hello.vec b/src/tests/data/tls/client_hello.vec
index afd8e83c1..40d883ede 100644
--- a/src/tests/data/tls/client_hello.vec
+++ b/src/tests/data/tls/client_hello.vec
@@ -25,44 +25,44 @@ Exception =
 # empty
 Buffer = 
 Protocol = 0303
-Exception = Invalid argument Decoding error: Client_Hello: Packet corrupted
+Exception = Client_Hello: Packet corrupted
 
 Buffer = 00
 Protocol = 0303
-Exception = Invalid argument Decoding error: Client_Hello: Packet corrupted
+Exception = Client_Hello: Packet corrupted
 
 # Invalid cipher suite length (0xf0e2 instead of 0x00e2)
 Buffer = 0303e00da23523058b5dc9c445d97b2bb6315b019e97838ac4f16c23b2cb031b6a4900f0e2c0afc0adc030c02cc028c024c014c00ac0a3c09f00a500a300a1009f006b006a006900680039003800370036cca9cca8c077c073ccaa00c400c300c200c10088008700860085c032c02ec02ac026c00fc005c079c075c0a1c09d009d003d003500c00084c0aec0acc02fc02bc027c023c013c009c0a2c09e00a400a200a0009e00670040003f003e0033003200310030c076c07200be00bd00bc00bb009a0099009800970045004400430042c031c02dc029c025c00ec004c078c074c0a0c09c009c003c002f00ba009600410007c012c008001600130010000dc00dc003000a00ff01000000
 Protocol = 0303
 AdditionalData = 
-Exception = Invalid argument Decoding error: Invalid ClientHello: Expected 61666 bytes remaining, only 230 left
+Exception = Invalid ClientHello: Expected 61666 bytes remaining, only 230 left
 
 #invalid extensions length
 Buffer = 030320f3dc33f90be6509e6133a1819f2b80fe6ccc6268d9195ca4ead7504ffe7e2a0000aac030c02cc028c024c014c00a00a500a300a1009f006b006a0069006800390038003700360088008700860085c032c02ec02ac026c00fc005009d003d00350084c02fc02bc027c023c013c00900a400a200a0009e00670040003f003e0033003200310030009a0099009800970045004400430042c031c02dc029c025c00ec004009c003c002f00960041c011c007c00cc00200050004c012c008001600130010000dc00dc003000a00ff01000001
 Protocol = 0303
-Exception = Invalid argument Decoding error: Bad extension size
+Exception = Bad extension size
 
 #invalid extensions length 2
 Buffer = 030320f3dc33f90be6509e6133a1819f2b80fe6ccc6268d9195ca4ead7504ffe7e2a0000aac030c02cc028c024c014c00a00a500a300a1009f006b006a0069006800390038003700360088008700860085c032c02ec02ac026c00fc005009d003d00350084c02fc02bc027c023c013c00900a400a200a0009e00670040003f003e0033003200310030009a0099009800970045004400430042c031c02dc029c025c00ec004009c003c002f00960041c011c007c00cc00200050004c012c008001600130010000dc00dc003000a00ff010000010000
 Protocol = 0303
-Exception = Invalid argument Decoding error: Bad extension size
+Exception = Bad extension size
 
 #invalid length of the supported groups  extension (0xf01c instead of 0x001c)
 Buffer = 0303871e18983024eaee1be8ae6607d5ecad941d33fd7fc1d8554a9e1fbfda8d30880000aac030c02cc028c024c014c00a00a500a300a1009f006b006a0069006800390038003700360088008700860085c032c02ec02ac026c00fc005009d003d00350084c02fc02bc027c023c013c00900a400a200a0009e00670040003f003e0033003200310030009a0099009800970045004400430042c031c02dc029c025c00ec004009c003c002f00960041c011c007c00cc00200050004c012c008001600130010000dc00dc003000a00ff01000055000b000403000102000af01c001a00170019001c001b0018001a0016000e000d000b000c0009000a00230000000d0020001e060106020603050105020503040104020403030103020303020102020203000f000101
 Protocol = 0303
-Exception = Invalid argument Decoding error: Inconsistent length field in supported groups list
+Exception = Inconsistent length field in supported groups list
 
 #invalid length of the supported groups  extension (0xf01a instead of 0x001a)
 Buffer = 0303871e18983024eaee1be8ae6607d5ecad941d33fd7fc1d8554a9e1fbfda8d30880000aac030c02cc028c024c014c00a00a500a300a1009f006b006a0069006800390038003700360088008700860085c032c02ec02ac026c00fc005009d003d00350084c02fc02bc027c023c013c00900a400a200a0009e00670040003f003e0033003200310030009a0099009800970045004400430042c031c02dc029c025c00ec004009c003c002f00960041c011c007c00cc00200050004c012c008001600130010000dc00dc003000a00ff01000055000b000403000102000a001cf01a00170019001c001b0018001a0016000e000d000b000c0009000a00230000000d0020001e060106020603050105020503040104020403030103020303020102020203000f000101
 Protocol = 0303
-Exception = Invalid argument Decoding error: Inconsistent length field in supported groups list
+Exception = Inconsistent length field in supported groups list
 
 #invalid length of the session ticket extension
 Buffer = 0303871e18983024eaee1be8ae6607d5ecad941d33fd7fc1d8554a9e1fbfda8d30880000aac030c02cc028c024c014c00a00a500a300a1009f006b006a0069006800390038003700360088008700860085c032c02ec02ac026c00fc005009d003d00350084c02fc02bc027c023c013c00900a400a200a0009e00670040003f003e0033003200310030009a0099009800970045004400430042c031c02dc029c025c00ec004009c003c002f00960041c011c007c00cc00200050004c012c008001600130010000dc00dc003000a00ff01000055000b000403000102000a001c001a00170019001c001b0018001a0016000e000d000b000c0009000a002300ff000d0020001e060106020603050105020503040104020403030103020303020102020203000f000101
 Protocol = 0303
-Exception = Invalid argument Decoding error: Invalid ClientHello: Expected 255 bytes remaining, only 41 left
+Exception = Invalid ClientHello: Expected 255 bytes remaining, only 41 left
 
 #invalid length of the heartbeat extension
 Buffer = 0303871e18983024eaee1be8ae6607d5ecad941d33fd7fc1d8554a9e1fbfda8d30880000aac030c02cc028c024c014c00a00a500a300a1009f006b006a0069006800390038003700360088008700860085c032c02ec02ac026c00fc005009d003d00350084c02fc02bc027c023c013c00900a400a200a0009e00670040003f003e0033003200310030009a0099009800970045004400430042c031c02dc029c025c00ec004009c003c002f00960041c011c007c00cc00200050004c012c008001600130010000dc00dc003000a00ff01000055000b000403000102000a001c001a00170019001c001b0018001a0016000e000d000b000c0009000a00230000000d0020001e060106020603050105020503040104020403030103020303020102020203000f000201
 Protocol = 0303
-Exception = Invalid argument Decoding error: Invalid ClientHello: Expected 2 bytes remaining, only 1 left
+Exception = Invalid ClientHello: Expected 2 bytes remaining, only 1 left
diff --git a/src/tests/data/tls/hello_request.vec b/src/tests/data/tls/hello_request.vec
index 3a7471ae4..280acada9 100644
--- a/src/tests/data/tls/hello_request.vec
+++ b/src/tests/data/tls/hello_request.vec
@@ -5,4 +5,4 @@ Buffer =
 Exception = 
 
 Buffer = 01
-Exception = Invalid argument Decoding error: Bad Hello_Request, has non-zero size
+Exception = Bad Hello_Request, has non-zero size
diff --git a/src/tests/data/tls/hello_verify.vec b/src/tests/data/tls/hello_verify.vec
index f5db9e085..59fc1c337 100644
--- a/src/tests/data/tls/hello_verify.vec
+++ b/src/tests/data/tls/hello_verify.vec
@@ -10,17 +10,17 @@ Exception =
 
 # HelloVerify request has to contain at least 3 bytes
 Buffer = 0101
-Exception = Invalid argument Decoding error: Hello verify request too small
+Exception = Hello verify request too small
 
 # HelloVerify has to contain valid protocol version
 Buffer = 010100
-Exception = Invalid argument Decoding error: Unknown version from server in hello verify request
+Exception = Unknown version from server in hello verify request
 
 # HelloVerify has to contain valid number of bytes 
 Buffer = FEFD0000
-Exception = Invalid argument Decoding error: Bad length in hello verify request
+Exception = Bad length in hello verify request
 
 # HelloVerify has to contain valid number of bytes 
 Buffer = FEFD0500
-Exception = Invalid argument Decoding error: Bad length in hello verify request
+Exception = Bad length in hello verify request
 
diff --git a/src/tests/data/tls/new_session_ticket.vec b/src/tests/data/tls/new_session_ticket.vec
index 22c03611e..bfc069149 100644
--- a/src/tests/data/tls/new_session_ticket.vec
+++ b/src/tests/data/tls/new_session_ticket.vec
@@ -14,7 +14,7 @@ Buffer = 0000000000051122334455
 Exception  =
 
 Buffer = 0001
-Exception = Invalid argument Decoding error: Session ticket message too short to be valid
+Exception = Session ticket message too short to be valid
 
 Buffer = 00010203000500
-Exception = Invalid argument Decoding error: Invalid SessionTicket: Expected 5 bytes remaining, only 1 left
\ No newline at end of file
+Exception = Invalid SessionTicket: Expected 5 bytes remaining, only 1 left
\ No newline at end of file
diff --git a/src/tests/data/tls/server_hello.vec b/src/tests/data/tls/server_hello.vec
index c4daed84e..481ad02b8 100644
--- a/src/tests/data/tls/server_hello.vec
+++ b/src/tests/data/tls/server_hello.vec
@@ -24,25 +24,25 @@ Buffer =
 Protocol = 0303
 Ciphersuite = C030
 AdditionalData = 
-Exception = Invalid argument Decoding error: Server_Hello: Packet corrupted
+Exception = Server_Hello: Packet corrupted
 
 # incorrect, corrupted
 Buffer = 00
 Protocol = 0303
 Ciphersuite = C030
 AdditionalData = 
-Exception = Invalid argument Decoding error: Server_Hello: Packet corrupted
+Exception = Server_Hello: Packet corrupted
 
 # invalid extensions length
 Buffer = 03039f9cafa88664d9095f85dd64a39e5dd5c09f5a4a5362938af3718ee4e818af6a00c03000001cff01000100000b00040300010200230000000f00010100170000
 Protocol = 0303
 Ciphersuite = C030
 AdditionalData = 00170023FF01
-Exception = Invalid argument Decoding error: Bad extension size
+Exception = Bad extension size
 
 # invalid extension length
 Buffer = 03039f9cafa88664d9095f85dd64a39e5dd5c09f5a4a5362938af3718ee4e818af6a00c03000001aff01000100000b00040300010200230100000f00010100170000
 Protocol = 0303
 Ciphersuite = C030
 AdditionalData = 00170023FF01
-Exception = Invalid argument Decoding error: Invalid ServerHello: Expected 256 bytes remaining, only 9 left
+Exception = Invalid ServerHello: Expected 256 bytes remaining, only 9 left