[prev in list] [next in list] [prev in thread] [next in thread] 

List:       helix-server-cvs
Subject:    [Server-cvs] protocol/common/pub servchallenge.h,1.2,1.3
From:       dcollins () helixcommunity ! org
Date:       2007-05-25 18:57:53
Message-ID: 200705251858.l4PIwBBJ020042 () mailer ! progressive-comp ! com
[Download RAW message or body]

Update of /cvsroot/server/protocol/common/pub
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv28071/protocol/common/pub

Modified Files:
	servchallenge.h 
Log Message:
Synopsis
========
Helix Server Commercial Source Licensing feature.

Branches: HEAD
Reviewed by: server-dev


Description
===========
Changes to implement the CSL feature.  These are being bubbled
from the SERVER_BORABORA branch to the head.  Additionally, 
recent HEAD changes are also picked up and moved for files
moving within the various code repositories.


Files Affected
==============

Far too many to list.


Testing Performed
=================
Unit Tests:
- none

Integration Tests:
- Server and proxy uptime tests on multiple platforms by dev and QA.
- Server and proxy BVT testing by QA.
- Server and proxy feature testing by dev and QA.

Leak Tests:
- Uptimes showed leaks were similar to the pre-CSL HEAD.

Performance Tests:
- none

Platforms Tested: linux-rhel4-i686, sunos-5.10-sparc-server, win32-i386-vc7
Build verified: linux-rhel4-i686, sunos-5.10-sparc-server, win32-i386-vc7


QA Hints
===============

None at this time.



Index: servchallenge.h
===================================================================
RCS file: /cvsroot/server/protocol/common/pub/servchallenge.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- servchallenge.h	24 Jan 2003 01:00:29 -0000	1.2
+++ servchallenge.h	25 May 2007 18:57:51 -0000	1.3
@@ -34,8 +34,8 @@
  * Contributor(s):  
  *   
  * ***** END LICENSE BLOCK ***** */  
-#ifndef	_CHALLENGE_H_
-#define	_CHALLENGE_H_
+#ifndef	_SERVCHALLENGE_H_
+#define	_SERVCHALLENGE_H_
 
 #define HX_SERV_COMPANY_ID_KEY_SIZE 16
 
@@ -46,37 +46,30 @@
 			  const char* challenge,
 			  UCHAR* outputKey);
 
-struct Challenge {
-			Challenge(Byte* ch, int len);
-			Challenge(long k1, long k2, Byte* k3, Byte* k4);
-
-static	long 		get_time_key(void);
-
-	Byte*		response1(Byte* k1, Byte* k2, long k3, long k4);
-	Byte*		response2(Byte* k1, Byte* k2, long k3, long k4);
-        Byte*           response3(Byte* k1);
-        Byte*           response4(Byte* k1);
-
-	Byte		text[33];
-	Byte		response[33];
-};
-
 struct RealChallenge
 {
     RealChallenge();
 
+    Byte* response1(Byte* k1, Byte* k2, long k3, long k4);
+    Byte* response2(Byte* k1, Byte* k2, long k3, long k4);
+
+#ifdef HELIX_FEATURE_SERVER
     Byte* response1(Byte* k1);
     Byte* response2(Byte* k1);
+#endif
 
-    Byte		challenge[33];
-    Byte		response[41];
-    Byte		trap[9];
+    Byte                challenge[33];
+    Byte                response[41];
+    Byte                trap[9];
 };
 
 struct MidBoxChallenge
 {
     MidBoxChallenge();
 
+    Byte* response1(Byte* k1, Byte* k2, long k3, long k4);
+    Byte* response2(Byte* k1, Byte* k2, long k3, long k4);
+
     Byte* response1(Byte* k1);
     Byte* response2(Byte* k1);
 
@@ -84,4 +77,5 @@
     Byte		response[41];
     Byte		trap[9];
 };
-#endif/*_CHALLENGE_H_*/
+
+#endif/*_SERVCHALLENGE_H_*/


_______________________________________________
Server-cvs mailing list
Server-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/server-cvs
[prev in list] [next in list] [prev in thread] [next in thread]