summaryrefslogtreecommitdiff
path: root/src/lib/libssl/s3_srvr.c
diff options
context:
space:
mode:
authordoug <>2015-06-15 05:32:58 +0000
committerdoug <>2015-06-15 05:32:58 +0000
commitb5c7960f11d2b64faae5154f9709f34d00462124 (patch)
tree48e9bd19ccb5bd20c0b80b96fa9a62b66846edb4 /src/lib/libssl/s3_srvr.c
parent6e37f91580bf8e077c11c85155cef0381d8ef35c (diff)
downloadopenbsd-b5c7960f11d2b64faae5154f9709f34d00462124.tar.gz
openbsd-b5c7960f11d2b64faae5154f9709f34d00462124.tar.bz2
openbsd-b5c7960f11d2b64faae5154f9709f34d00462124.zip
Remove ancient SSL_OP_NETSCAPE_CA_DN_BUG from SSLeay days.
This commit matches the OpenSSL removal in commit 3c33c6f6b10864355553961e638514a6d1bb00f6. ok deraadt@
Diffstat (limited to 'src/lib/libssl/s3_srvr.c')
-rw-r--r--src/lib/libssl/s3_srvr.c20
1 files changed, 5 insertions, 15 deletions
diff --git a/src/lib/libssl/s3_srvr.c b/src/lib/libssl/s3_srvr.c
index 7b6af070c9..1aa39c2863 100644
--- a/src/lib/libssl/s3_srvr.c
+++ b/src/lib/libssl/s3_srvr.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: s3_srvr.c,v 1.105 2015/06/15 05:16:56 doug Exp $ */ 1/* $OpenBSD: s3_srvr.c,v 1.106 2015/06/15 05:32:58 doug Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -1678,20 +1678,10 @@ ssl3_send_certificate_request(SSL *s)
1678 goto err; 1678 goto err;
1679 } 1679 }
1680 p = (unsigned char *)&(buf->data[4 + n]); 1680 p = (unsigned char *)&(buf->data[4 + n]);
1681 if (!(s->options & SSL_OP_NETSCAPE_CA_DN_BUG)) { 1681 s2n(j, p);
1682 s2n(j, p); 1682 i2d_X509_NAME(name, &p);
1683 i2d_X509_NAME(name, &p); 1683 n += 2 + j;
1684 n += 2 + j; 1684 nl += 2 + j;
1685 nl += 2 + j;
1686 } else {
1687 d = p;
1688 i2d_X509_NAME(name, &p);
1689 j -= 2;
1690 s2n(j, d);
1691 j += 2;
1692 n += j;
1693 nl += j;
1694 }
1695 } 1685 }
1696 } 1686 }
1697 /* else no CA names */ 1687 /* else no CA names */