Merge branch 'master' into github-master

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. 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"}

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! ssh [email protected] pw: ohnah4Beix9sha7aiPo9", "title": "Exploit it!", "tags": ["Exploitation"], "points": 70, "pk": "cYIQ4Tx75WY82QiWMYF09setUvDAFvqIVpeoz7v7ROE=", "salt": "PjXezrLHjoMVS4J8ZznKY9Y/8ivwYg/q+/efBG5pOfY=", "id": "exploitit"}

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://138.197.9.129:8002/", "title": "fixed_ip", "tags": ["Web"], "points": 40, "pk": "bJn3vUZGeyVBA/L4yZiOQQcMnL0ijwAHNl6Zo76pXXg=", "salt": "eBl10Wg93p0u+CmeAIyCW3LfD6AcnqL+yfmcHzcNYrQ=", "id": "fixed_ip"}

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"}

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"}

challenges/index.json

@@ -1 +1,9 @@
-["chall1", "chall2", "chall3"]
+[
+    "encrypted",
+    "fixed_ip",
+    "hmac",
+    "p0l1sh",
+    "futuro",
+    "exploitit",
+    "matrix-gift"
+]

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"}

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"}

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()