security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Activity

sm: Support secret key export via the Assuan interface. 

* sm/server.c (cmd_export): Add options --secret, --raw, and --pkcs12.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2015-08-24 12:43:00 +02:00
parent 76ef1f0f14
commit 3cf02192a8
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
sm/server.c
View File

@ -681,13 +681,15 @@ cmd_import (assuan_context_t ctx, char *line)
static const char hlp_export[] = static const char hlp_export[] =
"EXPORT [--data [--armor|--base64]] [--] <pattern>\n" "EXPORT [--data [--armor|--base64]] [--secret [--(raw|pkcs12)] [--] <pattern>\n"
"\n" "\n"
"Export the certificates selected by PATTERN. With --data the output\n" "Export the certificates selected by PATTERN. With --data the output\n"
"is returned using Assuan D lines; the default is to use the sink given\n" "is returned using Assuan D lines; the default is to use the sink given\n"
"by the last \"OUTPUT\" command. The options --armor or --base64 encode \n" "by the last \"OUTPUT\" command. The options --armor or --base64 encode \n"
"the output using the PEM respective a plain base-64 format; the default\n" "the output using the PEM respective a plain base-64 format; the default\n"
"is a binary format which is only suitable for a single certificate."; "is a binary format which is only suitable for a single certificate.\n"
"With --secret the secret key is exported using the PKCS#8 format,\n"
"with --raw using PKCS#1, and with --pkcs12 as full PKCS#12 container.";
static gpg_error_t static gpg_error_t
cmd_export (assuan_context_t ctx, char *line) cmd_export (assuan_context_t ctx, char *line)
{ {
@ -695,15 +697,23 @@ cmd_export (assuan_context_t ctx, char *line)
char *p; char *p;
strlist_t list, sl; strlist_t list, sl;
int use_data; int use_data;
int opt_secret;
int opt_raw = 0;
int opt_pkcs12 = 0;
use_data = has_option (line, "--data"); use_data = has_option (line, "--data");
if (use_data) if (use_data)
{ {
/* We need to override any possible setting done by an OUTPUT command. */ /* We need to override any possible setting done by an OUTPUT command. */
ctrl->create_pem = has_option (line, "--armor"); ctrl->create_pem = has_option (line, "--armor");
ctrl->create_base64 = has_option (line, "--base64"); ctrl->create_base64 = has_option (line, "--base64");
} }
opt_secret = has_option (line, "--secret");
if (opt_secret)
{
opt_raw = has_option (line, "--raw");
opt_pkcs12 = has_option (line, "--pkcs12");
}
line = skip_options (line); line = skip_options (line);
@ -730,6 +740,14 @@ cmd_export (assuan_context_t ctx, char *line)
} }
} }
if (opt_secret)
{
if (!list || !*list->d)
return set_error (GPG_ERR_NO_DATA, "No key given");
if (list->next)
return set_error (GPG_ERR_TOO_MANY, "Only one key allowed");
}
if (use_data) if (use_data)
{ {
estream_t stream; estream_t stream;
@ -741,7 +759,11 @@ cmd_export (assuan_context_t ctx, char *line)
return set_error (GPG_ERR_ASS_GENERAL, return set_error (GPG_ERR_ASS_GENERAL,
"error setting up a data stream"); "error setting up a data stream");
} }
gpgsm_export (ctrl, list, stream); if (opt_secret)
gpgsm_p12_export (ctrl, list->d, stream,
opt_raw? 2 : opt_pkcs12 ? 0 : 1);
else
gpgsm_export (ctrl, list, stream);
es_fclose (stream); es_fclose (stream);
} }
else else
@ -761,7 +783,11 @@ cmd_export (assuan_context_t ctx, char *line)
return set_error (gpg_err_code_from_syserror (), "fdopen() failed"); return set_error (gpg_err_code_from_syserror (), "fdopen() failed");
} }
gpgsm_export (ctrl, list, out_fp); if (opt_secret)
gpgsm_p12_export (ctrl, list->d, out_fp,
opt_raw? 2 : opt_pkcs12 ? 0 : 1);
else
gpgsm_export (ctrl, list, out_fp);
es_fclose (out_fp); es_fclose (out_fp);
} }