From d9b4d8329526cef653e6028a343b285a14ab8170 Mon Sep 17 00:00:00 2001
From: Jos Groot Lipman <jos.grootlipman@aareon.nl>
Date: Tue, 20 Mar 2012 12:15:00 +0000
Subject: [PATCH] Versie 2.83, crypto HMAC

svn path=/Slnkdwf/trunk/; revision=12538
---
 SlnkDWFCom/SLNKDWF.idl      | 20 ++++++++++++++++++++
 SlnkDWFCom/SLNKDWF.vcproj   | 20 ++++++++++++++++++++
 SlnkDWFCom/SLNKDWFVersion.h |  2 +-
 SlnkDWFCom/SLNKdwf.rc       |  1 +
 SlnkDWFCom/resource.h       |  3 ++-
 5 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/SlnkDWFCom/SLNKDWF.idl b/SlnkDWFCom/SLNKDWF.idl
index 7764e5d..7e7213c 100644
--- a/SlnkDWFCom/SLNKDWF.idl
+++ b/SlnkDWFCom/SLNKDWF.idl
@@ -370,6 +370,18 @@ interface IQRCode : IDispatch{
 	[propget, id(8), helpstring("property Color")] HRESULT Color([out, retval] LONG* pVal);
 	[propput, id(8), helpstring("property Color")] HRESULT Color([in] LONG newVal);
 };
+[
+	object,
+	uuid(ACB63821-BCE2-4905-ADF5-FFC044D0595D),
+	dual,
+	nonextensible,
+	helpstring("ICrypto Interface"),
+	pointer_default(unique)
+]
+interface ICrypto : IDispatch{
+	[id(1), helpstring("method b64_hmac_sha1")] HRESULT b64_hmac_sha1([in] BSTR key, [in] BSTR data, [out,retval] BSTR* pVal);
+	[id(2), helpstring("method hex_hmac_sha1")] HRESULT hex_hmac_sha1([in] BSTR key, [in] BSTR data, [out,retval] BSTR* pVal);
+};
 [
 	uuid(B6FCDE6E-141C-4601-B3AC-4DF4D5F25DF8),
 	version(1.0),
@@ -521,4 +533,12 @@ library SLNKDWFLib
 	{
 		[default] interface IQRCode;
 	};
+	[
+		uuid(0D6DF1E6-A665-4655-9674-062E9DF60F24),
+		helpstring("Crypto Class")
+	]
+	coclass Crypto
+	{
+		[default] interface ICrypto;
+	};
 };
diff --git a/SlnkDWFCom/SLNKDWF.vcproj b/SlnkDWFCom/SLNKDWF.vcproj
index 3dac7d6..9ba234f 100644
--- a/SlnkDWFCom/SLNKDWF.vcproj
+++ b/SlnkDWFCom/SLNKDWF.vcproj
@@ -363,6 +363,10 @@
 				RelativePath="BoundingBox.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\Crypto.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\dlldatax.c"
 				>
@@ -405,6 +409,10 @@
 				RelativePath="EPlotSections.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\hmac_sha1.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\ImageConvert.cpp"
 				>
@@ -425,6 +433,10 @@
 				RelativePath=".\QRCode.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\sha1.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\SLNKContour.cpp"
 				>
@@ -534,6 +546,10 @@
 				RelativePath="BoundingBox.rgs"
 				>
 			</File>
+			<File
+				RelativePath=".\Crypto.h"
+				>
+			</File>
 			<File
 				RelativePath=".\CSLNKBarcode.h"
 				>
@@ -654,6 +670,10 @@
 					RelativePath=".\Barcode.rgs"
 					>
 				</File>
+				<File
+					RelativePath=".\Crypto.rgs"
+					>
+				</File>
 				<File
 					RelativePath=".\CSLNKBarcode.rgs"
 					>
diff --git a/SlnkDWFCom/SLNKDWFVersion.h b/SlnkDWFCom/SLNKDWFVersion.h
index a9035bb..2d53d53 100644
--- a/SlnkDWFCom/SLNKDWFVersion.h
+++ b/SlnkDWFCom/SLNKDWFVersion.h
@@ -1,6 +1,6 @@
 // Zorg dat versies alfabetisch altijd op elkaar volgen!
 #define SLNK_MAJOR_VERSION 2
-#define SLNK_MINOR_VERSION 82
+#define SLNK_MINOR_VERSION 83
 #define SLNK_BUILD_VERSION 0
 
 // Define resource strings
diff --git a/SlnkDWFCom/SLNKdwf.rc b/SlnkDWFCom/SLNKdwf.rc
index 31d79dd..cf96944 100644
--- a/SlnkDWFCom/SLNKdwf.rc
+++ b/SlnkDWFCom/SLNKdwf.rc
@@ -140,6 +140,7 @@ IDR_WHIPCLEANER         REGISTRY                "WhipCleaner.rgs"
 IDR_IMAGECONVERT        REGISTRY                "ImageConvert.rgs"
 IDR_BARCODE             REGISTRY                "Barcode.rgs"
 IDR_QRCODE              REGISTRY                "QRCode.rgs"
+IDR_CRYPTO              REGISTRY                "Crypto.rgs"
 #endif    // Dutch (Netherlands) resources
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/SlnkDWFCom/resource.h b/SlnkDWFCom/resource.h
index aebbdc5..d1958a5 100644
--- a/SlnkDWFCom/resource.h
+++ b/SlnkDWFCom/resource.h
@@ -30,6 +30,7 @@
 #define IDR_IMAGECONVERT                130
 #define IDR_BARCODE                     131
 #define IDR_QRCODE                      132
+#define IDR_CRYPTO                      133
 
 // Next default values for new objects
 // 
@@ -38,6 +39,6 @@
 #define _APS_NEXT_RESOURCE_VALUE        201
 #define _APS_NEXT_COMMAND_VALUE         32768
 #define _APS_NEXT_CONTROL_VALUE         201
-#define _APS_NEXT_SYMED_VALUE           133
+#define _APS_NEXT_SYMED_VALUE           134
 #endif
 #endif