Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(107)

Unified Diff: third_party/tlslite/tlslite/utils/openssl_rc4.py

Issue 210323002: Update tlslite to 0.4.6. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Executable bit and --similarity=80 Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/tlslite/tlslite/utils/openssl_rc4.py
diff --git a/third_party/tlslite/tlslite/utils/openssl_rc4.py b/third_party/tlslite/tlslite/utils/openssl_rc4.py
index 2dc5adbe22febfd745513d3301ee391a25202cc8..2fbfa07e2bc3673b74ea4a158cbdab187b9af4e0 100644
--- a/third_party/tlslite/tlslite/utils/openssl_rc4.py
+++ b/third_party/tlslite/tlslite/utils/openssl_rc4.py
@@ -1,7 +1,10 @@
+# Author: Trevor Perrin
+# See the LICENSE file for legal information regarding use of this file.
+
"""OpenSSL/M2Crypto RC4 implementation."""
-from cryptomath import *
-from rc4 import RC4
+from .cryptomath import *
+from .rc4 import RC4
if m2cryptoLoaded:
@@ -19,7 +22,7 @@ if m2cryptoLoaded:
m2.rc4_free(self.rc4)
def encrypt(self, plaintext):
- return m2.rc4_update(self.rc4, plaintext)
+ return bytearray(m2.rc4_update(self.rc4, plaintext))
def decrypt(self, ciphertext):
- return self.encrypt(ciphertext)
+ return bytearray(self.encrypt(ciphertext))
« no previous file with comments | « third_party/tlslite/tlslite/utils/openssl_aes.py ('k') | third_party/tlslite/tlslite/utils/openssl_rsakey.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698