Skip to content

Support OTP >=24 #253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 25 commits into
base: master
Choose a base branch
from
Open

Support OTP >=24 #253

Show file tree
Hide file tree
Changes from 24 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
bb76baf
Update rebar.config
shuieryin Jun 1, 2017
39309a6
updated return type
shuieryin Jun 2, 2017
0b86209
fix return type issue
shuieryin Jun 2, 2017
0e04818
fix return type issue
shuieryin Jun 2, 2017
9c47fdb
updated plugin
shuieryin Jun 2, 2017
32ffc9d
remove plugin
shuieryin Jun 2, 2017
2e5457b
remove plugin
shuieryin Jun 2, 2017
26123b4
revert plugin
shuieryin Jun 2, 2017
a46cf67
revert plugin
shuieryin Jun 2, 2017
4c05576
remove plugin
shuieryin Jun 2, 2017
8f9f1cd
fix return type
shuieryin Jun 2, 2017
430b56e
remove plugin
shuieryin Jun 2, 2017
b3523c0
fix return type
shuieryin Jun 2, 2017
53d5f1b
fix return type
shuieryin Jun 2, 2017
308a2dc
fix return type
shuieryin Jun 2, 2017
f8ccbf6
revert plugin
shuieryin Jun 2, 2017
ac6052c
remove plugin
shuieryin Jun 2, 2017
d012e2b
fix insert return type
shuieryin Jun 2, 2017
0a15ab3
remove plugin
shuieryin Jun 2, 2017
ca47e96
Create rebar.config
shuieryin Jun 9, 2017
224b054
pull updates from source
shuieryin Sep 25, 2018
e18b6d1
Merge branch 'master' of https://github.com/comtihon/mongodb-erlang
shuieryin Oct 23, 2018
d985603
Merge branch 'master' into fork
Aug 25, 2022
7e760cd
compatible with otp 25
Aug 25, 2022
5815081
call pbkdf2:pbkdf2 for OTP < 24
Sep 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions rebar.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
{deps, [
{bson, ".*",
{git, "https://github.com/comtihon/bson-erlang.git", {tag, "v0.2.4"}}},
{pbkdf2, ".*",
{git, "https://github.com/comtihon/erlang-pbkdf2.git", {tag, "2.0.1"}}},
{poolboy, ".*",
{git, "https://github.com/comtihon/poolboy.git", {branch, "1.6.1"}}}
]}.
Expand Down
3 changes: 1 addition & 2 deletions src/connection/mc_auth_logic.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,7 @@ generate_sig(SaltedPassword, AuthMessage) ->

%% @private
hi(Password, Salt, Iterations) ->
{ok, Key} = pbkdf2:pbkdf2(sha, Password, Salt, Iterations, 20),
Key.
crypto:pbkdf2_hmac(sha, Password, Salt, Iterations, 20).
Copy link
Contributor

@dmsnell dmsnell Sep 10, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We probably want to follow the pattern in #232 to avoid breaking the library on older releases of OTP. That is, crypto:pbkdf2_hmac is new in OTP 24 and missing from older versions, so if we run this patch on OTP 23 we'll crash for the same reason this fix exists.

Checking for OTP version

mongodb-erlang/src/support/mc_utils.erl

Lines 14 to 19 in 5881a8b

-define(OLD_CRYPTO_API, true).
-ifdef(OTP_RELEASE).
-if(?OTP_RELEASE >= 23).
-undef(OLD_CRYPTO_API).
-endif.
-endif.

Conditionally using newer functions

mongodb-erlang/src/support/mc_utils.erl

Lines 75 to 79 in 5881a8b

-ifdef(OLD_CRYPTO_API).
hmac(One, Two) -> crypto:hmac(sha, One, Two).
-else.
hmac(One, Two) -> crypto:mac(hmac, sha, One, Two).
-endif.

Copy link
Author

@shuieryin shuieryin Sep 11, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

updated, didn't know crypto in OTP < 24 doesn't have pbkdf2_hmac, thanks for the info

Copy link
Contributor

@dmsnell dmsnell Sep 11, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My read on the docs is that it came in with OTP 24.2, with crypto 5.0.5

Come to think of it, do we need to check for 24.2 even? I guess OTP 24.0 and OTP 24.1 won't have it either. I'm not sure off-hand how to check for the minor version and I hope we can do it in the macro so this doesn't have to be a runtime check.

Copy link
Author

@shuieryin shuieryin Sep 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I couldn't find a predefined macro returns the minor/patch version

Copy link
Author

@shuieryin shuieryin Sep 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I couldn't find a predefined macro returns the minor/patch version


%% @private
xorKeys(<<>>, _, Res) -> Res;
Expand Down
2 changes: 1 addition & 1 deletion src/mongodb.app.src
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
{description, "Client interface to MongoDB, also known as the driver. See www.mongodb.org"},
{vsn, "3.4.6"},
{registered, []},
{applications, [kernel, stdlib, bson, crypto, poolboy, pbkdf2]},
{applications, [kernel, stdlib, bson, crypto, poolboy]},
{mod, {mongo_app, []}}
]}.