From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1OXrKe-0006Yp-D0 for garchives@archives.gentoo.org; Sun, 11 Jul 2010 07:52:13 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 50749E09E5; Sun, 11 Jul 2010 07:52:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 27568E09E5 for ; Sun, 11 Jul 2010 07:52:11 +0000 (UTC) Received: from corvid.gentoo.org (corvid.gentoo.org [208.92.234.79]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C33321B4129 for ; Sun, 11 Jul 2010 07:52:10 +0000 (UTC) Received: by corvid.gentoo.org (Postfix, from userid 2166) id 0D2272CE14; Sun, 11 Jul 2010 07:52:09 +0000 (UTC) From: "Samuli Suominen (ssuominen)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, ssuominen@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in dev-libs/libgeier/files: libgeier-0.11-openssl-1.patch X-VCS-Repository: gentoo-x86 X-VCS-Files: libgeier-0.11-openssl-1.patch X-VCS-Directories: dev-libs/libgeier/files X-VCS-Committer: ssuominen X-VCS-Committer-Name: Samuli Suominen Content-Type: text/plain; charset=utf8 Message-Id: <20100711075210.0D2272CE14@corvid.gentoo.org> Date: Sun, 11 Jul 2010 07:52:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 48eae8c6-833e-4cc3-a07f-885c733653c7 X-Archives-Hash: a85117a33092e47b7ac57a4a637e601f ssuominen 10/07/11 07:52:09 Added: libgeier-0.11-openssl-1.patch Log: Fix building with OpenSSL >=3D 1.0.0 wrt #324959. (Portage version: 2.2_rc67/cvs/Linux x86_64) Revision Changes Path 1.1 dev-libs/libgeier/files/libgeier-0.11-openssl-1.patc= h file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libgeier/= files/libgeier-0.11-openssl-1.patch?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libgeier/= files/libgeier-0.11-openssl-1.patch?rev=3D1.1&content-type=3Dtext/plain Index: libgeier-0.11-openssl-1.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D http://bugs.gentoo.org/324959 --- src/openssl/dsig-get-attr.c +++ src/openssl/dsig-get-attr.c @@ -47,7 +47,11 @@ ASN1_TYPE *val =3D sk_ASN1_TYPE_value(attr->value.set,0); =20 if(val->type =3D=3D V_ASN1_BMPSTRING) + #if OPENSSL_VERSION_NUMBER >=3D 0x10000000L + return OPENSSL_uni2asc(val->value.bmpstring->data, + #else return uni2asc(val->value.bmpstring->data, + #endif val->value.bmpstring->length); =20 if(val->type =3D=3D 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 =3D X509_get_pubkey((X509 *)x509_cert); =20 + #if OPENSSL_VERSION_NUMBER >=3D 0x10000000L + #define EVP_PKEY_encrypt EVP_PKEY_encrypt_old + #endif + int len =3D EVP_PKEY_encrypt((unsigned char *) buf, key, EVP_CIPHER_key_length(cipher), elster_pubkey);