aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2015-02-27 10:27:39 +0100
committerHenrik Nord <[email protected]>2015-02-27 10:27:39 +0100
commit4c3b88d20c62aacbd5dd6b45be4a18c73bed3356 (patch)
treed20c792e600c9da5d17bebb369f955c19d122ca4 /erts
parent18d5c901b1184c4c87ba549c14f96b528cdeb265 (diff)
parenta1fa5b86e2241a6409d3278ebc39dbc6a07fcae4 (diff)
downloadotp-4c3b88d20c62aacbd5dd6b45be4a18c73bed3356.tar.gz
otp-4c3b88d20c62aacbd5dd6b45be4a18c73bed3356.tar.bz2
otp-4c3b88d20c62aacbd5dd6b45be4a18c73bed3356.zip
Merge branch 'kellymclaughlin/crypto-aes-cfb-flexible-key-size/OTP-12467' into maint
* kellymclaughlin/crypto-aes-cfb-flexible-key-size/OTP-12467: Accept all valid key sizes in aes_cfb functions
Diffstat (limited to 'erts')
0 files changed, 0 insertions, 0 deletions