Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id AFDD9109B7 for ; Wed, 8 Jan 2014 09:46:12 +0000 (UTC) Received: (qmail 96876 invoked by uid 500); 8 Jan 2014 09:45:36 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 96070 invoked by uid 500); 8 Jan 2014 09:45:25 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 95640 invoked by uid 99); 8 Jan 2014 09:45:14 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 Jan 2014 09:45:14 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 Jan 2014 09:45:12 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 1142423889DA; Wed, 8 Jan 2014 09:44:51 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1556475 - /directory/apacheds/trunk/kerberos-client/src/main/java/org/apache/directory/kerberos/client/KdcConnection.java Date: Wed, 08 Jan 2014 09:44:50 -0000 To: commits@directory.apache.org From: kayyagari@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140108094451.1142423889DA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kayyagari Date: Wed Jan 8 09:44:50 2014 New Revision: 1556475 URL: http://svn.apache.org/r1556475 Log: use the subKey that was used in ApReq to decrypt the KrbPriv part present in the reply (DIRKRB-97) Modified: directory/apacheds/trunk/kerberos-client/src/main/java/org/apache/directory/kerberos/client/KdcConnection.java Modified: directory/apacheds/trunk/kerberos-client/src/main/java/org/apache/directory/kerberos/client/KdcConnection.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-client/src/main/java/org/apache/directory/kerberos/client/KdcConnection.java?rev=1556475&r1=1556474&r2=1556475&view=diff ============================================================================== --- directory/apacheds/trunk/kerberos-client/src/main/java/org/apache/directory/kerberos/client/KdcConnection.java (original) +++ directory/apacheds/trunk/kerberos-client/src/main/java/org/apache/directory/kerberos/client/KdcConnection.java Wed Jan 8 09:44:50 2014 @@ -595,13 +595,10 @@ public class KdcConnection } ChangePasswordReply chngPwdReply = ( ChangePasswordReply ) reply; - ApRep chngApRep = chngPwdReply.getApplicationReply(); - byte[] apRepData = cipherTextHandler.decrypt( tgt.getSessionKey(), chngApRep.getEncPart(), KeyUsage.AP_REP_ENC_PART_SESS_KEY ); - - EncApRepPart encApRepPart = KerberosDecoder.decodeEncApRepPart( apRepData ); - + KrbPriv replyPriv = chngPwdReply.getPrivateMessage(); - byte[] data = cipherTextHandler.decrypt( encApRepPart.getSubkey(), replyPriv.getEncPart(), KeyUsage.KRB_PRIV_ENC_PART_CHOSEN_KEY ); + // the same subKey present in ApReq is used for encrypting the KrbPriv present in reply + byte[] data = cipherTextHandler.decrypt( subKey, replyPriv.getEncPart(), KeyUsage.KRB_PRIV_ENC_PART_CHOSEN_KEY ); part = KerberosDecoder.decodeEncKrbPrivPart( data ); ChangePasswordResult result = new ChangePasswordResult( part.getUserData() );