topogen: remove CA generator (#3515)

It isn't clear why this was even here. It wasn't used for a long time, so we remove. Also clean up dependencies.
scionproto · Dec 13, 2019 · c14c1c5 · c14c1c5
1 parent d151ea8
commit c14c1c5
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 137 deletions.
diff --git a/.buildkite/scripts/build_scion_img b/.buildkite/scripts/build_scion_img
@@ -2,7 +2,7 @@
 
 set -e
 
-BASE_IMG=${BASE_IMG:-f936f668662950ed2875417dff9261e925aac489efb6d4ae44e7fcf4ea181226}
+BASE_IMG=${BASE_IMG:-555fce7eaf33d8e7d71715a1d0d74deebca8ffffbd61bda89c7f4c4d0dc22b13}
 
 docker pull scionproto/scion_base@sha256:$BASE_IMG
 docker tag scionproto/scion_base@sha256:$BASE_IMG scion_base:latest

diff --git a/env/debian/pkgs.txt b/env/debian/pkgs.txt
@@ -10,14 +10,11 @@ gcc
 git
 jq
 libcapnp-dev
-libffi-dev
-libssl-dev
 make
 moreutils
 net-tools
 netcat-openbsd
 ntp
-openssh-client
 patch
 python3-dev
 python3-flake8

diff --git a/env/pip3/requirements.txt b/env/pip3/requirements.txt
@@ -1,19 +1,9 @@
-# cryptography: licenses/cryptography
-cryptography==2.8 --hash=sha256:3cda1f0ed8747339bbdf71b9f38ca74c7b592f24f65cdb3ab3765e4b02871651 # Direct dependency
-# six: licenses/MIT
-six==1.10.0 --hash=sha256:0ff78c403d9bccf5a425a6d31a12aa6b47f1c21ca4dc2573a7e2f32a97335eb1
-# cffi: licenses/MIT
-cffi==1.13.2 --hash=sha256:135f69aecbf4517d5b3d6429207b2dff49c876be724ac0c8bf8e1ea99df3d7e5
-# pycparser: licenses/pycparser
-pycparser==2.19 --hash=sha256:a988718abfad80b6b157acce7bf130a30876d27603738ac39f140993246b25b3
 # toml: licenses/MIT
 toml==0.9.4 --hash=sha256:8e86bd6ce8cc11b9620cb637466453d94f5d57ad86f17e98a98d1f73e3baab2d # Direct dependency
 # plumbum: licenses/MIT
 plumbum==1.6.7 --hash=sha256:df96a5facf621db4a6d682bdc93afa5ed6b107a8667c73c3f0a0f0fab4217c81 # Direct dependency
 # pyyaml
 pyyaml==5.1.1 --hash=sha256:b4bb4d3f5e232425e25dda21c070ce05168a786ac9eda43768ab7f3ac2770955
-#pyOpenSSL
-pyOpenSSL==19.1.0 --hash=sha256:621880965a720b8ece2f1b2f54ea2071966ab00e2970ad2ce11d596102063504
 # supervisor: licenses/supervisor
 supervisor==4.1.0 --hash=sha256:2dc86fe0476e945e61483d614ceb2cf4f93b95282eb243bdf792621994360383 --hash=sha256:a76b2f77a560f2dc411c0254a4eb15f555e99faac48621b0f1fc9ab013944f47 # Direct dependency
 # supervisor-wildcards: licenses/BSD-3-Clause

diff --git a/python/topology/ca.py b/python/topology/ca.py
diff --git a/python/topology/config.py b/python/topology/config.py
@@ -41,7 +41,6 @@
     load_yaml_file,
     write_file,
 )
-from topology.ca import CAGenArgs, CAGenerator
 from topology.cert import CertGenArgs, CertGenerator
 from topology.common import (
     ArgsBase,
@@ -114,11 +113,8 @@ def generate_all(self):
         Generate all needed files.
         """
         self._ensure_uniq_ases()
-        ca_private_key_files, ca_cert_files, ca_certs = self._generate_cas()
         topo_dicts, self.networks, prv_networks = self._generate_topology()
         self._generate_with_topo(topo_dicts)
-        self._write_ca_files(topo_dicts, ca_private_key_files)
-        self._write_ca_files(topo_dicts, ca_cert_files)
         self._write_networks_conf(self.networks, NETWORKS_FILE)
         if self.args.bind_addr:
             self._write_networks_conf(prv_networks, PRV_NETWORKS_FILE)
@@ -143,13 +139,6 @@ def _generate_with_topo(self, topo_dicts):
         self._generate_certs_trcs(topo_dicts)
         self._generate_load_custs_sh(topo_dicts)
 
-    def _generate_cas(self):
-        ca_gen = CAGenerator(self._ca_args())
-        return ca_gen.generate()
-
-    def _ca_args(self):
-        return CAGenArgs(self.args, self.topo_config)
-
     def _generate_certs_trcs(self, topo_dicts):
         certgen = CertGenerator(self._cert_args())
         certgen.generate(topo_dicts)