71d6014956
- ddr_1998-alg-caseindep.diff: * Use case-independent matching for algorithm names (hash, crypt). - ddr_1998-check-nofail-noxattr.diff: * Make testsuite succeed for builds w/o xattr support. OBS-URL: https://build.opensuse.org/request/show/597860 OBS-URL: https://build.opensuse.org/package/show/Base:System/dd_rescue?expand=0&rev=41
123 lines
4.1 KiB
Diff
123 lines
4.1 KiB
Diff
commit 604e57678ed50ee88ea20d82c98bf7ba53db76c1
|
|
Author: Kurt Garloff <kurt@garloff.de>
|
|
Date: Thu Feb 8 10:41:25 2018 +0100
|
|
|
|
Case insensitivity for crypt algos, help, debug.
|
|
|
|
This makes it a bit easier to specify things correctly.
|
|
|
|
diff --git a/aes.c b/aes.c
|
|
index 33906b0..2784006 100644
|
|
--- a/aes.c
|
|
+++ b/aes.c
|
|
@@ -449,7 +449,7 @@ ciph_desc_t *findalg(ciph_desc_t* list, const char* nm, const char probe)
|
|
{
|
|
ciph_desc_t* alg = list;
|
|
while (alg->name) {
|
|
- if (!strcmp(alg->name, nm)) {
|
|
+ if (!strcasecmp(alg->name, nm)) {
|
|
if (!probe || !alg->probe)
|
|
return alg;
|
|
return (alg->probe()? NULL: alg);
|
|
diff --git a/libddr_crypt.c b/libddr_crypt.c
|
|
index 0d2e77f..1d9d4a0 100644
|
|
--- a/libddr_crypt.c
|
|
+++ b/libddr_crypt.c
|
|
@@ -158,7 +158,7 @@ int set_alg(crypt_state* state, const char* algnm)
|
|
FPLOG(FATAL, "Don't understand option (alg?) %s\n", algnm);
|
|
return -1;
|
|
}
|
|
- if (!strcmp(algnm, "help")) {
|
|
+ if (!strcasecmp(algnm, "help")) {
|
|
FPLOG(INFO, "Crypto algorithms:", NULL);
|
|
ciph_desc_t *alg;
|
|
for (alg = state->engine; alg->name != NULL; ++alg)
|
|
@@ -218,28 +218,28 @@ int crypt_plug_init(void **stat, char* param, int seq, const opt_t *opt)
|
|
param = next;
|
|
continue;
|
|
}
|
|
- if (!strcmp(param, "help")) {
|
|
+ if (!strcasecmp(param, "help")) {
|
|
FPLOG(INFO, "%s", crypt_help);
|
|
return -1;
|
|
- } else if (!strcmp(param, "debug"))
|
|
+ } else if (!strcasecmp(param, "debug"))
|
|
state->debug = 1;
|
|
else if (!strcmp(param, "encrypt") || !strcmp(param, "enc"))
|
|
state->enc = 1;
|
|
else if (!strcmp(param, "decrypt") || !strcmp(param, "dec"))
|
|
state->enc = 0;
|
|
else if (!memcmp(param, "engine=", 7)) {
|
|
- if (!strcmp(param+7, "aes_c"))
|
|
+ if (!strcasecmp(param+7, "aes_c"))
|
|
state->engine = AES_C_Methods;
|
|
#ifdef HAVE_AES_ARM64
|
|
- else if (!strcmp(param+7, "aesarm64"))
|
|
+ else if (!strcasecmp(param+7, "aesarm64"))
|
|
state->engine = AES_ARM8_Methods;
|
|
#endif
|
|
#ifdef HAVE_AESNI
|
|
- else if (!strcmp(param+7, "aesni"))
|
|
+ else if (!strcasecmp(param+7, "aesni"))
|
|
state->engine = AESNI_Methods;
|
|
#endif
|
|
#ifdef HAVE_LIBCRYPTO
|
|
- else if (!strcmp(param+7, "openssl"))
|
|
+ else if (!strcasecmp(param+7, "openssl"))
|
|
state->engine = AES_OSSL_Methods;
|
|
#endif
|
|
else {
|
|
@@ -257,11 +257,11 @@ int crypt_plug_init(void **stat, char* param, int seq, const opt_t *opt)
|
|
else if (!memcmp(param, "alg=", 4))
|
|
err += set_alg(state, param+4);
|
|
else if (!memcmp(param, "pad=", 4)) {
|
|
- if (!strcmp(param+4, "zero"))
|
|
+ if (!strcasecmp(param+4, "zero"))
|
|
state->pad = PAD_ZERO;
|
|
- else if (!strcmp(param+4, "always"))
|
|
+ else if (!strcasecmp(param+4, "always"))
|
|
state->pad = PAD_ALWAYS;
|
|
- else if (!strcmp(param+4, "asneeded"))
|
|
+ else if (!strcasecmp(param+4, "asneeded"))
|
|
state->pad = PAD_ASNEEDED;
|
|
else {
|
|
FPLOG(FATAL, "Illegal padding %s: Specify zero/always/asneeded!\n",
|
|
@@ -401,8 +401,10 @@ int crypt_plug_init(void **stat, char* param, int seq, const opt_t *opt)
|
|
}
|
|
/* 1st: Set engine: Default: aesni/aes_c: Done */
|
|
/* 2nd: Set alg: Already done if set explicitly */
|
|
- if (!err && !state->alg)
|
|
+ if (!err && !state->alg) {
|
|
state->alg = findalg(state->engine, "AES192-CTR", 0);
|
|
+ FPLOG(INFO, "Using default algorithm AES192-CTR\n", NULL);
|
|
+ }
|
|
if (!state->alg)
|
|
return -1;
|
|
|
|
diff --git a/libddr_hash.c b/libddr_hash.c
|
|
index 7c8cdf8..b6634ff 100644
|
|
--- a/libddr_hash.c
|
|
+++ b/libddr_hash.c
|
|
@@ -120,7 +120,7 @@ static loff_t readint(const char* const ptr)
|
|
hashalg_t *get_hashalg(hash_state *state, const char* nm)
|
|
{
|
|
unsigned int i;
|
|
- const char help = !strcmp(nm, "help");
|
|
+ const char help = !strcasecmp(nm, "help");
|
|
if (help)
|
|
FPLOG(INFO, "Supported algorithms:");
|
|
for (i = 0; i < sizeof(hashes)/sizeof(hashalg_t); ++i) {
|
|
@@ -154,10 +154,10 @@ int hash_plug_init(void **stat, char* param, int seq, const opt_t *opt)
|
|
char* next = strchr(param, ':');
|
|
if (next)
|
|
*next++ = 0;
|
|
- if (!strcmp(param, "help"))
|
|
+ if (!strcasecmp(param, "help"))
|
|
FPLOG(INFO, "%s", hash_help);
|
|
|
|
- else if (!strcmp(param, "debug"))
|
|
+ else if (!strcasecmp(param, "debug"))
|
|
state->debug = 1;
|
|
else if (!strcmp(param, "output"))
|
|
state->outfd = 1;
|