projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sha1-armv4-large.pl: comply with ABI.
[oweals/openssl.git]
/
crypto
/
pkcs7
/
example.c
diff --git
a/crypto/pkcs7/example.c
b/crypto/pkcs7/example.c
index 70e6b6a023577425a2f583bc68d0c7935357d89f..2953d04b5c905e54a37c9dd7e0c1308be80b3852 100644
(file)
--- a/
crypto/pkcs7/example.c
+++ b/
crypto/pkcs7/example.c
@@
-1,7
+1,9
@@
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
-#include <malloc.h>
-#include "pkcs7.h"
+#include <string.h>
+#include <openssl/pkcs7.h>
+#include <openssl/asn1_mac.h>
+#include <openssl/x509.h>
int add_signed_time(PKCS7_SIGNER_INFO *si)
{
int add_signed_time(PKCS7_SIGNER_INFO *si)
{
@@
-18,19
+20,16
@@
int add_signed_time(PKCS7_SIGNER_INFO *si)
ASN1_UTCTIME *get_signed_time(PKCS7_SIGNER_INFO *si)
{
ASN1_TYPE *so;
ASN1_UTCTIME *get_signed_time(PKCS7_SIGNER_INFO *si)
{
ASN1_TYPE *so;
- ASN1_UTCTIME *ut;
so=PKCS7_get_signed_attribute(si,NID_pkcs9_signingTime);
if (so->type == V_ASN1_UTCTIME)
so=PKCS7_get_signed_attribute(si,NID_pkcs9_signingTime);
if (so->type == V_ASN1_UTCTIME)
- {
- ut=so->value.utctime;
- }
- return(ut);
+ return so->value.utctime;
+ return NULL;
}
static int signed_string_nid= -1;
}
static int signed_string_nid= -1;
-
int
add_signed_string(PKCS7_SIGNER_INFO *si, char *str)
+
void
add_signed_string(PKCS7_SIGNER_INFO *si, char *str)
{
ASN1_OCTET_STRING *os;
{
ASN1_OCTET_STRING *os;
@@
-39,7
+38,7
@@
int add_signed_string(PKCS7_SIGNER_INFO *si, char *str)
signed_string_nid=
OBJ_create("1.2.3.4.5","OID_example","Our example OID");
os=ASN1_OCTET_STRING_new();
signed_string_nid=
OBJ_create("1.2.3.4.5","OID_example","Our example OID");
os=ASN1_OCTET_STRING_new();
- ASN1_OCTET_STRING_set(os,str,strlen(str));
+ ASN1_OCTET_STRING_set(os,
(unsigned char*)
str,strlen(str));
/* When we add, we do not free */
PKCS7_add_signed_attribute(si,signed_string_nid,
V_ASN1_OCTET_STRING,(char *)os);
/* When we add, we do not free */
PKCS7_add_signed_attribute(si,signed_string_nid,
V_ASN1_OCTET_STRING,(char *)os);
@@
-71,7
+70,7
@@
int get_signed_string(PKCS7_SIGNER_INFO *si, char *buf, int len)
return(0);
}
return(0);
}
-static signed_seq2string_nid= -1;
+static
int
signed_seq2string_nid= -1;
/* ########################################### */
int add_signed_seq2string(PKCS7_SIGNER_INFO *si, char *str1, char *str2)
{
/* ########################################### */
int add_signed_seq2string(PKCS7_SIGNER_INFO *si, char *str1, char *str2)
{
@@
-80,7
+79,7
@@
int add_signed_seq2string(PKCS7_SIGNER_INFO *si, char *str1, char *str2)
unsigned char *p;
ASN1_OCTET_STRING *os1,*os2;
ASN1_STRING *seq;
unsigned char *p;
ASN1_OCTET_STRING *os1,*os2;
ASN1_STRING *seq;
- char *data;
+
unsigned
char *data;
int i,total;
if (signed_seq2string_nid == -1)
int i,total;
if (signed_seq2string_nid == -1)
@@
-89,8
+88,8
@@
int add_signed_seq2string(PKCS7_SIGNER_INFO *si, char *str1, char *str2)
os1=ASN1_OCTET_STRING_new();
os2=ASN1_OCTET_STRING_new();
os1=ASN1_OCTET_STRING_new();
os2=ASN1_OCTET_STRING_new();
- ASN1_OCTET_STRING_set(os1,str1,strlen(str1));
- ASN1_OCTET_STRING_set(os2,str1,strlen(str1));
+ ASN1_OCTET_STRING_set(os1,
(unsigned char*)
str1,strlen(str1));
+ ASN1_OCTET_STRING_set(os2,
(unsigned char*)
str1,strlen(str1));
i =i2d_ASN1_OCTET_STRING(os1,NULL);
i+=i2d_ASN1_OCTET_STRING(os2,NULL);
total=ASN1_object_size(1,i,V_ASN1_SEQUENCE);
i =i2d_ASN1_OCTET_STRING(os1,NULL);
i+=i2d_ASN1_OCTET_STRING(os2,NULL);
total=ASN1_object_size(1,i,V_ASN1_SEQUENCE);
@@
-124,7
+123,7
@@
int get_signed_seq2string(PKCS7_SIGNER_INFO *si, char **str1, char **str2)
so=PKCS7_get_signed_attribute(si,signed_seq2string_nid);
if (so && (so->type == V_ASN1_SEQUENCE))
{
so=PKCS7_get_signed_attribute(si,signed_seq2string_nid);
if (so && (so->type == V_ASN1_SEQUENCE))
{
- ASN1_CTX c;
+ ASN1_
const_
CTX c;
ASN1_STRING *s;
long length;
ASN1_OCTET_STRING *os1,*os2;
ASN1_STRING *s;
long length;
ASN1_OCTET_STRING *os1,*os2;
@@
-145,7
+144,7
@@
int get_signed_seq2string(PKCS7_SIGNER_INFO *si, char **str1, char **str2)
goto err;
c.slen-=(c.p-c.q);
goto err;
c.slen-=(c.p-c.q);
- if (!asn1_Finish(&c)) goto err;
+ if (!asn1_
const_
Finish(&c)) goto err;
*str1=malloc(os1->length+1);
*str2=malloc(os2->length+1);
memcpy(*str1,os1->data,os1->length);
*str1=malloc(os1->length+1);
*str2=malloc(os2->length+1);
memcpy(*str1,os1->data,os1->length);
@@
-178,19
+177,16
@@
X509_ATTRIBUTE *create_time(void)
return(ret);
}
return(ret);
}
-ASN1_UTCTIME *sk_get_time(STACK *sk)
+ASN1_UTCTIME *sk_get_time(STACK
_OF(X509_ATTRIBUTE)
*sk)
{
ASN1_TYPE *so;
{
ASN1_TYPE *so;
- ASN1_UTCTIME *ut;
PKCS7_SIGNER_INFO si;
si.auth_attr=sk;
so=PKCS7_get_signed_attribute(&si,NID_pkcs9_signingTime);
if (so->type == V_ASN1_UTCTIME)
PKCS7_SIGNER_INFO si;
si.auth_attr=sk;
so=PKCS7_get_signed_attribute(&si,NID_pkcs9_signingTime);
if (so->type == V_ASN1_UTCTIME)
- {
- ut=so->value.utctime;
- }
- return(ut);
+ return so->value.utctime;
+ return NULL;
}
X509_ATTRIBUTE *create_string(char *str)
}
X509_ATTRIBUTE *create_string(char *str)
@@
-203,14
+199,14
@@
X509_ATTRIBUTE *create_string(char *str)
signed_string_nid=
OBJ_create("1.2.3.4.5","OID_example","Our example OID");
os=ASN1_OCTET_STRING_new();
signed_string_nid=
OBJ_create("1.2.3.4.5","OID_example","Our example OID");
os=ASN1_OCTET_STRING_new();
- ASN1_OCTET_STRING_set(os,str,strlen(str));
+ ASN1_OCTET_STRING_set(os,
(unsigned char*)
str,strlen(str));
/* When we add, we do not free */
ret=X509_ATTRIBUTE_create(signed_string_nid,
V_ASN1_OCTET_STRING,(char *)os);
return(ret);
}
/* When we add, we do not free */
ret=X509_ATTRIBUTE_create(signed_string_nid,
V_ASN1_OCTET_STRING,(char *)os);
return(ret);
}
-int sk_get_string(STACK *sk, char *buf, int len)
+int sk_get_string(STACK
_OF(X509_ATTRIBUTE)
*sk, char *buf, int len)
{
ASN1_TYPE *so;
ASN1_OCTET_STRING *os;
{
ASN1_TYPE *so;
ASN1_OCTET_STRING *os;
@@
-247,7
+243,7
@@
X509_ATTRIBUTE *add_seq2string(PKCS7_SIGNER_INFO *si, char *str1, char *str2)
ASN1_OCTET_STRING *os1,*os2;
ASN1_STRING *seq;
X509_ATTRIBUTE *ret;
ASN1_OCTET_STRING *os1,*os2;
ASN1_STRING *seq;
X509_ATTRIBUTE *ret;
- char *data;
+
unsigned
char *data;
int i,total;
if (signed_seq2string_nid == -1)
int i,total;
if (signed_seq2string_nid == -1)
@@
-256,8
+252,8
@@
X509_ATTRIBUTE *add_seq2string(PKCS7_SIGNER_INFO *si, char *str1, char *str2)
os1=ASN1_OCTET_STRING_new();
os2=ASN1_OCTET_STRING_new();
os1=ASN1_OCTET_STRING_new();
os2=ASN1_OCTET_STRING_new();
- ASN1_OCTET_STRING_set(os1,str1,strlen(str1));
- ASN1_OCTET_STRING_set(os2,str1,strlen(str1));
+ ASN1_OCTET_STRING_set(os1,
(unsigned char*)
str1,strlen(str1));
+ ASN1_OCTET_STRING_set(os2,
(unsigned char*)
str1,strlen(str1));
i =i2d_ASN1_OCTET_STRING(os1,NULL);
i+=i2d_ASN1_OCTET_STRING(os2,NULL);
total=ASN1_object_size(1,i,V_ASN1_SEQUENCE);
i =i2d_ASN1_OCTET_STRING(os1,NULL);
i+=i2d_ASN1_OCTET_STRING(os2,NULL);
total=ASN1_object_size(1,i,V_ASN1_SEQUENCE);
@@
-280,7
+276,7
@@
X509_ATTRIBUTE *add_seq2string(PKCS7_SIGNER_INFO *si, char *str1, char *str2)
}
/* For this case, I will malloc the return strings */
}
/* For this case, I will malloc the return strings */
-int sk_get_seq2string(STACK *sk, char **str1, char **str2)
+int sk_get_seq2string(STACK
_OF(X509_ATTRIBUTE)
*sk, char **str1, char **str2)
{
ASN1_TYPE *so;
PKCS7_SIGNER_INFO si;
{
ASN1_TYPE *so;
PKCS7_SIGNER_INFO si;
@@
-294,7
+290,7
@@
int sk_get_seq2string(STACK *sk, char **str1, char **str2)
so=PKCS7_get_signed_attribute(&si,signed_seq2string_nid);
if (so->type == V_ASN1_SEQUENCE)
{
so=PKCS7_get_signed_attribute(&si,signed_seq2string_nid);
if (so->type == V_ASN1_SEQUENCE)
{
- ASN1_CTX c;
+ ASN1_
const_
CTX c;
ASN1_STRING *s;
long length;
ASN1_OCTET_STRING *os1,*os2;
ASN1_STRING *s;
long length;
ASN1_OCTET_STRING *os1,*os2;
@@
-315,7
+311,7
@@
int sk_get_seq2string(STACK *sk, char **str1, char **str2)
goto err;
c.slen-=(c.p-c.q);
goto err;
c.slen-=(c.p-c.q);
- if (!asn1_Finish(&c)) goto err;
+ if (!asn1_
const_
Finish(&c)) goto err;
*str1=malloc(os1->length+1);
*str2=malloc(os2->length+1);
memcpy(*str1,os1->data,os1->length);
*str1=malloc(os1->length+1);
*str2=malloc(os2->length+1);
memcpy(*str1,os1->data,os1->length);