Skip to content

Commit e77ad63

Browse files
authored
Merge pull request #435 from fperrad/20180907_lint
some lintings
2 parents e5f56d4 + 9d9718e commit e77ad63

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/misc/pkcs12/pkcs12_kdf.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ int pkcs12_kdf( int hash_id,
2727
unsigned int tmp, i, j, n;
2828
unsigned char ch;
2929
unsigned char D[MAXBLOCKSIZE], A[MAXBLOCKSIZE], B[MAXBLOCKSIZE];
30-
unsigned char *I = NULL, *key = NULL;
30+
unsigned char *I, *key;
3131
int err = CRYPT_ERROR;
3232

3333
LTC_ARGCHK(pw != NULL);

src/pk/rsa/rsa_import_pkcs8.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ int rsa_import_pkcs8(const unsigned char *in, unsigned long inlen,
113113
if (err != CRYPT_OK) { goto LBL_ERR; }
114114

115115
/* check alg oid */
116-
if ((err = pk_oid_cmp_with_asn1(rsaoid, &alg_seq[0]))) {
116+
if ((err = pk_oid_cmp_with_asn1(rsaoid, &alg_seq[0])) != CRYPT_OK) {
117117
goto LBL_ERR;
118118
}
119119

0 commit comments

Comments
 (0)