Imported Upstream version 1.2.22upstream/1.2.22upstream

Change-Id: I4d17734839f021e46aef7a30483ac17e8c85fb1d
Signed-off-by: sangwan.kwon <sangwan.kwon@samsung.com>

4 files changed, 26 insertions, 33 deletions

diff --git a/win32/Makefile.msvc b/win32/Makefile.msvc
index 2712a0ad..e3d5262e 100644
--- a/win32/Makefile.msvc
+++ b/win32/Makefile.msvc
@@ -148,12 +148,12 @@ XMLSEC_OBJS = \
 	$(XMLSEC_INTDIR)\membuf.obj \
 	$(XMLSEC_INTDIR)\nodeset.obj \
 	$(XMLSEC_INTDIR)\parser.obj \
+	$(XMLSEC_INTDIR)\relationship.obj \
 	$(XMLSEC_INTDIR)\soap.obj \
 	$(XMLSEC_INTDIR)\strings.obj \
 	$(XMLSEC_INTDIR)\templates.obj \
 	$(XMLSEC_INTDIR)\transforms.obj \
 	$(XMLSEC_INTDIR)\x509.obj \
-	$(XMLSEC_INTDIR)\xkms.obj \
 	$(XMLSEC_INTDIR)\xmldsig.obj \
 	$(XMLSEC_INTDIR)\xmlenc.obj \
 	$(XMLSEC_INTDIR)\xmlsec.obj \
@@ -179,12 +179,12 @@ XMLSEC_OBJS_A = \
 	$(XMLSEC_INTDIR_A)\membuf.obj \
 	$(XMLSEC_INTDIR_A)\nodeset.obj \
 	$(XMLSEC_INTDIR_A)\parser.obj \
+	$(XMLSEC_INTDIR_A)\relationship.obj \
 	$(XMLSEC_INTDIR_A)\soap.obj \
 	$(XMLSEC_INTDIR_A)\strings.obj \
 	$(XMLSEC_INTDIR_A)\templates.obj \
 	$(XMLSEC_INTDIR_A)\transforms.obj \
 	$(XMLSEC_INTDIR_A)\x509.obj \
-	$(XMLSEC_INTDIR_A)\xkms.obj \
 	$(XMLSEC_INTDIR_A)\xmldsig.obj \
 	$(XMLSEC_INTDIR_A)\xmlenc.obj \
 	$(XMLSEC_INTDIR_A)\xmlsec.obj \
@@ -334,7 +334,7 @@ CFLAGS 			= $(CFLAGS) /DXMLSEC_MSCRYPTO_NT4=1
 !else 
 !endif
 
-APP_CFLAGS		= /D "XMLSEC_CRYPTO=\"$(XMLSEC_CRYPTO)\""
+APP_CFLAGS		= /D "XMLSEC_DEFAULT_CRYPTO=\"$(XMLSEC_DEFAULT_CRYPTO)\""
 !if "$(WITH_DL)" == "1"
 CFLAGS			= $(CFLAGS) /D "XMLSEC_DL_WIN32"
 APP_CFLAGS		= $(APP_CFLAGS) /D "XMLSEC_CRYPTO_DYNAMIC_LOADING"
@@ -346,12 +346,12 @@ APP_CFLAGS		= $(APP_CFLAGS) /D "XMLSEC_NO_TMPL_TEST"
 !endif
 
 !if "$(WITH_OPENSSL_VERSION)" == ""
-XMLSEC_OPENSSL_CFLAGS   = /D "XMLSEC_CRYPTO_OPENSSL" /D "XMLSEC_CRYPTO=\"openssl\""
+XMLSEC_OPENSSL_CFLAGS   = /D "XMLSEC_CRYPTO_OPENSSL" /D "XMLSEC_DEFAULT_CRYPTO=\"openssl\""
 !else
-XMLSEC_OPENSSL_CFLAGS   = /D "$(WITH_OPENSSL_VERSION)" /D "XMLSEC_CRYPTO_OPENSSL" /D "XMLSEC_CRYPTO=\"openssl\""
+XMLSEC_OPENSSL_CFLAGS   = /D "$(WITH_OPENSSL_VERSION)" /D "XMLSEC_CRYPTO_OPENSSL" /D "XMLSEC_DEFAULT_CRYPTO=\"openssl\""
 !endif
-XMLSEC_NSS_CFLAGS   	= /D "XMLSEC_CRYPTO_NSS" /D "XMLSEC_CRYPTO=\"nss\""
-XMLSEC_MSCRYPTO_CFLAGS  = /D "XMLSEC_CRYPTO_MSCRYPTO" /D "XMLSEC_CRYPTO=\"mscrypto\""
+XMLSEC_NSS_CFLAGS   	= /D "XMLSEC_CRYPTO_NSS" /D "XMLSEC_DEFAULT_CRYPTO=\"nss\""
+XMLSEC_MSCRYPTO_CFLAGS  = /D "XMLSEC_CRYPTO_MSCRYPTO" /D "XMLSEC_DEFAULT_CRYPTO=\"mscrypto\""
 
 #
 # The linker and its options.
@@ -410,33 +410,33 @@ ARFLAGS = /nologo
 # xmlsec-<default-crypto> options
 #
 !if "$(WITH_DEFAULT_CRYPTO)" == "openssl" 
-XMLSEC_CRYPTO          	= "openssl"
+XMLSEC_DEFAULT_CRYPTO   = "openssl"
 XMLSEC_CRYPTO_CFLAGS   	= $(XMLSEC_OPENSSL_CFLAGS)
 XMLSEC_CRYPTO_SOLIBS  	= $(XMLSEC_OPENSSL_SOLIBS)
 XMLSEC_CRYPTO_ALIBS    	= $(XMLSEC_OPENSSL_ALIBS)
 XMLSEC_CRYPTO_SO        = $(XMLSEC_OPENSSL_SO)
-XMLSEC_CRYPTO_IMP	= $(XMLSEC_OPENSSL_IMP)
-XMLSEC_CRYPTO_A		= $(XMLSEC_OPENSSL_A)
+XMLSEC_CRYPTO_IMP	    = $(XMLSEC_OPENSSL_IMP)
+XMLSEC_CRYPTO_A		    = $(XMLSEC_OPENSSL_A)
 !endif
 
 !if "$(WITH_DEFAULT_CRYPTO)" == "nss"
-XMLSEC_CRYPTO          	= "nss"
+XMLSEC_DEFAULT_CRYPTO   = "nss"
 XMLSEC_CRYPTO_CFLAGS   	= $(XMLSEC_NSS_CFLAGS)
 XMLSEC_CRYPTO_SOLIBS   	= $(XMLSEC_NSS_SOLIBS)
 XMLSEC_CRYPTO_ALIBS    	= $(XMLSEC_NSS_ALIBS)
 XMLSEC_CRYPTO_SO        = $(XMLSEC_NSS_SO)
-XMLSEC_CRYPTO_IMP	= $(XMLSEC_NSS_IMP)
-XMLSEC_CRYPTO_A		= $(XMLSEC_NSS_A)
+XMLSEC_CRYPTO_IMP	    = $(XMLSEC_NSS_IMP)
+XMLSEC_CRYPTO_A		    = $(XMLSEC_NSS_A)
 !endif
 
 !if "$(WITH_DEFAULT_CRYPTO)" == "mscrypto"
-XMLSEC_CRYPTO          	= "mscrypto"
+XMLSEC_DEFAULT_CRYPTO  	= "mscrypto"
 XMLSEC_CRYPTO_CFLAGS   	= $(XMLSEC_MSCRYPTO_CFLAGS)
 XMLSEC_CRYPTO_SOLIBS   	= $(XMLSEC_MSCRYPTO_SOLIBS)
 XMLSEC_CRYPTO_ALIBS    	= $(XMLSEC_MSCRYPTO_ALIBS)
 XMLSEC_CRYPTO_SO        = $(XMLSEC_MSCRYPTO_SO)
-XMLSEC_CRYPTO_IMP	= $(XMLSEC_MSCRYPTO_IMP)
-XMLSEC_CRYPTO_A		= $(XMLSEC_MSCRYPTO_A)
+XMLSEC_CRYPTO_IMP	    = $(XMLSEC_MSCRYPTO_IMP)
+XMLSEC_CRYPTO_A		    = $(XMLSEC_MSCRYPTO_A)
 !endif
 
 #
@@ -480,13 +480,6 @@ check-enc : $(BINDIR)\$(APP_NAME)
 	sh ./tests/testrun.sh ./tests/testEnc.sh default ./tests win32/$(BINDIR)/$(APP_NAME) der
 	cd win32
 
-check-xkms : $(BINDIR)\$(APP_NAME)
-	cd ..
-	if not exist win32\tmp mkdir win32\tmp
-	set TMPFOLDER=win32\tmp
-	sh ./tests/testrun.sh ./tests/testXKMS.sh default ./tests win32/$(BINDIR)/$(APP_NAME) der
-	cd win32
-		
 clean :
 	if exist $(XMLSEC_INTDIR) rmdir /S /Q $(XMLSEC_INTDIR)
 	if exist $(XMLSEC_INTDIR_A) rmdir /S /Q $(XMLSEC_INTDIR_A)
diff --git a/win32/README.txt b/win32/README.txt
index 511aa16b..7040e050 100644
--- a/win32/README.txt
+++ b/win32/README.txt
@@ -127,7 +127,7 @@ you need to add one of the following global defines:
     #define XMLSEC_CRYPTO_NSS
 
 Also you'll need to define all configuration parameters used during XML Security
-Library compilation (XMLSEC_OPENSSL_096, XMLSEC_NO_AES, XMLSEC_NO_X509,...).
+Library compilation (XMLSEC_OPENSSL_100, XMLSEC_NO_AES, XMLSEC_NO_X509,...).
 
   2.1 Additional Global Defines for static linking.
   -------------
-------------
-------------
------

diff --git a/win32/configure.js b/win32/configure.js
index 1d3622ca..7bbba19e 100644
--- a/win32/configure.js
+++ b/win32/configure.js
@@ -21,7 +21,7 @@ var baseName = "libxmlsec";
 
 /* Configure file which contains the version and the output file where
    we can store our build configuration. */
-var configFile = baseDir + "\\configure.in";
+var configFile = baseDir + "\\configure.ac";
 var versionFile = ".\\configure.txt";
 
 /* Input and output files regarding the lib(e)xml features. The second
@@ -311,19 +311,19 @@ for (j = 0; j < crlist.length; j++) {
 	if (crlist[j] == "openssl") {
 		curcrypto="openssl";
 		withOpenSSL = 1;
-		withOpenSSLVersion = "098"; /* default */
-	} else if (crlist[j] == "openssl=096") {
+		withOpenSSLVersion = "100"; /* default */
+	} else if (crlist[j] == "openssl=098") {
 		curcrypto="openssl";
 		withOpenSSL = 1;
-		withOpenSSLVersion = "096";
-	} else if (crlist[j] == "openssl=097") {
+		withOpenSSLVersion = "098";
+	} else if (crlist[j] == "openssl=100") {
 		curcrypto="openssl";
 		withOpenSSL = 1;
-		withOpenSSLVersion = "097";
-	} else if (crlist[j] == "openssl=098") {
+		withOpenSSLVersion = "100";
+	} else if (crlist[j] == "openssl=110") {
 		curcrypto="openssl";
 		withOpenSSL = 1;
-		withOpenSSLVersion = "098";
+		withOpenSSLVersion = "110";
 	} else if (crlist[j] == "nss") {
 		curcrypto="nss";
 		withNss = 1;
diff --git a/win32/mycfg.bat b/win32/mycfg.bat
index 9af468e3..17617b0c 100644
--- a/win32/mycfg.bat
+++ b/win32/mycfg.bat
@@ -3,7 +3,7 @@ REM
 REM This is my personal configuration file. 
 REM I am lazy to type all this crap again and again
 REM You are welcome to customize this file for your
-REM needs but do not check it into the CVS, please.
+REM needs but do not check it into the GitHub, please.
 REM
 REM Aleksey Sanin <aleksey@aleksey.com>
 REM