Attachment #342678 for bug #462380

Lines 342-347 Link Here

(-)./Pound-2.7a/config.c (+9 lines)
342	SSL_CTX_set_verify(res->ctx, SSL_VERIFY_NONE, NULL);	342	SSL_CTX_set_verify(res->ctx, SSL_VERIFY_NONE, NULL);
343	SSL_CTX_set_mode(res->ctx, SSL_MODE_AUTO_RETRY);	343	SSL_CTX_set_mode(res->ctx, SSL_MODE_AUTO_RETRY);
344	SSL_CTX_set_options(res->ctx, SSL_OP_ALL);	344	SSL_CTX_set_options(res->ctx, SSL_OP_ALL);
		345	#ifdef SSL_OP_NO_COMPRESSION
		346	SSL_CTX_set_options(res->ctx, SSL_OP_NO_COMPRESSION);
		347	#endif
345	SSL_CTX_clear_options(res->ctx, SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION);	348	SSL_CTX_clear_options(res->ctx, SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION);
346	SSL_CTX_clear_options(res->ctx, SSL_OP_LEGACY_SERVER_CONNECT);	349	SSL_CTX_clear_options(res->ctx, SSL_OP_LEGACY_SERVER_CONNECT);
347	sprintf(lin, "%d-Pound-%ld", getpid(), random());	350	sprintf(lin, "%d-Pound-%ld", getpid(), random());
Lines 362-367 Link Here
362	SSL_CTX_set_verify(res->ctx, SSL_VERIFY_NONE, NULL);	365	SSL_CTX_set_verify(res->ctx, SSL_VERIFY_NONE, NULL);
363	SSL_CTX_set_mode(res->ctx, SSL_MODE_AUTO_RETRY);	366	SSL_CTX_set_mode(res->ctx, SSL_MODE_AUTO_RETRY);
364	SSL_CTX_set_options(res->ctx, SSL_OP_ALL);	367	SSL_CTX_set_options(res->ctx, SSL_OP_ALL);
		368	#ifdef SSL_OP_NO_COMPRESSION
		369	SSL_CTX_set_options(res->ctx, SSL_OP_NO_COMPRESSION);
		370	#endif
365	SSL_CTX_clear_options(res->ctx, SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION);	371	SSL_CTX_clear_options(res->ctx, SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION);
366	SSL_CTX_clear_options(res->ctx, SSL_OP_LEGACY_SERVER_CONNECT);	372	SSL_CTX_clear_options(res->ctx, SSL_OP_LEGACY_SERVER_CONNECT);
367	sprintf(lin, "%d-Pound-%ld", getpid(), random());	373	sprintf(lin, "%d-Pound-%ld", getpid(), random());
Lines 902-907 Link Here
902	POUND_CTX *pc;	908	POUND_CTX *pc;
903		909
904	ssl_op_enable = SSL_OP_ALL;	910	ssl_op_enable = SSL_OP_ALL;
		911	#ifdef SSL_OP_NO_COMPRESSION
		912	ssl_op_enable \|= SSL_OP_NO_COMPRESSION;
		913	#endif
905	ssl_op_disable = SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION \| SSL_OP_LEGACY_SERVER_CONNECT;	914	ssl_op_disable = SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION \| SSL_OP_LEGACY_SERVER_CONNECT;
906		915
907	if((res = (LISTENER *)malloc(sizeof(LISTENER))) == NULL)	916	if((res = (LISTENER *)malloc(sizeof(LISTENER))) == NULL)




    CRYPTO_set_locking_callback(l_lock);
    init_timer();

    /* Disable SSL Compression for OpenSSL pre-1.0.  1.0 is handled with an option in config.c */
#if OPENSSL_VERSION_NUMBER >= 0x00907000L
#ifndef SSL_OP_NO_COMPRESSION
    {
      int i,n;
      STACK_OF(SSL_COMP) *ssl_comp_methods;

      ssl_comp_methods = SSL_COMP_get_compression_methods();
      n = sk_SSL_COMP_num(ssl_comp_methods);

      for(i=n-1; i>=0; i--) {
        sk_SSL_COMP_delete(ssl_comp_methods, i);
      }
    }
#endif
#endif

    /* prepare regular expressions */
    if(regcomp(&HEADER, "^([a-z0-9!#$%&'*+.^_`|~-]+):[ \t]*(.*)[ \t]*$", REG_ICASE | REG_NEWLINE | REG_EXTENDED)
    || regcomp(&CHUNK_HEAD, "^([0-9a-f]+).*$", REG_ICASE | REG_NEWLINE | REG_EXTENDED)

Return to bug 462380

Lines 267-272 Link Here

(-)./Pound-2.7a/pound.c (+17 lines)
267	CRYPTO_set_locking_callback(l_lock);	267	CRYPTO_set_locking_callback(l_lock);
268	init_timer();	268	init_timer();
269		269
		270	/* Disable SSL Compression for OpenSSL pre-1.0. 1.0 is handled with an option in config.c */
		271	#if OPENSSL_VERSION_NUMBER >= 0x00907000L
		272	#ifndef SSL_OP_NO_COMPRESSION
		273	{
		274	int i,n;
		275	STACK_OF(SSL_COMP) *ssl_comp_methods;
		276
		277	ssl_comp_methods = SSL_COMP_get_compression_methods();
		278	n = sk_SSL_COMP_num(ssl_comp_methods);
		279
		280	for(i=n-1; i>=0; i--) {
		281	sk_SSL_COMP_delete(ssl_comp_methods, i);
		282	}
		283	}
		284	#endif
		285	#endif
		286
270	/* prepare regular expressions */	287	/* prepare regular expressions */
271	if(regcomp(&HEADER, "^([a-z0-9!#$%&'+.^_`\|~-]+):[ \t](.)[ \t]$", REG_ICASE \| REG_NEWLINE \| REG_EXTENDED)	288	if(regcomp(&HEADER, "^([a-z0-9!#$%&'+.^_`\|~-]+):[ \t](.)[ \t]$", REG_ICASE \| REG_NEWLINE \| REG_EXTENDED)
272	\|\| regcomp(&CHUNK_HEAD, "^([0-9a-f]+).*$", REG_ICASE \| REG_NEWLINE \| REG_EXTENDED)	289	\|\| regcomp(&CHUNK_HEAD, "^([0-9a-f]+).*$", REG_ICASE \| REG_NEWLINE \| REG_EXTENDED)