projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove MD2 from digest algorithm table. This follows the recommendation in
[oweals/openssl.git]
/
crypto
/
evp
/
evp_pbe.c
diff --git
a/crypto/evp/evp_pbe.c
b/crypto/evp/evp_pbe.c
index abc4d0683c1e70f38010c8200d7074966fede6de..5e830be65fff7c58848e7e0d376ed58cd47c9e37 100644
(file)
--- a/
crypto/evp/evp_pbe.c
+++ b/
crypto/evp/evp_pbe.c
@@
-1,5
+1,5
@@
/* evp_pbe.c */
/* evp_pbe.c */
-/* Written by Dr Stephen N Henson (s
henson@bigfoot.com
) for the OpenSSL
+/* Written by Dr Stephen N Henson (s
teve@openssl.org
) for the OpenSSL
* project 1999.
*/
/* ====================================================================
* project 1999.
*/
/* ====================================================================
@@
-57,9
+57,9
@@
*/
#include <stdio.h>
*/
#include <stdio.h>
+#include "cryptlib.h"
#include <openssl/evp.h>
#include <openssl/x509.h>
#include <openssl/evp.h>
#include <openssl/x509.h>
-#include "cryptlib.h"
/* Password based encryption (PBE) functions */
/* Password based encryption (PBE) functions */
@@
-69,17
+69,16
@@
static STACK *pbe_algs;
typedef struct {
int pbe_nid;
typedef struct {
int pbe_nid;
-EVP_CIPHER *cipher;
-EVP_MD *md;
+
const
EVP_CIPHER *cipher;
+
const
EVP_MD *md;
EVP_PBE_KEYGEN *keygen;
} EVP_PBE_CTL;
EVP_PBE_KEYGEN *keygen;
} EVP_PBE_CTL;
-int EVP_PBE_CipherInit
(ASN1_OBJECT *pbe_obj, const char *pass, int passlen,
+int EVP_PBE_CipherInit(ASN1_OBJECT *pbe_obj, const char *pass, int passlen,
ASN1_TYPE *param, EVP_CIPHER_CTX *ctx, int en_de)
{
EVP_PBE_CTL *pbetmp, pbelu;
ASN1_TYPE *param, EVP_CIPHER_CTX *ctx, int en_de)
{
EVP_PBE_CTL *pbetmp, pbelu;
- unsigned char key[EVP_MAX_KEY_LENGTH], iv[EVP_MAX_IV_LENGTH];
int i;
pbelu.pbe_nid = OBJ_obj2nid(pbe_obj);
if (pbelu.pbe_nid != NID_undef) i = sk_find(pbe_algs, (char *)&pbelu);
int i;
pbelu.pbe_nid = OBJ_obj2nid(pbe_obj);
if (pbelu.pbe_nid != NID_undef) i = sk_find(pbe_algs, (char *)&pbelu);
@@
-88,36
+87,38
@@
int EVP_PBE_CipherInit (ASN1_OBJECT *pbe_obj, const char *pass, int passlen,
if (i == -1) {
char obj_tmp[80];
EVPerr(EVP_F_EVP_PBE_CIPHERINIT,EVP_R_UNKNOWN_PBE_ALGORITHM);
if (i == -1) {
char obj_tmp[80];
EVPerr(EVP_F_EVP_PBE_CIPHERINIT,EVP_R_UNKNOWN_PBE_ALGORITHM);
- if (!pbe_obj)
strcpy (obj_tmp, "NULL"
);
- else i2t_ASN1_OBJECT(obj_tmp,
80
, pbe_obj);
+ if (!pbe_obj)
BUF_strlcpy (obj_tmp, "NULL", sizeof obj_tmp
);
+ else i2t_ASN1_OBJECT(obj_tmp,
sizeof obj_tmp
, pbe_obj);
ERR_add_error_data(2, "TYPE=", obj_tmp);
return 0;
}
ERR_add_error_data(2, "TYPE=", obj_tmp);
return 0;
}
- if (passlen == -1) passlen = strlen(pass);
+ if(!pass) passlen = 0;
+ else if (passlen == -1) passlen = strlen(pass);
pbetmp = (EVP_PBE_CTL *)sk_value (pbe_algs, i);
pbetmp = (EVP_PBE_CTL *)sk_value (pbe_algs, i);
- i = (*pbetmp->keygen)(pass, passlen, param, pbetmp->cipher,
- pbetmp->md,
key, iv
);
+ i = (*pbetmp->keygen)(
ctx,
pass, passlen, param, pbetmp->cipher,
+ pbetmp->md,
en_de
);
if (!i) {
EVPerr(EVP_F_EVP_PBE_CIPHERINIT,EVP_R_KEYGEN_FAILURE);
return 0;
}
if (!i) {
EVPerr(EVP_F_EVP_PBE_CIPHERINIT,EVP_R_KEYGEN_FAILURE);
return 0;
}
- EVP_CipherInit (ctx, pbetmp->cipher, key, iv, en_de);
return 1;
}
return 1;
}
-static int pbe_cmp
(EVP_PBE_CTL **pbe1, EVP_PBE_CTL **pbe2
)
+static int pbe_cmp
(const char * const *a, const char * const *b
)
{
{
+ const EVP_PBE_CTL * const *pbe1 = (const EVP_PBE_CTL * const *) a,
+ * const *pbe2 = (const EVP_PBE_CTL * const *)b;
return ((*pbe1)->pbe_nid - (*pbe2)->pbe_nid);
}
/* Add a PBE algorithm */
return ((*pbe1)->pbe_nid - (*pbe2)->pbe_nid);
}
/* Add a PBE algorithm */
-int EVP_PBE_alg_add
(int nid, EVP_CIPHER *cipher,
EVP_MD *md,
+int EVP_PBE_alg_add
(int nid, const EVP_CIPHER *cipher, const
EVP_MD *md,
EVP_PBE_KEYGEN *keygen)
{
EVP_PBE_CTL *pbe_tmp;
EVP_PBE_KEYGEN *keygen)
{
EVP_PBE_CTL *pbe_tmp;
- if (!pbe_algs) pbe_algs = sk_new
(pbe_cmp);
- if (!(pbe_tmp = (EVP_PBE_CTL*)
M
alloc (sizeof(EVP_PBE_CTL)))) {
+ if (!pbe_algs) pbe_algs = sk_new(pbe_cmp);
+ if (!(pbe_tmp = (EVP_PBE_CTL*)
OPENSSL_m
alloc (sizeof(EVP_PBE_CTL)))) {
EVPerr(EVP_F_EVP_PBE_ALG_ADD,ERR_R_MALLOC_FAILURE);
return 0;
}
EVPerr(EVP_F_EVP_PBE_ALG_ADD,ERR_R_MALLOC_FAILURE);
return 0;
}
@@
-131,6
+132,6
@@
int EVP_PBE_alg_add (int nid, EVP_CIPHER *cipher, EVP_MD *md,
void EVP_PBE_cleanup(void)
{
void EVP_PBE_cleanup(void)
{
- sk_pop_free(pbe_algs,
F
reeFunc);
+ sk_pop_free(pbe_algs,
OPENSSL_f
reeFunc);
pbe_algs = NULL;
}
pbe_algs = NULL;
}