ALF-9501 "RINF 38: KeyStore detection sequence, password file and encryption check"

- initial checkin

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@29354 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Steven Glover
2011-07-26 13:53:49 +00:00
parent 19145084d9
commit 889ea0e58f
8 changed files with 307 additions and 31 deletions

View File

@@ -1,7 +1,23 @@
/*
* Copyright (C) 2005-2011 Alfresco Software Limited.
*
* This file is part of Alfresco
*
* Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
package org.alfresco.encryption;
import java.io.FileNotFoundException;
import java.io.InputStream;
import java.security.Key;
import java.security.KeyStore;
import java.security.UnrecoverableKeyException;
@@ -11,8 +27,6 @@ import java.util.Map;
import junit.framework.TestCase;
import org.alfresco.encryption.KeyStoreLoader;
import org.alfresco.encryption.KeystoreKeyProvider;
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.util.ApplicationContextHelper;
import org.springframework.context.ApplicationContext;
@@ -53,9 +67,9 @@ public class KeyStoreKeyProviderTest extends TestCase
return ks;
}
protected static KeyStoreLoader getKeyStoreLoader()
protected static KeyResourceLoader getKeyStoreLoader()
{
return new SpringKeyStoreLoader();
return new SpringKeyResourceLoader();
}
public void setUp() throws Exception