From f5729188bbe61d430edaa0891db3da2b0351ff36 Mon Sep 17 00:00:00 2001 From: Mazet Laurent Date: Thu, 15 May 2025 15:39:55 +0200 Subject: [PATCH] correct decrypting process --- cryptomod/script-black.eth | 4 ++-- function.c | 10 ++++++++-- pdu_encrypted_data.h | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/cryptomod/script-black.eth b/cryptomod/script-black.eth index c3107c5..c87d554 100644 --- a/cryptomod/script-black.eth +++ b/cryptomod/script-black.eth @@ -4,10 +4,10 @@ R:BYPASS BYPASSED_CROSS_ASYNC DATA="Radio\ Configuration" # received data -R:CROSS_CRYPTO ENCRYPTED_CROSS_ASYNC CHANNELID=0 IV=00:67:c6:69:98:73:51:ff:5c:4a:ec:29 BYPASSLEN=0 DATA=92:3c:7a:08:cc:0a:87:da:c2:07:df:70:97:cb:d9:d2:31:76:76:88:89:e4:59:b0:c5:85:d3:32:4b:2a:de:62:ab:d8:e5:8a:99:6d:26:71:1b:91:9b:f0:b2:96:7a:f0:3d:35:8a:eb:95:a3:dd:8c:f6:3b:50:a7:7a:76:17:4b:85:7f:05:7b:e1:42:f8:d7:1b:44:f6:ec:ba:d2:4c:15:ad:9a:bf:9c:db:2b:e8:50:1f:d9:6c:e6:72:95:14:ac:8b:e4:51:54:1d:a8:d8:cb:c3:3a:0b:7d:4e:92:e9:04:a3:b9:68:10:cc:fb:5a:c4:71:e9:e8:c8:c9:73:ac:01:fb:1b:8b:72:04:fa:dd:e0:66:9d:c9:18:f2:4e:8e:75:42:8c:67:91:c4:7b:f6:b3:ad:db:04:37:27:52:5a:dc:f7:78:6c:88:10:87:ff:d2:d8:bf:ae:06:9d:68:aa:e0:5a:82:72:8f:7b:93:45:33:84:30:b2:d1:48:23:04:cf:7a:48:e3:0f:4f:d6:56:79:36:6a:82:44:0a:ac:24:d6:93:6b:28:f7:9b:38:8a:48:1d:f0:c3:65:7c:c0:c1:14:6a:b0:72:7d:be:ac:46:91:2e:15:8d:64:77:53:9c:48:a9:81:f8:c0:8e:ec:e5:8d:5e:dc:e6:bb:5c:58:a6:13:0b:b3:3d:ca:d6:92:a6:a6:43:00:3f:a8:60:5e:14:9c:56:cc:8f:da:61:69:df:53:28:92:cc:5c:23:89:cd:22:70:30:c3:12:40:ca:67:df:b4:ae:1b:44:d6:e3:85:70:c4:3f:cd:60:90:56:63:16:cd:88:0c:12:ae:4a:b0:d8:80:2c:82:ae:d4:fb:f6:cd:56:7b:8b:48:f3:68:6c:8c:58:43:0d:75:0f:33:24:b4:01:b9:ae:66:7a:29:da:ed:8f:33:dd:c5:23:98:94:27:c1:c6:77:11:01:9f:86:d0:a5:a7:3c:54:e5:0f:eb:b0:6a:b5:fa:b1:6a:6e:3d:e2:5d:80:1f:3d:e3:57:64:03:47:32:54:51:3c:44:13:90:cc:20:a9:b8:c9:51:c4:73:0e:67:31:38:b2:c7:57:3a:e8:e8:2d:6b:f4:55:7f:09:c9:e0:a7:bf:42:82:7b:81:f7:02:c0:29:82:f9:96:73:0f:0d:79:ac:fb:64:68:81:31:bd:c1:59:5e:e2:60:ad:2b:bd:34:df:73:24:55:37:56:a0:6d:17:40:b6:54:5d:af:56:24:e0:bb:58:e6:26:46:df:ab:be:1c:14:40:85:6d:4c:93:d0:88:39:37:89:7f:1e:9f:52:21:c5:35:a9:7f:39:b9:5c:3e:88:6f:93:4b:ca:cc:c1:67:b2:3e:c9:73:5d:10:26:ea:25:1b:46:ed:e8:12:cb:f5:eb:18:f4:45:fc:ab:db:80:8c:f9:58:77:e0:7a:57:5d:0b:10:f5:87:d2:a0:45:0c:06:50:81:28:81:52:4d:5e:2c:45:be:bc:14:54:a5:66:5e:4a:fc:6c:86:35:c1:56:2f:56:16:0f:78:5e:1c:2b:bc:65:51:4e:a5:39:5c:86:ad:c2:aa:7a:7f:fe:65:ae:15:b8:04:03:5e:51:46:1c:db:93:4a:44:c5:4d:78:d8:cc:e9:24:b1:b2:5d:d9:58:ae:2c:f8:5c:f5:d2:64:6c:4c:e5:26:f9:5d:2f:70:09:39:57:5a:51:8c:99:c7:2f:1c:ba:ec:44:c9:57:8a:1e:76:6e:28:9c:15:d9:39:cc:38:88:f9:b5:c4:df:ae:15:36:d0:93:56:a0:77:72:b2:ff:59:8e:21:32:b3:e8:c5:1c:8a:7f:a9:ba:7e:09:c5:a3:f8:e9:3d:5a:05:3a:83:1a:34:e7:d4:8e:21:9e:eb:9e:62:3e:21:31:6a:f2:ea:ea:5b:98:84:bd:d0:31:c2:86:f2:6d:5b:f0:a3:48:d4:dc:d7:05:d1:26:fe:a7:65:a4:b4:f6:2d:cb:30:8d:4e:32:ec:50:de:06:68:c7:8e:a0:02:78:08:8d:8d:1e:d5:1b:77:ae:43:06:92:3f:3c:56:45:37:39:ca:08:3a:08:b1:11:16:b3:51:82:79:98:1d:2d:57:45:d8:76:40:62:ff:8e:8b:0b:89:dd:89:9e:c5:d8:22:5f:ac:42:83:84:8f:f9:8e:f5:95:a8:bd:af:d7:fa:e6:18:58:ce:95:2d:9b:a0:05:1f:e7:7b:27:23:71:4b:6c:d8:a1:53:6d:32:2a:44:1f:6b:45:73:d6:b2:01:66:1c:d3:3a:82:41:bd:8c:30:ba:c8:1d:a3:45:33:d1:bb:30:d2:80:d9:e5:15:15:d3:4c:ce:b4:81:23:1b:e7:42:4a:86:0d:32:bc:f9:5c:30:98:1a:f1:62:be:2f:c9:5e:ae:e6:fb:0e:68:95:3c:d3:1d:11:81 +R:CROSS_CRYPTO ENCRYPTED_CROSS_ASYNC CHANNELID=0 BYPASSLEN=0 AAD=00:00:00:00 IV=00:67:c6:69:98:73:51:ff:5c:4a:ec:29 DATA=42:87:77:9a:72:1f:b7:2d:eb:49:5f:ae:0f:f6:e6:5a:14:6d:18:09:cf:cc:b0:d5:28:24:87:4f:ee:35:4a:fe:cf:8b:e1:17:b0:7b:11:ab:99:8a:44:90:6c:21:2d:10:4f:03:2f:72:71:e3:81:ba:a8:6e:c7:4c:34:64:25:7e:2a:d6:d5:57:67:2d:7d:6b:69:8d:55:80:45:30:ca:49:52:ec:9a:f7:ee:fe:e6:2f:ef:6f:72:07:39:7e:08:8d:b8:ef:a4:5a:e4:0a:c5:97:04:4c:f8:b5:ea:a2:80:7f:52:ee:90:d6:33:b8:ca:ba:9c:bd:83:f3:7b:fa:64:ce:02:4c:48:2d:2e:3d:b5:8e:b0:e6:62:dd:0c:1f:e2:df:ee:33:7c:77:df:e3:35:1d:57:24:d5:8c:68:73:e8:8e:60:0c:6c:ab:15:8c:7e:1f:19:1a:81:84:94:bf:9d:0a:13:d0:c8:32:c3:0e:f7:46:44:43:81:ac:ff:87:cd:fd:1f:49:5d:ad:6a:fc:24:e8:7e:d5:a5:1d:68:ef:12:08:d4:89:0a:eb:8f:ca:6b:bd:95:7f:46:19:be:2c:63:2f:a3:61:13:34:e2:96:dd:80:45:2b:1b:20:2b:c6:d7:53:22:ed:4f:70:56:db:47:cc:28:62:6a:a3:a0:ee:91:f1:33:2f:9e:54:f2:f5:3b:3d:81:1b:af:5c:f4:72:ff:7a:cc:10:15:28:5c:ed:c6:a4:cf:d8:6a:d2:01:fd:92:49:24:c1:77:de:8f:3f:a6:05:d4:ed:2b:88:20:a1:03:44:07:39:d3:99:6d:85:ec:b4:e8:98:8c:c4:a6:bc:bd:22:6f:9d:d0:63:5e:de:74:81:52:e8:1e:0d:3f:35:dd:41:96:11:e3:72:09:3c:44:43:0b:bb:73:00:ce:f7:14:18:3e:73:cb:52:67:47:f5:4b:c3:1d:b9:47:ba:ce:ea:ed:37:84:6f:36:0f:a4:22:a3:08:3f:0c:e6:fa:7f:fb:70:71:05:32:99:25:13:56:9f:e1:18:4a:ba:f7:f0:d8:b2:5e:2d:0e:77:4f:c5:5b:80:42:b8:21:4f:bf:18:19:26:ef:83:07:8b:26:f3:00:e0:3b:0a:41:f8:3e:64:ac:d0:93:8a:32:66:d3:61:e9:d4:30:a6:eb:a4:8b:08:76:f1:db:a6:e8:03:04:95:73:0e:b4:60:95:f5:7e:05:7f:73:f5:47:7c:58:fb:e9:ef:33:44:e7:e8:c9:8e:e3:17:54:52:6c:c0:84:da:48:9a:e8:07:a8:0f:8e:52:52:47:f6:3a:dc:68:60:ef:3a:ea:a9:f7:52:69:45:7a:06:f3:19:e3:c4:96:d6:f5:18:29:a9:5b:ff:f8:af:2b:c5:89:76:31:ad:df:61:7e:44:49:e3:dd:39:7b:c5:36:5c:af:b9:45:14:01:8c:f6:a4:4f:fa:a7:06:48:7c:20:0a:08:12:61:b0:2b:26:fe:17:b1:7b:59:94:97:df:f6:35:fd:01:02:b5:c8:1e:b3:81:c9:d5:36:84:f2:b7:7c:c2:4a:1e:31:09:db:bb:3a:0a:6c:a7:a0:27:a5:1e:55:83:4f:cb:49:00:51:d6:9d:3b:db:b1:31:33:b9:fa:61:96:3f:e2:a2:8c:bc:cb:27:2f:33:20:2e:f8:f8:97:5d:cd:19:25:2d:79:3e:59:a6:d7:bc:b5:dc:ab:ef:5b:61:0c:09:98:5f:9a:86:5f:4a:7f:f0:6f:7b:d3:51:79:a2:b7:5c:62:8d:74:48:00:1b:b4:a7:40:9b:95:dd:e5:c6:e4:0d:12:34:90:b0:8f:10:43:d1:dc:30:7e:4f:29:87:90:0d:01:e3:25:e4:c9:ea:72:b5:be:2e:54:0c:52:0f:83:b9:2e:d2:71:e3:d9:ca:93:f4:5d:06:ff:fa:97:5c:45:b4:16:36:2e:d0:6a:c5:15:2f:33:76:fc:3d:d7:e6:f2:a5:79:67:5f:72:35:15:6d:96:e9:4a:eb:7c:c8:56:53:e0:91:ea:97:61:39:fc:9f:27:43:a0:99:aa:d2:97:08:27:04:b0:37:25:95:0b:d4:50:da:f4:07:9b:3d:3a:8b:6d:21:b1:68:6b:00:3e:aa:91:33:64:79:14:0d:15:73:bf:b0:bd:5a:7a:c9:c8:c9:ce:43:d5:d9:b4:c3:d8:f5:f8:e1:b0:67:3c:75:61:30:fc:61:44:e9:9f:02:48:c1:6d:21:24:cc:dd:05:31:2a:18:b6:26:76:3d:ec:c1:98:b4:37:3b:b1:f7:0e:ad:69:f4:a3:8e:40:ae:53:38:9c:56:f3:1a:ee:66:e7:ce:e7:81:3e:ed:ca:f4:e9:e4:9f:93:9c:bd:ae:43:bf:18:44:4e:bd:0e:2f:c6:63:ce:fb:67:18:50:58:9a:0c:3c:40:04:75:1d:f6 # wait SLEEP 1000 # send data -T:CROSS_CRYPTO DECRYPT_CROSS_ASYNC CHANNELID=0 IV=00:67:c6:69:98:73:51:ff:5c:4a:ec:29 BYPASSLEN=0 DATA=92:3c:7a:08:cc:0a:87:da:c2:07:df:70:97:cb:d9:d2:31:76:76:88:89:e4:59:b0:c5:85:d3:32:4b:2a:de:62:ab:d8:e5:8a:99:6d:26:71:1b:91:9b:f0:b2:96:7a:f0:3d:35:8a:eb:95:a3:dd:8c:f6:3b:50:a7:7a:76:17:4b:85:7f:05:7b:e1:42:f8:d7:1b:44:f6:ec:ba:d2:4c:15:ad:9a:bf:9c:db:2b:e8:50:1f:d9:6c:e6:72:95:14:ac:8b:e4:51:54:1d:a8:d8:cb:c3:3a:0b:7d:4e:92:e9:04:a3:b9:68:10:cc:fb:5a:c4:71:e9:e8:c8:c9:73:ac:01:fb:1b:8b:72:04:fa:dd:e0:66:9d:c9:18:f2:4e:8e:75:42:8c:67:91:c4:7b:f6:b3:ad:db:04:37:27:52:5a:dc:f7:78:6c:88:10:87:ff:d2:d8:bf:ae:06:9d:68:aa:e0:5a:82:72:8f:7b:93:45:33:84:30:b2:d1:48:23:04:cf:7a:48:e3:0f:4f:d6:56:79:36:6a:82:44:0a:ac:24:d6:93:6b:28:f7:9b:38:8a:48:1d:f0:c3:65:7c:c0:c1:14:6a:b0:72:7d:be:ac:46:91:2e:15:8d:64:77:53:9c:48:a9:81:f8:c0:8e:ec:e5:8d:5e:dc:e6:bb:5c:58:a6:13:0b:b3:3d:ca:d6:92:a6:a6:43:00:3f:a8:60:5e:14:9c:56:cc:8f:da:61:69:df:53:28:92:cc:5c:23:89:cd:22:70:30:c3:12:40:ca:67:df:b4:ae:1b:44:d6:e3:85:70:c4:3f:cd:60:90:56:63:16:cd:88:0c:12:ae:4a:b0:d8:80:2c:82:ae:d4:fb:f6:cd:56:7b:8b:48:f3:68:6c:8c:58:43:0d:75:0f:33:24:b4:01:b9:ae:66:7a:29:da:ed:8f:33:dd:c5:23:98:94:27:c1:c6:77:11:01:9f:86:d0:a5:a7:3c:54:e5:0f:eb:b0:6a:b5:fa:b1:6a:6e:3d:e2:5d:80:1f:3d:e3:57:64:03:47:32:54:51:3c:44:13:90:cc:20:a9:b8:c9:51:c4:73:0e:67:31:38:b2:c7:57:3a:e8:e8:2d:6b:f4:55:7f:09:c9:e0:a7:bf:42:82:7b:81:f7:02:c0:29:82:f9:96:73:0f:0d:79:ac:fb:64:68:81:31:bd:c1:59:5e:e2:60:ad:2b:bd:34:df:73:24:55:37:56:a0:6d:17:40:b6:54:5d:af:56:24:e0:bb:58:e6:26:46:df:ab:be:1c:14:40:85:6d:4c:93:d0:88:39:37:89:7f:1e:9f:52:21:c5:35:a9:7f:39:b9:5c:3e:88:6f:93:4b:ca:cc:c1:67:b2:3e:c9:73:5d:10:26:ea:25:1b:46:ed:e8:12:cb:f5:eb:18:f4:45:fc:ab:db:80:8c:f9:58:77:e0:7a:57:5d:0b:10:f5:87:d2:a0:45:0c:06:50:81:28:81:52:4d:5e:2c:45:be:bc:14:54:a5:66:5e:4a:fc:6c:86:35:c1:56:2f:56:16:0f:78:5e:1c:2b:bc:65:51:4e:a5:39:5c:86:ad:c2:aa:7a:7f:fe:65:ae:15:b8:04:03:5e:51:46:1c:db:93:4a:44:c5:4d:78:d8:cc:e9:24:b1:b2:5d:d9:58:ae:2c:f8:5c:f5:d2:64:6c:4c:e5:26:f9:5d:2f:70:09:39:57:5a:51:8c:99:c7:2f:1c:ba:ec:44:c9:57:8a:1e:76:6e:28:9c:15:d9:39:cc:38:88:f9:b5:c4:df:ae:15:36:d0:93:56:a0:77:72:b2:ff:59:8e:21:32:b3:e8:c5:1c:8a:7f:a9:ba:7e:09:c5:a3:f8:e9:3d:5a:05:3a:83:1a:34:e7:d4:8e:21:9e:eb:9e:62:3e:21:31:6a:f2:ea:ea:5b:98:84:bd:d0:31:c2:86:f2:6d:5b:f0:a3:48:d4:dc:d7:05:d1:26:fe:a7:65:a4:b4:f6:2d:cb:30:8d:4e:32:ec:50:de:06:68:c7:8e:a0:02:78:08:8d:8d:1e:d5:1b:77:ae:43:06:92:3f:3c:56:45:37:39:ca:08:3a:08:b1:11:16:b3:51:82:79:98:1d:2d:57:45:d8:76:40:62:ff:8e:8b:0b:89:dd:89:9e:c5:d8:22:5f:ac:42:83:84:8f:f9:8e:f5:95:a8:bd:af:d7:fa:e6:18:58:ce:95:2d:9b:a0:05:1f:e7:7b:27:23:71:4b:6c:d8:a1:53:6d:32:2a:44:1f:6b:45:73:d6:b2:01:66:1c:d3:3a:82:41:bd:8c:30:ba:c8:1d:a3:45:33:d1:bb:30:d2:80:d9:e5:15:15:d3:4c:ce:b4:81:23:1b:e7:42:4a:86:0d:32:bc:f9:5c:30:98:1a:f1:62:be:2f:c9:5e:ae:e6:fb:0e:68:95:3c:d3:1d:11:81 +T:CROSS_CRYPTO DECRYPT_CROSS_ASYNC CHANNELID=0 BYPASSLEN=0 AAD=00:00:00:00 IV=00:67:c6:69:98:73:51:ff:5c:4a:ec:29 DATA=42:87:77:9a:72:1f:b7:2d:eb:49:5f:ae:0f:f6:e6:5a:14:6d:18:09:cf:cc:b0:d5:28:24:87:4f:ee:35:4a:fe:cf:8b:e1:17:b0:7b:11:ab:99:8a:44:90:6c:21:2d:10:4f:03:2f:72:71:e3:81:ba:a8:6e:c7:4c:34:64:25:7e:2a:d6:d5:57:67:2d:7d:6b:69:8d:55:80:45:30:ca:49:52:ec:9a:f7:ee:fe:e6:2f:ef:6f:72:07:39:7e:08:8d:b8:ef:a4:5a:e4:0a:c5:97:04:4c:f8:b5:ea:a2:80:7f:52:ee:90:d6:33:b8:ca:ba:9c:bd:83:f3:7b:fa:64:ce:02:4c:48:2d:2e:3d:b5:8e:b0:e6:62:dd:0c:1f:e2:df:ee:33:7c:77:df:e3:35:1d:57:24:d5:8c:68:73:e8:8e:60:0c:6c:ab:15:8c:7e:1f:19:1a:81:84:94:bf:9d:0a:13:d0:c8:32:c3:0e:f7:46:44:43:81:ac:ff:87:cd:fd:1f:49:5d:ad:6a:fc:24:e8:7e:d5:a5:1d:68:ef:12:08:d4:89:0a:eb:8f:ca:6b:bd:95:7f:46:19:be:2c:63:2f:a3:61:13:34:e2:96:dd:80:45:2b:1b:20:2b:c6:d7:53:22:ed:4f:70:56:db:47:cc:28:62:6a:a3:a0:ee:91:f1:33:2f:9e:54:f2:f5:3b:3d:81:1b:af:5c:f4:72:ff:7a:cc:10:15:28:5c:ed:c6:a4:cf:d8:6a:d2:01:fd:92:49:24:c1:77:de:8f:3f:a6:05:d4:ed:2b:88:20:a1:03:44:07:39:d3:99:6d:85:ec:b4:e8:98:8c:c4:a6:bc:bd:22:6f:9d:d0:63:5e:de:74:81:52:e8:1e:0d:3f:35:dd:41:96:11:e3:72:09:3c:44:43:0b:bb:73:00:ce:f7:14:18:3e:73:cb:52:67:47:f5:4b:c3:1d:b9:47:ba:ce:ea:ed:37:84:6f:36:0f:a4:22:a3:08:3f:0c:e6:fa:7f:fb:70:71:05:32:99:25:13:56:9f:e1:18:4a:ba:f7:f0:d8:b2:5e:2d:0e:77:4f:c5:5b:80:42:b8:21:4f:bf:18:19:26:ef:83:07:8b:26:f3:00:e0:3b:0a:41:f8:3e:64:ac:d0:93:8a:32:66:d3:61:e9:d4:30:a6:eb:a4:8b:08:76:f1:db:a6:e8:03:04:95:73:0e:b4:60:95:f5:7e:05:7f:73:f5:47:7c:58:fb:e9:ef:33:44:e7:e8:c9:8e:e3:17:54:52:6c:c0:84:da:48:9a:e8:07:a8:0f:8e:52:52:47:f6:3a:dc:68:60:ef:3a:ea:a9:f7:52:69:45:7a:06:f3:19:e3:c4:96:d6:f5:18:29:a9:5b:ff:f8:af:2b:c5:89:76:31:ad:df:61:7e:44:49:e3:dd:39:7b:c5:36:5c:af:b9:45:14:01:8c:f6:a4:4f:fa:a7:06:48:7c:20:0a:08:12:61:b0:2b:26:fe:17:b1:7b:59:94:97:df:f6:35:fd:01:02:b5:c8:1e:b3:81:c9:d5:36:84:f2:b7:7c:c2:4a:1e:31:09:db:bb:3a:0a:6c:a7:a0:27:a5:1e:55:83:4f:cb:49:00:51:d6:9d:3b:db:b1:31:33:b9:fa:61:96:3f:e2:a2:8c:bc:cb:27:2f:33:20:2e:f8:f8:97:5d:cd:19:25:2d:79:3e:59:a6:d7:bc:b5:dc:ab:ef:5b:61:0c:09:98:5f:9a:86:5f:4a:7f:f0:6f:7b:d3:51:79:a2:b7:5c:62:8d:74:48:00:1b:b4:a7:40:9b:95:dd:e5:c6:e4:0d:12:34:90:b0:8f:10:43:d1:dc:30:7e:4f:29:87:90:0d:01:e3:25:e4:c9:ea:72:b5:be:2e:54:0c:52:0f:83:b9:2e:d2:71:e3:d9:ca:93:f4:5d:06:ff:fa:97:5c:45:b4:16:36:2e:d0:6a:c5:15:2f:33:76:fc:3d:d7:e6:f2:a5:79:67:5f:72:35:15:6d:96:e9:4a:eb:7c:c8:56:53:e0:91:ea:97:61:39:fc:9f:27:43:a0:99:aa:d2:97:08:27:04:b0:37:25:95:0b:d4:50:da:f4:07:9b:3d:3a:8b:6d:21:b1:68:6b:00:3e:aa:91:33:64:79:14:0d:15:73:bf:b0:bd:5a:7a:c9:c8:c9:ce:43:d5:d9:b4:c3:d8:f5:f8:e1:b0:67:3c:75:61:30:fc:61:44:e9:9f:02:48:c1:6d:21:24:cc:dd:05:31:2a:18:b6:26:76:3d:ec:c1:98:b4:37:3b:b1:f7:0e:ad:69:f4:a3:8e:40:ae:53:38:9c:56:f3:1a:ee:66:e7:ce:e7:81:3e:ed:ca:f4:e9:e4:9f:93:9c:bd:ae:43:bf:18:44:4e:bd:0e:2f:c6:63:ce:fb:67:18:50:58:9a:0c:3c:40:04:75:1d:f6 diff --git a/function.c b/function.c index 0b5fc1a..bd24627 100644 --- a/function.c +++ b/function.c @@ -222,8 +222,14 @@ int decrypt_func (ENCRYPTED_DATA_t *in, CLEAR_DATA_t *out) } if (EVP_DecryptUpdate (ctx, out->data, &out_len, in->data, in->data_len - TAG_LENGTH)) { out->data_len = out_len; - EVP_DecryptFinal_ex (ctx, NULL, &out_len); - out->data_len += out_len; + if (EVP_DecryptFinal_ex (ctx, NULL, &out_len)) { + out->data_len += out_len; + } else { + VERBOSE (crypto, WARNING, PRINTF ("decryption error\n")); + //memset (out->data, 0, out_len); + out->data_len = 0; + rc = 1; + } } else { VERBOSE (crypto, WARNING, PRINTF ("decryption error\n")); //memset (out->data, 0, out_len); diff --git a/pdu_encrypted_data.h b/pdu_encrypted_data.h index 5b91538..9f3faed 100644 --- a/pdu_encrypted_data.h +++ b/pdu_encrypted_data.h @@ -37,7 +37,7 @@ typedef struct { uint8_t bypass_len; /**< attached bypass message length */ uint8_t bypass[255]; /**< attached bypass message */ uint8_t aad[AAD_LENGTH]; /**< additional authenticated data */ - uint8_t iv[IV_LENGTH]; /**< initial vector */ + uint8_t iv[IV_LENGTH]; /**< initialization vector */ uint16_t data_len; /**< data length (must be aligned to 16 bytes) */ uint8_t data[16 * ((MOREP_PAYLOAD - 2 - AAD_LENGTH - IV_LENGTH) / 16)]; /**< data message + tag */ } ENCRYPTED_DATA_t; -- 2.30.2