gpg: Revamp structure of PKT_symkey_enc.

* g10/packet.h (PKT_symkey_enc): Allocate the session key so that we
have a fixed length for this struct.
* g10/free-packet.c (free_symkey_enc): Adjust for this change
* g10/parse-packet.c (parse_symkeyenc): Ditto.
* g10/encrypt.c (encrypt_simple, write_symkey_enc): Ditto.

1 files changed, 4 insertions, 4 deletions

diff --git a/g10/packet.h b/g10/packet.h
index 8b4c3d9c2..60446a417 100644
--- a/g10/packet.h
+++ b/g10/packet.h
@@ -147,9 +147,9 @@ typedef struct {
      S2K function on the password is the session key. See RFC 4880,
      Section 5.3.)  */
   byte seskeylen;
-  /* The session key as encrypted by the S2K specifier.  For AEAD this
-   * includes the nonce and the authentication tag.  */
-  byte seskey[1];
+  /* The malloced session key as encrypted by the S2K specifier.  For
+   * AEAD this includes the nonce and the authentication tag.  */
+  byte *seskey;
 } PKT_symkey_enc;
 
 /* A public-key encrypted session key packet as defined in RFC 4880,
@@ -177,7 +177,7 @@ typedef struct {
 struct seskey_enc_list
 {
   struct seskey_enc_list *next;
-  int result;
+  int result; /* The error code decrypting the session key.  */
   int u_sym;  /* Use the sym member.  */
   union {
     PKT_pubkey_enc pub;