diff options
| author | djm <> | 2010-10-01 22:59:01 +0000 |
|---|---|---|
| committer | djm <> | 2010-10-01 22:59:01 +0000 |
| commit | fe047d8b632246cb2db3234a0a4f32e5c318857b (patch) | |
| tree | 939b752540947d33507b3acc48d76a8bfb7c3dc3 /src/lib/libcrypto/asn1/x_req.c | |
| parent | 2ea67f4aa254b09ded62e6e14fc893bbe6381579 (diff) | |
| download | openbsd-fe047d8b632246cb2db3234a0a4f32e5c318857b.tar.gz openbsd-fe047d8b632246cb2db3234a0a4f32e5c318857b.tar.bz2 openbsd-fe047d8b632246cb2db3234a0a4f32e5c318857b.zip | |
resolve conflicts, fix local changes
Diffstat (limited to 'src/lib/libcrypto/asn1/x_req.c')
| -rw-r--r-- | src/lib/libcrypto/asn1/x_req.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/libcrypto/asn1/x_req.c b/src/lib/libcrypto/asn1/x_req.c index 59ca8ce329..d57555827c 100644 --- a/src/lib/libcrypto/asn1/x_req.c +++ b/src/lib/libcrypto/asn1/x_req.c | |||
| @@ -79,7 +79,8 @@ | |||
| 79 | * | 79 | * |
| 80 | */ | 80 | */ |
| 81 | 81 | ||
| 82 | static int rinf_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it) | 82 | static int rinf_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, |
| 83 | void *exarg) | ||
| 83 | { | 84 | { |
| 84 | X509_REQ_INFO *rinf = (X509_REQ_INFO *)*pval; | 85 | X509_REQ_INFO *rinf = (X509_REQ_INFO *)*pval; |
| 85 | 86 | ||