Changeset d309eb3

Timestamp:

Oct 17, 2002, 3:00:57 PM (22 years ago)

Author:

James M. Kretchmar <kretch@mit.edu>

Branches:

master, barnowl_perlaim, debian, owl, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

e3869df

Parents:

aecf3e6

Message:

Fixed a memory bug in getsubs
Added receive support for zcrypt messages
Added the 'zcrypt' variable which controls whether or not zcrypt
    messages are decrypted
'reply' is disabled for zcrypt until sending zcrypt works
Started implementing zcrypt command

Files:

• ChangeLog (modified) (1 diff)
• Makefile.in (modified) (2 diffs)
• commands.c (modified) (2 diffs)
• functions.c (modified) (3 diffs)
• message.c (modified) (3 diffs)
• variable.c (modified) (1 diff)
• zcrypt.c (added)

ChangeLog

@@ -9 +9 @@
         Added a workaround for a libzephyr bug that caused zwrites to fail
           if zephyrs were sent just before and just after renewing tickets
+        Fixed a memory bug in getsubs
+        Added receive support for zcrypt messages
+        Added the 'zcrypt' variable which controls whether or not zcrypt
+          messages are decrypted
+        'reply' is disabled for zcrypt until sending zcrypt works
+        Started implementing zcrypt command
         
 1.2.6

Makefile.in

@@ -13 +13 @@
      functions.o zwrite.o viewwin.o help.o filter.o regex.o history.o view.o \
      dict.o variable.o varstubs.o filterelement.o \
-     keypress.o keymap.o keybinding.o cmd.o context.o perlglue.o
+     keypress.o keymap.o keybinding.o cmd.o context.o perlglue.o zcrypt.o
 
 AUTOGEN=owl_prototypes.h varstubs.c perlglue.c
@@ -42 +42 @@
 # Only move owl_prototypes.h into place if the new one is different
 owl_prototypes.h: codelist.pl varstubs.c $(OBJS:.o=.c)
-        perl codelist.pl > owl_prototypes.h.new
+        perl codelist.pl | grep -v ZWRITEOPTIONS > owl_prototypes.h.new
         @cmp -s owl_prototypes.h.new owl_prototypes.h || echo 'Interfaces changed!'
         @cmp -s owl_prototypes.h.new owl_prototypes.h || mv -f owl_prototypes.h.new owl_prototypes.h

commands.c

@@ -100 +100 @@
               "-O opcode\n"
               "      Send to the specified opcode\n"),
+
+  /*
+  OWLCMD_ARGS("zcrypt", owl_command_zcrypt, OWL_CTX_INTERACTIVE,
+              "send an encrypted zephyr",
+              "zcrypt [-n] [-C] [-c class] [-i instance] [-r realm] [-O opcde] [-m <message...>]\n",
+              "Behaves like zwrite but uses encryption.  Not for use with\n"
+              "personal messages\n"),
+  */
   
   OWLCMD_ARGS("reply", owl_command_reply,  OWL_CTX_INTERACTIVE,
@@ -1302 +1310 @@
   }
   return NULL;
+}
+
+char *owl_command_zcrypt(int argc, char **argv, char *buff) {
+  char *tmpbuff, *pos, *cmd, *msg;
+  
+  /* check for a zwrite -m */
+  for (pos = buff; *pos; pos = skiptokens(pos, 1)) {
+    if (!strncmp(pos, "-m ", 3)) {
+      cmd = owl_strdup(buff);
+      msg = cmd+(pos-buff);
+      *msg = '\0';
+      msg += 3;
+      owl_zwrite_create_and_send_from_line(cmd, msg);
+      owl_free(cmd);
+      return NULL;
+    }
+  }
+
+  if (argc < 2) {
+    owl_function_makemsg("Not enough arguments to the zcrypt command.");
+  } else {
+    tmpbuff = owl_strdup(buff);
+    owl_function_zwrite_setup(tmpbuff);
+    owl_global_set_buffercommand(&g, tmpbuff);
+    owl_free(tmpbuff);
+  }
+  return(NULL);
 }
 

functions.c

@@ -122 +122 @@
   if (ret) {
     owl_function_makemsg("Error in zwrite arugments");
+    owl_zwrite_free(&z);
+    return;
+  }
+
+  /* send a ping if necessary */
+  if (owl_global_is_txping(&g)) {
+    owl_zwrite_send_ping(&z);
+  }
+  owl_zwrite_free(&z);
+
+  /* create and setup the editwin */
+  e=owl_global_get_typwin(&g);
+  owl_editwin_new_style(e, OWL_EDITWIN_STYLE_MULTILINE, owl_global_get_msg_history(&g));
+
+  if (!owl_global_get_lockout_ctrld(&g)) {
+    owl_function_makemsg("Type your zephyr below.  End with ^D or a dot on a line by itself.  ^C will quit.");
+  } else {
+    owl_function_makemsg("Type your zephyr below.  End with a dot on a line by itself.  ^C will quit.");
+  }
+
+  owl_editwin_clear(e);
+  owl_editwin_set_dotsend(e);
+  strcpy(buff, "----> ");
+  strcat(buff, line);
+  strcat(buff, "\n");
+  owl_editwin_set_locktext(e, buff);
+
+  /* make it active */
+  owl_global_set_typwin_active(&g);
+}
+
+void owl_function_zcrypt_setup(char *line) {
+  owl_editwin *e;
+  char buff[1024];
+  owl_zwrite z;
+  int ret;
+
+  /* check the arguments */
+  ret=owl_zwrite_create_from_line(&z, line);
+  if (ret) {
+    owl_function_makemsg("Error in zwrite arugments");
+    owl_zwrite_free(&z);
+    return;
+  }
+
+  if (owl_zwrite_get_numrecips(&z)>0) {
+    owl_function_makemsg("You may not specifiy a recipient for a zcrypt message");
     owl_zwrite_free(&z);
     return;
@@ -1295 +1342 @@
 
   buff=owl_malloc(num*500);
-  tmpbuff=owl_malloc(2048);
+  tmpbuff=owl_malloc(num*500);
   strcpy(buff, "");
   for (i=0; i<num; i++) {
@@ -1512 +1559 @@
         return;
       }
+    }
+
+    /* for now we disable replies to zcrypt messages, since we can't
+       support an encrypted reply */
+    if (!strcasecmp(owl_message_get_opcode(m), "crypt")) {
+      owl_function_makemsg("Replies to zcrypt messages are not enabled in this release");
+      return;
     }
 

message.c

@@ -401 +401 @@
   m->body[k]='\0';
 
+  /* if zcrypt is enabled try to decrypt the message */
+  if (owl_global_is_zcrypt(&g) && !strcasecmp(n->z_opcode, "crypt")) {
+    char *out;
+
+    out=owl_malloc(strlen(m->body)*16+20);
+    zcrypt_decrypt(out, m->body, m->class, m->inst);
+    owl_free(m->body);
+    m->body=out;
+  }
+
   /* save the hostname */
   owl_function_debugmsg("About to do gethostbyaddr");
@@ -547 +557 @@
   char *body, *indent, *ptr, *zsigbuff, frombuff[LINE];
   ZNotice_t *n;
-  int len;
-
+
+  n=&(m->notice);
+  
   /* get the body */
-  n=&(m->notice);
-  ptr=(owl_zephyr_get_message(n, &len));
-  body=owl_malloc(len+20);
-  strncpy(body, ptr, len);
-  body[len]='\0';
+  body=owl_malloc(strlen(m->body)+30);
+  strcpy(body, m->body);
 
   /* add a newline if we need to */
@@ -650 +658 @@
   char *body, *indent, *ptr, *zsigbuff, frombuff[LINE];
   ZNotice_t *n;
-  int len;
+
+  n=&(m->notice);
 
   /* get the body */
-  n=&(m->notice);
-  ptr=(owl_zephyr_get_message(n, &len));
-  body=owl_malloc(len+20);
-  strncpy(body, ptr, len);
-  body[len]='\0';
+  body=owl_malloc(strlen(m->body)+30);
+  strcpy(body, m->body);
 
   /* add a newline if we need to */

variable.c

@@ -110 +110 @@
                "Note that only messages received after this variable\n"
                "is set will be affected." ),
+
+  OWLVAR_BOOL( "zcrypt" /* %OwlVarStub */, 1,
+               "Do automatic zcrypt processing",
+               "" ),
 
   OWLVAR_ENUM_FULL( "disable-ctrl-d" /* %OwlVarStub:lockout_ctrld */, 1,