svn commit: r1602193 - in /syncope/branches/1_1_X: common/src/main/java/org/apache/syncope/common/types/CipherAlgorithm.java core/src/main/java/org/apache/syncope/core/persistence/beans/user/SyncopeUser.java

[coheigea]

Author: coheigea
Date: Thu Jun 12 14:57:05 2014
New Revision: 1602193

URL: http://svn.apache.org/r1602193
Log:
[SYNCOPE-313] - Adding an initial way to import hashed passwords into Syncope 
from an LDAP backend


Conflicts:
        
common/src/main/java/org/apache/syncope/common/types/CipherAlgorithm.java

Modified:
    
syncope/branches/1_1_X/common/src/main/java/org/apache/syncope/common/types/CipherAlgorithm.java
    
syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/persistence/beans/user/SyncopeUser.java

Modified: 
syncope/branches/1_1_X/common/src/main/java/org/apache/syncope/common/types/CipherAlgorithm.java
URL: 
http://svn.apache.org/viewvc/syncope/branches/1_1_X/common/src/main/java/org/apache/syncope/common/types/CipherAlgorithm.java?rev=1602193&r1=1602192&r2=1602193&view=diff
==============================================================================
--- 
syncope/branches/1_1_X/common/src/main/java/org/apache/syncope/common/types/CipherAlgorithm.java
 (original)
+++ 
syncope/branches/1_1_X/common/src/main/java/org/apache/syncope/common/types/CipherAlgorithm.java
 Thu Jun 12 14:57:05 2014
@@ -23,6 +23,7 @@ import javax.xml.bind.annotation.XmlEnum
 @XmlEnum
 public enum CipherAlgorithm {
 
+    SHA("SHA-1"),
     SHA1("SHA-1"),
     SHA256("SHA-256"),
     AES("AES"),

Modified: 
syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/persistence/beans/user/SyncopeUser.java
URL: 
http://svn.apache.org/viewvc/syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/persistence/beans/user/SyncopeUser.java?rev=1602193&r1=1602192&r2=1602193&view=diff
==============================================================================
--- 
syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/persistence/beans/user/SyncopeUser.java
 (original)
+++ 
syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/persistence/beans/user/SyncopeUser.java
 Thu Jun 12 14:57:05 2014
@@ -266,6 +266,13 @@ public class SyncopeUser extends Abstrac
         clearPassword = null;
     }
 
+    public void setEncodedPassword(final String password, final 
CipherAlgorithm cipherAlgoritm) {
+        // clear password
+        this.clearPassword = null;
+        this.password = password;
+        this.cipherAlgorithm = cipherAlgoritm;
+    }
+    
     public void setPassword(final String password, final CipherAlgorithm 
cipherAlgoritm, final int historySize) {
         // clear password
         this.clearPassword = password;