Revision: 2258
Author: olavmrk
Date: Wed Apr 21 05:55:40 2010
Log: metarefresh: Remove nonworking ca-code
http://code.google.com/p/simplesamlphp/source/detail?r=2258
Modified:
/trunk/modules/metarefresh/bin/metarefresh.php
/trunk/modules/metarefresh/lib/MetaLoader.php
=======================================
--- /trunk/modules/metarefresh/bin/metarefresh.php Wed Feb 25 23:19:00 2009
+++ /trunk/modules/metarefresh/bin/metarefresh.php Wed Apr 21 05:55:40 2010
@@ -31,10 +31,6 @@
*/
$validateFingerprint = NULL;
-/* $CA contains a path to a PEM file with certificates which are trusted,
- * or NULL if we don't want to verify certificates this way.
- */
-$ca = NULL;
/* This variable contains the files we will parse. */
$files = array();
@@ -81,14 +77,6 @@
}
$validateFingerprint = $v;
break;
- case '--ca':
- if($v === NULL || strlen($v) === 0) {
- echo('The --ca option requires an parameter.' . "\n");
- echo('Please run `' . $progName . ' --help` for usage
information.' . "\n");
- exit(1);
- }
- $ca = $v;
- break;
case '--help':
printHelp();
exit(0);
@@ -152,8 +140,6 @@
echo(' Check the signature of the
metadata,' . "\n");
echo(' and check the fingerprint of
the' . "\n");
echo(' certificate against
<FINGERPRINT>.' . "\n");
- echo(' --ca=<PEM file> Use the given PEM file as a source
of' . "\n");
- echo(' trusted root certificates.' . "\n");
echo(' -h, --help Print this help.' . "\n");
echo(' -o=<DIR>, --out-dir=<DIR> Write the output to this directory.
The' . "\n");
echo(' default directory is
metadata-generated/' . "\n");
=======================================
--- /trunk/modules/metarefresh/lib/MetaLoader.php Fri Mar 19 00:58:02 2010
+++ /trunk/modules/metarefresh/lib/MetaLoader.php Wed Apr 21 05:55:40 2010
@@ -34,7 +34,6 @@
} catch(Exception $e) {
SimpleSAML_Logger::warning('metarefresh: Failed to retrieve
metadata. ' . $e->getMessage());
}
- $ca = NULL;
foreach($entities as $entity) {
if(array_key_exists('validateFingerprint', $source) &&
$source['validateFingerprint'] !== NULL) {
if(!$entity->validateFingerprint($source['validateFingerprint'])) {
@@ -43,13 +42,6 @@
}
}
- // TODO: $ca is always null
- if($ca !== NULL) {
- if(!$entity->validateCA($ca)) {
- SimpleSAML_Logger::info('Skipping "' . $entity->getEntityId() . '" -
could not verify certificate.' . "\n");
- continue;
- }
- }
$template = NULL;
if (array_key_exists('template', $source)) $template =
$source['template'];
--
You received this message because you are subscribed to the Google Groups
"simpleSAMLphp commits" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/simplesamlphp-commits?hl=en.
