summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorHeikki Toivonen <heikki@heikkitoivonen.net>2005-05-17 21:20:19 +0000
committerHeikki Toivonen <heikki@heikkitoivonen.net>2005-05-17 21:20:19 +0000
commit0c8c5972371b4f1a50f7e6e1e9c44e45629065e7 (patch)
treecd25407a1cc466319b792626dff94c7e3f1a08c8 /contrib
parentef852477d647b0d9f499d8d452bf1fa261f17e3d (diff)
downloadm2crypto-0c8c5972371b4f1a50f7e6e1e9c44e45629065e7.tar.gz
Bug 1701, eliminate C pointers from interfaces and use M2Crypto objects instead. Also some cleanup and minor stuff.
git-svn-id: http://svn.osafoundation.org/m2crypto/trunk@279 2715db39-9adf-0310-9c64-84f055769b4b
Diffstat (limited to 'contrib')
-rw-r--r--contrib/SimpleX509create.py15
1 files changed, 5 insertions, 10 deletions
diff --git a/contrib/SimpleX509create.py b/contrib/SimpleX509create.py
index 5f439df..7f5fc67 100644
--- a/contrib/SimpleX509create.py
+++ b/contrib/SimpleX509create.py
@@ -5,8 +5,6 @@
"""PKI demo by Peter Teniz <peter.teniz@inverisa.net>"""
-import sys, os, re
-import StringIO
import M2Crypto
@@ -65,7 +63,7 @@ class Cert:
X509Name.add_entry_by_txt ( field='Email', type=MBSTRING_ASC, entry='user@localhost', len=-1, loc=-1, set=0 ) # pkcs9 email address
X509Name.add_entry_by_txt ( field='emailAddress', type=MBSTRING_ASC, entry='user@localhost', len=-1, loc=-1, set=0 ) # pkcs9 email address
- self.X509Request.set_subject_name( x509NamePtr=X509Name._ptr() )
+ self.X509Request.set_subject_name( X509Name )
#
# publickey
@@ -99,7 +97,7 @@ class Cert:
ASN1 = M2Crypto.ASN1.ASN1_UTCTIME ()
ASN1.set_time ( 500 )
- self.X509Certificate.set_not_before( ASN1._ptr() ) # 60 * 60 * 24 * 365 -> 1 year
+ self.X509Certificate.set_not_before( ASN1 )
#
# time notAfter
@@ -107,7 +105,7 @@ class Cert:
ASN1 = M2Crypto.ASN1.ASN1_UTCTIME ()
ASN1.set_time ( 500 )
- self.X509Certificate.set_not_after( ASN1._ptr() ) # 60 * 60 * 24 * 365 -> 1 year
+ self.X509Certificate.set_not_after( ASN1 )
#
# public key
@@ -124,7 +122,7 @@ class Cert:
#print X509Name.entry_count ()
#print X509Name.as_text ()
- self.X509Certificate.set_subject_name( x509NamePtr=X509Name._ptr() )
+ self.X509Certificate.set_subject_name( X509Name )
#
# issuer
@@ -144,7 +142,7 @@ class Cert:
#print X509Name.entry_count ()
#print X509Name.as_text ()
- self.X509Certificate.set_issuer_name( x509NamePtr=X509Name._ptr() )
+ self.X509Certificate.set_issuer_name( X509Name )
#
# signing
@@ -162,6 +160,3 @@ if __name__ == '__main__':
run.CreatePKey ()
run.CreateX509Request ()
run.CreateX509Certificate ()
-
-
-