diff options
| author | Werner Koch <[email protected]> | 1998-06-11 07:16:50 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 1998-06-11 07:16:50 +0000 |
| commit | d9b3dc000085007bdd198ca4c0500e80a72475d7 (patch) | |
| tree | bb3ffa42fa8b9e30476fdbc843632c896fcfec37 /g10/encode.c | |
| parent | . (diff) | |
| download | gnupg-d9b3dc000085007bdd198ca4c0500e80a72475d7.tar.gz gnupg-d9b3dc000085007bdd198ca4c0500e80a72475d7.zip | |
update from tobold
Diffstat (limited to 'g10/encode.c')
| -rw-r--r-- | g10/encode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/g10/encode.c b/g10/encode.c index 142ffeac2..d3d88ca7b 100644 --- a/g10/encode.c +++ b/g10/encode.c @@ -89,7 +89,7 @@ encode_simple( const char *filename, int mode ) cfx.dek = NULL; if( mode ) { s2k = m_alloc_clear( sizeof *s2k ); - s2k->mode = 1; + s2k->mode = opt.rfc1991? 0:1; s2k->hash_algo = opt.def_digest_algo ? opt.def_digest_algo : DEFAULT_DIGEST_ALGO; cfx.dek = passphrase_to_dek( NULL, opt.def_cipher_algo, s2k, 2 ); @@ -116,7 +116,7 @@ encode_simple( const char *filename, int mode ) write_comment( out, "#created by GNUPG v" VERSION " (" PRINTABLE_OS_NAME ")"); - if( s2k ) { + if( s2k && !opt.rfc1991 ) { PKT_symkey_enc *enc = m_alloc_clear( sizeof *enc ); enc->version = 4; enc->cipher_algo = cfx.dek->algo; |