From 2723a0e5739412953f60c37d0dab81d684ba5f26 Mon Sep 17 00:00:00 2001
From: Maximilian Hils <git@maximilianhils.com>
Date: Fri, 26 Jun 2015 13:26:35 +0200
Subject: remove certffi

---
 netlib/certffi.py   | 41 -----------------------------------------
 netlib/certutils.py |  6 ------
 2 files changed, 47 deletions(-)
 delete mode 100644 netlib/certffi.py

(limited to 'netlib')

diff --git a/netlib/certffi.py b/netlib/certffi.py
deleted file mode 100644
index 451f4493..00000000
--- a/netlib/certffi.py
+++ /dev/null
@@ -1,41 +0,0 @@
-from __future__ import (absolute_import, print_function, division)
-from cffi import FFI
-import OpenSSL
-
-xffi = FFI()
-xffi.cdef("""
-    struct rsa_meth_st {
-            int flags;
-            ...;
-    };
-    struct rsa_st {
-            int pad;
-            long version;
-            struct rsa_meth_st *meth;
-            ...;
-    };
-""")
-xffi.verify(
-    """#include <openssl/rsa.h>""",
-    extra_compile_args=['-w']
-)
-
-
-def handle(privkey):
-    new = xffi.new("struct rsa_st*")
-    newbuf = xffi.buffer(new)
-    rsa = OpenSSL.SSL._lib.EVP_PKEY_get1_RSA(privkey._pkey)
-    oldbuf = OpenSSL.SSL._ffi.buffer(rsa)
-    newbuf[:] = oldbuf[:]
-    return new
-
-
-def set_flags(privkey, val):
-    hdl = handle(privkey)
-    hdl.meth.flags = val
-    return privkey
-
-
-def get_flags(privkey):
-    hdl = handle(privkey)
-    return hdl.meth.flags
diff --git a/netlib/certutils.py b/netlib/certutils.py
index c6f0e628..c699af00 100644
--- a/netlib/certutils.py
+++ b/netlib/certutils.py
@@ -333,12 +333,6 @@ class CertStore(object):
 
         return entry.cert, entry.privatekey, entry.chain_file
 
-    def gen_pkey(self, cert_):
-        # FIXME: We should do something with cert here?
-        from . import certffi
-        certffi.set_flags(self.default_privatekey, 1)
-        return self.default_privatekey
-
 
 class _GeneralName(univ.Choice):
     # We are only interested in dNSNames. We use a default handler to ignore
-- 
cgit v1.2.3