security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-05-14 08:13:25 +02:00
Code Activity

Fixed padding in pkcs#12

Browse Source
This commit is contained in:
Werner Koch 2005-09-16 12:49:53 +00:00
parent f96f84f7a0
commit 19724f13bc
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
agent/ChangeLog
View File

@ -1,3 +1,8 @@
2005-09-16 Werner Koch <wk@g10code.com>
* minip12.c (build_key_sequence, build_cert_sequence): Fixed
padding.
2005-09-15 Moritz Schulte <moritz@g10code.com> 2005-09-15 Moritz Schulte <moritz@g10code.com>
* t-protect.c (test_agent_protect): Implemented. * t-protect.c (test_agent_protect): Implemented.

14
agent/minip12.c
View File

@ -745,6 +745,15 @@ parse_bag_data (const unsigned char *buffer, size_t length, int startoffset,
startoffset = 0; startoffset = 0;
buffer = p = plain; buffer = p = plain;
/* { */
/* # warning debug code is enabled */
/* FILE *fp = fopen ("tmp-rc2-plain-key.der", "wb"); */
/* if (!fp || fwrite (p, n, 1, fp) != 1) */
/* exit (2); */
/* fclose (fp); */
/* } */
where = "decrypted-text"; where = "decrypted-text";
if (parse_tag (&p, &n, &ti) || ti.class || ti.tag != TAG_SEQUENCE) if (parse_tag (&p, &n, &ti) || ti.class || ti.tag != TAG_SEQUENCE)
goto bailout; goto bailout;
@ -1229,7 +1238,7 @@ build_key_sequence (gcry_mpi_t *kparms, size_t *r_length)
assert (needed == plainlen); assert (needed == plainlen);
/* Append some pad characters; we already allocated extra space. */ /* Append some pad characters; we already allocated extra space. */
n = 8 - plainlen % 8; n = 8 - plainlen % 8;
for (;(plainlen % 8); plainlen++) for (i=0; i < n; i++, plainlen++)
*p++ = n; *p++ = n;
*r_length = plainlen; *r_length = plainlen;
@ -1453,6 +1462,7 @@ build_cert_sequence (unsigned char *buffer, size_t buflen, size_t *r_length)
size_t len[8], needed, n; size_t len[8], needed, n;
unsigned char *p, *certseq; unsigned char *p, *certseq;
size_t certseqlen; size_t certseqlen;
int i;
/* Walk 8 steps down to collect the info: */ /* Walk 8 steps down to collect the info: */
@ -1535,7 +1545,7 @@ build_cert_sequence (unsigned char *buffer, size_t buflen, size_t *r_length)
/* Append some pad characters; we already allocated extra space. */ /* Append some pad characters; we already allocated extra space. */
n = 8 - certseqlen % 8; n = 8 - certseqlen % 8;
for (;(certseqlen % 8); certseqlen++) for (i=0; i < n; i++, certseqlen++)
*p++ = n; *p++ = n;
*r_length = certseqlen; *r_length = certseqlen;