[Python-modules-commits] r17139 - in packages/python-keyczar/trunk/debian (3 files)

[chrisk-guest at users.alioth.debian.org]

    Date: Tuesday, May 24, 2011 @ 22:15:06
  Author: chrisk-guest
Revision: 17139

Drop obsolete patch (included in current upstream SVN snapshot)

Modified:
  packages/python-keyczar/trunk/debian/changelog
  packages/python-keyczar/trunk/debian/patches/series
Deleted:
  packages/python-keyczar/trunk/debian/patches/0001-use-os-urandom-for-entropy.patch

Modified: packages/python-keyczar/trunk/debian/changelog
===================================================================
--- packages/python-keyczar/trunk/debian/changelog	2011-05-24 22:09:22 UTC (rev 17138)
+++ packages/python-keyczar/trunk/debian/changelog	2011-05-24 22:15:06 UTC (rev 17139)
@@ -4,6 +4,9 @@
     commits and comprises mainly bugfixes. Closes: #627727
   * debian/control:
     - Bumped Standards-Version to 3.9.2 (no changes needed)
+  * debian/patches dropped:
+    - 0001-use-os-urandom-for-entropy
+      No longer needed, the current SVN snapshot includes it
 
  -- Christian Kastner <debian at kvr.at>  Tue, 24 May 2011 23:32:56 +0200
 

Deleted: packages/python-keyczar/trunk/debian/patches/0001-use-os-urandom-for-entropy.patch
===================================================================
--- packages/python-keyczar/trunk/debian/patches/0001-use-os-urandom-for-entropy.patch	2011-05-24 22:09:22 UTC (rev 17138)
+++ packages/python-keyczar/trunk/debian/patches/0001-use-os-urandom-for-entropy.patch	2011-05-24 22:15:06 UTC (rev 17139)
@@ -1,40 +0,0 @@
-Description: Use os.urandom() to get random bytes.
-
-For gathering random data, python-keyczar uses a PyCrypto module that has been
-deprecated recently in favor of a newer solution. To this end, the old
-PyCrypto interface now a wrapper around the new solution with the addition
-that it emits a DeprecationWarning.
-
-After discussion upstream, it was decided to use os.urandom() over a PyCrypto-
-specific solution for simplicity. 
-
-Origin: upstream http://code.google.com/p/keyczar/source/detail?r=473
-Bug: http://code.google.com/p/keyczar/issues/detail?id=59
-
---- a/src/keyczar/util.py
-+++ b/src/keyczar/util.py
-@@ -22,13 +22,13 @@
- 
- import base64
- import math
-+import os
- try:
-   # Import hashlib if Python >= 2.5
-   from hashlib import sha1
- except ImportError:
-   from sha import sha as sha1
- 
--from Crypto.Util import randpool
- from pyasn1.codec.der import decoder
- from pyasn1.codec.der import encoder
- from pyasn1.type import univ
-@@ -279,7 +279,8 @@
- 
- def RandBytes(n):
-   """Return n random bytes."""
--  return randpool.RandomPool(512).get_bytes(n)
-+  # This function requires at least Python 2.4.
-+  return os.urandom(n)
- 
- def Hash(*inputs):
-   """Return a SHA-1 hash over a variable number of inputs."""

Modified: packages/python-keyczar/trunk/debian/patches/series
===================================================================
--- packages/python-keyczar/trunk/debian/patches/series	2011-05-24 22:09:22 UTC (rev 17138)
+++ packages/python-keyczar/trunk/debian/patches/series	2011-05-24 22:15:06 UTC (rev 17139)
@@ -1 +0,0 @@
-0001-use-os-urandom-for-entropy.patch