wyj/guru
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/guru.git synced 2025-04-17 23:18:52 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

app-crypt/reop: Modern-C fixes

Browse Source 
Signed-off-by: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
This commit is contained in:
Haelwenn (lanodan) Monnier 2024-07-11 01:46:57 +02:00
parent a123ca924a
commit 1fd7313bb6
No known key found for this signature in database
GPG Key ID: D5B7A8E43C997DEE
3 changed files with 58 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
app-crypt/reop/files/reop-2.1.1-base64-function-signatures.patch Normal file
View File

@ -0,0 +1,41 @@
--- a/other/other.c
+++ b/other/other.c
@@ -328,11 +328,7 @@ static const char Pad64 = '=';
*/
int
-b64_ntop(src, srclength, target, targsize)
- u_char const *src;
- size_t srclength;
- char *target;
- size_t targsize;
+b64_ntop(u_char const *src, size_t srclength, char *target, size_t targsize)
{
size_t datalength = 0;
u_char input[3];
@@ -392,10 +388,7 @@ b64_ntop(src, srclength, target, targsize)
*/
int
-b64_pton(src, target, targsize)
- char const *src;
- u_char *target;
- size_t targsize;
+b64_pton(char const *src, u_char *target, size_t targsize)
{
int tarindex, state, ch;
u_char nextbyte;
diff --git a/other/other.h b/other/other.h
index 08701fa..9ff1c0d 100644
--- a/other/other.h
+++ b/other/other.h
@@ -3,6 +3,9 @@
#define _PATH_TTY "/dev/tty"
+int b64_ntop(u_char const *src, size_t srclength, char *target, size_t targsize);
+int b64_pton(char const *src, u_char *target, size_t targsize);
+
#ifndef HAVE_STRLCAT
size_t strlcat(char *dst, const char *src, size_t siz);
#endif

11
app-crypt/reop/files/reop-2.1.1-bcrypt_hash-cdata-sizeof.patch Normal file
View File

@ -0,0 +1,11 @@
--- a/other/other.c
+++ b/other/other.c
@@ -659,7 +659,7 @@ bcrypt_hash(u_int8_t *sha2pass, u_int8_t *sha2salt, u_int8_t *out)
cdata[i] = Blowfish_stream2word(ciphertext, sizeof(ciphertext),
&j);
for (i = 0; i < 64; i++)
- blf_enc(&state, cdata, sizeof(cdata) / sizeof(uint64_t));
+ blf_enc(&state, cdata, sizeof(cdata) / sizeof(uint32_t));
/* copy out */
for (i = 0; i < BCRYPT_BLOCKS; i++) {

7
app-crypt/reop/reop-2.1.1.ebuild → app-crypt/reop/reop-2.1.1-r1.ebuild
View File

@ -1,4 +1,4 @@
# Copyright 2020-2021 Gentoo Authors # Copyright 2020-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI=8 EAPI=8
@ -16,6 +16,11 @@ KEYWORDS="~amd64"
DEPEND="dev-libs/libsodium:=" DEPEND="dev-libs/libsodium:="
RDEPEND="${DEPEND}" RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}/reop-2.1.1-base64-function-signatures.patch"
"${FILESDIR}/reop-2.1.1-bcrypt_hash-cdata-sizeof.patch"
)
src_compile() { src_compile() {
emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="-lsodium ${LDFLAGS}" emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="-lsodium ${LDFLAGS}"
} }