diff options
| author | Andreas Schneider <asn@samba.org> | 2016-09-02 10:53:41 +0200 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2016-09-09 00:32:12 +0200 |
| commit | 1cbdfe91fe0d835ddfcaa7fd4bd0311209c8c25c (patch) | |
| tree | 6ee990af488f43cf61ef35488b2edde82bb72a94 /lib/krb5_wrap | |
| parent | 016f49997cddb7d0dcd8ea4a1ae721a105f6f62b (diff) | |
| download | samba-1cbdfe91fe0d835ddfcaa7fd4bd0311209c8c25c.tar.gz | |
Revert "krb5_wrap: Add MIT implmentation of smb_krb5_keyblock_init_contents()"
This reverts commit c0e861666911d84f2d78cdab370077d9ac192005.
The krb5_init_keyblock function from MIT allocates the key but we
operate only on the contents.
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'lib/krb5_wrap')
| -rw-r--r-- | lib/krb5_wrap/krb5_samba.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/lib/krb5_wrap/krb5_samba.c b/lib/krb5_wrap/krb5_samba.c index 841e3f84312..dcd6185db9f 100644 --- a/lib/krb5_wrap/krb5_samba.c +++ b/lib/krb5_wrap/krb5_samba.c @@ -1638,22 +1638,6 @@ krb5_error_code smb_krb5_keyblock_init_contents(krb5_context context, { #if defined(HAVE_KRB5_KEYBLOCK_INIT) return krb5_keyblock_init(context, enctype, data, length, key); -#elif defined(HAVE_KRB5_INIT_KEYBLOCK) - krb5_error_code code; - - code = krb5_init_keyblock(context, - enctype, - length, - key); - if (code != 0) { - return code; - } - - if (length != 0) { - memcpy(KRB5_KEY_DATA(key), data, length); - } - - return 0; #else memset(key, 0, sizeof(krb5_keyblock)); KRB5_KEY_DATA(key) = SMB_MALLOC(length); |