aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--agent/ChangeLog1
-rw-r--r--agent/minip12.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/agent/ChangeLog b/agent/ChangeLog
index 83e1fe867..5dca17146 100644
--- a/agent/ChangeLog
+++ b/agent/ChangeLog
@@ -2,6 +2,7 @@
* minip12.c (p12_build): Oops, array needs to be larger for the
certificate.
+ (build_cert_bag): Fixed yesterdays change.
* command-ssh.c (card_key_available): Let the card handler decide
whether the card is supported here. Also get a short serial
diff --git a/agent/minip12.c b/agent/minip12.c
index ea9f9b1b8..b4e836f5b 100644
--- a/agent/minip12.c
+++ b/agent/minip12.c
@@ -1409,7 +1409,7 @@ build_cert_bag (unsigned char *buffer, size_t buflen, char *salt,
p += DIM (oid_encryptedData);
/* 2. Store a [0] tag. */
- p = store_tag_length (p, 0x80, len[2]);
+ p = store_tag_length (p, 0xa0, len[2]);
/* 3. Store a sequence. */
p = store_tag_length (p, TAG_SEQUENCE, len[3]);
@@ -1433,7 +1433,7 @@ build_cert_bag (unsigned char *buffer, size_t buflen, char *salt,
p += DIM (data_rc2iter2048);
/* 8. And finally the [0] tag with the encrypted data. */
- p = store_tag_length (p, 0xa0, buflen);
+ p = store_tag_length (p, 0x80, buflen);
memcpy (p, buffer, buflen);
p += buflen;
certbaglen = p - certbag;