Browse Source

Merge pull request #435 from fperrad/20180907_lint

some lintings
Steffen Jaeckel 7 years ago
parent
commit
e77ad636e7
2 changed files with 2 additions and 2 deletions
  1. 1 1
      src/misc/pkcs12/pkcs12_kdf.c
  2. 1 1
      src/pk/rsa/rsa_import_pkcs8.c

+ 1 - 1
src/misc/pkcs12/pkcs12_kdf.c

@@ -27,7 +27,7 @@ int pkcs12_kdf(               int   hash_id,
    unsigned int tmp, i, j, n;
    unsigned char ch;
    unsigned char D[MAXBLOCKSIZE], A[MAXBLOCKSIZE], B[MAXBLOCKSIZE];
-   unsigned char *I = NULL, *key = NULL;
+   unsigned char *I, *key;
    int err = CRYPT_ERROR;
 
    LTC_ARGCHK(pw   != NULL);

+ 1 - 1
src/pk/rsa/rsa_import_pkcs8.c

@@ -113,7 +113,7 @@ int rsa_import_pkcs8(const unsigned char *in, unsigned long inlen,
    if (err != CRYPT_OK) { goto LBL_ERR; }
 
    /* check alg oid */
-   if ((err = pk_oid_cmp_with_asn1(rsaoid, &alg_seq[0]))) {
+   if ((err = pk_oid_cmp_with_asn1(rsaoid, &alg_seq[0])) != CRYPT_OK) {
       goto LBL_ERR;
    }