security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-23 10:29:58 +01:00
Code Activity

gpg: Very minor cleanup in decrypt_data.

Browse Source 
* g10/decrypt-data.c (decrypt_data): Show also the aead algo with
--show-session-key.  Remove meanwhile superfluous NULL-ptr test.
This commit is contained in:
Werner Koch 2022-08-29 13:07:43 +02:00
parent e92812a475
commit 5b24c41ba7
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
g10/decrypt-data.c
View File

@ -284,7 +284,10 @@ decrypt_data (ctrl_t ctrl, void *procctx, PKT_encrypted *ed, DEK *dek,
char numbuf[25]; char numbuf[25];
char *hexbuf; char *hexbuf;
snprintf (numbuf, sizeof numbuf, "%d:", dek->algo); if (ed->aead_algo)
snprintf (numbuf, sizeof numbuf, "%d.%u:", dek->algo, ed->aead_algo);
else
snprintf (numbuf, sizeof numbuf, "%d:", dek->algo);
hexbuf = bin2hex (dek->key, dek->keylen, NULL); hexbuf = bin2hex (dek->key, dek->keylen, NULL);
if (!hexbuf) if (!hexbuf)
{ {
@ -486,6 +489,7 @@ decrypt_data (ctrl_t ctrl, void *procctx, PKT_encrypted *ed, DEK *dek,
{ {
char *filename = NULL; char *filename = NULL;
estream_t fp; estream_t fp;
rc = get_output_file ("", 0, ed->buf, &filename, &fp); rc = get_output_file ("", 0, ed->buf, &filename, &fp);
if (! rc) if (! rc)
{ {
@ -509,8 +513,7 @@ decrypt_data (ctrl_t ctrl, void *procctx, PKT_encrypted *ed, DEK *dek,
filename, gpg_strerror (rc)); filename, gpg_strerror (rc));
iobuf_close (output); iobuf_close (output);
if (afx) release_armor_context (afx);
release_armor_context (afx);
} }
xfree (filename); xfree (filename);
} }