mirror of
https://gitlab.univ-nantes.fr/glicid-public/guix-glicid.git
synced 2025-04-30 06:08:37 +02:00
Merge branch 'devel' into 'main'
adding ipmitool patch to test compilation See merge request glicid-public/guix-glicid!70
This commit is contained in:
commit
ae212e215a
2 changed files with 26 additions and 4 deletions
22
glicid/packages/patches/ipmitool-evp_cipher_ctx.patch
Normal file
22
glicid/packages/patches/ipmitool-evp_cipher_ctx.patch
Normal file
|
@ -0,0 +1,22 @@
|
||||||
|
diff --git a/src/plugins/lanplus/lanplus_crypt_impl.c b/src/plugins/lanplus/lanplus_crypt_impl.c
|
||||||
|
index d5fac37..8bb1879 100644
|
||||||
|
--- a/src/plugins/lanplus/lanplus_crypt_impl.c
|
||||||
|
+++ b/src/plugins/lanplus/lanplus_crypt_impl.c
|
||||||
|
@@ -164,7 +164,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_t * iv,
|
||||||
|
uint8_t * output,
|
||||||
|
uint32_t * bytes_written)
|
||||||
|
{
|
||||||
|
- EVP_CIPHER_CTX ctx;
|
||||||
|
+ EVP_CIPHER_CTX *ctx = NULL;
|
||||||
|
EVP_CIPHER_CTX_init(&ctx);
|
||||||
|
EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
|
||||||
|
EVP_CIPHER_CTX_set_padding(&ctx, 0);
|
||||||
|
@@ -239,7 +239,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv,
|
||||||
|
uint8_t * output,
|
||||||
|
uint32_t * bytes_written)
|
||||||
|
{
|
||||||
|
- EVP_CIPHER_CTX ctx;
|
||||||
|
+ EVP_CIPHER_CTX *ctx = NULL;
|
||||||
|
EVP_CIPHER_CTX_init(&ctx);
|
||||||
|
EVP_DecryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
|
||||||
|
EVP_CIPHER_CTX_set_padding(&ctx, 0);
|
|
@ -4,16 +4,16 @@
|
||||||
#:use-module ((gnu packages python) #:prefix gnu:)
|
#:use-module ((gnu packages python) #:prefix gnu:)
|
||||||
)
|
)
|
||||||
|
|
||||||
(define-public python-3.10
|
(define-public python-3.9
|
||||||
(package
|
(package
|
||||||
(inherit gnu:python-3)
|
(inherit gnu:python-3.9)
|
||||||
(name "python")
|
(name "python")
|
||||||
(version "3.10.5")
|
(version "3.9.13")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "https://www.python.org/ftp/python/" version "/Python-" version ".tar.xz"))
|
(uri (string-append "https://www.python.org/ftp/python/" version "/Python-" version ".tar.xz"))
|
||||||
(sha256 (base32 "11j4nzbnhbif9pg2m8l67akj0lb2h3c27gxzm9shmvq6n7ayydw4"))
|
(sha256 (base32 "03q8lcb476a9n41nih9qvwf1fzfzjbvq6vj0cnmd458yixchqnqj"))
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
Loading…
Add table
Reference in a new issue