projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix EVP CCM decrypt. Add decrypt support to algorithm test program.
[openssl.git]
/
crypto
/
asn1
/
asn_pack.c
diff --git
a/crypto/asn1/asn_pack.c
b/crypto/asn1/asn_pack.c
index e62eed2afad626debfb50494a68e85b37e5fa9f0..ad738217d7786a4e4ebad367774b87bccc9a8f7c 100644
(file)
--- a/
crypto/asn1/asn_pack.c
+++ b/
crypto/asn1/asn_pack.c
@@
-1,5
+1,5
@@
/* asn_pack.c */
/* asn_pack.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.
*/
/* ====================================================================
@@
-66,11
+66,11
@@
/* Turn an ASN1 encoded SEQUENCE OF into a STACK of structures */
/* Turn an ASN1 encoded SEQUENCE OF into a STACK of structures */
-STACK
*ASN1_seq_unpack(unsigned char *buf, int len, char *(*d2i)()
,
-
void (*free_func)(void *
))
+STACK
_OF(OPENSSL_BLOCK) *ASN1_seq_unpack(const unsigned char *buf, int len
,
+
d2i_of_void *d2i, void (*free_func)(OPENSSL_BLOCK
))
{
{
- STACK *sk;
- unsigned char *pbuf;
+ STACK
_OF(OPENSSL_BLOCK)
*sk;
+
const
unsigned char *pbuf;
pbuf = buf;
if (!(sk = d2i_ASN1_SET(NULL, &pbuf, len, d2i, free_func,
V_ASN1_SEQUENCE, V_ASN1_UNIVERSAL)))
pbuf = buf;
if (!(sk = d2i_ASN1_SET(NULL, &pbuf, len, d2i, free_func,
V_ASN1_SEQUENCE, V_ASN1_UNIVERSAL)))
@@
-82,8
+82,8
@@
STACK *ASN1_seq_unpack(unsigned char *buf, int len, char *(*d2i)(),
* OPENSSL_malloc'ed buffer
*/
* OPENSSL_malloc'ed buffer
*/
-unsigned char *ASN1_seq_pack(STACK
*safes, int (*i2d)(), unsigned char **buf
,
- int *len)
+unsigned char *ASN1_seq_pack(STACK
_OF(OPENSSL_BLOCK) *safes, i2d_of_void *i2d
,
+
unsigned char **buf,
int *len)
{
int safelen;
unsigned char *safe, *p;
{
int safelen;
unsigned char *safe, *p;
@@
-106,9
+106,9
@@
unsigned char *ASN1_seq_pack(STACK *safes, int (*i2d)(), unsigned char **buf,
/* Extract an ASN1 object from an ASN1_STRING */
/* Extract an ASN1 object from an ASN1_STRING */
-void *ASN1_unpack_string
(ASN1_STRING *oct, char *(*d2i)()
)
+void *ASN1_unpack_string
(ASN1_STRING *oct, d2i_of_void *d2i
)
{
{
- unsigned char *p;
+
const
unsigned char *p;
char *ret;
p = oct->data;
char *ret;
p = oct->data;
@@
-119,7
+119,7
@@
void *ASN1_unpack_string (ASN1_STRING *oct, char *(*d2i)())
/* Pack an ASN1 object into an ASN1_STRING */
/* Pack an ASN1 object into an ASN1_STRING */
-ASN1_STRING *ASN1_pack_string(void *obj, i
nt (*i2d)()
, ASN1_STRING **oct)
+ASN1_STRING *ASN1_pack_string(void *obj, i
2d_of_void *i2d
, ASN1_STRING **oct)
{
unsigned char *p;
ASN1_STRING *octmp;
{
unsigned char *p;
ASN1_STRING *octmp;
@@
-149,13
+149,13
@@
ASN1_STRING *ASN1_pack_string(void *obj, int (*i2d)(), ASN1_STRING **oct)
/* ASN1_ITEM versions of the above */
/* ASN1_ITEM versions of the above */
-ASN1_STRING *ASN1_
pack_item
(void *obj, const ASN1_ITEM *it, ASN1_STRING **oct)
+ASN1_STRING *ASN1_
item_pack
(void *obj, const ASN1_ITEM *it, ASN1_STRING **oct)
{
ASN1_STRING *octmp;
if (!oct || !*oct) {
if (!(octmp = ASN1_STRING_new ())) {
{
ASN1_STRING *octmp;
if (!oct || !*oct) {
if (!(octmp = ASN1_STRING_new ())) {
- ASN1err(ASN1_F_ASN1_
PACK_STRING
,ERR_R_MALLOC_FAILURE);
+ ASN1err(ASN1_F_ASN1_
ITEM_PACK
,ERR_R_MALLOC_FAILURE);
return NULL;
}
if (oct) *oct = octmp;
return NULL;
}
if (oct) *oct = octmp;
@@
-167,11
+167,11
@@
ASN1_STRING *ASN1_pack_item(void *obj, const ASN1_ITEM *it, ASN1_STRING **oct)
}
if (!(octmp->length = ASN1_item_i2d(obj, &octmp->data, it))) {
}
if (!(octmp->length = ASN1_item_i2d(obj, &octmp->data, it))) {
- ASN1err(ASN1_F_ASN1_
PACK_STRING
,ASN1_R_ENCODE_ERROR);
+ ASN1err(ASN1_F_ASN1_
ITEM_PACK
,ASN1_R_ENCODE_ERROR);
return NULL;
}
if (!octmp->data) {
return NULL;
}
if (!octmp->data) {
- ASN1err(ASN1_F_ASN1_
PACK_STRING
,ERR_R_MALLOC_FAILURE);
+ ASN1err(ASN1_F_ASN1_
ITEM_PACK
,ERR_R_MALLOC_FAILURE);
return NULL;
}
return octmp;
return NULL;
}
return octmp;
@@
-179,13
+179,13
@@
ASN1_STRING *ASN1_pack_item(void *obj, const ASN1_ITEM *it, ASN1_STRING **oct)
/* Extract an ASN1 object from an ASN1_STRING */
/* Extract an ASN1 object from an ASN1_STRING */
-void *ASN1_
unpack_item
(ASN1_STRING *oct, const ASN1_ITEM *it)
+void *ASN1_
item_unpack
(ASN1_STRING *oct, const ASN1_ITEM *it)
{
{
- unsigned char *p;
+
const
unsigned char *p;
void *ret;
p = oct->data;
if(!(ret = ASN1_item_d2i(NULL, &p, oct->length, it)))
void *ret;
p = oct->data;
if(!(ret = ASN1_item_d2i(NULL, &p, oct->length, it)))
- ASN1err(ASN1_F_ASN1_
UNPACK_STRING
,ASN1_R_DECODE_ERROR);
+ ASN1err(ASN1_F_ASN1_
ITEM_UNPACK
,ASN1_R_DECODE_ERROR);
return ret;
}
return ret;
}