aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2016-08-12Added a reference to cmac RFC in the description part of the man pagePetr Gotthard
2016-07-30Fix building crypto/cmac_nif on 64-bit machines.Petr Gotthard
2016-07-30crypto:cmac calculating the Cipher-based Message Authentication CodePetr Gotthard
The ERL-82 issue requests a way to calculate a CMAC in Erlang. The AES128 CMAC is standartized in RFC 4493 and used e.g. for message authentication in the LoRaWAN networks. The CMAC is implemented by OpenSSL since v1.0.1, but as @IngelaAndin stated in response to the ERL-82, the current crypto implementation does not include functions that call those OpenSSL cryptolib functions. This commit introduces a new function `crypto:cmac` that calls the corresponding OpenSSL functions and calculates the CMAC. Only the cmac_nif is implemented. The incremental functions (init, update, final) are not provided because the current OpenSSL does not allow custom memory allocators like `enif_alloc_resource`. The Erlang user guide states that at least OpenSSL 0.9.8 is required, so I added few #ifdefs so the code is compatible with all versions. However, the OpenSSL pages say that the pre-1.0.1 versions (0.9.8 and 1.0.0) are no longer maintained. Even the 1.0.1 will be retired by Dec 2016. Hence I believe that adding a 1.0.1-only function like CMAC should be OK.
2016-07-25Merge branch 'maint'Raimo Niskanen
2016-07-25Merge branch 'maint-18' into maintRaimo Niskanen
Conflicts: OTP_VERSION erts/doc/src/notes.xml erts/vsn.mk lib/common_test/doc/src/notes.xml lib/common_test/vsn.mk lib/ssl/doc/src/notes.xml lib/ssl/src/ssl.appup.src lib/ssl/vsn.mk lib/stdlib/test/ets_SUITE.erl otp_versions.table
2016-07-25Merge branch 'maint'Björn-Egil Dahlberg
2016-07-25Merge branch 'vladdu/use-top-level-readme/ERL-180/PR-1120/OTP-13767' into maintBjörn-Egil Dahlberg
* vladdu/use-top-level-readme/ERL-180/PR-1120/OTP-13767: use top-level README in packaged release
2016-07-23Updated OTP versionOTP-18.3.4.2Erlang/OTP
2016-07-23Prepare releaseErlang/OTP
2016-07-23Merge branch 'raimo/ssl/version-selection/maint-18/OTP-13753' into maint-18Erlang/OTP
* raimo/ssl/version-selection/maint-18/OTP-13753: Improve version selection
2016-07-23Merge branch 'peppe/ct_telnet_duplicated_lines/OTP-13730' into maint-18Erlang/OTP
* peppe/ct_telnet_duplicated_lines/OTP-13730: Fix error with duplicated printouts by ct_telnet:expect/3
2016-07-23Merge branch 'sverker/update_counter-deadlock/ERL-188/OTP-13731' into maint-18Erlang/OTP
* sverker/update_counter-deadlock/ERL-188/OTP-13731: erts: Add test ets_SUITE:update_counter_table_growth erts: Fix deadlock in ets:update_counter/4 erts: Optimize db_finalize_dbterm_hash
2016-07-23Fix error with duplicated printouts by ct_telnet:expect/3Peter Andersson
OTP-13730
2016-07-22Merge branch 'maint'Björn-Egil Dahlberg
2016-07-22Merge branch 'egil/erts/fix-maps-hashing/ERL-199/OTP-13763' into maintBjörn-Egil Dahlberg
* egil/erts/fix-maps-hashing/ERL-199/OTP-13763: erts: Update maps entropy tests erts: Fix internal hashing entropy for maps erts: Fix whitespaces
2016-07-21Merge branch 'maint'Björn-Egil Dahlberg
2016-07-21Merge branch ↵Björn-Egil Dahlberg
'imrivera/kernel/fix-code_server-crash/ERL-194/PR-1128/OTP-13765' into maint * imrivera/kernel/fix-code_server-crash/ERL-194/PR-1128/OTP-13765: Fix code_server crash when adding some code paths ERL-194
2016-07-21erts: Update maps entropy testsBjörn-Egil Dahlberg
2016-07-21erts: Fix internal hashing entropy for mapsBjörn-Egil Dahlberg
We need to use an initial hash seed for each map pair, i.e. the hash value. The hash value is reset to the seed for each pair instead of setting the seed to zero. If we don't, no additional entropy is given to the system and the hash collision resolution in maps:from_list/1 would fail.
2016-07-21erts: Fix whitespacesBjörn-Egil Dahlberg
2016-07-21Improve version selectionRaimo Niskanen
Use the list of versions that the server allows and among those choose the highest version that is not higher than the client's version. Note that this chosen version might be lower than the client's version, but is used to improve interoperability. Patch suggested by Dimitry Borisov refering to RFC 5246 appendix E.1.
2016-07-19Merge branch 'maint'Raimo Niskanen
2016-07-19Merge branch ↵Raimo Niskanen
'raimo/stdlib/gen_statem-types-and-templates/ERL-172_ERL-187/OTP-13746' into maint * raimo/stdlib/gen_statem-types-and-templates/ERL-172_ERL-187/OTP-13746: Fix type and template errors from bugs.erlang.org: ERL-172 and ERL-187
2016-07-18Fix type and template errors from bugs.erlang.org: ERL-172 and ERL-187Raimo Niskanen
2016-07-15Merge branch 'maint'Björn-Egil Dahlberg
Conflicts: OTP_VERSION
2016-07-15Merge branch 'maint-19' into maintBjörn-Egil Dahlberg
2016-07-15Merge branch 'maint'Raimo Niskanen
2016-07-15Merge branch 'falkevik/erts/configure_to_check_in_libsctp_for_sctp_funcs' ↵Raimo Niskanen
into maint * falkevik/erts/configure_to_check_in_libsctp_for_sctp_funcs: Check libsctp for sctp funcs in configure.in
2016-07-15Merge branch 'maint'Raimo Niskanen
2016-07-15Merge branch 'schwartz/system/doc_fix' into maintRaimo Niskanen
* schwartz/system/doc_fix: Fix verb conjugation in statem docs
2016-07-14Merge branch 'maint'Lukas Larsson
2016-07-14Merge branch 'lukas/erts/dirty_msacc_cleanup/OTP-13744' into maintLukas Larsson
* lukas/erts/dirty_msacc_cleanup/OTP-13744: erts: Update msacc docs with dirty scheduler info erts: Cleanup a bunch of un-neccesary #ifndefs erts: Fix some msacc inline directives erts: Add extra bif msacc states erts: Add erts_map_from_ks_and_vs erts: Fix msacc for dirty scheduler and heap_limit
2016-07-14erts: Update msacc docs with dirty scheduler infoLukas Larsson
2016-07-14erts: Cleanup a bunch of un-neccesary #ifndefsLukas Larsson
2016-07-14erts: Fix some msacc inline directivesLukas Larsson
2016-07-14erts: Add extra bif msacc statesLukas Larsson
2016-07-14erts: Add erts_map_from_ks_and_vsLukas Larsson
2016-07-14erts: Fix msacc for dirty scheduler and heap_limitLukas Larsson
2016-07-14Merge branch 'maint'Lukas Larsson
Conflicts: erts/emulator/Makefile.in
2016-07-14Merge branch 'lukas/erts/remove_benchmark_code/OTP-13743' into maintLukas Larsson
* lukas/erts/remove_benchmark_code/OTP-13743: hipe: Remove performance profiling code
2016-07-14hipe: Remove performance profiling codeLukas Larsson
This type of statistics is now available through the microstate accounting API.
2016-07-14Merge branch 'maint'Lukas Larsson
2016-07-14Merge branch 'lukas/erts/tracing/get_seq_tracer_mem_leak/OTP-13742' into maintLukas Larsson
* lukas/erts/tracing/get_seq_tracer_mem_leak/OTP-13742: erts: Make sure to de-allocate the old seq tracer
2016-07-14Merge branch 'maint'Lukas Larsson
2016-07-14Merge branch 'pw/erts/documentation-editorial-changes/OTP-13740' into maintLukas Larsson
* pw/erts/documentation-editorial-changes/OTP-13740: erts: Review of documentation changes erts: Editorial changes erts: Move all functions in docs to be in alphabetical order
2016-07-14Fix code_server crash when adding some code paths ERL-194Ignacio Martínez
2016-07-14Updated OTP versionOTP-19.0.2Erlang/OTP
2016-07-14Prepare releaseErlang/OTP
2016-07-14Merge branch 'egil/compiler/fix-literal-binary-match/ERL-190/OTP-13738' into ↵Erlang/OTP
maint-19 * egil/compiler/fix-literal-binary-match/ERL-190/OTP-13738: Update primary bootstrap Revert "beam_dead: Improve optimization of literal binary matching" compiler: Test literal binary matching
2016-07-14Merge branch 'sverker/update_counter-deadlock/ERL-188/OTP-13731' into maint-19Erlang/OTP
* sverker/update_counter-deadlock/ERL-188/OTP-13731: erts: Add test ets_SUITE:update_counter_table_growth erts: Fix deadlock in ets:update_counter/4 erts: Optimize db_finalize_dbterm_hash