The X509 buffer is retrived by reading ZOOM option "sslPeerCert".
Removed libyazssl.la. When SSL is enabled, libyaz.la has SSL support and
all programs have too (yaz-ztest, yaz-client, zoom..). May not be
as "modular" but it simplifies things.
Added cs_get_peer_certificate to that returns peer X509 PEM.
Possible compatibility problems with earlier versions marked with '*'.
+ZOOM now allows inspection of X509 peer certificate for verification.
+The X509 buffer is retrived by reading ZOOM option "sslPeerCert".
+
+Removed libyazssl.la. When SSL is enabled, libyaz.la has SSL support and
+all programs have too (yaz-ztest, yaz-client, zoom..). May not be
+as "modular" but it simplifies things.
+
+Added cs_get_peer_certificate to that returns peer X509 PEM.
+
Added cs_get_ssl that returns SSL handle (SSL *) for SSL comstack; returns
NULL if SSL is unavailable.
-## Copyright (C) 1995-2003, Index Data
+## Copyright (C) 1995-2004, Index Data
## All rights reserved.
-## $Id: Makefile.am,v 1.21 2004-04-28 12:10:51 adam Exp $
+## $Id: Makefile.am,v 1.22 2004-04-28 22:44:58 adam Exp $
-if ISSSL
-extra=yaz-client-ssl
-endif
-
-bin_PROGRAMS=yaz-client $(extra)
+bin_PROGRAMS=yaz-client
EXTRA_PROGRAMS=bertorture
EXTRA_DIST = default.bib
COMMON=admin.c admin.h tabcomplete.c tabcomplete.h
yaz_client_SOURCES=client.c $(COMMON)
-yaz_client_ssl_SOURCES=$(COMMON)
-yaz_client_LDADD = ../src/libyaz.la $(READLINE_LIBS)
-yaz_client_ssl_LDADD = ssl-client.lo ../src/libyazssl.la ../src/libyaz.la $(READLINE_LIBS) $(SSL_LIBS)
-bertorture_LDADD = ../src/libyaz.la
+yaz_client_LDADD = ../src/libyaz.la $(READLINE_LIBS) $(SSL_LIBS)
+bertorture_LDADD = ../src/libyaz.la $(SSL_LIBS)
bertorture_SOURCES=bertorture.c
-AM_CPPFLAGS=-I$(top_srcdir)/include
+AM_CPPFLAGS=-I$(top_srcdir)/include $(SSL_CFLAGS) $(SSL_DEFS)
-ssl-client.lo: client.c
- $(LTCOMPILE) $(SSL_CFLAGS) $(SSL_DEFS) -c $(srcdir)/client.c -o ssl-client.lo
* Copyright (c) 1995-2004, Index Data
* See the file LICENSE for details.
*
- * $Id: client.c,v 1.240 2004-04-28 13:25:57 adam Exp $
+ * $Id: client.c,v 1.241 2004-04-28 22:44:58 adam Exp $
*/
#include <stdio.h>
if ((ssl = (SSL *) cs_get_ssl(conn)))
{
X509 *server_cert = SSL_get_peer_certificate (ssl);
- char *str;
if (server_cert)
{
dnl YAZ Toolkit, Index Data 1994-2004
dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.136 2004-04-17 08:24:03 adam Exp $
+dnl $Id: configure.in,v 1.137 2004-04-28 22:44:58 adam Exp $
AC_INIT(include/yaz/yaz-version.h)
AM_INIT_AUTOMAKE(yaz, 2.0.19)
AM_MAINTAINER_MODE
LIBS="$xLIBS"
CFLAGS="$xCFLAGS"
fi
-AM_CONDITIONAL(ISSSL, test $USE_SSL = "1")
dnl
dnl ------ GNU Readline
READLINE_SHARED_LIBADD=""
+yaz (2.0.19-3) unstable; urgency=low
+
+ * Upstream.
+
+ -- Adam Dickmeiss <adam@indexdata.dk> Thu, 29 Apr 2004 00:27:35 +0200
+
yaz (2.0.19-2) unstable; urgency=low
* Upstream.
debian/tmp/usr/bin/yaz-client
-debian/tmp/usr/bin/yaz-client-ssl
debian/tmp/usr/bin/yaz-ztest
-debian/tmp/usr/bin/yaz-ztest-ssl
debian/tmp/usr/bin/zoomsh
debian/tmp/usr/bin/yaz-marcdump
debian/tmp/usr/bin/yaz-iconv
debian/tmp/usr/share/man/man1/yaz-client.1
-debian/tmp/usr/share/man/man1/yaz-client-ssl.1
debian/tmp/usr/share/man/man8/yaz-ztest.8
-debian/tmp/usr/share/man/man8/yaz-ztest-ssl.8
debian/tmp/usr/share/man/man1/zoomsh.1
debian/tmp/usr/share/man/man1/yaz-marcdump.1
debian/tmp/usr/share/man/man1/yaz-iconv.1
-## $Id: Makefile.am,v 1.53 2004-04-22 18:44:40 adam Exp $
+## $Id: Makefile.am,v 1.54 2004-04-28 22:44:59 adam Exp $
docdir=$(datadir)/doc/@PACKAGE@
zoom.events.html zoom.html zoom.options.html zoom.query.html \
zoom.records.html zoom.resultsets.html zoom.scan.html
-MANFILES=yaz-client.1 yaz-client-ssl.1 yaz-ztest.8 \
- yaz-ztest-ssl.8 yaz-config.8 yaz.7 zoomsh.1 yaz-asncomp.1 \
+MANFILES=yaz-client.1 yaz-ztest.8 \
+ yaz-config.8 yaz.7 zoomsh.1 yaz-asncomp.1 \
yaz-marcdump.1 yaz-iconv.1
REFFILES=yaz-client-man.xml yaz-ztest-man.xml yaz-config-man.xml \
yaz-man.xml zoomsh-man.xml yaz-asncomp-man.xml \
zoomsh.1: zoomsh-man.xml
docbook2man $(srcdir)/zoomsh-man.xml
-yaz-ztest-ssl.8:
- ln -s yaz-ztest.8 yaz-ztest-ssl.8
-
-yaz-client-ssl.1:
- ln -s yaz-client.1 yaz-client-ssl.1
-
yaz-asncomp.1: yaz-asncomp-man.xml
docbook2man $(srcdir)/yaz-asncomp-man.xml
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
<!ENTITY yaz-client-commands SYSTEM "yaz-client-commands.xml">
]>
-<!-- $Id: yaz-client-man.xml,v 1.1 2003-10-27 12:21:24 adam Exp $ -->
+<!-- $Id: yaz-client-man.xml,v 1.2 2004-04-28 22:44:59 adam Exp $ -->
<refentry id="yaz-client">
<refmeta>
<arg choice="opt">addr</arg>
</cmdsynopsis>
- <cmdsynopsis>
- <command>yaz-client-ssl</command>
- <arg rep="repeat" choice="opt"><option>option</option></arg>
- <arg choice="opt">addr</arg>
- </cmdsynopsis>
-
</refsynopsisdiv>
<refsect1><title>DESCRIPTION</title>
performance of Z39.50 targets and SRW servers.
</para>
<para>
- <command>yaz-client-ssl</command> is identical to
- <command>yaz-client</command> except that it supports SSL transport.
- </para>
- <para>
If the <replaceable>addr</replaceable> is specified, the client creates
a connection to the Z39.50/SRW target at the address.
</para>
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
-<!-- $Id: yaz-config-man.xml,v 1.1 2003-10-27 12:21:24 adam Exp $ -->
+<!-- $Id: yaz-config-man.xml,v 1.2 2004-04-28 22:44:59 adam Exp $ -->
<refentry id="yaz-config">
<refmeta>
<refentrytitle>yaz-config</refentrytitle>
Use the threaded version of YAZ.
</para></listitem>
</varlistentry>
- <varlistentry>
- <term>ssl</term>
- <listitem><para>
- Use YAZ with SSL support.
- </para></listitem>
- </varlistentry>
</variablelist>
</refsect1>
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
<!ENTITY ztest-options SYSTEM "ztest-options.xml">
]>
-<!-- $Id: yaz-ztest-man.xml,v 1.3 2004-01-17 01:20:12 adam Exp $ -->
+<!-- $Id: yaz-ztest-man.xml,v 1.4 2004-04-28 22:44:59 adam Exp $ -->
<refentry id="yaz-ztest">
<refmeta>
<arg choice="opt" rep="repeat">listener-spec</arg>
</cmdsynopsis>
- <cmdsynopsis>
- <command>yaz-ztest-ssl</command>
- <arg rep="repeat" choice="opt"><option>option</option></arg>
- <arg choice="opt" rep="repeat">addr</arg>
- </cmdsynopsis>
-
</refsynopsisdiv>
<refsect1><title>DESCRIPTION</title>
<para>
records.
</para>
<para>
- <command>yaz-ztest-ssl</command> is identical to
- <command>yaz-ztest</command> except that it supports SSL transport.
- </para>
- <para>
The <replaceable>listener-spec</replaceable> consists of a transport
mode followed by a colon, followed by a listener address. The
transport mode is either <literal>tcp</literal>, <literal>unix</literal>,
- or <literal>ssl</literal> (<command>yaz-ztest-ssl</command> only).
+ or <literal>ssl</literal>.
</para>
<para>
For TCP and SSL, an address has the form:
* LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
* OF THIS SOFTWARE.
*
- * $Id: comstack.h,v 1.12 2004-04-28 12:10:52 adam Exp $
+ * $Id: comstack.h,v 1.13 2004-04-28 22:44:59 adam Exp $
*/
#ifndef COMSTACK_H
#define CS_WANT_READ 1
#define CS_WANT_WRITE 2
-
+
YAZ_EXPORT int cs_look (COMSTACK);
YAZ_EXPORT const char *cs_strerror(COMSTACK h);
YAZ_EXPORT const char *cs_errmsg(int n);
YAZ_EXPORT void cs_get_host_args(const char *type_and_host, const char **args);
YAZ_EXPORT int cs_complete_auto(const unsigned char *buf, int len);
YAZ_EXPORT void *cs_get_ssl(COMSTACK cs);
+YAZ_EXPORT int cs_get_peer_certificate_x509(COMSTACK cs, char **buf, int *len);
/*
* error management.
/*
* Public header for ZOOM C.
- * $Id: zoom.h,v 1.22 2004-02-23 09:26:11 adam Exp $
+ * $Id: zoom.h,v 1.23 2004-04-28 22:44:59 adam Exp $
*/
#include <stdlib.h>
ZOOM_connection_option_set (ZOOM_connection c, const char *key,
const char *val);
+ZOOM_API(void)
+ZOOM_connection_option_setl (ZOOM_connection c, const char *key,
+ const char *val, int len);
+
/* return error code (0 == success, failure otherwise). cp
holds error string on failure, addinfo holds addititional info (if any)
*/
## Copyright (C) 1994-2004, Index Data
## All rights reserved.
-## $Id: Makefile.am,v 1.11 2004-03-17 11:00:04 adam Exp $
+## $Id: Makefile.am,v 1.12 2004-04-28 22:44:59 adam Exp $
if ISTHR
thrlib=libyazthread.la
endif
-if ISSSL
-ssllib=libyazssl.la
-endif
-
YAZ_VERSION_INFO=2:0:0
-lib_LTLIBRARIES = libyaz.la $(thrlib) $(ssllib)
+lib_LTLIBRARIES = libyaz.la $(thrlib)
TESTS = $(check_PROGRAMS)
YAZCOMP = $(top_srcdir)/util/yaz-asncomp
YAZCOMPLINE = $(YAZCOMP) -d z.tcl -i yaz -I../include $(YCFLAGS)
-AM_CPPFLAGS=-I$(top_srcdir)/include $(XML2_CFLAGS)
+AM_CPPFLAGS=-I$(top_srcdir)/include $(XML2_CFLAGS) $(SSL_CFLAGS) $(SSL_DEFS)
AM_YFLAGS=-p cql_
THREADED_FLAGS = @CFLAGSTHREADS@
libyazthread_la_LIBADD=thr-nmem.lo thr-statserv.lo thr-eventl.lo
libyazthread_la_LDFLAGS=-version-info $(YAZ_VERSION_INFO)
-libyazssl_la_SOURCES=
-libyazssl_la_LIBADD=ssl-comstack.lo ssl-tcpip.lo
-libyazssl_la_LDFLAGS=-version-info $(YAZ_VERSION_INFO)
-
# Rules for Z39.50 V3
$(srcdir)/z-accdes1.c \
$(srcdir)/z-accform1.c \
thr-eventl.lo: eventl.c
$(LTCOMPILE) $(THREADED_FLAGS) -c $(srcdir)/eventl.c -o thr-eventl.lo
-# SSL versions of objects.
-ssl-comstack.lo: comstack.c
- $(LTCOMPILE) $(SSL_CFLAGS) $(SSL_DEFS) -c $(srcdir)/comstack.c -o ssl-comstack.lo
-
-ssl-tcpip.lo: tcpip.c
- $(LTCOMPILE) $(SSL_CFLAGS) $(SSL_DEFS) -c $(srcdir)/tcpip.c -o ssl-tcpip.lo
-
* Copyright (c) 1995-2004, Index Data
* See the file LICENSE for details.
*
- * $Id: comstack.c,v 1.6 2004-02-25 12:59:56 adam Exp $
+ * $Id: comstack.c,v 1.7 2004-04-28 22:44:59 adam Exp $
*/
#include <string.h>
COMSTACK cs;
CS_TYPE t;
+ printf (
+#if HAVE_OPENSSL_SSL_H
+ "cs_create_host SSL\n"
+#else
+ "cs_create_host\n"
+#endif
+ );
if (strncmp (type_and_host, "tcp:", 4) == 0)
{
t = tcpip_type;
/*
- * Copyright (c) 1995-2003, Index Data
+ * Copyright (c) 1995-2004, Index Data
* See the file LICENSE for details.
*
- * $Id: tcpip.c,v 1.2 2004-04-28 12:10:53 adam Exp $
+ * $Id: tcpip.c,v 1.3 2004-04-28 22:44:59 adam Exp $
*/
#include <stdio.h>
state = (struct tcpip_state *) cs->cprivate;
return state->ssl;
}
+
+int cs_get_peer_certificate_x509(COMSTACK cs, char **buf, int *len)
+{
+ SSL *ssl = cs_get_ssl(cs);
+ if (ssl)
+ {
+ X509 *server_cert = SSL_get_peer_certificate (ssl);
+ if (server_cert)
+ {
+ BIO *bio = BIO_new(BIO_s_mem());
+ char *pem_buf;
+ /* get PEM buffer in memory */
+ PEM_write_bio_X509(bio, server_cert);
+ *len = BIO_get_mem_data(bio, &pem_buf);
+ *buf = xmalloc(*len);
+ memcpy(*buf, pem_buf, *len);
+ BIO_free(bio);
+ return 1;
+ }
+ }
+ return 0;
+}
#else
void *cs_get_ssl(COMSTACK cs)
{
return 0;
}
+
+int cs_get_peer_certificate_x509(COMSTACK cs, char **buf, int *len)
+{
+ return 0;
+}
+
#endif
+
* Copyright (c) 2000-2004, Index Data
* See the file LICENSE for details.
*
- * $Id: zoom-c.c,v 1.26 2004-04-06 17:47:24 adam Exp $
+ * $Id: zoom-c.c,v 1.27 2004-04-28 22:44:59 adam Exp $
*
* ZOOM layer for C, connections, result sets, queries.
*/
switch (task->which)
{
case ZOOM_TASK_SEARCH:
-
ZOOM_resultset_destroy (task->u.search.resultset);
break;
case ZOOM_TASK_RETRIEVE:
}
}
+static void get_cert(ZOOM_connection c)
+{
+ char *cert_buf;
+ int cert_len;
+
+ if (cs_get_peer_certificate_x509(c->cs, &cert_buf, &cert_len))
+ {
+ ZOOM_connection_option_setl(c, "sslPeerCert",
+ cert_buf, cert_len);
+ xfree(cert_buf);
+ }
+}
+
static zoom_ret do_connect (ZOOM_connection c)
{
void *add;
{
ZOOM_Event event = ZOOM_Event_create(ZOOM_EVENT_CONNECT);
ZOOM_connection_put_event(c, event);
+ get_cert(c);
if (c->proto == PROTO_Z3950)
ZOOM_connection_send_init(c);
else
ZOOM_options_get(c->options, "implementationName"),
odr_prepend(c->odr_out, "ZOOM-C", ireq->implementationName));
- version = odr_strdup(c->odr_out, "$Revision: 1.26 $");
+ version = odr_strdup(c->odr_out, "$Revision: 1.27 $");
if (strlen(version) > 10) /* check for unexpanded CVS strings */
version[strlen(version)-2] = '\0';
ireq->implementationVersion = odr_prepend(c->odr_out,
ZOOM_API(void)
ZOOM_connection_option_set (ZOOM_connection c, const char *key,
- const char *val)
+ const char *val)
{
ZOOM_options_set (c->options, key, val);
}
+ZOOM_API(void)
+ZOOM_connection_option_setl (ZOOM_connection c, const char *key,
+ const char *val, int len)
+{
+ ZOOM_options_setl (c->options, key, val, len);
+}
+
ZOOM_API(const char *)
ZOOM_resultset_option_get (ZOOM_resultset r, const char *key)
{
else if (ret == 0)
{
ZOOM_connection_put_event (c, event);
+ get_cert(c);
if (c->proto == PROTO_Z3950)
ZOOM_connection_send_init(c);
else
-## Copyright (C) 1994-2003, Index Data
+## Copyright (C) 1994-2004, Index Data
## All rights reserved.
-## $Id: Makefile.am,v 1.25 2004-03-10 17:18:08 adam Exp $
+## $Id: Makefile.am,v 1.26 2004-04-28 22:45:00 adam Exp $
TESTS = $(check_PROGRAMS)
noinst_PROGRAMS = cclsh cql2pqf cql2xcql srwtst yaz-benchmark
# MARC dumper utility
-yaz_marcdump_LDADD = ../src/libyaz.la
yaz_marcdump_SOURCES = marcdump.c
+yaz_marcdump_LDADD = ../src/libyaz.la $(SSL_LIBS)
# YAZ Iconv utility
-yaz_iconv_LDADD = ../src/libyaz.la
yaz_iconv_SOURCES = yaziconv.c
+yaz_iconv_LDADD = ../src/libyaz.la $(SSL_LIBS)
srwtst_SOURCES=srwtst.c
-srwtst_LDADD = ../src/libyaz.la
+srwtst_LDADD = ../src/libyaz.la $(SSL_LIBS)
cclsh_SOURCES=cclsh.c
-cclsh_LDADD = ../src/libyaz.la $(READLINE_LIBS)
+cclsh_LDADD = ../src/libyaz.la $(READLINE_LIBS) $(SSL_LIBS)
cql2pqf_SOURCES = cql2pqf.c
-cql2pqf_LDADD = ../src/libyaz.la
+cql2pqf_LDADD = ../src/libyaz.la $(SSL_LIBS)
cql2xcql_SOURCES = cql2xcql.c
-cql2xcql_LDADD = ../src/libyaz.la
+cql2xcql_LDADD = ../src/libyaz.la $(SSL_LIBS)
-yaz_benchmark_LDADD = ../src/libyaz.la
yaz_benchmark_SOURCES = benchmark.c
+yaz_benchmark_LDADD = ../src/libyaz.la $(SSL_LIBS)
#!/bin/sh
-# $Id: yaz-config.in,v 1.19 2004-01-05 09:45:49 adam Exp $
+# $Id: yaz-config.in,v 1.20 2004-04-28 22:44:58 adam Exp $
yazprefix=@prefix@
yaz_echo_cflags=no
yaz_echo_libs=no
yaz_src_root=@YAZ_SRC_ROOT@
yaz_build_root=@YAZ_BUILD_ROOT@
-yazextralibs="@LIBS@"
+yazextralibs="@SSL_LIBS@ @LIBS@"
YAZVERSION=@VERSION@
usage()
[--comp]
Libraries:
threads
- malloc
- ssl
EOF
exit $1
}
malloc)
lib_malloc=yes
;;
- ssl)
- lib_ssl=yes
- ;;
-*)
yaz_echo_help=yes
;;
lyaz="-lyazthread $lyaz"
fi
-if test "$lib_ssl" = "yes" -a -n "@SSL_LIBS@"; then
- yazextralibs="@SSL_LIBS@ $yazextralibs"
- lyaz="-lyazssl $lyaz"
-fi
-
if test "$yaz_echo_source" = "yes"; then
YAZBIN=${yaz_build_root}/bin
YAZLIB="-L${yaz_build_root}/src/.libs $lyaz $yazextralibs"
YAZLALIB="${yaz_build_root}/src/libyaz.la $yazextralibs"
- if test "$lib_ssl" = "yes" -a -n "$SSL_LIBS@"; then
- YAZLALIB="${yaz_build_root}/src/libyazssl.la"
- fi
if test "$lib_thread" = "yes" -a -n "@CFLAGSTHREADS@"; then
YAZLALIB="${yaz_build_root}/src/libyazthread.la $YAZLALIB"
fi
YAZINC="$YAZINC @CFLAGSTHREADS@"
fi
-if test "$lib_ssl" = "yes"; then
- YAZINC="$YAZINC @SSL_CFLAGS@"
-fi
+YAZINC="$YAZINC @SSL_CFLAGS@"
if test "$yaz_echo_help" = "yes"; then
usage 1 1>&2
/usr/bin/zoomsh*
/usr/bin/yaz-marcdump
/usr/bin/yaz-iconv
-/usr/share/man/man1/yaz-client-ssl.*
/usr/share/man/man1/yaz-client.*
/usr/share/man/man1/zoomsh.*
/usr/share/man/man1/yaz-marcdump.*
/usr/share/man/man1/yaz-iconv.*
-/usr/share/man/man8/yaz-ztest-ssl.*
/usr/share/man/man8/yaz-ztest.*
%files -n lib%{name}
-## $Id: Makefile.am,v 1.12 2003-10-27 12:21:45 adam Exp $
+## $Id: Makefile.am,v 1.13 2004-04-28 22:45:00 adam Exp $
## Copyright (C) 2001, Index Data
AM_CPPFLAGS = -I$(top_srcdir)/include
EXTRA_PROGRAMS = zoomtst1 zoomtst2 zoomtst3 zoomtst4 zoomtst5 zoomtst6 zoomtst7 zoomtst8
-bin_PROGRAMS = zoomsh
+bin_PROGRAMS = zoomsh
-LDADD = ../src/libyaz.la $(READLINE_LIBS)
+LDADD = ../src/libyaz.la $(READLINE_LIBS) $(SSL_LIBS)
zoomtst1_SOURCES = zoomtst1.c
zoomtst2_SOURCES = zoomtst2.c
* Copyright (c) 2002-2004, Index Data.
* See the file LICENSE for details.
*
- * $Id: zoomsh.c,v 1.27 2004-02-23 09:26:11 adam Exp $
+ * $Id: zoomsh.c,v 1.28 2004-04-28 22:45:00 adam Exp $
*/
/* ZOOM-C Shell */
#include <string.h>
#include <ctype.h>
+#include <yaz/comstack.h>
+
#if HAVE_READLINE_READLINE_H
#include <readline/readline.h>
#endif
#define MAX_CON 100
+#if 0
+static void dummy()
+{
+ cs_get_ssl(0);
+}
+#endif
+
static int next_token (const char **cpp, const char **t_start)
{
int len = 0;
ZOOM_connection z39_con[MAX_CON];
ZOOM_resultset z39_res[MAX_CON];
+ if (0)
+ {
+ COMSTACK cs = 0;
+ cs_get_ssl(cs);
+ cs_create_host(0, 0, 0);
+ }
nmem_init();
for (i = 0; i<MAX_CON; i++)
{
-## $Id: Makefile.am,v 1.15 2003-10-27 12:21:45 adam Exp $
+## $Id: Makefile.am,v 1.16 2004-04-28 22:45:00 adam Exp $
-if ISSSL
-sslbin=yaz-ztest-ssl
-endif
-
-bin_PROGRAMS=yaz-ztest $(sslbin)
+bin_PROGRAMS=yaz-ztest
yaz_ztest_SOURCES=ztest.c read-grs.c read-marc.c
-yaz_ztest_ssl_SOURCES=$(yaz_ztest_SOURCES)
EXTRA_DIST=dummy-records dummy-words dummy-grs
extra=../src/libyazthread.la
endif
-yaz_ztest_LDADD=$(extra) ../src/libyaz.la \
- $(LIBTHREAD)
-
-yaz_ztest_ssl_LDADD=$(extra) ../src/libyazssl.la ../src/libyaz.la \
- $(SSL_LIBS) $(LIBTHREAD)
+yaz_ztest_LDADD=$(extra) ../src/libyaz.la $(SSL_LIBS) $(LIBTHREAD)
AM_CFLAGS=@CFLAGSTHREADS@
projects / yaz-moved-to-github.git / commitdiff