Commit 2539ade
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 <[email protected]>
Reviewed-By: Ben Noorhduis <[email protected]>int not ssize_t
1 parent 2ca3373 commit 2539ade
2 files changed
+28
-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 | | |
| |||
4737 | 4738 | | |
4738 | 4739 | | |
4739 | 4740 | | |
4740 | | - | |
| 4741 | + | |
4741 | 4742 | | |
4742 | | - | |
| 4743 | + | |
4743 | 4744 | | |
4744 | | - | |
4745 | | - | |
| 4745 | + | |
| 4746 | + | |
4746 | 4747 | | |
4747 | 4748 | | |
4748 | 4749 | | |
| |||
4771 | 4772 | | |
4772 | 4773 | | |
4773 | 4774 | | |
4774 | | - | |
| 4775 | + | |
4775 | 4776 | | |
4776 | 4777 | | |
4777 | 4778 | | |
4778 | 4779 | | |
4779 | 4780 | | |
4780 | 4781 | | |
4781 | 4782 | | |
4782 | | - | |
| 4783 | + | |
4783 | 4784 | | |
4784 | 4785 | | |
4785 | 4786 | | |
4786 | 4787 | | |
4787 | 4788 | | |
4788 | 4789 | | |
4789 | 4790 | | |
4790 | | - | |
| 4791 | + | |
4791 | 4792 | | |
4792 | 4793 | | |
4793 | 4794 | | |
4794 | 4795 | | |
4795 | 4796 | | |
4796 | 4797 | | |
4797 | 4798 | | |
4798 | | - | |
| 4799 | + | |
4799 | 4800 | | |
4800 | 4801 | | |
4801 | 4802 | | |
| |||
4828 | 4829 | | |
4829 | 4830 | | |
4830 | 4831 | | |
4831 | | - | |
| 4832 | + | |
4832 | 4833 | | |
4833 | | - | |
| 4834 | + | |
4834 | 4835 | | |
4835 | | - | |
| 4836 | + | |
4836 | 4837 | | |
4837 | | - | |
| 4838 | + | |
4838 | 4839 | | |
4839 | 4840 | | |
4840 | 4841 | | |
| |||
4891 | 4892 | | |
4892 | 4893 | | |
4893 | 4894 | | |
4894 | | - | |
4895 | | - | |
4896 | | - | |
4897 | | - | |
| 4895 | + | |
| 4896 | + | |
| 4897 | + | |
| 4898 | + | |
| 4899 | + | |
4898 | 4900 | | |
4899 | 4901 | | |
4900 | 4902 | | |
| |||
4946 | 4948 | | |
4947 | 4949 | | |
4948 | 4950 | | |
4949 | | - | |
4950 | | - | |
| 4951 | + | |
| 4952 | + | |
| 4953 | + | |
4951 | 4954 | | |
4952 | 4955 | | |
4953 | 4956 | | |
4954 | 4957 | | |
| 4958 | + | |
| 4959 | + | |
4955 | 4960 | | |
4956 | 4961 | | |
4957 | 4962 | | |
| |||
4974 | 4979 | | |
4975 | 4980 | | |
4976 | 4981 | | |
4977 | | - | |
| 4982 | + | |
4978 | 4983 | | |
4979 | 4984 | | |
4980 | 4985 | | |
| |||
| 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 | + | |
0 commit comments