Changing OTP prompt option to allow for "Prepend OTP" method too

localization.c

@@ -626,6 +626,18 @@ GeneralSettingsDlgProc(HWND hwndDlg, UINT msg, UNUSED WPARAM wParam, LPARAM lPar
             {
                 CheckRadioButton(hwndDlg, ID_RB_BALLOON3, ID_RB_BALLOON5, ID_RB_BALLOON3);
             }
+            if (o.show_balloon == 0)
+            {
+                CheckRadioButton(hwndDlg, ID_RB_BALLOON0, ID_RB_BALLOON2, ID_RB_BALLOON0);
+            }
+            else if (o.show_balloon == 1)
+            {
+                CheckRadioButton(hwndDlg, ID_RB_BALLOON0, ID_RB_BALLOON2, ID_RB_BALLOON1);
+            }
+            else if (o.show_balloon == 2)
+            {
+                CheckRadioButton(hwndDlg, ID_RB_BALLOON0, ID_RB_BALLOON2, ID_RB_BALLOON2);
+            }
 
             int plap_status = GetPLAPRegistrationStatus();
             if (plap_status == -1) /* PLAP not supported in this version */
@@ -640,9 +652,17 @@ GeneralSettingsDlgProc(HWND hwndDlg, UINT msg, UNUSED WPARAM wParam, LPARAM lPar
             {
                 Button_SetCheck(GetDlgItem(hwndDlg, ID_CHK_AUTO_RESTART), BST_CHECKED);
             }
-            if (o.auth_pass_concat_otp)
+            if (o.auth_pass_concat_otp == 0)
             {
-                Button_SetCheck(GetDlgItem(hwndDlg, ID_CHK_CONCAT_OTP), BST_CHECKED);
+                CheckRadioButton(hwndDlg, ID_RB_APPEND_OTP, ID_RB_DISABLE_OTP, ID_RB_DISABLE_OTP);
+            }
+            else if (o.auth_pass_concat_otp == 1)
+            {
+                CheckRadioButton(hwndDlg, ID_RB_APPEND_OTP, ID_RB_DISABLE_OTP, ID_RB_APPEND_OTP);
+            }
+            else if (o.auth_pass_concat_otp == 2)
+            {
+                CheckRadioButton(hwndDlg, ID_RB_APPEND_OTP, ID_RB_DISABLE_OTP, ID_RB_PREPEND_OTP);
             }
 
             break;
@@ -708,8 +728,18 @@ GeneralSettingsDlgProc(HWND hwndDlg, UINT msg, UNUSED WPARAM wParam, LPARAM lPar
                     (Button_GetCheck(GetDlgItem(hwndDlg, ID_CHK_SHOW_SCRIPT_WIN)) == BST_CHECKED);
                 o.enable_auto_restart =
                     (Button_GetCheck(GetDlgItem(hwndDlg, ID_CHK_AUTO_RESTART)) == BST_CHECKED);
-                o.auth_pass_concat_otp =
-                    (Button_GetCheck(GetDlgItem(hwndDlg, ID_CHK_CONCAT_OTP)) == BST_CHECKED);
+                if (IsDlgButtonChecked(hwndDlg, ID_RB_APPEND_OTP))
+                {
+                    o.auth_pass_concat_otp = 1;
+                }
+                else if (IsDlgButtonChecked(hwndDlg, ID_RB_PREPEND_OTP))
+                {
+                    o.auth_pass_concat_otp = 2;
+                }
+                else
+                {
+                    o.auth_pass_concat_otp = 0;
+                }
 
                 SaveRegistryKeys();
 

openvpn-gui-res.h

@@ -121,6 +121,10 @@
 #define ID_TXT_PERSISTENT                247
 #define ID_CHK_PLAP_REG                  248
 #define ID_CHK_AUTO_RESTART              249
+#define ID_TXT_CONCAT_OTP                470
+#define ID_RB_APPEND_OTP                 471
+#define ID_RB_PREPEND_OTP                472
+#define ID_RB_DISABLE_OTP                473
 
 /* Proxy Auth Dialog */
 #define ID_DLG_PROXY_AUTH                250
@@ -166,10 +170,6 @@
 #define ID_LVW_PKCS11                    451
 #define ID_TXT_PKCS11                    452
 
-/* General settings contd.. */
-
-#define ID_CHK_CONCAT_OTP                470
-
 /*
  * String Table Resources
  */

openvpn.c

@@ -712,7 +712,15 @@ UserAuthDialogFunc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
                         }
                         if (param->flags & FLAG_CR_TYPE_CONCAT)
                         {
-                            GetDlgItemTextW(hwndDlg, ID_EDT_AUTH_CHALLENGE, password + wcslen(password), _countof(password)-wcslen(password));
+                            if (o.auth_pass_concat_otp == 1) {
+                                /* Append to password */
+                                GetDlgItemTextW(hwndDlg, ID_EDT_AUTH_CHALLENGE, password + wcslen(password), _countof(password) - wcslen(password));
+                            }
+                            else {
+                                /* Prepend to password */
+                                GetDlgItemTextW(hwndDlg, ID_EDT_AUTH_CHALLENGE, password, _countof(password));
+                                GetDlgItemTextW(hwndDlg, ID_EDT_AUTH_PASS, password + wcslen(password), _countof(password) - wcslen(password));
+                            }
                             SetDlgItemTextW(hwndDlg, ID_EDT_AUTH_PASS, password);
                             /* erase potentially secret contents in the response text box */
                             memset(password, L'x', wcslen(password));
@@ -1434,7 +1442,7 @@ OnPassword(connection_t *c, char *msg)
             param->str = strdup(chstr + 5);
             LocalizedDialogBoxParamEx(ID_DLG_AUTH_CHALLENGE, c->hwndStatus, UserAuthDialogFunc, (LPARAM) param);
         }
-        else if (o.auth_pass_concat_otp)
+        else if (o.auth_pass_concat_otp != 0)
         {
             param->flags |= FLAG_CR_ECHO | FLAG_CR_TYPE_CONCAT;
             LocalizedDialogBoxParamEx(ID_DLG_AUTH_CHALLENGE, c->hwndStatus, UserAuthDialogFunc, (LPARAM) param);
@@ -1637,7 +1645,7 @@ OnByteCount(connection_t *c, char *msg)
     format_bytecount(in, _countof(in), c->bytes_in);
     format_bytecount(out, _countof(out), c->bytes_out);
     SetDlgItemTextW(c->hwndStatus, ID_TXT_BYTECOUNT,
-                    LoadLocalizedString(IDS_NFO_BYTECOUNT, in, out));
+        LoadLocalizedString(IDS_NFO_BYTECOUNT, in, out));
 }
 
 /*

res/openvpn-gui-res-cs.rc

@@ -164,7 +164,7 @@ BEGIN
     GROUPBOX "Spuštění", 202, 6, 47, 235, 30
     AUTOCHECKBOX "Spustit při startu Windows", ID_CHK_STARTUP, 17, 59, 100, 12
 
-    GROUPBOX "Volby", ID_GROUPBOX3, 6, 82, 235, 180
+    GROUPBOX "Volby", ID_GROUPBOX3, 6, 82, 235, 195
     AUTOCHECKBOX "Připojovat záznamy na konec logu", ID_CHK_LOG_APPEND, 17, 95, 130, 10
     AUTOCHECKBOX "Zobrazit okno skriptu", ID_CHK_SHOW_SCRIPT_WIN, 17, 110, 200, 10
     AUTOCHECKBOX "Tiché spojení", ID_CHK_SILENT, 17, 125, 200, 10
@@ -179,7 +179,10 @@ BEGIN
     AUTORADIOBUTTON "&Disable", ID_RB_BALLOON5, 181, 200, 40, 10
     AUTOCHECKBOX "Enable Pre-Logon A&ccess Provider (requires admin access)", ID_CHK_PLAP_REG, 17, 215, 200, 10
     AUTOCHECKBOX "Enable auto restart of active connections", ID_CHK_AUTO_RESTART, 17, 230, 200, 10
-    AUTOCHECKBOX "Prompt for &OTP and combine with password", ID_CHK_CONCAT_OTP, 17, 245, 200, 10
+    LTEXT "Prompt for OTP and combine with password", ID_TXT_CONCAT_OTP, 17, 245, 200, 10
+    AUTORADIOBUTTON "Append &OTP", ID_RB_APPEND_OTP, 28, 260, 55, 10
+    AUTORADIOBUTTON "Prepend O&TP", ID_RB_PREPEND_OTP, 86, 260, 90, 10
+    AUTORADIOBUTTON "Disa&ble", ID_RB_DISABLE_OTP, 181, 260, 40, 10
 END
 
 /* Advanced Dialog */

res/openvpn-gui-res-de.rc

@@ -164,7 +164,7 @@ BEGIN
     GROUPBOX "Systemstart", 202, 6, 47, 235, 30
     AUTOCHECKBOX "Mit &Windows starten", ID_CHK_STARTUP, 17, 59, 200, 12
 
-    GROUPBOX "Einstellungen", ID_GROUPBOX3, 6, 82, 235, 180
+    GROUPBOX "Einstellungen", ID_GROUPBOX3, 6, 82, 235, 195
     AUTOCHECKBOX "An &Log anhängen", ID_CHK_LOG_APPEND, 17, 95, 200, 10
     AUTOCHECKBOX "&Skriptfenster zeigen", ID_CHK_SHOW_SCRIPT_WIN, 17, 110, 200, 10
     AUTOCHECKBOX "Stille &Verbindung", ID_CHK_SILENT, 17, 125, 200, 10
@@ -179,7 +179,10 @@ BEGIN
     AUTORADIOBUTTON "&Disable", ID_RB_BALLOON5, 180, 200, 50, 10
     AUTOCHECKBOX "Enable Pre-Logon A&ccess Provider (requires admin access)", ID_CHK_PLAP_REG, 17, 215, 200, 10
     AUTOCHECKBOX "Enable auto restart of active connections", ID_CHK_AUTO_RESTART, 17, 230, 200, 10
-    AUTOCHECKBOX "Prompt for &OTP and combine with password", ID_CHK_CONCAT_OTP, 17, 245, 200, 10
+    LTEXT "Prompt for OTP and combine with password", ID_TXT_CONCAT_OTP, 17, 245, 200, 10
+    AUTORADIOBUTTON "Append &OTP", ID_RB_APPEND_OTP, 28, 260, 55, 10
+    AUTORADIOBUTTON "Prepend O&TP", ID_RB_PREPEND_OTP, 86, 260, 90, 10
+    AUTORADIOBUTTON "Disa&ble", ID_RB_DISABLE_OTP, 181, 260, 40, 10
 END
 
 /* Advanced Dialog */

res/openvpn-gui-res-dk.rc

@@ -164,7 +164,7 @@ BEGIN
     GROUPBOX "Autostart", 202, 6, 47, 235, 30
     AUTOCHECKBOX "Start med Windows", ID_CHK_STARTUP, 17, 59, 200, 12
 
-    GROUPBOX "Indstillinger", ID_GROUPBOX3, 6, 82, 235, 180
+    GROUPBOX "Indstillinger", ID_GROUPBOX3, 6, 82, 235, 195
     AUTOCHECKBOX "Tilføj til log", ID_CHK_LOG_APPEND, 17, 95, 60, 10
     AUTOCHECKBOX "Vis script vindue", ID_CHK_SHOW_SCRIPT_WIN, 17, 110, 200, 10
     AUTOCHECKBOX "Stille forbindelse", ID_CHK_SILENT, 17, 125, 200, 10
@@ -179,7 +179,10 @@ BEGIN
     AUTORADIOBUTTON "&Disable", ID_RB_BALLOON5, 181, 200, 40, 10
     AUTOCHECKBOX "Enable Pre-Logon A&ccess Provider (requires admin access)", ID_CHK_PLAP_REG, 17, 215, 200, 10
     AUTOCHECKBOX "Enable auto restart of active connections", ID_CHK_AUTO_RESTART, 17, 230, 200, 10
-    AUTOCHECKBOX "Prompt for &OTP and combine with password", ID_CHK_CONCAT_OTP, 17, 245, 200, 10
+    LTEXT "Prompt for OTP and combine with password", ID_TXT_CONCAT_OTP, 17, 245, 200, 10
+    AUTORADIOBUTTON "Append &OTP", ID_RB_APPEND_OTP, 28, 260, 55, 10
+    AUTORADIOBUTTON "Prepend O&TP", ID_RB_PREPEND_OTP, 86, 260, 90, 10
+    AUTORADIOBUTTON "Disa&ble", ID_RB_DISABLE_OTP, 181, 260, 40, 10
 END
 
 /* Advanced Dialog */

res/openvpn-gui-res-en.rc

@@ -178,7 +178,7 @@ BEGIN
     GROUPBOX "Startup", 202, 6, 47, 235, 30
     AUTOCHECKBOX "Launch on User &Logon", ID_CHK_STARTUP, 17, 59, 100, 12
 
-    GROUPBOX "Preferences", ID_GROUPBOX3, 6, 82, 235, 180
+    GROUPBOX "Preferences", ID_GROUPBOX3, 6, 82, 235, 195
     AUTOCHECKBOX "A&ppend to log", ID_CHK_LOG_APPEND, 17, 95, 60, 10
     AUTOCHECKBOX "Show script &window", ID_CHK_SHOW_SCRIPT_WIN, 17, 110, 200, 10
     AUTOCHECKBOX "S&ilent connection", ID_CHK_SILENT, 17, 125, 200, 10
@@ -193,7 +193,10 @@ BEGIN
     AUTORADIOBUTTON "&Disable", ID_RB_BALLOON5, 181, 200, 40, 10
     AUTOCHECKBOX "Enable Pre-Logon A&ccess Provider (requires admin access)", ID_CHK_PLAP_REG, 17, 215, 200, 10
     AUTOCHECKBOX "Enable auto restart of active connections", ID_CHK_AUTO_RESTART, 17, 230, 200, 10
-    AUTOCHECKBOX "Prompt for &OTP and combine with password", ID_CHK_CONCAT_OTP, 17, 245, 200, 10
+    LTEXT "Prompt for OTP and combine with password", ID_TXT_CONCAT_OTP, 17, 245, 200, 10
+    AUTORADIOBUTTON "Append &OTP", ID_RB_APPEND_OTP, 28, 260, 55, 10
+    AUTORADIOBUTTON "Prepend O&TP", ID_RB_PREPEND_OTP, 86, 260, 90, 10
+    AUTORADIOBUTTON "Disa&ble", ID_RB_DISABLE_OTP, 181, 260, 40, 10
 END
 
 /* Advanced Dialog */

res/openvpn-gui-res-es.rc

@@ -162,7 +162,7 @@ BEGIN
     GROUPBOX "Startup", 202, 6, 47, 235, 30
     AUTOCHECKBOX "Launch on Windows startup", ID_CHK_STARTUP, 17, 59, 200, 12
 
-    GROUPBOX "Preferences", ID_GROUPBOX3, 6, 82, 235, 180
+    GROUPBOX "Preferences", ID_GROUPBOX3, 6, 82, 235, 195
     AUTOCHECKBOX "Append to log", ID_CHK_LOG_APPEND, 17, 95, 60, 10
     AUTOCHECKBOX "Show script window", ID_CHK_SHOW_SCRIPT_WIN, 17, 110, 200, 10
     AUTOCHECKBOX "Silent connection", ID_CHK_SILENT, 17, 125, 200, 10
@@ -177,7 +177,10 @@ BEGIN
     AUTORADIOBUTTON "&Disable", ID_RB_BALLOON5, 181, 200, 40, 10
     AUTOCHECKBOX "Enable Pre-Logon A&ccess Provider (requires admin access)", ID_CHK_PLAP_REG, 17, 215, 200, 10
     AUTOCHECKBOX "Enable auto restart of active connections", ID_CHK_AUTO_RESTART, 17, 230, 200, 10
-    AUTOCHECKBOX "Prompt for &OTP and combine with password", ID_CHK_CONCAT_OTP, 17, 245, 200, 10
+    LTEXT "Prompt for OTP and combine with password", ID_TXT_CONCAT_OTP, 17, 245, 200, 10
+    AUTORADIOBUTTON "Append &OTP", ID_RB_APPEND_OTP, 28, 260, 55, 10
+    AUTORADIOBUTTON "Prepend O&TP", ID_RB_PREPEND_OTP, 86, 260, 90, 10
+    AUTORADIOBUTTON "Disa&ble", ID_RB_DISABLE_OTP, 181, 260, 40, 10
 END
 
 /* Advanced Dialog */

res/openvpn-gui-res-fa.rc

@@ -170,7 +170,7 @@ BEGIN
     GROUPBOX "شروع به کار", 202, 6, 47, 235, 30
     AUTOCHECKBOX "شروع به کار - وقتی کاربر وارد شد", ID_CHK_STARTUP, 17, 59, 200, 12
 
-    GROUPBOX "تنظیمات", ID_GROUPBOX3, 6, 82, 235, 180
+    GROUPBOX "تنظیمات", ID_GROUPBOX3, 6, 82, 235, 195
     AUTOCHECKBOX "چسباندن به گزارشات", ID_CHK_LOG_APPEND, 17, 95, 60, 10
     AUTOCHECKBOX "نمایش پنجره اسکریپت", ID_CHK_SHOW_SCRIPT_WIN, 17, 110, 200, 10
     AUTOCHECKBOX "بی صدا(اعلان) متصل شدن", ID_CHK_SILENT, 17, 125, 200, 10
@@ -185,7 +185,10 @@ BEGIN
     AUTORADIOBUTTON "&Disable", ID_RB_BALLOON5, 181, 200, 40, 10
     AUTOCHECKBOX "Enable Pre-Logon A&ccess Provider (requires admin access)", ID_CHK_PLAP_REG, 17, 215, 200, 10
     AUTOCHECKBOX "Enable auto restart of active connections", ID_CHK_AUTO_RESTART, 17, 230, 200, 10
-    AUTOCHECKBOX "Prompt for &OTP and combine with password", ID_CHK_CONCAT_OTP, 17, 245, 200, 10
+    LTEXT "Prompt for OTP and combine with password", ID_TXT_CONCAT_OTP, 17, 245, 200, 10
+    AUTORADIOBUTTON "Append &OTP", ID_RB_APPEND_OTP, 28, 260, 55, 10
+    AUTORADIOBUTTON "Prepend O&TP", ID_RB_PREPEND_OTP, 86, 260, 90, 10
+    AUTORADIOBUTTON "Disa&ble", ID_RB_DISABLE_OTP, 181, 260, 40, 10
 END
 
 /* Advanced Dialog */

res/openvpn-gui-res-fi.rc

@@ -163,7 +163,7 @@ BEGIN
     GROUPBOX "Käynnistäminen", 202, 6, 47, 235, 30
     AUTOCHECKBOX "Käynnistä Windowsiin kirjautuessa", ID_CHK_STARTUP, 17, 59, 200, 12
 
-    GROUPBOX "Valinnat", ID_GROUPBOX3, 6, 82, 235, 180
+    GROUPBOX "Valinnat", ID_GROUPBOX3, 6, 82, 235, 195
     AUTOCHECKBOX "Lisää lokitiedostoon", ID_CHK_LOG_APPEND, 17, 95, 200, 10
     AUTOCHECKBOX "Näytä komentosarjaikkuna", ID_CHK_SHOW_SCRIPT_WIN, 17, 110, 200, 10
     AUTOCHECKBOX "Yhdistä taustalla", ID_CHK_SILENT, 17, 125, 200, 10
@@ -178,7 +178,10 @@ BEGIN
     AUTORADIOBUTTON "&Disable", ID_RB_BALLOON5, 181, 200, 40, 10
     AUTOCHECKBOX "Enable Pre-Logon A&ccess Provider (requires admin access)", ID_CHK_PLAP_REG, 17, 215, 200, 10
     AUTOCHECKBOX "Enable auto restart of active connections", ID_CHK_AUTO_RESTART, 17, 230, 200, 10
-    AUTOCHECKBOX "Prompt for &OTP and combine with password", ID_CHK_CONCAT_OTP, 17, 245, 200, 10
+    LTEXT "Prompt for OTP and combine with password", ID_TXT_CONCAT_OTP, 17, 245, 200, 10
+    AUTORADIOBUTTON "Append &OTP", ID_RB_APPEND_OTP, 28, 260, 55, 10
+    AUTORADIOBUTTON "Prepend O&TP", ID_RB_PREPEND_OTP, 86, 260, 90, 10
+    AUTORADIOBUTTON "Disa&ble", ID_RB_DISABLE_OTP, 181, 260, 40, 10
 END
 
 /* Advanced Dialog */

res/openvpn-gui-res-fr.rc

@@ -163,7 +163,7 @@ BEGIN
     GROUPBOX "Démarrage", 202, 6, 47, 235, 30
     AUTOCHECKBOX "Lancer au démarrage de Windows", ID_CHK_STARTUP, 17, 59, 200, 12
 
-    GROUPBOX "Préférences", ID_GROUPBOX3, 6, 82, 235, 180
+    GROUPBOX "Préférences", ID_GROUPBOX3, 6, 82, 235, 195
     AUTOCHECKBOX "Ajouter au fichier log", ID_CHK_LOG_APPEND, 17, 95, 81, 10
     AUTOCHECKBOX "Afficher la fenêtre des scripts", ID_CHK_SHOW_SCRIPT_WIN, 17, 110, 200, 10
     AUTOCHECKBOX "Connexion silencieuse", ID_CHK_SILENT, 17, 125, 200, 10
@@ -178,7 +178,10 @@ BEGIN
     AUTORADIOBUTTON "&Inactif", ID_RB_BALLOON5, 181, 200, 40, 10
     AUTOCHECKBOX "Activer le fournisseur d'&accès à la pré-ouverture de session", ID_CHK_PLAP_REG, 17, 215, 200, 10
     AUTOCHECKBOX "Activer le redémarrage auto des connexions activées", ID_CHK_AUTO_RESTART, 17, 230, 200, 10
-    AUTOCHECKBOX "Prompt for &OTP and combine with password", ID_CHK_CONCAT_OTP, 17, 245, 200, 10
+    LTEXT "Demander un code OTP et le combiner avec le mot de passe", ID_TXT_CONCAT_OTP, 17, 245, 200, 10
+    AUTORADIOBUTTON "&OTP à la fin", ID_RB_APPEND_OTP, 28, 260, 55, 10
+    AUTORADIOBUTTON "O&TP au début", ID_RB_PREPEND_OTP, 86, 260, 90, 10
+    AUTORADIOBUTTON "I&nactif", ID_RB_DISABLE_OTP, 181, 260, 40, 10
 END
 
 /* Advanced Dialog */

res/openvpn-gui-res-it.rc

@@ -163,7 +163,7 @@ BEGIN
     GROUPBOX "Opzioni avvio", 202, 6, 47, 235, 30
     AUTOCHECKBOX "&Esegui all'avvio di Windows", ID_CHK_STARTUP, 17, 59, 200, 12
 
-    GROUPBOX "Impostazioni", ID_GROUPBOX3, 6, 82, 235, 190
+    GROUPBOX "Impostazioni", ID_GROUPBOX3, 6, 82, 235, 205
     AUTOCHECKBOX "Aggiungi in coda al f&ile registro", ID_CHK_LOG_APPEND, 17, 95, 200, 10
     AUTOCHECKBOX "Visualizza &finestra script", ID_CHK_SHOW_SCRIPT_WIN, 17, 110, 200, 10
     AUTOCHECKBOX "Connessione &silenziosa", ID_CHK_SILENT, 17, 125, 200, 10
@@ -179,7 +179,10 @@ BEGIN
     AUTOCHECKBOX "Abilita provider di pre-accesso/accesso", ID_CHK_PLAP_REG, 17, 215, 200, 10
     LTEXT "(richiede accesso come amministratore)", 220, 28, 225, 200, 10
     AUTOCHECKBOX "Abilita riavvio automatico connessioni attive", ID_CHK_AUTO_RESTART, 17, 240, 200, 10
-    AUTOCHECKBOX "Richiedi &OTP e combinalo con la password", ID_CHK_CONCAT_OTP, 17, 255, 200, 10
+    LTEXT "Richiedi &OTP e combinalo con la password", ID_TXT_CONCAT_OTP, 17, 255, 200, 10
+    AUTORADIOBUTTON "Append &OTP", ID_RB_APPEND_OTP, 28, 270, 55, 10
+    AUTORADIOBUTTON "Prepend O&TP", ID_RB_PREPEND_OTP, 86, 270, 90, 10
+    AUTORADIOBUTTON "Disa&ble", ID_RB_DISABLE_OTP, 181, 270, 40, 10
 END
 
 /* Advanced Dialog */

res/openvpn-gui-res-jp.rc

@@ -164,7 +164,7 @@ BEGIN
     GROUPBOX "起動", 202, 6, 47, 235, 30
     AUTOCHECKBOX "Windows起動時に開始(&L)", ID_CHK_STARTUP, 17, 59, 200, 12
 
-    GROUPBOX "設定", ID_GROUPBOX3, 6, 82, 235, 180
+    GROUPBOX "設定", ID_GROUPBOX3, 6, 82, 235, 195
     AUTOCHECKBOX "ログ追記モード(&P)", ID_CHK_LOG_APPEND, 17, 95, 200, 10
     AUTOCHECKBOX "スクリプト実行ウィンドウを表示(&W)", ID_CHK_SHOW_SCRIPT_WIN, 17, 110, 200, 10
     AUTOCHECKBOX "サイレント接続モード(&I)", ID_CHK_SILENT, 17, 125, 200, 10
@@ -179,7 +179,10 @@ BEGIN
     AUTORADIOBUTTON "&Disable", ID_RB_BALLOON5, 181, 200, 40, 10
     AUTOCHECKBOX "Enable Pre-Logon A&ccess Provider (requires admin access)", ID_CHK_PLAP_REG, 17, 215, 200, 10
     AUTOCHECKBOX "Enable auto restart of active connections", ID_CHK_AUTO_RESTART, 17, 230, 200, 10
-    AUTOCHECKBOX "OTPを要求し、パスワードと組み合わせる", ID_CHK_CONCAT_OTP, 17, 245, 200, 10
+    LTEXT "OTPを要求し、パスワードと組み合わせる", ID_TXT_CONCAT_OTP, 17, 245, 200, 10
+    AUTORADIOBUTTON "Append &OTP", ID_RB_APPEND_OTP, 28, 260, 55, 10
+    AUTORADIOBUTTON "Prepend O&TP", ID_RB_PREPEND_OTP, 86, 260, 90, 10
+    AUTORADIOBUTTON "Disa&ble", ID_RB_DISABLE_OTP, 181, 260, 40, 10
 END
 
 /* Advanced Dialog */

res/openvpn-gui-res-kr.rc

@@ -165,7 +165,7 @@ BEGIN
     GROUPBOX "시작 설정", 202, 6, 47, 235, 30
     AUTOCHECKBOX "Windows 시작 시에 실행", ID_CHK_STARTUP, 17, 59, 100, 12
 
-    GROUPBOX "환경 설정", ID_GROUPBOX3, 6, 82, 235, 180
+    GROUPBOX "환경 설정", ID_GROUPBOX3, 6, 82, 235, 195
     AUTOCHECKBOX "로그 파일에 추가", ID_CHK_LOG_APPEND, 17, 95, 200, 10
     AUTOCHECKBOX "스크립트 창 보기", ID_CHK_SHOW_SCRIPT_WIN, 17, 110, 200, 10
     AUTOCHECKBOX "연결 시 상태 대화 상자 표시하지 않기", ID_CHK_SILENT, 17, 125, 200, 10
@@ -180,7 +180,10 @@ BEGIN
     AUTORADIOBUTTON "&Disable", ID_RB_BALLOON5, 181, 200, 40, 10
     AUTOCHECKBOX "Enable Pre-Logon A&ccess Provider (requires admin access)", ID_CHK_PLAP_REG, 17, 215, 200, 10
     AUTOCHECKBOX "Enable auto restart of active connections", ID_CHK_AUTO_RESTART, 17, 230, 200, 10
-    AUTOCHECKBOX "Prompt for &OTP and combine with password", ID_CHK_CONCAT_OTP, 17, 245, 200, 10
+    LTEXT "Prompt for OTP and combine with password", ID_TXT_CONCAT_OTP, 17, 245, 200, 10
+    AUTORADIOBUTTON "Append &OTP", ID_RB_APPEND_OTP, 28, 260, 55, 10
+    AUTORADIOBUTTON "Prepend O&TP", ID_RB_PREPEND_OTP, 86, 260, 90, 10
+    AUTORADIOBUTTON "Disa&ble", ID_RB_DISABLE_OTP, 181, 260, 40, 10
 END
 
 /* Advanced Dialog */