lib: wrap crypt API to hide errno usage
In order to prevent using the global errno, replace it with a static
version and create a wrapper function which returns the error value.
Signed-off-by: Steffen Jaeckel <jaeckel-floss@eyet-services.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Heiko Schocher <hs@denx.de>
diff --git a/lib/crypt/crypt.c b/lib/crypt/crypt.c
index 4ec6079..247c34b 100644
--- a/lib/crypt/crypt.c
+++ b/lib/crypt/crypt.c
@@ -5,8 +5,8 @@
#include <crypt.h>
#include "crypt-port.h"
-typedef void (*crypt_fn)(const char *, size_t, const char *, size_t, uint8_t *,
- size_t, void *, size_t);
+typedef int (*crypt_fn)(const char *, size_t, const char *, size_t, uint8_t *,
+ size_t, void *, size_t);
const unsigned char ascii64[65] =
"./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
@@ -29,19 +29,20 @@
*equal = ret ^ 1;
}
-void crypt_compare(const char *should, const char *passphrase, int *equal)
+int crypt_compare(const char *should, const char *passphrase, int *equal)
{
u8 output[CRYPT_OUTPUT_SIZE], scratch[ALG_SPECIFIC_SIZE];
size_t n;
+ int err;
struct {
const char *prefix;
crypt_fn crypt;
} crypt_algos[] = {
#if defined(CONFIG_CRYPT_PW_SHA256)
- { "$5$", crypt_sha256crypt_rn },
+ { "$5$", crypt_sha256crypt_rn_wrapped },
#endif
#if defined(CONFIG_CRYPT_PW_SHA512)
- { "$6$", crypt_sha512crypt_rn },
+ { "$6$", crypt_sha512crypt_rn_wrapped },
#endif
{ NULL, NULL }
};
@@ -56,18 +57,20 @@
}
if (n >= ARRAY_SIZE(crypt_algos))
- return;
+ return -EINVAL;
- crypt_algos[n].crypt(passphrase, strlen(passphrase), should, 0, output,
- sizeof(output), scratch, sizeof(scratch));
-
+ err = crypt_algos[n].crypt(passphrase, strlen(passphrase), should, 0,
+ output, sizeof(output), scratch,
+ sizeof(scratch));
/* early return on error, nothing really happened inside the crypt() function */
- if (errno == ERANGE || errno == EINVAL)
- return;
+ if (err)
+ return err;
equals_constant_time(should, output, strlen((const char *)output),
equal);
memset(scratch, 0, sizeof(scratch));
memset(output, 0, sizeof(output));
+
+ return 0;
}