1 files changed, 5 insertions, 15 deletions

diff --git a/src/lib/libssl/d1_srvr.c b/src/lib/libssl/d1_srvr.c
index bd3a8e1a42..42af17e96e 100644
--- a/src/lib/libssl/d1_srvr.c
+++ b/src/lib/libssl/d1_srvr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: d1_srvr.c,v 1.52 2015/06/13 08:38:10 doug Exp $ */
+/* $OpenBSD: d1_srvr.c,v 1.53 2015/06/15 05:32:58 doug Exp $ */
 /*
  * DTLS implementation written by Nagendra Modadugu
  * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
@@ -1164,20 +1164,10 @@ dtls1_send_certificate_request(SSL *s)
                                         goto err;
                                 }
                                 p = (unsigned char *)&(buf->data[DTLS1_HM_HEADER_LENGTH + n]);
-                                if (!(s->options & SSL_OP_NETSCAPE_CA_DN_BUG)) {
-                                        s2n(j, p);
-                                        i2d_X509_NAME(name, &p);
-                                        n += 2 + j;
-                                        nl += 2 + j;
-                                } else {
-                                        d = p;
-                                        i2d_X509_NAME(name, &p);
-                                        j -= 2;
-                                        s2n(j, d);
-                                        j += 2;
-                                        n += j;
-                                        nl += j;
-                                }
+                                s2n(j, p);
+                                i2d_X509_NAME(name, &p);
+                                n += 2 + j;
+                                nl += 2 + j;
                         }
                 }
                 /* else no CA names */