gnupg/g10 (ChangeLog encode.c g10.c main.h mainproc.c)

[cvs user dshaw]

    Date: Sunday, October 26, 2003 @ 04:26:14
  Author: dshaw
    Path: /cvs/gnupg/gnupg/g10

Modified: ChangeLog encode.c g10.c main.h mainproc.c

* g10.c (main): Add --symmetric --encrypt command.  This generates a
message that can be decrypted via a passphrase or public key system.

* main.h, encode.c (encode_seskey): Allow passing in an already-created
session key dek. (encode_simple): Use the actual symmetric cipher when
encrypting a session key for a symmetric message. (encode_crypt): Add a
flag to trigger a hybrid mode that can be decrypted via a passphrase or a
pk.  Change all callers.

* mainproc.c (symkey_decrypt_sesskey): There is no way to tell the
difference here between a bad passphrase and a cipher algorithm that we
don't have, so use a error message that makes that clear. Use the actual
list of ciphers when checking whether a cipher is invalid.  Return error
if the decrypted cipher algorithm is invalid. (proc_symkey_enc): In a
mixed passphrase/pk message, if a valid dek already exists from decrypting
via pk, do not try to process the passphrase. (proc_symkey_enc): Indicate
when we're decrypting a session key as opposed to decrypting data.  If a
passphrase is invalid, discard the dek so we'll keep trying.


------------+
 ChangeLog  |   26 +++++++++++++++
 encode.c   |   97 ++++++++++++++++++++++++++++++++++++++++++++---------------
 g10.c      |   34 ++++++++++++++++++--
 main.h     |    2 -
 mainproc.c |   79 ++++++++++++++++++++++++++++++++----------------
 5 files changed, 185 insertions(+), 53 deletions(-)