1
0

patch-monitor_c 2.0 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162
  1. --- openssh-5.3p1.orig/monitor.c 2009-06-21 10:58:46.000000000 +0200
  2. +++ openssh-5.3p1/monitor.c 2009-12-05 12:10:19.000000000 +0100
  3. @@ -2042,8 +2042,8 @@ mm_answer_jpake_step1(int sock, Buffer *
  4. debug3("%s: sending step1", __func__);
  5. mm_request_send(sock, MONITOR_ANS_JPAKE_STEP1, m);
  6. - bzero(x3_proof, x3_proof_len);
  7. - bzero(x4_proof, x4_proof_len);
  8. + memset(x3_proof, 0, x3_proof_len);
  9. + memset(x4_proof, 0, x4_proof_len);
  10. xfree(x3_proof);
  11. xfree(x4_proof);
  12. @@ -2072,8 +2072,8 @@ mm_answer_jpake_get_pwdata(int sock, Buf
  13. debug3("%s: sending pwdata", __func__);
  14. mm_request_send(sock, MONITOR_ANS_JPAKE_GET_PWDATA, m);
  15. - bzero(hash_scheme, strlen(hash_scheme));
  16. - bzero(salt, strlen(salt));
  17. + memset(hash_scheme, 0, strlen(hash_scheme));
  18. + memset(salt, 0, strlen(salt));
  19. xfree(hash_scheme);
  20. xfree(salt);
  21. @@ -2112,8 +2112,8 @@ mm_answer_jpake_step2(int sock, Buffer *
  22. JPAKE_DEBUG_CTX((pctx, "step2 done in %s", __func__));
  23. - bzero(x1_proof, x1_proof_len);
  24. - bzero(x2_proof, x2_proof_len);
  25. + memset(x1_proof, 0, x1_proof_len);
  26. + memset(x2_proof, 0, x2_proof_len);
  27. xfree(x1_proof);
  28. xfree(x2_proof);
  29. @@ -2125,7 +2125,7 @@ mm_answer_jpake_step2(int sock, Buffer *
  30. debug3("%s: sending step2", __func__);
  31. mm_request_send(sock, MONITOR_ANS_JPAKE_STEP2, m);
  32. - bzero(x4_s_proof, x4_s_proof_len);
  33. + memset(x4_s_proof, 0, x4_s_proof_len);
  34. xfree(x4_s_proof);
  35. monitor_permit(mon_dispatch, MONITOR_REQ_JPAKE_KEY_CONFIRM, 1);
  36. @@ -2159,7 +2159,7 @@ mm_answer_jpake_key_confirm(int sock, Bu
  37. JPAKE_DEBUG_CTX((pctx, "key_confirm done in %s", __func__));
  38. - bzero(x2_s_proof, x2_s_proof_len);
  39. + memset(x2_s_proof, 0, x2_s_proof_len);
  40. buffer_clear(m);
  41. /* pctx->k is sensitive, not sent */
  42. @@ -2193,7 +2193,7 @@ mm_answer_jpake_check_confirm(int sock,
  43. JPAKE_DEBUG_CTX((pctx, "check_confirm done in %s", __func__));
  44. - bzero(peer_confirm_hash, peer_confirm_hash_len);
  45. + memset(peer_confirm_hash, 0, peer_confirm_hash_len);
  46. xfree(peer_confirm_hash);
  47. buffer_clear(m);