From c65e3b0bebb7b2362ad05f17ae98ce4320bda6ea Mon Sep 17 00:00:00 2001 From: Jim Norman Date: Mon, 24 Apr 2006 15:39:58 +0000 Subject: [PATCH] change lookup name from kwallet_rw to casakwallet --- CASA.changes | 4 + c_adlib/ad_kw/KWalletNative.cs | 220 ++++++++++++++++----------------- 2 files changed, 114 insertions(+), 110 deletions(-) diff --git a/CASA.changes b/CASA.changes index bef28505..b856924a 100644 --- a/CASA.changes +++ b/CASA.changes @@ -1,3 +1,7 @@ +------------------------------------------------------------------- +Mon Apr 24 04:40:20 MST 2006 - jnorman@novell.com +- change lookup name from kwallet_rw to casakwallet + ------------------------------------------------------------------- Sat Apr 22 18:52:20 MST 2006 - cmashayekhi@novell.com - installcasa and uninstallcasa scripts were added to diff --git a/c_adlib/ad_kw/KWalletNative.cs b/c_adlib/ad_kw/KWalletNative.cs index 971f75ef..ab95d2f7 100644 --- a/c_adlib/ad_kw/KWalletNative.cs +++ b/c_adlib/ad_kw/KWalletNative.cs @@ -28,87 +28,87 @@ using System.Runtime.InteropServices; namespace Novell.CASA.DataEngines.KWallet { -public class kwallet -{ + public class kwallet + { - //private static int MAX_NAME_LENGTH = 512; - private const string CPP_LIB = "kwallets_rw"; + //private static int MAX_NAME_LENGTH = 512; + private const string CPP_LIB = "casakwallet"; -/* + /* - [DllImport(CPP_LIB)] - public static extern void MyTest( - EnumSecretList enumSecretList - ); + [DllImport(CPP_LIB)] + public static extern void MyTest( + EnumSecretList enumSecretList + ); -*/ - [DllImport(CPP_LIB)] - public static extern void Aggregate( - EnumSecretList enumSecretList - ); + */ + [DllImport(CPP_LIB)] + public static extern void Aggregate( + EnumSecretList enumSecretList + ); - [DllImport(CPP_LIB)] - public static extern void FreeList(); + [DllImport(CPP_LIB)] + public static extern void FreeList(); - [DllImport(CPP_LIB)] - public static extern int SetEntry(string walletName, string folderName, int entryType, string keyName, string value, int valueLen); + [DllImport(CPP_LIB)] + public static extern int SetEntry(string walletName, string folderName, int entryType, string keyName, string value, int valueLen); - [DllImport(CPP_LIB)] - public static extern int SetMapEntry(string walletName, string folderName, string keyName, String[,] value, int eleCount); - [DllImport(CPP_LIB)] - public static extern int RemoveEntry(string walletName, string folderName, string keyName); + [DllImport(CPP_LIB)] + public static extern int SetMapEntry(string walletName, string folderName, string keyName, String[,] value, int eleCount); + [DllImport(CPP_LIB)] + public static extern int RemoveEntry(string walletName, string folderName, string keyName); -/* - public static int Try(EnumSecretList enumSecretList) - { - MyTest(enumSecretList); - return 0; - } + /* + public static int Try(EnumSecretList enumSecretList) + { + MyTest(enumSecretList); + return 0; + } -*/ - public static int AggregateKW(EnumSecretList enumSecretList) - { - Aggregate(enumSecretList); - return 0; - } - - - - public static int FreeResources() - { - FreeList(); - return 0; - } - - - public static int SetSecret(string walletName, string folderName, int entryType, string keyName, string value, int valueLen ) - { - return(SetEntry(walletName, folderName, entryType, keyName, value, valueLen )); - } - - - public static int SetSecret(string walletName, string folderName, string keyName, NameValueCollection nvc) - { - - String[,] mapele = new String[nvc.Count,2 ]; - - for (int i=0; i< nvc.Count; i++) + */ + public static int AggregateKW(EnumSecretList enumSecretList) { - mapele[i,0] = nvc.GetKey(i); - mapele[i,1] = nvc.Get(nvc.GetKey(i)); + Aggregate(enumSecretList); + return 0; + } + + + + public static int FreeResources() + { + FreeList(); + return 0; + } + + + public static int SetSecret(string walletName, string folderName, int entryType, string keyName, string value, int valueLen ) + { + return(SetEntry(walletName, folderName, entryType, keyName, value, valueLen )); + } + + + public static int SetSecret(string walletName, string folderName, string keyName, NameValueCollection nvc) + { + + String[,] mapele = new String[nvc.Count,2 ]; + + for (int i=0; i< nvc.Count; i++) + { + mapele[i,0] = nvc.GetKey(i); + mapele[i,1] = nvc.Get(nvc.GetKey(i)); - } + } - return(SetMapEntry(walletName, folderName, keyName, mapele, nvc.Count)); - } + return(SetMapEntry(walletName, folderName, keyName, mapele, nvc.Count)); + } - public static int DeleteSecret(string walletName, string folderName, string keyName) - { - return(RemoveEntry(walletName, folderName, keyName)); - } + public static int DeleteSecret(string walletName, string folderName, string keyName) + { + return(RemoveEntry(walletName, folderName, keyName)); + } @@ -120,40 +120,40 @@ public class kwallet -//TBD: All this for future. -/* - [DllImport(CPP_LIB)] - public static extern int ReadSecret - ( - [MarshalAs(UnmanagedType.LPStr)] - String walletName, - [MarshalAs(UnmanagedType.LPStr)] - String folderName, - [MarshalAs(UnmanagedType.LPStr)] - String key, - [MarshalAs(UnmanagedType.LPStr)] - Byte[] secretVal - ); + //TBD: All this for future. + /* + [DllImport(CPP_LIB)] + public static extern int ReadSecret + ( + [MarshalAs(UnmanagedType.LPStr)] + String walletName, + [MarshalAs(UnmanagedType.LPStr)] + String folderName, + [MarshalAs(UnmanagedType.LPStr)] + String key, + [MarshalAs(UnmanagedType.LPStr)] + Byte[] secretVal + ); - [DllImport(CPP_LIB)] - public static extern int WriteSecret - ( - [MarshalAs(UnmanagedType.LPStr)] - String walletName, - [MarshalAs(UnmanagedType.LPStr)] - String folderName, - int entryType, - [MarshalAs(UnmanagedType.LPStr)] - String key, - [MarshalAs(UnmanagedType.LPStr)] - Byte[] secret - ); + [DllImport(CPP_LIB)] + public static extern int WriteSecret + ( + [MarshalAs(UnmanagedType.LPStr)] + String walletName, + [MarshalAs(UnmanagedType.LPStr)] + String folderName, + int entryType, + [MarshalAs(UnmanagedType.LPStr)] + String key, + [MarshalAs(UnmanagedType.LPStr)] + Byte[] secret + ); - [DllImport(CPP_LIB)] - public static extern void CloseAllWallets(); + [DllImport(CPP_LIB)] + public static extern void CloseAllWallets(); @@ -161,33 +161,33 @@ public class kwallet - public static int ReadWallet(String walletName, String folderName, String key, Byte[] secretVal) - { + public static int ReadWallet(String walletName, String folderName, String key, Byte[] secretVal) + { - // Read a secret from wallet - return (ReadSecret(walletName, folderName, key, secretVal)); - } + // Read a secret from wallet + return (ReadSecret(walletName, folderName, key, secretVal)); + } - public static int WriteWallet(String walletName, String folderName,int entryType, String key, Byte[] secretVal) - { + public static int WriteWallet(String walletName, String folderName,int entryType, String key, Byte[] secretVal) + { - // Write secret to wallet - return (WriteSecret( walletName, folderName, entryType, key, secretVal)); + // Write secret to wallet + return (WriteSecret( walletName, folderName, entryType, key, secretVal)); - } + } - public static void DisconnectApplication() - { + public static void DisconnectApplication() + { - CloseAllWallets(); + CloseAllWallets(); - } -*/ + } + */ -} + } }