diff options
| author |   djm <djm@openbsd.org> | 2009-04-06 06:33:15 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2009-04-06 06:33:15 +0000 |
| commit | 50c17820b957a3701405f7c9e3c78d197e41b584 (patch) | |
| tree | 6d48b4de4458fad1c083c58332f58788b1b098d9 /lib/libssl/ssl_ciph.c | |
| parent | import of OpenSSL 0.9.8k (diff) | |
| download | wireguard-openbsd-50c17820b957a3701405f7c9e3c78d197e41b584.tar.xz wireguard-openbsd-50c17820b957a3701405f7c9e3c78d197e41b584.zip | |
resolve conflicts
Diffstat (limited to 'lib/libssl/ssl_ciph.c')
| -rw-r--r-- | lib/libssl/ssl_ciph.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/libssl/ssl_ciph.c b/lib/libssl/ssl_ciph.c index 4116fd12f1a..e9c9a083065 100644 --- a/lib/libssl/ssl_ciph.c +++ b/lib/libssl/ssl_ciph.c @@ -1355,7 +1355,7 @@ int SSL_COMP_add_compression_method(int id, COMP_METHOD *cm) comp->method=cm; load_builtin_compressions(); if (ssl_comp_methods - && !sk_SSL_COMP_find(ssl_comp_methods,comp)) + && sk_SSL_COMP_find(ssl_comp_methods,comp) >= 0) { OPENSSL_free(comp); MemCheck_on(); |