kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'ew/sha256-gcrypt-leak-fixes' 

Leakfixes.

* ew/sha256-gcrypt-leak-fixes:
  sha256/gcrypt: die on gcry_md_open failures
  sha256/gcrypt: fix memory leak with SHA-256 repos
  sha256/gcrypt: fix build with SANITIZE=leak
maint
Junio C Hamano 2023-08-07 11:57:18 -07:00
parent a04cef9fd7 823839bda1
commit b2797581d0
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sha256/gcrypt.h
View File

@ -7,22 +7,25 @@


typedef gcry_md_hd_t gcrypt_SHA256_CTX; typedef gcry_md_hd_t gcrypt_SHA256_CTX;


inline void gcrypt_SHA256_Init(gcrypt_SHA256_CTX *ctx) static inline void gcrypt_SHA256_Init(gcrypt_SHA256_CTX *ctx)
{ {
gcry_md_open(ctx, GCRY_MD_SHA256, 0); gcry_error_t err = gcry_md_open(ctx, GCRY_MD_SHA256, 0);
if (err)
die("gcry_md_open: %s", gcry_strerror(err));
} }


inline void gcrypt_SHA256_Update(gcrypt_SHA256_CTX *ctx, const void *data, size_t len) static inline void gcrypt_SHA256_Update(gcrypt_SHA256_CTX *ctx, const void *data, size_t len)
{ {
gcry_md_write(*ctx, data, len); gcry_md_write(*ctx, data, len);
} }


inline void gcrypt_SHA256_Final(unsigned char *digest, gcrypt_SHA256_CTX *ctx) static inline void gcrypt_SHA256_Final(unsigned char *digest, gcrypt_SHA256_CTX *ctx)
{ {
memcpy(digest, gcry_md_read(*ctx, GCRY_MD_SHA256), SHA256_DIGEST_SIZE); memcpy(digest, gcry_md_read(*ctx, GCRY_MD_SHA256), SHA256_DIGEST_SIZE);
gcry_md_close(*ctx);
} }


inline void gcrypt_SHA256_Clone(gcrypt_SHA256_CTX *dst, const gcrypt_SHA256_CTX *src) static inline void gcrypt_SHA256_Clone(gcrypt_SHA256_CTX *dst, const gcrypt_SHA256_CTX *src)
{ {
gcry_md_copy(dst, *src); gcry_md_copy(dst, *src);
} }