Skip to content

Commit 647b340

Browse files
sjaeckelsjaeckel
committed
Use LTC_NULL with ssh_decode_sequence_multi()
Signed-off-by: Steffen Jaeckel <s@jaeckel.eu>
1 parent 08b69be commit 647b340

1 file changed

Lines changed: 13 additions & 13 deletions

File tree

‎src/misc/pem/pem_ssh.c‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ static int s_ssh_decode_ecdsa(const unsigned char *in, unsigned long *inlen, ltc
9393
LTC_SSHDATA_STRING, groupname, &groupnamelen,
9494
LTC_SSHDATA_STRING, buf0, &buf0len,
9595
LTC_SSHDATA_STRING, buf1, &buf1len,
96-
LTC_SSHDATA_EOL, NULL);
96+
LTC_SSHDATA_EOL, LTC_NULL);
9797
if (err == CRYPT_OK) {
9898
key = buf1;
9999
keylen = buf1len;
@@ -137,7 +137,7 @@ static int s_ssh_decode_ed25519(const unsigned char *in, unsigned long *inlen, l
137137

138138
if ((err = ssh_decode_sequence_multi(p, &cur_len,
139139
LTC_SSHDATA_STRING, pubkey, &pubkeylen,
140-
LTC_SSHDATA_EOL, NULL)) != CRYPT_OK) {
140+
LTC_SSHDATA_EOL, LTC_NULL)) != CRYPT_OK) {
141141
goto cleanup;
142142
}
143143

@@ -155,7 +155,7 @@ static int s_ssh_decode_ed25519(const unsigned char *in, unsigned long *inlen, l
155155

156156
if ((err = ssh_decode_sequence_multi(p, &cur_len,
157157
LTC_SSHDATA_STRING, privkey, &privkeylen,
158-
LTC_SSHDATA_EOL, NULL)) != CRYPT_OK) {
158+
LTC_SSHDATA_EOL, LTC_NULL)) != CRYPT_OK) {
159159
goto cleanup;
160160
}
161161
if ((err = ed25519_import_raw(privkey, privkeylen, PK_PRIVATE, &key->u.ed25519)) != CRYPT_OK) {
@@ -195,7 +195,7 @@ static int s_ssh_decode_dsa(const unsigned char *in, unsigned long *inlen, ltc_p
195195
LTC_SSHDATA_MPINT, key->u.dsa.q,
196196
LTC_SSHDATA_MPINT, key->u.dsa.g,
197197
LTC_SSHDATA_MPINT, key->u.dsa.y,
198-
LTC_SSHDATA_EOL, NULL)) != CRYPT_OK) {
198+
LTC_SSHDATA_EOL, LTC_NULL)) != CRYPT_OK) {
199199
goto cleanup;
200200
}
201201
key->u.dsa.qord = ltc_mp_unsigned_bin_size(key->u.dsa.q);
@@ -219,7 +219,7 @@ static int s_ssh_decode_dsa(const unsigned char *in, unsigned long *inlen, ltc_p
219219

220220
if ((err = ssh_decode_sequence_multi(p, &cur_len,
221221
LTC_SSHDATA_MPINT, key->u.dsa.x,
222-
LTC_SSHDATA_EOL, NULL)) != CRYPT_OK) {
222+
LTC_SSHDATA_EOL, LTC_NULL)) != CRYPT_OK) {
223223
goto cleanup;
224224
}
225225

@@ -262,7 +262,7 @@ static int s_ssh_decode_rsa(const unsigned char *in, unsigned long *inlen, ltc_p
262262
if ((err = ssh_decode_sequence_multi(p, &cur_len,
263263
LTC_SSHDATA_MPINT, key->u.rsa.N,
264264
LTC_SSHDATA_MPINT, key->u.rsa.e,
265-
LTC_SSHDATA_EOL, NULL)) != CRYPT_OK) {
265+
LTC_SSHDATA_EOL, LTC_NULL)) != CRYPT_OK) {
266266
goto cleanup;
267267
}
268268

@@ -290,7 +290,7 @@ static int s_ssh_decode_rsa(const unsigned char *in, unsigned long *inlen, ltc_p
290290
LTC_SSHDATA_MPINT, key->u.rsa.qP,
291291
LTC_SSHDATA_MPINT, key->u.rsa.p,
292292
LTC_SSHDATA_MPINT, key->u.rsa.q,
293-
LTC_SSHDATA_EOL, NULL)) != CRYPT_OK) {
293+
LTC_SSHDATA_EOL, LTC_NULL)) != CRYPT_OK) {
294294
goto cleanup_tmps;
295295
}
296296

@@ -377,7 +377,7 @@ static int s_decode_key(const unsigned char *in, unsigned long *inlen, ltc_pka_k
377377
if ((err = ssh_decode_sequence_multi(p, &cur_len,
378378
LTC_SSHDATA_UINT32, &check1,
379379
LTC_SSHDATA_UINT32, &check2,
380-
LTC_SSHDATA_EOL, NULL)) != CRYPT_OK) {
380+
LTC_SSHDATA_EOL, LTC_NULL)) != CRYPT_OK) {
381381
return err;
382382
}
383383
if (check1 != check2) {
@@ -390,7 +390,7 @@ static int s_decode_key(const unsigned char *in, unsigned long *inlen, ltc_pka_k
390390
}
391391
if ((err = ssh_decode_sequence_multi(p, &cur_len,
392392
LTC_SSHDATA_STRING, pka, &pkalen,
393-
LTC_SSHDATA_EOL, NULL)) != CRYPT_OK) {
393+
LTC_SSHDATA_EOL, LTC_NULL)) != CRYPT_OK) {
394394
return err;
395395
}
396396

@@ -427,7 +427,7 @@ static int s_decode_key(const unsigned char *in, unsigned long *inlen, ltc_pka_k
427427
}
428428
if ((err = ssh_decode_sequence_multi(p, &cur_len,
429429
LTC_SSHDATA_STRING, c, &commentlen,
430-
LTC_SSHDATA_EOL, NULL)) != CRYPT_OK) {
430+
LTC_SSHDATA_EOL, LTC_NULL)) != CRYPT_OK) {
431431
return err;
432432
}
433433
if (commentlen == 0) {
@@ -651,7 +651,7 @@ static int s_decode_header(unsigned char *in, unsigned long *inlen, struct kdf_o
651651
LTC_SSHDATA_STRING, kdfoptions, &kdfoptionslen,
652652
LTC_SSHDATA_UINT32, &num_keys,
653653
LTC_SSHDATA_STRING, pubkey1, &pubkey1len,
654-
LTC_SSHDATA_EOL, NULL)) != CRYPT_OK) {
654+
LTC_SSHDATA_EOL, LTC_NULL)) != CRYPT_OK) {
655655
return err;
656656
}
657657
if (num_keys != 1) {
@@ -680,7 +680,7 @@ static int s_decode_header(unsigned char *in, unsigned long *inlen, struct kdf_o
680680
if ((err = ssh_decode_sequence_multi(kdfoptions, &len,
681681
LTC_SSHDATA_STRING, opts->salt, &opts->saltlen,
682682
LTC_SSHDATA_UINT32, &opts->num_rounds,
683-
LTC_SSHDATA_EOL, NULL)) != CRYPT_OK) {
683+
LTC_SSHDATA_EOL, LTC_NULL)) != CRYPT_OK) {
684684
return err;
685685
}
686686
if (len != kdfoptionslen) {
@@ -754,7 +754,7 @@ static int s_decode_openssh(struct get_char *g, ltc_pka_key *k, const password_c
754754

755755
if ((err = ssh_decode_sequence_multi(p, &w,
756756
LTC_SSHDATA_STRING, privkey, &privkey_len,
757-
LTC_SSHDATA_EOL, NULL)) != CRYPT_OK) {
757+
LTC_SSHDATA_EOL, LTC_NULL)) != CRYPT_OK) {
758758
goto cleanup;
759759
}
760760

0 commit comments

Comments
 (0)