diff options
| author |   jsing <jsing@openbsd.org> | 2014-08-23 14:52:41 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2014-08-23 14:52:41 +0000 |
| commit | 0b57eba065d81bf38258c4261f5ed3bc37321c3e (patch) | |
| tree | 8816178d1ba55291fd8e8dd22463ec8be7263b00 /lib/libssl/s3_lib.c | |
| parent | oddly now needs sys/socket.h, because someone removed struct socket fwd (diff) | |
| download | wireguard-openbsd-0b57eba065d81bf38258c4261f5ed3bc37321c3e.tar.xz wireguard-openbsd-0b57eba065d81bf38258c4261f5ed3bc37321c3e.zip | |
Replace the remaining ssl3_get_cipher_by_char() calls with n2s() and
ssl3_get_cipher_by_id().
ok bcook@
Diffstat (limited to 'lib/libssl/s3_lib.c')
| -rw-r--r-- | lib/libssl/s3_lib.c | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/lib/libssl/s3_lib.c b/lib/libssl/s3_lib.c index 1d84effeeab..1578f0388dc 100644 --- a/lib/libssl/s3_lib.c +++ b/lib/libssl/s3_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: s3_lib.c,v 1.76 2014/08/11 01:06:22 jsing Exp $ */ +/* $OpenBSD: s3_lib.c,v 1.77 2014/08/23 14:52:41 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -2452,28 +2452,6 @@ ssl3_ctx_callback_ctrl(SSL_CTX *ctx, int cmd, void (*fp)(void)) return (1); } -/* This function needs to check if the ciphers required are actually - * available */ -const SSL_CIPHER * -ssl3_get_cipher_by_char(const unsigned char *p) -{ - SSL_CIPHER c; - const SSL_CIPHER *cp; - unsigned long id; - - id = 0x03000000L | ((unsigned long)p[0] << 8L) | (unsigned long)p[1]; - c.id = id; - cp = OBJ_bsearch_ssl_cipher_id(&c, ssl3_ciphers, SSL3_NUM_CIPHERS); -#ifdef DEBUG_PRINT_UNKNOWN_CIPHERSUITES - if (cp == NULL) - fprintf(stderr, "Unknown cipher ID %x\n", (p[0] << 8) | p[1]); -#endif - if (cp == NULL || cp->valid == 0) - return NULL; - else - return cp; -} - int ssl3_put_cipher_by_char(const SSL_CIPHER *c, unsigned char *p) { |