Skip to content

Commit

Permalink
Merge branch 'ew/sha256-gcrypt-leak-fixes' into next
Browse files Browse the repository at this point in the history
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
  • Loading branch information
gitster committed Aug 1, 2023
2 parents 405eb13 + 823839b commit eed8380
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions sha256/gcrypt.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,25 @@

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);
}

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);
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);
}
Expand Down

0 comments on commit eed8380

Please sign in to comment.