diff options
| author |   doug <doug@openbsd.org> | 2015-06-15 05:32:58 +0000 |
|---|---|---|
| committer | doug <doug@openbsd.org> | 2015-06-15 05:32:58 +0000 |
| commit | dcf079f536f13fe347bbf1407f92735cce5c1ae2 (patch) | |
| tree | 35d85b7b34efc36bb277e21c1a606d2d968fb040 /lib/libssl/src/ssl/s3_srvr.c | |
| parent | Remove ancient compat hack SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG. (diff) | |
| download | wireguard-openbsd-dcf079f536f13fe347bbf1407f92735cce5c1ae2.tar.xz wireguard-openbsd-dcf079f536f13fe347bbf1407f92735cce5c1ae2.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 'lib/libssl/src/ssl/s3_srvr.c')
| -rw-r--r-- | lib/libssl/src/ssl/s3_srvr.c | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/lib/libssl/src/ssl/s3_srvr.c b/lib/libssl/src/ssl/s3_srvr.c index 7b6af070c97..1aa39c28635 100644 --- a/lib/libssl/src/ssl/s3_srvr.c +++ b/lib/libssl/src/ssl/s3_srvr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: s3_srvr.c,v 1.105 2015/06/15 05:16:56 doug Exp $ */ +/* $OpenBSD: s3_srvr.c,v 1.106 2015/06/15 05:32:58 doug Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -1678,20 +1678,10 @@ ssl3_send_certificate_request(SSL *s) goto err; } p = (unsigned char *)&(buf->data[4 + 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 */ |