more build fixes

svn path=/trunk/kdesupport/qca/; revision=648320

crypto.prf.in

@@ -0,0 +1,12 @@
+# prepend this file with a QCA_PREFIX definition
+
+CONFIG *= qt
+INCLUDEPATH += $$QCA_PREFIX/include/QtCrypto
+LIBS += -L$$QCA_PREFIX/lib
+
+CONFIG(debug, debug|release) {
+	unix:LIBS += -lqca_debug
+	else:LIBS += -lqcad
+} else {
+	LIBS += -lqca
+}

crypto_win.prf

@@ -1,9 +0,0 @@
-CONFIG *= qt
-windows:{
-	# change this to the QCA install location
-	QCA_PREFIX = /local
-
-	INCLUDEPATH += $$QCA_PREFIX/include/QtCrypto
-	LIBS += -L$$QCA_PREFIX/lib
-	LIBS += -lqca
-}

examples/aes-cmac/aes-cmac.cpp

@@ -86,7 +86,7 @@ public:
 	// Generate the subkeys
 	QSecureArray const_Zero(16);
 	QSecureArray const_Rb(16);
-	const_Rb[15] = 0x87;
+	const_Rb[15] = (char)0x87;
 
 	m_X = const_Zero;
 	m_residual = QSecureArray();
@@ -110,7 +110,7 @@ public:
 	    m_k2 = xorArray(leftShift(m_k1), const_Rb);
     }
 
-    Context *clone() const
+    QCA::Provider::Context *clone() const
     {
         return new AESCMACContext(*this);
     }
@@ -162,7 +162,7 @@ public:
 	if ( numBytesLeft != 16 ) {
 	    // no full block, so we have to pad.
 	    m_residual.resize(16);
-	    m_residual[numBytesLeft] = 0x80;
+	    m_residual[numBytesLeft] = (char)0x80;
 	    lastBlock = xorArray(m_residual, m_k2);
 	} else {
 	    // this is a full block - no padding

installwin.bat

@@ -1,5 +1,8 @@
-@REM install qmake feature file pointing to the current directory
+@echo off
+REM install qmake feature file pointing to the current directory
 
 echo QCA_PREFIX = %CD% > crypto.prf
 type crypto.prf.in >> crypto.prf
 copy crypto.prf %QTDIR%\mkspecs\features
+
+echo Installed crypto.prf as a qmake feature.