Attachment 2941 Details for Bug 7793 – Updated patch for glibc 2.14 to add sha-256/512 support

[patch] Updated patch for glibc 2.14 to add sha-256/512 support

glibc-2.14.1-mdv-wrapper_handle_sha.patch (text/plain), 5.16 KB, created by a b on 2012-10-15 00:53:56 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: a b

Created: 2012-10-15 00:53:56 CEST

Size: 5.16 KB

patch

obsolete

>--- crypt/wrapper.c.orig	2012-09-29 00:50:34.655115658 -0700
>+++ crypt/wrapper.c	2012-09-29 00:50:34.658115466 -0700
>@@ -55,6 +55,11 @@
> extern char *__des_crypt_r(const char *key, const char *salt,
> 	struct crypt_data *data);
> extern struct crypt_data _ufc_foobar;
>+/* support for sha256-crypt and sha512-crypt */
>+extern char *__sha256_crypt_r (const char *key, const char *salt,
>+			       char *buffer, int buflen);
>+extern char *__sha512_crypt_r (const char *key, const char *salt,
>+			       char *buffer, int buflen);
> #endif
> 
> static int _crypt_data_alloc(void **data, int *size, int need)
>@@ -140,6 +145,10 @@
> 		return _crypt_blowfish_rn(key, setting, (char *)data, size);
> 	if (setting[0] == '$' && setting[1] == '1')
> 		return __md5_crypt_r(key, setting, (char *)data, size);
>+	if (setting[0] == '$' && setting[1] == '5')
>+		return __sha256_crypt_r(key, setting, (char *)data, size);
>+	if (setting[0] == '$' && setting[1] == '6')
>+		return __sha512_crypt_r(key, setting, (char *)data, size);
> 	if (setting[0] == '$') goto out_einval;
> 	if (setting[0] == '_') {
> 		if (size < sizeof(struct _crypt_extended_data)) goto out_erange;
>@@ -179,6 +188,16 @@
> 			return NULL;
> 		return __md5_crypt_r(key, setting, (char *)*data, *size);
> 	}
>+	if (setting[0] == '$' && setting[1] == '5') {
>+		if (_crypt_data_alloc(data, size, CRYPT_OUTPUT_SIZE))
>+			return NULL;
>+		return __sha256_crypt_r(key, setting, (char *)*data, *size);
>+	}
>+	if (setting[0] == '$' && setting[1] == '6') {
>+		if (_crypt_data_alloc(data, size, CRYPT_OUTPUT_SIZE))
>+			return NULL;
>+		return __sha512_crypt_r(key, setting, (char *)*data, *size);
>+	}
> 	if (setting[0] == '$') goto out_einval;
> 	if (setting[0] == '_') {
> 		if (_crypt_data_alloc(data, size,
>@@ -270,6 +289,12 @@
> 	if (!strncmp(prefix, "$1$", 3))
> 		use = _crypt_gensalt_md5_rn;
> 	else
>+	if (!strncmp(prefix, "$5$", 3))
>+		use = _crypt_gensalt_sha256c_rn;
>+	else
>+	if (!strncmp(prefix, "$6$", 3))
>+		use = _crypt_gensalt_sha512c_rn;
>+	else
> 	if (prefix[0] == '_')
> 		use = _crypt_gensalt_extended_rn;
> 	else
>--- crypt/crypt_gensalt.h.orig	2011-07-16 07:58:39.000000000 -0700
>+++ crypt/crypt_gensalt.h	2012-09-29 01:07:58.404471915 -0700
>@@ -26,5 +26,9 @@
> 	const char *input, int size, char *output, int output_size);
> extern char *_crypt_gensalt_md5_rn(const char *prefix, unsigned long count,
> 	const char *input, int size, char *output, int output_size);
>+extern char *_crypt_gensalt_sha256c_rn(unsigned long count,
>+	const char *input, int size, char *output, int output_size);
>+extern char *_crypt_gensalt_sha512c_rn(unsigned long count,
>+	const char *input, int size, char *output, int output_size);
> 
> #endif
>--- crypt/crypt_gensalt.c.orig	2011-07-16 08:06:53.000000000 -0700
>+++ crypt/crypt_gensalt.c	2012-09-29 00:50:34.658115466 -0700
>@@ -122,3 +122,78 @@
> 
> 	return output;
> }
>+
>+char *_crypt_gensalt_sha256c_rn(unsigned long count,
>+	const char *input, int size, char *output, int output_size)
>+{
>+	unsigned long value;
>+
>+	if (size < 3 || output_size < 3 + 4 + 1 || (count && count != 1000)) {
>+		if (output_size > 0) output[0] = '\0';
>+		__set_errno((output_size < 3 + 4 + 1) ? ERANGE : EINVAL);
>+		return NULL;
>+	}
>+
>+	output[0] = '$';
>+	output[1] = '5';
>+	output[2] = '$';
>+	value = (unsigned long)(unsigned char)input[0] |
>+		((unsigned long)(unsigned char)input[1] << 8) |
>+		((unsigned long)(unsigned char)input[2] << 16);
>+	output[3] = _crypt_itoa64[value & 0x3f];
>+	output[4] = _crypt_itoa64[(value >> 6) & 0x3f];
>+	output[5] = _crypt_itoa64[(value >> 12) & 0x3f];
>+	output[6] = _crypt_itoa64[(value >> 18) & 0x3f];
>+	output[7] = '\0';
>+
>+	if (size >= 6 && output_size >= 3 + 4 + 4 + 1) {
>+		value = (unsigned long)(unsigned char)input[3] |
>+			((unsigned long)(unsigned char)input[4] << 8) |
>+			((unsigned long)(unsigned char)input[5] << 16);
>+		output[7] = _crypt_itoa64[value & 0x3f];
>+		output[8] = _crypt_itoa64[(value >> 6) & 0x3f];
>+		output[9] = _crypt_itoa64[(value >> 12) & 0x3f];
>+		output[10] = _crypt_itoa64[(value >> 18) & 0x3f];
>+		output[11] = '\0';
>+	}
>+
>+	return output;
>+}
>+
>+
>+char *_crypt_gensalt_sha512c_rn(unsigned long count,
>+	const char *input, int size, char *output, int output_size)
>+{
>+	unsigned long value;
>+
>+	if (size < 3 || output_size < 3 + 4 + 1 || (count && count != 1000)) {
>+		if (output_size > 0) output[0] = '\0';
>+		__set_errno((output_size < 3 + 4 + 1) ? ERANGE : EINVAL);
>+		return NULL;
>+	}
>+
>+	output[0] = '$';
>+	output[1] = '6';
>+	output[2] = '$';
>+	value = (unsigned long)(unsigned char)input[0] |
>+		((unsigned long)(unsigned char)input[1] << 8) |
>+		((unsigned long)(unsigned char)input[2] << 16);
>+	output[3] = _crypt_itoa64[value & 0x3f];
>+	output[4] = _crypt_itoa64[(value >> 6) & 0x3f];
>+	output[5] = _crypt_itoa64[(value >> 12) & 0x3f];
>+	output[6] = _crypt_itoa64[(value >> 18) & 0x3f];
>+	output[7] = '\0';
>+
>+	if (size >= 6 && output_size >= 3 + 4 + 4 + 1) {
>+		value = (unsigned long)(unsigned char)input[3] |
>+			((unsigned long)(unsigned char)input[4] << 8) |
>+			((unsigned long)(unsigned char)input[5] << 16);
>+		output[7] = _crypt_itoa64[value & 0x3f];
>+		output[8] = _crypt_itoa64[(value >> 6) & 0x3f];
>+		output[9] = _crypt_itoa64[(value >> 12) & 0x3f];
>+		output[10] = _crypt_itoa64[(value >> 18) & 0x3f];
>+		output[11] = '\0';
>+	}
>+
>+	return output;
>+}

--- crypt/wrapper.c.orig	2012-09-29 00:50:34.655115658 -0700
+++ crypt/wrapper.c	2012-09-29 00:50:34.658115466 -0700
@@ -55,6 +55,11 @@
 extern char *__des_crypt_r(const char *key, const char *salt,
 	struct crypt_data *data);
 extern struct crypt_data _ufc_foobar;
+/* support for sha256-crypt and sha512-crypt */
+extern char *__sha256_crypt_r (const char *key, const char *salt,
+			       char *buffer, int buflen);
+extern char *__sha512_crypt_r (const char *key, const char *salt,
+			       char *buffer, int buflen);
 #endif
 
 static int _crypt_data_alloc(void **data, int *size, int need)
@@ -140,6 +145,10 @@
 		return _crypt_blowfish_rn(key, setting, (char *)data, size);
 	if (setting[0] == '$' && setting[1] == '1')
 		return __md5_crypt_r(key, setting, (char *)data, size);
+	if (setting[0] == '$' && setting[1] == '5')
+		return __sha256_crypt_r(key, setting, (char *)data, size);
+	if (setting[0] == '$' && setting[1] == '6')
+		return __sha512_crypt_r(key, setting, (char *)data, size);
 	if (setting[0] == '$') goto out_einval;
 	if (setting[0] == '_') {
 		if (size < sizeof(struct _crypt_extended_data)) goto out_erange;
@@ -179,6 +188,16 @@
 			return NULL;
 		return __md5_crypt_r(key, setting, (char *)*data, *size);
 	}
+	if (setting[0] == '$' && setting[1] == '5') {
+		if (_crypt_data_alloc(data, size, CRYPT_OUTPUT_SIZE))
+			return NULL;
+		return __sha256_crypt_r(key, setting, (char *)*data, *size);
+	}
+	if (setting[0] == '$' && setting[1] == '6') {
+		if (_crypt_data_alloc(data, size, CRYPT_OUTPUT_SIZE))
+			return NULL;
+		return __sha512_crypt_r(key, setting, (char *)*data, *size);
+	}
 	if (setting[0] == '$') goto out_einval;
 	if (setting[0] == '_') {
 		if (_crypt_data_alloc(data, size,
@@ -270,6 +289,12 @@
 	if (!strncmp(prefix, "$1$", 3))
 		use = _crypt_gensalt_md5_rn;
 	else
+	if (!strncmp(prefix, "$5$", 3))
+		use = _crypt_gensalt_sha256c_rn;
+	else
+	if (!strncmp(prefix, "$6$", 3))
+		use = _crypt_gensalt_sha512c_rn;
+	else
 	if (prefix[0] == '_')
 		use = _crypt_gensalt_extended_rn;
 	else
--- crypt/crypt_gensalt.h.orig	2011-07-16 07:58:39.000000000 -0700
+++ crypt/crypt_gensalt.h	2012-09-29 01:07:58.404471915 -0700
@@ -26,5 +26,9 @@
 	const char *input, int size, char *output, int output_size);
 extern char *_crypt_gensalt_md5_rn(const char *prefix, unsigned long count,
 	const char *input, int size, char *output, int output_size);
+extern char *_crypt_gensalt_sha256c_rn(unsigned long count,
+	const char *input, int size, char *output, int output_size);
+extern char *_crypt_gensalt_sha512c_rn(unsigned long count,
+	const char *input, int size, char *output, int output_size);
 
 #endif
--- crypt/crypt_gensalt.c.orig	2011-07-16 08:06:53.000000000 -0700
+++ crypt/crypt_gensalt.c	2012-09-29 00:50:34.658115466 -0700
@@ -122,3 +122,78 @@
 
 	return output;
 }
+
+char *_crypt_gensalt_sha256c_rn(unsigned long count,
+	const char *input, int size, char *output, int output_size)
+{
+	unsigned long value;
+
+	if (size < 3 || output_size < 3 + 4 + 1 || (count && count != 1000)) {
+		if (output_size > 0) output[0] = '\0';
+		__set_errno((output_size < 3 + 4 + 1) ? ERANGE : EINVAL);
+		return NULL;
+	}
+
+	output[0] = '$';
+	output[1] = '5';
+	output[2] = '$';
+	value = (unsigned long)(unsigned char)input[0] |
+		((unsigned long)(unsigned char)input[1] << 8) |
+		((unsigned long)(unsigned char)input[2] << 16);
+	output[3] = _crypt_itoa64[value & 0x3f];
+	output[4] = _crypt_itoa64[(value >> 6) & 0x3f];
+	output[5] = _crypt_itoa64[(value >> 12) & 0x3f];
+	output[6] = _crypt_itoa64[(value >> 18) & 0x3f];
+	output[7] = '\0';
+
+	if (size >= 6 && output_size >= 3 + 4 + 4 + 1) {
+		value = (unsigned long)(unsigned char)input[3] |
+			((unsigned long)(unsigned char)input[4] << 8) |
+			((unsigned long)(unsigned char)input[5] << 16);
+		output[7] = _crypt_itoa64[value & 0x3f];
+		output[8] = _crypt_itoa64[(value >> 6) & 0x3f];
+		output[9] = _crypt_itoa64[(value >> 12) & 0x3f];
+		output[10] = _crypt_itoa64[(value >> 18) & 0x3f];
+		output[11] = '\0';
+	}
+
+	return output;
+}
+
+
+char *_crypt_gensalt_sha512c_rn(unsigned long count,
+	const char *input, int size, char *output, int output_size)
+{
+	unsigned long value;
+
+	if (size < 3 || output_size < 3 + 4 + 1 || (count && count != 1000)) {
+		if (output_size > 0) output[0] = '\0';
+		__set_errno((output_size < 3 + 4 + 1) ? ERANGE : EINVAL);
+		return NULL;
+	}
+
+	output[0] = '$';
+	output[1] = '6';
+	output[2] = '$';
+	value = (unsigned long)(unsigned char)input[0] |
+		((unsigned long)(unsigned char)input[1] << 8) |
+		((unsigned long)(unsigned char)input[2] << 16);
+	output[3] = _crypt_itoa64[value & 0x3f];
+	output[4] = _crypt_itoa64[(value >> 6) & 0x3f];
+	output[5] = _crypt_itoa64[(value >> 12) & 0x3f];
+	output[6] = _crypt_itoa64[(value >> 18) & 0x3f];
+	output[7] = '\0';
+
+	if (size >= 6 && output_size >= 3 + 4 + 4 + 1) {
+		value = (unsigned long)(unsigned char)input[3] |
+			((unsigned long)(unsigned char)input[4] << 8) |
+			((unsigned long)(unsigned char)input[5] << 16);
+		output[7] = _crypt_itoa64[value & 0x3f];
+		output[8] = _crypt_itoa64[(value >> 6) & 0x3f];
+		output[9] = _crypt_itoa64[(value >> 12) & 0x3f];
+		output[10] = _crypt_itoa64[(value >> 18) & 0x3f];
+		output[11] = '\0';
+	}
+
+	return output;
+}

Actions: View | Diff

Attachments on bug 7793: 2941 | 2942 | 2947