diff options
| author |   djm <djm@openbsd.org> | 2010-10-01 22:58:41 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2010-10-01 22:58:41 +0000 |
| commit | 0a5d6eded2bd6dd9bf9d298f0d7139301afe8abe (patch) | |
| tree | 9173c770f38c55515569708729da7e02172d3f3d /lib/libcrypto/asn1/x_req.c | |
| parent | import OpenSSL-1.0.0a (diff) | |
| download | wireguard-openbsd-0a5d6eded2bd6dd9bf9d298f0d7139301afe8abe.tar.xz wireguard-openbsd-0a5d6eded2bd6dd9bf9d298f0d7139301afe8abe.zip | |
resolve conflicts, fix local changes
Diffstat (limited to 'lib/libcrypto/asn1/x_req.c')
| -rw-r--r-- | lib/libcrypto/asn1/x_req.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/libcrypto/asn1/x_req.c b/lib/libcrypto/asn1/x_req.c index 59ca8ce3293..d57555827cc 100644 --- a/lib/libcrypto/asn1/x_req.c +++ b/lib/libcrypto/asn1/x_req.c @@ -79,7 +79,8 @@ * */ -static int rinf_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it) +static int rinf_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, + void *exarg) { X509_REQ_INFO *rinf = (X509_REQ_INFO *)*pval; |