D11071.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D11071.diff
View Options

	Index: head/usr.sbin/bhyve/rfb.c
	===================================================================
	--- head/usr.sbin/bhyve/rfb.c
	+++ head/usr.sbin/bhyve/rfb.c
	@@ -832,12 +832,14 @@
	memcpy(crypt_expected, challenge, AUTH_LENGTH);

	/* Encrypt the Challenge with DES */
	- DES_set_key((C_Block *)keystr, &ks);
	- DES_ecb_encrypt((C_Block *)challenge,
	- (C_Block *)crypt_expected, &ks, DES_ENCRYPT);
	- DES_ecb_encrypt((C_Block *)(challenge + PASSWD_LENGTH),
	- (C_Block *)(crypt_expected + PASSWD_LENGTH),
	+ DES_set_key((const_DES_cblock *)keystr, &ks);
	+ DES_ecb_encrypt((const_DES_cblock *)challenge,
	+ (const_DES_cblock *)crypt_expected,
	&ks, DES_ENCRYPT);
	+ DES_ecb_encrypt((const_DES_cblock *)(challenge + PASSWD_LENGTH),
	+ (const_DES_cblock *)(crypt_expected +
	+ PASSWD_LENGTH),
	+ &ks, DES_ENCRYPT);

	if (memcmp(crypt_expected, buf, AUTH_LENGTH) != 0) {
	message = "Auth Failed: Invalid Password.";
	@@ -858,7 +860,7 @@
	if (sres) {
	((uint32_t ) buf) = htonl(strlen(message));
	stream_write(cfd, buf, 4);
	- stream_write(cfd, message, strlen(message));
	+ stream_write(cfd, message, strlen(message));
	goto done;
	}