You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by dr...@apache.org on 2015/04/23 11:15:54 UTC

directory-kerby git commit: Corrected an encryption type used to decrypt tgt

Repository: directory-kerby
Updated Branches:
  refs/heads/master 7a1670bfd -> d696cd1a5


Corrected an encryption type used to decrypt tgt


Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/d696cd1a
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/d696cd1a
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/d696cd1a

Branch: refs/heads/master
Commit: d696cd1a5eeb507be7a689f604120adcd6e72cd3
Parents: 7a1670b
Author: Drankye <dr...@gmail.com>
Authored: Thu Apr 23 17:15:40 2015 +0800
Committer: Drankye <dr...@gmail.com>
Committed: Thu Apr 23 17:15:40 2015 +0800

----------------------------------------------------------------------
 .../apache/kerby/kerberos/kerb/server/request/TgsRequest.java   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/d696cd1a/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/request/TgsRequest.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/request/TgsRequest.java b/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/request/TgsRequest.java
index 6d5c610..739d759 100644
--- a/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/request/TgsRequest.java
+++ b/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/request/TgsRequest.java
@@ -73,10 +73,9 @@ public class TgsRequest extends KdcRequest {
             throw new KrbException(KrbErrorCode.KRB_AP_ERR_MSG_TYPE);
         }
 
-        EncryptionType encType = getKdcReq().getReqBody().getEtypes().listIterator().next();
-        EncryptionKey tgsKey = getTgsEntry().getKeys().get(encType);
-
         Ticket ticket = apReq.getTicket();
+        EncryptionType encType = ticket.getEncryptedEncPart().getEType();
+        EncryptionKey tgsKey = getTgsEntry().getKeys().get(encType);
         if (ticket.getTktvno() != KrbConstant.KRB_V5) {
             throw new KrbException(KrbErrorCode.KRB_AP_ERR_BADVERSION);
         }