Imported Upstream version 1.5.7

1 files changed, 12 insertions, 7 deletions

diff --git a/src/modules/common/swcipher.cpp b/src/modules/common/swcipher.cpp
index d221b8b..bd4d551 100644
--- a/src/modules/common/swcipher.cpp
+++ b/src/modules/common/swcipher.cpp
@@ -3,10 +3,11 @@
  *				cipher utilities.
  */
 
-#include <string.h>
 #include <stdlib.h>
+#include <string.h>
 #include <swcipher.h>
 
+SWORD_NAMESPACE_START
 
 /******************************************************************************
  * SWCipher Constructor - Initializes data for instance of SWCipher
@@ -30,7 +31,7 @@ SWCipher::~SWCipher()
 }
 
 
-char *SWCipher::Buf(const char *ibuf, unsigned int ilen)
+char *SWCipher::Buf(const char *ibuf, unsigned long ilen)
 {
 	if (ibuf) {
 	
@@ -54,14 +55,14 @@ char *SWCipher::Buf(const char *ibuf, unsigned int ilen)
 }
 
 
-char *SWCipher::cipherBuf(unsigned int *ilen, const char *ibuf)
+char *SWCipher::cipherBuf(unsigned long *ilen, const char *ibuf)
 {
 	if (ibuf) {
 	
 		if (buf)
 			free(buf);
 			
-		buf = (char *) malloc(*ilen);
+		buf = (char *) malloc(*ilen+1);
 		memcpy(buf, ibuf, *ilen);
 		len = *ilen;
 		cipher = true;
@@ -69,7 +70,7 @@ char *SWCipher::cipherBuf(unsigned int *ilen, const char *ibuf)
 
 	Encode();
 
-	*ilen = (short)len;
+	*ilen = len;
 	return buf;
 }
 
@@ -86,7 +87,7 @@ void SWCipher::Encode(void)
 {
 	if (!cipher) {
 		work = master;
-		for (int i = 0; i < len; i++)
+		for (unsigned long i = 0; i < len; i++)
 			buf[i] = work.encrypt(buf[i]);
 		cipher = true;
 	}
@@ -105,8 +106,10 @@ void SWCipher::Decode(void)
 {
 	if (cipher) {
 		work = master;
-		for (int i = 0; i < len; i++)
+		unsigned long i;
+		for (i = 0; i < len; i++)
 			buf[i] = work.decrypt(buf[i]);
+		buf[i] = 0;
 		cipher = false;
 	}
 }
@@ -121,3 +124,5 @@ void SWCipher::setCipherKey(const char *ikey) {
 	unsigned char *key = (unsigned char *)ikey;
 	master.initialize(key, strlen((char *)key));
 }
+
+SWORD_NAMESPACE_END