From 2ee0d62b8045405d8c5813640164f1dce46c55a6 Mon Sep 17 00:00:00 2001
From: David Edwards <david.edwards@alfresco.com>
Date: Fri, 31 May 2019 16:32:49 +0100
Subject: [PATCH] Revert "REPO-4400 Removed files and beans (#465)"

This reverts commit 8f584c86fd8161f2a6810c98bc7fd738249705dc.
---
 .gitignore                                       |   3 ---
 .../resources/alfresco/encryption-context.xml    |  14 ++++++++++++++
 .../keystore/ssl-keystore-passwords.properties   |   7 +++++++
 .../keystore/ssl-truststore-passwords.properties |   5 +++++
 .../resources/alfresco/keystore/ssl.keystore     | Bin 0 -> 2756 bytes
 .../resources/alfresco/keystore/ssl.truststore   | Bin 0 -> 740 bytes
 6 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 src/main/resources/alfresco/keystore/ssl-keystore-passwords.properties
 create mode 100644 src/main/resources/alfresco/keystore/ssl-truststore-passwords.properties
 create mode 100644 src/main/resources/alfresco/keystore/ssl.keystore
 create mode 100644 src/main/resources/alfresco/keystore/ssl.truststore

diff --git a/.gitignore b/.gitignore
index 39e0c15d2a..ff04b28cf1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,5 @@
 *.class
 
-# VSCode
-.vscode/
-
 # Eclipse
 .classpath
 .settings
diff --git a/src/main/resources/alfresco/encryption-context.xml b/src/main/resources/alfresco/encryption-context.xml
index fecdbf42e6..d1048874b5 100644
--- a/src/main/resources/alfresco/encryption-context.xml
+++ b/src/main/resources/alfresco/encryption-context.xml
@@ -50,6 +50,20 @@
         <property name="trustStoreParameters" ref="sslTrustStoreParameters"/>
     </bean>
 
+    <bean id="ssl.keyStore" class="org.alfresco.encryption.AlfrescoKeyStoreImpl" init-method="init">
+       <property name="keyStoreParameters" ref="sslKeyStoreParameters"/>
+       <property name="keyResourceLoader" ref="springKeyResourceLoader"/>
+       <property name="validateKeyChanges" value="false"/>
+       <property name="encryptionKeysRegistry" ref="encryptionKeysRegistry"/>
+    </bean>
+
+    <bean id="ssl.trustStore" class="org.alfresco.encryption.AlfrescoKeyStoreImpl" init-method="init">
+       <property name="keyStoreParameters" ref="sslTrustStoreParameters"/>
+       <property name="keyResourceLoader" ref="springKeyResourceLoader"/>
+       <property name="validateKeyChanges" value="false"/>
+       <property name="encryptionKeysRegistry" ref="encryptionKeysRegistry"/>
+    </bean>
+
     <bean id="md5EncryptionParameters" class="org.alfresco.httpclient.MD5EncryptionParameters">
         <property name="cipherAlgorithm" value="${encryption.cipherAlgorithm}"/>
         <property name="messageTimeout" value="${encryption.mac.messageTimeout}"/>
diff --git a/src/main/resources/alfresco/keystore/ssl-keystore-passwords.properties b/src/main/resources/alfresco/keystore/ssl-keystore-passwords.properties
new file mode 100644
index 0000000000..3a32c534d6
--- /dev/null
+++ b/src/main/resources/alfresco/keystore/ssl-keystore-passwords.properties
@@ -0,0 +1,7 @@
+aliases=ssl.alfresco.ca,ssl.repo
+# The ssl keystore password
+keystore.password=kT9X6oe68t
+# The password protecting the ssl repository key
+ssl.repo.password=kT9X6oe68t
+# The password protecting the ssl Alfresco CA key
+ssl.alfresco.ca.password=kT9X6oe68t
\ No newline at end of file
diff --git a/src/main/resources/alfresco/keystore/ssl-truststore-passwords.properties b/src/main/resources/alfresco/keystore/ssl-truststore-passwords.properties
new file mode 100644
index 0000000000..e5510fb03c
--- /dev/null
+++ b/src/main/resources/alfresco/keystore/ssl-truststore-passwords.properties
@@ -0,0 +1,5 @@
+aliases=alfresco.ca
+# The ssl truststore password
+keystore.password=kT9X6oe68t
+# The password protecting the ssl Alfresco CA strust certificate
+alfresco.ca.password=kT9X6oe68t
\ No newline at end of file
diff --git a/src/main/resources/alfresco/keystore/ssl.keystore b/src/main/resources/alfresco/keystore/ssl.keystore
new file mode 100644
index 0000000000000000000000000000000000000000..3491f92e3b4d92f5d19dea4664c3897612f69a39
GIT binary patch
literal 2756
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

literal 0
HcmV?d00001

diff --git a/src/main/resources/alfresco/keystore/ssl.truststore b/src/main/resources/alfresco/keystore/ssl.truststore
new file mode 100644
index 0000000000000000000000000000000000000000..67273aff4f6f17507ea3de302153ac2dd6150fc7
GIT binary patch
literal 740
zcmX?i?%X*B1_mY|W(3pRi8*OSsm00pddZ1EF-yUUl9LRq5qhQumOy0-44Rnc05R(V
zW+p}^CQgQ?E6Lw-)NHOB@Un4gwRyCC=VfGMWo0l(GvqelWMd9xVH0L@cY<*^c$h-H
z4TTK^K{D(-T)v5!DXDoGsfj6u@&>XXK`tIKN2mi7g7ec#$`gxH6?{rk^bAD|gg^?I
zdAQ*UoE;4m#CZ*k3@i){49yJ9jZLB?_>ByK0_KM1PyxERq;WoS7%;LjFgNxx7&LY=
zH8wK5(kLo9$R=-dhV7E6+qdtD6>>as|2tltki4S&d-09gR=4{u?Fv`>((xcq<J5J%
zncT10Ds32@nyTLa_VsT6FQs<pq4tzHT^eFP&ztTFocru^#Bz~iN_!i)irsFmVwm+H
z)3{MVwA|i>@!844AKfj}Ih-2*K3-Uz{=R7O$%zT7mDib=85tNC2N?K)16h`jMT|v+
zS!%w$g`0K5o?14M`r8~mt*=CH8ps2KSXP-u!a%G6y8<4N0$~<b17=3X|HvK&MmjUl
zr;9ek9+1<kU*F-sDAtJgs^Ui%fs>ElT)T1a&@}PRYn|IIE{C!89-m_7n$+}tlI6|-
z-JKe-_J;)-n-@mEc=@k?gH~hdo5W3*SMBz+pZ7}F;#RX3i;VbY`S_W-!K>2Wmp}ej
zWWB4mr2bdY+dm=NZn^BQSN<_<P^#3Qyiz;Wd}Gv;Ezeti9^diCz%MMhd*j~7!yYG(
G?*jmSG51>l

literal 0
HcmV?d00001