From e57dd4bc9ed33bb9706c3499922434c364e48ddb Mon Sep 17 00:00:00 2001 From: Marian Beermann Date: Sat, 29 Jul 2017 12:28:33 +0200 Subject: [PATCH] crypto: avoid bad prototype codegen from cython (-Wstrict-prototypes, Cyton forgets a "void") --- src/borg/crypto/low_level.pyx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/borg/crypto/low_level.pyx b/src/borg/crypto/low_level.pyx index b0acaadca..82d874071 100644 --- a/src/borg/crypto/low_level.pyx +++ b/src/borg/crypto/low_level.pyx @@ -222,8 +222,8 @@ cdef class AES256_CTR_BASE: cdef unsigned char iv[16] cdef long long blocks - @staticmethod - def requirements_check(): + @classmethod + def requirements_check(cls): if OPENSSL_VERSION_NUMBER < 0x10000000: raise ValueError('AES CTR requires OpenSSL >= 1.0.0. Detected: OpenSSL %08x' % OPENSSL_VERSION_NUMBER) @@ -480,8 +480,8 @@ cdef class _AEAD_BASE: cdef unsigned char iv[12] cdef long long blocks - @staticmethod - def requirements_check(): + @classmethod + def requirements_check(cls): """check whether library requirements for this ciphersuite are satisfied""" raise NotImplemented # override / implement in child class @@ -671,8 +671,8 @@ cdef class _CHACHA_BASE(_AEAD_BASE): cdef class AES256_OCB(_AES_BASE): - @staticmethod - def requirements_check(): + @classmethod + def requirements_check(cls): if OPENSSL_VERSION_NUMBER < 0x10100000: raise ValueError('AES OCB requires OpenSSL >= 1.1.0. Detected: OpenSSL %08x' % OPENSSL_VERSION_NUMBER) @@ -683,8 +683,8 @@ cdef class AES256_OCB(_AES_BASE): cdef class CHACHA20_POLY1305(_CHACHA_BASE): - @staticmethod - def requirements_check(): + @classmethod + def requirements_check(cls): if OPENSSL_VERSION_NUMBER < 0x10100000: raise ValueError('CHACHA20-POLY1305 requires OpenSSL >= 1.1.0. Detected: OpenSSL %08x' % OPENSSL_VERSION_NUMBER)