Commit da3f425
committed
crypto: PBKDF2 works with
Change types of all PBKDF2 params to `int` as they are `int` in `evp.h`.
Check that `raw_keylen` fits into `int` before passing it to OpenSSL.
Fix: #5396
PR-URL: #5397
Reviewed-By: Shigeki Ohtsu <ohtsu@iij.ad.jp>
Reviewed-By: Ben Noorhduis <info@bnoordhuis.nl>int not ssize_t
1 parent 610bd8d commit da3f425
2 files changed
+33
-31
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
| 22 | + | |
22 | 23 | | |
23 | 24 | | |
24 | 25 | | |
| |||
4955 | 4956 | | |
4956 | 4957 | | |
4957 | 4958 | | |
4958 | | - | |
| 4959 | + | |
4959 | 4960 | | |
4960 | | - | |
| 4961 | + | |
4961 | 4962 | | |
4962 | | - | |
4963 | | - | |
| 4963 | + | |
| 4964 | + | |
4964 | 4965 | | |
4965 | 4966 | | |
4966 | 4967 | | |
| |||
4989 | 4990 | | |
4990 | 4991 | | |
4991 | 4992 | | |
4992 | | - | |
| 4993 | + | |
4993 | 4994 | | |
4994 | 4995 | | |
4995 | 4996 | | |
4996 | 4997 | | |
4997 | 4998 | | |
4998 | 4999 | | |
4999 | 5000 | | |
5000 | | - | |
| 5001 | + | |
5001 | 5002 | | |
5002 | 5003 | | |
5003 | 5004 | | |
5004 | 5005 | | |
5005 | 5006 | | |
5006 | 5007 | | |
5007 | 5008 | | |
5008 | | - | |
| 5009 | + | |
5009 | 5010 | | |
5010 | 5011 | | |
5011 | 5012 | | |
5012 | 5013 | | |
5013 | 5014 | | |
5014 | 5015 | | |
5015 | 5016 | | |
5016 | | - | |
| 5017 | + | |
5017 | 5018 | | |
5018 | 5019 | | |
5019 | 5020 | | |
| |||
5046 | 5047 | | |
5047 | 5048 | | |
5048 | 5049 | | |
5049 | | - | |
| 5050 | + | |
5050 | 5051 | | |
5051 | | - | |
| 5052 | + | |
5052 | 5053 | | |
5053 | | - | |
| 5054 | + | |
5054 | 5055 | | |
5055 | | - | |
| 5056 | + | |
5056 | 5057 | | |
5057 | 5058 | | |
5058 | 5059 | | |
| |||
5109 | 5110 | | |
5110 | 5111 | | |
5111 | 5112 | | |
5112 | | - | |
5113 | | - | |
5114 | | - | |
5115 | | - | |
| 5113 | + | |
| 5114 | + | |
| 5115 | + | |
| 5116 | + | |
| 5117 | + | |
5116 | 5118 | | |
5117 | 5119 | | |
5118 | 5120 | | |
| |||
5164 | 5166 | | |
5165 | 5167 | | |
5166 | 5168 | | |
5167 | | - | |
5168 | | - | |
| 5169 | + | |
| 5170 | + | |
| 5171 | + | |
5169 | 5172 | | |
5170 | 5173 | | |
5171 | 5174 | | |
5172 | 5175 | | |
| 5176 | + | |
| 5177 | + | |
5173 | 5178 | | |
5174 | 5179 | | |
5175 | 5180 | | |
| |||
5192 | 5197 | | |
5193 | 5198 | | |
5194 | 5199 | | |
5195 | | - | |
| 5200 | + | |
5196 | 5201 | | |
5197 | 5202 | | |
5198 | 5203 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
63 | 63 | | |
64 | 64 | | |
65 | 65 | | |
66 | | - | |
67 | | - | |
68 | | - | |
| 66 | + | |
69 | 67 | | |
70 | 68 | | |
71 | 69 | | |
72 | 70 | | |
73 | | - | |
74 | | - | |
75 | | - | |
| 71 | + | |
76 | 72 | | |
77 | 73 | | |
78 | 74 | | |
79 | 75 | | |
80 | | - | |
81 | | - | |
82 | | - | |
| 76 | + | |
83 | 77 | | |
84 | 78 | | |
85 | 79 | | |
86 | 80 | | |
87 | | - | |
88 | | - | |
89 | | - | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
0 commit comments