diff options
| author | Eduardo Chappa <chappa@washington.edu> | 2014-04-18 01:04:44 -0600 |
|---|---|---|
| committer | Eduardo Chappa <chappa@washington.edu> | 2014-04-18 01:04:44 -0600 |
| commit | fdef7c51110e5ba139c53e3faa72f038e95d02e7 (patch) | |
| tree | b11f7982b1ac4fed50ae2a16cfc7851cd960ad59 /alpine/mailcmd.c | |
| parent | caa4e3ccd7c9bf9352434b0f78c7b650338cd4d0 (diff) | |
| download | alpine-fdef7c51110e5ba139c53e3faa72f038e95d02e7.tar.xz | |
* Set default ssl configuration for Homebrew in MAC OSX to
/usr/local/etc/openssl, under the advice of Sam Hathaway.
* Add management certificate support for containers.
* Fix crashing bugs introduced in version 2.19.9, which did not allow
alpine to start with the -passfile and use a remote pinerc. Reported by
Ulf-Dietrich Braumann.
* fix a bug which was introduced in version 2.19.9, where Alpine would
free a certificate associated to a key after encryption, and so this
could not be used during decryption. We use X509_dup to copy the cert
and so make the copy be freed, and not the original.
* S/MIME: sign messages using intermediate certificates when needed and
possible.
Diffstat (limited to 'alpine/mailcmd.c')
| -rw-r--r-- | alpine/mailcmd.c | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/alpine/mailcmd.c b/alpine/mailcmd.c index d9a6f412..0ea1617c 100644 --- a/alpine/mailcmd.c +++ b/alpine/mailcmd.c @@ -4,8 +4,8 @@ static char rcsid[] = "$Id: mailcmd.c 1266 2009-07-14 18:39:12Z hubert@u.washing /* * ======================================================================== - * Copyright 2006-2009 University of Washington * Copyright 2013-2014 Eduardo Chappa + * Copyright 2006-2009 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. @@ -302,25 +302,14 @@ static ESCKEY_S flag_text_opt[] = { {-1, 0, NULL, NULL} }; -int alpine_get_data_prompt(char *prompt, char *value, size_t len) -{ - int rv, flags; - flags = OE_DISALLOW_HELP; - value[0] = '\0'; - rv = optionally_enter(value, -FOOTER_ROWS(ps_global), 0, len, - prompt, NULL, NO_HELP, &flags); - return rv; -} - int alpine_get_password(char *prompt, char *pass, size_t len) { - int rv, flags; - flags = OE_PASSWD | OE_DISALLOW_HELP; + int flags = OE_PASSWD | OE_DISALLOW_HELP; pass[0] = '\0'; - rv = optionally_enter(pass, -FOOTER_ROWS(ps_global), 0, len, - prompt, NULL, NO_HELP, &flags); - return rv; + return optionally_enter(pass, + -(ps_global->ttyo ? FOOTER_ROWS(ps_global) : 3), + 0, len, prompt, NULL, NO_HELP, &flags); } int smime_import_certificate(char *filename, char *full_filename, size_t len) |