oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Windows: Catch up with hcrypto changes

Browse Source
This commit is contained in:
Asanka C. Herath
2010-10-15 01:51:47 -04:00
parent d98e72bc62
commit 3855dd33bd
2 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/hcrypto/NTMakefile
View File

@@ -33,7 +33,7 @@ SUBDIRS=libtommath
RELDIR=lib\hcrypto RELDIR=lib\hcrypto
intcflags=-DKRB5 -DASN1_LIB -I$(HCRYPTOINCLUDEDIR) -DUSE_HCRYPTO_IMATH=1 intcflags=-DKRB5 -DASN1_LIB -I$(HCRYPTOINCLUDEDIR) -DUSE_HCRYPTO_LTM=1
!include ../../windows/NTMakefile.w32 !include ../../windows/NTMakefile.w32
@@ -90,8 +90,6 @@ all:: $(INCFILES)
# libhcrypto # libhcrypto
libhcrypto_OBJs = \ libhcrypto_OBJs = \
$(OBJ)\imath.obj \
$(OBJ)\iprime.obj \
$(OBJ)\aes.obj \ $(OBJ)\aes.obj \
$(OBJ)\bn.obj \ $(OBJ)\bn.obj \
$(OBJ)\camellia.obj \ $(OBJ)\camellia.obj \
@@ -99,7 +97,6 @@ libhcrypto_OBJs = \
$(OBJ)\common.obj \ $(OBJ)\common.obj \
$(OBJ)\des.obj \ $(OBJ)\des.obj \
$(OBJ)\dh.obj \ $(OBJ)\dh.obj \
$(OBJ)\dh-imath.obj \
$(OBJ)\dh-ltm.obj \ $(OBJ)\dh-ltm.obj \
$(OBJ)\dh-tfm.obj \ $(OBJ)\dh-tfm.obj \
$(OBJ)\dsa.obj \ $(OBJ)\dsa.obj \
@@ -121,7 +118,6 @@ libhcrypto_OBJs = \
$(OBJ)\rnd_keys.obj \ $(OBJ)\rnd_keys.obj \
$(OBJ)\rsa.obj \ $(OBJ)\rsa.obj \
$(OBJ)\rsa-gmp.obj \ $(OBJ)\rsa-gmp.obj \
$(OBJ)\rsa-imath.obj \
$(OBJ)\rsa-ltm.obj \ $(OBJ)\rsa-ltm.obj \
$(OBJ)\rsa-tfm.obj \ $(OBJ)\rsa-tfm.obj \
$(OBJ)\sha.obj \ $(OBJ)\sha.obj \
@@ -133,9 +129,6 @@ libhcrypto_OBJs = \
$(LIBHCRYPTO): $(libhcrypto_OBJs) $(LIBHCRYPTO): $(libhcrypto_OBJs)
$(LIBCON) $(LIBCON)
{imath/}.c{$(OBJ)}.obj::
$(C2OBJ_P)
all:: $(LIBHCRYPTO) all:: $(LIBHCRYPTO)
clean:: clean::
@@ -146,7 +139,6 @@ clean::
TESTLIB=$(OBJ)\libhctest.lib TESTLIB=$(OBJ)\libhctest.lib
$(TESTLIB): \ $(TESTLIB): \
$(OBJ)\imath.obj \
$(OBJ)\des.obj \ $(OBJ)\des.obj \
$(OBJ)\ui.obj $(OBJ)\ui.obj
$(LIBCON) $(LIBCON)
@@ -161,7 +153,6 @@ test-binaries: \
$(OBJ)\test_cipher.exe \ $(OBJ)\test_cipher.exe \
$(OBJ)\test_engine_dso.exe \ $(OBJ)\test_engine_dso.exe \
$(OBJ)\test_hmac.exe \ $(OBJ)\test_hmac.exe \
$(OBJ)\test_imath.exe \
$(OBJ)\test_pkcs5.exe \ $(OBJ)\test_pkcs5.exe \
$(OBJ)\test_pkcs12.exe \ $(OBJ)\test_pkcs12.exe \
$(OBJ)\test_rsa.exe \ $(OBJ)\test_rsa.exe \
@@ -177,7 +168,7 @@ $(OBJ)\example_evp_cipher.exe: $(OBJ)\example_evp_cipher.obj $(TESTLIB) $(LIBHEI
$(EXECONLINK) $(EXECONLINK)
$(EXEPREP_NODIST) $(EXEPREP_NODIST)
$(OBJ)\mdtest.exe: $(OBJ)\mdtest.obj $(LIBHEIMDAL) $(LIBROKEN) $(OBJ)\mdtest.exe: $(OBJ)\mdtest.obj $(LIBHEIMDAL) $(LIBROKEN) $(OBJ)\sha512.obj
$(EXECONLINK) $(EXECONLINK)
$(EXEPREP_NODIST) $(EXEPREP_NODIST)
@@ -205,10 +196,6 @@ $(OBJ)\test_hmac.exe: $(OBJ)\test_hmac.obj $(LIBHEIMDAL) $(LIBROKEN)
$(EXECONLINK) $(EXECONLINK)
$(EXEPREP_NODIST) $(EXEPREP_NODIST)
$(OBJ)\test_imath.exe: $(OBJ)\test_imath.obj $(TESTLIB) $(LIBROKEN)
$(EXECONLINK)
$(EXEPREP_NODIST)
$(OBJ)\test_pkcs5.exe: $(OBJ)\test_pkcs5.obj $(LIBHEIMDAL) $(LIBROKEN) $(OBJ)\test_pkcs5.exe: $(OBJ)\test_pkcs5.obj $(LIBHEIMDAL) $(LIBROKEN)
$(EXECONLINK) $(EXECONLINK)
$(EXEPREP_NODIST) $(EXEPREP_NODIST)
@@ -248,7 +235,6 @@ test-run:
test_cipher.exe test_cipher.exe
test_engine_dso.exe test_engine_dso.exe
test_hmac.exe test_hmac.exe
test_imath.exe
test_pkcs5.exe test_pkcs5.exe
test_pkcs12.exe test_pkcs12.exe
test_rsa.exe test_rsa.exe

1
lib/hcrypto/libhcrypto-exports.def
View File

@@ -249,7 +249,6 @@ EXPORTS
hc_RSA_get_app_data hc_RSA_get_app_data
hc_RSA_get_default_method hc_RSA_get_default_method
hc_RSA_get_method hc_RSA_get_method
hc_RSA_imath_method
hc_RSA_new hc_RSA_new
hc_RSA_new_method hc_RSA_new_method
hc_RSA_null_method hc_RSA_null_method