diff options
| author |   jsing <jsing@openbsd.org> | 2014-12-14 14:34:43 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2014-12-14 14:34:43 +0000 |
| commit | 40eee476bc542a54d0b4254d1b38f5f6d772008a (patch) | |
| tree | f02df65af446d9e21886555ef5b97d2e4db7f5e6 /lib/libssl/s3_lib.c | |
| parent | unifdef NETSCAPE_HANG_BUG from the DTLS code. The code is not currently (diff) | |
| download | wireguard-openbsd-40eee476bc542a54d0b4254d1b38f5f6d772008a.tar.xz wireguard-openbsd-40eee476bc542a54d0b4254d1b38f5f6d772008a.zip | |
unifdef OPENSSL_NO_NEXTPROTONEG, which is one of the last standing #ifndef
mazes in libssl. NPN is being replaced by ALPN, however it is still going
to be around for a while yet.
ok miod@
Diffstat (limited to 'lib/libssl/s3_lib.c')
| -rw-r--r-- | lib/libssl/s3_lib.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/libssl/s3_lib.c b/lib/libssl/s3_lib.c index 4beee2d53c4..21e339525cb 100644 --- a/lib/libssl/s3_lib.c +++ b/lib/libssl/s3_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: s3_lib.c,v 1.87 2014/12/10 15:36:47 jsing Exp $ */ +/* $OpenBSD: s3_lib.c,v 1.88 2014/12/14 14:34:43 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -1927,11 +1927,9 @@ ssl3_clear(SSL *s) s->s3->in_read_app_data = 0; s->version = SSL3_VERSION; -#ifndef OPENSSL_NO_NEXTPROTONEG free(s->next_proto_negotiated); s->next_proto_negotiated = NULL; s->next_proto_negotiated_len = 0; -#endif } |