diff options
| -rw-r--r-- | main/rng-tools/APKBUILD | 2 | ||||
| -rw-r--r-- | main/rng-tools/fix-encrypt-name-clash.patch | 22 |
2 files changed, 24 insertions, 0 deletions
diff --git a/main/rng-tools/APKBUILD b/main/rng-tools/APKBUILD index 20473ebb9e..c02fbe19d2 100644 --- a/main/rng-tools/APKBUILD +++ b/main/rng-tools/APKBUILD @@ -15,6 +15,7 @@ makedepends="argp-standalone autoconf automake linux-headers libtool subpackages="$pkgname-doc $pkgname-openrc" source="rng-tools-$pkgver.tar.gz::https://github.com/nhorman/rng-tools/archive/v$pkgver.tar.gz fix-textrels-on-PIC-x86.patch + fix-encrypt-name-clash.patch rngd.confd rngd.initd " @@ -56,5 +57,6 @@ package() { sha512sums="b72d8918f709989ebc70cb9ea9c8b3dabf53041b24bc3f3a6de1bea318861dfd6c1a6110bd750041dc4819406db4a2b28f5137af5f5d5f2beb666f607913b389 rng-tools-6.10.tar.gz 241b56146ec8e55572711b7aa36fa2afbe7a9527d25f03098f35f4c52a9049933d9bc2a82b0e2e0dbc836409d7f650f3a88ef546d6c5a687f7be8fbe4a013b7e fix-textrels-on-PIC-x86.patch +c65d177b20948f88341b22149325011fca93da1137cb176f642ae1944ffc2110141e123518fcc1329346a21c57a51a6cf22f8f06f7d10337a7b1a50c243e97cf fix-encrypt-name-clash.patch 363b5aa431a0da37fc9eb8c93cffed0b75f43064530318fb41c774acd8aab8a1e109cf6c294b77fa6b8f97aa355b2849f56e83d8b06bcd9e0e9f3aa4f3ba49ac rngd.confd 86a6a7446eda64c075e468bc304008314b710629e06146582c5ce3fcc307a6b4baf5f8e8a47b72f1bab0bb608d76f953f2712cddd35809abcb02b8320c682535 rngd.initd" diff --git a/main/rng-tools/fix-encrypt-name-clash.patch b/main/rng-tools/fix-encrypt-name-clash.patch new file mode 100644 index 0000000000..26677187f5 --- /dev/null +++ b/main/rng-tools/fix-encrypt-name-clash.patch @@ -0,0 +1,22 @@ +diff --git a/rngd_darn.c b/rngd_darn.c +index 35df7a1..9345895 100644 +--- a/rngd_darn.c ++++ b/rngd_darn.c +@@ -109,7 +109,7 @@ static int init_openssl(struct rng *ent_src) + return 0; + } + +-int encrypt(unsigned char *plaintext, int plaintext_len, unsigned char *key, ++static int osslencrypt(unsigned char *plaintext, int plaintext_len, unsigned char *key, + unsigned char *iv, unsigned char *ciphertext) + { + int len; +@@ -150,7 +150,7 @@ static inline int openssl_mangle(unsigned char *tmp, struct rng *ent_src) + unsigned char ciphertext[CHUNK_SIZE * RDRAND_ROUNDS]; + + /* Encrypt the plaintext */ +- ciphertext_len = encrypt (tmp, strlen(tmp), key, iv_buf, ++ ciphertext_len = osslencrypt (tmp, strlen(tmp), key, iv_buf, + ciphertext); + printf("Calling mangle with len %d\n", ciphertext_len); + if (!ciphertext_len) |