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/aes/aes_misc.c | |
| parent | 12867252827c8efaa8ddd1fa3b3d6e321e2bcdef (diff) | |
| download | openbsd-38ce604e3cc97706b876b0525ddff0121115456d.tar.gz openbsd-38ce604e3cc97706b876b0525ddff0121115456d.tar.bz2 openbsd-38ce604e3cc97706b876b0525ddff0121115456d.zip | |
resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/aes/aes_misc.c')
| -rw-r--r-- | src/lib/libcrypto/aes/aes_misc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/libcrypto/aes/aes_misc.c b/src/lib/libcrypto/aes/aes_misc.c index 090def25d5..4fead1b4c7 100644 --- a/src/lib/libcrypto/aes/aes_misc.c +++ b/src/lib/libcrypto/aes/aes_misc.c | |||
| @@ -53,7 +53,7 @@ | |||
| 53 | #include <openssl/aes.h> | 53 | #include <openssl/aes.h> |
| 54 | #include "aes_locl.h" | 54 | #include "aes_locl.h" |
| 55 | 55 | ||
| 56 | const char *AES_version="AES" OPENSSL_VERSION_PTEXT; | 56 | const char AES_version[]="AES" OPENSSL_VERSION_PTEXT; |
| 57 | 57 | ||
| 58 | const char *AES_options(void) { | 58 | const char *AES_options(void) { |
| 59 | #ifdef FULL_UNROLL | 59 | #ifdef FULL_UNROLL |