diff options
| author |   jsing <jsing@openbsd.org> | 2014-08-10 14:42:55 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2014-08-10 14:42:55 +0000 |
| commit | 3e6620b05005703104bc76bb7ab704a725e99897 (patch) | |
| tree | 43645363ec33870f6339e73eec118c9ae7acba82 /lib/libssl/s23_lib.c | |
| parent | Ask for the descriptor size corresponding to the number of ports present (diff) | |
| download | wireguard-openbsd-3e6620b05005703104bc76bb7ab704a725e99897.tar.xz wireguard-openbsd-3e6620b05005703104bc76bb7ab704a725e99897.zip | |
Since we no longer need to support SSLv2-style cipher lists, start
unravelling the maze of function pointers and callbacks by directly
calling ssl3_{get,put}_cipher_by_char() and removing the
ssl_{get,put}_cipher_by_char macros.
Prompted by similar changes in boringssl.
ok guenther.
Diffstat (limited to 'lib/libssl/s23_lib.c')
| -rw-r--r-- | lib/libssl/s23_lib.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/lib/libssl/s23_lib.c b/lib/libssl/s23_lib.c index 643910be697..3a6d1d598bc 100644 --- a/lib/libssl/s23_lib.c +++ b/lib/libssl/s23_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: s23_lib.c,v 1.16 2014/07/11 08:17:36 miod Exp $ */ +/* $OpenBSD: s23_lib.c,v 1.17 2014/08/10 14:42:56 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -67,21 +67,6 @@ ssl23_default_timeout(void) } int -ssl23_put_cipher_by_char(const SSL_CIPHER *c, unsigned char *p) -{ - long l; - - /* We can write SSLv2 and SSLv3 ciphers */ - if (p != NULL) { - l = c->id; - p[0] = ((unsigned char)(l >> 16L))&0xFF; - p[1] = ((unsigned char)(l >> 8L))&0xFF; - p[2] = ((unsigned char)(l ))&0xFF; - } - return (3); -} - -int ssl23_read(SSL *s, void *buf, int len) { int n; |