Skip to content
  • nagachika's avatar
    93bceb14
    merge revision(s) 55074: [Backport #12868] · 93bceb14
    nagachika authored
    	* ext/openssl/ossl.c (Init_openssl): register an ex_data index for
    	  X509_STORE and X509_STORE_CTX respectively. Since they don't share
    	  the ex_data index registry, we can't use the same index.
    	  (ossl_verify_cb): use the the correct index.
    
    	* ext/openssl/ossl_ssl.c (ossl_ssl_verify_callback): ditto.
    
    	* ext/openssl/ossl_x509store.c (ossl_x509store_set_vfy_cb): ditto.
    	  (ossl_x509stctx_verify): ditto.
    
    	* ext/openssl/ossl.h (void ossl_clear_error): add extern declarations
    	  of ossl_store_{ctx_,}ex_verify_cb_idx.
    
    	* ext/openssl/openssl_missing.c: remove X509_STORE_set_ex_data and
    	  X509_STORE_get_ex_data.
    
    	* ext/openssl/openssl_missing.h: implement X509_STORE_get_ex_data,
    	  X509_STORE_set_ex_data and X509_STORE_get_ex_new_index as macros.
    
    
    git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@56565 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
    93bceb14
    merge revision(s) 55074: [Backport #12868]
    nagachika authored
    	* ext/openssl/ossl.c (Init_openssl): register an ex_data index for
    	  X509_STORE and X509_STORE_CTX respectively. Since they don't share
    	  the ex_data index registry, we can't use the same index.
    	  (ossl_verify_cb): use the the correct index.
    
    	* ext/openssl/ossl_ssl.c (ossl_ssl_verify_callback): ditto.
    
    	* ext/openssl/ossl_x509store.c (ossl_x509store_set_vfy_cb): ditto.
    	  (ossl_x509stctx_verify): ditto.
    
    	* ext/openssl/ossl.h (void ossl_clear_error): add extern declarations
    	  of ossl_store_{ctx_,}ex_verify_cb_idx.
    
    	* ext/openssl/openssl_missing.c: remove X509_STORE_set_ex_data and
    	  X509_STORE_get_ex_data.
    
    	* ext/openssl/openssl_missing.h: implement X509_STORE_get_ex_data,
    	  X509_STORE_set_ex_data and X509_STORE_get_ex_new_index as macros.
    
    
    git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@56565 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Loading