security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-17 15:44:34 +02:00
Code Activity

2003-08-20 Marcus Brinkmann <marcus@g10code.de>

Browse Source 
* encrypt.c (encode_session_key): Allocate enough space.  Cast key
	byte to unsigned char to prevent sign extension.
	(encrypt_dek): Check return value before error.
This commit is contained in:
Marcus Brinkmann 2003-08-20 16:53:40 +00:00
parent e3cdba8386
commit e8cf79c977
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sm/ChangeLog
View File

@ -1,3 +1,9 @@
2003-08-20 Marcus Brinkmann <marcus@g10code.de>
* encrypt.c (encode_session_key): Allocate enough space. Cast key
byte to unsigned char to prevent sign extension.
(encrypt_dek): Check return value before error.
2003-08-14 Timo Schulz <twoaday@freakmail.de> 2003-08-14 Timo Schulz <twoaday@freakmail.de>
* encrypt.c (encode_session_key): Use new Libgcrypt interface. * encrypt.c (encode_session_key): Use new Libgcrypt interface.

5
sm/encrypt.c
View File

@ -134,11 +134,11 @@ encode_session_key (DEK dek, gcry_sexp_t * r_data)
int i; int i;
int rc; int rc;
p = xmalloc (64+dek->keylen); p = xmalloc (64 + 2 * dek->keylen);
strcpy (p, "(data\n (flags pkcs1)\n (value #"); strcpy (p, "(data\n (flags pkcs1)\n (value #");
for (i=0; i < dek->keylen; i++) for (i=0; i < dek->keylen; i++)
{ {
sprintf (tmp, "%02x", dek->key[i]); sprintf (tmp, "%02x", (unsigned char) dek->key[i]);
strcat (p, tmp); strcat (p, tmp);
} }
strcat (p, "#))\n"); strcat (p, "#))\n");
@ -184,6 +184,7 @@ encrypt_dek (const DEK dek, KsbaCert cert, char **encval)
/* put the encoded cleartext into a simple list */ /* put the encoded cleartext into a simple list */
rc = encode_session_key (dek, &s_data); rc = encode_session_key (dek, &s_data);
if (rc)
{ {
log_error ("encode_session_key failed: %s\n", gpg_strerror (rc)); log_error ("encode_session_key failed: %s\n", gpg_strerror (rc));
return rc; return rc;