mirror of
git://git.gnupg.org/gnupg.git
synced 2025-01-18 14:17:03 +01:00
Fixed yesterdays change. Importing to Outlook seems to work now.
This commit is contained in:
parent
6f90f05cb2
commit
aa7eccfbef
@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
* minip12.c (p12_build): Oops, array needs to be larger for the
|
* minip12.c (p12_build): Oops, array needs to be larger for the
|
||||||
certificate.
|
certificate.
|
||||||
|
(build_cert_bag): Fixed yesterdays change.
|
||||||
|
|
||||||
* command-ssh.c (card_key_available): Let the card handler decide
|
* command-ssh.c (card_key_available): Let the card handler decide
|
||||||
whether the card is supported here. Also get a short serial
|
whether the card is supported here. Also get a short serial
|
||||||
|
@ -1409,7 +1409,7 @@ build_cert_bag (unsigned char *buffer, size_t buflen, char *salt,
|
|||||||
p += DIM (oid_encryptedData);
|
p += DIM (oid_encryptedData);
|
||||||
|
|
||||||
/* 2. Store a [0] tag. */
|
/* 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. */
|
/* 3. Store a sequence. */
|
||||||
p = store_tag_length (p, TAG_SEQUENCE, len[3]);
|
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);
|
p += DIM (data_rc2iter2048);
|
||||||
|
|
||||||
/* 8. And finally the [0] tag with the encrypted data. */
|
/* 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);
|
memcpy (p, buffer, buflen);
|
||||||
p += buflen;
|
p += buflen;
|
||||||
certbaglen = p - certbag;
|
certbaglen = p - certbag;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user