From 413ca4e6c2089d8b5e0844c26cf5671209226b93 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 8 Nov 2023 16:21:19 +0000 Subject: gentoo auto-resync : 08:11:2023 - 16:21:18 --- sys-fs/dmg2img/Manifest | 4 - sys-fs/dmg2img/dmg2img-1.6.7-r1.ebuild | 40 ---- sys-fs/dmg2img/files/dmg2img-1.6.7-openssl11.patch | 202 --------------------- sys-fs/dmg2img/metadata.xml | 9 - 4 files changed, 255 deletions(-) delete mode 100644 sys-fs/dmg2img/Manifest delete mode 100644 sys-fs/dmg2img/dmg2img-1.6.7-r1.ebuild delete mode 100644 sys-fs/dmg2img/files/dmg2img-1.6.7-openssl11.patch delete mode 100644 sys-fs/dmg2img/metadata.xml (limited to 'sys-fs/dmg2img') diff --git a/sys-fs/dmg2img/Manifest b/sys-fs/dmg2img/Manifest deleted file mode 100644 index 619f9b28061d..000000000000 --- a/sys-fs/dmg2img/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -AUX dmg2img-1.6.7-openssl11.patch 7080 BLAKE2B 9815c1c0b3c23f2dae7da65e380ee4a2f2c460ddfa1c5e8e153c2b5b1213139d2052957b40f9c15042b750ed2c7318c36acc6de470b9da66a93550eb913964f4 SHA512 1addd0d349ad21c0fae423fe558583d9457aa2bcdf4f8fe16d408e703437faaa5b1324f38dfb66e9f3d811e89181fc0378978ffc852e87675fde0e416fccb136 -DIST dmg2img-1.6.7.tar.gz 23238 BLAKE2B d4dc8da2974bc296e8aba21de816413df797322c6194e4ece3d0900d64fcd33084b29be6172a45bdc3f515c2e10544f107be2c7f0e6b7d247cf5d6bc5ad03e2f SHA512 4c42841c5cdbf868b6038648a6c83e78d4b7f2010f7065d7b3f4c2c04d13af9489716c1dfa867aff5f3c3b3eef96dc3fc0610eff13fec139265f37f468e339e6 -EBUILD dmg2img-1.6.7-r1.ebuild 714 BLAKE2B 1890ad230f7d984e85a0100252f7e3d1d826a1a9894cce1e519a30413b04c6fb399a2136ba4a2ea97673f0dd057c93cb533e7842563eee966bc66b8dabc8b356 SHA512 6403bcb3ddf795abd770f3bc87bd87d459409b1ceb06b676f2281d0053c95871551ec8168c2eb023c1fea94028b38e8630714a83defe8b9d4e4253e5fc328f11 -MISC metadata.xml 365 BLAKE2B 292cd0a637e47a8dbd4f449295377c70266f26335415deee9760641f96fb43d0630036c339a0fba9c5c58a8b17c2387a29145ac48f0ebc54133e58d78207cee7 SHA512 84bf9a3ecb6349530a52408ea2456c48255d386cf6e4b073dc336283a90cffa0fc55901f765905e146cbe5beed85551510d30e3d05b596180d342604d8bc5202 diff --git a/sys-fs/dmg2img/dmg2img-1.6.7-r1.ebuild b/sys-fs/dmg2img/dmg2img-1.6.7-r1.ebuild deleted file mode 100644 index b227b97b3155..000000000000 --- a/sys-fs/dmg2img/dmg2img-1.6.7-r1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs - -DESCRIPTION="Converts Apple DMG files to standard HFS+ images" -HOMEPAGE="http://vu1tur.eu.org/tools" -SRC_URI="http://vu1tur.eu.org/tools/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" - -RDEPEND="app-arch/bzip2 - sys-libs/zlib - dev-libs/openssl:0= - " -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${P}-openssl11.patch #674168 -) - -src_prepare() { - default - sed -i -e 's:-s:$(LDFLAGS):g' Makefile || die "sed failed" -} - -src_compile() { - tc-export CC - emake CFLAGS="${CFLAGS}" -} - -src_install() { - dobin dmg2img vfdecrypt - dodoc README - doman vfdecrypt.1 -} diff --git a/sys-fs/dmg2img/files/dmg2img-1.6.7-openssl11.patch b/sys-fs/dmg2img/files/dmg2img-1.6.7-openssl11.patch deleted file mode 100644 index 53b73038ade1..000000000000 --- a/sys-fs/dmg2img/files/dmg2img-1.6.7-openssl11.patch +++ /dev/null @@ -1,202 +0,0 @@ -diff --git a/old/vfdecrypt.c b/vfdecrypt.c -index 56d3530..b1a36d3 100644 ---- a/old/vfdecrypt.c -+++ b/vfdecrypt.c -@@ -183,7 +183,7 @@ void adjust_v2_header_byteorder(cencrypted_v2_pwheader *pwhdr) { - pwhdr->encrypted_keyblob_size = htonl(pwhdr->encrypted_keyblob_size); - } - --HMAC_CTX hmacsha1_ctx; -+HMAC_CTX *hmacsha1_ctx; - AES_KEY aes_decrypt_key; - int CHUNK_SIZE=4096; // default - -@@ -196,9 +196,9 @@ void compute_iv(uint32_t chunk_no, uint8_t *iv) { - unsigned int mdLen; - - chunk_no = OSSwapHostToBigInt32(chunk_no); -- HMAC_Init_ex(&hmacsha1_ctx, NULL, 0, NULL, NULL); -- HMAC_Update(&hmacsha1_ctx, (void *) &chunk_no, sizeof(uint32_t)); -- HMAC_Final(&hmacsha1_ctx, mdResult, &mdLen); -+ HMAC_Init_ex(hmacsha1_ctx, NULL, 0, NULL, NULL); -+ HMAC_Update(hmacsha1_ctx, (void *) &chunk_no, sizeof(uint32_t)); -+ HMAC_Final(hmacsha1_ctx, mdResult, &mdLen); - memcpy(iv, mdResult, CIPHER_BLOCKSIZE); - } - -@@ -212,52 +212,75 @@ void decrypt_chunk(uint8_t *ctext, uint8_t *ptext, uint32_t chunk_no) { - /* DES3-EDE unwrap operation loosely based on to RFC 2630, section 12.6 - * wrapped_key has to be 40 bytes in length. */ - int apple_des3_ede_unwrap_key(uint8_t *wrapped_key, int wrapped_key_len, uint8_t *decryptKey, uint8_t *unwrapped_key) { -- EVP_CIPHER_CTX ctx; -+ EVP_CIPHER_CTX *ctx; - uint8_t *TEMP1, *TEMP2, *CEKICV; - uint8_t IV[8] = { 0x4a, 0xdd, 0xa2, 0x2c, 0x79, 0xe8, 0x21, 0x05 }; - int outlen, tmplen, i; - -- EVP_CIPHER_CTX_init(&ctx); -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+ ctx = EVP_CIPHER_CTX_new(); -+#else -+ ctx = malloc(sizeof(*ctx)); -+#endif -+ if (!ctx) { -+ fprintf(stderr, "Out of memory: EVP_CIPHER_CTX!\n"); -+ return(-1); -+ } -+ -+ EVP_CIPHER_CTX_init(ctx); - /* result of the decryption operation shouldn't be bigger than ciphertext */ - TEMP1 = malloc(wrapped_key_len); - TEMP2 = malloc(wrapped_key_len); - CEKICV = malloc(wrapped_key_len); - /* uses PKCS#7 padding for symmetric key operations by default */ -- EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, decryptKey, IV); -+ EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, decryptKey, IV); - -- if(!EVP_DecryptUpdate(&ctx, TEMP1, &outlen, wrapped_key, wrapped_key_len)) { -+ if(!EVP_DecryptUpdate(ctx, TEMP1, &outlen, wrapped_key, wrapped_key_len)) { - fprintf(stderr, "internal error (1) during key unwrap operation!\n"); - return(-1); - } -- if(!EVP_DecryptFinal_ex(&ctx, TEMP1 + outlen, &tmplen)) { -+ if(!EVP_DecryptFinal_ex(ctx, TEMP1 + outlen, &tmplen)) { - fprintf(stderr, "internal error (2) during key unwrap operation!\n"); - return(-1); - } - outlen += tmplen; -- EVP_CIPHER_CTX_cleanup(&ctx); -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+ EVP_CIPHER_CTX_reset(ctx); -+#else -+ EVP_CIPHER_CTX_cleanup(ctx); -+#endif - - /* reverse order of TEMP3 */ - for(i = 0; i < outlen; i++) TEMP2[i] = TEMP1[outlen - i - 1]; - -- EVP_CIPHER_CTX_init(&ctx); -+ EVP_CIPHER_CTX_init(ctx); - /* uses PKCS#7 padding for symmetric key operations by default */ -- EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, decryptKey, TEMP2); -- if(!EVP_DecryptUpdate(&ctx, CEKICV, &outlen, TEMP2+8, outlen-8)) { -+ EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, decryptKey, TEMP2); -+ if(!EVP_DecryptUpdate(ctx, CEKICV, &outlen, TEMP2+8, outlen-8)) { - fprintf(stderr, "internal error (3) during key unwrap operation!\n"); - return(-1); - } -- if(!EVP_DecryptFinal_ex(&ctx, CEKICV + outlen, &tmplen)) { -+ if(!EVP_DecryptFinal_ex(ctx, CEKICV + outlen, &tmplen)) { - fprintf(stderr, "internal error (4) during key unwrap operation!\n"); - return(-1); - } - - outlen += tmplen; -- EVP_CIPHER_CTX_cleanup(&ctx); -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+ EVP_CIPHER_CTX_reset(ctx); -+#else -+ EVP_CIPHER_CTX_cleanup(ctx); -+#endif - - memcpy(unwrapped_key, CEKICV+4, outlen-4); - free(TEMP1); - free(TEMP2); - free(CEKICV); -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+ EVP_CIPHER_CTX_free(ctx); -+#else -+ free(ctx); -+#endif - return(0); - } - -@@ -279,31 +302,46 @@ int unwrap_v1_header(char *passphrase, cencrypted_v1_header *header, uint8_t *ae - int unwrap_v2_header(char *passphrase, cencrypted_v2_pwheader *header, uint8_t *aes_key, uint8_t *hmacsha1_key) { - /* derived key is a 3DES-EDE key */ - uint8_t derived_key[192/8]; -- EVP_CIPHER_CTX ctx; -+ EVP_CIPHER_CTX *ctx; - uint8_t *TEMP1; - int outlen, tmplen; - -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+ ctx = EVP_CIPHER_CTX_new(); -+#else -+ ctx = malloc(sizeof(*ctx)); -+#endif -+ if (!ctx) { -+ fprintf(stderr, "Out of memory: EVP_CIPHER_CTX!\n"); -+ return(-1); -+ } -+ - PKCS5_PBKDF2_HMAC_SHA1(passphrase, strlen(passphrase), (unsigned char*)header->kdf_salt, 20, - PBKDF2_ITERATION_COUNT, sizeof(derived_key), derived_key); - - print_hex(derived_key, 192/8); - -- EVP_CIPHER_CTX_init(&ctx); -+ EVP_CIPHER_CTX_init(ctx); - /* result of the decryption operation shouldn't be bigger than ciphertext */ - TEMP1 = malloc(header->encrypted_keyblob_size); - /* uses PKCS#7 padding for symmetric key operations by default */ -- EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, derived_key, header->blob_enc_iv); -+ EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, derived_key, header->blob_enc_iv); - -- if(!EVP_DecryptUpdate(&ctx, TEMP1, &outlen, header->encrypted_keyblob, header->encrypted_keyblob_size)) { -+ if(!EVP_DecryptUpdate(ctx, TEMP1, &outlen, header->encrypted_keyblob, header->encrypted_keyblob_size)) { - fprintf(stderr, "internal error (1) during key unwrap operation!\n"); - return(-1); - } -- if(!EVP_DecryptFinal_ex(&ctx, TEMP1 + outlen, &tmplen)) { -+ if(!EVP_DecryptFinal_ex(ctx, TEMP1 + outlen, &tmplen)) { - fprintf(stderr, "internal error (2) during key unwrap operation!\n"); - return(-1); - } - outlen += tmplen; -- EVP_CIPHER_CTX_cleanup(&ctx); -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+ EVP_CIPHER_CTX_free(ctx); -+#else -+ EVP_CIPHER_CTX_cleanup(ctx); -+ free(ctx); -+#endif - memcpy(aes_key, TEMP1, 16); - memcpy(hmacsha1_key, TEMP1, 20); - -@@ -446,8 +484,21 @@ int main(int argc, char *argv[]) { - CHUNK_SIZE = v2header.blocksize; - } - -- HMAC_CTX_init(&hmacsha1_ctx); -- HMAC_Init_ex(&hmacsha1_ctx, hmacsha1_key, sizeof(hmacsha1_key), EVP_sha1(), NULL); -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+ hmacsha1_ctx = HMAC_CTX_new(); -+#else -+ hmacsha1_ctx = malloc(sizeof(*hmacsha1_ctx)); -+#endif -+ if (!hmacsha1_ctx) { -+ fprintf(stderr, "Out of memory: HMAC CTX!\n"); -+ exit(1); -+ } -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+ HMAC_CTX_reset(hmacsha1_ctx); -+#else -+ HMAC_CTX_init(hmacsha1_ctx); -+#endif -+ HMAC_Init_ex(hmacsha1_ctx, hmacsha1_key, sizeof(hmacsha1_key), EVP_sha1(), NULL); - AES_set_decrypt_key(aes_key, CIPHER_KEY_LENGTH * 8, &aes_decrypt_key); - - if (verbose >= 1) { -@@ -472,5 +523,11 @@ int main(int argc, char *argv[]) { - } - - if (verbose) fprintf(stderr, "%"PRIX32" chunks written\n", chunk_no); -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+ HMAC_CTX_free(hmacsha1_ctx); -+#else -+ HMAC_CTX_cleanup(hmacsha1_ctx); -+ free(hmacsha1_ctx); -+#endif - return(0); - } diff --git a/sys-fs/dmg2img/metadata.xml b/sys-fs/dmg2img/metadata.xml deleted file mode 100644 index 78ed2a765d2d..000000000000 --- a/sys-fs/dmg2img/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - dmg2img is an application that can convert .dmg files, popular on Mac OSX - systems, to HFS+ disk images, suitable for mounting on Linux systems. - - -- cgit v1.2.3