diff options
| author | Bodo Möller <bodo@openssl.org> | 2007-02-17 06:45:38 +0000 |
|---|---|---|
| committer | Bodo Möller <bodo@openssl.org> | 2007-02-17 06:45:38 +0000 |
| commit | 52b8dad8ec6eb0dcada52851af5f9498af7a91be (patch) | |
| tree | ea3f77d4784d2d5faf4c1e31f1b28dcece2fdcae /ssl/s3_enc.c | |
| parent | cc684e330b61975a4c478e01a46ca687106eebbf (diff) | |
Reorganize the data used for SSL ciphersuite pattern matching.
This change resolves a number of problems and obviates multiple kludges.
A new feature is that you can now say "AES256" or "AES128" (not just
"AES", which enables both).
In some cases the ciphersuite list generated from a given string is
affected by this change. I hope this is just in those cases where the
previous behaviour did not make sense.
Diffstat (limited to 'ssl/s3_enc.c')
| -rw-r--r-- | ssl/s3_enc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ssl/s3_enc.c b/ssl/s3_enc.c index 1690663e04..8f3ba93d61 100644 --- a/ssl/s3_enc.c +++ b/ssl/s3_enc.c @@ -56,7 +56,7 @@ * [including the GNU Public Licence.] */ /* ==================================================================== - * Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved. + * Copyright (c) 1998-2007 The OpenSSL Project. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -430,11 +430,11 @@ int ssl3_setup_key_block(SSL *s) if (s->session->cipher != NULL) { - if ((s->session->cipher->algorithms & SSL_ENC_MASK) == SSL_eNULL) + if (s->session->cipher->algorithm_enc == SSL_eNULL) s->s3->need_empty_fragments = 0; #ifndef OPENSSL_NO_RC4 - if ((s->session->cipher->algorithms & SSL_ENC_MASK) == SSL_RC4) + if (s->session->cipher->algorithm_enc == SSL_RC4) s->s3->need_empty_fragments = 0; #endif } |