File size: 4,755 Bytes
5980447 |
1 2 |
{"repo": "SpockBotMC/SpockBot", "pull_number": 81, "instance_id": "SpockBotMC__SpockBot-81", "issue_numbers": "", "base_commit": "c0cf152824695a03d1c5a358e807c452e2d8bce9", "patch": "diff --git a/setup.py b/setup.py\n--- a/setup.py\n+++ b/setup.py\n@@ -12,7 +12,7 @@\n url='https://github.com/SpockBotMC/SpockBot',\n packages=find_packages(exclude=['tests', 'tests.*']),\n install_requires=[\n- 'PyCrypto >= 2.6.1',\n+ 'cryptography >= 0.9',\n 'six',\n ],\n keywords=['minecraft'],\ndiff --git a/spock/plugins/core/auth.py b/spock/plugins/core/auth.py\n--- a/spock/plugins/core/auth.py\n+++ b/spock/plugins/core/auth.py\n@@ -12,10 +12,11 @@\n import urllib2 as request\n from urllib2 import URLError\n import logging\n+import os\n \n-from Crypto import Random\n-from Crypto.Cipher import PKCS1_v1_5\n-from Crypto.PublicKey import RSA\n+from cryptography.hazmat.backends import default_backend\n+from cryptography.hazmat.primitives import serialization\n+from cryptography.hazmat.primitives.asymmetric import padding\n \n from spock.mcp import yggdrasil\n from spock.plugins.base import PluginBase\n@@ -23,6 +24,7 @@\n \n \n logger = logging.getLogger('spock')\n+backend = default_backend()\n \n \n # This function courtesy of barneygale\n@@ -67,7 +69,7 @@ def start_session(self, username, password=''):\n return rep\n \n def gen_shared_secret(self):\n- self.shared_secret = Random._UserFriendlyRNG.get_random_bytes(16)\n+ self.shared_secret = os.urandom(16)\n return self.shared_secret\n \n \n@@ -101,12 +103,12 @@ def handle_session_error(self, name, data):\n \n # Encryption Key Request - Request for client to start encryption\n def handle_encryption_request(self, name, packet):\n- pubkey = packet.data['public_key']\n+ pubkey_raw = packet.data['public_key']\n if self.authenticated:\n serverid = java_hex_digest(hashlib.sha1(\n packet.data['server_id'].encode('ascii')\n + self.auth.shared_secret\n- + pubkey\n+ + pubkey_raw\n ))\n logger.info(\n \"AUTHPLUGIN: Attempting to authenticate session with \"\n@@ -127,13 +129,13 @@ def handle_encryption_request(self, name, packet):\n logger.warning(\"AUTHPLUGIN: %s\", rep)\n logger.info(\"AUTHPLUGIN: Session authentication successful\")\n \n- rsa_cipher = PKCS1_v1_5.new(RSA.importKey(pubkey))\n+ pubkey = serialization.load_der_public_key(pubkey_raw, backend)\n+ encrypt = lambda data: pubkey.encrypt(data, padding.PKCS1v15())\n self.net.push_packet(\n 'LOGIN>Encryption Response',\n {\n- 'shared_secret': rsa_cipher.encrypt(self.auth.shared_secret),\n- 'verify_token': rsa_cipher.encrypt(\n- packet.data['verify_token']),\n+ 'shared_secret': encrypt(self.auth.shared_secret),\n+ 'verify_token': encrypt(packet.data['verify_token']),\n }\n )\n self.net.enable_crypto(self.auth.shared_secret)\ndiff --git a/spock/plugins/core/net.py b/spock/plugins/core/net.py\n--- a/spock/plugins/core/net.py\n+++ b/spock/plugins/core/net.py\n@@ -9,7 +9,9 @@\n import socket\n import time\n \n-from Crypto.Cipher import AES\n+from cryptography.hazmat.backends import default_backend\n+from cryptography.hazmat.primitives import ciphers\n+from cryptography.hazmat.primitives.ciphers import algorithms, modes\n \n from spock import utils\n from spock.mcp import mcdata, mcpacket\n@@ -17,21 +19,22 @@\n from spock.utils import pl_announce\n \n logger = logging.getLogger('spock')\n+backend = default_backend()\n \n \n class AESCipher(object):\n def __init__(self, shared_secret):\n+ cipher = ciphers.Cipher(algorithms.AES(shared_secret),\n+ modes.CFB8(shared_secret), backend)\n # Name courtesy of dx\n- self.encryptifier = AES.new(shared_secret, AES.MODE_CFB,\n- IV=shared_secret)\n- self.decryptifier = AES.new(shared_secret, AES.MODE_CFB,\n- IV=shared_secret)\n+ self.encryptifier = cipher.encryptor()\n+ self.decryptifier = cipher.decryptor()\n \n def encrypt(self, data):\n- return self.encryptifier.encrypt(data)\n+ return self.encryptifier.update(data)\n \n def decrypt(self, data):\n- return self.decryptifier.decrypt(data)\n+ return self.decryptifier.update(data)\n \n \n class SelectSocket(socket.socket):\n", "test_patch": "", "problem_statement": "", "hints_text": "", "created_at": "2015-08-15T23:56:37Z"}
|