Revert "krb5: always generate the acceptor subkey as the same enctype as the used...
authorStefan Metzmacher <metze@samba.org>
Wed, 13 Aug 2008 05:22:36 +0000 (07:22 +0200)
committerStefan Metzmacher <metze@samba.org>
Thu, 14 Aug 2008 11:13:52 +0000 (13:13 +0200)
This reverts commit dbb94133e0313cae933d261af0bf1210807a6d11.

As we fixed gensec_gssapi to only return a session key when it's
have the correct session key, this hack isn't needed anymore.

metze
(This used to be commit 697cd1896bccaa55ee422f17d9312d787ca699ed)

source4/heimdal/lib/krb5/rd_req.c

index e80aaa6789bb88b2a93b48e5297f2636d74e0394..ddf1f69ae44d02772360b8ec9e18140892e96223 100644 (file)
@@ -463,8 +463,6 @@ krb5_verify_ap_req2(krb5_context context,
 
     ac->keytype = ETYPE_NULL;
 
-#if 0
-/* it's bad to use a different enctype as the client */
     if (etypes.val) {
        int i;
 
@@ -475,7 +473,6 @@ krb5_verify_ap_req2(krb5_context context,
            }
        }
     }
-#endif
 
     /* save key */
     ret = krb5_copy_keyblock(context, &t->ticket.key, &ac->keyblock);