aboutsummaryrefslogtreecommitdiffstats
path: root/erts/Makefile
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2019-02-28 12:33:53 +0100
committerHans Nilsson <[email protected]>2019-02-28 12:33:53 +0100
commitcc12aeb0ce4a9444aba199f6d145ef525de268a9 (patch)
treedac6a8b3a4c4e8b912eaaed7235fe0546074f5d8 /erts/Makefile
parent5645812561e52c8f21821077bd58c22c1dd609f1 (diff)
parentbef4f555454b0b035bbfc71fe296af8c2d5fe0b3 (diff)
downloadotp-cc12aeb0ce4a9444aba199f6d145ef525de268a9.tar.gz
otp-cc12aeb0ce4a9444aba199f6d145ef525de268a9.tar.bz2
otp-cc12aeb0ce4a9444aba199f6d145ef525de268a9.zip
Merge branch 'maint'
* maint: crypto: Fix bad return value for aes_cfb8 and aes_cfb128 if FIPS_SUPPORT crypto: Fix bad return code for eddsa if FIPS_SUPPORT
Diffstat (limited to 'erts/Makefile')
0 files changed, 0 insertions, 0 deletions