From: XhmikosR <xhmikosr@gmail.com>
Date: Mon, 15 Jan 2018 22:56:30 +0000 (+0200)
Subject: Use the SRI hashes for the live site's assets. (#25282)
X-Git-Tag: v4.0.0~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e6d9316ba0d99125edd3484c8a3778b6fa7be2e7;p=thirdparty%2Fbootstrap.git

Use the SRI hashes for the live site's assets. (#25282)
---

diff --git a/_includes/header.html b/_includes/header.html
index f2f1deff86..85d3753e1c 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -14,7 +14,7 @@
 
 <!-- Bootstrap core CSS -->
 {% if site.github %}
-<link href="{{ site.baseurl }}/dist/css/bootstrap.min.css" rel="stylesheet">
+<link href="{{ site.baseurl }}/dist/css/bootstrap.min.css" rel="stylesheet" integrity="{{ site.cdn.css_hash }}" crossorigin="anonymous">
 {% else %}
 <link href="{{ site.baseurl }}/dist/css/bootstrap.css" rel="stylesheet">
 {% endif %}
diff --git a/_includes/scripts.html b/_includes/scripts.html
index ee598dcc4d..7c262149f2 100644
--- a/_includes/scripts.html
+++ b/_includes/scripts.html
@@ -1,10 +1,10 @@
 <script src="{{ site.cdn.jquery }}" integrity="{{ site.cdn.jquery_hash }}" crossorigin="anonymous"></script>
 <script>window.jQuery || document.write('<script src="{{ site.baseurl }}/assets/js/vendor/jquery-slim.min.js"><\/script>')</script>
 
-<script src="{{ site.baseurl }}/assets/js/vendor/popper.min.js"></script>
+<script src="{{ site.baseurl }}/assets/js/vendor/popper.min.js"{% if site.github %} integrity="{{ site.cdn.popper_hash }}" crossorigin="anonymous"{% endif %}></script>
 
 {%- if site.github -%}
-  <script src="{{ site.baseurl }}/dist/js/bootstrap.min.js"></script>
+  <script src="{{ site.baseurl }}/dist/js/bootstrap.min.js" integrity="{{ site.cdn.js_hash }}" crossorigin="anonymous"></script>
 {%- else -%}
   <script src="{{ site.baseurl }}/dist/js/bootstrap.js"></script>
 {%- endif -%}