diff options
Diffstat (limited to 'src/lib/gssapi/krb5/k5sealv3.c')
| -rw-r--r-- | src/lib/gssapi/krb5/k5sealv3.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/lib/gssapi/krb5/k5sealv3.c b/src/lib/gssapi/krb5/k5sealv3.c index 26e20d73b4..ad5c03a398 100644 --- a/src/lib/gssapi/krb5/k5sealv3.c +++ b/src/lib/gssapi/krb5/k5sealv3.c @@ -81,7 +81,7 @@ gss_krb5int_make_seal_token_v3 (krb5_context context, size_t ec; unsigned short tok_id; krb5_checksum sum; - krb5_keyblock *key; + krb5_key key; krb5_cksumtype cksumtype; assert(ctx->big_endian == 0); @@ -136,7 +136,7 @@ gss_krb5int_make_seal_token_v3 (krb5_context context, return ENOMEM; /* Get size of ciphertext. */ - bufsize = 16 + krb5_encrypt_size (plain.length, key->enctype); + bufsize = 16 + krb5_encrypt_size (plain.length, key->keyblock.enctype); /* Allocate space for header plus encrypted data. */ outbuf = malloc(bufsize); if (outbuf == NULL) { @@ -164,8 +164,8 @@ gss_krb5int_make_seal_token_v3 (krb5_context context, cipher.ciphertext.data = (char *)outbuf + 16; cipher.ciphertext.length = bufsize - 16; - cipher.enctype = key->enctype; - err = krb5_c_encrypt(context, key, key_usage, 0, &plain, &cipher); + cipher.enctype = key->keyblock.enctype; + err = krb5_k_encrypt(context, key, key_usage, 0, &plain, &cipher); zap(plain.data, plain.length); free(plain.data); plain.data = 0; @@ -245,7 +245,7 @@ gss_krb5int_make_seal_token_v3 (krb5_context context, sum.contents = outbuf + 16 + message2->length; sum.length = cksumsize; - err = krb5_c_make_checksum(context, cksumtype, key, + err = krb5_k_make_checksum(context, cksumtype, key, key_usage, &plain, &sum); zap(plain.data, plain.length); free(plain.data); @@ -317,7 +317,7 @@ gss_krb5int_unseal_token_v3(krb5_context *contextptr, krb5_checksum sum; krb5_error_code err; krb5_boolean valid; - krb5_keyblock *key; + krb5_key key; krb5_cksumtype cksumtype; if (ctx->big_endian != 0) @@ -398,14 +398,14 @@ gss_krb5int_unseal_token_v3(krb5_context *contextptr, For all current cryptosystems, the ciphertext size will be larger than the plaintext size. */ - cipher.enctype = key->enctype; + cipher.enctype = key->keyblock.enctype; cipher.ciphertext.length = bodysize - 16; cipher.ciphertext.data = (char *)ptr + 16; plain.length = bodysize - 16; plain.data = malloc(plain.length); if (plain.data == NULL) goto no_mem; - err = krb5_c_decrypt(context, key, key_usage, 0, + err = krb5_k_decrypt(context, key, key_usage, 0, &cipher, &plain); if (err) { free(plain.data); @@ -459,7 +459,7 @@ gss_krb5int_unseal_token_v3(krb5_context *contextptr, } sum.contents = ptr+bodysize-ec; sum.checksum_type = cksumtype; - err = krb5_c_verify_checksum(context, key, key_usage, + err = krb5_k_verify_checksum(context, key, key_usage, &plain, &sum, &valid); if (err) goto error; @@ -496,7 +496,7 @@ gss_krb5int_unseal_token_v3(krb5_context *contextptr, sum.length = bodysize - 16; sum.contents = ptr + 16; sum.checksum_type = cksumtype; - err = krb5_c_verify_checksum(context, key, key_usage, + err = krb5_k_verify_checksum(context, key, key_usage, &plain, &sum, &valid); free(plain.data); plain.data = NULL; |