projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't shadow.
[oweals/openssl.git]
/
crypto
/
evp
/
names.c
diff --git
a/crypto/evp/names.c
b/crypto/evp/names.c
index 4cc715606e154995f3ca352d91495706c60dd73a..3e8f4603285124091032daec2496ac8307a00c3f 100644
(file)
--- a/
crypto/evp/names.c
+++ b/
crypto/evp/names.c
@@
-58,11
+58,11
@@
#include <stdio.h>
#include "cryptlib.h"
#include <stdio.h>
#include "cryptlib.h"
-#include "evp.h"
-#include "objects.h"
+#include <openssl/evp.h>
+#include <openssl/objects.h>
+#include <openssl/x509.h>
-int EVP_add_cipher(c)
-EVP_CIPHER *c;
+int EVP_add_cipher(EVP_CIPHER *c)
{
int r;
{
int r;
@@
-72,11
+72,10
@@
EVP_CIPHER *c;
return(r);
}
return(r);
}
-int EVP_add_digest(md)
-EVP_MD *md;
+int EVP_add_digest(EVP_MD *md)
{
int r;
{
int r;
- char *name;
+ c
onst c
har *name;
name=OBJ_nid2sn(md->type);
r=OBJ_NAME_add(name,OBJ_NAME_TYPE_MD_METH,(char *)md);
name=OBJ_nid2sn(md->type);
r=OBJ_NAME_add(name,OBJ_NAME_TYPE_MD_METH,(char *)md);
@@
-95,26
+94,25
@@
EVP_MD *md;
return(r);
}
return(r);
}
-EVP_CIPHER *EVP_get_cipherbyname(name)
-char *name;
+const EVP_CIPHER *EVP_get_cipherbyname(const char *name)
{
{
- EVP_CIPHER *cp;
+
const
EVP_CIPHER *cp;
- cp=(EVP_CIPHER *)OBJ_NAME_get(name,OBJ_NAME_TYPE_CIPHER_METH);
+ cp=(
const
EVP_CIPHER *)OBJ_NAME_get(name,OBJ_NAME_TYPE_CIPHER_METH);
return(cp);
}
return(cp);
}
-EVP_MD *EVP_get_digestbyname(name)
-char *name;
+const EVP_MD *EVP_get_digestbyname(const char *name)
{
{
- EVP_MD *cp;
+
const
EVP_MD *cp;
- cp=(EVP_MD *)OBJ_NAME_get(name,OBJ_NAME_TYPE_MD_METH);
+ cp=(
const
EVP_MD *)OBJ_NAME_get(name,OBJ_NAME_TYPE_MD_METH);
return(cp);
}
return(cp);
}
-void EVP_cleanup()
+void EVP_cleanup(
void
)
{
OBJ_NAME_cleanup(OBJ_NAME_TYPE_CIPHER_METH);
OBJ_NAME_cleanup(OBJ_NAME_TYPE_MD_METH);
{
OBJ_NAME_cleanup(OBJ_NAME_TYPE_CIPHER_METH);
OBJ_NAME_cleanup(OBJ_NAME_TYPE_MD_METH);
+ EVP_PBE_cleanup();
}
}