Merge patch branch changes to main.

extensions/guacamole-auth-totp/src/licenses/bundled/totp-reference-impl-07/README

@@ -1,8 +0,0 @@
-TOTP Reference Implementation (https://tools.ietf.org/id/draft-mraihi-totp-timebased-07.html#Section-Reference-Impl)
--------------------------------------------------------------------------------
-
-    Verson: 07
-    From: 'IETF Trust' (http://trustee.ietf.org/license-info)
-    License(s):
-        BSD 3-clause (bundled/totp-reference-impl-07/license.txt)
-

extensions/guacamole-auth-totp/src/licenses/bundled/totp-reference-impl-07/license.txt

@@ -1,3 +1,10 @@
+# Name:    TOTP Reference Implementation
+# URL:     https://tools.ietf.org/id/draft-mraihi-totp-timebased-07.html#Section-Reference-Impl
+# Version: 07
+# From:    'IETF Trust' (http://trustee.ietf.org/license-info)
+# License: BSD 3-clause 
+#
+# --- BEGIN LICENSE FILE ---
 Copyright (c) 2011 IETF Trust and the persons identified as authors
 of the code. All rights reserved.
 
@@ -25,4 +32,4 @@ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
 CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
+# --- END LICENSE FILE ---