SKALE-1850 Add client authentification

Merge remote-tracking branch 'origin/enhancement/SKALE-1762-Add-SSL-to-SGX-server-and-client' into feature/SKALE-1850-remove-extra-dependencies-from-SGX

SGXRegistrationServer.cpp

@@ -6,7 +6,7 @@
 #include <fstream>
 #include <sstream>
 
-
+#include <third_party/cryptlite/sha256.h>
 #include <jsonrpccpp/server/connectors/httpserver.h>
 
 #include <stdio.h>
@@ -44,14 +44,19 @@ Json::Value SignSertificateImpl(const std::string& cert){
   result["status"] = 0;
   result["errorMessage"] = "";
   try{
-
-  std::ofstream outfile ("cert/test.csr");
+  std::cerr << " going to create csr" << std::endl;
+  std::ofstream outfile ("cert/client.csr");
   outfile << cert << std::endl;
   outfile.close();
+  std::string csrPath = "cert/client.csr";
+  if (access(csrPath.c_str(), F_OK) != 0){
+    throw RPCException(FILE_NOT_FOUND, "Csr does not exist");
+  }
   result["result"] = true;
   std::thread thr(set_cert_created1, true);
   thr.detach();
 
+  std::string hash = cryptlite::sha256::hash_hex(cert);
 
  // std::thread timeout_thr (std::bind(&SGXRegistrationServer::set_cert_created, this, true));
 
@@ -76,7 +81,7 @@ Json::Value GetSertificateImpl(const std::string& hash){
       result["cert"] = "";
     }
     else {
-      std::ifstream infile("cert/test_cert.crt");
+      std::ifstream infile("cert/client.crt");
       if (!infile.is_open()) {
         throw RPCException(FILE_NOT_FOUND, "Certificate does not exist");
       } else {
@@ -101,6 +106,7 @@ Json::Value GetSertificateImpl(const std::string& hash){
 
 
 Json::Value SGXRegistrationServer::SignCertificate(const std::string& cert){
+  std::cerr << "Enter SignCertificate " << std::endl;
   lock_guard<recursive_mutex> lock(m);
   return SignSertificateImpl(cert);
 }
@@ -119,24 +125,24 @@ void SGXRegistrationServer::set_cert_created(bool b){
 
 int init_registration_server() {
 
-  std::string certPath = "cert/SGXCACertificate.crt";
-  std::string keyPath = "cert/SGXCACertificate.key";
-
-  if (access(certPath.c_str(), F_OK) != 0){
-    std::cerr << "CERTIFICATE IS GOING TO BE CREATED" << std::endl;
-
-    std::string genCert = "cd cert && ./self-signed-tls -c=US -s=California -l=San-Francisco -o=\"Skale Labs\" -u=\"Department of Software Engineering\" -n=\"SGXCACertificate\" -e=info@skalelabs.com";
-
-    if (system(genCert.c_str()) == 0){
-      std::cerr << "CERTIFICATE IS SUCCESSFULLY GENERATED" << std::endl;
-    }
-    else{
-      std::cerr << "CERTIFICATE GENERATION FAILED" << std::endl;
-      exit(-1);
-    }
-  }
-
-  hs2 = new HttpServer(1027);
+//  std::string certPath = "cert/SGXCACertificate.crt";
+//  std::string keyPath = "cert/SGXCACertificate.key";
+//
+//  if (access(certPath.c_str(), F_OK) != 0){
+//    std::cerr << "CERTIFICATE IS GOING TO BE CREATED" << std::endl;
+//
+//    std::string genCert = "cd cert && ./self-signed-tls -c=US -s=California -l=San-Francisco -o=\"Skale Labs\" -u=\"Department of Software Engineering\" -n=\"SGXCACertificate\" -e=info@skalelabs.com";
+//
+//    if (system(genCert.c_str()) == 0){
+//      std::cerr << "CERTIFICATE IS SUCCESSFULLY GENERATED" << std::endl;
+//    }
+//    else{
+//      std::cerr << "CERTIFICATE GENERATION FAILED" << std::endl;
+//      exit(-1);
+//    }
+//  }
+
+  hs2 = new HttpServer(1031);
   sr = new SGXRegistrationServer(*hs2,
                                  JSONRPC_SERVER_V2); // hybrid server (json-rpc 1.0 & 2.0)
 

SGXWalletServer.cpp

@@ -74,30 +74,48 @@ void debug_print(){
 }
 
 int init_server() {
-  std::string certPath = "cert/SGXServerCertificate.crt";
-  std::string keyPath = "cert/SGXServerCertificate.key";
+  std::string rootCAPath = "cert/rootCA.pem";
+  std::string keyCAPath = "cert/rootCA.key";
 
-  if (access(certPath.c_str(), F_OK) != 0){ //(!boost::filesystem::exists(certPath) ){
-    std::cerr << "NO!!! " << std::endl;
-    std::cerr << "CERTIFICATE IS GOING TO BE CREATED" << std::endl;
+  if (access(rootCAPath.c_str(), F_OK) != 0 || access(keyCAPath.c_str(), F_OK) != 0){
+    std::cerr << "YOU DO NOT HAVE ROOT CA CERTIFICATE" << std::endl;
+    std::cerr << "ROOT CA CERTIFICATE IS GOING TO BE CREATED" << std::endl;
 
-    std::string genCert = "cd cert && ./self-signed-tls -c=US -s=California -l=San-Francisco -o=\"Skale Labs\" -u=\"Department of Software Engineering\" -n=\"SGXServerCertificate\" -e=info@skalelabs.com";
+    std::string genRootCACert = "cd cert && ./create_CA";
+
+    if (system(genRootCACert.c_str()) == 0){
+      std::cerr << "ROOT CA CERTIFICATE IS SUCCESSFULLY GENERATED" << std::endl;
+    }
+    else{
+      std::cerr << "ROOT CA CERTIFICATE GENERATION FAILED" << std::endl;
+      exit(-1);
+    }
+  }
+
+  std::string certPath = "cert/SGXServerCert.crt";
+  std::string keyPath = "cert/SGXServerCert.key";
+
+  if (access(certPath.c_str(), F_OK) != 0 || access(certPath.c_str(), F_OK) != 0){
+    std::cerr << "YOU DO NOT HAVE SERVER CERTIFICATE " << std::endl;
+    std::cerr << "SERVER CERTIFICATE IS GOING TO BE CREATED" << std::endl;
+
+    std::string genCert = "cd cert && ./create_server_cert";
 
     if (system(genCert.c_str()) == 0){
-       std::cerr << "CERTIFICATE IS SUCCESSFULLY GENERATED" << std::endl;
+       std::cerr << "SERVER CERTIFICATE IS SUCCESSFULLY GENERATED" << std::endl;
     }
     else{
-      std::cerr << "CERTIFICATE GENERATION FAILED" << std::endl;
+      std::cerr << "SERVER CERTIFICATE GENERATION FAILED" << std::endl;
       exit(-1);
     }
   }
 
-  hs = new HttpServer(1026, certPath, keyPath, 10);
+  hs = new HttpServer(1030, certPath, keyPath, rootCAPath, 10);
   s = new SGXWalletServer(*hs,
                       JSONRPC_SERVER_V2); // hybrid server (json-rpc 1.0 & 2.0)
 
   if (!s->StartListening()) {
-    cerr << "Server could not start listening" << endl;
+    cerr << "SGX Server could not start listening" << endl;
     exit(-1);
   }
   return 0;

abstractregserver.h

@@ -6,6 +6,7 @@
 #define SGXD_ABSTRACTREGSERVER_H
 
 #include <jsonrpccpp/server.h>
+#include <iostream>
 
 class AbstractRegServer : public jsonrpc::AbstractServer<AbstractRegServer>
 {
@@ -18,7 +19,8 @@ public:
 
   inline virtual void SignCertificateI(const Json::Value &request, Json::Value &response)
   {
-    response = this->SignCertificate( request["certificate"].asString());
+      std::cerr << "SignCertificateI in abstr server " << std::endl;
+      response = this->SignCertificate( request["certificate"].asString());
   }
   inline virtual void GetCertificateI(const Json::Value &request, Json::Value &response)
   {

cert/ca.config

+[ ca ]
+        default_ca             = CA_CLIENT       # При подписи сертификатов
+        # использовать секцию CA_CLIENT
+        
+        [ CA_CLIENT ]
+        dir                    = .            # Каталог для служебных файлов
+        certs                  = $dir/certs      # Каталог для сертификатов
+        new_certs_dir          = $dir/new_certs   # Каталог для новых сертификатов
+
+        database               = $dir/index.txt  # Файл с базой данных
+        # подписанных сертификатов
+        serial                 = $dir/serial     # Файл содержащий серийный номер
+        RANDFILE               = $dir/.rnd
+        # сертификата
+        # (в шестнадцатиричном формате)
+        certificate            = ./rootCA.pem        # Файл сертификата CA
+        private_key            = ./rootCA.key        # Файл закрытого ключа CA
+
+        default_days           = 3650             # Срок действия подписываемого
+        # сертификата
+        default_crl_days       = 7               # Срок действия CRL (см. $4)
+        default_md             = sha256             # Алгоритм подписи
+
+        name_opt               = ca_default
+        cert_opt               = ca_default
+        policy                 = policy_anything # Название секции с описанием
+        # политики в отношении данных
+        # сертификата
+
+        [ policy_anything ]
+        countryName            = optional        # Код страны - не обязателен
+        stateOrProvinceName    = optional        # ......
+        localityName           = optional        # ......
+        organizationName       = optional        # ......
+        organizationalUnitName = optional        # ......
+        commonName             = supplied        # ...... - обязателен
+        emailAddress           = optional        # ......

cert/create_CA

+#!/bin/bash
+
+# Generate root CA key
+openssl genrsa -out rootCA.key 2048
+
+# Create an X.509 cert from the CA key
+openssl req -x509 -sha256 -nodes -days 1024 -newkey rsa:2048 -key rootCA.key -out rootCA.pem -subj "/CN=SGXCACertificate"
+
+mkdir new_certs
+touch index.txt
+echo "01" > serial
+
+
+

cert/create_client_cert

+#!/bin/bash
+
+#sign csr
+yes | openssl ca -config ca.config -in "client.csr" -out "client.crt"

cert/create_server_cert

+#!/bin/bash
+
+# Generate server key
+openssl genrsa -out "SGXServerCert.key" 2048
+
+# Create server certificate request
+#openssl req -new -key "SGXServer.key" -out "SGXServer.csr" -subj "/CN=SGXCACertificate"
+
+openssl req -new -sha256 -nodes -out "SGXServerCert.csr" -newkey rsa:2048 -keyout "SGXServerCert.key" -subj /CN=SGXServer
+
+# Sign and generate the user certificate from the
+#openssl x509 -req -in "SGXServer.csr" -CA rootCA.crt -CAkey rootCA.key -CAcreateserial -out "SGXServerCertificate.crt" -days 3650
+
+yes | openssl ca -config ca.config -in "SGXServerCert.csr" -out "SGXServerCert.crt"

cert/self-signed-tls

-#!/bin/bash
-
-# Directories
-cur=$(pwd)
-tmp=$(mktemp -d)
-scriptName=$(basename "$0")
-
-# Certificate Variables
-OUTPATH="./"
-VERBOSE=0
-DURATION=3650 # 10 years
-
-safeExit() {
-  if [ -d "$tmp" ]; then
-    if [ $VERBOSE -eq 1 ]; then
-      echo "Removing temporary directory '${tmp}'"
-    fi
-    rm -rf "$tmp"
-  fi
-
-  trap - INT TERM EXIT
-  exit
-}
-
-# Help Screen
-help() {
-  echo -n "${scriptName} [OPTIONS] -c=US --state=California
-
-Generate self-signed TLS certificate using OpenSSL
-
- Options:
-  -c|--country         Country Name (2 letter code)
-  -s|--state           State or Province Name (full name)
-  -l|--locality        Locality Name (eg, city)
-  -o|--organization    Organization Name (eg, company)
-  -u|--unit            Organizational Unit Name (eg, section)
-  -n|--common-name     Common Name (e.g. server FQDN or YOUR name)
-  -e|--email           Email Address
-  -p|--path            Path to output generated keys
-  -d|--duration        Validity duration of the certificate (in days)
-  -h|--help            Display this help and exit
-  -v|--verbose         Verbose output
-"
-}
-
-# Test output path is valid
-testPath() {
-  if [ ! -d $OUTPATH ]; then
-    echo "The specified directory \"${OUTPATH}\" does not exist"
-    exit 1
-  fi
-}
-
-# Process Arguments
-while [ "$1" != "" ]; do
-  PARAM=$(echo "$1" | awk -F= '{print $1}')
-  VALUE=$(echo "$1" | awk -F= '{print $2}')
-  case $PARAM in
-    -h|--help) help; safeExit ;;
-    -c|--country) C=$VALUE ;;
-    -s|--state) ST=$VALUE ;;
-    -l|--locality) L=$VALUE ;;
-    -o|--organization) O=$VALUE ;;
-    -u|--unit) OU=$VALUE ;;
-    -n|--common-name) CN=$VALUE ;;
-    -e|--email) emailAddress=$VALUE ;;
-    -p|--path) OUTPATH=$VALUE; testPath ;;
-	-d|--duration) DURATION=$VALUE ;;
-    -v|--verbose) VERBOSE=1 ;;
-    *) echo "ERROR: unknown parameter \"$PARAM\""; help; exit 1 ;;
-  esac
-  shift
-done
-
-# Prompt for variables that were not provided in arguments
-checkVariables() {
-  # Country
-  if [ -z "$C" ]; then
-    echo -n "Country Name (2 letter code) [AU]:"
-    read -r C
-  fi
-
-  # State
-  if [ -z "$ST" ]; then
-    echo -n "State or Province Name (full name) [Some-State]:"
-    read -r ST
-  fi
-
-  # Locality
-  if [ -z "$L" ]; then
-    echo -n "Locality Name (eg, city) []:"
-    read -r L
-  fi
-
-  # Organization
-  if [ -z "$O" ]; then
-    echo -n "Organization Name (eg, company) [Internet Widgits Pty Ltd]:"
-    read -r O
-  fi
-
-  # Organizational Unit
-  if [ -z "$OU" ]; then
-    echo -n "Organizational Unit Name (eg, section) []:"
-    read -r OU
-  fi
-
-  # Common Name
-  if [ -z "$CN" ]; then
-    echo -n "Common Name (e.g. server FQDN or YOUR name) []:"
-    read -r CN
-  fi
-
-  # Email Address
-  if [ -z "$emailAddress" ]; then
-    echo -n "Email Address []:"
-    read -r emailAddress
-  fi
-}
-
-# Show variable values
-showVals() {
-  echo "Country: ${C}";
-  echo "State: ${ST}";
-  echo "Locality: ${L}";
-  echo "Organization: ${O}";
-  echo "Organization Unit: ${OU}";
-  echo "Common Name: ${CN}";
-  echo "Email: ${emailAddress}";
-  echo "Output Path: ${OUTPATH}";
-  echo "Certificate Duration (Days): ${DURATION}";
-  echo "Verbose: ${VERBOSE}";
-}
-
-# Init
-init() {
-  cd "$tmp" || exit
-  pwd
-}
-
-# Cleanup
-cleanup() {
-  echo "Cleaning up"
-  cd "$cur" || exit
-  rm -rf "$tmp"
-}
-
-buildCsrCnf() {
-cat << EOF > "${tmp}/tmp.csr.cnf"
-[req]
-default_bits = 2048
-prompt = no
-default_md = sha256
-distinguished_name = dn
-
-[dn]
-C=${C}
-ST=${ST}
-L=${L}
-O=${O}
-OU=${OU}
-CN=${CN}
-emailAddress=${emailAddress}
-EOF
-}
-
-buildExtCnf() {
-cat << EOF > "${tmp}/v3.ext"
-authorityKeyIdentifier=keyid,issuer
-basicConstraints=CA:FALSE
-keyUsage = digitalSignature, nonRepudiation, keyEncipherment, dataEncipherment
-subjectAltName = @alt_names
-
-[alt_names]
-DNS.1 = ${CN}
-EOF
-}
-
-# Build TLS Certificate
-build() {
-  # Santizie domain name for file name
-  FILENAME=${CN/\*\./}
-  # Generate CA key & crt
-  openssl genrsa -out "${tmp}/tmp.key" 2048
-  openssl req -x509 -new -nodes -key "${tmp}/tmp.key" -sha256 -days "${DURATION}" -out "${OUTPATH}${FILENAME}_CA.pem" -subj "/C=${C}/ST=${ST}/L=${L}/O=${O}/OU=${OU}/CN=${CN}/emailAddress=${emailAddress}"
-
-  # CSR Configuration
-  buildCsrCnf
-
-  # Create v3.ext configuration file
-  buildExtCnf
-
-  # Server key
-  openssl req -new -sha256 -nodes -out "${OUTPATH}${FILENAME}.csr" -newkey rsa:2048 -keyout "${OUTPATH}${FILENAME}.key" -config <( cat "${tmp}/tmp.csr.cnf" )
-
-  # Server certificate
-  openssl x509 -req -in "${OUTPATH}${FILENAME}.csr" -CA "${OUTPATH}${FILENAME}_CA.pem" -CAkey "${tmp}/tmp.key" -CAcreateserial -out "${OUTPATH}${FILENAME}.crt" -days "${DURATION}" -sha256 -extfile "${tmp}/v3.ext"
-}
-
-checkVariables
-build
-# showVals
-safeExit

compile

+/usr/share/automake-1.16/compile
\ No newline at end of file

depcomp

+/usr/share/automake-1.16/depcomp
\ No newline at end of file

install-sh

+/usr/share/automake-1.16/install-sh
\ No newline at end of file

missing

+/usr/share/automake-1.16/missing
\ No newline at end of file

secure_enclave/Makefile.in

-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -137,7 +137,15 @@ am__v_at_0 = @
 am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/BLSEnclave.Po ./$(DEPDIR)/DH_dkg.Po \
+	./$(DEPDIR)/DKGUtils.Po ./$(DEPDIR)/alt_bn128_g1.Po \
+	./$(DEPDIR)/alt_bn128_g2.Po ./$(DEPDIR)/alt_bn128_init.Po \
+	./$(DEPDIR)/curves.Po ./$(DEPDIR)/domain_parameters.Po \
+	./$(DEPDIR)/numbertheory.Po ./$(DEPDIR)/point.Po \
+	./$(DEPDIR)/secure_enclave.Po ./$(DEPDIR)/secure_enclave_t.Po \
+	./$(DEPDIR)/signature.Po ./$(DEPDIR)/signed_enclave_debug.Po \
+	./$(DEPDIR)/signed_enclave_rel.Po
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -365,8 +373,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 $(top_srcdir)/build-aux/sgx_enclave.am $(am__empty):
 
@@ -431,21 +439,27 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BLSEnclave.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DH_dkg.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DKGUtils.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alt_bn128_g1.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alt_bn128_g2.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alt_bn128_init.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/curves.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/domain_parameters.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/numbertheory.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/point.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/secure_enclave.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/secure_enclave_t.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/signature.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/signed_enclave_debug.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/signed_enclave_rel.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BLSEnclave.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DH_dkg.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DKGUtils.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alt_bn128_g1.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alt_bn128_g2.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alt_bn128_init.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/curves.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/domain_parameters.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/numbertheory.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/point.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/secure_enclave.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/secure_enclave_t.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/signature.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/signed_enclave_debug.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/signed_enclave_rel.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -569,7 +583,10 @@ cscopelist-am: $(am__tagged_files)
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -642,7 +659,21 @@ clean: clean-am
 clean-am: clean-generic clean-libexecPROGRAMS mostlyclean-am
 
 distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/BLSEnclave.Po
+	-rm -f ./$(DEPDIR)/DH_dkg.Po
+	-rm -f ./$(DEPDIR)/DKGUtils.Po
+	-rm -f ./$(DEPDIR)/alt_bn128_g1.Po
+	-rm -f ./$(DEPDIR)/alt_bn128_g2.Po
+	-rm -f ./$(DEPDIR)/alt_bn128_init.Po
+	-rm -f ./$(DEPDIR)/curves.Po
+	-rm -f ./$(DEPDIR)/domain_parameters.Po
+	-rm -f ./$(DEPDIR)/numbertheory.Po
+	-rm -f ./$(DEPDIR)/point.Po
+	-rm -f ./$(DEPDIR)/secure_enclave.Po
+	-rm -f ./$(DEPDIR)/secure_enclave_t.Po
+	-rm -f ./$(DEPDIR)/signature.Po
+	-rm -f ./$(DEPDIR)/signed_enclave_debug.Po
+	-rm -f ./$(DEPDIR)/signed_enclave_rel.Po
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
@@ -688,7 +719,21 @@ install-ps-am:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/BLSEnclave.Po
+	-rm -f ./$(DEPDIR)/DH_dkg.Po
+	-rm -f ./$(DEPDIR)/DKGUtils.Po
+	-rm -f ./$(DEPDIR)/alt_bn128_g1.Po
+	-rm -f ./$(DEPDIR)/alt_bn128_g2.Po
+	-rm -f ./$(DEPDIR)/alt_bn128_init.Po
+	-rm -f ./$(DEPDIR)/curves.Po
+	-rm -f ./$(DEPDIR)/domain_parameters.Po
+	-rm -f ./$(DEPDIR)/numbertheory.Po
+	-rm -f ./$(DEPDIR)/point.Po
+	-rm -f ./$(DEPDIR)/secure_enclave.Po
+	-rm -f ./$(DEPDIR)/secure_enclave_t.Po
+	-rm -f ./$(DEPDIR)/signature.Po
+	-rm -f ./$(DEPDIR)/signed_enclave_debug.Po
+	-rm -f ./$(DEPDIR)/signed_enclave_rel.Po
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -708,19 +753,19 @@ uninstall-am: uninstall-libexecPROGRAMS
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
-	clean-libexecPROGRAMS cscopelist-am ctags ctags-am distclean \
-	distclean-compile distclean-generic distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-libexecPROGRAMS \
-	install-man install-pdf install-pdf-am install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
-	ps ps-am tags tags-am uninstall uninstall-am \
-	uninstall-libexecPROGRAMS
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
+	clean-generic clean-libexecPROGRAMS cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am \
+	install-libexecPROGRAMS install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am uninstall-libexecPROGRAMS
 
 .PRECIOUS: Makefile