summaryrefslogtreecommitdiff
path: root/sbin/isakmpd
diff options
context:
space:
mode:
Diffstat (limited to 'sbin/isakmpd')
-rw-r--r--sbin/isakmpd/hash.c5
-rw-r--r--sbin/isakmpd/udp.c7
2 files changed, 9 insertions, 3 deletions
diff --git a/sbin/isakmpd/hash.c b/sbin/isakmpd/hash.c
index eca6e409ce3..736ee8c8bc4 100644
--- a/sbin/isakmpd/hash.c
+++ b/sbin/isakmpd/hash.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hash.c,v 1.6 2001/04/15 16:09:16 ho Exp $ */
+/* $OpenBSD: hash.c,v 1.7 2001/06/29 20:38:15 angelos Exp $ */
/* $EOM: hash.c,v 1.10 1999/04/17 23:20:34 niklas Exp $ */
/*
@@ -43,6 +43,7 @@
#include "sysdep.h"
#include "hash.h"
+#include "log.h"
void hmac_init (struct hash *, unsigned char *, int);
void hmac_final (unsigned char *, struct hash *);
@@ -78,6 +79,8 @@ hash_get (enum hashes hashtype)
{
int i;
+ LOG_DBG ((LOG_CRYPTO, 60, "hash_get: requested algorithm %d", hashtype));
+
for (i = 0; i < sizeof hashes / sizeof hashes[0]; i++)
if (hashtype == hashes[i].type)
return &hashes[i];
diff --git a/sbin/isakmpd/udp.c b/sbin/isakmpd/udp.c
index 2eb625c12b0..a253df7c2f2 100644
--- a/sbin/isakmpd/udp.c
+++ b/sbin/isakmpd/udp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: udp.c,v 1.33 2001/06/29 20:22:58 niklas Exp $ */
+/* $OpenBSD: udp.c,v 1.34 2001/06/29 20:38:16 angelos Exp $ */
/* $EOM: udp.c,v 1.57 2001/01/26 10:09:57 niklas Exp $ */
/*
@@ -150,7 +150,10 @@ udp_make (struct sockaddr *laddr)
}
/* Make sure we don't get our traffic encrypted. */
- sysdep_cleartext (s);
+ if (sysdep_cleartext (s) == -1)
+ {
+ goto err;
+ }
/*
* In order to have several bound specific address-port combinations