Fix Python wrappers

3 files changed, 4 insertions, 18 deletions

diff --git a/src/build-data/makefile/python.in b/src/build-data/makefile/python.in
index d0e33f6e3..87c342fcf 100644
--- a/src/build-data/makefile/python.in
+++ b/src/build-data/makefile/python.in
@@ -17,10 +17,11 @@ all: $(BOTAN_PYTHON_MODDIR)/_botan.so
 
 $(BOTAN_PYTHON_MODDIR)/_botan.so: $(PYTHON_OBJS)
 	cp src/wrap/python/*.py $(BOTAN_PYTHON_MODDIR)
-	$(CXX) -shared -o $@ $(PYTHON_OBJS) -L. -L$(PYTHON_ROOT) -lbotan -lboost_python -Wl,-rpath-link,. -Wl,-soname,$@
+	$(CXX) -shared -Wl,-soname,$@ $(PYTHON_OBJS) -L. -L$(PYTHON_ROOT) -lbotan -lboost_python -o $@
 
 clean:
-	rm -f $(PYTHON_OBJS) $(BOTAN_PYTHON_MODDIR)
+        rm -rf $(BOTAN_PYTHON_MODDIR)/*
+	rm -f $(PYTHON_OBJS)
 
 install:
 	mkdir -p $(PYTHON_SITE_PACKAGE_DIR)/botan
diff --git a/src/wrap/python/filter.cpp b/src/wrap/python/filter.cpp
index 343c0831b..437c5239f 100644
--- a/src/wrap/python/filter.cpp
+++ b/src/wrap/python/filter.cpp
@@ -19,7 +19,7 @@ class Py_Filter : public Filter
 
       std::string name() const { return "Py_Filter_FIXME"; }
 
-      void write(const byte data[], u32bit length)
+      void write(const byte data[], size_t length)
          {
          write_str(std::string((const char*)data, length));
          }
diff --git a/src/wrap/python/x509.cpp b/src/wrap/python/x509.cpp
index c2c9533c8..4c248890d 100644
--- a/src/wrap/python/x509.cpp
+++ b/src/wrap/python/x509.cpp
@@ -56,16 +56,6 @@ class memvec_to_hexstr
          }
    };
 
-class X509_Store_Search_Wrap : public X509_Store::Search_Func,
-                               public python::wrapper<X509_Store::Search_Func>
-   {
-   public:
-      bool match(const X509_Certificate& cert) const
-         {
-         return this->get_override("match")(cert);
-         }
-   };
-
 BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(add_cert_ols, add_cert, 1, 2)
 BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(validate_cert_ols, validate_cert, 1, 2)
 
@@ -132,11 +122,6 @@ void export_x509()
          python::class_<X509_Store>("X509_Store")
          .def("add_cert", &X509_Store::add_cert, add_cert_ols())
          .def("validate", &X509_Store::validate_cert, validate_cert_ols())
-         .def("get_certs", &X509_Store::get_certs)
          .def("add_crl", &X509_Store::add_crl);
-
-      python::class_<X509_Store_Search_Wrap, boost::noncopyable>
-              ("Search_Func")
-         .def("match", python::pure_virtual(&X509_Store::Search_Func::match));
       }
    }