along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: encr.c,v 1.12.4.3 2000/08/17 16:51:07 guus Exp $
+ $Id: encr.c,v 1.12.4.5 2000/09/15 12:58:38 zarq Exp $
*/
#include "config.h"
mpz_t my_private_key, my_public_key, generator, shared_prime;
int my_key_expiry = (time_t)(-1);
-static char* mypassphrase;
-static int mypassphraselen;
+char* mypassphrase;
+int mypassphraselen;
int char_hex_to_bin(int c)
{
syslog(LOG_ERR, _("Illegal passphrase in %s; size would be %d"), filename, size);
return -1;
}
- size >>= 2; /* bits->nibbles */
- pp = xmalloc(size+2);
- fgets(pp, size+1, f);
+
+ /* Hmz... hackish... strange +1 and +2 stuff... I really like more comments on those alignment thingies! */
+
+ pp = xmalloc(size/4 + 1); /* Allocate enough for fgets */
+ fgets(pp, size/4 + 1, f); /* Read passhrase and reserve one byte for end-of-string */
fclose(f);
- *out = xmalloc(size);
+ *out = xmalloc(size/8 + 2); /* Allocate enough bytes, +1 for rounding if bits%8 != 0, +1 for 2-byte alignment */
cp
return str_hex_to_bin(*out, pp);
}
/* We haven't received a key from this host (yet). */
continue;
ek = make_shared_key(p->public_key->key);
- free_key(p->key);
- p->key = xmalloc(sizeof(*p->key));
- p->key->length = strlen(ek);
- p->key->expiry = p->public_key->expiry;
- p->key->key = xmalloc(strlen(ek) + 1);
- strcpy(p->key->key, ek);
+ free_key(p->datakey);
+ p->datakey = xmalloc(sizeof(*p->datakey));
+ p->datakey->length = strlen(ek);
+ p->datakey->expiry = p->public_key->expiry;
+ p->datakey->key = xmalloc(strlen(ek) + 1);
+ strcpy(p->datakey->key, ek);
}
cp
}