projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Since we're moving between directories, let's get an absolute path to
[oweals/openssl.git]
/
crypto
/
pkcs7
/
example.c
diff --git
a/crypto/pkcs7/example.c
b/crypto/pkcs7/example.c
index f6656be28e19b30de5bc0039cb0959003d216c73..2953d04b5c905e54a37c9dd7e0c1308be80b3852 100644
(file)
--- a/
crypto/pkcs7/example.c
+++ b/
crypto/pkcs7/example.c
@@
-3,6
+3,7
@@
#include <string.h>
#include <openssl/pkcs7.h>
#include <openssl/asn1_mac.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)
{
@@
-122,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;
@@
-143,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);
@@
-289,7
+290,7
@@
int sk_get_seq2string(STACK_OF(X509_ATTRIBUTE) *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;
@@
-310,7
+311,7
@@
int sk_get_seq2string(STACK_OF(X509_ATTRIBUTE) *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);