|
 |
72fdaf |
diff -up sudo-1.8.6p7/plugins/sudoers/match.c.digestmessagesfix sudo-1.8.6p7/plugins/sudoers/match.c
|
|
|
72fdaf |
--- sudo-1.8.6p7/plugins/sudoers/match.c.digestmessagesfix 2015-09-01 15:33:27.493054381 +0200
|
|
|
72fdaf |
+++ sudo-1.8.6p7/plugins/sudoers/match.c 2015-09-01 15:33:31.327054279 +0200
|
|
|
72fdaf |
@@ -566,6 +566,21 @@ base64_decode(const char *in, unsigned c
|
|
|
72fdaf |
return io;
|
|
|
72fdaf |
}
|
|
|
72fdaf |
|
|
|
72fdaf |
+static const char *digesttype2str(int digest_type)
|
|
|
72fdaf |
+{
|
|
|
72fdaf |
+ switch(digest_type) {
|
|
|
72fdaf |
+ case SUDO_DIGEST_SHA224:
|
|
|
72fdaf |
+ return "SHA224";
|
|
|
72fdaf |
+ case SUDO_DIGEST_SHA256:
|
|
|
72fdaf |
+ return "SHA256";
|
|
|
72fdaf |
+ case SUDO_DIGEST_SHA384:
|
|
|
72fdaf |
+ return "SHA384";
|
|
|
72fdaf |
+ case SUDO_DIGEST_SHA512:
|
|
|
72fdaf |
+ return "SHA512";
|
|
|
72fdaf |
+ }
|
|
|
72fdaf |
+ return "<INVALID>";
|
|
|
72fdaf |
+}
|
|
|
72fdaf |
+
|
|
|
72fdaf |
static bool
|
|
|
72fdaf |
digest_matches(char *file, struct sudo_digest *sd)
|
|
|
72fdaf |
{
|
|
|
72fdaf |
@@ -597,7 +612,7 @@ digest_matches(char *file, struct sudo_d
|
|
|
72fdaf |
if (!isxdigit((unsigned char)sd->digest_str[i + i]) ||
|
|
|
72fdaf |
!isxdigit((unsigned char)sd->digest_str[i + i + 1])) {
|
|
|
72fdaf |
warningx(_("digest for %s (%s) is not in %s form"), file,
|
|
|
72fdaf |
- sd->digest_str, sd->digest_str);
|
|
|
72fdaf |
+ sd->digest_str, digesttype2str(sd->digest_type));
|
|
|
72fdaf |
goto bad_format;
|
|
|
72fdaf |
}
|
|
|
72fdaf |
sudoers_digest[i] = hexchar(&sd->digest_str[i + i]);
|
|
|
72fdaf |
@@ -619,7 +634,7 @@ digest_matches(char *file, struct sudo_d
|
|
|
72fdaf |
debug_return_bool(match);
|
|
|
72fdaf |
bad_format:
|
|
|
72fdaf |
warningx(_("digest for %s (%s) is not in %s form"), file,
|
|
|
72fdaf |
- sd->digest_str, sd->digest_str);
|
|
|
72fdaf |
+ sd->digest_str, digesttype2str(sd->digest_type));
|
|
|
72fdaf |
if (sudoers_digest)
|
|
|
72fdaf |
efree(sudoers_digest);
|
|
|
72fdaf |
if (file_digest)
|