Changeset 1912

Timestamp:

06/05/00 03:25:03 (8 years ago)

Author:

graham

Message:

Compile fixes.

Location:

trunk/licq/src/daemon

Files:

• licq_openssl.cpp (modified) (9 diffs)
• licq_openssl.h (modified) (1 diff)

trunk/licq/src/daemon/licq_openssl.cpp

@@ -3 +3 @@
 #endif
 
+#include "licq_openssl.h"
 
 #ifdef USE_OPENSSL
@@ -12 +13 @@
 #include <string.h>
 
-#include "licq_openssl.h"
+#include "licq_buffer.h"
+//#include "licq_log.h"
+
 
 CDHKey::CDHKey()
@@ -26 +29 @@
 CBuffer *CDHKey::DesXEncrypt(CBuffer *inbuf)
 {
-  unsigned char *data_in = inbuf->getDataStart();
+  unsigned char *data_in = (unsigned char *)inbuf->getDataStart();
 
   if (data_in == NULL) return (NULL);
@@ -32 +35 @@
   int data_size = inbuf->getDataSize();
   CBuffer *outbuf = new CBuffer(data_size);
-  unsigned char *data_out = outbuf->getDataStart();
-  memset(data_out, 0, data_size);
-
-  des_cblock iv;
-  des_m_gab_schedule ks;
+  unsigned char *data_out = (unsigned char *)outbuf->getDataStart();
+  memset(data_out, 0, data_size);
+
+  des_cblock iv;
+  des_key_schedule ks;
   unsigned char wholebinkey[DES_KEY_SZ * 3];
   des_cblock binkey;
@@ -61 +64 @@
 
   printf("------------\nDoing desx.cbc\n");
-  if ((int j = des_set_key_checked(binkey, ks)) != 0)
+  int j;
+  if ((j = des_set_key_checked(&binkey, ks)) != 0)
   {
       printf("ERR: %d\n", j);
@@ -67 +71 @@
   }
 
-  int r = des_xcbc_encrypt(data_in, data_out, data_size, ks, &iv, &xin,
+  des_xcbc_encrypt(data_in, data_out, data_size, ks, &iv, &xin,
      &xout, DES_ENCRYPT);
 
-  printf("en (%d)\n", r);
-
   return outbuf;
 }
@@ -78 +80 @@
 CBuffer *CDHKey::DesXDecrypt(CBuffer *inbuf)
 {
-  unsigned char *data_in = inbuf->getDataStart();
-
-  if (data_in == NULL) return;
+  unsigned char *data_in = (unsigned char *)inbuf->getDataStart();
+
+  if (data_in == NULL) return NULL;
 
   int data_size = inbuf->getDataSize();
   CBuffer *outbuf = new CBuffer(data_size);
-  unsigned char *data_out = outbuf->getDataStart();
+  unsigned char *data_out = (unsigned char *)outbuf->getDataStart();
   memset(data_out, 0, data_size);
 
@@ -113 +115 @@
 
   printf("------------\nDoing desx.cbc\n");
-  if ((int j = des_set_key_checked(&binkey, ks)) != 0)
+  int j;
+  if ((j = des_set_key_checked(&binkey, ks)) != 0)
   {
       printf("ERR: %d\n",j);
@@ -119 +122 @@
   }
 
-  int r = des_xcbc_encrypt(data_in, data_out, data_size, ks, &iv, &xin,
-     &xout, DES_DECRYPT);
-
-  printf("de (%d):\n[%s]\n--\n", r, data_out);
+  des_xcbc_encrypt(data_in, data_out, data_size, ks, &iv, &xin,
+   &xout, DES_DECRYPT);
+
+  printf("de:\n[%s]\n--\n", data_out);
 
   return outbuf;

trunk/licq/src/daemon/licq_openssl.h

@@ -11 +11 @@
 
 #include <openssl/bn.h>
+
+class CBuffer;
 
 // Cypto Status