diff options
| author | Nathaniel McCallum <npmccallum@redhat.com> | 2015-03-10 10:57:23 -0400 |
|---|---|---|
| committer | Simo Sorce <simo@redhat.com> | 2015-03-10 18:31:54 -0400 |
| commit | e9c92795d87a316ea47f6bf37c9636e86eec57e7 (patch) | |
| tree | d1e406913ce8987eae438f0b3b4665cce9eba41f /src/mod_auth_gssapi.c | |
| parent | 1fc49992c107bd3830921a8198929a936e8b7fb2 (diff) | |
| download | mod_auth_gssapi-e9c92795d87a316ea47f6bf37c9636e86eec57e7.tar.gz mod_auth_gssapi-e9c92795d87a316ea47f6bf37c9636e86eec57e7.tar.xz mod_auth_gssapi-e9c92795d87a316ea47f6bf37c9636e86eec57e7.zip | |
Use aes-256-gcm rather than aes-128-cbc
Also, remove all the manual HMAC code since it is no longer needed.
The end result should be faster and stronger authenticated encryption.
Closes #12
Reviewed-by: Simo Sorce <simo@redhat.com>
Diffstat (limited to 'src/mod_auth_gssapi.c')
| -rw-r--r-- | src/mod_auth_gssapi.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mod_auth_gssapi.c b/src/mod_auth_gssapi.c index b5e6a2e..4f21123 100644 --- a/src/mod_auth_gssapi.c +++ b/src/mod_auth_gssapi.c @@ -586,7 +586,7 @@ static const char *mag_use_s4u2p(cmd_parms *parms, void *mconfig, int on) static const char *mag_sess_key(cmd_parms *parms, void *mconfig, const char *w) { struct mag_config *cfg = (struct mag_config *)mconfig; - struct databuf keys; + struct databuf key; unsigned char *val; apr_status_t rc; const char *k; @@ -607,16 +607,16 @@ static const char *mag_sess_key(cmd_parms *parms, void *mconfig, const char *w) return NULL; } - keys.length = (int)apr_base64_decode_binary(val, k); - keys.value = (unsigned char *)val; + key.length = (int)apr_base64_decode_binary(val, k); + key.value = (unsigned char *)val; - if (keys.length != 32) { + if (key.length < 32) { ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, parms->server, - "Invalid key lenght, expected 32 got %d", keys.length); + "Invalid key length, expected >=32 got %d", key.length); return NULL; } - rc = SEAL_KEY_CREATE(cfg->pool, &cfg->mag_skey, &keys); + rc = SEAL_KEY_CREATE(cfg->pool, &cfg->mag_skey, &key); if (rc != OK) { ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, parms->server, "Failed to import sealing key!"); |