geos_one/CASA
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bug 134096

Browse Source
This commit is contained in:
Jim Norman
2005-11-30 17:36:44 +00:00
parent caa494c6b9
commit c32ff61794
4 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CASA.changes
View File

@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Nov 30 10:34:02 MST 2005 - jnorman@novell.com
- Bug 134096, Fixed Wrapper code for proper structure marshaling.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Nov 29 17:01:09 MST 2005 - jnorman@novell.com Tue Nov 29 17:01:09 MST 2005 - jnorman@novell.com

4
c_micasadk/sscs_ndk.c
View File

@@ -765,10 +765,10 @@ miCASAOpenSecretStoreCache
} }
else else
{ {
if((ssid->ssName) && (sscs_Utf8StrSize(ssid->ssName)) == 0) if (sscs_Utf8StrSize(ssid->ssName) == 0)
{ {
// set to default // set to default
// sscs_Utf8Strcpy(ssid->ssName, SSCS_DEFAULT_SECRETSTORE_ID); sscs_Utf8Strcpy(ssid->ssName, SSCS_DEFAULT_SECRETSTORE_ID);
} }
ssid->version = NSSCS_VERSION_NUMBER; ssid->version = NSSCS_VERSION_NUMBER;

6
c_sharp/NSSCSWrapper/NativeCalls.cs
View File

@@ -67,8 +67,8 @@ namespace Novell.CASA
[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)] [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
public class SSCS_SECRET_STORE_ID_T public class SSCS_SECRET_STORE_ID_T
{ {
public int len; // * max id len in bytes public int version; // * max id len in bytes
[MarshalAs(UnmanagedType.LPStr, SizeConst = 512)] [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 512)]
public string id; // * should be passed in # of chars public string id; // * should be passed in # of chars
}; };
@@ -473,7 +473,7 @@ namespace Novell.CASA
SSCS_SECRET_STORE_ID_T SSid = new SSCS_SECRET_STORE_ID_T(); SSCS_SECRET_STORE_ID_T SSid = new SSCS_SECRET_STORE_ID_T();
SSid.id = sSecretStoreName; SSid.id = sSecretStoreName;
SSid.len = sSecretStoreName.Length; SSid.version = 0;
SSCS_EXT_T ext = new SSCS_EXT_T(); SSCS_EXT_T ext = new SSCS_EXT_T();
try try

4
include/micasa.h
View File

@@ -155,8 +155,8 @@ static SS_UTF8_T SSCS_LOCAL_REMOTE_KEY_CHAIN_ID[] = {"SSCS_LOCAL_REMOTE_KEY_CHA
// {'S','S','C','S','_','L','O','C','A','L','_','R','E','M','O','T','E','_','K','E','Y','_','C','H','A','I','N','_','I','D', 0}; // {'S','S','C','S','_','L','O','C','A','L','_','R','E','M','O','T','E','_','K','E','Y','_','C','H','A','I','N','_','I','D', 0};
#define NSSCS_VERSION_NUMBER 0x00040000L // client version Major 04 Minor 00 Revision 01 #define NSSCS_VERSION_NUMBER 0x00010000L // client version Major 04 Minor 00 Revision 01
// the final release will be 4.0.0 // the final release will be 1.0.0
#define NSSCS_MIN_SECRET_BUF_LEN 3968 //* (4K-128)to match server #define NSSCS_MIN_SECRET_BUF_LEN 3968 //* (4K-128)to match server