directory-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Enrique Rodriguez" <>
Subject Re: svn commit: r540371 [1/7] - in /directory/apacheds/trunk: kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/ kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/ kerb
Date Tue, 22 May 2007 00:13:44 GMT
On 5/21/07, <> wrote:
> Author: erodriguez
> Date: Mon May 21 17:00:43 2007
> New Revision: 540371
> URL:
> Log:
> Merged 'kerberos-encryption-types' branch back into ApacheDS trunk at peg revision r540341.
> ...

So, as you can see, I closed-out the 'kerberos-encryption-types'
branch.  I'll double-check my local machine then delete the branch

1)  Of course tests and ITests passed but one thing I'm not sure of is
whether I commented out or properly handled all the places AES-256 is
used or tested.  AES-256 requires the "unlimited strength" policy for
the JVM.  If a test fails on the use of AES-256 it needs to be
commented out.  If something in Kerberos causes an exception related
to AES-256 then I need to re-work how I handle that condition.

2)  I mentioned I would drop a copy of my command syntax.  It may wrap
badly but here it is.  Note on merges to the branch I use "operative
revision" syntax while on the merge of the branch back into the trunk
I use the "peg revision."  I had zero conflicts with these commands.

$ cd ['kerberos-encryption-types' branch]
$ svn log -v --stop-on-copy
r533845 | erodriguez | 2007-04-30 13:25:25 -0700 (Mon, 30 Apr 2007) | 1 line
Changed paths:
   A /directory/apacheds/branches/kerberos-encryption-types (from

Creating a branch of the ApacheDS trunk to refactor kerberos-shared
and to add AES and DES3 encryption types.

$ svn --dry-run merge -r 533844:539990
$ svn merge -r 533844:539990

$ cd ['directory' trunk]
$ svn --dry-run merge
$ svn merge


View raw message