[midPoint-git] midPoint branch v2.2-support updated. v2.2support-219-g49df654

[Katka Valalikova]

Project "midPoint" branch v2.2-support has been updated
       via  49df6544a8779706fe0fc887c00331f608e34e47 (commit) v2.2support-219-g49df654
       via  54770157ab2bb02193f1e0bd3a81a57f5d2c9b53 (commit) v2.2support-215-g5477015
      from  2101f6b6e953c6853423824faa08721072ba4b0b (commit) v2.2support-217-g2101f6b

- Log -----------------------------------------------------------------
commit 49df6544a8779706fe0fc887c00331f608e34e47
Merge: 5477015 2101f6b
Author: katkav <k.valalikova at evolveum.com>
Date:   Fri Dec 6 16:29:22 2013 +0100

    Merge branch 'v2.2-support' of git.evolveum.com:/srv/git/projects/midpoint into v2.2-support

commit 54770157ab2bb02193f1e0bd3a81a57f5d2c9b53
Author: katkav <k.valalikova at evolveum.com>
Date:   Fri Dec 6 16:17:23 2013 +0100

    adding test for encrypt/decrypt operation..
    
    improvement of decrypt algorithm (using the key for decryption which was used before when the value was encrypted)

-----------------------------------------------------------------------

(Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full)

Summary of changes:
 .../midpoint/common/crypto/AESProtector.java       |   12 +++-
 .../midpoint/common/crypto/TestProtector.java      |   64 ++++++++++++++++++++
 .../src/test/resources/crypto/test-keystore.jceks  |  Bin 500 -> 983 bytes
 infra/common/testng.xml                            |    7 ++-
 4 files changed, 79 insertions(+), 4 deletions(-)
 create mode 100644 infra/common/src/test/java/com/evolveum/midpoint/common/crypto/TestProtector.java


hooks/post-receive
-- 
midPoint