diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-07-11 07:52:10 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-07-11 07:52:10 +0000 |
| commit | 847a99b662a4c6b7be05b992da5f5d10c1141ec6 (patch) | |
| tree | 58402b8f211d89fe28b091f695f01b51961a07d8 /dev-libs/libgeier/files | |
| parent | Version bump. Switch from swig-provided code to handcrafted code. (diff) | |
| download | gentoo-2-847a99b662a4c6b7be05b992da5f5d10c1141ec6.tar.gz gentoo-2-847a99b662a4c6b7be05b992da5f5d10c1141ec6.tar.bz2 gentoo-2-847a99b662a4c6b7be05b992da5f5d10c1141ec6.zip | |
Fix building with OpenSSL >= 1.0.0 wrt #324959.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/libgeier/files')
| -rw-r--r-- | dev-libs/libgeier/files/libgeier-0.11-openssl-1.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/dev-libs/libgeier/files/libgeier-0.11-openssl-1.patch b/dev-libs/libgeier/files/libgeier-0.11-openssl-1.patch new file mode 100644 index 000000000000..28fff5733a0a --- /dev/null +++ b/dev-libs/libgeier/files/libgeier-0.11-openssl-1.patch @@ -0,0 +1,29 @@ +http://bugs.gentoo.org/324959 + +--- src/openssl/dsig-get-attr.c ++++ src/openssl/dsig-get-attr.c +@@ -47,7 +47,11 @@ + ASN1_TYPE *val = sk_ASN1_TYPE_value(attr->value.set,0); + + if(val->type == V_ASN1_BMPSTRING) ++ #if OPENSSL_VERSION_NUMBER >= 0x10000000L ++ return OPENSSL_uni2asc(val->value.bmpstring->data, ++ #else + return uni2asc(val->value.bmpstring->data, ++ #endif + val->value.bmpstring->length); + + if(val->type == V_ASN1_OCTET_STRING) +--- src/openssl/pkcs7_encrypt.c ++++ src/openssl/pkcs7_encrypt.c +@@ -269,6 +269,10 @@ + char buf[512]; + EVP_PKEY *elster_pubkey = X509_get_pubkey((X509 *)x509_cert); + ++ #if OPENSSL_VERSION_NUMBER >= 0x10000000L ++ #define EVP_PKEY_encrypt EVP_PKEY_encrypt_old ++ #endif ++ + int len = EVP_PKEY_encrypt((unsigned char *) buf, + key, EVP_CIPHER_key_length(cipher), + elster_pubkey); |