diff options
| author | Niels Provos <provos@cvs.openbsd.org> | 1998-04-04 22:48:31 +0000 |
|---|---|---|
| committer | Niels Provos <provos@cvs.openbsd.org> | 1998-04-04 22:48:31 +0000 |
| commit | adf25bd83f3ba8df80f56a0d31bdf858a5a13787 (patch) | |
| tree | 26971a02d96dbf835ec1694287551ecf536e17dc | |
| parent | 82ba32f268c5a2a11b9c78dc28df9e7e59091797 (diff) | |
use the right key material for authentication, bug report by
Richard Guy Briggs <rgb@conscoop.ottawa.on.ca>
| -rw-r--r-- | sbin/ipsec/ipsecadm/ipsecadm.c | 4 | ||||
| -rw-r--r-- | sbin/ipsec/ipsecadm/xf_esp_new.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sbin/ipsec/ipsecadm/ipsecadm.c b/sbin/ipsec/ipsecadm/ipsecadm.c index fa3017bd202..603024d7255 100644 --- a/sbin/ipsec/ipsecadm/ipsecadm.c +++ b/sbin/ipsec/ipsecadm/ipsecadm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ipsecadm.c,v 1.13 1997/11/24 19:15:58 provos Exp $ */ +/* $OpenBSD: ipsecadm.c,v 1.14 1998/04/04 22:48:28 provos Exp $ */ /* * The author of this code is John Ioannidis, ji@tla.org, * (except when noted otherwise). @@ -228,7 +228,7 @@ main(argc, argv) exit(1); } authp = argv[++i]; - alen = strlen(keyp); + alen = strlen(authp); } else if (!strcmp(argv[i]+1, "iv") && ivp == NULL && i+1 < argc) { if (mode & (AH_OLD|AH_NEW)) { fprintf(stderr, "%s: Invalid option %s with auth\n", diff --git a/sbin/ipsec/ipsecadm/xf_esp_new.c b/sbin/ipsec/ipsecadm/xf_esp_new.c index b5661a5925e..7df6976433e 100644 --- a/sbin/ipsec/ipsecadm/xf_esp_new.c +++ b/sbin/ipsec/ipsecadm/xf_esp_new.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xf_esp_new.c,v 1.5 1997/11/18 00:13:44 provos Exp $ */ +/* $OpenBSD: xf_esp_new.c,v 1.6 1998/04/04 22:48:30 provos Exp $ */ /* * The author of this code is John Ioannidis, ji@tla.org, * (except when noted otherwise). @@ -111,7 +111,7 @@ int newpadding; xd->edx_data[i+ivlen] = x2i(keyp+2*i); for (i = 0; i < alen; i++) - xd->edx_data[i+ivlen+klen] = x2i(keyp+2*i); + xd->edx_data[i+ivlen+klen] = x2i(authp+2*i); return xf_set(em); } |