Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Definitions section – Clarifications – some structural changes #13

Merged
merged 24 commits into from Apr 22, 2015
Merged

Definitions section – Clarifications – some structural changes #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
01195a3
Added Definitions link
thedoctor Mar 17, 2015
a843b97
Formatting and spacing consistency - trailing whitespace - stray uncl…
thedoctor Mar 17, 2015
cfba64b
definitions stub
thedoctor Mar 17, 2015
068e00e
Merge branch 'master' of github.com:CryptoConsortium/CCSS into gh-pages
thedoctor Apr 7, 2015
6fb7f28
refactored to eliminate unnecessary for loops
thedoctor Apr 7, 2015
611af4b
somewhat hacky method of adding definition links inline in aspect de…
thedoctor Apr 12, 2015
3f125fe
begin adding definitions.
thedoctor Apr 12, 2015
e6b686e
Adding definitions
thedoctor Apr 12, 2015
126b2b8
More definitions. Clarified the 1.01-level1 requirement regarding ba…
thedoctor Apr 13, 2015
49ceb71
ampersand
thedoctor Apr 13, 2015
e5f8d95
Added note about Dual_EC backdoor
thedoctor Apr 13, 2015
15248bf
More definitions, address,wallet,hdwallet,multisig
thedoctor Apr 13, 2015
b9ae6e9
Added definition links and clarified the distinction between 'wallet…
thedoctor Apr 13, 2015
b58eb23
typo
thedoctor Apr 13, 2015
96ab80c
linkified Key Storage and clarified that backup requirements don't a…
thedoctor Apr 13, 2015
a05a72d
More definitions and clarifications
thedoctor Apr 13, 2015
50f2197
Added definition tags and clarified that only organizational key hol…
thedoctor Apr 13, 2015
92fb95e
Merge remote-tracking branch 'upstream/gh-pages' into gh-pages
thedoctor Apr 13, 2015
5addb97
definition-tagged Key Compromise Policy stuff
thedoctor Apr 13, 2015
93325cc
def-linked 1.06
thedoctor Apr 14, 2015
029778e
def-linked 2.02
thedoctor Apr 14, 2015
ef0f2a1
def-linked 2.03 and added a proofofreserve definition
thedoctor Apr 14, 2015
4386a28
formatting
thedoctor Apr 14, 2015
f08e8d4
renamed definitions to 6_ because of changelog conflict
thedoctor Apr 14, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
154 changes: 63 additions & 91 deletions 1_aspects.html
View file
Open in desktop
Expand Up @@ -5,109 +5,81 @@
---


{% assign aspects_sorted = '101-KeySeedGeneration|102-WalletCreation|103-KeyStorage|104-KeyUsage|105-KeyCompromisePolicy|106-KeyholderGrantRevokePoliciesAndProcedures|201-SecurityAuditsAndPentests|202-DataSanitizationPolicy|203-ProofOfReserve|204-AuditLogs' | split: '|' %}
{% assign aspects_sorted = '101-KeySeedGeneration|102-WalletCreation|103-KeyStorage|104-KeyUsage|105-KeyCompromisePolicy|106-KeyholderGrantRevokePoliciesAndProcedures|201-SecurityAuditsAndPentests|202-DataSanitizationPolicy|203-ProofOfReserve|204-AuditLogs' | split: '|' %}

<div class="home">

<ul class="aspect-list" name="top">


{% for current_aspect in aspects_sorted %}
{% for aspect_hash in site.data.aspects %}

{% assign aspect = aspect_hash[1] %}

{% if aspect.file == current_aspect %}
{% if category != aspect.category %}
{% assign category = aspect.category %}
<li>{{category}}</li>
{% endif %}
<li><a href='#{{aspect.id}}'>{{aspect.id}} {{aspect.title}} </a></li>
{% endif %}
{% endfor %}

{% endfor %}
</ul>

<ul class="post-list">
{% for current_aspect in aspects_sorted order:ascending %}
{% for aspect_hash in site.data.aspects %}
{% assign aspect = aspect_hash[1] %}
{% if aspect.file == current_aspect %}
<li> <a name="{{ aspect.id }}"></a>
<h1>
{{ aspect.id }} {{ aspect.title }}
<div class="contribution-links">

<a href="https://github.com/CryptoConsortium/CCSS/edit/master/_data/aspects/{{ aspect.file }}.yml">Edit</a>
| <a href="https://github.com/CryptoConsortium/CCSS/commits/master/_data/aspects/{{ aspect.file }}.yml">History</a>
| <a href="https://github.com/CryptoConsortium/CCSS/issues/new?body=Source%20File%3A%20{{ aspect.file }}%0A%0A">Discuss</a>
| <a href="#top">Top</a>
</div>
</h1>

{{ aspect.description }}
<p>
<h3> Aspect Components Include </h3>
<ul class="component-list">
{% for part in aspect.components %}
<li>{{part.id}} {{ part.title_short }}</li>
{% endfor %}

</ul>
</p>

<p>
<ul class="post-list">
<li>
<h2> <img class='level' src='/CCSS/images/Level1.jpg'/> </h2>
<ul class="level-list">
{% for part in aspect.level_one %}
<li>{{ part }}</li>
{% endfor %}
</ul>
</li>
<li>
<h2> <img class='level' src='/CCSS/images/Level2.jpg'/> </h2>
<ul class="level-list">
{% for part in aspect.level_two %}
<li>{{ part }}</li>
{% endfor %}
</ul>
</li>
<li>
<h2> <img class='level' src='/CCSS/images/Level3.jpg'/> </h2>
<ul class="level-list">
{% for part in aspect.level_three %}
<li>{{ part }}</li>
{% endfor %}
</ul>
</li>

</ul>
<p>
</li>
{% endif %}
{% endfor %}
{% endfor %}
{% for current_aspect in aspects_sorted %}
{% assign aspect = site.data.aspects[current_aspect] %}

{% if category != aspect.category %}
{% assign category = aspect.category %}
<li>{{category}}</li>
{% endif %}
<li><a href='#{{aspect.id}}'>{{aspect.id}} {{aspect.title}}</a></li>

{% endfor %}
</ul>

<h1 class="page-heading">Definitions </h1>

<ul class="post-list">
{% for definitions_hash in site.data.definitions %}
{% assign definition = definitions_hash[1] %}
<li>
{% for current_aspect in aspects_sorted order:ascending %}
{% assign aspect = site.data.aspects[current_aspect] %}
<li> <a name="{{ aspect.id }}"></a>
<h1> {{ aspect.id }} {{ aspect.title }}
<div class="contribution-links">

<h2>
<a class="post-link" href="{{ post.url | prepend: site.baseurl }}">{{ definition.word }}</a>

</h2>
{{ definition.description }}
</li>
<a href="https://github.com/CryptoConsortium/CCSS/edit/master/_data/aspects/{{ aspect.file }}.yml">Edit</a>
| <a href="https://github.com/CryptoConsortium/CCSS/commits/master/_data/aspects/{{ aspect.file }}.yml">History</a>
| <a href="https://github.com/CryptoConsortium/CCSS/issues/new?body=Source%20File%3A%20{{ aspect.file }}%0A%0A">Discuss</a>
| <a href="#top">Top</a>
</div>
</h1>

{{ aspect.description | replace:'](#','](../Definitions#' | markdownify }}
<p>
<h3> Aspect Components Include </h3>
<ul class="component-list">
{% for part in aspect.components %}
<li>{{part.id}} {{ part.title_short }}</li>
{% endfor %}

</ul>
</p>

<p>
<ul class="post-list">
<li>
<h2> <img class='level' src='/CCSS/images/Level1.jpg'/> </h2>
<ul class="level-list">
{% for part in aspect.level_one %}
<li>{{ part | replace:'](#','](../Definitions#' | markdownify }}</li>
{% endfor %}
</ul>
</li>
<li>
<h2> <img class='level' src='/CCSS/images/Level2.jpg'/> </h2>
<ul class="level-list">
{% for part in aspect.level_two %}
<li>{{ part | replace:'](#','](../Definitions#' | markdownify }}</li>
{% endfor %}
</ul>
</li>
<li>
<h2> <img class='level' src='/CCSS/images/Level3.jpg'/> </h2>
<ul class="level-list">
{% for part in aspect.level_three %}
<li>{{ part | replace:'](#','](../Definitions#' | markdownify }}</li>
{% endfor %}
</ul>
</li>

</ul>
</p>
</li>
{% endfor %}
</ul>


</div>
126 changes: 55 additions & 71 deletions 2_matrix.html
View file
Open in desktop
Expand Up @@ -4,86 +4,70 @@
permalink: /Matrix/
---

{% assign aspect_count = "0 28 9" | split: ' ' %}
{% assign aspect_count = "0 28 9" | split: ' ' %}
{% assign category_count = 0 %}

{% assign aspects_sorted = '101-KeySeedGeneration|102-WalletCreation|103-KeyStorage|104-KeyUsage|105-KeyCompromisePolicy|106-KeyholderGrantRevokePoliciesAndProcedures|201-SecurityAuditsAndPentests|202-DataSanitizationPolicy|203-ProofOfReserve|204-AuditLogs' | split: '|' %}
{% assign aspects_sorted = '101-KeySeedGeneration|102-WalletCreation|103-KeyStorage|104-KeyUsage|105-KeyCompromisePolicy|106-KeyholderGrantRevokePoliciesAndProcedures|201-SecurityAuditsAndPentests|202-DataSanitizationPolicy|203-ProofOfReserve|204-AuditLogs' | split: '|' %}

<div class="home">


<ul class="matrix">

<table>
<colgroup>
<col style="width:100px">
<col style="width:150px">
<col style="width:300px">
<col style="width:300px">
<col style="width:300px">
<col style="width:300px">
<col style="width:300px">
</colgroup>
<thead>
<tr>
<th id='header_category'>Category</th>
<th id='header_aspect'>Aspect</th>
<th id='header_component'>Component</th>
<th id='header_uncertifiable'>Uncertified</th>
<th id='header_level_i'><img src="/CCSS/images/Level1.jpg" alt="Level I" width="250"/></th>
<th id='header_level_ii'><img src="/CCSS/images/Level2.jpg" alt="Level II" width="250"/></th>
<th id='header_level_iii'><img src="/CCSS/images/Level3.jpg" alt="Level III" width="250"/></th>
</tr>
</thead>
<tbody>
{% for current_aspect in aspects_sorted %}
{% for aspect_hash in site.data.aspects %}
{% assign aspect = aspect_hash[1] %}
{% if aspect.file == current_aspect %}
<tr>
{% assign rower = false %}

{% if category != aspect.category %}
{% assign category = aspect.category %}
{% assign category_count = category_count | plus: 1 %}

<td rowspan={{ aspect_count[category_count] }}>{{category}}</li>

{% endif %}


{% assign component_count = 0 %}
{% for part in aspect.components %}
{% assign component_count = component_count | plus: 1 %}
{% endfor %}

<td rowspan={{ component_count }}>{{ aspect.title }}</td>



{% for part in aspect.components %}
{% if rower %}
<tr>
{% endif %}
<td>{{ part.title_short }}</td>
<td>{{ part.uncertified }}</td>
<td>{{ part.level_one}}</td>
<td>{{ part.level_two}}</td>
<td>{{ part.level_three }}</td>
</tr>
{% assign rower = true %}
{% endfor %}

</tr>
{% endif %}
{% endfor %}
{% endfor %}
</tbody>
</table>

<colgroup>
<col style="width:100px">
<col style="width:150px">
<col style="width:300px">
<col style="width:300px">
<col style="width:300px">
<col style="width:300px">
<col style="width:300px">
</colgroup>
<thead>
<tr>
<th id='header_category'>Category</th>
<th id='header_aspect'>Aspect</th>
<th id='header_component'>Component</th>
<th id='header_uncertifiable'>Uncertified</th>
<th id='header_level_i'><img src="/CCSS/images/Level1.jpg" alt="Level I" width="250"/></th>
<th id='header_level_ii'><img src="/CCSS/images/Level2.jpg" alt="Level II" width="250"/></th>
<th id='header_level_iii'><img src="/CCSS/images/Level3.jpg" alt="Level III" width="250"/></th>
</tr>
</thead>
<tbody>
{% for current_aspect in aspects_sorted %}
{% assign aspect = site.data.aspects[current_aspect] %}
<tr>
{% assign rower = false %}

</ul>
{% if category != aspect.category %}
{% assign category = aspect.category %}
{% assign category_count = category_count | plus: 1 %}

<td rowspan={{ aspect_count[category_count] }}>{{category}}</li>

{% endif %}

<td rowspan={{ aspect.components.size }}>{{ aspect.title }}</td>

{% for part in aspect.components %}
{% if rower %}
<tr>
{% endif %}
<td>{{ part.title_short }}</td>
<td>{{ part.uncertified }}</td>
<td>{{ part.level_one}}</td>
<td>{{ part.level_two}}</td>
<td>{{ part.level_three }}</td>
</tr>
{% assign rower = true %}
{% endfor %}

</tr>
{% endfor %}
</tbody>
</table>

</ul>

</div>