Home Explore Help
Sign In
oss
/
openadk
4
1
Fork 3
Files Issues 1 Pull Requests 0 Wiki
Tree: 65b27b644c
Branches Tags
openadk
/
package
/
openssh
/
patches
/
patch-monitor_c

patch-monitor_c 2.0 KB
History Raw

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162 
  1. --- openssh-5.3p1.orig/monitor.c	2009-06-21 10:58:46.000000000 +0200
    2. 

  2. +++ openssh-5.3p1/monitor.c	2009-12-05 12:10:19.000000000 +0100
    3. 

  3. @@ -2042,8 +2042,8 @@ mm_answer_jpake_step1(int sock, Buffer *
    4. 

  4.  	debug3("%s: sending step1", __func__);
    5. 

  5.  	mm_request_send(sock, MONITOR_ANS_JPAKE_STEP1, m);
    6. 

  6.  
    7. 

  7. -	bzero(x3_proof, x3_proof_len);
    8. 

  8. -	bzero(x4_proof, x4_proof_len);
    9. 

  9. +	memset(x3_proof, 0, x3_proof_len);
    10. 

  10. +	memset(x4_proof, 0, x4_proof_len);
    11. 

  11.  	xfree(x3_proof);
    12. 

  12.  	xfree(x4_proof);
    13. 

  13.  
    14. 

  14. @@ -2072,8 +2072,8 @@ mm_answer_jpake_get_pwdata(int sock, Buf
    15. 

  15.  	debug3("%s: sending pwdata", __func__);
    16. 

  16.  	mm_request_send(sock, MONITOR_ANS_JPAKE_GET_PWDATA, m);
    17. 

  17.  
    18. 

  18. -	bzero(hash_scheme, strlen(hash_scheme));
    19. 

  19. -	bzero(salt, strlen(salt));
    20. 

  20. +	memset(hash_scheme, 0, strlen(hash_scheme));
    21. 

  21. +	memset(salt, 0, strlen(salt));
    22. 

  22.  	xfree(hash_scheme);
    23. 

  23.  	xfree(salt);
    24. 

  24.  
    25. 

  25. @@ -2112,8 +2112,8 @@ mm_answer_jpake_step2(int sock, Buffer *
    26. 

  26.  
    27. 

  27.  	JPAKE_DEBUG_CTX((pctx, "step2 done in %s", __func__));
    28. 

  28.  
    29. 

  29. -	bzero(x1_proof, x1_proof_len);
    30. 

  30. -	bzero(x2_proof, x2_proof_len);
    31. 

  31. +	memset(x1_proof, 0, x1_proof_len);
    32. 

  32. +	memset(x2_proof, 0, x2_proof_len);
    33. 

  33.  	xfree(x1_proof);
    34. 

  34.  	xfree(x2_proof);
    35. 

  35.  
    36. 

  36. @@ -2125,7 +2125,7 @@ mm_answer_jpake_step2(int sock, Buffer *
    37. 

  37.  	debug3("%s: sending step2", __func__);
    38. 

  38.  	mm_request_send(sock, MONITOR_ANS_JPAKE_STEP2, m);
    39. 

  39.  
    40. 

  40. -	bzero(x4_s_proof, x4_s_proof_len);
    41. 

  41. +	memset(x4_s_proof, 0, x4_s_proof_len);
    42. 

  42.  	xfree(x4_s_proof);
    43. 

  43.  
    44. 

  44.  	monitor_permit(mon_dispatch, MONITOR_REQ_JPAKE_KEY_CONFIRM, 1);
    45. 

  45. @@ -2159,7 +2159,7 @@ mm_answer_jpake_key_confirm(int sock, Bu
    46. 

  46.  
    47. 

  47.  	JPAKE_DEBUG_CTX((pctx, "key_confirm done in %s", __func__));
    48. 

  48.  
    49. 

  49. -	bzero(x2_s_proof, x2_s_proof_len);
    50. 

  50. +	memset(x2_s_proof, 0, x2_s_proof_len);
    51. 

  51.  	buffer_clear(m);
    52. 

  52.  
    53. 

  53.  	/* pctx->k is sensitive, not sent */
    54. 

  54. @@ -2193,7 +2193,7 @@ mm_answer_jpake_check_confirm(int sock, 
    55. 

  55.  
    56. 

  56.  	JPAKE_DEBUG_CTX((pctx, "check_confirm done in %s", __func__));
    57. 

  57.  
    58. 

  58. -	bzero(peer_confirm_hash, peer_confirm_hash_len);
    59. 

  59. +	memset(peer_confirm_hash, 0, peer_confirm_hash_len);
    60. 

  60.  	xfree(peer_confirm_hash);
    61. 

  61.  
    62. 

  62.  	buffer_clear(m);
    63.