deon/khosb
Archived
1
0
Fork 0
Code Issues 6 Pull Requests Packages Projects Releases Wiki Activity

Improvements to SSL classes

Browse Source
This commit is contained in:
Deon George
2012-12-19 17:28:39 +11:00
parent 6588de4f7f
commit 863bc1150a
12 changed files with 535 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/ssl/views/service/user/plugin/ssl/view.php
View File

@@ -15,7 +15,7 @@
</tr>
<tr>
<td>Issuer</td>
<td class="data"><?php echo $so->dnissuer(); ?></td>
<td class="data"><?php echo $so->issuerdn(); ?></td>
</tr>
<tr>
<td>CA</td>
@@ -31,7 +31,7 @@
</tr>
<tr>
<td>Serial Number</td>
<td class="data"><?php echo $so->serial_num(); ?></td>
<td class="data"><?php echo $so->serial(); ?></td>
</tr>
<tr>
<td>Version</td>

31
modules/ssl/views/ssl/admin/add_view.php
View File

@@ -1,46 +1,55 @@
<!-- $o = ORM::factory('SSL_CA'); -->
<table border="0">
<tr>
<td>DN</td>
<td class="data"><?php echo $o->dn(); ?></td>
</tr>
<tr>
<td>Subject</td>
<td class="data"><?php printf('%s (%s)',SSL::subject($so->sign_cert),SSL::serial($so->sign_cert)); ?></td>
<td class="data"><?php printf('%s (%s)',$o->subject(),$o->serial()); ?></td>
</tr>
<tr>
<td>Subject Key ID</td>
<td class="data"><?php echo SSL::ski($so->sign_cert); ?></td>
<td class="data"><?php echo $o->ski(); ?></td>
</tr>
<tr>
<td>Issuer</td>
<td class="data"><?php printf('%s (%s)',SSL::issuer($so->sign_cert),SSL::aki_serial($so->sign_cert)); ?></td>
<td class="data"><?php printf('%s (%s)',$o->issuer(),$o->aki_serial()); ?></td>
</tr>
<tr>
<td>Issuer Key ID</td>
<td class="data"><?php echo SSL::aki_keyid($so->sign_cert); ?></td>
<td class="data"><?php echo $o->aki_keyid(); ?></td>
</tr>
<tr>
<td>CA</td>
<td class="data"><?php echo StaticList_YesNo::display($o->isCA()); ?></td>
</tr>
<tr>
<td>Valid From</td>
<td class="data"><?php echo SSL::from($so->sign_cert,TRUE); ?></td>
<td class="data"><?php echo $o->valid_from(TRUE); ?></td>
</tr>
<tr>
<td>Valid To</td>
<td class="data"><?php echo SSL::expire($so->sign_cert,TRUE); ?></td>
<td class="data"><?php echo $o->valid_to(TRUE); ?></td>
</tr>
<tr>
<td>Hash</td>
<td class="data"><?php echo SSL::hash($so->sign_cert); ?></td>
<td class="data"><?php echo $o->hash(); ?></td>
</tr>
<tr>
<td>Version</td>
<td class="data"><?php echo SSL::version($so->sign_cert); ?></td>
<td class="data"><?php echo $o->version(); ?></td>
</tr>
<tr>
<td>Key Algorithm</td>
<td class="data"><?php echo SSL::algorithm($so->sign_cert); ?></td>
<td class="data"><?php echo $o->algorithm(); ?></td>
</tr>
<tr>
<td style="width: 40%;">Private Key</td>
<td style="width: 60%;"><?php echo FORM::textarea('sign_pk',$so->sign_pk,array('cols'=>64,'rows'=>13)); ?></td>
<td style="width: 60%;"><?php echo FORM::textarea('sign_pk',$o->sign_pk,array('cols'=>64,'rows'=>13)); ?></td>
</tr>
<tr>
<td>Certificate</td>
<td><?php echo FORM::textarea('sign_cert',$so->sign_cert,array('cols'=>64,'rows'=>13)); ?></td>
<td><?php echo FORM::textarea('sign_cert',$o->sign_cert,array('cols'=>64,'rows'=>13)); ?></td>
</tr>
<table>