diff options
| author | miod <> | 2014-06-18 04:47:32 +0000 |
|---|---|---|
| committer | miod <> | 2014-06-18 04:47:32 +0000 |
| commit | 90898c5c996c55a6812496bd7309c1d5b4deb695 (patch) | |
| tree | a107dc5341e432490de042228f41049ec965b2c8 /src/lib/libssl/ssl_ciph.c | |
| parent | a04ecd090853b75561f72a47526e760f3f9467bb (diff) | |
| download | openbsd-90898c5c996c55a6812496bd7309c1d5b4deb695.tar.gz openbsd-90898c5c996c55a6812496bd7309c1d5b4deb695.tar.bz2 openbsd-90898c5c996c55a6812496bd7309c1d5b4deb695.zip | |
In SSL_COMP_add_compression_method(), make sure error cases actually return
`error' rather than `success'.
ok deraadt@
Diffstat (limited to 'src/lib/libssl/ssl_ciph.c')
| -rw-r--r-- | src/lib/libssl/ssl_ciph.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libssl/ssl_ciph.c b/src/lib/libssl/ssl_ciph.c index a89c8253c8..d491a0cab6 100644 --- a/src/lib/libssl/ssl_ciph.c +++ b/src/lib/libssl/ssl_ciph.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ssl_ciph.c,v 1.53 2014/06/13 13:28:53 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_ciph.c,v 1.54 2014/06/18 04:47:32 miod Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -2029,7 +2029,7 @@ SSL_COMP_add_compression_method(int id, COMP_METHOD *cm) | |||
| 2029 | if (id < 193 || id > 255) { | 2029 | if (id < 193 || id > 255) { |
| 2030 | SSLerr(SSL_F_SSL_COMP_ADD_COMPRESSION_METHOD, | 2030 | SSLerr(SSL_F_SSL_COMP_ADD_COMPRESSION_METHOD, |
| 2031 | SSL_R_COMPRESSION_ID_NOT_WITHIN_PRIVATE_RANGE); | 2031 | SSL_R_COMPRESSION_ID_NOT_WITHIN_PRIVATE_RANGE); |
| 2032 | return 0; | 2032 | return 1; |
| 2033 | } | 2033 | } |
| 2034 | 2034 | ||
| 2035 | comp = malloc(sizeof(SSL_COMP)); | 2035 | comp = malloc(sizeof(SSL_COMP)); |
