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/krb5 | |
| parent | 12867252827c8efaa8ddd1fa3b3d6e321e2bcdef (diff) | |
| download | openbsd-38ce604e3cc97706b876b0525ddff0121115456d.tar.gz openbsd-38ce604e3cc97706b876b0525ddff0121115456d.tar.bz2 openbsd-38ce604e3cc97706b876b0525ddff0121115456d.zip | |
resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/krb5')
| -rw-r--r-- | src/lib/libcrypto/krb5/krb5_asn.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/libcrypto/krb5/krb5_asn.h b/src/lib/libcrypto/krb5/krb5_asn.h index 3329477b07..41725d0dc4 100644 --- a/src/lib/libcrypto/krb5/krb5_asn.h +++ b/src/lib/libcrypto/krb5/krb5_asn.h | |||
| @@ -225,7 +225,7 @@ DECLARE_STACK_OF(KRB5_AUTHENTBODY) | |||
| 225 | ** void name##_free(type *a); | 225 | ** void name##_free(type *a); |
| 226 | ** DECLARE_ASN1_ENCODE_FUNCTIONS(type, name, name) = | 226 | ** DECLARE_ASN1_ENCODE_FUNCTIONS(type, name, name) = |
| 227 | ** DECLARE_ASN1_ENCODE_FUNCTIONS(type, itname, name) = | 227 | ** DECLARE_ASN1_ENCODE_FUNCTIONS(type, itname, name) = |
| 228 | ** type *d2i_##name(type **a, unsigned char **in, long len); | 228 | ** type *d2i_##name(type **a, const unsigned char **in, long len); |
| 229 | ** int i2d_##name(type *a, unsigned char **out); | 229 | ** int i2d_##name(type *a, unsigned char **out); |
| 230 | ** DECLARE_ASN1_ITEM(itname) = OPENSSL_EXTERN const ASN1_ITEM itname##_it | 230 | ** DECLARE_ASN1_ITEM(itname) = OPENSSL_EXTERN const ASN1_ITEM itname##_it |
| 231 | */ | 231 | */ |