Accepting request 1075196 from home:msmeissn:branches:devel:libraries:c_c++

- liboqs-fix-prototypemismatch.patch: fixed uint8_t* vs unsigned char* mismatch
- disable -Werror for now.

OBS-URL: https://build.opensuse.org/request/show/1075196
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/liboqs?expand=0&rev=9
This commit is contained in:
Marcus Meissner 2023-03-29 10:56:36 +00:00 committed by Git OBS Bridge
parent ad592432dc
commit 5a8ee88768
3 changed files with 45 additions and 1 deletions

View File

@ -0,0 +1,37 @@
Index: liboqs-0.7.1/src/kem/frodokem/kem_frodokem.h
===================================================================
--- liboqs-0.7.1.orig/src/kem/frodokem/kem_frodokem.h
+++ liboqs-0.7.1/src/kem/frodokem/kem_frodokem.h
@@ -11,9 +11,9 @@
#define OQS_KEM_frodokem_640_aes_length_ciphertext 9720
#define OQS_KEM_frodokem_640_aes_length_shared_secret 16
OQS_KEM *OQS_KEM_frodokem_640_aes_new(void);
-OQS_API OQS_STATUS OQS_KEM_frodokem_640_aes_keypair(uint8_t *public_key, uint8_t *secret_key);
-OQS_API OQS_STATUS OQS_KEM_frodokem_640_aes_encaps(uint8_t *ciphertext, uint8_t *shared_secret, const uint8_t *public_key);
-OQS_API OQS_STATUS OQS_KEM_frodokem_640_aes_decaps(uint8_t *shared_secret, const uint8_t *ciphertext, const uint8_t *secret_key);
+OQS_API OQS_STATUS OQS_KEM_frodokem_640_aes_keypair(unsigned char *public_key, unsigned char *secret_key);
+OQS_API OQS_STATUS OQS_KEM_frodokem_640_aes_encaps(unsigned char *ciphertext, unsigned char *shared_secret, const unsigned char *public_key);
+OQS_API OQS_STATUS OQS_KEM_frodokem_640_aes_decaps(unsigned char *shared_secret, const unsigned char *ciphertext, const unsigned char *secret_key);
#endif
#ifdef OQS_ENABLE_KEM_frodokem_640_shake
Index: liboqs-0.7.1/.CMake/compiler_opts.cmake
===================================================================
--- liboqs-0.7.1.orig/.CMake/compiler_opts.cmake
+++ liboqs-0.7.1/.CMake/compiler_opts.cmake
@@ -62,7 +62,6 @@ if(CMAKE_C_COMPILER_ID MATCHES "Clang|GN
endif()
if(CMAKE_C_COMPILER_ID MATCHES "Clang")
- add_compile_options(-Werror)
add_compile_options(-Wall)
add_compile_options(-Wextra)
add_compile_options(-Wpedantic)
@@ -109,7 +108,6 @@ if(CMAKE_C_COMPILER_ID MATCHES "Clang")
endif()
elseif(CMAKE_C_COMPILER_ID STREQUAL "GNU")
- add_compile_options(-Werror)
add_compile_options(-Wall)
add_compile_options(-Wextra)
add_compile_options(-Wpedantic)

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Mar 29 06:38:25 UTC 2023 - Marcus Meissner <meissner@suse.com>
- liboqs-fix-prototypemismatch.patch: fixed uint8_t* vs unsigned char* mismatch
- disable -Werror for now.
-------------------------------------------------------------------
Tue Nov 15 16:10:18 UTC 2022 - Jan Engelhardt <jengelh@inai.de>

View File

@ -1,7 +1,7 @@
#
# spec file for package liboqs
#
# Copyright (c) 2022 SUSE LLC
# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -29,6 +29,7 @@ Patch0: liboqs-fix-build.patch
# PATCH-FIX-UPSTREAM
Patch1: 0001-Add-support-for-powerpc64.-1160.patch
Patch2: 0002-Mark-stack-non-executable-when-compiling-with-clang-.patch
Patch3: liboqs-fix-prototypemismatch.patch
BuildRequires: cmake
BuildRequires: doxygen
BuildRequires: libopenssl-devel