rpms/aespipe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixing issues to link the assembler code

Browse source
This commit is contained in:
Jirka Hladky 2019-08-15 03:49:09 +02:00
commit 7b3abeda51
4 changed files with 8 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -4,3 +4,4 @@
/aespipe-v2.4e.tar.bz2
/aespipe.spec
/aespipe-v2.4e-link.patch
/aespipe-v2.4e-underline.patch

39
aespipe-v2.4e-link.patch
View file

@ -1,39 +0,0 @@
diff -ru aespipe-v2.4e-original/aes.h aespipe-v2.4e/aes.h
--- aespipe-v2.4e-original/aes.h 2004-06-12 16:31:41.000000000 +0200
+++ aespipe-v2.4e/aes.h 2019-08-14 14:03:25.556605313 +0200
@@ -90,17 +90,17 @@
#if defined(__linux__) && defined(__KERNEL__) && (defined(X86_ASM) || defined(AMD64_ASM))
asmlinkage
#endif
-extern void aes_set_key(aes_context *, const unsigned char [], const int, const int);
+extern void aes_set_key(aes_context *, const unsigned char [], const int, const int) asm ("_aes_set_key");
#if defined(__linux__) && defined(__KERNEL__) && (defined(X86_ASM) || defined(AMD64_ASM))
asmlinkage
#endif
-extern void aes_encrypt(const aes_context *, const unsigned char [], unsigned char []);
+extern void aes_encrypt(const aes_context *, const unsigned char [], unsigned char []) asm ("_aes_encrypt");
#if defined(__linux__) && defined(__KERNEL__) && (defined(X86_ASM) || defined(AMD64_ASM))
asmlinkage
#endif
-extern void aes_decrypt(const aes_context *, const unsigned char [], unsigned char []);
+extern void aes_decrypt(const aes_context *, const unsigned char [], unsigned char []) asm ("_aes_decrypt");
// The block length inputs to aes_set_block and aes_set_key are in numbers
// of bytes or bits. The calls to subroutines must be made in the above
diff -ru aespipe-v2.4e-original/md5.h aespipe-v2.4e/md5.h
--- aespipe-v2.4e-original/md5.h 2010-04-11 12:12:11.000000000 +0200
+++ aespipe-v2.4e/md5.h 2019-08-14 14:03:38.723627097 +0200
@@ -10,9 +10,9 @@
#if defined(__linux__) && defined(__KERNEL__) && (defined(X86_ASM) || defined(AMD64_ASM))
asmlinkage
#endif
-extern void md5_transform_CPUbyteorder(u_int32_t *, u_int32_t const *);
+extern void md5_transform_CPUbyteorder(u_int32_t *, u_int32_t const *) asm("_md5_transform_CPUbyteorder");
#if defined(__linux__) && defined(__KERNEL__) && (defined(X86_ASM) || defined(AMD64_ASM))
asmlinkage
#endif
-extern void md5_transform_CPUbyteorder_2x(u_int32_t *, u_int32_t const *, u_int32_t const *);
+extern void md5_transform_CPUbyteorder_2x(u_int32_t *, u_int32_t const *, u_int32_t const *) asm("_md5_transform_CPUbyteorder_2x");

7
aespipe.spec
View file

@ -1,11 +1,11 @@
Summary: AES-based encryption tool for tar/cpio and loop-aes imagemore
Name: aespipe
Version: 2.4e
Release: 2%{?dist}
Release: 3%{?dist}
License: GPLv2+
URL: http://loop-aes.sourceforge.net/
Source: http://loop-aes.sourceforge.net/aespipe/aespipe-v%{version}.tar.bz2
Patch0: aespipe-v2.4e-link.patch
Patch0: aespipe-v2.4e-underline.patch
BuildRequires: gcc
BuildRequires: gpg
Requires: gpg
@ -57,6 +57,9 @@ install -Dp -m0755 aespipe %{buildroot}%{_bindir}/aespipe
%{_bindir}/aespipe
%changelog
* Thu Aug 15 2019 Jirka Hladky <hladky.jiri@gmail.com> - 2.4e-3
- Imroved patch to solve the issues with assembler linking
* Wed Aug 14 2019 Jirka Hladky <hladky.jiri@gmail.com> - 2.4e-2
- Added patch to solve the issues with assembler linking

4
sources
View file

@ -1,3 +1,3 @@
SHA512 (aespipe.spec) = dfe46718cc4f61de0c8a38993dbbe8857f172d6684f42e1be8b16a150398120f4839777910694f391b2d01d44d703c98c7035111eda15dd00b1a135f720b66db
SHA512 (aespipe-v2.4e-link.patch) = e3ac00c483d1e9a7c1f9991036fc72f41c271295a206d53b6cb0a0f39ba40687110836919a51140b09fc97aa3b1fde023303d64362cf4a8f8761fdb01f2ea375
SHA512 (aespipe.spec) = 9d586a71bb11d6bff1273fb7a1d5e614223b246ebeb0d5ef572751b444646767ecb43eb2ad11d434ddac1ab4e37b34a75c6de4ca9d314369a03402616e9add23
SHA512 (aespipe-v2.4e-underline.patch) = 352e89b8a3d98347a93318f3b9d0941901756f9ef222bb9d1b8b6e70d3cf62a103154781e9f73b5e88d2b8015b3a84a773ede03402282392a14c6d0a69e16024
SHA512 (aespipe-v2.4e.tar.bz2) = e038f710ac971e5ba740648c0f255e8bc9fcea9be1a6b76208a453f21f013e1662c006d4f4495fa2b2560fd9b0c236947462a9b337a120073c6a5335b29f077e