Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ISC Open Source Projects
BIND
Commits
7e9ccec6
Commit
7e9ccec6
authored
Feb 12, 2013
by
Mark Andrews
Browse files
3485. [cleanup] Only compile openssl_gostlink.c if we support GOST.
parent
44863746
Changes
5
Hide whitespace changes
Inline
Side-by-side
CHANGES
View file @
7e9ccec6
3485. [cleanup] Only compile openssl_gostlink.c if we support GOST.
3484. [bug] Some statistics were incorrectly rendered in XML.
[RT #32587]
...
...
configure
View file @
7e9ccec6
...
...
@@ -1321,6 +1321,8 @@ OPENSSL_GOST
OPENSSL_ECDSA
OPENSSLLINKSRCS
OPENSSLLINKOBJS
OPENSSLGOSTLINKSRCS
OPENSSLGOSTLINKOBJS
DST_OPENSSL_INC
USE_OPENSSL
LWRES_PLATFORM_NEEDSYSSELECTH
...
...
@@ -13976,12 +13978,16 @@ case "$use_openssl" in
$as_echo "no" >&6; }
DST_OPENSSL_INC=""
USE_OPENSSL=""
OPENSSLGOSTLINKOBJS=""
OPENSSLGOSTLINKSRS=""
OPENSSLLINKOBJS=""
OPENSSLLINKSRCS=""
;;
auto)
DST_OPENSSL_INC=""
USE_OPENSSL=""
OPENSSLGOSTLINKOBJS=""
OPENSSLGOSTLINKSRS=""
OPENSSLLINKOBJS=""
OPENSSLLINKSRCS=""
as_fn_error $? "OpenSSL was not found in any of $openssldirs; use --with-openssl=/path
...
...
@@ -14354,11 +14360,13 @@ fi
esac
case $have_gost in
yes)
OPENSSL_GOST="yes"
OPENSSL_GOST="yes"
OPENSSLGOSTLINKOBJS='${OPENSSLGOSTLINKOBJS}'
OPENSSLGOSTLINKSRCS='${OPENSSLGOSTLINKSRCS}'
$as_echo "#define HAVE_OPENSSL_GOST 1" >>confdefs.h
;;
;;
*)
;;
esac
...
...
@@ -14382,6 +14390,8 @@ esac
DNS_CRYPTO_LIBS="$DNS_CRYPTO_LIBS $DNS_OPENSSL_LIBS"
#
...
...
configure.in
View file @
7e9ccec6
...
...
@@ -619,12 +619,16 @@ case "$use_openssl" in
AC_MSG_RESULT(no)
DST_OPENSSL_INC=""
USE_OPENSSL=""
OPENSSLGOSTLINKOBJS=""
OPENSSLGOSTLINKSRS=""
OPENSSLLINKOBJS=""
OPENSSLLINKSRCS=""
;;
auto)
DST_OPENSSL_INC=""
USE_OPENSSL=""
OPENSSLGOSTLINKOBJS=""
OPENSSLGOSTLINKSRS=""
OPENSSLLINKOBJS=""
OPENSSLLINKSRCS=""
AC_MSG_ERROR(
...
...
@@ -872,10 +876,12 @@ int main() {
esac
case $have_gost in
yes)
OPENSSL_GOST="yes"
AC_DEFINE(HAVE_OPENSSL_GOST, 1,
[Define if your OpenSSL version supports GOST.])
;;
OPENSSL_GOST="yes"
OPENSSLGOSTLINKOBJS='${OPENSSLGOSTLINKOBJS}'
OPENSSLGOSTLINKSRCS='${OPENSSLGOSTLINKSRCS}'
AC_DEFINE(HAVE_OPENSSL_GOST, 1,
[Define if your OpenSSL version supports GOST.])
;;
*)
;;
esac
...
...
@@ -894,6 +900,8 @@ esac
AC_SUBST(USE_OPENSSL)
AC_SUBST(DST_OPENSSL_INC)
AC_SUBST(OPENSSLGOSTLINKOBJS)
AC_SUBST(OPENSSLGOSTLINKSRCS)
AC_SUBST(OPENSSLLINKOBJS)
AC_SUBST(OPENSSLLINKSRCS)
AC_SUBST(OPENSSL_ECDSA)
...
...
lib/dns/Makefile.in
View file @
7e9ccec6
...
...
@@ -49,8 +49,9 @@ LIBS = @LIBS@
# Alphabetically
OPENSSLGOSTLINKOBJS
=
opensslgost_link.@O@
OPENSSLLINKOBJS
=
openssl_link.@O@ openssldh_link.@O@ openssldsa_link.@O@
\
opensslecdsa_link.@O@
opensslgost_link.@O
@
\
opensslecdsa_link.@O@
@OPENSSLGOSTLINKOBJS
@
\
opensslrsa_link.@O@
DSTOBJS
=
@DST_EXTRA_OBJS@ @OPENSSLLINKOBJS@
\
...
...
@@ -79,8 +80,9 @@ DNSOBJS = acache.@O@ acl.@O@ adb.@O@ byaddr.@O@ \
OBJS
=
${DNSOBJS}
${OTHEROBJS}
${DSTOBJS}
# Alphabetically
OPENSSLGOSTLINKSRCS
=
opensslgost_link.c
OPENSSLLINKSRCS
=
openssl_link.c openssldh_link.c openssldsa_link.c
\
opensslecdsa_link.c
opensslgost_link.c
opensslrsa_link.c
opensslecdsa_link.c
@OPENSSLGOSTLINKSRCS@
opensslrsa_link.c
DSTSRCS
=
@DST_EXTRA_SRCS@ @OPENSSLLINKSRCS@
\
dst_api.c dst_lib.c dst_parse.c
\
...
...
lib/export/dns/Makefile.in
View file @
7e9ccec6
...
...
@@ -46,8 +46,9 @@ LIBS = @LIBS@
# Alphabetically
OPENSSLGOSTLINKOBJS
=
opensslgost_link.@O@
OPENSSLLINKOBJS
=
openssl_link.@O@ openssldh_link.@O@ openssldsa_link.@O@
\
opensslecdsa_link.@O@
opensslgost_link.@O
@ opensslrsa_link.@O@
opensslecdsa_link.@O@
@OPENSSLGOSTLINKOBJS
@ opensslrsa_link.@O@
DSTOBJS
=
@OPENSSLLINKOBJS@
\
dst_api.@O@ dst_lib.@O@ dst_parse.@O@ dst_result.@O@
\
...
...
@@ -74,8 +75,9 @@ OBJS= ${DNSOBJS} ${OTHEROBJS} ${DSTOBJS} ${PORTDNSOBJS}
# Alphabetically
OPENSSLGOSTLINKSRCS
=
opensslgost_link.c
OPENSSLLINKSRCS
=
openssl_link.c openssldh_link.c openssldsa_link.c
\
opensslecdsa_link.c
opensslgost_link.c
opensslrsa_link.c
opensslecdsa_link.c
@OPENSSLGOSTLINKSRCS@
opensslrsa_link.c
DSTSRCS
=
@OPENSSLLINKSRCS@
\
dst_api.c dst_lib.c dst_parse.c
\
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment