diff options
| author | Michal Rokos <m.rokos@sh.cvut.cz> | 2002-06-12 17:56:23 +0000 |
|---|---|---|
| committer | Michal Rokos <m.rokos@sh.cvut.cz> | 2002-06-12 17:56:23 +0000 |
| commit | 01161239ae75f7b87385fcb062199b18badd82ca (patch) | |
| tree | 08e006ccbe405e7862776642ed01d04784681188 /ossl_x509store.c | |
| parent | f08db1b743865441d75d3462a39693c41e2d6bc3 (diff) | |
| download | ruby-openssl-history-01161239ae75f7b87385fcb062199b18badd82ca.tar.gz | |
change all rb_raise and OSSL_Raise to ossl_raise
fix: Cipher#final cannot be called without preceding Cipher#(en|de)crypt
Config ported to OpenSSL 0.9.7 interface
Diffstat (limited to 'ossl_x509store.c')
| -rw-r--r-- | ossl_x509store.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/ossl_x509store.c b/ossl_x509store.c index 58ee712..ed99e2a 100644 --- a/ossl_x509store.c +++ b/ossl_x509store.c @@ -15,7 +15,7 @@ #define GetX509Store(obj, storep) do { \ Data_Get_Struct(obj, ossl_x509store, storep); \ if (!storep) { \ - rb_raise(rb_eRuntimeError, "STORE wasn't initialized!"); \ + ossl_raise(rb_eRuntimeError, "STORE wasn't initialized!"); \ } \ } while (0); @@ -66,7 +66,7 @@ ossl_x509store_new(X509_STORE_CTX *ctx) */ /* if (!(ctx2 = X509_STORE_CTX_new())) { - OSSL_Raise(eX509StoreError, ""); + ossl_raise(eX509StoreError, ""); } X509_STORE_CTX_init(ctx2, X509_STORE_dup(ctx->ctx), X509_dup(ctx->cert), NULL); */ @@ -135,7 +135,7 @@ ossl_session_db_set(void *key, VALUE data) } if (!(item = (ossl_session_db *)OPENSSL_malloc(sizeof(ossl_session_db)))) { rb_thread_critical = 0; - OSSL_Raise(eX509StoreError, ""); + ossl_raise(eX509StoreError, ""); } item->key = key; item->data = data; @@ -172,10 +172,10 @@ ossl_x509store_initialize(int argc, VALUE *argv, VALUE self) GetX509Store(self, storep); if (!(store = X509_STORE_new())) { - OSSL_Raise(eX509StoreError, ""); + ossl_raise(eX509StoreError, ""); } if (!(storep->store = X509_STORE_CTX_new())) { - OSSL_Raise(eX509StoreError, ""); + ossl_raise(eX509StoreError, ""); } X509_STORE_set_verify_cb_func(store, ossl_x509store_verify_cb); /* OpenSSL 0.9.6c @@ -202,7 +202,7 @@ ossl_x509store_add_trusted(VALUE self, VALUE cert) x509 = DupX509CertPtr(cert); /* DUP NEEDED!!! */ if (!X509_STORE_add_cert(storep->store->ctx, x509)) { - OSSL_Raise(eX509StoreError, ""); + ossl_raise(eX509StoreError, ""); } return cert; } @@ -249,7 +249,7 @@ ossl_x509store_add_crl(VALUE self, VALUE crlst) if (!X509_STORE_add_crl(storep->store->ctx, crl)) { X509_CRL_free(crl); - OSSL_Raise(eX509StoreError, ""); + ossl_raise(eX509StoreError, ""); } X509_CRL_free(crl); @@ -385,7 +385,7 @@ ossl_x509store_set_default_paths(VALUE self) GetX509Store(self, storep); if (!X509_STORE_set_default_paths(storep->store->ctx)) { - OSSL_Raise(eX509StoreError, ""); + ossl_raise(eX509StoreError, ""); } return self; @@ -401,7 +401,7 @@ ossl_x509store_load_locations(VALUE self, VALUE path) Check_SafeStr(path); if (!X509_STORE_load_locations(storep->store->ctx, NULL, RSTRING(path)->ptr)) { - OSSL_Raise(eX509StoreError, ""); + ossl_raise(eX509StoreError, ""); } return self; |