From 847ac4f3363ebdc4e2eb4fa462a09443256a1c38 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Mon, 30 Jul 2007 03:30:27 +0100 Subject: [PATCH] tls_change_cipher() can complain about null cipher and digest algorithms; we only need the pubkey check disabled (and only because pubkey algorithms are not yet integrated into the crypto_algorithm subsystem). --- src/net/tls.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/net/tls.c b/src/net/tls.c index dcdb6601..64e44b55 100644 --- a/src/net/tls.c +++ b/src/net/tls.c @@ -498,16 +498,14 @@ static int tls_change_cipher ( struct tls_session *tls, struct tls_cipherspec *pending, struct tls_cipherspec *active ) { - /* FIXME: Why is this disabled? */ -#if 0 /* Sanity check */ - if ( ( pending->pubkey == &crypto_null ) || + if ( /* FIXME (when pubkey is not hard-coded to RSA): + * ( pending->pubkey == &crypto_null ) || */ ( pending->cipher == &crypto_null ) || ( pending->digest == &crypto_null ) ) { DBGC ( tls, "TLS %p refusing to use null cipher\n", tls ); return -ENOTSUP; } -#endif tls_clear_cipher ( tls, active ); memswap ( active, pending, sizeof ( *active ) );