From b091bad77d269e22dfc274f8fdd6157072d4194d Mon Sep 17 00:00:00 2001
From: MunyDev <jeffplays1292@gmail.com>
Date: Fri, 9 Aug 2024 01:55:16 -0400
Subject: [PATCH] moved to src directory plus new features

---
 .gitignore                             |   4 ++-
 Makefile                               |   3 ++-
 generate_new_pbs.py                    |  16 ------------
 myCA.der                               | Bin 0 -> 879 bytes
 src/root_store_gen/generate_new_pbs.py |  34 +++++++++++++++++++++++++
 src/root_store_gen/print_pb.py         |   9 +++++++
 6 files changed, 48 insertions(+), 18 deletions(-)
 delete mode 100644 generate_new_pbs.py
 create mode 100644 myCA.der
 create mode 100644 src/root_store_gen/generate_new_pbs.py
 create mode 100644 src/root_store_gen/print_pb.py

diff --git a/.gitignore b/.gitignore
index fe1528e..7f017d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
 .venv
 __pycache__
 gen
-original
\ No newline at end of file
+original
+out
+*pb2.py
\ No newline at end of file
diff --git a/Makefile b/Makefile
index caa0832..d4150d5 100644
--- a/Makefile
+++ b/Makefile
@@ -4,4 +4,5 @@ setup-venv:
 setup-python:
 	mkdir -p gen/python
 	protoc --python_out=gen/python crs.proto
-	exit
\ No newline at end of file
+	cp gen/python/crs_pb2.py src/root_store_gen
+	exit
diff --git a/generate_new_pbs.py b/generate_new_pbs.py
deleted file mode 100644
index da4ab3d..0000000
--- a/generate_new_pbs.py
+++ /dev/null
@@ -1,16 +0,0 @@
-import sys
-import os.path as path
-import pathlib
-import importlib.util
-import sys
-import crs_pb2
-def usage():
-    print("Usage: <proto input> <proto output>")
-cwd = path.dirname(path.abspath(sys.argv[0]))
-if len(sys.argv) < 2:
-    usage()
-    exit(-1)
-buf= open(sys.argv[1], 'rb')
-rs = crs_pb2.RootStore()
-rs.ParseFromString(buf.read())
-print(rs.trust_anchors[0])
\ No newline at end of file
diff --git a/myCA.der b/myCA.der
new file mode 100644
index 0000000000000000000000000000000000000000..46da4a5e55e0aeb75fed37303b4ad492543200ae
GIT binary patch
literal 879
zcmXqLV$L>bVhUcs%*4pVBoc9}>7L4>>Z<k21cXfu3=P)IdbZ4fmyJ`a&7<u*FC!y2
zD}#ZnA-4f18*?ZNn=q4OsG+cdAc(`k!xfyLo2naJl30>zsAwP$66E5M@XRYoEy_zR
zQ3%gWNzW`PRtPAmRPZTDF_07IH8L?UH#9diF)}o<i~@2kfm|~vms-{|F)AT@fRUAf
zxrvdV!Jvtei>Zl`kzu3Ar7rvRyF-jmes7R(`JbTj^Yx9T%-Wox)6Vla+e~qq`reRn
z+IqRiHy`}63jE7+XUZ}yK_d$eewVJ3MNiufZhkp&SIYLqb1UbY9_R}Rn9{=~@2b&#
z@mx^#w$8^@)!H8w*ge%Yra!u}ebSQp<hA@SWK&lv{J(KOped};r)=6gQ?K_m>lAC5
z7Ynsq;7+ot+`*^Qc3Y_3edo%@k<5!_D(a<Qh0JL<x;v0F%J-Dqa^cd<#SX5zT2EGN
z-xbLvCnojV{9+Qz<CWK6Em=}wQ>xK3r=`hQV%@nPLb1Ca`ya1o(YG@Gq~)>NF?mI@
zl37;R46ALSc^53!zFs`1>G2mC9lvNMW=00a#lZ%F2C~2yljUO(V-b1&WcKeV20M(~
zqq!UZuXv%qs;;dQ9HFwxED{D{4cHa%gY*kCGX7^_HDCr($iWUwH^5+LWGK%S-r||P
z_feVjj0Z}B2fs_LZ=QZ3bV*IUi9efx;RLRXe2$n^YxHfG?%w`|PpN-;9Oq>9j|YP*
zihuqwJaGK{XTHS~?{8lD;DquDKEba?rO)e}cw~7g?<RBi!K<=dVPzHzx7_~nHAm(z
zd;C<cuHRKv54R;R6xQLb)tY5t>LWdahxNy$07hf4?e}UoygjI8#h{VVrJHFZ((PVU
z9w)xJ&E|XM_NnJGBHtX^Gi$P}+LTT6oEI7heLUe*yuoX>-mh;iS1!qDmRP<H+3Yv-
zt<+qL|2LcdT;YGx@Sa!Xbz0`S2vO#9GtTrq<b7XK%(<*FcV*J)C<88Un>og|3L*Dx
Ibr%Q&0N8y~Y5)KL

literal 0
HcmV?d00001

diff --git a/src/root_store_gen/generate_new_pbs.py b/src/root_store_gen/generate_new_pbs.py
new file mode 100644
index 0000000..d7f9f53
--- /dev/null
+++ b/src/root_store_gen/generate_new_pbs.py
@@ -0,0 +1,34 @@
+import sys
+import os.path as path
+import pathlib
+import importlib.util
+import sys
+import crs_pb2
+def usage():
+    print("Usage: <proto input> <new ca key>... <proto output>")
+cwd = path.dirname(path.abspath(sys.argv[0]))
+if len(sys.argv) < 4:
+    usage()
+    exit(-1)
+cas = []
+for a in sys.argv[2:-1:]:
+    print(f"Registering CA from {a}")
+    cas.append(a)
+outfile = sys.argv[-1]
+print(f"Outputing to: {outfile}")
+out = open(outfile, 'wb')
+buf= open(sys.argv[1], 'rb')
+rs = crs_pb2.RootStore()
+rs.ParseFromString(buf.read())
+for ca in cas:
+    with open(ca, 'rb') as file:
+        print(f"Loading Certificate Authority {ca} into rootstore")
+        der = file.read()
+        next_trust_anchor = crs_pb2.TrustAnchor()
+        next_trust_anchor.Clear()
+        next_trust_anchor.der = der
+        next_trust_anchor.display_name = "Success!"
+        print(next_trust_anchor.constraints)
+        rs.trust_anchors.append(next_trust_anchor)
+out.write(rs.SerializeToString())
+out.close()
\ No newline at end of file
diff --git a/src/root_store_gen/print_pb.py b/src/root_store_gen/print_pb.py
new file mode 100644
index 0000000..634305a
--- /dev/null
+++ b/src/root_store_gen/print_pb.py
@@ -0,0 +1,9 @@
+import crs_pb2
+import sys
+if (len(sys.argv) < 2):
+    print("Usage: <chrome root store protobuf file>")
+    exit(-1)
+rs = crs_pb2.RootStore()
+with open(sys.argv[1], 'rb') as f:
+    rs.ParseFromString(f.read())
+    print(rs)