diff options
| author | djm <> | 2012-10-13 21:25:14 +0000 |
|---|---|---|
| committer | djm <> | 2012-10-13 21:25:14 +0000 |
| commit | 942650cdef05a877200cb7aff3a075935a5fd0cd (patch) | |
| tree | 281e0a29ae8f87a8c47fbd4deaa1f3d48b8cc5c1 /src/lib/libcrypto/rc4/rc4.h | |
| parent | 37f091539f73e1650c83acd0c78677ef48c209a6 (diff) | |
| download | openbsd-942650cdef05a877200cb7aff3a075935a5fd0cd.tar.gz openbsd-942650cdef05a877200cb7aff3a075935a5fd0cd.tar.bz2 openbsd-942650cdef05a877200cb7aff3a075935a5fd0cd.zip | |
resolve conflicts
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libcrypto/rc4/rc4.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/lib/libcrypto/rc4/rc4.h b/src/lib/libcrypto/rc4/rc4.h index 29d1acccf5..88ceb46bc5 100644 --- a/src/lib/libcrypto/rc4/rc4.h +++ b/src/lib/libcrypto/rc4/rc4.h | |||
| @@ -79,6 +79,7 @@ typedef struct rc4_key_st | |||
| 79 | 79 | ||
| 80 | const char *RC4_options(void); | 80 | const char *RC4_options(void); |
| 81 | void RC4_set_key(RC4_KEY *key, int len, const unsigned char *data); | 81 | void RC4_set_key(RC4_KEY *key, int len, const unsigned char *data); |
| 82 | void private_RC4_set_key(RC4_KEY *key, int len, const unsigned char *data); | ||
| 82 | void RC4(RC4_KEY *key, size_t len, const unsigned char *indata, | 83 | void RC4(RC4_KEY *key, size_t len, const unsigned char *indata, |
| 83 | unsigned char *outdata); | 84 | unsigned char *outdata); |
| 84 | 85 | ||