lib/libssh2
1
0
Fork 0
mirror of https://github.com/libssh2/libssh2.git synced 2025-11-20 02:42:09 +03:00
Code Activity

openssl: formatting/whitespace

Browse Source 
Also use `NULL` instead of `0` for pointers.

Closes #1305
This commit is contained in:
Viktor Szakats
2024-01-11 19:43:30 +00:00
parent ba27bbe7c9
commit ade785d251
1 changed files with 42 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
src/openssl.c
View File

@@ -1178,7 +1178,8 @@ read_private_key_from_file(void **key_ctx,
int int
_libssh2_rsa_new_private_frommemory(libssh2_rsa_ctx ** rsa, _libssh2_rsa_new_private_frommemory(libssh2_rsa_ctx ** rsa,
LIBSSH2_SESSION * session, LIBSSH2_SESSION * session,
const char *filedata, size_t filedata_len, const char *filedata,
size_t filedata_len,
unsigned const char *passphrase) unsigned const char *passphrase)
{ {
int rc; int rc;
@@ -1193,12 +1194,15 @@ _libssh2_rsa_new_private_frommemory(libssh2_rsa_ctx ** rsa,
_libssh2_init_if_needed(); _libssh2_init_if_needed();
rc = read_private_key_from_memory((void **) rsa, read_rsa, rc = read_private_key_from_memory((void **)rsa, read_rsa,
filedata, filedata_len, passphrase); filedata, filedata_len,
passphrase);
if(rc) { if(rc) {
rc = read_openssh_private_key_from_memory((void **)rsa, session, rc = read_openssh_private_key_from_memory((void **)rsa, session,
"ssh-rsa", filedata, filedata_len, passphrase); "ssh-rsa",
filedata, filedata_len,
passphrase);
} }
return rc; return rc;
@@ -1558,8 +1562,8 @@ _libssh2_rsa_new_openssh_private(libssh2_rsa_ctx ** rsa,
if(strcmp("ssh-rsa", (const char *)buf) == 0) { if(strcmp("ssh-rsa", (const char *)buf) == 0) {
rc = gen_publickey_from_rsa_openssh_priv_data(session, decrypted, rc = gen_publickey_from_rsa_openssh_priv_data(session, decrypted,
NULL, 0, NULL, NULL,
NULL, 0, rsa); NULL, NULL, rsa);
} }
else { else {
rc = -1; rc = -1;
@@ -1604,7 +1608,8 @@ _libssh2_rsa_new_private(libssh2_rsa_ctx ** rsa,
int int
_libssh2_dsa_new_private_frommemory(libssh2_dsa_ctx ** dsa, _libssh2_dsa_new_private_frommemory(libssh2_dsa_ctx ** dsa,
LIBSSH2_SESSION * session, LIBSSH2_SESSION * session,
const char *filedata, size_t filedata_len, const char *filedata,
size_t filedata_len,
unsigned const char *passphrase) unsigned const char *passphrase)
{ {
int rc; int rc;
@@ -1902,8 +1907,8 @@ _libssh2_dsa_new_openssh_private(libssh2_dsa_ctx ** dsa,
if(strcmp("ssh-dss", (const char *)buf) == 0) { if(strcmp("ssh-dss", (const char *)buf) == 0) {
rc = gen_publickey_from_dsa_openssh_priv_data(session, decrypted, rc = gen_publickey_from_dsa_openssh_priv_data(session, decrypted,
NULL, 0, NULL, NULL,
NULL, 0, dsa); NULL, NULL, dsa);
} }
else { else {
rc = -1; rc = -1;
@@ -1945,7 +1950,6 @@ _libssh2_dsa_new_private(libssh2_dsa_ctx ** dsa,
#endif /* LIBSSH_DSA */ #endif /* LIBSSH_DSA */
#if LIBSSH2_ECDSA #if LIBSSH2_ECDSA
int int
_libssh2_ecdsa_new_private_frommemory(libssh2_ecdsa_ctx ** ec_ctx, _libssh2_ecdsa_new_private_frommemory(libssh2_ecdsa_ctx ** ec_ctx,
LIBSSH2_SESSION * session, LIBSSH2_SESSION * session,
@@ -1956,14 +1960,16 @@ _libssh2_ecdsa_new_private_frommemory(libssh2_ecdsa_ctx ** ec_ctx,
int rc; int rc;
#if defined(USE_OPENSSL_3) #if defined(USE_OPENSSL_3)
pem_read_bio_func read_ec = (pem_read_bio_func) &PEM_read_bio_PrivateKey; pem_read_bio_func read_ec =
(pem_read_bio_func) &PEM_read_bio_PrivateKey;
#else #else
pem_read_bio_func read_ec = (pem_read_bio_func) &PEM_read_bio_ECPrivateKey; pem_read_bio_func read_ec =
(pem_read_bio_func) &PEM_read_bio_ECPrivateKey;
#endif #endif
_libssh2_init_if_needed(); _libssh2_init_if_needed();
rc = read_private_key_from_memory((void **) ec_ctx, read_ec, rc = read_private_key_from_memory((void **)ec_ctx, read_ec,
filedata, filedata_len, filedata, filedata_len,
passphrase); passphrase);
@@ -2482,12 +2488,9 @@ _libssh2_ed25519_new_private(libssh2_ed25519_ctx ** ed_ctx,
} }
if(strcmp("ssh-ed25519", (const char *)buf) == 0) { if(strcmp("ssh-ed25519", (const char *)buf) == 0) {
rc = gen_publickey_from_ed25519_openssh_priv_data(session, rc = gen_publickey_from_ed25519_openssh_priv_data(session, decrypted,
decrypted, NULL, NULL,
NULL, NULL, NULL,
NULL,
NULL,
NULL,
&ctx); &ctx);
} }
else { else {
@@ -2556,10 +2559,8 @@ _libssh2_ed25519_new_private_sk(libssh2_ed25519_ctx **ed_ctx,
if(strcmp("sk-ssh-ed25519@openssh.com", (const char *)buf) == 0) { if(strcmp("sk-ssh-ed25519@openssh.com", (const char *)buf) == 0) {
rc = gen_publickey_from_sk_ed25519_openssh_priv_data(session, rc = gen_publickey_from_sk_ed25519_openssh_priv_data(session,
decrypted, decrypted,
NULL, NULL, NULL,
NULL, NULL, NULL,
NULL,
NULL,
flags, flags,
application, application,
key_handle, key_handle,
@@ -3694,8 +3695,9 @@ _libssh2_ecdsa_new_openssh_private(libssh2_ecdsa_ctx ** ec_ctx,
if(rc == 0) { if(rc == 0) {
rc = gen_publickey_from_ecdsa_openssh_priv_data(session, type, rc = gen_publickey_from_ecdsa_openssh_priv_data(session, type,
decrypted, NULL, 0, decrypted,
NULL, 0, ec_ctx); NULL, NULL,
NULL, NULL, ec_ctx);
} }
else { else {
rc = -1; rc = -1;
@@ -3755,8 +3757,8 @@ _libssh2_ecdsa_new_openssh_private_sk(libssh2_ecdsa_ctx ** ec_ctx,
if(strcmp("sk-ecdsa-sha2-nistp256@openssh.com", (const char *)buf) == 0) { if(strcmp("sk-ecdsa-sha2-nistp256@openssh.com", (const char *)buf) == 0) {
rc = gen_publickey_from_sk_ecdsa_openssh_priv_data(session, rc = gen_publickey_from_sk_ecdsa_openssh_priv_data(session,
decrypted, decrypted,
NULL, 0, NULL, NULL,
NULL, 0, NULL, NULL,
flags, flags,
application, application,
key_handle, key_handle,
@@ -3781,15 +3783,17 @@ _libssh2_ecdsa_new_private(libssh2_ecdsa_ctx ** ec_ctx,
int rc; int rc;
#if defined(USE_OPENSSL_3) #if defined(USE_OPENSSL_3)
pem_read_bio_func read_ec = (pem_read_bio_func) &PEM_read_bio_PrivateKey; pem_read_bio_func read_ec =
(pem_read_bio_func) &PEM_read_bio_PrivateKey;
#else #else
pem_read_bio_func read_ec = (pem_read_bio_func) &PEM_read_bio_ECPrivateKey; pem_read_bio_func read_ec =
(pem_read_bio_func) &PEM_read_bio_ECPrivateKey;
#endif #endif
_libssh2_init_if_needed(); _libssh2_init_if_needed();
rc = read_private_key_from_file((void **) ec_ctx, read_ec, rc = read_private_key_from_file((void **) ec_ctx, read_ec,
filename, passphrase); filename, passphrase);
if(rc) { if(rc) {
return _libssh2_ecdsa_new_openssh_private(ec_ctx, session, return _libssh2_ecdsa_new_openssh_private(ec_ctx, session,
@@ -3812,15 +3816,17 @@ _libssh2_ecdsa_new_private_sk(libssh2_ecdsa_ctx ** ec_ctx,
int rc; int rc;
#if defined(USE_OPENSSL_3) #if defined(USE_OPENSSL_3)
pem_read_bio_func read_ec = (pem_read_bio_func) &PEM_read_bio_PrivateKey; pem_read_bio_func read_ec =
(pem_read_bio_func) &PEM_read_bio_PrivateKey;
#else #else
pem_read_bio_func read_ec = (pem_read_bio_func) &PEM_read_bio_ECPrivateKey; pem_read_bio_func read_ec =
(pem_read_bio_func) &PEM_read_bio_ECPrivateKey;
#endif #endif
_libssh2_init_if_needed(); _libssh2_init_if_needed();
rc = read_private_key_from_file((void **) ec_ctx, read_ec, rc = read_private_key_from_file((void **) ec_ctx, read_ec,
filename, passphrase); filename, passphrase);
if(rc) { if(rc) {
return _libssh2_ecdsa_new_openssh_private_sk(ec_ctx, return _libssh2_ecdsa_new_openssh_private_sk(ec_ctx,
@@ -4579,10 +4585,8 @@ _libssh2_pub_priv_openssh_keyfilememory(LIBSSH2_SESSION *session,
method_len, method_len,
pubkeydata, pubkeydata,
pubkeydata_len, pubkeydata_len,
NULL, NULL, NULL,
NULL, NULL, NULL,
NULL,
NULL,
(libssh2_ed25519_ctx**)key_ctx); (libssh2_ed25519_ctx**)key_ctx);
} }
} }
@@ -4618,9 +4622,8 @@ _libssh2_pub_priv_openssh_keyfilememory(LIBSSH2_SESSION *session,
method, method_len, method, method_len,
pubkeydata, pubkeydata,
pubkeydata_len, pubkeydata_len,
NULL,
NULL, NULL, NULL, NULL,
NULL, NULL, NULL,
(libssh2_ecdsa_ctx**)key_ctx); (libssh2_ecdsa_ctx**)key_ctx);
} }
else if(_libssh2_ecdsa_curve_type_from_name((const char *)buf, &type) else if(_libssh2_ecdsa_curve_type_from_name((const char *)buf, &type)