diff options
| author | djm <> | 2012-10-13 21:25:14 +0000 |
|---|---|---|
| committer | djm <> | 2012-10-13 21:25:14 +0000 |
| commit | 93723b50b639d8dc717bc1bf463fd46e1b321239 (patch) | |
| tree | 281e0a29ae8f87a8c47fbd4deaa1f3d48b8cc5c1 /src/lib/libcrypto/aes/aes.h | |
| parent | 65e72ac55a6405783db7a12d7e35a7561d46005b (diff) | |
| download | openbsd-93723b50b639d8dc717bc1bf463fd46e1b321239.tar.gz openbsd-93723b50b639d8dc717bc1bf463fd46e1b321239.tar.bz2 openbsd-93723b50b639d8dc717bc1bf463fd46e1b321239.zip | |
resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/aes/aes.h')
| -rw-r--r-- | src/lib/libcrypto/aes/aes.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/lib/libcrypto/aes/aes.h b/src/lib/libcrypto/aes/aes.h index d2c99730fe..031abf01b5 100644 --- a/src/lib/libcrypto/aes/aes.h +++ b/src/lib/libcrypto/aes/aes.h | |||
| @@ -90,6 +90,11 @@ int AES_set_encrypt_key(const unsigned char *userKey, const int bits, | |||
| 90 | int AES_set_decrypt_key(const unsigned char *userKey, const int bits, | 90 | int AES_set_decrypt_key(const unsigned char *userKey, const int bits, |
| 91 | AES_KEY *key); | 91 | AES_KEY *key); |
| 92 | 92 | ||
| 93 | int private_AES_set_encrypt_key(const unsigned char *userKey, const int bits, | ||
| 94 | AES_KEY *key); | ||
| 95 | int private_AES_set_decrypt_key(const unsigned char *userKey, const int bits, | ||
| 96 | AES_KEY *key); | ||
| 97 | |||
| 93 | void AES_encrypt(const unsigned char *in, unsigned char *out, | 98 | void AES_encrypt(const unsigned char *in, unsigned char *out, |
| 94 | const AES_KEY *key); | 99 | const AES_KEY *key); |
| 95 | void AES_decrypt(const unsigned char *in, unsigned char *out, | 100 | void AES_decrypt(const unsigned char *in, unsigned char *out, |