| 1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162 | --- openssh-5.3p1.orig/monitor.c	2009-06-21 10:58:46.000000000 +0200+++ openssh-5.3p1/monitor.c	2009-12-05 12:10:19.000000000 +0100@@ -2042,8 +2042,8 @@ mm_answer_jpake_step1(int sock, Buffer * 	debug3("%s: sending step1", __func__); 	mm_request_send(sock, MONITOR_ANS_JPAKE_STEP1, m); -	bzero(x3_proof, x3_proof_len);-	bzero(x4_proof, x4_proof_len);+	memset(x3_proof, 0, x3_proof_len);+	memset(x4_proof, 0, x4_proof_len); 	xfree(x3_proof); 	xfree(x4_proof); @@ -2072,8 +2072,8 @@ mm_answer_jpake_get_pwdata(int sock, Buf 	debug3("%s: sending pwdata", __func__); 	mm_request_send(sock, MONITOR_ANS_JPAKE_GET_PWDATA, m); -	bzero(hash_scheme, strlen(hash_scheme));-	bzero(salt, strlen(salt));+	memset(hash_scheme, 0, strlen(hash_scheme));+	memset(salt, 0, strlen(salt)); 	xfree(hash_scheme); 	xfree(salt); @@ -2112,8 +2112,8 @@ mm_answer_jpake_step2(int sock, Buffer *  	JPAKE_DEBUG_CTX((pctx, "step2 done in %s", __func__)); -	bzero(x1_proof, x1_proof_len);-	bzero(x2_proof, x2_proof_len);+	memset(x1_proof, 0, x1_proof_len);+	memset(x2_proof, 0, x2_proof_len); 	xfree(x1_proof); 	xfree(x2_proof); @@ -2125,7 +2125,7 @@ mm_answer_jpake_step2(int sock, Buffer * 	debug3("%s: sending step2", __func__); 	mm_request_send(sock, MONITOR_ANS_JPAKE_STEP2, m); -	bzero(x4_s_proof, x4_s_proof_len);+	memset(x4_s_proof, 0, x4_s_proof_len); 	xfree(x4_s_proof);  	monitor_permit(mon_dispatch, MONITOR_REQ_JPAKE_KEY_CONFIRM, 1);@@ -2159,7 +2159,7 @@ mm_answer_jpake_key_confirm(int sock, Bu  	JPAKE_DEBUG_CTX((pctx, "key_confirm done in %s", __func__)); -	bzero(x2_s_proof, x2_s_proof_len);+	memset(x2_s_proof, 0, x2_s_proof_len); 	buffer_clear(m);  	/* pctx->k is sensitive, not sent */@@ -2193,7 +2193,7 @@ mm_answer_jpake_check_confirm(int sock,   	JPAKE_DEBUG_CTX((pctx, "check_confirm done in %s", __func__)); -	bzero(peer_confirm_hash, peer_confirm_hash_len);+	memset(peer_confirm_hash, 0, peer_confirm_hash_len); 	xfree(peer_confirm_hash);  	buffer_clear(m);
 |