diff -Nru openssl-0.9.8o/debian/changelog openssl-0.9.8o/debian/changelog
--- openssl-0.9.8o/debian/changelog	2010-11-30 05:34:27.000000000 +0100
+++ openssl-0.9.8o/debian/changelog	2010-12-23 21:02:47.000000000 +0100
@@ -1,3 +1,40 @@
+openssl (0.9.8o-4ubuntu1) natty; urgency=low
+
+  * Merge from debian unstable.  Remaining changes: (LP: #693902)
+    - debian/patches/Bsymbolic-functions.patch: Link using
+      -Bsymbolic-functions.
+    - Use a different priority for libssl0.9.8/restart-services
+      depending on whether a desktop, or server dist-upgrade is being
+      performed.
+    - Display a system restart required notification bubble on libssl0.9.8
+      upgrade.
+    - Don't build for processors no longer supported: i486, i586
+      (on i386), v8 (on sparc).
+    - Create libssl0.9.8-udeb, for the benefit of wget-udeb (no
+      wget-udeb package in Debian).
+    - Replace duplicate files in the doc directory with symlinks.
+    - Move runtime libraries to /lib, for the benefit of wpasupplicant.
+    - Ship documentation in openssl-doc, suggested by the package.
+      (Closes: #470594)
+    - Use host compiler when cross-building. Patch from Neil Williams.
+      (Closes: #465248).
+    - Don't run 'make test' when cross-building.
+    - debian/patches/aesni.patch: Backport Intel AES-NI support from
+      http://rt.openssl.org/Ticket/Display.html?id=2067 (refreshed)
+    - debian/patches/perlpath-quilt.patch: Don't change perl #! paths
+      under .pc.
+    - debian/patches/no-sslv2.patch: disable SSLv2 to match NSS
+      and GnuTLS. The protocol is unsafe and extremely deprecated.
+      (Closes: #589706)
+
+ -- Artur Rona <ari-tczew@ubuntu.com>  Thu, 23 Dec 2010 20:20:03 +0100
+
+openssl (0.9.8o-4) unstable; urgency=low
+
+  * Fix CVE-2010-4180 (Closes: #529221)
+
+ -- Kurt Roeckx <kurt@roeckx.be>  Mon, 06 Dec 2010 20:33:21 +0100
+
 openssl (0.9.8o-3ubuntu1) natty; urgency=low
 
   * Merge from debian unstable (LP: #677756).  Remaining changes:
diff -Nru openssl-0.9.8o/debian/patches/CVE-2010-4180.patch openssl-0.9.8o/debian/patches/CVE-2010-4180.patch
--- openssl-0.9.8o/debian/patches/CVE-2010-4180.patch	1970-01-01 01:00:00.000000000 +0100
+++ openssl-0.9.8o/debian/patches/CVE-2010-4180.patch	2010-12-06 20:33:57.000000000 +0100
@@ -0,0 +1,63 @@
+diff --git a/doc/ssl/SSL_CTX_set_options.pod b/doc/ssl/SSL_CTX_set_options.pod
+index 06025d1..a703ce0 100644
+--- a/doc/ssl/SSL_CTX_set_options.pod
++++ b/doc/ssl/SSL_CTX_set_options.pod
+@@ -78,18 +78,7 @@ this breaks this server so 16 bytes is the way to go.
+ 
+ =item SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG
+ 
+-ssl3.netscape.com:443, first a connection is established with RC4-MD5.
+-If it is then resumed, we end up using DES-CBC3-SHA.  It should be
+-RC4-MD5 according to 7.6.1.3, 'cipher_suite'.
+-
+-Netscape-Enterprise/2.01 (https://merchant.netscape.com) has this bug.
+-It only really shows up when connecting via SSLv2/v3 then reconnecting
+-via SSLv3. The cipher list changes....
+-
+-NEW INFORMATION.  Try connecting with a cipher list of just
+-DES-CBC-SHA:RC4-MD5.  For some weird reason, each new connection uses
+-RC4-MD5, but a re-connect tries to use DES-CBC-SHA.  So netscape, when
+-doing a re-connect, always takes the first cipher in the cipher list.
++As of OpenSSL 0.9.8q and 1.0.0c, this option has no effect.
+ 
+ =item SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG
+ 
+diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
+index f0995b9..a7cb7a1 100644
+--- a/ssl/s3_clnt.c
++++ b/ssl/s3_clnt.c
+@@ -814,8 +814,11 @@ int ssl3_get_server_hello(SSL *s)
+ 		s->session->cipher_id = s->session->cipher->id;
+ 	if (s->hit && (s->session->cipher_id != c->id))
+ 		{
++/* Workaround is now obsolete */
++#if 0
+ 		if (!(s->options &
+ 			SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG))
++#endif
+ 			{
+ 			al=SSL_AD_ILLEGAL_PARAMETER;
+ 			SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_OLD_SESSION_CIPHER_NOT_RETURNED);
+diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
+index e696450..e2d570f 100644
+--- a/ssl/s3_srvr.c
++++ b/ssl/s3_srvr.c
+@@ -927,6 +927,10 @@ int ssl3_get_client_hello(SSL *s)
+ 				break;
+ 				}
+ 			}
++/* Disabled because it can be used in a ciphersuite downgrade
++ * attack: CVE-2010-4180.
++ */
++#if 0
+ 		if (j == 0 && (s->options & SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG) && (sk_SSL_CIPHER_num(ciphers) == 1))
+ 			{
+ 			/* Special case as client bug workaround: the previously used cipher may
+@@ -941,6 +945,7 @@ int ssl3_get_client_hello(SSL *s)
+ 				j = 1;
+ 				}
+ 			}
++#endif
+ 		if (j == 0)
+ 			{
+ 			/* we need to have the cipher in the cipher
diff -Nru openssl-0.9.8o/debian/patches/series openssl-0.9.8o/debian/patches/series
--- openssl-0.9.8o/debian/patches/series	2010-11-30 05:34:27.000000000 +0100
+++ openssl-0.9.8o/debian/patches/series	2010-12-23 20:18:34.000000000 +0100
@@ -20,6 +20,7 @@
 perl-path.diff
 CVE-2010-2939.patch
 CVE-2010-3864.patch
+CVE-2010-4180.patch
 aesni.patch
 perlpath-quilt.patch
 Bsymbolic-functions.patch