Skip to content

Commit 10833aa

Browse files
committed
ssl: adjust styles of ossl_start_ssl()
Expand tabs, insert some spaces, and adjust indentation of switch-case to match Ruby's style.
1 parent cdec3c7 commit 10833aa

File tree

1 file changed

+36
-36
lines changed

1 file changed

+36
-36
lines changed

ext/openssl/ossl_ssl.c

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1765,62 +1765,62 @@ ossl_start_ssl(VALUE self, int (*func)(SSL *), const char *funcname, VALUE opts)
17651765
GetSSL(self, ssl);
17661766

17671767
VALUE io = rb_attr_get(self, id_i_io);
1768-
for(;;){
1769-
ret = func(ssl);
1768+
for (;;) {
1769+
ret = func(ssl);
17701770

1771-
cb_state = rb_attr_get(self, ID_callback_state);
1771+
cb_state = rb_attr_get(self, ID_callback_state);
17721772
if (!NIL_P(cb_state)) {
1773-
/* must cleanup OpenSSL error stack before re-raising */
1774-
ossl_clear_error();
1775-
rb_jump_tag(NUM2INT(cb_state));
1776-
}
1773+
/* must cleanup OpenSSL error stack before re-raising */
1774+
ossl_clear_error();
1775+
rb_jump_tag(NUM2INT(cb_state));
1776+
}
17771777

1778-
if (ret > 0)
1779-
break;
1778+
if (ret > 0)
1779+
break;
17801780

1781-
switch((ret2 = ssl_get_error(ssl, ret))){
1782-
case SSL_ERROR_WANT_WRITE:
1781+
switch ((ret2 = ssl_get_error(ssl, ret))) {
1782+
case SSL_ERROR_WANT_WRITE:
17831783
if (no_exception_p(opts)) { return sym_wait_writable; }
17841784
write_would_block(nonblock);
17851785
io_wait_writable(io);
17861786
continue;
1787-
case SSL_ERROR_WANT_READ:
1787+
case SSL_ERROR_WANT_READ:
17881788
if (no_exception_p(opts)) { return sym_wait_readable; }
17891789
read_would_block(nonblock);
17901790
io_wait_readable(io);
17911791
continue;
1792-
case SSL_ERROR_SYSCALL:
1792+
case SSL_ERROR_SYSCALL:
17931793
#ifdef __APPLE__
17941794
/* See ossl_ssl_write_internal() */
17951795
if (errno == EPROTOTYPE)
17961796
continue;
17971797
#endif
1798-
if (errno) rb_sys_fail(funcname);
1799-
ossl_raise(eSSLError, "%s SYSCALL returned=%d errno=%d peeraddr=%"PRIsVALUE" state=%s",
1800-
funcname, ret2, errno, peeraddr_ip_str(self), SSL_state_string_long(ssl));
1798+
if (errno) rb_sys_fail(funcname);
1799+
ossl_raise(eSSLError, "%s SYSCALL returned=%d errno=%d peeraddr=%"PRIsVALUE" state=%s",
1800+
funcname, ret2, errno, peeraddr_ip_str(self), SSL_state_string_long(ssl));
18011801

18021802
#if defined(SSL_R_CERTIFICATE_VERIFY_FAILED)
1803-
case SSL_ERROR_SSL:
1804-
err = ERR_peek_last_error();
1805-
if (ERR_GET_LIB(err) == ERR_LIB_SSL &&
1806-
ERR_GET_REASON(err) == SSL_R_CERTIFICATE_VERIFY_FAILED) {
1807-
const char *err_msg = ERR_reason_error_string(err),
1808-
*verify_msg = X509_verify_cert_error_string(SSL_get_verify_result(ssl));
1809-
if (!err_msg)
1810-
err_msg = "(null)";
1811-
if (!verify_msg)
1812-
verify_msg = "(null)";
1813-
ossl_clear_error(); /* let ossl_raise() not append message */
1814-
ossl_raise(eSSLError, "%s returned=%d errno=%d peeraddr=%"PRIsVALUE" state=%s: %s (%s)",
1815-
funcname, ret2, errno, peeraddr_ip_str(self), SSL_state_string_long(ssl),
1816-
err_msg, verify_msg);
1817-
}
1803+
case SSL_ERROR_SSL:
1804+
err = ERR_peek_last_error();
1805+
if (ERR_GET_LIB(err) == ERR_LIB_SSL &&
1806+
ERR_GET_REASON(err) == SSL_R_CERTIFICATE_VERIFY_FAILED) {
1807+
const char *err_msg = ERR_reason_error_string(err),
1808+
*verify_msg = X509_verify_cert_error_string(SSL_get_verify_result(ssl));
1809+
if (!err_msg)
1810+
err_msg = "(null)";
1811+
if (!verify_msg)
1812+
verify_msg = "(null)";
1813+
ossl_clear_error(); /* let ossl_raise() not append message */
1814+
ossl_raise(eSSLError, "%s returned=%d errno=%d peeraddr=%"PRIsVALUE" state=%s: %s (%s)",
1815+
funcname, ret2, errno, peeraddr_ip_str(self), SSL_state_string_long(ssl),
1816+
err_msg, verify_msg);
1817+
}
18181818
#endif
1819-
/* fallthrough */
1820-
default:
1821-
ossl_raise(eSSLError, "%s returned=%d errno=%d peeraddr=%"PRIsVALUE" state=%s",
1822-
funcname, ret2, errno, peeraddr_ip_str(self), SSL_state_string_long(ssl));
1823-
}
1819+
/* fallthrough */
1820+
default:
1821+
ossl_raise(eSSLError, "%s returned=%d errno=%d peeraddr=%"PRIsVALUE" state=%s",
1822+
funcname, ret2, errno, peeraddr_ip_str(self), SSL_state_string_long(ssl));
1823+
}
18241824
}
18251825

18261826
return self;

0 commit comments

Comments
 (0)