diff options
| author | Claudio Jeker <claudio@cvs.openbsd.org> | 2023-06-06 13:27:50 +0000 |
|---|---|---|
| committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2023-06-06 13:27:50 +0000 |
| commit | b0e9d7b34199b90d78a7937b97165befc59177b0 (patch) | |
| tree | ee73e565b2919fe831c8295f8b7102aa0ac8d3be /sbin | |
| parent | bf8a23be44098e4e39faedb17b7818ce2e27ff6c (diff) | |
Use ibuf_seek() instead of ibuf_data() + offset constructs. Effect is
the same in these cases.
OK tb@
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/iked/crypto.c | 6 | ||||
| -rw-r--r-- | sbin/iked/ikev2_msg.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sbin/iked/crypto.c b/sbin/iked/crypto.c index a6d9b54b011..99d32823f6e 100644 --- a/sbin/iked/crypto.c +++ b/sbin/iked/crypto.c @@ -1,4 +1,4 @@ -/* $OpenBSD: crypto.c,v 1.43 2023/05/23 13:12:19 claudio Exp $ */ +/* $OpenBSD: crypto.c,v 1.44 2023/06/06 13:27:49 claudio Exp $ */ /* * Copyright (c) 2010-2013 Reyk Floeter <reyk@openbsd.org> @@ -567,9 +567,9 @@ cipher_init(struct iked_cipher *encr, int enc) return (-1); if (encr->encr_saltlength > 0) { /* For AEADs the nonce is salt + IV (see RFC5282) */ - nonce = ibuf_new(ibuf_data(encr->encr_key) + + nonce = ibuf_new(ibuf_seek(encr->encr_key, ibuf_size(encr->encr_key) - encr->encr_saltlength, - encr->encr_saltlength); + encr->encr_saltlength), encr->encr_saltlength); if (nonce == NULL) return (-1); if (ibuf_add(nonce, ibuf_data(encr->encr_iv) , ibuf_size(encr->encr_iv)) != 0) diff --git a/sbin/iked/ikev2_msg.c b/sbin/iked/ikev2_msg.c index 77a9a166c14..47803e966c0 100644 --- a/sbin/iked/ikev2_msg.c +++ b/sbin/iked/ikev2_msg.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ikev2_msg.c,v 1.93 2023/05/30 08:41:15 claudio Exp $ */ +/* $OpenBSD: ikev2_msg.c,v 1.94 2023/06/06 13:27:49 claudio Exp $ */ /* * Copyright (c) 2019 Tobias Heider <tobias.heider@stusta.de> @@ -644,7 +644,7 @@ ikev2_msg_decrypt(struct iked *env, struct iked_sa *sa, } cipher_setkey(sa->sa_encr, encr->buf, ibuf_length(encr)); - cipher_setiv(sa->sa_encr, ibuf_data(src) + ivoff, ivlen); + cipher_setiv(sa->sa_encr, ibuf_seek(src, ivoff, ivlen), ivlen); if (cipher_init_decrypt(sa->sa_encr) == -1) { log_info("%s: error initiating cipher.", __func__); goto done; @@ -676,7 +676,7 @@ ikev2_msg_decrypt(struct iked *env, struct iked_sa *sa, } if ((outlen = ibuf_length(out)) != 0) { - if (cipher_update(sa->sa_encr, ibuf_data(src) + encroff, + if (cipher_update(sa->sa_encr, ibuf_seek(src, encroff, encrlen), encrlen, ibuf_data(out), &outlen) == -1) { log_info("%s: error updating cipher.", __func__); goto done; |