diff options
| author | djm <> | 2008-09-06 12:17:54 +0000 |
|---|---|---|
| committer | djm <> | 2008-09-06 12:17:54 +0000 |
| commit | 38ce604e3cc97706b876b0525ddff0121115456d (patch) | |
| tree | 7ccc28afe1789ea3dbedf72365f955d5b8e105b5 /src/lib/libcrypto/asn1/x_req.c | |
| parent | 12867252827c8efaa8ddd1fa3b3d6e321e2bcdef (diff) | |
| download | openbsd-38ce604e3cc97706b876b0525ddff0121115456d.tar.gz openbsd-38ce604e3cc97706b876b0525ddff0121115456d.tar.bz2 openbsd-38ce604e3cc97706b876b0525ddff0121115456d.zip | |
resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/asn1/x_req.c')
| -rw-r--r-- | src/lib/libcrypto/asn1/x_req.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/libcrypto/asn1/x_req.c b/src/lib/libcrypto/asn1/x_req.c index b3f18ebc12..59ca8ce329 100644 --- a/src/lib/libcrypto/asn1/x_req.c +++ b/src/lib/libcrypto/asn1/x_req.c | |||
| @@ -102,7 +102,7 @@ ASN1_SEQUENCE_enc(X509_REQ_INFO, enc, rinf_cb) = { | |||
| 102 | 102 | ||
| 103 | IMPLEMENT_ASN1_FUNCTIONS(X509_REQ_INFO) | 103 | IMPLEMENT_ASN1_FUNCTIONS(X509_REQ_INFO) |
| 104 | 104 | ||
| 105 | ASN1_SEQUENCE_ref(X509_REQ, 0, CRYPTO_LOCK_X509_INFO) = { | 105 | ASN1_SEQUENCE_ref(X509_REQ, 0, CRYPTO_LOCK_X509_REQ) = { |
| 106 | ASN1_SIMPLE(X509_REQ, req_info, X509_REQ_INFO), | 106 | ASN1_SIMPLE(X509_REQ, req_info, X509_REQ_INFO), |
| 107 | ASN1_SIMPLE(X509_REQ, sig_alg, X509_ALGOR), | 107 | ASN1_SIMPLE(X509_REQ, sig_alg, X509_ALGOR), |
| 108 | ASN1_SIMPLE(X509_REQ, signature, ASN1_BIT_STRING) | 108 | ASN1_SIMPLE(X509_REQ, signature, ASN1_BIT_STRING) |