Test fix for key generation

pull/140/head
parent d4167897da
commit accee41de7
No known key found for this signature in database
GPG Key ID: FF1D842BF4DDE92B

@ -48,8 +48,9 @@ void on_key_generate_accept(GtkWidget *self, key_creation_window* window){
int ex_status=0;
if (yon_char_is_empty(password)&&yon_char_is_empty(password_confirm)){
yon_debug_output("%s\n",yon_generate_key_no_password_command(type,name,email,strength,comment,expire,password));
ex_status = system(yon_debug_output("%s\n",yon_generate_key_no_password_command(type,name,email,strength,comment,expire,password)));
char *command = yon_generate_key_no_password_command(type,name,email,strength,comment,expire,password);
yon_debug_output("%s\n",command);
yon_terminal_window_launch_shell(GTK_WINDOW(window->Window),(yon_debug_output("%s\n",command)),SUCCESS_LABEL,FAIL_LABEL);
} else if (!strcmp(password,password_confirm)){
for (int i=0;i<strlen(password);i++){
if (!g_ascii_isgraph(password[i])){
@ -58,18 +59,15 @@ void on_key_generate_accept(GtkWidget *self, key_creation_window* window){
return;
}
}
yon_debug_output("%s\n",yon_generate_key_command(type,name,email,strength,comment,expire,password));
ex_status = system(yon_debug_output("%s\n",yon_generate_key_command(type,name,email,strength,comment,expire,password)));
char *command = yon_generate_key_command(type,name,email,strength,comment,expire,password);
yon_debug_output("%s\n",command);
yon_terminal_window_launch_shell(GTK_WINDOW(window->Window),yon_debug_output("%s\n",command),SUCCESS_LABEL,FAIL_LABEL);
} else {
yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),PASSWORD_INCORRECT_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE);
yon_ubl_status_highlight_incorrect(window->PasswordConfirmationEntry);
yon_ubl_status_highlight_incorrect(window->PasswordEntry);
return;
}
if (!ex_status)
yon_ubl_status_box_render(KEY_CREATION_SUCCESS_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE);
else
yon_ubl_status_box_render(KEY_CREATION_FAILURE_LABEL,BACKGROUND_IMAGE_FAIL_TYPE);
gtk_widget_destroy(window->Window);
yon_sign_list_update();
}

@ -126,7 +126,7 @@ Expire-Date: ",!yon_char_is_empty(expire)?expire:"0","\n\
Passphrase: ",password,"\n\
%commit\n\
%echo done\n\
EOF",NULL)
EOF\n\n",NULL)
#define yon_generate_key_no_password_command(type,name,email,strength,comment,expire,password) yon_char_unite("gpg --batch --gen-key <<EOF\n\
%echo Generating a basic OpenPGP key\n\
@ -141,7 +141,7 @@ Expire-Date: ",!yon_char_is_empty(expire)?expire:"0","\n\
%no-protection\n\
%commit\n\
%echo done\n\
EOF",NULL)
EOF\n\n",NULL)
#define STORAGE_search_macro "STORAGE["
#define STORAGE(target) yon_char_unite("STORAGE[",target,"]",NULL)

Loading…
Cancel
Save