From 69302fcd9ffdcbb19d5831e967a44342ea5c8f0d Mon Sep 17 00:00:00 2001
From: Sun Knudsen <hello@sunknudsen.com>
Date: Thu, 10 Dec 2020 07:24:56 -0500
Subject: [PATCH] Refactored ulagen.py to Python 3

---
 .../README.md                                   |   6 +++---
 .../ulagen.py                                   |  10 +++++-----
 .../ulagen.py.sig                               | Bin 566 -> 566 bytes
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/how-to-self-host-hardened-strongswan-ikev2-ipsec-vpn-server-for-ios-and-macos/README.md b/how-to-self-host-hardened-strongswan-ikev2-ipsec-vpn-server-for-ios-and-macos/README.md
index b40657b..de72117 100644
--- a/how-to-self-host-hardened-strongswan-ikev2-ipsec-vpn-server-for-ios-and-macos/README.md
+++ b/how-to-self-host-hardened-strongswan-ikev2-ipsec-vpn-server-for-ios-and-macos/README.md
@@ -231,7 +231,7 @@ $ source ~/.bashrc
 #### Install cURL and Python
 
 ```shell
-apt install -y curl python
+apt install -y curl python3
 ```
 
 #### Generate random IPv6 ULA and save to environment variables
@@ -241,8 +241,8 @@ Shout out to [Andrew Ho](https://gist.github.com/andrewlkho/31341da4f5953b8d977a
 The following command downloads and runs [ulagen.py](./ulagen.py) ([PGP signature](./ulagen.py.sig), [PGP public key](https://sunknudsen.com/sunknudsen.asc)).
 
 ```console
-$ curl -s https://sunknudsen.com/static/media/privacy-guides/how-to-self-host-hardened-strongswan-ikev2-ipsec-vpn-server-for-ios-and-macos/ulagen.py | python | grep "First subnet" | awk '{print "STRONGSWAN_IPV6_ULA="$3}' | tee -a ~/.bashrc
-STRONGSWAN_IPV6_ULA=fdcb:f7a1:38ec::/64
+$ curl -s https://sunknudsen.com/static/media/privacy-guides/how-to-self-host-hardened-strongswan-ikev2-ipsec-vpn-server-for-ios-and-macos/ulagen.py | python3 | grep "First subnet" | awk '{print "STRONGSWAN_IPV6_ULA="$3}' | tee -a ~/.bashrc
+STRONGSWAN_IPV6_ULA=fdba:8ce0:c301::/64
 
 $ source ~/.bashrc
 ```
diff --git a/how-to-self-host-hardened-strongswan-ikev2-ipsec-vpn-server-for-ios-and-macos/ulagen.py b/how-to-self-host-hardened-strongswan-ikev2-ipsec-vpn-server-for-ios-and-macos/ulagen.py
index 166c578..7cd5be1 100755
--- a/how-to-self-host-hardened-strongswan-ikev2-ipsec-vpn-server-for-ios-and-macos/ulagen.py
+++ b/how-to-self-host-hardened-strongswan-ikev2-ipsec-vpn-server-for-ios-and-macos/ulagen.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import hashlib
 import time
@@ -16,13 +16,13 @@ def time_ntpformat():
     
 def main():
   h = hashlib.sha1()
-  h.update(get_eui64() + str(time_ntpformat()))
+  h.update(str(get_eui64() + str(time_ntpformat())).encode("utf-8"))
   globalid = h.hexdigest()[0:10]
 
   prefix = ":".join(("fd" + globalid[0:2], globalid[2:6], globalid[6:10]))
-  print "Prefix:       " + prefix + "::/48"
-  print "First subnet: " + prefix + "::/64"
-  print "Last subnet:  " + prefix + ":ffff::/64"
+  print("Prefix:       " + prefix + "::/48")
+  print("First subnet: " + prefix + "::/64")
+  print("Last subnet:  " + prefix + ":ffff::/64")
 
 if __name__ == "__main__":
   main()
diff --git a/how-to-self-host-hardened-strongswan-ikev2-ipsec-vpn-server-for-ios-and-macos/ulagen.py.sig b/how-to-self-host-hardened-strongswan-ikev2-ipsec-vpn-server-for-ios-and-macos/ulagen.py.sig
index 023cfca7bd6aa77d8d8fba5c1286f19f668c6b05..fa4bdcadd4c000d403ef6c40567a87482f05d04e 100644
GIT binary patch
delta 542
zcmV+(0^$9(1hxc_BY)8AG5`t*5Fe*!hAX`j1^T!T{v(3h`0Py8RNmaNNQYQ#aB(WE
z(F{{_-eT|lCMNHgP>&jIm|6=_Uu-8_tcX^@EA0`0Ws6^eoGS<>+VBQ)nV0Xjxxf%b
zLLHo-<&kz&Yv`tSpkZA29I&qGHb}xWVkcGed6|4f0U4Y6UVnCQo5KzNQf{HYypw(7
z`WS2fLFfJ@x`z@b3EDd~m&J-V6NQu3A)4ETW;kLJEU>H1&O5~rlQ+fRWfL%vV&R_@
zrj+~Sar5~4n<R2)EHYR!3@r!8n&siOrf)ZJr6law{B*Fbx^EoY*Lo6}8+uqGAOX>4
z{~t|>GMTS<;D5ELTu(i-B)_6i&$6JjXaoLUSLws_1#JrV9WQkQc6dO~*R3^JS~_*!
zmRdU6M-#Ms6BTKW_w;A?hExSP<pwUxT&_XX1$OU<v*S-nuNrAPrG_N;(G1bR9<5J&
zONVvLB762ac{x&E?ax}ihN7z8Ig@e63|N^f;m2m3{C_2-@9|;@QcjItjK%}~#q?<=
zH)-^c7%;SX^S6>dnh?A|3i3Iblz7Y}rONlofTPw}x|K&j91lN3n1#V-rIn9tA$LC=
ziDw~M(g18$%*2+d>|G$8E6l@RK(DcYiMHGI9W+YT|HuKO(22|i{oQ5a?E_~^j)8dw
g$k_HaKo{@gu{eMf?Tg=6^OBr8pR;sqj{TeArJ)WE=l}o!

delta 542
zcmV+(0^$9(1hxc_BY!DwbpQ$p5Fe*!hAX`j1wbDV0KIs+Z7GH?fVp{*5K6;s*7TH#
zm@F`|)yCW*&YZPhgivefzA=vRVY$>I{<oEImvAZ$#H*v+?BNga)@WSOSL}++y<J+#
z@N${9R3if1Tx?|v?o~uZCLiB@kd7sR@7!LcGph8v-eYF%5`Vl1Frb{10EGV%g;ot_
zm&vuNj+w!3GRRQ&_w>^4ps~podWR$>z6e1_RYVk2OBMW2lwkZ8@=V_P8WLB6Bz*tq
zg)fi~jgIM7L8@6MzR{Y3qypUBw+B{Gm83)LeI_WQyffVtnw_FdLH~K7>q}KCJN`!!
z(t-lG(gszr6Mv8!m%2Q%_@nj%5}QeJYKK@>+@@9Jp!koo(w(WU?a^FOz{CQ#*lB8#
z76i0TYKocKgqZ}8AFh2gu^msx7!v0Qg3zJ|3)dn`58KtCVG7p*XzR7_&a5Jt<+0iw
zHPW$|Jfu}zCUN^-&|#bDZ>wv<l$JksvUn_X>lKIFSbuzK^1VZDRB^5P2aXb6`yUz}
zy3nW+r-26a@pfh9+&hZRctnE&LTfN;y&9o^WzaRh8A)ty)SeTjk9^PlxVv{|y}_z3
zidZM%RMC<_^$v86R<NH+0nt9Mn>KSLP{3thac!z$gn1e`O<n_cW>VMRJyP3)nr6hW
g#fdtz!583jEGaD@QAA6}5&mY5sv|_kPs@jXSZ>=2RR910