comparison src/protocols/yahoo/crypt.c @ 10687:b256ce6b85b8

[gaim-migrate @ 12235] grim says this is really fixed this time. committer: Tailor Script <[e-mail]>

10686:212946f774c0

	int needed = 3 + strlen (salt) + 1 + 26 + 1;

	size_t salt_len;
	size_t key_len;
	size_t cnt;
	char *cp;

	if (buflen < needed) {
		buflen = needed;
		if ((buffer = g_realloc(buffer, buflen)) == NULL)

	/* Add key again.  */
	gaim_cipher_context_append(context2, key, key_len);

	/* Now get result of this (16 bytes) and add it to the other context.  */
	gaim_cipher_context_digest(context2, NULL, digest);

	/* Add for any character in the key one byte of the alternate sum.  */
	for (cnt = key_len; cnt > 16; cnt -= 16)
		gaim_cipher_context_append(context1, digest, 16);
	gaim_cipher_context_append(context1, digest, cnt);

	for (cnt = key_len; cnt > 0; cnt >>= 1)
		gaim_cipher_context_append(context1,
								   (cnt & 1) != 0 ? digest : (guint8 *)key, 1);

	/* Create intermediate result.  */
	gaim_cipher_context_digest(context1, NULL, digest);

	/* Now comes another weirdness.  In fear of password crackers here
	 * comes a quite long loop which just processes the output of the
	 * previous round again.  We cannot ignore this here.
	 */

			gaim_cipher_context_append(context2, digest, 16);
		else
			gaim_cipher_context_append(context2, key, key_len);

		/* Create intermediate result.  */
		gaim_cipher_context_digest(context2, NULL, digest);
	}

	/* Now we can construct the result string.  It consists of three parts. */
	strncpy(buffer, md5_salt_prefix, MAX (0, buflen));
	cp = buffer + strlen(buffer);

	 * attaching to processes or reading core dumps cannot get any
	 * information.  We do it in this way to clear correct_words[]
	 * inside the MD5 implementation as well.
	 */
	gaim_cipher_context_reset(context1, NULL);
	gaim_cipher_context_digest(context1, NULL, digest);
	gaim_cipher_context_destroy(context1);
	gaim_cipher_context_destroy(context2);

	return buffer;
}

10687:b256ce6b85b8

	int needed = 3 + strlen (salt) + 1 + 26 + 1;

	size_t salt_len;
	size_t key_len;
	size_t cnt;

	char *cp;

	if (buflen < needed) {
		buflen = needed;
		if ((buffer = g_realloc(buffer, buflen)) == NULL)

	/* Add key again.  */
	gaim_cipher_context_append(context2, key, key_len);

	/* Now get result of this (16 bytes) and add it to the other context.  */
	gaim_cipher_context_digest(context2, sizeof(digest), digest, NULL);

	/* Add for any character in the key one byte of the alternate sum.  */
	for (cnt = key_len; cnt > 16; cnt -= 16)
		gaim_cipher_context_append(context1, digest, 16);
	gaim_cipher_context_append(context1, digest, cnt);

	for (cnt = key_len; cnt > 0; cnt >>= 1)
		gaim_cipher_context_append(context1,
								   (cnt & 1) != 0 ? digest : (guint8 *)key, 1);

	/* Create intermediate result.  */
	gaim_cipher_context_digest(context1, sizeof(digest), digest, NULL);

	/* Now comes another weirdness.  In fear of password crackers here
	 * comes a quite long loop which just processes the output of the
	 * previous round again.  We cannot ignore this here.
	 */

			gaim_cipher_context_append(context2, digest, 16);
		else
			gaim_cipher_context_append(context2, key, key_len);

		/* Create intermediate result.  */
		gaim_cipher_context_digest(context2, sizeof(digest), digest, NULL);
	}

	/* Now we can construct the result string.  It consists of three parts. */
	strncpy(buffer, md5_salt_prefix, MAX (0, buflen));
	cp = buffer + strlen(buffer);

	 * attaching to processes or reading core dumps cannot get any
	 * information.  We do it in this way to clear correct_words[]
	 * inside the MD5 implementation as well.
	 */
	gaim_cipher_context_reset(context1, NULL);
	gaim_cipher_context_digest(context1, sizeof(digest), digest, NULL);
	gaim_cipher_context_destroy(context1);
	gaim_cipher_context_destroy(context2);

	return buffer;
}