CVE-2022-37966 kdc: Implement new Kerberos session key behaviour since ENC_HMAC_SHA1_...

[samba.git] / source4 / kdc / sdb_to_hdb.c

diff --git a/source4/kdc/sdb_to_hdb.c b/source4/kdc/sdb_to_hdb.c
index f1976573d0bbcd6c46edfafa647f469d943988f5..c72eb91ea218b585dc68c2c4895fc7988c0f5ca5 100644 (file)
--- a/source4/kdc/sdb_to_hdb.c
+++ b/source4/kdc/sdb_to_hdb.c
@@ -26,6 +26,7 @@
 #include "sdb.h"
 #include "sdb_hdb.h"
 #include "lib/krb5_wrap/krb5_samba.h"
+#include "librpc/gen_ndr/security.h"
 #include "kdc/samba_kdc.h"
 
 #undef DBGC_CLASS
@@ -273,14 +274,14 @@ int sdb_entry_to_hdb_entry(krb5_context context,
        sdb_flags_to_hdb_flags(&s->flags, &h->flags);
 
        h->etypes = NULL;
-       if (h->keys.val != NULL) {
+       if (s->etypes != NULL) {
                h->etypes = malloc(sizeof(*h->etypes));
                if (h->etypes == NULL) {
                        rc = ENOMEM;
                        goto error;
                }
 
-               h->etypes->len = s->keys.len;
+               h->etypes->len = s->etypes->len;
 
                h->etypes->val = calloc(h->etypes->len, sizeof(int));
                if (h->etypes->val == NULL) {
@@ -289,9 +290,28 @@ int sdb_entry_to_hdb_entry(krb5_context context,
                }
 
                for (i = 0; i < h->etypes->len; i++) {
-                       Key k = h->keys.val[i];
+                       h->etypes->val[i] = s->etypes->val[i];
+               }
+       }
+
+       h->session_etypes = NULL;
+       if (s->session_etypes != NULL) {
+               h->session_etypes = malloc(sizeof(*h->session_etypes));
+               if (h->session_etypes == NULL) {
+                       rc = ENOMEM;
+                       goto error;
+               }
+
+               h->session_etypes->len = s->session_etypes->len;
+
+               h->session_etypes->val = calloc(h->session_etypes->len, sizeof(*h->session_etypes->val));
+               if (h->session_etypes->val == NULL) {
+                       rc = ENOMEM;
+                       goto error;
+               }
 
-                       h->etypes->val[i] = KRB5_KEY_TYPE(&(k.key));
+               for (i = 0; i < h->session_etypes->len; ++i) {
+                       h->session_etypes->val[i] = s->session_etypes->val[i];
                }
        }