Merge in initial fixes

svn path=/pow/POW-0.7/lib/_der.py; revision=724

4 files changed, 18 insertions, 16 deletions

diff --git a/pow/POW-0.7/lib/_der.py b/pow/POW-0.7/lib/_der.py
index 590185c4..0a7a60c2 100644
--- a/pow/POW-0.7/lib/_der.py
+++ b/pow/POW-0.7/lib/_der.py
@@ -137,7 +137,7 @@ class DerError(Exception):
 
    __str__ = __repr__
 
-class _Tag:
+class _Tag(object):
    def __init__(self):
       self.tagclass = 0
       self.tagform = 0
@@ -179,7 +179,7 @@ class _Tag:
                total = (total << 7) | byte
          self.tagnumber = total
  
-class _Length:
+class _Length(object):
    def __init__(self):
       self.length = 0
 
@@ -443,7 +443,7 @@ _addFragment('''
 </class>
 ''')
 
-class _GeneralObject:
+class _GeneralObject(object):
 
    _addFragment('''
    <constructor>
@@ -1982,7 +1982,7 @@ _addFragment('''
    </body>
 </class>
 ''')
-class Choice:
+class Choice(object):
 
    _addFragment('''
    <constructor>
diff --git a/pow/POW-0.7/lib/_simpledb.py b/pow/POW-0.7/lib/_simpledb.py
index ed5d20fa..190e96be 100755
--- a/pow/POW-0.7/lib/_simpledb.py
+++ b/pow/POW-0.7/lib/_simpledb.py
@@ -36,7 +36,7 @@
 
 import _oids, _objects, types
 
-class OidData:
+class OidData(object):
    def __init__(self):
       self.oids = _oids.data
       self.objs = _objects.data
diff --git a/pow/POW-0.7/lib/pkix.py b/pow/POW-0.7/lib/pkix.py
index 9d2b7ca5..184fdeed 100755
--- a/pow/POW-0.7/lib/pkix.py
+++ b/pow/POW-0.7/lib/pkix.py
@@ -1666,9 +1666,9 @@ class Extension(Sequence):
          extnObj = self.classMap[oid]()
       else:
          if critical:
-            raise DerError, 'failed to read critical extension %s' % oid
+            raise DerError, 'failed to read critical extension %s' % str(oid)
          else:
-            return (name, critical, ())
+            return (oid, critical, ())
 
       try:
          extnObj = self.classMap[oid]()
diff --git a/pow/POW-0.7/setup.py b/pow/POW-0.7/setup.py
index 13fc34dd..9ba4efc4 100644
--- a/pow/POW-0.7/setup.py
+++ b/pow/POW-0.7/setup.py
@@ -1,3 +1,8 @@
+# [sra] Changes here are specific to the RPKI project, in order to get POW linked
+#       against a copy of the OpenSSL libraries with the right options enabled.
+#       Unlike the other changes to this package, I don't expect this one to be
+#       useful to other POW users.
+
 from distutils.core import setup, Extension
 import sys, os, cfgparse
 
@@ -8,14 +13,10 @@ oidinfo.dumpobjs('lib/_objects.py')
 print 'writing oid module'
 oidinfo.dumpoids('lib/_oids.py')
 
-if sys.platform == 'win32':
-    library_dirs = [ os.path.join(sys.prefix, 'bin') ]
-    libraries = [ 'ssleay32', 'libeay32' ]
-else:
-    library_dirs = [ os.path.join(sys.prefix, 'lib') ]
-    libraries = [ 'ssl', 'crypto' ]
-
-include_dirs = [os.path.join(sys.prefix, 'include')]
+library_dirs = [ "../openssl/openssl-0.9.8e" ]
+include_dirs = [ library_dirs[0] + "include" ]
+libraries    = [ "ssl", "crypto" ]
+define_macros= [ ("NO_RC5_32_12_16", 1) ]
 
 setup(name='POW',
       version='0.7',
@@ -31,7 +32,8 @@ setup(name='POW',
                         ['POW.c'], 
                         libraries=libraries,
                         library_dirs=library_dirs,
-                        include_dirs=include_dirs )
+                        include_dirs=include_dirs,
+                        define_macros=define_macros)
                   ])
 
 os.remove('lib/_objects.py')