[Pkg-privacy-commits] [obfsproxy] 51/353: Removed obsolete references to uncompact, decode, and encode

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository obfsproxy.

commit 4be14dd4c0b9d437916f0ef4111bd7102241aa2a
Author: Brandon Wiley <brandon at blanu.net>
Date:   Mon Sep 3 18:37:58 2012 -0500

    Removed obsolete references to uncompact, decode, and encode
---
 src/obfsproxy/transports/obfs2.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/obfsproxy/transports/obfs2.py b/src/obfsproxy/transports/obfs2.py
index 3039a48..d256d4f 100644
--- a/src/obfsproxy/transports/obfs2.py
+++ b/src/obfsproxy/transports/obfs2.py
@@ -13,7 +13,6 @@ import hashlib
 import base64
 
 from obfsproxy.crypto.aes import AESCoder
-from obfsproxy.util import decode, uncompact
 from obfsproxy.transports.base import BaseDaemon
 
 MAGIC_VALUE = decode('2BF5CA7E')
@@ -96,7 +95,6 @@ def mac(s, x):
 
     return h(s + x + s)
 
-
 class Obfs2Daemon(BaseDaemon):
 
     """
@@ -149,7 +147,7 @@ class Obfs2Daemon(BaseDaemon):
 
         if state == STREAM:
             data = self.downstreamConnection.read_some()
-            encodedData = encode(data)
+            encodedData = e(padKey, data)
             self.upstreamConnection.write(encodedData)
 
     def receivedUpstream(self):
@@ -215,7 +213,7 @@ class Obfs2Daemon(BaseDaemon):
                         self.otherKey)
         elif state == STREAM:
             data = self.upstreamConnection.read_some()
-            decodedData = decode(data)
+            decodedData = d(padKey, data)
             self.downstreamConnection.write(decodedData)
 
     def derivePadKey(self, seed, padString):

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/obfsproxy.git