diff options
Diffstat (limited to 'crypto/pem/pvkfmt.c')
| -rw-r--r-- | crypto/pem/pvkfmt.c | 12 | 
1 files changed, 6 insertions, 6 deletions
diff --git a/crypto/pem/pvkfmt.c b/crypto/pem/pvkfmt.c index 1fc19c17f913..a933b7c1813c 100644 --- a/crypto/pem/pvkfmt.c +++ b/crypto/pem/pvkfmt.c @@ -1,5 +1,5 @@  /* - * Copyright 2005-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2005-2020 The OpenSSL Project Authors. All Rights Reserved.   *   * Licensed under the OpenSSL license (the "License").  You may not use   * this file except in compliance with the License.  You can obtain a copy @@ -29,10 +29,10 @@ static unsigned int read_ledword(const unsigned char **in)  {      const unsigned char *p = *in;      unsigned int ret; -    ret = *p++; -    ret |= (*p++ << 8); -    ret |= (*p++ << 16); -    ret |= (*p++ << 24); +    ret = (unsigned int)*p++; +    ret |= (unsigned int)*p++ << 8; +    ret |= (unsigned int)*p++ << 16; +    ret |= (unsigned int)*p++ << 24;      *in = p;      return ret;  } @@ -875,9 +875,9 @@ int i2b_PVK_bio(BIO *out, EVP_PKEY *pk, int enclevel,      wrlen = BIO_write(out, tmp, outlen);      OPENSSL_free(tmp);      if (wrlen == outlen) { -        PEMerr(PEM_F_I2B_PVK_BIO, PEM_R_BIO_WRITE_FAILURE);          return outlen;      } +    PEMerr(PEM_F_I2B_PVK_BIO, PEM_R_BIO_WRITE_FAILURE);      return -1;  }  | 
