From 1e8f26362c93f102d4a704646610a10b00e5986b Mon Sep 17 00:00:00 2001
From: Thiago Cardoso <thiagoncc@gmail.com>
Date: Sat, 28 Jan 2017 07:44:03 -0200
Subject: [PATCH 01/11] Added challs

---
 challenges/chall1.json      |  7 -------
 challenges/chall2.json      |  7 -------
 challenges/chall3.json      |  7 -------
 challenges/encrypted.json   |  1 +
 challenges/exploitit.json   |  1 +
 challenges/fixed_ip.json    |  1 +
 challenges/futuro.json      |  1 +
 challenges/hmac.json        |  1 +
 challenges/index.json       | 10 +++++++++-
 challenges/matrix-gift.json |  1 +
 challenges/p0l1sh.json      |  1 +
 ctf                         |  4 ++--
 12 files changed, 18 insertions(+), 24 deletions(-)
 delete mode 100644 challenges/chall1.json
 delete mode 100644 challenges/chall2.json
 delete mode 100644 challenges/chall3.json
 create mode 100644 challenges/encrypted.json
 create mode 100644 challenges/exploitit.json
 create mode 100644 challenges/fixed_ip.json
 create mode 100644 challenges/futuro.json
 create mode 100644 challenges/hmac.json
 create mode 100644 challenges/matrix-gift.json
 create mode 100644 challenges/p0l1sh.json

diff --git a/challenges/chall1.json b/challenges/chall1.json
deleted file mode 100644
index 381f67f..0000000
--- a/challenges/chall1.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{"id": "chall1",
-"title": "this is chall1",
-"description": "this is a lorem ipsum challenge. Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.",
-"points": 50,
-"tags": ["rev"],
-"salt": "QUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUE=",
-"pk": "QtluMkVUZBUe0nfGW78C4D6tNKU0Ewnn/jFTvIpAOQE="}
diff --git a/challenges/chall2.json b/challenges/chall2.json
deleted file mode 100644
index d49c41b..0000000
--- a/challenges/chall2.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{"id": "chall2",
-"title": "this is chall2",
-"description": "this is a lorem ipsum challenge. Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.",
-"points": 30,
-"tags": ["rev", "xpl"],
-"salt": "QUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUE=",
-"pk": "etRmJS2PcGjWPpi/lMknbooV8gK6RB59bXeWY3IU5+o="}
diff --git a/challenges/chall3.json b/challenges/chall3.json
deleted file mode 100644
index d0a2087..0000000
--- a/challenges/chall3.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{"id": "chall3",
-"title": "this is chall3",
-"description": "this is a lorem ipsum challenge. Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.",
-"points": 30,
-"tags": ["rev", "xpl"],
-"salt": "QUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUE=",
-"pk": "KHDz2akcJ4fP6HuOg1nuAqRrLxxoYpEtq+fCtqe3MpU="}
diff --git a/challenges/encrypted.json b/challenges/encrypted.json
new file mode 100644
index 0000000..e1c2e78
--- /dev/null
+++ b/challenges/encrypted.json
@@ -0,0 +1 @@
+{"description": "PT: Voc\u00ea consegue reverter isso? Basta reverter essa string com base no bin\u00e1rio, boa sorte.  EN: Just revert this string based on the binary, good luck.  ;S=#<Or=|&u8~&EIoq&Yd@I0Z`+@dA$}-n~'F\\ct https://ctf.tecland.com.br/homologacao/encrypted.tar.gz", "title": "Encrypted", "tags": ["Reversing"], "points": 60, "pk": "mVtYzq/vX0qgvhEpFMHlizrODy/+69TtUlFEJL1VG9M=", "salt": "ag0ZFDH5eaf2suDcThqzrnk7vKVSWQoUrldqTCAostQ=", "id": "encrypted"}
\ No newline at end of file
diff --git a/challenges/exploitit.json b/challenges/exploitit.json
new file mode 100644
index 0000000..35ffcd7
--- /dev/null
+++ b/challenges/exploitit.json
@@ -0,0 +1 @@
+{"description": "PT: Voc\u00ea manja de pwn ent\u00e3o? Exploit it! :) EN: So you think you can pwn? Exploit it!  :)", "title": "Exploit it!", "tags": ["Exploitation"], "points": 70, "pk": "cYIQ4Tx75WY82QiWMYF09setUvDAFvqIVpeoz7v7ROE=", "salt": "PjXezrLHjoMVS4J8ZznKY9Y/8ivwYg/q+/efBG5pOfY=", "id": "exploitit"}
\ No newline at end of file
diff --git a/challenges/fixed_ip.json b/challenges/fixed_ip.json
new file mode 100644
index 0000000..59d9fa2
--- /dev/null
+++ b/challenges/fixed_ip.json
@@ -0,0 +1 @@
+{"description": "PT: Digite IP e porta para receber a FLAG! EN: Type IP and Port to receive the FLAG! http://IP:8002", "title": "fixed_ip", "tags": ["Web"], "points": 40, "pk": "bJn3vUZGeyVBA/L4yZiOQQcMnL0ijwAHNl6Zo76pXXg=", "salt": "eBl10Wg93p0u+CmeAIyCW3LfD6AcnqL+yfmcHzcNYrQ=", "id": "fixed_ip"}
\ No newline at end of file
diff --git a/challenges/futuro.json b/challenges/futuro.json
new file mode 100644
index 0000000..bf01f99
--- /dev/null
+++ b/challenges/futuro.json
@@ -0,0 +1 @@
+{"description": "PT: Jakko, um finland\u00eas tamb\u00e9m conhecido como \"WiZ\", escondeu um tesouro em sustenido 0x1337 no treasure.ctf-br.org. Voc\u00ea \u00e9 capaz de encontr\u00e1-lo utilizando suas net skillz? :) EN: Jakko, a finnish also known as \"WiZ\", have a hidden treasure in sustained 0x1337 at treasure.ctf-br.org. Are you capable of find it using your net skillz? :)", "title": "Futuro", "tags": ["Networking"], "points": 50, "pk": "g6Je/ZZ+wf7XwF1TOIAzbvwG7OXJbMNU6xM5KbYg8jw=", "salt": "fqHNbTGV0o8PQ25JG6neAs6yyFxHDUBc09+9gnMxztA=", "id": "futuro"}
\ No newline at end of file
diff --git a/challenges/hmac.json b/challenges/hmac.json
new file mode 100644
index 0000000..1d1d50f
--- /dev/null
+++ b/challenges/hmac.json
@@ -0,0 +1 @@
+{"description": "PT: Voc\u00ea conseguiria quebrar esse hash pra n\u00f3s? \u00c9 formado por letras min\u00fasculas e a key leetz0rs_can. Submeta com CTF-BR{palavra} EN: Can you break this hash for us? ([a-z], key -> leetz0rs_can). Add CTF-BR{word} on submission. Hash: 97a4242c5a9082e6c5920e0e3dc0b9b4", "title": "HMAC", "tags": ["Cryptography"], "points": 30, "pk": "A9MwsdbveEZsGCpVkP5twdcfWNAeXrFCrnbxk0GELbE=", "salt": "V0/7FGubNKULkFO4r4Q8CakGdzuCZ32Tr3UYYs6qnFU=", "id": "hmac"}
\ No newline at end of file
diff --git a/challenges/index.json b/challenges/index.json
index 4a2da10..1edeeeb 100644
--- a/challenges/index.json
+++ b/challenges/index.json
@@ -1 +1,9 @@
-["chall1", "chall2", "chall3"]
+[
+    "encrypted",
+    "fixed_ip",
+    "hmac",
+    "p0l1sh",
+    "futuro",
+    "exploitit",
+    "matrix-gift"
+]
diff --git a/challenges/matrix-gift.json b/challenges/matrix-gift.json
new file mode 100644
index 0000000..d039db2
--- /dev/null
+++ b/challenges/matrix-gift.json
@@ -0,0 +1 @@
+{"description": "PT: Na matrix testo meus limites e ela me recompensa. EN: In the matrix I test my skills and I'm always rewarded. https://ctf.tecland.com.br/homologacao/Matrix-Gift.tar.gz", "title": "Matrix Gift", "tags": ["Exploitation"], "points": 50, "pk": "f9Hq+0royBzlZ+LsaIB99ha059tfLBoSDJCxPdS3tyA=", "salt": "iZnUQk5/8Xlafki96En5P2FrvmvV2L9MbZ1f5mJ+QUI=", "id": "matrix-gift"}
\ No newline at end of file
diff --git a/challenges/p0l1sh.json b/challenges/p0l1sh.json
new file mode 100644
index 0000000..a404acc
--- /dev/null
+++ b/challenges/p0l1sh.json
@@ -0,0 +1 @@
+{"description": "PT: c0n3c73 n4 p0r74 d0 pr0c3554d0r XT 3m 104.219.54.49 3 pr055164. Adicione CTF-BR{} ao submeter. EN: C0n3c7 t0 XT's CPU p0r7 1n 104.219.54.49 4nd m0v3 0n. Add CTF-BR{} on submission.", "title": "p0l1sh", "tags": ["Miscellaneous"], "points": 20, "pk": "iZDJdmuJQ6Ko5duhjMkz4ac+ZV+P87oB0z2kp+NvItM=", "salt": "IyRZI4jVh7RRokW+943L5orKR27lam0qR9O6nH5tEN0=", "id": "p0l1sh"}
\ No newline at end of file
diff --git a/ctf b/ctf
index ffc9da5..faea0d8 100755
--- a/ctf
+++ b/ctf
@@ -121,8 +121,8 @@ def cmd_add_challenge(args):
     chall['description'] = description
     chall['points'] = points
     chall['tags'] = tags
-    chall['salt'] = base64.b64encode(salt)
-    chall['pk'] = base64.b64encode(pk)
+    chall['salt'] = salt
+    chall['pk'] = pk
     chall.save()
 
 

From 3cb07a465186deac5c2fda0a6faa7ace59f8b3f6 Mon Sep 17 00:00:00 2001
From: Alisson Bertochi <alisson@bertochi.com.br>
Date: Sat, 28 Jan 2017 09:59:12 -0200
Subject: [PATCH 02/11] Fix description for challenge

---
 challenges/exploitit.json | 2 +-
 challenges/fixed_ip.json  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/challenges/exploitit.json b/challenges/exploitit.json
index 35ffcd7..1c3f486 100644
--- a/challenges/exploitit.json
+++ b/challenges/exploitit.json
@@ -1 +1 @@
-{"description": "PT: Voc\u00ea manja de pwn ent\u00e3o? Exploit it! :) EN: So you think you can pwn? Exploit it!  :)", "title": "Exploit it!", "tags": ["Exploitation"], "points": 70, "pk": "cYIQ4Tx75WY82QiWMYF09setUvDAFvqIVpeoz7v7ROE=", "salt": "PjXezrLHjoMVS4J8ZznKY9Y/8ivwYg/q+/efBG5pOfY=", "id": "exploitit"}
\ No newline at end of file
+{"description": "PT: Voc\u00ea manja de pwn ent\u00e3o? Exploit it! :) EN: So you think you can pwn? Exploit it! ssh pwn1@192.241.165.203 pw: ohnah4Beix9sha7aiPo9", "title": "Exploit it!", "tags": ["Exploitation"], "points": 70, "pk": "cYIQ4Tx75WY82QiWMYF09setUvDAFvqIVpeoz7v7ROE=", "salt": "PjXezrLHjoMVS4J8ZznKY9Y/8ivwYg/q+/efBG5pOfY=", "id": "exploitit"}
diff --git a/challenges/fixed_ip.json b/challenges/fixed_ip.json
index 59d9fa2..50dc1b6 100644
--- a/challenges/fixed_ip.json
+++ b/challenges/fixed_ip.json
@@ -1 +1 @@
-{"description": "PT: Digite IP e porta para receber a FLAG! EN: Type IP and Port to receive the FLAG! http://IP:8002", "title": "fixed_ip", "tags": ["Web"], "points": 40, "pk": "bJn3vUZGeyVBA/L4yZiOQQcMnL0ijwAHNl6Zo76pXXg=", "salt": "eBl10Wg93p0u+CmeAIyCW3LfD6AcnqL+yfmcHzcNYrQ=", "id": "fixed_ip"}
\ No newline at end of file
+{"description": "PT: Digite IP e porta para receber a FLAG! EN: Type IP and Port to receive the FLAG! http://138.197.9.129:8002/", "title": "fixed_ip", "tags": ["Web"], "points": 40, "pk": "bJn3vUZGeyVBA/L4yZiOQQcMnL0ijwAHNl6Zo76pXXg=", "salt": "eBl10Wg93p0u+CmeAIyCW3LfD6AcnqL+yfmcHzcNYrQ=", "id": "fixed_ip"}

From 8f8ad286feacb44593bdf0d0f5df18f719ca25a9 Mon Sep 17 00:00:00 2001
From: Alisson Bertochi <alisson@bertochi.com.br>
Date: Sat, 28 Jan 2017 10:07:46 -0200
Subject: [PATCH 03/11] Fix description for challenge Encrypted

---
 challenges/encrypted.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/challenges/encrypted.json b/challenges/encrypted.json
index e1c2e78..66fee4d 100644
--- a/challenges/encrypted.json
+++ b/challenges/encrypted.json
@@ -1 +1 @@
-{"description": "PT: Voc\u00ea consegue reverter isso? Basta reverter essa string com base no bin\u00e1rio, boa sorte.  EN: Just revert this string based on the binary, good luck.  ;S=#<Or=|&u8~&EIoq&Yd@I0Z`+@dA$}-n~'F\\ct https://ctf.tecland.com.br/homologacao/encrypted.tar.gz", "title": "Encrypted", "tags": ["Reversing"], "points": 60, "pk": "mVtYzq/vX0qgvhEpFMHlizrODy/+69TtUlFEJL1VG9M=", "salt": "ag0ZFDH5eaf2suDcThqzrnk7vKVSWQoUrldqTCAostQ=", "id": "encrypted"}
\ No newline at end of file
+{"description": "PT: Voc\u00ea consegue reverter isso? Basta reverter essa string com base no bin\u00e1rio, boa sorte.  EN: Just revert this string based on the binary, good luck. Hash: https://goo.gl/USPE9t Bin: https://ctf.tecland.com.br/homologacao/encrypted.tar.gz", "title": "Encrypted", "tags": ["Reversing"], "points": 60, "pk": "mVtYzq/vX0qgvhEpFMHlizrODy/+69TtUlFEJL1VG9M=", "salt": "ag0ZFDH5eaf2suDcThqzrnk7vKVSWQoUrldqTCAostQ=", "id": "encrypted"}

From 73fa2def78a5be56f618261372bc4cd4543e8990 Mon Sep 17 00:00:00 2001
From: Paulo Matias <paulo.matias@usp.br>
Date: Sat, 28 Jan 2017 10:09:27 -0200
Subject: [PATCH 04/11] Update README.md

---
 README.md | 59 ++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 37 insertions(+), 22 deletions(-)

diff --git a/README.md b/README.md
index c248d9c..c8488ba 100644
--- a/README.md
+++ b/README.md
@@ -1,38 +1,53 @@
 # Platform Test Edition
 
-Welcome to the Pwn2Win CTF platform test edition.
+Welcome to the Pwn2Win CTF **Platform Test Edition**.
 
 ## Registration
 
-1- All team members must have a github account and a configured ssh key
+1. All team members must have a GitHub account and [configure a SSH key in their account settings](https://github.com/settings/keys).
+
+   **Note**: If you prefer team members to stay anonymous, you can create a single GitHub account for the entire team and share its credentials.
+   
+2. All team members must have the git client [correctly set up](https://git-scm.com/book/en/v2/Getting-Started-First-Time-Git-Setup). If you have never used git before, run:
+   ```bash
+   git config --global user.name "John Doe"
+   git config --global user.email johndoe@example.com
+   ```
+   
+2. All team members must clone the repository and install the dependencies:
+   ```bash
+   git clone git@github.com:pwn2winctf/PTE.git
+   cd PTE
+   sudo -H pip install -r pip-requirements.txt
+   ```
+
+3. Test if you can see the help menu:
+  ```bash
+  ./ctf -h
+  ```
+  **Note**: If you have problems with pysodium, you should install libsodium18 (e.g, https://packages.debian.org/sid/libsodium18)
+
+4. The leader of the team must execute the following command and follow the instructions to register the team:
+  ```bash
+  ./ctf init
+  ```
+
+5. After that, the leader shares `team-secrets.json` with the members of the team and they are ready to go :)
 
-2- All team members must clone the repository and install the dependencies:
-```bash
-git clone git@github.com:pwn2winctf/PTE.git
-cd PTE
-pip install -r pip-requirements.txt
-```
+## Challenges
 
-3- Test if you can see the help menu:
-```bash
-./ctf -h
-```
-- Note: If you have problems with pysodium, you should install libsodium18 (e.g, https://packages.debian.org/sid/libsodium18)
+Challenges are available on https://pwn2winctf.github.io.
 
-4- The leader of the team must execute the following command and follow the instructions to register the team:
+If you prefer to browse them locally, you may also run a local webserver by typing `make`, or list challenges through the command line interface:
 ```bash
-./ctf init
+./ctf challs
 ```
 
-5- After that, the leader shares team-secrets.json with the members team and they are ready to go :)
-
-## Challenges
-
-The challenge instructions are located in the *challenges* directory.
-
 ## Flag submission
 
 To submit a flag:
 ```bash
-./ctf submit 'CTF-BR{flag123}'
+./ctf submit --chall chall-id 'CTF-BR{flag123}'
 ```
+
+You may omit `--chall chall-id` from the command, however it will be slower to run this way. In this case, we will look for the flag in every challenge released until now.

From 0a026badd513d1784e4bf1197abf3500ad2848b3 Mon Sep 17 00:00:00 2001
From: Paulo Matias <paulo.matias@usp.br>
Date: Sat, 28 Jan 2017 10:12:02 -0200
Subject: [PATCH 05/11] Update README.md

---
 README.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/README.md b/README.md
index c8488ba..81734ea 100644
--- a/README.md
+++ b/README.md
@@ -51,3 +51,12 @@ To submit a flag:
 ```
 
 You may omit `--chall chall-id` from the command, however it will be slower to run this way. In this case, we will look for the flag in every challenge released until now.
+
+## Scoreboard
+
+Currently, the scoreboard is only available through the command line interface:
+```bash
+./ctf score --names --pull
+```
+
+However we plan to make it available through the web interface in a future release.

From e5d6eadedf4b27e2b1ee7e8121912ff9a2950ad8 Mon Sep 17 00:00:00 2001
From: Paulo Matias <paulo.matias@usp.br>
Date: Sat, 28 Jan 2017 10:15:39 -0200
Subject: [PATCH 06/11] Update README.md

Clarify libsodium
---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 81734ea..b14268d 100644
--- a/README.md
+++ b/README.md
@@ -18,6 +18,7 @@ Welcome to the Pwn2Win CTF **Platform Test Edition**.
    ```bash
    git clone git@github.com:pwn2winctf/PTE.git
    cd PTE
+   sudo apt-get install libsodium18
    sudo -H pip install -r pip-requirements.txt
    ```
 
@@ -25,7 +26,7 @@ Welcome to the Pwn2Win CTF **Platform Test Edition**.
   ```bash
   ./ctf -h
   ```
-  **Note**: If you have problems with pysodium, you should install libsodium18 (e.g, https://packages.debian.org/sid/libsodium18)
+  **Note**: If you have installed `libsodium13`, you may have problems with pysodium. In this case, you should install `libsodium18` (e.g. https://packages.debian.org/sid/libsodium18)
 
 4. The leader of the team must execute the following command and follow the instructions to register the team:
   ```bash

From fcde1d64358eb175c297d304033cc97bf3d1343e Mon Sep 17 00:00:00 2001
From: Paulo Matias <paulo.matias@usp.br>
Date: Sat, 28 Jan 2017 10:41:17 -0200
Subject: [PATCH 07/11] Update README.md

Add reference to backports PPA
---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index b14268d..6b21bab 100644
--- a/README.md
+++ b/README.md
@@ -21,12 +21,12 @@ Welcome to the Pwn2Win CTF **Platform Test Edition**.
    sudo apt-get install libsodium18
    sudo -H pip install -r pip-requirements.txt
    ```
-
-3. Test if you can see the help menu:
+   **Note**: If you are using Ubuntu 14.04, add [ppa:elt/libsodium](https://launchpad.net/~elt/+archive/ubuntu/libsodium) to your system to be able to install `libsodium18`. If you are using Debian, you need to get the package from [sid](https://packages.debian.org/sid/libsodium18).
+  
+3. If dependencies are installed correctly, you should now see the help menu when calling:
   ```bash
   ./ctf -h
   ```
-  **Note**: If you have installed `libsodium13`, you may have problems with pysodium. In this case, you should install `libsodium18` (e.g. https://packages.debian.org/sid/libsodium18)
 
 4. The leader of the team must execute the following command and follow the instructions to register the team:
   ```bash

From be778be40eac0ecf0c06b4210b2e5cf0ceb3a3fd Mon Sep 17 00:00:00 2001
From: Paulo Matias <paulo.matias@usp.br>
Date: Sat, 28 Jan 2017 10:50:40 -0200
Subject: [PATCH 08/11] Update README.md

---
 README.md | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 6b21bab..53c8a90 100644
--- a/README.md
+++ b/README.md
@@ -24,16 +24,21 @@ Welcome to the Pwn2Win CTF **Platform Test Edition**.
    **Note**: If you are using Ubuntu 14.04, add [ppa:elt/libsodium](https://launchpad.net/~elt/+archive/ubuntu/libsodium) to your system to be able to install `libsodium18`. If you are using Debian, you need to get the package from [sid](https://packages.debian.org/sid/libsodium18).
   
 3. If dependencies are installed correctly, you should now see the help menu when calling:
-  ```bash
-  ./ctf -h
-  ```
-
-4. The leader of the team must execute the following command and follow the instructions to register the team:
-  ```bash
-  ./ctf init
-  ```
+   ```bash
+   ./ctf -h
+   ```
 
-5. After that, the leader shares `team-secrets.json` with the members of the team and they are ready to go :)
+4. The **leader of the team** must execute the following command and follow the instructions to register the team:
+   ```bash
+   ./ctf init
+   ```
+  
+5. The **other members of the team** must login to GitHub without registering a new team, by running:
+   ```bash
+   ./ctf login
+   ```
+   
+6. After that, **the leader** must share the `team-secrets.json` with the members of the team. The **other members of the team** must place the `team-secrets.json` file shared by the leader in their `PTE` directory.
 
 ## Challenges
 

From 52a3d665a4a65d62baec9eca902d3065e000b769 Mon Sep 17 00:00:00 2001
From: Paulo Matias <paulo.matias@usp.br>
Date: Sat, 28 Jan 2017 11:00:56 -0200
Subject: [PATCH 09/11] Add target for updating AWS lambda function

---
 Makefile | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Makefile b/Makefile
index 0ab259d..f2f503b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,2 +1,8 @@
 all:
 	python -m SimpleHTTPServer 8080
+
+../lambda.zip: FORCE
+	rm -f "$@"
+	zip -ry "$@" * .git*
+
+FORCE:

From 78861d1048dd4f71fea00bdab3f631d8907dbd9e Mon Sep 17 00:00:00 2001
From: Paulo Matias <paulo.matias@usp.br>
Date: Sat, 28 Jan 2017 11:18:47 -0200
Subject: [PATCH 10/11] Silence warnings by disabling CheckHostIP

---
 lambda_function.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lambda_function.py b/lambda_function.py
index 35f4389..25e2fc4 100644
--- a/lambda_function.py
+++ b/lambda_function.py
@@ -92,7 +92,8 @@ def setup_environment():
 
     ssh_config = os.path.join(ssh_dir, 'config')
     with open(ssh_config, 'w') as f:
-        f.write('StrictHostKeyChecking yes\n'
+        f.write('CheckHostIP no\n'
+                'StrictHostKeyChecking yes\n'
                 'IdentityFile %s\n'
                 'UserKnownHostsFile %s\n' %
                 (ssh_identity, os.path.join(root, 'known_hosts')))

From 672db1e07fedc3b60471e3a1f19abb700825af16 Mon Sep 17 00:00:00 2001
From: Paulo Matias <paulo.matias@usp.br>
Date: Sat, 28 Jan 2017 11:24:13 -0200
Subject: [PATCH 11/11] More sanity checks

---
 nizkctf/acceptedsubmissions.py | 3 +++
 nizkctf/proposal.py            | 7 ++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/nizkctf/acceptedsubmissions.py b/nizkctf/acceptedsubmissions.py
index 055712f..c68bb63 100644
--- a/nizkctf/acceptedsubmissions.py
+++ b/nizkctf/acceptedsubmissions.py
@@ -21,6 +21,9 @@ def path(self):
         return SubRepo.get_path(ACCEPTED_SUBMISSIONS_FILE)
 
     def add(self, chall_id, points, team_id):
+        if (chall_id, team_id) in ((s['chall'], s['team']) for s in self):
+            # Challenge already submitted by team
+            return
         self.append({"chall": chall_id,
                      "points": points,
                      "team": team_id,
diff --git a/nizkctf/proposal.py b/nizkctf/proposal.py
index 8c8fe62..900996d 100644
--- a/nizkctf/proposal.py
+++ b/nizkctf/proposal.py
@@ -124,7 +124,8 @@ def accept_proposal(merge_info):
 def retry_push(commit_message, retries=PUSH_RETRIES):
     for retry in range(retries):
         try:
-            SubRepo.git(['reset', '--hard', 'origin/master'])
+            checkout('master')
+            SubRepo.git(['reset', '--hard', 'upstream/master'])
             SubRepo.pull()
             yield retry  # do local modifications
             SubRepo.push(commit_message, merge_request=False)
@@ -142,7 +143,7 @@ def filename_owner(filename):
 def add_proposal_remote(merge_info):
     url = merge_info['source_ssh_url']
     SubRepo.git(['remote', 'add', 'proposal', url])
-    SubRepo.git(['fetch', 'proposal'])
+    SubRepo.git(['fetch', '--all'])
 
 
 def setup_user_name_and_email():
@@ -226,6 +227,6 @@ def check_diff_size(src, dest):
 
 
 def get_merge_base(commit):
-    merge_base = SubRepo.git(['merge-base', 'origin/master', commit],
+    merge_base = SubRepo.git(['merge-base', 'upstream/master', commit],
                              stdout=subprocess.PIPE).strip()
     return merge_base