From 76548e0fd23aa761e0651888019ba8efe4f810d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= Date: Tue, 26 Sep 2006 09:55:55 +0000 Subject: [PATCH] switch from wrap/unwrap to encrypt/decrypt git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@18177 ec53bebd-3082-4978-b11e-865c3cabbd6b --- appl/gssmask/gssmaestro.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/appl/gssmask/gssmaestro.c b/appl/gssmask/gssmaestro.c index bba74f140..6ccdf6055 100644 --- a/appl/gssmask/gssmaestro.c +++ b/appl/gssmask/gssmaestro.c @@ -146,11 +146,11 @@ get_targetname(struct client *client, } static int32_t -wrap_token(struct client *client, int32_t hContext, int32_t flags, +encrypt_token(struct client *client, int32_t hContext, int32_t flags, krb5_data *in, krb5_data *out) { int32_t val; - put32(client, eWrap); + put32(client, eEncrypt); put32(client, hContext); put32(client, flags); put32(client, 0); @@ -161,11 +161,11 @@ wrap_token(struct client *client, int32_t hContext, int32_t flags, } static int32_t -unwrap_token(struct client *client, int32_t hContext, int flags, +decrypt_token(struct client *client, int32_t hContext, int flags, krb5_data *in, krb5_data *out) { int32_t val; - put32(client, eUnwrap); + put32(client, eDecrypt); put32(client, hContext); put32(client, flags); put32(client, 0); @@ -401,23 +401,23 @@ test_wrap(struct client *c1, int32_t hc1, struct client *c2, int32_t hc2, krb5_data_zero(&wrapped); krb5_data_zero(&out); - val = wrap_token(c1, hc1, conf, &msg, &wrapped); + val = encrypt_token(c1, hc1, conf, &msg, &wrapped); if (val) { - warnx("wrap_token failed to host: %s", c1->moniker); + warnx("encrypt_token failed to host: %s", c1->moniker); return val; } - val = unwrap_token(c2, hc2, conf, &wrapped, &out); + val = decrypt_token(c2, hc2, conf, &wrapped, &out); if (val) { krb5_data_free(&wrapped); - warnx("unwrap_token failed to host: %s", c2->moniker); + warnx("decrypt_token failed to host: %s", c2->moniker); return val; } if (msg.length != out.length) { - warnx("unwrap'ed token have wrong length"); + warnx("decrypted'ed token have wrong length"); val = GSMERR_ERROR; } else if (memcmp(msg.data, out.data, msg.length) != 0) { - warnx("unwrap'ed token have wrong data"); + warnx("decryptd'ed token have wrong data"); val = GSMERR_ERROR; }