summaryrefslogtreecommitdiff
path: root/src/lib/libssl/d1_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/d1_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/d1_srvr.c')
-rw-r--r--src/lib/libssl/d1_srvr.c20
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 @@
1/* $OpenBSD: d1_srvr.c,v 1.52 2015/06/13 08:38:10 doug Exp $ */ 1/* $OpenBSD: d1_srvr.c,v 1.53 2015/06/15 05:32:58 doug Exp $ */
2/* 2/*
3 * DTLS implementation written by Nagendra Modadugu 3 * DTLS implementation written by Nagendra Modadugu
4 * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. 4 * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
@@ -1164,20 +1164,10 @@ dtls1_send_certificate_request(SSL *s)
1164 goto err; 1164 goto err;
1165 } 1165 }
1166 p = (unsigned char *)&(buf->data[DTLS1_HM_HEADER_LENGTH + n]); 1166 p = (unsigned char *)&(buf->data[DTLS1_HM_HEADER_LENGTH + n]);
1167 if (!(s->options & SSL_OP_NETSCAPE_CA_DN_BUG)) { 1167 s2n(j, p);
1168 s2n(j, p); 1168 i2d_X509_NAME(name, &p);
1169 i2d_X509_NAME(name, &p); 1169 n += 2 + j;
1170 n += 2 + j; 1170 nl += 2 + j;
1171 nl += 2 + j;
1172 } else {
1173 d = p;
1174 i2d_X509_NAME(name, &p);
1175 j -= 2;
1176 s2n(j, d);
1177 j += 2;
1178 n += j;
1179 nl += j;
1180 }
1181 } 1171 }
1182 } 1172 }
1183 /* else no CA names */ 1173 /* else no CA names */