public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in dev-libs/libgeier/files: libgeier-0.11-openssl-1.patch
@ 2010-07-11  7:52 Samuli Suominen (ssuominen)
  0 siblings, 0 replies; 2+ messages in thread
From: Samuli Suominen (ssuominen) @ 2010-07-11  7:52 UTC (permalink / raw
  To: gentoo-commits

ssuominen    10/07/11 07:52:09

  Added:                libgeier-0.11-openssl-1.patch
  Log:
  Fix building with OpenSSL >= 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.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libgeier/files/libgeier-0.11-openssl-1.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libgeier/files/libgeier-0.11-openssl-1.patch?rev=1.1&content-type=text/plain

Index: libgeier-0.11-openssl-1.patch
===================================================================
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);






^ permalink raw reply	[flat|nested] 2+ messages in thread

* [gentoo-commits] gentoo-x86 commit in dev-libs/libgeier/files: libgeier-0.11-openssl-1.patch
@ 2015-02-03 14:25 Pacho Ramos (pacho)
  0 siblings, 0 replies; 2+ messages in thread
From: Pacho Ramos (pacho) @ 2015-02-03 14:25 UTC (permalink / raw
  To: gentoo-commits

pacho       15/02/03 14:25:54

  Removed:              libgeier-0.11-openssl-1.patch
  Log:
  Remove masked for removal package


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2015-02-03 14:25 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-02-03 14:25 [gentoo-commits] gentoo-x86 commit in dev-libs/libgeier/files: libgeier-0.11-openssl-1.patch Pacho Ramos (pacho)
  -- strict thread matches above, loose matches on Subject: below --
2010-07-11  7:52 Samuli Suominen (ssuominen)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox