Skip to content
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

bpo-33164: Blake2 dependency update #6286

Merged
merged 7 commits into from May 23, 2019
Merged

bpo-33164: Blake2 dependency update #6286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7fe54f5
Blake2 dependency update
Mar 28, 2018
6e78f50
update news
Mar 30, 2018
bf3f9d9
Last blake2 version
Aug 16, 2018
5afc289
Add missing preprocessor directives, regenerating configure too
Jun 6, 2018
654e54c
rebase
Aug 16, 2018
bb61212
Fix Mac Build
May 18, 2019
0f99a55
Simpler solution, just ignoring memset_s as every OS has its own solu…
May 22, 2019
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
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Security/2018-03-30-12-26-47.bpo-33164.aO29Cx.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Updated blake2 implementation which uses secure memset implementation provided by platform.
23 changes: 10 additions & 13 deletions Modules/_blake2/impl/blake2-config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,20 @@
/*
BLAKE2 reference source code package - optimized C implementations

Copyright 2012, Samuel Neves <sneves@dei.uc.pt>. You may use this under the
terms of the CC0, the OpenSSL Licence, or the Apache Public License 2.0, at
your option. The terms of these licenses can be found at:
Written in 2012 by Samuel Neves <sneves@dei.uc.pt>

- CC0 1.0 Universal : http://creativecommons.org/publicdomain/zero/1.0
- OpenSSL license : https://www.openssl.org/source/license.html
- Apache 2.0 : http://www.apache.org/licenses/LICENSE-2.0
To the extent possible under law, the author(s) have dedicated all copyright
and related and neighboring rights to this software to the public domain
worldwide. This software is distributed without any warranty.

More information about the BLAKE2 hash function can be found at
https://blake2.net.
You should have received a copy of the CC0 Public Domain Dedication along with
this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
*/
#pragma once
#ifndef __BLAKE2_CONFIG_H__
#define __BLAKE2_CONFIG_H__

/* These don't work everywhere */
#if defined(__SSE2__) || defined(__x86_64__) || defined(__amd64__)
#if defined(__SSE2__)
#define HAVE_SSE2
#endif

Expand All @@ -26,7 +23,7 @@
#endif

#if defined(__SSE4_1__)
#define HAVE_SSE41
#define HAVE_SSE4_1
#endif

#if defined(__AVX__)
Expand All @@ -51,8 +48,8 @@
#endif

#ifdef HAVE_AVX
#ifndef HAVE_SSE41
#define HAVE_SSE41
#ifndef HAVE_SSE4_1
#define HAVE_SSE4_1
#endif
#endif

Expand Down
Loading