bpo-33164: blake2 fix for HP-UX #13633

ghost · 2019-05-28T17:51:13Z

Backporting fix on blake2 side too.

Fixes from @michael-o mainly.

https://bugs.python.org/issue33164

tiran · 2019-05-28T18:44:42Z

Modules/_blake2/impl/blake2-impl.h

@@ -140,6 +140,9 @@ static inline void secure_zero_memory(void *v, size_t n)
 {
 #if defined(_WIN32) || defined(WIN32)
  SecureZeroMemory(v, n);
+#elif deifned(__hpux)


typo, should be "defined"

good catch ...

Here is my upstream fix: BLAKE2/libb2@37062e5

tiran · 2019-05-28T18:45:29Z

configure.ac

@@ -3527,7 +3527,9 @@ AC_CHECK_FUNCS(alarm accept4 setitimer getitimer bind_textdomain_codeset chown \
 getgrouplist getgroups getlogin getloadavg getpeername getpgid getpid \
 getpriority getresuid getresgid getpwent getpwnam_r getpwuid_r getspnam getspent getsid getwd \
 if_nameindex \
- madvise mkfifoat mknod mknodat mktime mremap nice openat pathconf pause pipe2 plock poll \


What and why did you modify the configure script?

In fact I got the fixes from a HP-UX specialist, if it works without the better.

will remove the changes ...

The change comes actually from the original PR which broke it, 51aa35e#diff-67e997bcfdac55191033d57a16d1408a too much has been removed as opposed to the configure script.

The configure.ac needs to retain:

initgroups kill killpg lchmod lchown lockf linkat lstat lutimes mmap \ memrchr mbrtowc mkdirat mkfifo \

Here is the patch I have sent via email:

# diff -U 1 configure.ac.orig configure.ac --- configure.ac.orig 2019-05-28 14:34:58 +0000 +++ configure.ac 2019-05-28 14:38:23 +0000 @@ -3526,6 +3526,8 @@ getgrouplist getgroups getlogin getloadavg getpeername getpgid getpid \ getpriority getresuid getresgid getpwent getpwnam_r getpwuid_r getspnam getspent getsid getwd \ if_nameindex \ + initgroups kill killpg lchmod lchown lockf linkat lstat lutimes mmap \ + memrchr mbrtowc mkdirat mkfifo \ mkfifoat mknod mknodat mktime mremap nice openat pathconf pause pipe2 plock poll \ posix_fallocate posix_fadvise posix_spawn posix_spawnp pread preadv preadv2 \ pthread_condattr_setclock pthread_init pthread_kill putenv pwrite pwritev pwritev2 \

Please reinstantiate otherwise all of these won't be available at compile time.

@dcarlier-afilias please readd otherwise people are back to the configure error.

I'm sorry about I merged the previous PR. I thought travis checked configure script is really generated from configure.ac.

bedevere-bot · 2019-05-28T18:45:35Z

A Python core developer has requested some changes be made to your pull request before we can consider merging it. If you could please address their requests along with any other requests in other reviews from core developers that would be appreciated.

Once you have made the requested changes, please leave a comment on this pull request containing the phrase I have made the requested changes; please review again. I will then notify any core developers who have left a review that you're ready for them to take another look at this pull request.

michael-o · 2019-05-28T20:03:51Z

Modules/_blake2/impl/blake2-impl.h

@@ -140,6 +140,9 @@ static inline void secure_zero_memory(void *v, size_t n)
 {
 #if defined(_WIN32) || defined(WIN32)
  SecureZeroMemory(v, n);
+#elif defined(__hpux)
+  static void *(*const volatile memset_v)(void *, int, size_t) = &memset;
+  memset_v(v, 0,n);


This one misses a space after the second comma

michael-o · 2019-05-28T20:06:39Z

Modules/_blake2/impl/blake2-impl.h

@@ -140,6 +140,9 @@ static inline void secure_zero_memory(void *v, size_t n)
 {
 #if defined(_WIN32) || defined(WIN32)
  SecureZeroMemory(v, n);
+#elif deifned(__hpux)


Here is my upstream fix: BLAKE2/libb2@37062e5

Backporting fix on blake2 side too.

michael-o · 2019-05-28T20:24:06Z

@dcarlier-afilias looks very good now. Let me double check on the server tomorrow and then you can merge into master! Thank you very much for the quick reaction.

Modules/_blake2/impl/blake2-impl.h

methane · 2019-05-29T09:42:58Z

I will merge this after @michael-o 's check.

michael-o

Compiles for me on top of 0ae022c with my outstanding PR: https://github.com/python/cpython/pulls/michael-o. Would be nice if someone could take a look at them. They are trivial.

tiran · 2019-05-29T11:06:26Z

@methane please revert the merge. The modifications to autoconf script are incorrect.

michael-o · 2019-05-29T11:08:58Z

@tiran, why? It restores the configure.ac before it was broken by the blake2 upgrade + added functions.

methane · 2019-05-29T11:24:15Z

@tiran "minimize patch manually after autoreconf" makes this type of trouble.
I created #13651 which commit all generated files by autoreconf as-is.

tiran · 2019-05-29T11:32:53Z

@michael-o The commit d8b7551 only changes configure.ac. CPython also has the configure script in VCS. Any change to configure.ac must also update configure.

methane · 2019-05-29T11:37:21Z

@tiran Mismatch between configure and configure.ac was introduced by #6286.
https://github.com/python/cpython/pull/6286/files?short_path=2328065#diff-e2d5a00791bce9a01f99bc6fd613a39d

This PR resolves the mismatch. I'm sorry about merging #6286.

methane · 2019-05-30T07:37:09Z

I re-run autoreconf and commit generated files without manual modification, except aclocal.m4 (GH-13651).

the-knights-who-say-ni added the CLA signed label May 28, 2019

bedevere-bot added the awaiting review label May 28, 2019

tiran requested changes May 28, 2019

View reviewed changes

bedevere-bot removed the awaiting review label May 28, 2019

bedevere-bot added the awaiting changes label May 28, 2019

michael-o reviewed May 28, 2019

View reviewed changes

David Carlier added 2 commits May 28, 2019 21:15

bpo-33164: blake2 fix for HP-UX

72fdc15

Backporting fix on blake2 side too.

reinstantiate configure.ac changes

1b91a3b

methane reviewed May 29, 2019

View reviewed changes

Modules/_blake2/impl/blake2-impl.h Show resolved Hide resolved

methane added the skip news label May 29, 2019

reduce diff

8ff8488

michael-o approved these changes May 29, 2019

View reviewed changes

methane merged commit d8b7551 into python:master May 29, 2019

bedevere-bot removed the awaiting changes label May 29, 2019

DinoV pushed a commit to DinoV/cpython that referenced this pull request Jan 14, 2020

bpo-33164: blake2 fix for HP-UX (pythonGH-13633)

12094f2

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

bpo-33164: blake2 fix for HP-UX #13633

bpo-33164: blake2 fix for HP-UX #13633

ghost commented May 28, 2019 •

edited by bedevere-bot

Loading

tiran May 28, 2019

ghost May 28, 2019

michael-o May 28, 2019

tiran May 28, 2019

ghost May 28, 2019

ghost May 28, 2019

michael-o May 28, 2019

michael-o May 28, 2019

michael-o May 28, 2019 •

edited

Loading

methane May 29, 2019

bedevere-bot commented May 28, 2019

michael-o May 28, 2019

michael-o May 28, 2019

michael-o commented May 28, 2019

methane commented May 29, 2019

michael-o left a comment

tiran commented May 29, 2019

michael-o commented May 29, 2019

methane commented May 29, 2019

tiran commented May 29, 2019

methane commented May 29, 2019

methane commented May 30, 2019

bpo-33164: blake2 fix for HP-UX #13633

bpo-33164: blake2 fix for HP-UX #13633

Conversation

ghost commented May 28, 2019 • edited by bedevere-bot Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

michael-o May 28, 2019 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bedevere-bot commented May 28, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

michael-o commented May 28, 2019

methane commented May 29, 2019

michael-o left a comment

Choose a reason for hiding this comment

tiran commented May 29, 2019

michael-o commented May 29, 2019

methane commented May 29, 2019

tiran commented May 29, 2019

methane commented May 29, 2019

methane commented May 30, 2019

ghost commented May 28, 2019 •

edited by bedevere-bot

Loading

michael-o May 28, 2019 •

edited

Loading