summaryrefslogtreecommitdiff
path: root/src/hash
diff options
context:
space:
mode:
authorEdward Thomson <ethomson@edwardthomson.com>2018-12-27 13:47:34 -0600
committerEdward Thomson <ethomson@edwardthomson.com>2019-01-22 22:30:35 +0000
commitf673e232afe22eb865cdc915e55a2df6493f0fbb (patch)
treee79e3e6fb1e1d78367679aea75e66c8141b4daa8 /src/hash
parent647dfdb42d06514a85c1499f1be88a32b8a4c24b (diff)
downloadlibgit2-f673e232afe22eb865cdc915e55a2df6493f0fbb.tar.gz
git_error: use new names in internal APIs and usage
Move to the `git_error` name in the internal API for error-related functions.
Diffstat (limited to 'src/hash')
-rw-r--r--src/hash/hash_collisiondetect.h2
-rw-r--r--src/hash/hash_openssl.h6
-rw-r--r--src/hash/hash_win32.c26
3 files changed, 17 insertions, 17 deletions
diff --git a/src/hash/hash_collisiondetect.h b/src/hash/hash_collisiondetect.h
index 4e4c7da55..743209802 100644
--- a/src/hash/hash_collisiondetect.h
+++ b/src/hash/hash_collisiondetect.h
@@ -41,7 +41,7 @@ GIT_INLINE(int) git_hash_final(git_oid *out, git_hash_ctx *ctx)
{
assert(ctx);
if (SHA1DCFinal(out->id, &ctx->c)) {
- giterr_set(GITERR_SHA1, "SHA1 collision attack detected");
+ git_error_set(GIT_ERROR_SHA1, "SHA1 collision attack detected");
return -1;
}
diff --git a/src/hash/hash_openssl.h b/src/hash/hash_openssl.h
index 9a32cba2a..8dbfd5ad5 100644
--- a/src/hash/hash_openssl.h
+++ b/src/hash/hash_openssl.h
@@ -29,7 +29,7 @@ GIT_INLINE(int) git_hash_init(git_hash_ctx *ctx)
assert(ctx);
if (SHA1_Init(&ctx->c) != 1) {
- giterr_set(GITERR_SHA1, "hash_openssl: failed to initialize hash context");
+ git_error_set(GIT_ERROR_SHA1, "hash_openssl: failed to initialize hash context");
return -1;
}
@@ -41,7 +41,7 @@ GIT_INLINE(int) git_hash_update(git_hash_ctx *ctx, const void *data, size_t len)
assert(ctx);
if (SHA1_Update(&ctx->c, data, len) != 1) {
- giterr_set(GITERR_SHA1, "hash_openssl: failed to update hash");
+ git_error_set(GIT_ERROR_SHA1, "hash_openssl: failed to update hash");
return -1;
}
@@ -53,7 +53,7 @@ GIT_INLINE(int) git_hash_final(git_oid *out, git_hash_ctx *ctx)
assert(ctx);
if (SHA1_Final(out->id, &ctx->c) != 1) {
- giterr_set(GITERR_SHA1, "hash_openssl: failed to finalize hash");
+ git_error_set(GIT_ERROR_SHA1, "hash_openssl: failed to finalize hash");
return -1;
}
diff --git a/src/hash/hash_win32.c b/src/hash/hash_win32.c
index 779802c4b..4b6830358 100644
--- a/src/hash/hash_win32.c
+++ b/src/hash/hash_win32.c
@@ -25,7 +25,7 @@ GIT_INLINE(int) hash_cng_prov_init(void)
/* Only use CNG on Windows 2008 / Vista SP1 or better (Windows 6.0 SP1) */
if (!git_has_win32_version(6, 0, 1)) {
- giterr_set(GITERR_SHA1, "CryptoNG is not supported on this platform");
+ git_error_set(GIT_ERROR_SHA1, "CryptoNG is not supported on this platform");
return -1;
}
@@ -35,7 +35,7 @@ GIT_INLINE(int) hash_cng_prov_init(void)
StringCchCat(dll_path, MAX_PATH, "\\") < 0 ||
StringCchCat(dll_path, MAX_PATH, GIT_HASH_CNG_DLL_NAME) < 0 ||
(hash_prov.prov.cng.dll = LoadLibrary(dll_path)) == NULL) {
- giterr_set(GITERR_SHA1, "CryptoNG library could not be loaded");
+ git_error_set(GIT_ERROR_SHA1, "CryptoNG library could not be loaded");
return -1;
}
@@ -49,7 +49,7 @@ GIT_INLINE(int) hash_cng_prov_init(void)
(hash_prov.prov.cng.close_algorithm_provider = (hash_win32_cng_close_algorithm_provider_fn)GetProcAddress(hash_prov.prov.cng.dll, "BCryptCloseAlgorithmProvider")) == NULL) {
FreeLibrary(hash_prov.prov.cng.dll);
- giterr_set(GITERR_OS, "CryptoNG functions could not be loaded");
+ git_error_set(GIT_ERROR_OS, "CryptoNG functions could not be loaded");
return -1;
}
@@ -57,7 +57,7 @@ GIT_INLINE(int) hash_cng_prov_init(void)
if (hash_prov.prov.cng.open_algorithm_provider(&hash_prov.prov.cng.handle, GIT_HASH_CNG_HASH_TYPE, NULL, GIT_HASH_CNG_HASH_REUSABLE) < 0) {
FreeLibrary(hash_prov.prov.cng.dll);
- giterr_set(GITERR_OS, "algorithm provider could not be initialized");
+ git_error_set(GIT_ERROR_OS, "algorithm provider could not be initialized");
return -1;
}
@@ -66,7 +66,7 @@ GIT_INLINE(int) hash_cng_prov_init(void)
hash_prov.prov.cng.close_algorithm_provider(hash_prov.prov.cng.handle, 0);
FreeLibrary(hash_prov.prov.cng.dll);
- giterr_set(GITERR_OS, "algorithm handle could not be found");
+ git_error_set(GIT_ERROR_OS, "algorithm handle could not be found");
return -1;
}
@@ -86,7 +86,7 @@ GIT_INLINE(void) hash_cng_prov_shutdown(void)
GIT_INLINE(int) hash_cryptoapi_prov_init()
{
if (!CryptAcquireContext(&hash_prov.prov.cryptoapi.handle, NULL, 0, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT)) {
- giterr_set(GITERR_OS, "legacy hash context could not be started");
+ git_error_set(GIT_ERROR_OS, "legacy hash context could not be started");
return -1;
}
@@ -141,7 +141,7 @@ GIT_INLINE(int) hash_cryptoapi_init(git_hash_ctx *ctx)
if (!CryptCreateHash(ctx->prov->prov.cryptoapi.handle, CALG_SHA1, 0, 0, &ctx->ctx.cryptoapi.hash_handle)) {
ctx->ctx.cryptoapi.valid = 0;
- giterr_set(GITERR_OS, "legacy hash implementation could not be created");
+ git_error_set(GIT_ERROR_OS, "legacy hash implementation could not be created");
return -1;
}
@@ -159,7 +159,7 @@ GIT_INLINE(int) hash_cryptoapi_update(git_hash_ctx *ctx, const void *_data, size
DWORD chunk = (len > MAXDWORD) ? MAXDWORD : (DWORD)len;
if (!CryptHashData(ctx->ctx.cryptoapi.hash_handle, data, chunk, 0)) {
- giterr_set(GITERR_OS, "legacy hash data could not be updated");
+ git_error_set(GIT_ERROR_OS, "legacy hash data could not be updated");
return -1;
}
@@ -178,7 +178,7 @@ GIT_INLINE(int) hash_cryptoapi_final(git_oid *out, git_hash_ctx *ctx)
assert(ctx->ctx.cryptoapi.valid);
if (!CryptGetHashParam(ctx->ctx.cryptoapi.hash_handle, HP_HASHVAL, out->id, &len, 0)) {
- giterr_set(GITERR_OS, "legacy hash data could not be finished");
+ git_error_set(GIT_ERROR_OS, "legacy hash data could not be finished");
error = -1;
}
@@ -204,7 +204,7 @@ GIT_INLINE(int) hash_ctx_cng_init(git_hash_ctx *ctx)
if (hash_prov.prov.cng.create_hash(hash_prov.prov.cng.handle, &ctx->ctx.cng.hash_handle, ctx->ctx.cng.hash_object, hash_prov.prov.cng.hash_object_size, NULL, 0, 0) < 0) {
git__free(ctx->ctx.cng.hash_object);
- giterr_set(GITERR_OS, "hash implementation could not be created");
+ git_error_set(GIT_ERROR_OS, "hash implementation could not be created");
return -1;
}
@@ -223,7 +223,7 @@ GIT_INLINE(int) hash_cng_init(git_hash_ctx *ctx)
/* CNG needs to be finished to restart */
if (ctx->prov->prov.cng.finish_hash(ctx->ctx.cng.hash_handle, hash, GIT_OID_RAWSZ, 0) < 0) {
- giterr_set(GITERR_OS, "hash implementation could not be finished");
+ git_error_set(GIT_ERROR_OS, "hash implementation could not be finished");
return -1;
}
@@ -240,7 +240,7 @@ GIT_INLINE(int) hash_cng_update(git_hash_ctx *ctx, const void *_data, size_t len
ULONG chunk = (len > ULONG_MAX) ? ULONG_MAX : (ULONG)len;
if (ctx->prov->prov.cng.hash_data(ctx->ctx.cng.hash_handle, data, chunk, 0) < 0) {
- giterr_set(GITERR_OS, "hash could not be updated");
+ git_error_set(GIT_ERROR_OS, "hash could not be updated");
return -1;
}
@@ -254,7 +254,7 @@ GIT_INLINE(int) hash_cng_update(git_hash_ctx *ctx, const void *_data, size_t len
GIT_INLINE(int) hash_cng_final(git_oid *out, git_hash_ctx *ctx)
{
if (ctx->prov->prov.cng.finish_hash(ctx->ctx.cng.hash_handle, out->id, GIT_OID_RAWSZ, 0) < 0) {
- giterr_set(GITERR_OS, "hash could not be finished");
+ git_error_set(GIT_ERROR_OS, "hash could not be finished");
return -1;
}