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/a_bool.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/a_bool.c')
| -rw-r--r-- | src/lib/libcrypto/asn1/a_bool.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libcrypto/asn1/a_bool.c b/src/lib/libcrypto/asn1/a_bool.c index 24333ea4d5..331acdf053 100644 --- a/src/lib/libcrypto/asn1/a_bool.c +++ b/src/lib/libcrypto/asn1/a_bool.c | |||
| @@ -75,10 +75,10 @@ int i2d_ASN1_BOOLEAN(int a, unsigned char **pp) | |||
| 75 | return(r); | 75 | return(r); |
| 76 | } | 76 | } |
| 77 | 77 | ||
| 78 | int d2i_ASN1_BOOLEAN(int *a, unsigned char **pp, long length) | 78 | int d2i_ASN1_BOOLEAN(int *a, const unsigned char **pp, long length) |
| 79 | { | 79 | { |
| 80 | int ret= -1; | 80 | int ret= -1; |
| 81 | unsigned char *p; | 81 | const unsigned char *p; |
| 82 | long len; | 82 | long len; |
| 83 | int inf,tag,xclass; | 83 | int inf,tag,xclass; |
| 84 | int i=0; | 84 | int i=0; |