diff options
| author | Werner Koch <wk@gnupg.org> | 2007-12-12 11:28:30 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2007-12-12 11:28:30 +0100 |
| commit | bae4b256c79c24e5306c692adf9bb5891433c7d5 (patch) | |
| tree | c0aae4de008d75964074146240257f81b8ded0b1 /sm/server.c | |
| parent | Allow decryption using type 20 Elgamal keys. (diff) | |
| download | gnupg2-bae4b256c79c24e5306c692adf9bb5891433c7d5.tar.xz gnupg2-bae4b256c79c24e5306c692adf9bb5891433c7d5.zip | |
Support DSA2.
Support Camellia for testing.
More audit stuff.
Diffstat (limited to '')
| -rw-r--r-- | sm/server.c | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/sm/server.c b/sm/server.c index e61f9d600..b9fe2a25e 100644 --- a/sm/server.c +++ b/sm/server.c @@ -366,7 +366,14 @@ cmd_recipient (assuan_context_t ctx, char *line) ctrl_t ctrl = assuan_get_pointer (ctx); int rc; - rc = gpgsm_add_to_certlist (ctrl, line, 0, &ctrl->server_local->recplist, 0); + if (!ctrl->audit) + rc = start_audit_session (ctrl); + else + rc = 0; + + if (!rc) + rc = gpgsm_add_to_certlist (ctrl, line, 0, + &ctrl->server_local->recplist, 0); if (rc) { gpg_err_code_t r = gpg_err_code (rc); @@ -478,6 +485,8 @@ cmd_encrypt (assuan_context_t ctx, char *line) &ctrl->server_local->recplist, 1); } if (!rc) + rc = ctrl->audit? 0 : start_audit_session (ctrl); + if (!rc) rc = gpgsm_encrypt (assuan_get_pointer (ctx), ctrl->server_local->recplist, inp_fd, out_fp); @@ -492,6 +501,7 @@ cmd_encrypt (assuan_context_t ctx, char *line) return rc; } + /* DECRYPT This performs the decrypt operation after doing some check on the @@ -517,7 +527,10 @@ cmd_decrypt (assuan_context_t ctx, char *line) out_fp = fdopen (dup(out_fd), "w"); if (!out_fp) return set_error (GPG_ERR_ASS_GENERAL, "fdopen() failed"); - rc = gpgsm_decrypt (ctrl, inp_fd, out_fp); + + rc = start_audit_session (ctrl); + if (!rc) + rc = gpgsm_decrypt (ctrl, inp_fd, out_fp); fclose (out_fp); /* close and reset the fd */ @@ -600,8 +613,10 @@ cmd_sign (assuan_context_t ctx, char *line) if (!out_fp) return set_error (GPG_ERR_ASS_GENERAL, "fdopen() failed"); - rc = gpgsm_sign (assuan_get_pointer (ctx), ctrl->server_local->signerlist, - inp_fd, detached, out_fp); + rc = start_audit_session (ctrl); + if (!rc) + rc = gpgsm_sign (assuan_get_pointer (ctx), ctrl->server_local->signerlist, + inp_fd, detached, out_fp); fclose (out_fp); /* close and reset the fd */ |