Add the possibility to specify the use of zlib compression and
decompression. It can be set up to link at link time or to load the zlib library at run-time.
This commit is contained in:
parent
a0256f462a
commit
e452de9d87
3
CHANGES
3
CHANGES
@ -12,6 +12,9 @@
|
|||||||
*) applies to 0.9.6a/0.9.6b and 0.9.7
|
*) applies to 0.9.6a/0.9.6b and 0.9.7
|
||||||
+) applies to 0.9.7 only
|
+) applies to 0.9.7 only
|
||||||
|
|
||||||
|
+) Add configuration choices to get zlib compression for TLS.
|
||||||
|
[Richard Levitte]
|
||||||
|
|
||||||
+) Changes to Kerberos SSL for RFC 2712 compliance:
|
+) Changes to Kerberos SSL for RFC 2712 compliance:
|
||||||
1. Implemented real KerberosWrapper, instead of just using
|
1. Implemented real KerberosWrapper, instead of just using
|
||||||
KRB5 AP_REQ message. [Thanks to Simon Wilkinson <sxw@sxw.org.uk>]
|
KRB5 AP_REQ message. [Thanks to Simon Wilkinson <sxw@sxw.org.uk>]
|
||||||
|
33
Configure
33
Configure
@ -10,7 +10,7 @@ use strict;
|
|||||||
|
|
||||||
# see INSTALL for instructions.
|
# see INSTALL for instructions.
|
||||||
|
|
||||||
my $usage="Usage: Configure [no-<cipher> ...] [-Dxxx] [-lxxx] [-Lxxx] [-fxxx] [-Kxxx] [no-hw-xxx|no-hw] [no-threads] [no-asm] [no-dso] [no-krb5] [386] [--prefix=DIR] [--openssldir=OPENSSLDIR] [--with-xxx=vvv] os/compiler[:flags]\n";
|
my $usage="Usage: Configure [no-<cipher> ...] [-Dxxx] [-lxxx] [-Lxxx] [-fxxx] [-Kxxx] [no-hw-xxx|no-hw] [[no-]threads] [[no-]shared] [[no-]zlib|zlib-dynamic] [no-asm] [no-dso] [no-krb5] [386] [--prefix=DIR] [--openssldir=OPENSSLDIR] [--with-xxx[=vvv]] os/compiler[:flags]\n";
|
||||||
|
|
||||||
# Options:
|
# Options:
|
||||||
#
|
#
|
||||||
@ -25,13 +25,15 @@ my $usage="Usage: Configure [no-<cipher> ...] [-Dxxx] [-lxxx] [-Lxxx] [-fxxx] [-
|
|||||||
#
|
#
|
||||||
# --with-krb5-dir Declare where Kerberos 5 lives. The libraries are expected
|
# --with-krb5-dir Declare where Kerberos 5 lives. The libraries are expected
|
||||||
# to live in the subdirectory lib/ and the header files in
|
# to live in the subdirectory lib/ and the header files in
|
||||||
# include/.
|
# include/. A value is required.
|
||||||
# --with-krb5-lib Declare where the Kerberos 5 libraries live.
|
# --with-krb5-lib Declare where the Kerberos 5 libraries live. A value is
|
||||||
|
# required.
|
||||||
# (Default: KRB5_DIR/lib)
|
# (Default: KRB5_DIR/lib)
|
||||||
# --with-krb5-include Declare where the Kerberos 5 header files live.
|
# --with-krb5-include Declare where the Kerberos 5 header files live. A
|
||||||
|
# value is required.
|
||||||
# (Default: KRB5_DIR/include)
|
# (Default: KRB5_DIR/include)
|
||||||
# --with-krb5-flavor Declare what flavor of Kerberos 5 is used. Currently
|
# --with-krb5-flavor Declare what flavor of Kerberos 5 is used. Currently
|
||||||
# supported values are "MIT" and "Heimdal".
|
# supported values are "MIT" and "Heimdal". A value is required.
|
||||||
#
|
#
|
||||||
# no-hw-xxx do not compile support for specific crypto hardware.
|
# no-hw-xxx do not compile support for specific crypto hardware.
|
||||||
# Generic OpenSSL-style methods relating to this support
|
# Generic OpenSSL-style methods relating to this support
|
||||||
@ -46,6 +48,9 @@ my $usage="Usage: Configure [no-<cipher> ...] [-Dxxx] [-lxxx] [-Lxxx] [-fxxx] [-
|
|||||||
# no-dso do not compile in any native shared-library methods. This
|
# no-dso do not compile in any native shared-library methods. This
|
||||||
# will ensure that all methods just return NULL.
|
# will ensure that all methods just return NULL.
|
||||||
# no-krb5 do not compile in any KRB5 library or code.
|
# no-krb5 do not compile in any KRB5 library or code.
|
||||||
|
# [no-]zlib [don't] compile support for zlib compression.
|
||||||
|
# zlib-dynamic Like "zlib", but the zlib library is expected to be a shared
|
||||||
|
# library and will be loaded in run-time by the OpenSSL library.
|
||||||
# 386 generate 80386 code
|
# 386 generate 80386 code
|
||||||
# no-<cipher> build without specified algorithm (rsa, idea, rc5, ...)
|
# no-<cipher> build without specified algorithm (rsa, idea, rc5, ...)
|
||||||
# -<xxx> +<xxx> compiler options are passed through
|
# -<xxx> +<xxx> compiler options are passed through
|
||||||
@ -467,6 +472,7 @@ my $exe_ext="";
|
|||||||
my $install_prefix="";
|
my $install_prefix="";
|
||||||
my $no_threads=0;
|
my $no_threads=0;
|
||||||
my $no_shared=1;
|
my $no_shared=1;
|
||||||
|
my $zlib=2;
|
||||||
my $no_krb5=0;
|
my $no_krb5=0;
|
||||||
my $threads=0;
|
my $threads=0;
|
||||||
my $no_asm=0;
|
my $no_asm=0;
|
||||||
@ -567,6 +573,12 @@ PROCESS_ARGS:
|
|||||||
{ $no_shared=1; }
|
{ $no_shared=1; }
|
||||||
elsif (/^shared$/)
|
elsif (/^shared$/)
|
||||||
{ $no_shared=0; }
|
{ $no_shared=0; }
|
||||||
|
elsif (/^no-zlib$/)
|
||||||
|
{ $zlib=0; }
|
||||||
|
elsif (/^zlib$/)
|
||||||
|
{ $zlib=1; }
|
||||||
|
elsif (/^zlib-dynamic$/)
|
||||||
|
{ $zlib=2; }
|
||||||
elsif (/^no-symlinks$/)
|
elsif (/^no-symlinks$/)
|
||||||
{ $symlink=0; }
|
{ $symlink=0; }
|
||||||
elsif (/^no-(.+)$/)
|
elsif (/^no-(.+)$/)
|
||||||
@ -827,8 +839,15 @@ if ($no_asm)
|
|||||||
|
|
||||||
if ($threads)
|
if ($threads)
|
||||||
{
|
{
|
||||||
$cflags=$thread_cflags;
|
$cflags=$thread_cflags;
|
||||||
$openssl_thread_defines .= $thread_defines;
|
$openssl_thread_defines .= $thread_defines;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($zlib)
|
||||||
|
{
|
||||||
|
$cflags = "-DZLIB $cflags";
|
||||||
|
$cflags = "-DZLIB_SHARED $cflags" if $zlib == 2;
|
||||||
|
$lflags = "$lflags -lz" if $zlib == 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
# You will find shlib_mark1 and shlib_mark2 explained in Makefile.org
|
# You will find shlib_mark1 and shlib_mark2 explained in Makefile.org
|
||||||
|
9
INSTALL
9
INSTALL
@ -53,6 +53,15 @@
|
|||||||
This will usually require additional system-dependent options!
|
This will usually require additional system-dependent options!
|
||||||
See "Note on multi-threading" below.
|
See "Note on multi-threading" below.
|
||||||
|
|
||||||
|
no-zlib Don't try to build with support for zlib compression and
|
||||||
|
decompression.
|
||||||
|
|
||||||
|
zlib Build with support for zlib compression/decompression.
|
||||||
|
|
||||||
|
zlib-dynamic Like "zlib", but has OpenSSL load the zlib library dynamically
|
||||||
|
when needed. This is only supported on systems where loading
|
||||||
|
of shared libraries is supported.
|
||||||
|
|
||||||
no-shared Don't try to create shared libraries.
|
no-shared Don't try to create shared libraries.
|
||||||
|
|
||||||
shared In addition to the usual static libraries, create shared
|
shared In addition to the usual static libraries, create shared
|
||||||
|
Loading…
x
Reference in New Issue
Block a user