projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make OPENSSL_NO_COMP compile again.
[openssl.git]
/
ssl
/
ssl_ciph.c
diff --git
a/ssl/ssl_ciph.c
b/ssl/ssl_ciph.c
index 8c2e1c305e4d3db4f97d93dfcdb42fbb2c683c66..cdd7a9ae74d682e2d4eb6651a17a46eb482d06ce 100644
(file)
--- a/
ssl/ssl_ciph.c
+++ b/
ssl/ssl_ciph.c
@@
-192,6
+192,9
@@
void ssl_load_ciphers(void)
EVP_get_digestbyname(SN_sha1);
}
EVP_get_digestbyname(SN_sha1);
}
+
+#ifndef OPENSSL_NO_COMP
+
static int sk_comp_cmp(const SSL_COMP * const *a,
const SSL_COMP * const *b)
{
static int sk_comp_cmp(const SSL_COMP * const *a,
const SSL_COMP * const *b)
{
@@
-231,6
+234,7
@@
static void load_builtin_compressions(void)
}
CRYPTO_w_unlock(CRYPTO_LOCK_SSL);
}
}
CRYPTO_w_unlock(CRYPTO_LOCK_SSL);
}
+#endif
int ssl_cipher_get_evp(const SSL_SESSION *s, const EVP_CIPHER **enc,
const EVP_MD **md, SSL_COMP **comp)
int ssl_cipher_get_evp(const SSL_SESSION *s, const EVP_CIPHER **enc,
const EVP_MD **md, SSL_COMP **comp)
@@
-243,8
+247,9
@@
int ssl_cipher_get_evp(const SSL_SESSION *s, const EVP_CIPHER **enc,
if (comp != NULL)
{
SSL_COMP ctmp;
if (comp != NULL)
{
SSL_COMP ctmp;
-
+#ifndef OPENSSL_NO_COMP
load_builtin_compressions();
load_builtin_compressions();
+#endif
*comp=NULL;
ctmp.id=s->compress_meth;
*comp=NULL;
ctmp.id=s->compress_meth;
@@
-1131,6
+1136,21
@@
SSL_COMP *ssl3_comp_find(STACK_OF(SSL_COMP) *sk, int n)
return(NULL);
}
return(NULL);
}
+#ifdef OPENSSL_NO_COMP
+void *SSL_COMP_get_compression_methods(void)
+ {
+ return NULL;
+ }
+int SSL_COMP_add_compression_method(int id, void *cm)
+ {
+ return 1;
+ }
+
+const char *SSL_COMP_get_name(const void *comp)
+ {
+ return NULL;
+ }
+#else
STACK_OF(SSL_COMP) *SSL_COMP_get_compression_methods(void)
{
load_builtin_compressions();
STACK_OF(SSL_COMP) *SSL_COMP_get_compression_methods(void)
{
load_builtin_compressions();
@@
-1191,3
+1211,4
@@
const char *SSL_COMP_get_name(const COMP_METHOD *comp)
return NULL;
}
return NULL;
}
+#endif