diff options
| author | djm <> | 2008-09-06 12:15:54 +0000 |
|---|---|---|
| committer | djm <> | 2008-09-06 12:15:54 +0000 |
| commit | f1625f274acf5dcd5601f6cb5e29e233b2a441a3 (patch) | |
| tree | 44899ddfbef8f24aacbea50086c041c1b150f6d6 /src/lib/libcrypto/pkcs7/example.c | |
| parent | 4f828b924f54507141fb95ebe49dfcd261945e85 (diff) | |
| download | openbsd-f1625f274acf5dcd5601f6cb5e29e233b2a441a3.tar.gz openbsd-f1625f274acf5dcd5601f6cb5e29e233b2a441a3.tar.bz2 openbsd-f1625f274acf5dcd5601f6cb5e29e233b2a441a3.zip | |
import of OpenSSL 0.9.8h
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libcrypto/pkcs7/example.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libcrypto/pkcs7/example.c b/src/lib/libcrypto/pkcs7/example.c index c993947cc3..2953d04b5c 100644 --- a/src/lib/libcrypto/pkcs7/example.c +++ b/src/lib/libcrypto/pkcs7/example.c | |||
| @@ -123,7 +123,7 @@ int get_signed_seq2string(PKCS7_SIGNER_INFO *si, char **str1, char **str2) | |||
| 123 | so=PKCS7_get_signed_attribute(si,signed_seq2string_nid); | 123 | so=PKCS7_get_signed_attribute(si,signed_seq2string_nid); |
| 124 | if (so && (so->type == V_ASN1_SEQUENCE)) | 124 | if (so && (so->type == V_ASN1_SEQUENCE)) |
| 125 | { | 125 | { |
| 126 | ASN1_CTX c; | 126 | ASN1_const_CTX c; |
| 127 | ASN1_STRING *s; | 127 | ASN1_STRING *s; |
| 128 | long length; | 128 | long length; |
| 129 | ASN1_OCTET_STRING *os1,*os2; | 129 | ASN1_OCTET_STRING *os1,*os2; |
| @@ -144,7 +144,7 @@ int get_signed_seq2string(PKCS7_SIGNER_INFO *si, char **str1, char **str2) | |||
| 144 | goto err; | 144 | goto err; |
| 145 | c.slen-=(c.p-c.q); | 145 | c.slen-=(c.p-c.q); |
| 146 | 146 | ||
| 147 | if (!asn1_Finish(&c)) goto err; | 147 | if (!asn1_const_Finish(&c)) goto err; |
| 148 | *str1=malloc(os1->length+1); | 148 | *str1=malloc(os1->length+1); |
| 149 | *str2=malloc(os2->length+1); | 149 | *str2=malloc(os2->length+1); |
| 150 | memcpy(*str1,os1->data,os1->length); | 150 | memcpy(*str1,os1->data,os1->length); |
| @@ -290,7 +290,7 @@ int sk_get_seq2string(STACK_OF(X509_ATTRIBUTE) *sk, char **str1, char **str2) | |||
| 290 | so=PKCS7_get_signed_attribute(&si,signed_seq2string_nid); | 290 | so=PKCS7_get_signed_attribute(&si,signed_seq2string_nid); |
| 291 | if (so->type == V_ASN1_SEQUENCE) | 291 | if (so->type == V_ASN1_SEQUENCE) |
| 292 | { | 292 | { |
| 293 | ASN1_CTX c; | 293 | ASN1_const_CTX c; |
| 294 | ASN1_STRING *s; | 294 | ASN1_STRING *s; |
| 295 | long length; | 295 | long length; |
| 296 | ASN1_OCTET_STRING *os1,*os2; | 296 | ASN1_OCTET_STRING *os1,*os2; |
| @@ -311,7 +311,7 @@ int sk_get_seq2string(STACK_OF(X509_ATTRIBUTE) *sk, char **str1, char **str2) | |||
| 311 | goto err; | 311 | goto err; |
| 312 | c.slen-=(c.p-c.q); | 312 | c.slen-=(c.p-c.q); |
| 313 | 313 | ||
| 314 | if (!asn1_Finish(&c)) goto err; | 314 | if (!asn1_const_Finish(&c)) goto err; |
| 315 | *str1=malloc(os1->length+1); | 315 | *str1=malloc(os1->length+1); |
| 316 | *str2=malloc(os2->length+1); | 316 | *str2=malloc(os2->length+1); |
| 317 | memcpy(*str1,os1->data,os1->length); | 317 | memcpy(*str1,os1->data,os1->length); |
