summaryrefslogtreecommitdiff
path: root/M2Crypto
diff options
context:
space:
mode:
authorHeikki Toivonen <heikki@heikkitoivonen.net>2008-07-22 06:46:50 +0000
committerHeikki Toivonen <heikki@heikkitoivonen.net>2008-07-22 06:46:50 +0000
commitcb8a655ecb39390c965665b42c2b706d70187bd5 (patch)
treeee1c7239bde400f8302c9c981021e89dce74a76e /M2Crypto
parente416aa8626e5d7d227faa10a2260dddc9b8bdcec (diff)
downloadm2crypto-cb8a655ecb39390c965665b42c2b706d70187bd5.tar.gz
X509_Store.load_info now returns the value from the underlying
m2.x509_store_load_locations call, and in case of error raises X509Error. git-svn-id: http://svn.osafoundation.org/m2crypto/trunk@610 2715db39-9adf-0310-9c64-84f055769b4b
Diffstat (limited to 'M2Crypto')
-rw-r--r--M2Crypto/X509.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/M2Crypto/X509.py b/M2Crypto/X509.py
index bc35fe1..d3a825f 100644
--- a/M2Crypto/X509.py
+++ b/M2Crypto/X509.py
@@ -743,7 +743,10 @@ class X509_Store:
return self.store
def load_info(self, file):
- m2.x509_store_load_locations(self.store, file)
+ ret = m2.x509_store_load_locations(self.store, file)
+ if ret < 1:
+ raise X509Error(Err.get_error())
+ return ret
load_locations = load_info