nss: block ciphers

5 files changed, 58 insertions, 65 deletions

diff --git a/Makefile.am b/Makefile.am
index 5a4ce482..1de2cfff 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 NULL =
 
 SUBDIRS = include src apps tests man
-
+TEST_APP = apps/xmlsec
 bin_SCRIPTS = xmlsec-config
 
 EXTRA_DIST = \
@@ -28,17 +28,17 @@ api-doc:
 api-doc-clean:
 	@cd docs/api;make clean
 
-check-km:
+check-km: $(TEST_APP)
 	@cd tests;make check-km
 
-check-dsig:
+check-dsig: $(TEST_APP)
 	@cd tests;make check-dsig
 
-check-enc:
+check-enc: $(TEST_APP)
 	@cd tests;make check-enc
 
-memcheck:
+memcheck: $(TEST_APP)
 	@export DEBUG_MEMORY=1;make check
 
-perfcheck:
+perfcheck: $(TEST_APP)
 	@export PERF_TEST=10;make check
diff --git a/include/xmlsec/nss/crypto.h b/include/xmlsec/nss/crypto.h
index f090d4d9..ea20a196 100644
--- a/include/xmlsec/nss/crypto.h
+++ b/include/xmlsec/nss/crypto.h
@@ -42,6 +42,32 @@ XMLSEC_EXPORT xmlSecKeyDataId 	xmlSecNssKeyDataAesGetKlass		(void);
 XMLSEC_EXPORT int		xmlSecNssKeyDataAesSet			(xmlSecKeyDataPtr data,
 									 const unsigned char* buf,
 									 size_t bufSize);
+/**
+ * xmlSecNssTransformAes128CbcId:
+ * 
+ * The AES128 CBC cipher transform id.
+ */
+#define xmlSecNssTransformAes128CbcId \
+	xmlSecNssTransformAes128CbcGetKlass()
+XMLSEC_EXPORT xmlSecTransformId	xmlSecNssTransformAes128CbcGetKlass	(void);
+
+/**
+ * xmlSecNssTransformAes192CbcId:
+ * 
+ * The AES192 CBC cipher transform id.
+ */
+#define xmlSecNssTransformAes192CbcId \
+	xmlSecNssTransformAes192CbcGetKlass()
+XMLSEC_EXPORT xmlSecTransformId	xmlSecNssTransformAes192CbcGetKlass	(void);
+
+/**
+ * xmlSecNssTransformAes256CbcId:
+ * 
+ * The AES256 CBC cipher transform id.
+ */
+#define xmlSecNssTransformAes256CbcId \
+	xmlSecNssTransformAes256CbcGetKlass()
+XMLSEC_EXPORT xmlSecTransformId	xmlSecNssTransformAes256CbcGetKlass	(void);
 
 #endif /* XMLSEC_NO_AES */
 
@@ -63,6 +89,15 @@ XMLSEC_EXPORT int		xmlSecNssKeyDataDesSet			(xmlSecKeyDataPtr data,
 									 const unsigned char* buf,
 									 size_t bufSize);
 
+/**
+ * xmlSecNssTransformDes3CbcId:
+ * 
+ * The DES3 CBC cipher transform id.
+ */
+#define xmlSecNssTransformDes3CbcId \
+	xmlSecNssTransformDes3CbcGetKlass()
+XMLSEC_EXPORT xmlSecTransformId xmlSecNssTransformDes3CbcGetKlass	(void);
+
 #endif /* XMLSEC_NO_DES */
 
 
diff --git a/include/xmlsec/nss/todo.h b/include/xmlsec/nss/todo.h
index 31f3d239..6de2d50f 100644
--- a/include/xmlsec/nss/todo.h
+++ b/include/xmlsec/nss/todo.h
@@ -16,33 +16,6 @@ XMLSEC_EXPORT int		xmlSecNssKeyDataAesSet		(xmlSecKeyDataPtr data,
 									 const unsigned char* buf,
 									 size_t bufSize);
 /**
- * xmlSecNssTransformAes128CbcId:
- * 
- * The AES128 CBC cipher transform id.
- */
-#define xmlSecNssTransformAes128CbcId \
-	xmlSecNssTransformAes128CbcGetKlass()
-XMLSEC_EXPORT xmlSecTransformId	xmlSecNssTransformAes128CbcGetKlass	(void);
-
-/**
- * xmlSecNssTransformAes192CbcId:
- * 
- * The AES192 CBC cipher transform id.
- */
-#define xmlSecNssTransformAes192CbcId \
-	xmlSecNssTransformAes192CbcGetKlass()
-XMLSEC_EXPORT xmlSecTransformId	xmlSecNssTransformAes192CbcGetKlass	(void);
-
-/**
- * xmlSecNssTransformAes256CbcId:
- * 
- * The AES256 CBC cipher transform id.
- */
-#define xmlSecNssTransformAes256CbcId \
-	xmlSecNssTransformAes256CbcGetKlass()
-XMLSEC_EXPORT xmlSecTransformId	xmlSecNssTransformAes256CbcGetKlass	(void);
-
-/**
  * xmlSecNssTransformKWAes128Id:
  * 
  * The AES 128 key wrap transform id.
@@ -78,26 +51,6 @@ XMLSEC_EXPORT xmlSecTransformId	xmlSecNssTransformKWAes256GetKlass	(void);
  *******************************************************************/
 #ifndef XMLSEC_NO_DES
 /**
- * xmlSecDesKey:
- * 
- * The DES key id.
- */
-#define xmlSecNssKeyDataDesId \
-	xmlSecNssKeyDataDesGetKlass()
-XMLSEC_EXPORT xmlSecKeyDataId	xmlSecNssKeyDataDesGetKlass		(void);
-XMLSEC_EXPORT int		xmlSecNssKeyDataDesSet		(xmlSecKeyDataPtr data,
-									 const unsigned char* buf,
-									 size_t bufSize);
-/**
- * xmlSecNssTransformDes3CbcId:
- * 
- * The DES3 CBC cipher transform id.
- */
-#define xmlSecNssTransformDes3CbcId \
-	xmlSecNssTransformDes3CbcGetKlass()
-XMLSEC_EXPORT xmlSecTransformId xmlSecNssTransformDes3CbcGetKlass	(void);
-
-/**
  * xmlSecNssTransformKWDes3Id:
  * 
  * The DES3 CBC cipher transform id.
diff --git a/src/keysmngr.c b/src/keysmngr.c
index f9d796b4..ebd1368f 100644
--- a/src/keysmngr.c
+++ b/src/keysmngr.c
@@ -378,16 +378,21 @@ xmlSecSimpleKeysStoreLoad(xmlSecKeyDataStorePtr store, const char *uri) {
 	    return(-1);
 	}
 	
-	ret = xmlSecSimpleKeysStoreAdoptKey(store, key);
-	if(ret < 0) {
-	    xmlSecError(XMLSEC_ERRORS_HERE,
-			xmlSecErrorsSafeString(xmlSecKeyDataStoreGetName(store)),
-			"xmlSecSimpleKeysStoreAdoptKey",
-			XMLSEC_ERRORS_R_XMLSEC_FAILED,
-			XMLSEC_ERRORS_NO_MESSAGE);
+	if(xmlSecKeyIsValid(key)) {
+    	    ret = xmlSecSimpleKeysStoreAdoptKey(store, key);
+	    if(ret < 0) {
+		xmlSecError(XMLSEC_ERRORS_HERE,
+			    xmlSecErrorsSafeString(xmlSecKeyDataStoreGetName(store)),
+			    "xmlSecSimpleKeysStoreAdoptKey",
+			    XMLSEC_ERRORS_R_XMLSEC_FAILED,
+			    XMLSEC_ERRORS_NO_MESSAGE);
+		xmlSecKeyDestroy(key);
+		xmlFreeDoc(doc);
+		return(-1);
+	    }
+	} else {
+	    /* we have an unknown key in our file, just ignore it */
 	    xmlSecKeyDestroy(key);
-	    xmlFreeDoc(doc);
-	    return(-1);
 	}
         cur = xmlSecGetNextElementNode(cur->next);
     }
diff --git a/xmlsec.pc b/xmlsec.pc
index 532fff38..7136c14d 100644
--- a/xmlsec.pc
+++ b/xmlsec.pc
@@ -4,8 +4,8 @@ libdir=${exec_prefix}/lib
 includedir=${prefix}/include
 
 Name: xmlsec
-Version: 0.1.0-openssl
+Version: 0.1.0-nss
 Description: XML Security Library implements XML Signature and XML Encryption standards
 Requires: libxml-2.0 >= 2.4.24 libxslt >= 1.0.20 
-Libs: -lxmlsec-openssl -lxmlsec -L/home/aleksey/lib -lxml2 -lz -lm -L/home/aleksey/lib -lxslt -lxml2 -lz -lm -L/home/aleksey/lib -lcrypto 
-Cflags: -I${includedir}/xmlsec @XMLSEC_CFLAGS@ -DXMLSEC_CRYPTO=\"openssl\"
+Libs: -lxmlsec-nss -lxmlsec -L/home/aleksey/lib -lxml2 -lz -lm -L/home/aleksey/lib -lxslt -lxml2 -lz -lm -L/usr/lib -lnss3 -lnspr4 -lplds4 -lplc4 
+Cflags: -I${includedir}/xmlsec @XMLSEC_CFLAGS@ -DXMLSEC_CRYPTO=\"nss\"