diff -Nru ppp-2.4.5-eaptls-mppe-0.992/debian/changelog ppp-2.4.5-eaptls-mppe-0.992/debian/changelog --- ppp-2.4.5-eaptls-mppe-0.992/debian/changelog 2012-04-05 08:47:05.000000000 +0000 +++ ppp-2.4.5-eaptls-mppe-0.992/debian/changelog 2012-08-03 07:47:51.000000000 +0000 @@ -1,4 +1,12 @@ -ppp-2.4.5-eaptls-mppe (0.992-0ubuntu1~ppa1~maverick1) maverick; urgency=low +ppp-2.4.5-eaptls-mppe (0.992-0ubuntu2~ppa1~maverick1) maverick; urgency=low + + * Fixed bug pppd crashes when certificate is configured to be read from + file and private key is configured to be read from pkcs11 engine. + Solved by adding a new patch 'mixed-engine-file-support.patch'. + + -- Werner Jaeger Fri, 3 Aug 2012 08:13:07 +0200 + +ppp-2.4.5-eaptls-mppe (0.992-0ubuntu1~ppa1~precise1) precise; urgency=low * new upstream release - Fix compilation issue with eaptls_check_hook and passwordfd plugin diff -Nru ppp-2.4.5-eaptls-mppe-0.992/debian/patches/mixed-engine-file-support.patch ppp-2.4.5-eaptls-mppe-0.992/debian/patches/mixed-engine-file-support.patch --- ppp-2.4.5-eaptls-mppe-0.992/debian/patches/mixed-engine-file-support.patch 1970-01-01 00:00:00.000000000 +0000 +++ ppp-2.4.5-eaptls-mppe-0.992/debian/patches/mixed-engine-file-support.patch 2012-08-03 07:16:51.000000000 +0000 @@ -0,0 +1,16 @@ +Description: Fixed bug pppd crashes when certificate is configured to be + read from file and private key is configured to be read from pkcs11 engine. +Forwarded: no +Author: Werner Jaeger + +--- a/pppd/eap-tls.c ++++ b/pppd/eap-tls.c +@@ -403,7 +403,7 @@ + if (ssl_config && pkey_engine_name) + { + /* don't load the same engine twice */ +- if ( strcmp( cert_engine_name, pkey_engine_name) == 0 ) ++ if ( cert_engine_name != NULL && strcmp( cert_engine_name, pkey_engine_name) == 0 ) + pkey_engine = cert_engine; + else + pkey_engine = eaptls_ssl_load_engine( pkey_engine_name ); diff -Nru ppp-2.4.5-eaptls-mppe-0.992/debian/patches/series ppp-2.4.5-eaptls-mppe-0.992/debian/patches/series --- ppp-2.4.5-eaptls-mppe-0.992/debian/patches/series 2012-04-04 16:17:04.000000000 +0000 +++ ppp-2.4.5-eaptls-mppe-0.992/debian/patches/series 2012-08-03 05:32:01.000000000 +0000 @@ -2,5 +2,5 @@ fix-missing-ssl-op-no-ticket.patch fix-lintian-errors.patch add-chap-passwd-hook.patch - configure.patch +mixed-engine-file-support.patch