projects
/
mod_auth_gssapi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use aes-256-gcm rather than aes-128-cbc
[mod_auth_gssapi.git]
/
src
/
mod_auth_gssapi.c
diff --git
a/src/mod_auth_gssapi.c
b/src/mod_auth_gssapi.c
index
b5e6a2e
..
4f21123
100644
(file)
--- 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;
static const char *mag_sess_key(cmd_parms *parms, void *mconfig, const char *w)
{
struct mag_config *cfg = (struct mag_config *)mconfig;
- struct databuf key
s
;
+ struct databuf key;
unsigned char *val;
apr_status_t rc;
const char *k;
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;
}
return NULL;
}
- key
s
.length = (int)apr_base64_decode_binary(val, k);
- key
s
.value = (unsigned char *)val;
+ key.length = (int)apr_base64_decode_binary(val, k);
+ key.value = (unsigned char *)val;
- if (key
s.length !=
32) {
+ if (key
.length <
32) {
ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, parms->server,
ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, parms->server,
- "Invalid key leng
ht, expected 32 got %d", keys
.length);
+ "Invalid key leng
th, expected >=32 got %d", key
.length);
return NULL;
}
return NULL;
}
- rc = SEAL_KEY_CREATE(cfg->pool, &cfg->mag_skey, &key
s
);
+ 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!");
if (rc != OK) {
ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, parms->server,
"Failed to import sealing key!");