from OpenSSL import SSL
-from geni.trust.certificate import *
+from geni.trust.certificate import Keypair, Certificate
from geni.trust.credential import *
+
from geni.util.faults import *
from geni.util.api import GeniAPI
from geni.util.debug import log