Skip to content

Commit

Permalink
* src/munged/cipher.c (HAVE_OPENSSL:_cipher_map_enum),
Browse files Browse the repository at this point in the history
  src/libmunge/enum.c: Made AES-256 support dependent upon SHA-256
  since the 256-bit cipher key length can currently only be satisfied
  by a 256-bit message digest.
  • Loading branch information
dun committed Nov 14, 2006
1 parent a0b5fbd commit 1c34cbc
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 3 deletions.
7 changes: 7 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
2006-11-14 Chris Dunlap <[email protected]>

* src/munged/cipher.c (HAVE_OPENSSL:_cipher_map_enum),
src/libmunge/enum.c: Made AES-256 support dependent upon SHA-256
since the 256-bit cipher key length can currently only be satisfied
by a 256-bit message digest.

2006-11-13 Chris Dunlap <[email protected]>

* src/munged/cipher.c (HAVE_LIBGCRYPT:_cipher_final): Changed so
Expand Down
2 changes: 1 addition & 1 deletion src/libmunge/enum.c
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
# define MUNGE_CIPHER_AES128_FLAG 0
#endif

#if HAVE_LIBGCRYPT || HAVE_EVP_AES_256_CBC
#if HAVE_LIBGCRYPT || (HAVE_EVP_AES_256_CBC && HAVE_EVP_SHA256)
# define MUNGE_CIPHER_AES256_FLAG 1
#else
# define MUNGE_CIPHER_AES256_FLAG 0
Expand Down
4 changes: 2 additions & 2 deletions src/munged/cipher.c
Original file line number Diff line number Diff line change
Expand Up @@ -653,11 +653,11 @@ _cipher_map_enum (munge_cipher_t cipher, void *dst)
algo = EVP_aes_128_cbc ();
break;
#endif /* HAVE_EVP_AES_128_CBC */
#if HAVE_EVP_AES_256_CBC
#if HAVE_EVP_AES_256_CBC && HAVE_EVP_SHA256
case MUNGE_CIPHER_AES256:
algo = EVP_aes_256_cbc ();
break;
#endif /* HAVE_EVP_AES_256_CBC */
#endif /* HAVE_EVP_AES_256_CBC && HAVE_EVP_SHA256 */
default:
rc = -1;
break;
Expand Down

0 comments on commit 1c34cbc

Please sign in to comment.