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 91e545a1416d7a5b19283adc0cd43c3fe1d2b8e3..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.
*/
/* ====================================================================
@@
-74,7
+74,7
@@
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)
{
ASN1_TYPE *param, EVP_CIPHER_CTX *ctx, int en_de)
{
@@
-106,7
+106,8
@@
int EVP_PBE_CipherInit (ASN1_OBJECT *pbe_obj, const char *pass, int passlen,
static int pbe_cmp(const char * const *a, const char * const *b)
{
static int pbe_cmp(const char * const *a, const char * const *b)
{
- EVP_PBE_CTL **pbe1 = (EVP_PBE_CTL **) a, **pbe2 = (EVP_PBE_CTL **)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);
}
return ((*pbe1)->pbe_nid - (*pbe2)->pbe_nid);
}