Recent changes from 0.9.6-stable
This commit is contained in:
Richard Levitte
parent
980645e55e
commit
3ef63bcc6b
@ -136,12 +136,8 @@ $(DLIBCRYPTO):
|
|||||||
|
|
||||||
$(PROGRAM): progs.h $(E_OBJ) $(PROGRAM).o $(DLIBCRYPTO) $(DLIBSSL)
|
$(PROGRAM): progs.h $(E_OBJ) $(PROGRAM).o $(DLIBCRYPTO) $(DLIBSSL)
|
||||||
$(RM) $(PROGRAM)
|
$(RM) $(PROGRAM)
|
||||||
if [ "$(SHLIB_TARGET)" = "" ] ; then \
|
LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
|
||||||
$(CC) -o $(PROGRAM) $(CFLAGS) $(PROGRAM).o $(E_OBJ) $(PEX_LIBS) $(LIBSSL) $(LIBCRYPTO) $(EX_LIBS); \
|
$(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)
|
-(cd ..; OPENSSL="`pwd`/apps/openssl"; export OPENSSL; $(PERL) tools/c_rehash certs)
|
||||||
|
|
||||||
progs.h: progs.pl
|
progs.h: progs.pl
|
||||||
|
|||||||
@ -207,7 +207,7 @@ static int ssl_set_pkey(CERT *c, EVP_PKEY *pkey)
|
|||||||
ok=1;
|
ok=1;
|
||||||
else
|
else
|
||||||
#endif
|
#endif
|
||||||
if (!X509_check_private_key(c->pkeys[i].x509,pkey))
|
if (!X509_check_private_key(c->pkeys[i].x509,pkey))
|
||||||
{
|
{
|
||||||
if ((i == SSL_PKEY_DH_RSA) || (i == SSL_PKEY_DH_DSA))
|
if ((i == SSL_PKEY_DH_RSA) || (i == SSL_PKEY_DH_DSA))
|
||||||
{
|
{
|
||||||
@ -241,6 +241,8 @@ static int ssl_set_pkey(CERT *c, EVP_PKEY *pkey)
|
|||||||
return(0);
|
return(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ERR_clear_error(); /* make sure no error from X509_check_private_key()
|
||||||
|
* is left if we have chosen to ignore it */
|
||||||
if (c->pkeys[i].privatekey != NULL)
|
if (c->pkeys[i].privatekey != NULL)
|
||||||
EVP_PKEY_free(c->pkeys[i].privatekey);
|
EVP_PKEY_free(c->pkeys[i].privatekey);
|
||||||
CRYPTO_add(&pkey->references,1,CRYPTO_LOCK_EVP_PKEY);
|
CRYPTO_add(&pkey->references,1,CRYPTO_LOCK_EVP_PKEY);
|
||||||
|
|||||||
@ -258,200 +258,104 @@ $(DLIBCRYPTO):
|
|||||||
(cd ..; $(MAKE) DIRS=crypto all)
|
(cd ..; $(MAKE) DIRS=crypto all)
|
||||||
|
|
||||||
$(RSATEST): $(RSATEST).o $(DLIBCRYPTO)
|
$(RSATEST): $(RSATEST).o $(DLIBCRYPTO)
|
||||||
if [ "$(SHLIB_TARGET)" = "" ]; then \
|
LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
|
||||||
$(CC) -o $(RSATEST) $(CFLAGS) $(RSATEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS); \
|
$(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)
|
$(BNTEST): $(BNTEST).o $(DLIBCRYPTO)
|
||||||
if [ "$(SHLIB_TARGET)" = "" ]; then \
|
LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
|
||||||
$(CC) -o $(BNTEST) $(CFLAGS) $(BNTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS); \
|
$(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)
|
$(EXPTEST): $(EXPTEST).o $(DLIBCRYPTO)
|
||||||
if [ "$(SHLIB_TARGET)" = "" ]; then \
|
LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
|
||||||
$(CC) -o $(EXPTEST) $(CFLAGS) $(EXPTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS); \
|
$(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)
|
$(IDEATEST): $(IDEATEST).o $(DLIBCRYPTO)
|
||||||
if [ "$(SHLIB_TARGET)" = "" ]; then \
|
LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
|
||||||
$(CC) -o $(IDEATEST) $(CFLAGS) $(IDEATEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS); \
|
$(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)
|
$(MD2TEST): $(MD2TEST).o $(DLIBCRYPTO)
|
||||||
if [ "$(SHLIB_TARGET)" = "" ]; then \
|
LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
|
||||||
$(CC) -o $(MD2TEST) $(CFLAGS) $(MD2TEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS); \
|
$(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)
|
$(SHATEST): $(SHATEST).o $(DLIBCRYPTO)
|
||||||
if [ "$(SHLIB_TARGET)" = "" ]; then \
|
LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
|
||||||
$(CC) -o $(SHATEST) $(CFLAGS) $(SHATEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS); \
|
$(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)
|
$(SHA1TEST): $(SHA1TEST).o $(DLIBCRYPTO)
|
||||||
if [ "$(SHLIB_TARGET)" = "" ]; then \
|
LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
|
||||||
$(CC) -o $(SHA1TEST) $(CFLAGS) $(SHA1TEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS); \
|
$(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)
|
$(RMDTEST): $(RMDTEST).o $(DLIBCRYPTO)
|
||||||
if [ "$(SHLIB_TARGET)" = "" ]; then \
|
LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
|
||||||
$(CC) -o $(RMDTEST) $(CFLAGS) $(RMDTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS); \
|
$(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)
|
$(MDC2TEST): $(MDC2TEST).o $(DLIBCRYPTO)
|
||||||
if [ "$(SHLIB_TARGET)" = "" ]; then \
|
LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
|
||||||
$(CC) -o $(MDC2TEST) $(CFLAGS) $(MDC2TEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS); \
|
$(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)
|
$(MD4TEST): $(MD4TEST).o $(DLIBCRYPTO)
|
||||||
if [ "$(SHLIB_TARGET)" = "" ]; then \
|
LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
|
||||||
$(CC) -o $(MD4TEST) $(CFLAGS) $(MD4TEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS); \
|
$(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)
|
$(MD5TEST): $(MD5TEST).o $(DLIBCRYPTO)
|
||||||
if [ "$(SHLIB_TARGET)" = "" ]; then \
|
LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
|
||||||
$(CC) -o $(MD5TEST) $(CFLAGS) $(MD5TEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS); \
|
$(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)
|
$(HMACTEST): $(HMACTEST).o $(DLIBCRYPTO)
|
||||||
if [ "$(SHLIB_TARGET)" = "" ]; then \
|
LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
|
||||||
$(CC) -o $(HMACTEST) $(CFLAGS) $(HMACTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS); \
|
$(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)
|
$(RC2TEST): $(RC2TEST).o $(DLIBCRYPTO)
|
||||||
if [ "$(SHLIB_TARGET)" = "" ]; then \
|
LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
|
||||||
$(CC) -o $(RC2TEST) $(CFLAGS) $(RC2TEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS); \
|
$(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)
|
$(BFTEST): $(BFTEST).o $(DLIBCRYPTO)
|
||||||
if [ "$(SHLIB_TARGET)" = "" ]; then \
|
LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
|
||||||
$(CC) -o $(BFTEST) $(CFLAGS) $(BFTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS); \
|
$(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)
|
$(CASTTEST): $(CASTTEST).o $(DLIBCRYPTO)
|
||||||
if [ "$(SHLIB_TARGET)" = "" ]; then \
|
LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
|
||||||
$(CC) -o $(CASTTEST) $(CFLAGS) $(CASTTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS); \
|
$(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)
|
$(RC4TEST): $(RC4TEST).o $(DLIBCRYPTO)
|
||||||
if [ "$(SHLIB_TARGET)" = "" ]; then \
|
LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
|
||||||
$(CC) -o $(RC4TEST) $(CFLAGS) $(RC4TEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS); \
|
$(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)
|
$(RC5TEST): $(RC5TEST).o $(DLIBCRYPTO)
|
||||||
if [ "$(SHLIB_TARGET)" = "" ]; then \
|
LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
|
||||||
$(CC) -o $(RC5TEST) $(CFLAGS) $(RC5TEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS); \
|
$(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)
|
$(DESTEST): $(DESTEST).o $(DLIBCRYPTO)
|
||||||
if [ "$(SHLIB_TARGET)" = "" ]; then \
|
LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
|
||||||
$(CC) -o $(DESTEST) $(CFLAGS) $(DESTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS); \
|
$(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)
|
$(RANDTEST): $(RANDTEST).o $(DLIBCRYPTO)
|
||||||
if [ "$(SHLIB_TARGET)" = "" ]; then \
|
LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
|
||||||
$(CC) -o $(RANDTEST) $(CFLAGS) $(RANDTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS); \
|
$(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)
|
$(DHTEST): $(DHTEST).o $(DLIBCRYPTO)
|
||||||
if [ "$(SHLIB_TARGET)" = "" ]; then \
|
LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
|
||||||
$(CC) -o $(DHTEST) $(CFLAGS) $(DHTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS); \
|
$(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)
|
$(DSATEST): $(DSATEST).o $(DLIBCRYPTO)
|
||||||
if [ "$(SHLIB_TARGET)" = "" ]; then \
|
LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
|
||||||
$(CC) -o $(DSATEST) $(CFLAGS) $(DSATEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS); \
|
$(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)
|
$(METHTEST): $(METHTEST).o $(DLIBCRYPTO)
|
||||||
if [ "$(SHLIB_TARGET)" = "" ]; then \
|
LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
|
||||||
$(CC) -o $(METHTEST) $(CFLAGS) $(METHTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS); \
|
$(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)
|
$(SSLTEST): $(SSLTEST).o $(DLIBSSL) $(DLIBCRYPTO)
|
||||||
if [ "$(SHLIB_TARGET)" = "" ]; then \
|
LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
|
||||||
$(CC) -o $(SSLTEST) $(CFLAGS) $(SSLTEST).o $(PEX_LIBS) $(LIBSSL) $(LIBCRYPTO) $(EX_LIBS); \
|
$(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)
|
$(ENGINETEST): $(ENGINETEST).o $(DLIBCRYPTO)
|
||||||
LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
|
LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
|
||||||
$(CC) -o $(ENGINETEST) $(CFLAGS) $(ENGINETEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
|
$(CC) -o $(ENGINETEST) $(CFLAGS) $(ENGINETEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
|
||||||
|
|
||||||
dummytest: dummytest.o $(DLIBCRYPTO)
|
dummytest: dummytest.o $(DLIBCRYPTO)
|
||||||
if [ "$(SHLIB_TARGET)" = "" ]; then \
|
LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
|
||||||
$(CC) -o dummytest $(CFLAGS) dummytest.o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS); \
|
$(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.
|
# DO NOT DELETE THIS LINE -- make depend depends on it.
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user