diff options
| -rw-r--r-- | g10/ChangeLog | 5 | ||||
| -rw-r--r-- | g10/export.c | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 7f9f0fcca..43e6c06df 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,8 @@ +2007-02-06 Werner Koch <[email protected]> + + * export.c (do_export_stream): Allow reset-subkey-passwd along + with sexp-format. + 2007-02-04 Werner Koch <[email protected]> * parse-packet.c (parse_signature): Limit bytes read for an diff --git a/g10/export.c b/g10/export.c index 78def573d..a4514ae38 100644 --- a/g10/export.c +++ b/g10/export.c @@ -564,7 +564,10 @@ do_export_stream( IOBUF out, strlist_t users, int secret, goto leave; } - rc = build_packet (out, node->pkt); + if ((options&EXPORT_SEXP_FORMAT)) + rc = build_sexp (out, node->pkt, &indent); + else + rc = build_packet (out, node->pkt); node->pkt->pkt.secret_key = sk_save; free_secret_key (sk); |