fyb/calcurse-edge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix SHA1 calculation of long notes

Browse Source 
sha1_update() modifies the input data, so we need to duplicate the input
before calculating the hash. Otherwise, input data longer than 64 bytes
will be garbled.

Reported-by: Hakan Jerning <jerning@home.se>
Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
This commit is contained in:
Lukas Fleischer 2014-07-08 12:50:03 +02:00
parent 0529b864b0
commit 9dc36589ae
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/sha1.c
View File

@ -40,6 +40,7 @@
*/ */
#include <stdio.h> #include <stdio.h>
#include <stdlib.h>
#include <string.h> #include <string.h>
#include "sha1.h" #include "sha1.h"
@ -233,18 +234,21 @@ void sha1_final(sha1_ctx_t * ctx, uint8_t digest[SHA1_DIGESTLEN])
void sha1_digest(const char *data, char *buffer) void sha1_digest(const char *data, char *buffer)
{ {
char *buf = strdup(data);
sha1_ctx_t ctx; sha1_ctx_t ctx;
uint8_t digest[SHA1_DIGESTLEN]; uint8_t digest[SHA1_DIGESTLEN];
int i; int i;
sha1_init(&ctx); sha1_init(&ctx);
sha1_update(&ctx, (const uint8_t *)data, strlen(data)); sha1_update(&ctx, (const uint8_t *)buf, strlen(buf));
sha1_final(&ctx, (uint8_t *) digest); sha1_final(&ctx, (uint8_t *) digest);
for (i = 0; i < SHA1_DIGESTLEN; i++) { for (i = 0; i < SHA1_DIGESTLEN; i++) {
snprintf(buffer, 3, "%02x", digest[i]); snprintf(buffer, 3, "%02x", digest[i]);
buffer += sizeof(char) * 2; buffer += sizeof(char) * 2;
} }
free(buf);
} }
void sha1_stream(FILE * fp, char *buffer) void sha1_stream(FILE * fp, char *buffer)