From 77ba58109058d4184417e1700d27d173c905c2c2 Mon Sep 17 00:00:00 2001
From: donal72 <donal72>
Date: Tue, 16 Oct 2007 13:28:45 +0000
Subject: [PATCH] Create DistinguishedName records with a subjectAltName field,
 and recognise incoming certificates' subjectAltName fields: MDL-11020,
 MDL-10326

---
 mnet/lib.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/mnet/lib.php b/mnet/lib.php
index aa6ebf5ce0..e355f0c1c7 100644
--- a/mnet/lib.php
+++ b/mnet/lib.php
@@ -79,6 +79,9 @@ function mnet_get_public_key($uri, $application=null) {
         if (strlen(trim($public_certificate))) {
             $credentials = openssl_x509_parse($public_certificate);
             $host = $credentials['subject']['CN'];
+            if (array_key_exists( 'subjectAltName', $credentials['subject'])) {
+                $host = $credentials['subject']['subjectAltName'];
+            }
             if (strpos($uri, $host) !== false) {
                 mnet_set_public_key($uri, $public_certificate);
                 return $public_certificate;
@@ -310,7 +313,8 @@ function mnet_generate_keypair($dn = null, $days=28) {
            "localityName" => $locality,
            "organizationName" => $organization,
            "organizationalUnitName" => 'Moodle',
-           "commonName" => $CFG->wwwroot,
+           "commonName" => substr($CFG->wwwroot, 0, 64),
+           "subjectAltName" => $CFG->wwwroot,
            "emailAddress" => $email
         );
     }
-- 
2.39.5