kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Const-correct the PKCS8 salt parameter.

Browse Source 
Change-Id: Iad9b0898b3a602fc2e554c4fd59a599c61cd8ef7
Reviewed-on: https://boringssl-review.googlesource.com/13063
Commit-Queue: David Benjamin <davidben@google.com>
Reviewed-by: Adam Langley <alangley@gmail.com>
This commit is contained in:
David Benjamin 2016-12-28 04:42:19 -05:00 committed by Adam Langley
parent 35349e9fac
commit 8f3f6be0d5
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/pkcs8/internal.h
View File

@ -99,7 +99,7 @@ int PKCS5_v2_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const uint8_t *pass_raw,
X509_ALGOR *PKCS5_pbe_set(int alg, int iter, const unsigned char *salt, X509_ALGOR *PKCS5_pbe_set(int alg, int iter, const unsigned char *salt,
int saltlen); int saltlen);
X509_ALGOR *PKCS5_pbe2_set(const EVP_CIPHER *cipher, int iter, X509_ALGOR *PKCS5_pbe2_set(const EVP_CIPHER *cipher, int iter,
unsigned char *salt, int saltlen); const unsigned char *salt, int saltlen);
#if defined(__cplusplus) #if defined(__cplusplus)

8
crypto/pkcs8/p5_pbev2.c
View File

@ -110,8 +110,8 @@ static int param_to_asn1(EVP_CIPHER_CTX *c, ASN1_TYPE *type)
return ASN1_TYPE_set_octetstring(type, c->oiv, iv_len); return ASN1_TYPE_set_octetstring(type, c->oiv, iv_len);
} }
static X509_ALGOR *PKCS5_pbkdf2_set(int iter, unsigned char *salt, int saltlen, static X509_ALGOR *PKCS5_pbkdf2_set(int iter, const unsigned char *salt,
int prf_nid, int keylen) int saltlen, int prf_nid, int keylen)
{ {
X509_ALGOR *keyfunc = NULL; X509_ALGOR *keyfunc = NULL;
PBKDF2PARAM *kdf = NULL; PBKDF2PARAM *kdf = NULL;
@ -197,7 +197,7 @@ static X509_ALGOR *PKCS5_pbkdf2_set(int iter, unsigned char *salt, int saltlen,
* Extended version to allow application supplied PRF NID and IV. */ * Extended version to allow application supplied PRF NID and IV. */
static X509_ALGOR *PKCS5_pbe2_set_iv(const EVP_CIPHER *cipher, int iter, static X509_ALGOR *PKCS5_pbe2_set_iv(const EVP_CIPHER *cipher, int iter,
unsigned char *salt, int saltlen, const unsigned char *salt, int saltlen,
unsigned char *aiv, int prf_nid) unsigned char *aiv, int prf_nid)
{ {
X509_ALGOR *scheme = NULL, *kalg = NULL, *ret = NULL; X509_ALGOR *scheme = NULL, *kalg = NULL, *ret = NULL;
@ -300,7 +300,7 @@ static X509_ALGOR *PKCS5_pbe2_set_iv(const EVP_CIPHER *cipher, int iter,
} }
X509_ALGOR *PKCS5_pbe2_set(const EVP_CIPHER *cipher, int iter, X509_ALGOR *PKCS5_pbe2_set(const EVP_CIPHER *cipher, int iter,
unsigned char *salt, int saltlen) const unsigned char *salt, int saltlen)
{ {
return PKCS5_pbe2_set_iv(cipher, iter, salt, saltlen, NULL, -1); return PKCS5_pbe2_set_iv(cipher, iter, salt, saltlen, NULL, -1);
} }

4
crypto/pkcs8/pkcs8.c
View File

@ -540,7 +540,7 @@ static ASN1_OCTET_STRING *pkcs12_item_i2d_encrypt(X509_ALGOR *algor,
} }
X509_SIG *PKCS8_encrypt(int pbe_nid, const EVP_CIPHER *cipher, const char *pass, X509_SIG *PKCS8_encrypt(int pbe_nid, const EVP_CIPHER *cipher, const char *pass,
int pass_len, uint8_t *salt, size_t salt_len, int pass_len, const uint8_t *salt, size_t salt_len,
int iterations, PKCS8_PRIV_KEY_INFO *p8inf) { int iterations, PKCS8_PRIV_KEY_INFO *p8inf) {
uint8_t *pass_raw = NULL; uint8_t *pass_raw = NULL;
size_t pass_raw_len = 0; size_t pass_raw_len = 0;
@ -560,7 +560,7 @@ X509_SIG *PKCS8_encrypt(int pbe_nid, const EVP_CIPHER *cipher, const char *pass,
X509_SIG *PKCS8_encrypt_pbe(int pbe_nid, const EVP_CIPHER *cipher, X509_SIG *PKCS8_encrypt_pbe(int pbe_nid, const EVP_CIPHER *cipher,
const uint8_t *pass_raw, size_t pass_raw_len, const uint8_t *pass_raw, size_t pass_raw_len,
uint8_t *salt, size_t salt_len, const uint8_t *salt, size_t salt_len,
int iterations, PKCS8_PRIV_KEY_INFO *p8inf) { int iterations, PKCS8_PRIV_KEY_INFO *p8inf) {
X509_SIG *pkcs8 = NULL; X509_SIG *pkcs8 = NULL;
X509_ALGOR *pbe; X509_ALGOR *pbe;

4
include/openssl/pkcs8.h
View File

@ -88,7 +88,7 @@ OPENSSL_EXPORT X509_SIG *PKCS8_encrypt_pbe(int pbe_nid,
const EVP_CIPHER *cipher, const EVP_CIPHER *cipher,
const uint8_t *pass_raw, const uint8_t *pass_raw,
size_t pass_raw_len, size_t pass_raw_len,
uint8_t *salt, size_t salt_len, const uint8_t *salt, size_t salt_len,
int iterations, int iterations,
PKCS8_PRIV_KEY_INFO *p8inf); PKCS8_PRIV_KEY_INFO *p8inf);
@ -123,7 +123,7 @@ OPENSSL_EXPORT int PKCS12_get_key_and_certs(EVP_PKEY **out_key,
* unchanged. */ * unchanged. */
OPENSSL_EXPORT X509_SIG *PKCS8_encrypt(int pbe_nid, const EVP_CIPHER *cipher, OPENSSL_EXPORT X509_SIG *PKCS8_encrypt(int pbe_nid, const EVP_CIPHER *cipher,
const char *pass, int pass_len, const char *pass, int pass_len,
uint8_t *salt, size_t salt_len, const uint8_t *salt, size_t salt_len,
int iterations, int iterations,
PKCS8_PRIV_KEY_INFO *p8inf); PKCS8_PRIV_KEY_INFO *p8inf);