Merge lp:~wibblymat/ubuntu/oneiric/cryptonit/openssl-transition into lp:ubuntu/oneiric/cryptonit

[Mat Scales]

Cryptonit FTBFS with openssl-1.0.0, which this branch fixes.

[Mat Scales (wibblymat)]

The package is a mess. Not maintained upstream at all since 2006. Only FTBFS fixes in Debian or Ubuntu since then.

I could tidy the package, make it 3.0 (quilt), bump the standards version, etc. if required, but it seems unlikely.

[Stefano Rivera (stefanor)]

Yeah, it should probably be removed from Debian (http://wiki.debian.org/qa.debian.org/removals). It looks like an interesting package, but is clearly unmaintained. I'll file a bug to that effect.

[Colin Watson (cjwatson)]

This appears to have been effectively merged by way of your patch sent to the Debian bug, so marking as such:

cryptonit (0.9.7-2.4ubuntu2) oneiric; urgency=low

  * src/pkcs7.cpp: fix FTBFS with OpenSSL 1.0.0. Patch from debbugs #636956,
    thanks to Mat Scales.
  * debian/rules: don't copy config.* files to have a cleaner diff.
  * Rebuild gets rid of binary dependency on openssl0.9.8.

 -- Ilya Barygin <email address hidden> Thu, 18 Aug 2011 23:53:29 +0400

=== modified file 'debian/changelog'
--- debian/changelog	2010-10-25 11:50:24 +0000
+++ debian/changelog	2011-08-12 21:48:24 +0000
@@ -1,3 +1,9 @@
+cryptonit (0.9.7-2.4ubuntu2) oneiric; urgency=low
+
+  * Updated to build with OpenSSL 1.0.0
+
+ -- Mat Scales <[e-mail]>  Fri, 12 Aug 2011 22:20:42 +0100
+
 cryptonit (0.9.7-2.4ubuntu1) natty; urgency=low
 
   * link against -ldl to fix FTBFS
 
=== modified file 'debian/control'
--- debian/control	2010-10-25 11:50:24 +0000
+++ debian/control	2011-08-12 21:48:24 +0000
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Pierre Machard <[e-mail]>
-Build-Depends: debhelper (>= 5.0.0), libldap2-dev (>= 2.1.22-1), libssl-dev (>= 0.9.7c-5), wx2.6-headers, libwxgtk2.6-dev, automake1.9, autoconf, libtool
+Build-Depends: debhelper (>= 5.0.0), libldap2-dev (>= 2.1.22-1), libssl-dev (>= 1.0.0), wx2.6-headers, libwxgtk2.6-dev, automake1.9, autoconf, libtool
 Standards-Version: 3.8.0
 Homepage: http://www.cryptonit.org
 
 
=== modified file 'src/pkcs7.cpp'
--- src/pkcs7.cpp	2006-06-05 14:33:40 +0000
+++ src/pkcs7.cpp	2011-08-12 21:48:24 +0000
@@ -227,15 +227,21 @@
     void pkcs7::setDigest(DigestName name)
     {
 	switch(name) {
+#ifndef OPENSSL_NO_MD2
 	case D_MD2:
 	    digest = EVP_md2();
 	    break;
+#endif
+#ifndef OPENSSL_NO_MD5
 	case D_MD5:
 	    digest = EVP_md5();
 	    break;
+#endif
+#ifndef OPENSSL_NO_SHA
 	case D_SHA1:
 	    digest = EVP_sha1();
 	    break;
+#endif
 	default:
 	    break;
 	}
@@ -456,7 +462,7 @@
     int pkcs7::sign(const char *filein, Certificate &cert, Key &privateKey,
 		    std::vector<Certificate> &certChain, bool detached)
     {
-	STACK_OF(509) *chain=NULL;
+	STACK_OF(X509) *chain=NULL;
 	std::vector<Certificate>::iterator certIt;
 	X509 *certif = cert.getX509Certificate();
 	EVP_PKEY *pkey = privateKey.getPrivateKey();
@@ -925,7 +931,7 @@
 	else if(isSignedAndEncrypted())
 	    recipientStack = sk_PKCS7_RECIP_INFO_dup(p7->d.signed_and_enveloped->recipientinfo);
     
-	while((cert=sk_PKCS7_RECIP_INFO_pop(recipientStack)->cert) != NULL) {
+	while((cert=((PKCS7_RECIP_INFO *)sk_PKCS7_RECIP_INFO_pop(recipientStack))->cert) != NULL) {
 	    Certificate *certif = new Certificate();
 	    certif->setX509Certificate(cert);
 #ifdef DEBUG