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 2000/05/31 18:23:06 zarq Exp $
+ $Id: encr.c,v 1.12.4.3 2000/08/17 16:51:07 guus Exp $
*/
#include "config.h"
cp
if((cfg = get_config_val(passphrasesdir)) == NULL)
{
- filename = xmalloc(strlen(confbase)+13+strlen(which));
- sprintf(filename, "%spassphrases/%s", confbase, which);
+ asprintf(&filename, "%spassphrases/%s", confbase, which);
}
else
{
- filename = xmalloc(strlen(cfg->data.ptr)+2+strlen(which));
- sprintf(filename, "%s/%s", (char*)cfg->data.ptr, which);
+ asprintf(&filename, "%s/%s", (char*)cfg->data.ptr, which);
}
if((f = fopen(filename, "rb")) == NULL)
{
- syslog(LOG_ERR, _("Could not open %s: %m"), filename);
+ if(debug_lvl > 1)
+ syslog(LOG_ERR, _("Could not open %s: %m"), filename);
return -1;
}
else
my_key_expiry = (time_t)(time(NULL) + cfg->data.val);
- syslog(LOG_NOTICE, _("Generating %d bits keys."), PRIVATE_KEY_BITS);
+ if(debug_lvl > 1)
+ syslog(LOG_NOTICE, _("Generating %d bits keys"), PRIVATE_KEY_BITS);
if((f = fopen("/dev/urandom", "r")) == NULL)
{
mpz_t pk;
unsigned char *out;
BF_KEY bf_key;
- char which[sizeof("123.123.123.123")+1];
+ char *which;
char *meuk;
cp
mpz_init_set_str(pk, his_pubkey, 36);
if(key_inited)
cipher_set_key(&encryption_key, encryption_keylen, text_key);
- sprintf(which, IP_ADDR_S, IP_ADDR_V(cl->vpn_ip));
+ asprintf(&which, IP_ADDR_S, IP_ADDR_V(cl->vpn_ip));
if((pplen = read_passphrase(which, &meuk)) < 0)
return -1;