diff options
| author | Eduardo Chappa <chappa@washington.edu> | 2014-03-09 14:26:50 -0600 |
|---|---|---|
| committer | Eduardo Chappa <chappa@washington.edu> | 2014-03-09 14:26:50 -0600 |
| commit | e9554c597f7f33c6ebebaa47087b4db878a59913 (patch) | |
| tree | 9b8ff514f4db831a456185034cc614cf712b43e2 /alpine/keymenu.c | |
| parent | ac368b05842ee45ed29cd997840eb788649da268 (diff) | |
| download | alpine-e9554c597f7f33c6ebebaa47087b4db878a59913.tar.xz | |
* Forwarding messages with attachments of content-type multipart,
failed when attempting to sign it, with and "Error writing pipe"
error.
* Using a .pinerc file outside the home directory made Alpine not find
the .alpine-smime directory with certificates.
* Configuration screen for S/MIME adds ability to manage certificates.
(currently available to users who manage certificates in
directories, not in containers, which will be available in the next
alpha release.)
Diffstat (limited to 'alpine/keymenu.c')
| -rw-r--r-- | alpine/keymenu.c | 88 |
1 files changed, 87 insertions, 1 deletions
diff --git a/alpine/keymenu.c b/alpine/keymenu.c index 9ccba791..3e90f1b7 100644 --- a/alpine/keymenu.c +++ b/alpine/keymenu.c @@ -4,8 +4,8 @@ static char rcsid[] = "$Id: keymenu.c 1074 2008-06-04 00:08:43Z hubert@u.washing /* * ======================================================================== - * Copyright 2006-2008 University of Washington * Copyright 2013-2014 Eduardo Chappa + * Copyright 2006-2008 University of Washington * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -2617,6 +2617,92 @@ struct key config_smime_helper_keys[] = ENDKEY_MENU}; INST_KEY_MENU(config_smime_helper_keymenu, config_smime_helper_keys); +struct key config_smime_manage_certs_menu_keys[] = + {HELP_MENU, + WHEREIS_MENU, + EXIT_SETUP_MENU, + {"S", "[" N_("Select") "]", {MC_CHOICE,3,{'s',ctrl('M'),ctrl('J')}}, KS_NONE}, + {"I", N_("Import Cert"), {MC_IMPORT,1,{'i'}}, KS_NONE}, + NULL_MENU, + PREV_MENU, + NEXT_MENU, + PREVPAGE_MENU, + NEXTPAGE_MENU, + HOMEKEY_MENU, + ENDKEY_MENU}; +INST_KEY_MENU(config_smime_manage_certs_menu_keymenu, config_smime_manage_certs_menu_keys); + +struct key config_smime_add_certs_keys[] = + {HELP_MENU, + NULL_MENU, + EXIT_SETUP_MENU, + {"I", N_("Import Cert"), {MC_IMPORT,3,{'i', ctrl('M'), ctrl('J')}}, KS_NONE}, + NULL_MENU, + NULL_MENU, + NULL_MENU, + NULL_MENU, + NULL_MENU, + NULL_MENU, + NULL_MENU, + NULL_MENU}; +INST_KEY_MENU(config_smime_add_certs_keymenu, config_smime_add_certs_keys); + +struct key config_smime_manage_certs_work_keys[] = + {HELP_MENU, + OTHER_MENU, + EXIT_SETUP_MENU, + {"V", "[" N_("View Info") "]", {MC_CHOICE,3,{'v',ctrl('M'),ctrl('J')}}, KS_NONE}, + {"I", N_("Import Cert"), {MC_IMPORT,1,{'i'}}, KS_NONE}, + NULL_MENU, + {"D", N_("Delete"), {MC_DELETE,1,{'d'}}, KS_NONE}, + {"U", N_("Undelete"), {MC_UNDELETE,1,{'u'}}, KS_NONE}, + {"X", N_("Expunge"), {MC_EXPUNGE,1,{'x'}}, KS_NONE}, + NULL_MENU, + NULL_MENU, + WHEREIS_MENU, + + PREV_MENU, + NEXT_MENU, + PREVPAGE_MENU, + NEXTPAGE_MENU, + NULL_MENU, + NULL_MENU, + NULL_MENU, + NULL_MENU, + NULL_MENU, + NULL_MENU, + HOMEKEY_MENU, + ENDKEY_MENU}; +INST_KEY_MENU(config_smime_manage_certs_work_keymenu, config_smime_manage_certs_work_keys); + +struct key smime_certificate_info_keys[] = + {HELP_MENU, + OTHER_MENU, + {"E",N_("Exit Viewer"),{MC_EXIT,1,{'e'}},KS_EXITMODE}, + {"T",N_("Trust Cert"), {MC_TRUST,1,{'t'}},KS_NONE}, + {"D",N_("Delete"), {MC_DELETE,1,{'d'}},KS_NONE}, + {"U",N_("Undelete"), {MC_UNDELETE,1,{'u'}},KS_NONE}, + {"B",N_("Public Key"), {MC_PUBLIC,1,{'b'}},KS_NONE}, + {"R",N_("Private Key"),{MC_PRIVATE,1,{'r'}},KS_NONE}, + NULL_MENU, + NULL_MENU, + FWDEMAIL_MENU, + {"S", N_("Save"), {MC_SAVETEXT,1,{'s'}}, KS_SAVE}, + + HELP_MENU, + OTHER_MENU, + PREVPAGE_MENU, + NEXTPAGE_MENU, + PRYNTTXT_MENU, + WHEREIS_MENU, + NULL_MENU, + NULL_MENU, + NULL_MENU, + NULL_MENU, + HOMEKEY_MENU, + ENDKEY_MENU}; +INST_KEY_MENU(smime_certificate_info_keymenu, smime_certificate_info_keys); + /* * Internal prototypes |