lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-12-11 03:42:35 +03:00
Code Activity

libgcrypt: Reformat

Browse Source 
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Sahana Prasad <sahana@redhat.com>
This commit is contained in:
Jakub Jelen
2024-04-23 21:15:08 +02:00
parent 2e4a9e3f7b
commit dceb17d2ad
1 changed files with 109 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/pki_gcrypt.c
View File

@@ -548,9 +548,14 @@ static ssh_buffer privatekey_string_to_buffer(const char *pkey, int type,
return out; return out;
} }
static int b64decode_rsa_privatekey(const char *pkey, gcry_sexp_t *r, static int
ssh_auth_callback cb, void *userdata, const char *desc) { b64decode_rsa_privatekey(const char *pkey,
const unsigned char *data; gcry_sexp_t *r,
ssh_auth_callback cb,
void *userdata,
const char *desc)
{
const unsigned char *data = NULL;
ssh_string n = NULL; ssh_string n = NULL;
ssh_string e = NULL; ssh_string e = NULL;
ssh_string d = NULL; ssh_string d = NULL;
@@ -562,8 +567,13 @@ static int b64decode_rsa_privatekey(const char *pkey, gcry_sexp_t *r,
ssh_string v = NULL; ssh_string v = NULL;
ssh_buffer buffer = NULL; ssh_buffer buffer = NULL;
int rc = 1; int rc = 1;
gcry_error_t rv = 0;
buffer = privatekey_string_to_buffer(pkey, SSH_KEYTYPE_RSA, cb, userdata, desc); buffer = privatekey_string_to_buffer(pkey,
SSH_KEYTYPE_RSA,
cb,
userdata,
desc);
if (buffer == NULL) { if (buffer == NULL) {
return 0; return 0;
} }
@@ -598,19 +608,28 @@ static int b64decode_rsa_privatekey(const char *pkey, gcry_sexp_t *r,
SSH_BUFFER_FREE(buffer); SSH_BUFFER_FREE(buffer);
if (n == NULL || e == NULL || d == NULL || p == NULL || q == NULL || if (n == NULL || e == NULL || d == NULL || p == NULL || q == NULL ||
unused1 == NULL || unused2 == NULL|| u == NULL) { unused1 == NULL || unused2 == NULL || u == NULL) {
rc = 0; rc = 0;
goto error; goto error;
} }
if (gcry_sexp_build(r, NULL, rv = gcry_sexp_build(
r,
NULL,
"(private-key(rsa(n %b)(e %b)(d %b)(p %b)(q %b)(u %b)))", "(private-key(rsa(n %b)(e %b)(d %b)(p %b)(q %b)(u %b)))",
ssh_string_len(n), ssh_string_data(n), ssh_string_len(n),
ssh_string_len(e), ssh_string_data(e), ssh_string_data(n),
ssh_string_len(d), ssh_string_data(d), ssh_string_len(e),
ssh_string_len(p), ssh_string_data(p), ssh_string_data(e),
ssh_string_len(q), ssh_string_data(q), ssh_string_len(d),
ssh_string_len(u), ssh_string_data(u))) { ssh_string_data(d),
ssh_string_len(p),
ssh_string_data(p),
ssh_string_len(q),
ssh_string_data(q),
ssh_string_len(u),
ssh_string_data(u));
if (rv) {
rc = 0; rc = 0;
} }
@@ -1200,16 +1219,20 @@ ssh_key pki_key_dup(const ssh_key key, int demote)
return new; return new;
} }
static int pki_key_generate(ssh_key key, int parameter, const char *type_s, int type){ static int
gcry_sexp_t params; pki_key_generate(ssh_key key, int parameter, const char *type_s, int type)
{
gcry_sexp_t params = NULL;
int rc; int rc;
rc = gcry_sexp_build(&params, rc = gcry_sexp_build(&params,
NULL, NULL,
"(genkey(%s(nbits %d)(transient-key)))", "(genkey(%s(nbits %d)(transient-key)))",
type_s, type_s,
parameter); parameter);
if (rc != 0) if (rc != 0) {
return SSH_ERROR; return SSH_ERROR;
}
switch (type) { switch (type) {
case SSH_KEYTYPE_RSA: case SSH_KEYTYPE_RSA:
rc = gcry_pk_genkey(&key->rsa, params); rc = gcry_pk_genkey(&key->rsa, params);
@@ -1228,7 +1251,9 @@ static int pki_key_generate(ssh_key key, int parameter, const char *type_s, int
return SSH_OK; return SSH_OK;
} }
int pki_key_generate_rsa(ssh_key key, int parameter){ int
pki_key_generate_rsa(ssh_key key, int parameter)
{
return pki_key_generate(key, parameter, "rsa", SSH_KEYTYPE_RSA); return pki_key_generate(key, parameter, "rsa", SSH_KEYTYPE_RSA);
} }