From 9b9b9a189704d311a17efee894b11c24398de523 Mon Sep 17 00:00:00 2001
From: Simon Josefsson <simon@josefsson.org>
Date: Tue, 10 Mar 2009 22:01:04 +0000
Subject: [PATCH] Remove.

---
 addKey.php        | 121 ----------------------------------------------
 add_key.php       |   5 --
 add_key_debug.php |   5 --
 3 files changed, 131 deletions(-)
 delete mode 100644 addKey.php
 delete mode 100644 add_key.php
 delete mode 100644 add_key_debug.php

diff --git a/addKey.php b/addKey.php
deleted file mode 100644
index c04200f..0000000
--- a/addKey.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php require_once '../yubiphpbase/appinclude.php';
-	  require_once '../yubiphpbase/yubi_lib.php';
-	  require_once 'common.php';
-	  
-header("content-type: text/plain");
-
-$tokenId = $secret = '';
-
-$nonce = getHttpVal('nonce', '');
-if ($nonce == '') {
-	reply(S_MISSING_PARAMETER, '', $client, '', 'nonce');
-	exit;
-}
-
-$client = getHttpVal('id', 0);
-if ($client <= 0) {
-	reply(S_MISSING_PARAMETER, '', $client, $nonce, '', 'id');
-	exit;
-}
-$ci = getClientInfo($client);
-
-$h = getHttpVal('h', '');
-if ($h == '') {
-	reply(S_MISSING_PARAMETER, '', $client, $nonce, '', 'h');
-	exit;
-}
-
-$op = getHttpVal('operation', '');
-
-if ($op == '') {
-	reply(S_MISSING_PARAMETER, '', $client, $nonce, '', 'operation');
-	exit;
-} else if ($op != 'add_key') {
-	reply(S_OPERATION_NOT_ALLOWED, $ci['secret'], $client, $nonce, '', $op);
-	exit;
-}
-
-if (! isset($ci['id'])) {
-	debug('Client '.$client.' not found!');
-	$client = 1;
-	if (($ci = getClientInfo($client)) == null)  {
-		debug('Root client not found, service not installed properly!');
-		reply(S_BACKEND_ERROR, '', $client, $nonce, '', 'root client missing');
-		exit;
-	}	
-	reply(S_BAD_CLIENT, $ci['secret'], $client, $nonce);
-	exit;
-}
-
-if ($ci['perm_id'] != 1 && $ci['perm_id'] != 2) {
-  	reply(S_OPERATION_NOT_ALLOWED, $ci['secret'], $client, $nonce, '', $ci['perm_id']);
-	exit;
-}
-
-//// Verify request signature
-//
-$reqArr = array();
-$reqArr['id'] = $client;
-$reqArr['nonce'] = $nonce;
-$reqArr['operation'] = 'add_key';
-$reqHash = sign($reqArr, $ci['secret']);
-if ($reqHash != $h) {
-  	reply(S_BAD_SIGNATURE, $ci['secret'], $client, $nonce);
-	if ($trace) { 
-		echo 'Secret: '.$ci['secret']."\n";
-		echo 'Sign: '; print_r($reqArr);
-		echo 'Correct h: '.$reqHash;
-	}
-	exit;
-}
-
-$tokenId = base64_encode(genRandRaw(6));
-$secret = base64_encode(genRandRaw(16));
-
-if (($a=addNewKey($tokenId, 1, $secret, '', $client)) == null) {
-	$keyid = -1;
-}
-
-$keyid = $a['keyid'];
-$sn = $a['sn'];
-$usrid = $a['usrid'];
-
-if ($keyid > 0) {
-	debug('Key '.$keyid.' added. sn='.$sn.', usrid='.$usrid);
-	reply(S_OK, $ci['secret'], $client, $nonce, $sn);
-} else {
-	reply(S_BACKEND_ERROR, $ci['secret'], $client, $nonce);
-	exit;
-}
-
-function reply($status, $apiKey, $client_id, $nonce, $sn='', $info='') {
-	global $tokenId, $secret, $usrid;
-	
-	if ($status == null) {
-		$status = S_BACKEND_ERROR;
-	}
-
-	$a = array();
-
-	echo 'nonce='.($a['nonce'] = $nonce).PHP_EOL;
-	echo 'status='.($a['status'] = $status).PHP_EOL;
-	
-	if ($info != '') {
-		echo 'info='.($a['info'] = $info).PHP_EOL;
-	}
-	
-	if ($sn != '') {
-		echo 'sn='.$sn.PHP_EOL;
-	}
-	
-	echo 'token_id='.($a['token_id'] = $tokenId).PHP_EOL;
-	echo 'user_id='.($a['user_id'] = $usrid).PHP_EOL;//TODO
-	
-	echo 't='.($a['t']=getUTCTimeStamp()).PHP_EOL;
-	$h = sign($a, $apiKey);
-	echo 'h='.$h.PHP_EOL;
-	echo PHP_EOL;
-
-} // End reply
-
-?>
diff --git a/add_key.php b/add_key.php
deleted file mode 100644
index a4db7ab..0000000
--- a/add_key.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php $trace = false;
-
-require 'addKey.php';
-
-?>
\ No newline at end of file
diff --git a/add_key_debug.php b/add_key_debug.php
deleted file mode 100644
index 4a81993..0000000
--- a/add_key_debug.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php $trace = true;
-
-require 'addKey.php';
-
-?>
\ No newline at end of file