diff options
| -rw-r--r-- | alpine/keymenu.c | 4 | ||||
| -rw-r--r-- | alpine/keymenu.h | 2 | ||||
| -rw-r--r-- | imap/src/c-client/sha.h | 7 | ||||
| -rw-r--r-- | pith/pine.hlp | 24 |
4 files changed, 17 insertions, 20 deletions
diff --git a/alpine/keymenu.c b/alpine/keymenu.c index a05bae70..16ffbb4a 100644 --- a/alpine/keymenu.c +++ b/alpine/keymenu.c @@ -2895,8 +2895,8 @@ INST_KEY_MENU(config_smime_manage_password_file_menu_keymenu, config_smime_manag /* * Internal prototypes */ -void output_keymenu(struct key_menu *, bitmap_t, int, int); -void format_keymenu(struct key_menu *, bitmap_t, int); +void output_keymenu(struct key_menu *, unsigned char *, int, int); +void format_keymenu(struct key_menu *, unsigned char *, int); void menu_clear_cmd_binding(struct key_menu *, int); #ifdef MOUSE void print_inverted_label(int, MENUITEM *); diff --git a/alpine/keymenu.h b/alpine/keymenu.h index ece80ed1..84dff1e1 100644 --- a/alpine/keymenu.h +++ b/alpine/keymenu.h @@ -692,7 +692,7 @@ int menu_clear_binding(struct key_menu *, UCS); int menu_binding_index(struct key_menu *, int); void mark_keymenu_dirty(void); void blank_keymenu(int, int); -void draw_keymenu(struct key_menu *, bitmap_t, int, int, int, OtherMenu); +void draw_keymenu(struct key_menu *, unsigned char *, int, int, int, OtherMenu); void redraw_keymenu(void); void clearfooter(struct pine *); diff --git a/imap/src/c-client/sha.h b/imap/src/c-client/sha.h index e21c9844..5ae7b423 100644 --- a/imap/src/c-client/sha.h +++ b/imap/src/c-client/sha.h @@ -200,8 +200,7 @@ extern int SHA256Input(SHA256Context *, const uint8_t *bytes, unsigned int bytecount); extern int SHA256FinalBits(SHA256Context *, const uint8_t bits, unsigned int bitcount); -extern int SHA256Result(SHA256Context *, - uint8_t Message_Digest[SHA256HashSize]); +extern int SHA256Result(SHA256Context *, uint8_t *); /* SHA-384 */ extern int SHA384Reset(SHA384Context *); @@ -257,7 +256,7 @@ extern int hmacInput(HMACContext *ctx, const unsigned char *text, extern int hmacFinalBits(HMACContext *ctx, const uint8_t bits, unsigned int bitcount); -extern int hmacResult(HMACContext *ctx, - uint8_t digest[USHAMaxHashSize]); +extern int hmacResult(HMACContext *, + uint8_t *); #endif /* _SHA_H_ */ diff --git a/pith/pine.hlp b/pith/pine.hlp index 78e56236..8b5297d8 100644 --- a/pith/pine.hlp +++ b/pith/pine.hlp @@ -140,7 +140,7 @@ with help text for the config screen and the composer that didn't have any reasonable place to be called from. Dummy change to get revision in pine.hlp ============= h_revision ================= -Alpine Commit 623 2021-11-23 22:28:10 +Alpine Commit 624 2021-11-24 22:33:48 ============= h_news ================= <HTML> <HEAD> @@ -16608,18 +16608,16 @@ source code of this project is located at <BODY> <H1>Tenant Explained</H1> -The tenant is a way in which a service can either restrict an app to access -only certain portions of its service. For example, a service may allow -an app to have access to your work data, or school data, and not every app -is allowed to access this data, or the access is not allowed for all accounts, -but only those restructed in the tenant. - -<P> When Alpine registers with an email service provider, it does so with the -intention that you can use Alpine for any of your needs (work, school or -personal), and the client-id and tenant that it uses would allow you access to -only your work email, say, and not your personal email, because the app is -trusted only at work, and so the client-id and tenant are good for that -organization only. +The tenant is a way in which a an app can be restricted. Alpine by default +has no restrictions, which means that it can be used to access any service; +however, a system administrator might register their own app and make it +available only to those in their organization. + +<P> +This setting allows a system administrator to register Alpine with a different +client-id and client-secret and further restrict access to only authorized +users. + <P> <End of help on this topic> </BODY> |