logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git
commit: 0397356c5cd05aec2d9eced54c62c31e4af5c840
parent d988d58d98a2f08684b2c428a6583530634d96b8
Author: Michael Forney <mforney@mforney.org>
Date:   Tue,  5 Oct 2021 18:47:49 -0700

python: Fix SHAKE.get_name() in _hashbearssl

Diffstat:

Mpkg/python/patch/0001-Add-BearSSL-implementation-of-_hashlib.patch12+++++++-----
Mpkg/python/ver2+-
2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkg/python/patch/0001-Add-BearSSL-implementation-of-_hashlib.patch b/pkg/python/patch/0001-Add-BearSSL-implementation-of-_hashlib.patch @@ -1,21 +1,21 @@ -From a21116a6e36fd6d2f7c815cc0ebf92fffe0e72c6 Mon Sep 17 00:00:00 2001 +From 61ad7f5ec78d4c80a99ac71820d9bc8b62c3fbae Mon Sep 17 00:00:00 2001 From: Michael Forney <mforney@mforney.org> Date: Sat, 15 May 2021 22:48:13 -0700 Subject: [PATCH] Add BearSSL implementation of _hashlib --- - Modules/_hashbearssl.c | 1124 +++++++++++++++++++++++++++++++ + Modules/_hashbearssl.c | 1126 +++++++++++++++++++++++++++++++ Modules/clinic/_hashbearssl.c.h | 1113 ++++++++++++++++++++++++++++++ - 2 files changed, 2237 insertions(+) + 2 files changed, 2239 insertions(+) create mode 100644 Modules/_hashbearssl.c create mode 100644 Modules/clinic/_hashbearssl.c.h diff --git a/Modules/_hashbearssl.c b/Modules/_hashbearssl.c new file mode 100644 -index 0000000000..3d51d99efb +index 0000000000..2d1a76296d --- /dev/null +++ b/Modules/_hashbearssl.c -@@ -0,0 +1,1124 @@ +@@ -0,0 +1,1126 @@ +/* Module that wraps all BearSSL hash algorithms */ +#define PY_SSIZE_T_CLEAN +#include "Python.h" @@ -387,6 +387,7 @@ index 0000000000..3d51d99efb + newobj->lock = NULL; + ENTER_HASHLIB(self) + newobj->ctx = self->ctx; ++ newobj->bits = self->bits; + LEAVE_HASHLIB(self) + + return (PyObject *)newobj; @@ -658,6 +659,7 @@ index 0000000000..3d51d99efb + if (!self) + return NULL; + self->lock = NULL; ++ self->bits = bits; + br_shake_init(&self->ctx, bits); + + if (string->len >= HASHLIB_GIL_MINSIZE) { diff --git a/pkg/python/ver b/pkg/python/ver @@ -1 +1 @@ -3.10.0 r0 +3.10.0 r1