瀏覽代碼

Adding bits to DH group KEX algorithm names

As PuTTY 0.78 does

Source commit: 90ed0339486bf2db796550ca0a71ca1df3451998
Martin Prikryl 2 年之前
父節點
當前提交
89d744f657
共有 2 個文件被更改,包括 12 次插入12 次删除
  1. 6 6
      source/resource/TextsWin.h
  2. 6 6
      source/resource/TextsWin1.rc

+ 6 - 6
source/resource/TextsWin.h

@@ -662,12 +662,12 @@
 #define CIPHER_NAME_CHACHA20    6060
 #define CIPHER_NAME_AESGCM      6061
 #define KEX_NAME_WARN           6070
-#define KEX_NAME_DHGROUP1       6071
-#define KEX_NAME_DHGROUP14      6072
-#define KEX_NAME_DHGROUP15      6073
-#define KEX_NAME_DHGROUP16      6074
-#define KEX_NAME_DHGROUP17      6075
-#define KEX_NAME_DHGROUP18      6076
+#define KEX_NAME_DHGROUP1_BITS  6071
+#define KEX_NAME_DHGROUP14_BITS 6072
+#define KEX_NAME_DHGROUP15_BITS 6073
+#define KEX_NAME_DHGROUP16_BITS 6074
+#define KEX_NAME_DHGROUP17_BITS 6075
+#define KEX_NAME_DHGROUP18_BITS 6076
 #define KEX_NAME_DHGEX          6077
 #define KEX_NAME_RSA            6078
 #define KEX_NAME_ECDH           6079

+ 6 - 6
source/resource/TextsWin1.rc

@@ -667,12 +667,12 @@ BEGIN
         CIPHER_NAME_CHACHA20, "ChaCha20"
         CIPHER_NAME_AESGCM, "AES-GCM"
         KEX_NAME_WARN, "-- warn below here --"
-        KEX_NAME_DHGROUP1, "Diffie-Hellman group 1"
-        KEX_NAME_DHGROUP14, "Diffie-Hellman group 14"
-        KEX_NAME_DHGROUP15, "Diffie-Hellman group 15"
-        KEX_NAME_DHGROUP16, "Diffie-Hellman group 16"
-        KEX_NAME_DHGROUP17, "Diffie-Hellman group 17"
-        KEX_NAME_DHGROUP18, "Diffie-Hellman group 18"
+        KEX_NAME_DHGROUP1_BITS, "Diffie-Hellman group 1 (1024-bit)"
+        KEX_NAME_DHGROUP14_BITS, "Diffie-Hellman group 14 (2048-bit)"
+        KEX_NAME_DHGROUP15_BITS, "Diffie-Hellman group 15 (3072-bit)"
+        KEX_NAME_DHGROUP16_BITS, "Diffie-Hellman group 16 (4096-bit)"
+        KEX_NAME_DHGROUP17_BITS, "Diffie-Hellman group 17 (6144-bit)"
+        KEX_NAME_DHGROUP18_BITS, "Diffie-Hellman group 18 (8192-bit)"
         KEX_NAME_DHGEX, "Diffie-Hellman group exchange"
         KEX_NAME_RSA, "RSA-based key exchange"
         KEX_NAME_ECDH, "ECDH key exchange"