Please take our Survey
logo       
<prev   next>

Choosing A Webhost:
A web hosting service is a type of Internet hosting service that allows individuals and organizations to provide their own website accessible via the World Wide Web. Web hosts are companies that provide space on a server they own for use by their clients as well as providing Internet connectivity, typically in a data center. Web hosts can also provide data center space and connectivity to the Internet for servers they do not own to be located in their data center, called colocation. more...

[CVS] OpenSSL: OpenSSL-engine-0_9_6-stable: openssl/ CHANGES Makefile....: msg#00020

encryption.openssl.cvs

Subject: [CVS] OpenSSL: OpenSSL-engine-0_9_6-stable: openssl/ CHANGES Makefile....

OpenSSL CVS Repository
http://cvs.openssl.org/
____________________________________________________________________________

Server: cvs.openssl.org Name: Richard Levitte
Root: /e/openssl/cvs Email: levitte@xxxxxxxxxxx
Module: openssl Date: 09-Aug-2003 11:35:57
Branch: OpenSSL-engine-0_9_6-stable Handle: 2003080910355205

Modified files: (Branch: OpenSSL-engine-0_9_6-stable)
openssl CHANGES Makefile.org
openssl/apps Makefile.ssl
openssl/crypto/bio bss_bio.c
openssl/crypto/rand rand_win.c
openssl/ssl s3_srvr.c
openssl/test Makefile.ssl

Log:
Recent changes from 0.9.6-stable.

Summary:
Revision Changes Path
1.532.2.19.4.72+6 -1 openssl/CHANGES
1.88.2.7.4.27+2 -2 openssl/Makefile.org
1.52.2.9.4.16+6 -2 openssl/apps/Makefile.ssl
1.28.2.1.4.5+54 -1 openssl/crypto/bio/bss_bio.c
1.2.2.9.4.6 +10 -4 openssl/crypto/rand/rand_win.c
1.48.2.1.4.14+4 -0 openssl/ssl/s3_srvr.c
1.37.2.6.4.17+144 -48 openssl/test/Makefile.ssl
____________________________________________________________________________

patch -p0 <<'@@ .'
Index: openssl/CHANGES
============================================================================
$ cvs diff -u -r1.532.2.19.4.71 -r1.532.2.19.4.72 CHANGES
--- openssl/CHANGES 19 Jun 2003 23:25:55 -0000 1.532.2.19.4.71
+++ openssl/CHANGES 9 Aug 2003 09:35:52 -0000 1.532.2.19.4.72
@@ -4,7 +4,12 @@

Changes between 0.9.6j and 0.9.6k [xx XXX 2003]

- *) Change X509_cretificate_type() to mark the key as exported/exportable
+ *) In ssl3_get_client_hello() (ssl/s3_srvr.c), tolerate additional
+ extra data after the compression methods not only for TLS 1.0
+ but also for SSL 3.0 (as required by the specification).
+ [Bodo Moeller; problem pointed out by Matthias Loepfe]
+
+ *) Change X509_certificate_type() to mark the key as exported/exportable
when it's 512 *bits* long, not 512 bytes.
[Richard Levitte]

@@ .
patch -p0 <<'@@ .'
Index: openssl/Makefile.org
============================================================================
$ cvs diff -u -r1.88.2.7.4.26 -r1.88.2.7.4.27 Makefile.org
--- openssl/Makefile.org 10 Apr 2003 06:45:12 -0000 1.88.2.7.4.26
+++ openssl/Makefile.org 9 Aug 2003 09:35:53 -0000 1.88.2.7.4.27
@@ -368,7 +368,7 @@
find . -name "*.o" -print > allobjs ; \
OBJS= ; export OBJS ; \
for obj in `ar t lib$$i.a` ; do \
- OBJS="$${OBJS} `grep $$obj allobjs`" ; \
+ OBJS="$${OBJS} `grep /$$obj allobjs`" ; \
done ; \
set -x; ${CC} ${SHARED_LDFLAGS} \
-G -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
@@ -390,7 +390,7 @@
find . -name "*.o" -print > allobjs ; \
OBJS= ; export OBJS ; \
for obj in `ar t lib$$i.a` ; do \
- OBJS="$${OBJS} `grep $$obj allobjs`" ; \
+ OBJS="$${OBJS} `grep /$$obj allobjs`" ; \
done ; \
set -x; ${CC} ${SHARED_LDFLAGS} \
$${SHARE_FLAG} -o
lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
@@ .
patch -p0 <<'@@ .'
Index: openssl/apps/Makefile.ssl
============================================================================
$ cvs diff -u -r1.52.2.9.4.15 -r1.52.2.9.4.16 Makefile.ssl
--- openssl/apps/Makefile.ssl 10 Apr 2003 06:45:14 -0000 1.52.2.9.4.15
+++ openssl/apps/Makefile.ssl 9 Aug 2003 09:35:54 -0000 1.52.2.9.4.16
@@ -136,8 +136,12 @@

$(PROGRAM): progs.h $(E_OBJ) $(PROGRAM).o $(DLIBCRYPTO) $(DLIBSSL)
$(RM) $(PROGRAM)
- LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
- $(CC) -o $(PROGRAM) $(CFLAGS) $(PROGRAM).o $(E_OBJ) $(PEX_LIBS)
$(LIBSSL) $(LIBCRYPTO) $(EX_LIBS)
+ if [ "$(SHLIB_TARGET)" = "" ] ; then \
+ $(CC) -o $(PROGRAM) $(CFLAGS) $(PROGRAM).o $(E_OBJ) $(PEX_LIBS)
$(LIBSSL) $(LIBCRYPTO) $(EX_LIBS); \
+ else \
+ LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
+ $(CC) -o $(PROGRAM) $(CFLAGS) $(PROGRAM).o $(E_OBJ) $(PEX_LIBS)
$(LIBSSL) $(LIBCRYPTO) $(EX_LIBS); \
+ fi
-(cd ..; OPENSSL="`pwd`/apps/openssl"; export OPENSSL; $(PERL)
tools/c_rehash certs)

progs.h: progs.pl
@@ .
patch -p0 <<'@@ .'
Index: openssl/crypto/bio/bss_bio.c
============================================================================
$ cvs diff -u -r1.28.2.1.4.4 -r1.28.2.1.4.5 bss_bio.c
--- openssl/crypto/bio/bss_bio.c 29 May 2002 11:29:08 -0000
1.28.2.1.4.4
+++ openssl/crypto/bio/bss_bio.c 9 Aug 2003 09:35:55 -0000
1.28.2.1.4.5
@@ -1,4 +1,57 @@
/* crypto/bio/bss_bio.c -*- Mode: C; c-file-style: "eay" -*- */
+/* ====================================================================
+ * Copyright (c) 1998-2003 The OpenSSL Project. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ * software must display the following acknowledgment:
+ * "This product includes software developed by the OpenSSL Project
+ * for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For written permission, please contact
+ * openssl-core@xxxxxxxxxxxx
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ * nor may "OpenSSL" appear in their names without prior written
+ * permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by the OpenSSL Project
+ * for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@xxxxxxxxxxxxx). This product includes software written by Tim
+ * Hudson (tjh@xxxxxxxxxxxxx).
+ *
+ */

/* Special method for a BIO where the other endpoint is also a BIO
* of this kind, handled by the same thread (i.e. the "peer" is actually
@@ -503,7 +556,7 @@
break;

case BIO_C_DESTROY_BIO_PAIR:
- /* Effects both BIOs in the pair -- call just once!
+ /* Affects both BIOs in the pair -- call just once!
* Or let BIO_free(bio1); BIO_free(bio2); do the job. */
bio_destroy_pair(bio);
ret = 1;
@@ .
patch -p0 <<'@@ .'
Index: openssl/crypto/rand/rand_win.c
============================================================================
$ cvs diff -u -r1.2.2.9.4.5 -r1.2.2.9.4.6 rand_win.c
--- openssl/crypto/rand/rand_win.c 5 Dec 2002 01:18:02 -0000
1.2.2.9.4.5
+++ openssl/crypto/rand/rand_win.c 9 Aug 2003 09:35:56 -0000
1.2.2.9.4.6
@@ -162,6 +162,7 @@
typedef DWORD (WINAPI *GETQUEUESTATUS)(UINT);

typedef HANDLE (WINAPI *CREATETOOLHELP32SNAPSHOT)(DWORD, DWORD);
+typedef BOOL (WINAPI *CLOSETOOLHELP32SNAPSHOT)(HANDLE);
typedef BOOL (WINAPI *HEAP32FIRST)(LPHEAPENTRY32, DWORD, DWORD);
typedef BOOL (WINAPI *HEAP32NEXT)(LPHEAPENTRY32);
typedef BOOL (WINAPI *HEAP32LIST)(HANDLE, LPHEAPLIST32);
@@ -414,7 +415,7 @@
* This seeding method was proposed in Peter Gutmann, Software
* Generation of Practically Strong Random Numbers,
*
http://www.usenix.org/publications/library/proceedings/sec98/gutmann.html
- * revised version at http://www.cryptoengines.com/~peter/06_random.pdf
+ * revised version at http://www.cryptoengines.com/~peter/06_random.pdf
* (The assignment of entropy estimates below is arbitrary, but based
* on Peter's analysis the full poll appears to be safe. Additional
* interactive seeding is encouraged.)
@@ -423,6 +424,7 @@
if (kernel)
{
CREATETOOLHELP32SNAPSHOT snap;
+ CLOSETOOLHELP32SNAPSHOT close_snap;
HANDLE handle;

HEAP32FIRST heap_first;
@@ -440,6 +442,8 @@

snap = (CREATETOOLHELP32SNAPSHOT)
GetProcAddress(kernel, "CreateToolhelp32Snapshot");
+ close_snap = (CLOSETOOLHELP32SNAPSHOT)
+ GetProcAddress(kernel, "CloseToolhelp32Snapshot");
heap_first = (HEAP32FIRST) GetProcAddress(kernel,
"Heap32First");
heap_next = (HEAP32NEXT) GetProcAddress(kernel, "Heap32Next");
heaplist_first = (HEAP32LIST) GetProcAddress(kernel,
"Heap32ListFirst");
@@ -455,7 +459,7 @@
heaplist_next && process_first && process_next &&
thread_first && thread_next && module_first &&
module_next && (handle = snap(TH32CS_SNAPALL,0))
- != NULL)
+ != INVALID_HANDLE_VALUE)
{
/* heap list and heap walking */
/* HEAPLIST32 contains 3 fields that will change with
@@ -517,8 +521,10 @@
do
RAND_add(&m, m.dwSize, 9);
while (module_next(handle, &m));
-
- CloseHandle(handle);
+ if (close_snap)
+ close_snap(handle);
+ else
+ CloseHandle(handle);
}

FreeLibrary(kernel);
@@ .
patch -p0 <<'@@ .'
Index: openssl/ssl/s3_srvr.c
============================================================================
$ cvs diff -u -r1.48.2.1.4.13 -r1.48.2.1.4.14 s3_srvr.c
--- openssl/ssl/s3_srvr.c 25 Mar 2003 01:26:54 -0000 1.48.2.1.4.13
+++ openssl/ssl/s3_srvr.c 9 Aug 2003 09:35:56 -0000 1.48.2.1.4.14
@@ -828,6 +828,9 @@
}

/* TLS does not mind if there is extra stuff */
+#if 0 /* SSL 3.0 does not mind either, so we should disable this test
+ * (was enabled in 0.9.6d through 0.9.6j and 0.9.7 through 0.9.7b,
+ * in earlier SSLeay/OpenSSL releases this test existed but was
buggy) */
if (s->version == SSL3_VERSION)
{
if (p < (d+n))
@@ -839,6 +842,7 @@
goto f_err;
}
}
+#endif

/* Given s->session->ciphers and ssl_get_ciphers_by_id(s), we must
* pick a cipher */
@@ .
patch -p0 <<'@@ .'
Index: openssl/test/Makefile.ssl
============================================================================
$ cvs diff -u -r1.37.2.6.4.16 -r1.37.2.6.4.17 Makefile.ssl
--- openssl/test/Makefile.ssl 14 Apr 2003 06:28:59 -0000 1.37.2.6.4.16
+++ openssl/test/Makefile.ssl 9 Aug 2003 09:35:57 -0000 1.37.2.6.4.17
@@ -258,104 +258,200 @@
(cd ..; $(MAKE) DIRS=crypto all)

$(RSATEST): $(RSATEST).o $(DLIBCRYPTO)
- LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
- $(CC) -o $(RSATEST) $(CFLAGS) $(RSATEST).o $(PEX_LIBS) $(LIBCRYPTO)
$(EX_LIBS)
+ if [ "$(SHLIB_TARGET)" = "" ]; then \
+ $(CC) -o $(RSATEST) $(CFLAGS) $(RSATEST).o $(PEX_LIBS) $(LIBCRYPTO)
$(EX_LIBS); \
+ else \
+ LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
+ $(CC) -o $(RSATEST) $(CFLAGS) $(RSATEST).o $(PEX_LIBS) $(LIBCRYPTO)
$(EX_LIBS); \
+ fi

$(BNTEST): $(BNTEST).o $(DLIBCRYPTO)
- LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
- $(CC) -o $(BNTEST) $(CFLAGS) $(BNTEST).o $(PEX_LIBS) $(LIBCRYPTO)
$(EX_LIBS)
+ if [ "$(SHLIB_TARGET)" = "" ]; then \
+ $(CC) -o $(BNTEST) $(CFLAGS) $(BNTEST).o $(PEX_LIBS) $(LIBCRYPTO)
$(EX_LIBS); \
+ else \
+ LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
+ $(CC) -o $(BNTEST) $(CFLAGS) $(BNTEST).o $(PEX_LIBS) $(LIBCRYPTO)
$(EX_LIBS); \
+ fi

$(EXPTEST): $(EXPTEST).o $(DLIBCRYPTO)
- LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
- $(CC) -o $(EXPTEST) $(CFLAGS) $(EXPTEST).o $(PEX_LIBS) $(LIBCRYPTO)
$(EX_LIBS)
+ if [ "$(SHLIB_TARGET)" = "" ]; then \
+ $(CC) -o $(EXPTEST) $(CFLAGS) $(EXPTEST).o $(PEX_LIBS) $(LIBCRYPTO)
$(EX_LIBS); \
+ else \
+ LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
+ $(CC) -o $(EXPTEST) $(CFLAGS) $(EXPTEST).o $(PEX_LIBS) $(LIBCRYPTO)
$(EX_LIBS); \
+ fi

$(IDEATEST): $(IDEATEST).o $(DLIBCRYPTO)
- LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
- $(CC) -o $(IDEATEST) $(CFLAGS) $(IDEATEST).o $(PEX_LIBS) $(LIBCRYPTO)
$(EX_LIBS)
+ if [ "$(SHLIB_TARGET)" = "" ]; then \
+ $(CC) -o $(IDEATEST) $(CFLAGS) $(IDEATEST).o $(PEX_LIBS) $(LIBCRYPTO)
$(EX_LIBS); \
+ else \
+ LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
+ $(CC) -o $(IDEATEST) $(CFLAGS) $(IDEATEST).o $(PEX_LIBS) $(LIBCRYPTO)
$(EX_LIBS); \
+ fi

$(MD2TEST): $(MD2TEST).o $(DLIBCRYPTO)
- LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
- $(CC) -o $(MD2TEST) $(CFLAGS) $(MD2TEST).o $(PEX_LIBS) $(LIBCRYPTO)
$(EX_LIBS)
+ if [ "$(SHLIB_TARGET)" = "" ]; then \
+ $(CC) -o $(MD2TEST) $(CFLAGS) $(MD2TEST).o $(PEX_LIBS) $(LIBCRYPTO)
$(EX_LIBS); \
+ else \
+ LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
+ $(CC) -o $(MD2TEST) $(CFLAGS) $(MD2TEST).o $(PEX_LIBS) $(LIBCRYPTO)
$(EX_LIBS); \
+ fi

$(SHATEST): $(SHATEST).o $(DLIBCRYPTO)
- LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
- $(CC) -o $(SHATEST) $(CFLAGS) $(SHATEST).o $(PEX_LIBS) $(LIBCRYPTO)
$(EX_LIBS)
+ if [ "$(SHLIB_TARGET)" = "" ]; then \
+ $(CC) -o $(SHATEST) $(CFLAGS) $(SHATEST).o $(PEX_LIBS) $(LIBCRYPTO)
$(EX_LIBS); \
+ else \
+ LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
+ $(CC) -o $(SHATEST) $(CFLAGS) $(SHATEST).o $(PEX_LIBS) $(LIBCRYPTO)
$(EX_LIBS); \
+ fi

$(SHA1TEST): $(SHA1TEST).o $(DLIBCRYPTO)
- LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
- $(CC) -o $(SHA1TEST) $(CFLAGS) $(SHA1TEST).o $(PEX_LIBS) $(LIBCRYPTO)
$(EX_LIBS)
+ if [ "$(SHLIB_TARGET)" = "" ]; then \
+ $(CC) -o $(SHA1TEST) $(CFLAGS) $(SHA1TEST).o $(PEX_LIBS) $(LIBCRYPTO)
$(EX_LIBS); \
+ else \
+ LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
+ $(CC) -o $(SHA1TEST) $(CFLAGS) $(SHA1TEST).o $(PEX_LIBS) $(LIBCRYPTO)
$(EX_LIBS); \
+ fi

$(RMDTEST): $(RMDTEST).o $(DLIBCRYPTO)
- LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
- $(CC) -o $(RMDTEST) $(CFLAGS) $(RMDTEST).o $(PEX_LIBS) $(LIBCRYPTO)
$(EX_LIBS)
+ if [ "$(SHLIB_TARGET)" = "" ]; then \
+ $(CC) -o $(RMDTEST) $(CFLAGS) $(RMDTEST).o $(PEX_LIBS) $(LIBCRYPTO)
$(EX_LIBS); \
+ else \
+ LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
+ $(CC) -o $(RMDTEST) $(CFLAGS) $(RMDTEST).o $(PEX_LIBS) $(LIBCRYPTO)
$(EX_LIBS); \
+ fi

$(MDC2TEST): $(MDC2TEST).o $(DLIBCRYPTO)
- LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
- $(CC) -o $(MDC2TEST) $(CFLAGS) $(MDC2TEST).o $(PEX_LIBS) $(LIBCRYPTO)
$(EX_LIBS)
+ if [ "$(SHLIB_TARGET)" = "" ]; then \
+ $(CC) -o $(MDC2TEST) $(CFLAGS) $(MDC2TEST).o $(PEX_LIBS) $(LIBCRYPTO)
$(EX_LIBS); \
+ else \
+ LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
+ $(CC) -o $(MDC2TEST) $(CFLAGS) $(MDC2TEST).o $(PEX_LIBS) $(LIBCRYPTO)
$(EX_LIBS); \
+ fi

$(MD4TEST): $(MD4TEST).o $(DLIBCRYPTO)
- LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
- $(CC) -o $(MD4TEST) $(CFLAGS) $(MD4TEST).o $(PEX_LIBS) $(LIBCRYPTO)
$(EX_LIBS)
+ if [ "$(SHLIB_TARGET)" = "" ]; then \
+ $(CC) -o $(MD4TEST) $(CFLAGS) $(MD4TEST).o $(PEX_LIBS) $(LIBCRYPTO)
$(EX_LIBS); \
+ else \
+ LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
+ $(CC) -o $(MD4TEST) $(CFLAGS) $(MD4TEST).o $(PEX_LIBS) $(LIBCRYPTO)
$(EX_LIBS); \
+ fi

$(MD5TEST): $(MD5TEST).o $(DLIBCRYPTO)
- LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
- $(CC) -o $(MD5TEST) $(CFLAGS) $(MD5TEST).o $(PEX_LIBS) $(LIBCRYPTO)
$(EX_LIBS)
+ if [ "$(SHLIB_TARGET)" = "" ]; then \
+ $(CC) -o $(MD5TEST) $(CFLAGS) $(MD5TEST).o $(PEX_LIBS) $(LIBCRYPTO)
$(EX_LIBS); \
+ else \
+ LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
+ $(CC) -o $(MD5TEST) $(CFLAGS) $(MD5TEST).o $(PEX_LIBS) $(LIBCRYPTO)
$(EX_LIBS); \
+ fi

$(HMACTEST): $(HMACTEST).o $(DLIBCRYPTO)
- LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
- $(CC) -o $(HMACTEST) $(CFLAGS) $(HMACTEST).o $(PEX_LIBS) $(LIBCRYPTO)
$(EX_LIBS)
+ if [ "$(SHLIB_TARGET)" = "" ]; then \
+ $(CC) -o $(HMACTEST) $(CFLAGS) $(HMACTEST).o $(PEX_LIBS) $(LIBCRYPTO)
$(EX_LIBS); \
+ else \
+ LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
+ $(CC) -o $(HMACTEST) $(CFLAGS) $(HMACTEST).o $(PEX_LIBS) $(LIBCRYPTO)
$(EX_LIBS); \
+ fi

$(RC2TEST): $(RC2TEST).o $(DLIBCRYPTO)
- LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
- $(CC) -o $(RC2TEST) $(CFLAGS) $(RC2TEST).o $(PEX_LIBS) $(LIBCRYPTO)
$(EX_LIBS)
+ if [ "$(SHLIB_TARGET)" = "" ]; then \
+ $(CC) -o $(RC2TEST) $(CFLAGS) $(RC2TEST).o $(PEX_LIBS) $(LIBCRYPTO)
$(EX_LIBS); \
+ else \
+ LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
+ $(CC) -o $(RC2TEST) $(CFLAGS) $(RC2TEST).o $(PEX_LIBS) $(LIBCRYPTO)
$(EX_LIBS); \
+ fi

$(BFTEST): $(BFTEST).o $(DLIBCRYPTO)
- LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
- $(CC) -o $(BFTEST) $(CFLAGS) $(BFTEST).o $(PEX_LIBS) $(LIBCRYPTO)
$(EX_LIBS)
+ if [ "$(SHLIB_TARGET)" = "" ]; then \
+ $(CC) -o $(BFTEST) $(CFLAGS) $(BFTEST).o $(PEX_LIBS) $(LIBCRYPTO)
$(EX_LIBS); \
+ else \
+ LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
+ $(CC) -o $(BFTEST) $(CFLAGS) $(BFTEST).o $(PEX_LIBS) $(LIBCRYPTO)
$(EX_LIBS); \
+ fi

$(CASTTEST): $(CASTTEST).o $(DLIBCRYPTO)
- LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
- $(CC) -o $(CASTTEST) $(CFLAGS) $(CASTTEST).o $(PEX_LIBS) $(LIBCRYPTO)
$(EX_LIBS)
+ if [ "$(SHLIB_TARGET)" = "" ]; then \
+ $(CC) -o $(CASTTEST) $(CFLAGS) $(CASTTEST).o $(PEX_LIBS) $(LIBCRYPTO)
$(EX_LIBS); \
+ else \
+ LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
+ $(CC) -o $(CASTTEST) $(CFLAGS) $(CASTTEST).o $(PEX_LIBS) $(LIBCRYPTO)
$(EX_LIBS); \
+ fi

$(RC4TEST): $(RC4TEST).o $(DLIBCRYPTO)
- LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
- $(CC) -o $(RC4TEST) $(CFLAGS) $(RC4TEST).o $(PEX_LIBS) $(LIBCRYPTO)
$(EX_LIBS)
+ if [ "$(SHLIB_TARGET)" = "" ]; then \
+ $(CC) -o $(RC4TEST) $(CFLAGS) $(RC4TEST).o $(PEX_LIBS) $(LIBCRYPTO)
$(EX_LIBS); \
+ else \
+ LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
+ $(CC) -o $(RC4TEST) $(CFLAGS) $(RC4TEST).o $(PEX_LIBS) $(LIBCRYPTO)
$(EX_LIBS); \
+ fi

$(RC5TEST): $(RC5TEST).o $(DLIBCRYPTO)
- LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
- $(CC) -o $(RC5TEST) $(CFLAGS) $(RC5TEST).o $(PEX_LIBS) $(LIBCRYPTO)
$(EX_LIBS)
+ if [ "$(SHLIB_TARGET)" = "" ]; then \
+ $(CC) -o $(RC5TEST) $(CFLAGS) $(RC5TEST).o $(PEX_LIBS) $(LIBCRYPTO)
$(EX_LIBS); \
+ else \
+ LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
+ $(CC) -o $(RC5TEST) $(CFLAGS) $(RC5TEST).o $(PEX_LIBS) $(LIBCRYPTO)
$(EX_LIBS); \
+ fi

$(DESTEST): $(DESTEST).o $(DLIBCRYPTO)
- LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
- $(CC) -o $(DESTEST) $(CFLAGS) $(DESTEST).o $(PEX_LIBS) $(LIBCRYPTO)
$(EX_LIBS)
+ if [ "$(SHLIB_TARGET)" = "" ]; then \
+ $(CC) -o $(DESTEST) $(CFLAGS) $(DESTEST).o $(PEX_LIBS) $(LIBCRYPTO)
$(EX_LIBS); \
+ else \
+ LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
+ $(CC) -o $(DESTEST) $(CFLAGS) $(DESTEST).o $(PEX_LIBS) $(LIBCRYPTO)
$(EX_LIBS); \
+ fi

$(RANDTEST): $(RANDTEST).o $(DLIBCRYPTO)
- LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
- $(CC) -o $(RANDTEST) $(CFLAGS) $(RANDTEST).o $(PEX_LIBS) $(LIBCRYPTO)
$(EX_LIBS)
+ if [ "$(SHLIB_TARGET)" = "" ]; then \
+ $(CC) -o $(RANDTEST) $(CFLAGS) $(RANDTEST).o $(PEX_LIBS) $(LIBCRYPTO)
$(EX_LIBS); \
+ else \
+ LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
+ $(CC) -o $(RANDTEST) $(CFLAGS) $(RANDTEST).o $(PEX_LIBS) $(LIBCRYPTO)
$(EX_LIBS); \
+ fi

$(DHTEST): $(DHTEST).o $(DLIBCRYPTO)
- LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
- $(CC) -o $(DHTEST) $(CFLAGS) $(DHTEST).o $(PEX_LIBS) $(LIBCRYPTO)
$(EX_LIBS)
+ if [ "$(SHLIB_TARGET)" = "" ]; then \
+ $(CC) -o $(DHTEST) $(CFLAGS) $(DHTEST).o $(PEX_LIBS) $(LIBCRYPTO)
$(EX_LIBS); \
+ else \
+ LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
+ $(CC) -o $(DHTEST) $(CFLAGS) $(DHTEST).o $(PEX_LIBS) $(LIBCRYPTO)
$(EX_LIBS); \
+ fi

$(DSATEST): $(DSATEST).o $(DLIBCRYPTO)
- LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
- $(CC) -o $(DSATEST) $(CFLAGS) $(DSATEST).o $(PEX_LIBS) $(LIBCRYPTO)
$(EX_LIBS)
+ if [ "$(SHLIB_TARGET)" = "" ]; then \
+ $(CC) -o $(DSATEST) $(CFLAGS) $(DSATEST).o $(PEX_LIBS) $(LIBCRYPTO)
$(EX_LIBS); \
+ else \
+ LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
+ $(CC) -o $(DSATEST) $(CFLAGS) $(DSATEST).o $(PEX_LIBS) $(LIBCRYPTO)
$(EX_LIBS); \
+ fi

$(METHTEST): $(METHTEST).o $(DLIBCRYPTO)
- LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
- $(CC) -o $(METHTEST) $(CFLAGS) $(METHTEST).o $(PEX_LIBS) $(LIBCRYPTO)
$(EX_LIBS)
+ if [ "$(SHLIB_TARGET)" = "" ]; then \
+ $(CC) -o $(METHTEST) $(CFLAGS) $(METHTEST).o $(PEX_LIBS) $(LIBCRYPTO)
$(EX_LIBS); \
+ else \
+ LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
+ $(CC) -o $(METHTEST) $(CFLAGS) $(METHTEST).o $(PEX_LIBS) $(LIBCRYPTO)
$(EX_LIBS); \
+ fi

$(SSLTEST): $(SSLTEST).o $(DLIBSSL) $(DLIBCRYPTO)
- LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
- $(CC) -o $(SSLTEST) $(CFLAGS) $(SSLTEST).o $(PEX_LIBS) $(LIBSSL)
$(LIBCRYPTO) $(EX_LIBS)
+ if [ "$(SHLIB_TARGET)" = "" ]; then \
+ $(CC) -o $(SSLTEST) $(CFLAGS) $(SSLTEST).o $(PEX_LIBS) $(LIBSSL)
$(LIBCRYPTO) $(EX_LIBS); \
+ else \
+ LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
+ $(CC) -o $(SSLTEST) $(CFLAGS) $(SSLTEST).o $(PEX_LIBS) $(LIBSSL)
$(LIBCRYPTO) $(EX_LIBS); \
+ fi

$(ENGINETEST): $(ENGINETEST).o $(DLIBCRYPTO)
LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
$(CC) -o $(ENGINETEST) $(CFLAGS) $(ENGINETEST).o $(PEX_LIBS)
$(LIBCRYPTO) $(EX_LIBS)

dummytest: dummytest.o $(DLIBCRYPTO)
- LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
- $(CC) -o dummytest $(CFLAGS) dummytest.o $(PEX_LIBS) $(LIBCRYPTO)
$(EX_LIBS)
+ if [ "$(SHLIB_TARGET)" = "" ]; then \
+ $(CC) -o dummytest $(CFLAGS) dummytest.o $(PEX_LIBS) $(LIBCRYPTO)
$(EX_LIBS); \
+ else \
+ LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
+ $(CC) -o dummytest $(CFLAGS) dummytest.o $(PEX_LIBS) $(LIBCRYPTO)
$(EX_LIBS); \
+ fi

# DO NOT DELETE THIS LINE -- make depend depends on it.

@@ .
______________________________________________________________________
OpenSSL Project http://www.openssl.org
CVS Repository Commit List openssl-cvs@xxxxxxxxxxx
Automated List Manager majordomo@xxxxxxxxxxx
<Prev in Thread] Current Thread [Next in Thread>
Previous by Date:  [CVS] OpenSSL: OpenSSL_0_9_6-stable: openssl/test/ Makefile.ssl, Richard Levitte
Next by Date:  [CVS] OpenSSL: openssl-web/related/ apps.wml, Richard Levitte
Previous by Thread:  [CVS] OpenSSL: OpenSSL_0_9_6-stable: openssl/test/ Makefile.ssl, Richard Levitte
Next by Thread:  [CVS] OpenSSL: OpenSSL_0_9_7-stable: openssl/ Configure Makefile.org T..., Richard Levitte
Indexes:  [Date] [Thread] [Top] [All Lists]

Google Custom Search
Recently Viewed:
qnx.openqnx.dev...    gcc.libstdc++.c...    solaris.opensol...    information-ret...    misc.misterhous...    web.catalyst.ge...    apache.webservi...    redhat.release....    hardware.lirc/2...    kernel.autofs/2...    technology.sust...    linux.vdr/2003-...    editors.lyx.gen...    org.user-groups...    netbsd.devel.pk...    xdg.devel/2004-...    version-control...    jakarta.slide.d...    debian.packages...    creativecommons...    ports.ppc.embed...    bug-tracking.bu...   
Home | blog view | USPTO Patent Archive | advertise | OSDir is an inevitable website. super tiny logo

Free Magazines

Cisco News
Receive a free quarterly e-newsletter with exclusive articles on how Cisco IT uses its own products and solutions to enable the business.
subscribe

Systems Management News, the newspaper for IT systems administration and data center managers! Each issue of Systems Management News is chock-full of news and analysis to help you understand what's happening in your field.
subscribe

The Enterprise Newsweekly eWeek is the essential technology information source for builders of e-business.
subscribe

Oracle Magazine Oracle Magazine contains technology strategy articles, sample code, tips, Oracle and partner news, how to articles for developers and DBAs, and more. Oracle (NASDAQ: ORCL) is the world's largest enterprise software company.
subscribe

Total Telecom Total Telecom is "The Economist of the communications industry".
subscribe