Temp commit with untested php extension stuff.

docker/Dockerfile

@@ -49,7 +49,7 @@ RUN git clone gogs@git-crysp.uwaterloo.ca:miti/verifier.git && \
 WORKDIR /root/graphene/LibOS/shim/test/native
 RUN make SGX=1 #&& make SGX_RUN=1 
 
-RUN apt update && apt install -y php7.0-dev tmux
+RUN apt update && apt install -y php7.0-dev tmux libxml2-dev 
 
 WORKDIR /root/source
 RUN git clone --recursive https://github.com/CopernicaMarketingSoftware/PHP-CPP.git && \
@@ -57,11 +57,27 @@ RUN git clone --recursive https://github.com/CopernicaMarketingSoftware/PHP-CPP.
 	cp libphpcpp.so.* /usr/lib/ && make install 
 
 RUN git clone gogs@git-crysp.uwaterloo.ca:miti/Apache_PHP_extension.git && \
-	cd Apache_PHP_extension && \
+	cd Apache_PHP_extension && git checkout recreating_state_for_teeter && \
 	make 
 
-#WORKDIR /root/graphene/LibOS/shim/test/apps/apache
-#RUN make SGX=1 && make SGX_RUN=1
+WORKDIR /root/graphene/LibOS/shim/test/apps/apache
+RUN cp /root/source/Apache_PHP_extension/apacheMakefile ./Makefile 
+RUN cp /root/source/Apache_PHP_extension/*.tar.gz ./
+#Don't make the manifest yet - make the apache/php build first and then the manifest.
+RUN make SGX=1 build-apache 
+
+#Add the updated httpd.manifest.template
+RUN cp /root/source/Apache_PHP_extension/httpd.manifest.template ./
+#Add the PHP .ini file from the PHP folder to /obj/lib 
+RUN cp ./php-7.0.7/php.ini-development ./obj/lib/php.ini 
+#Add the extension to the obj/modules folder. 
+RUN cp /root/source/Apache_PHP_extension/localattestation_decryption.so ./obj/modules/
+#Add the extension directory and the extension name to the php.ini 
+RUN echo "extension_dir=/root/graphene/LibOS/shim/test/apps/apache/LibOS/shim/test/apps/apache/obj/modules" >> obj/lib/php.ini && \ 
+	echo "extension=localattestation_decryption.so" >> obj/lib/php.ini
+#Add all php source code files to the right place. 
+RUN cp /root/source/Apache_PHP_extension/*.php ./obj/htdocs
+RUN make SGX=1 
 
 WORKDIR /root 
 COPY deploy_enclaves.sh ./

docker/gitcrysp-docker-deploy-key.id_rsa

@@ -1,51 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-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
------END RSA PRIVATE KEY-----

docker/gitcrysp-docker-deploy-key.id_rsa.pub

@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCsezWP/mPG0b+oN9/NXkUIQWz2JWcQblCfXnLYK7ZnRqbV//8QYHJ2yQy3Q4AGXMzLO6uW9kCSPspb8+42oRoSDJ1+rWeS1UrwwI71bhZErNCF4ESV8XJlYbqdeDj9hZdP2JDvUotdHuDNZoY5/kL5BMYqnhjMU5BjEHArKOgALbB5hKmNTsdPpLr4Er02jtAls9iPLeYb52K9sjXrj7YQwnicdHpoTJyLtf2Ht5459FxnLEXbdvh+SSoogvxDjAx9NNmjcweIjJpisjzTo3tY/aAN0MC5L7/N3f2kxN44xDbnuzjejLYZI7eAWBBwcyhbQcPBL66eJtsSdizMO6MEfr0F0c2I462/2npG4RUBzDGKdp+xk7/bh4bAWTdgcU99QKEif2KCwrdWkUtsIQsBd6gczsnDQJxyoZX5lb61/qReovaigVzkj9+1yxCcV2Lj3Oy5v5U5Y5c9xPekfvNlFSiSyVinihHc+AqIVEZeMxMGzOCojGr2TZNkCnWbfyPb7vPtAjrrHNe+i4zl5vd4CJIoENpyG/WUThoQ9CArr549iq0PzNORvMNFKAX+0ANArZA6piB/Mdoz54+eEsZVhF9cPEXI8nhkfRG78eM/RYggkT2On/fsfQfWLx+z1zWe0q/3tPkWABujacbFZTHlUQlqXR417Hwl5iyEYlDqPw== m2mazmud@teeter

graphene-docker/Dockerfile

@@ -3,18 +3,11 @@ RUN apt update
 RUN apt install -y gawk python-pip
 RUN pip install protobuf
 RUN pip install pycrypto
-WORKDIR /root/.ssh
-
-#Temp - TODO: Make the git repo public and remove these commands and retest.
-COPY gitcrysp-docker-deploy-key.id_rsa ./id_rsa
-COPY gitcrysp-docker-deploy-key.id_rsa.pub ./id_rsa.pub
-RUN ssh-keyscan git-crysp.uwaterloo.ca > ./known_hosts
 
 WORKDIR /root
-RUN git clone gogs@git-crysp.uwaterloo.ca:miti/graphene.git 
+RUN git clone https://github.com/oscarlab/graphene
 WORKDIR graphene
-RUN git checkout mitigator_patch
-RUN git checkout 2263b701
+RUN git checkout 58e6087
 RUN git submodule init
 RUN git submodule update
 RUN cd Pal/src/host/Linux-SGX/sgx-driver && git checkout 30d4b940