Removed unnecessary pki folder.

Previously the source code was located inside a pki folder.
This folder was created during svn migration and is no longer
needed. This folder has now been removed and the contents have
been moved up one level.

Ticket #131

1 files changed, 0 insertions, 234 deletions

diff --git a/pki/base/tps/lib/perl/PKI/TPS/ReqCertInfo.pm b/pki/base/tps/lib/perl/PKI/TPS/ReqCertInfo.pm
deleted file mode 100755
index f2faee2c7..000000000
--- a/pki/base/tps/lib/perl/PKI/TPS/ReqCertInfo.pm
+++ /dev/null
@@ -1,234 +0,0 @@
-#!/usr/bin/perl
-#
-# --- BEGIN COPYRIGHT BLOCK ---
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation;
-# version 2.1 of the License.
-# 
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA  02110-1301  USA 
-# 
-# Copyright (C) 2007 Red Hat, Inc.
-# All rights reserved.
-# --- END COPYRIGHT BLOCK ---
-#
-
-use strict;
-use warnings;
-use PKI::TPS::GlobalVar;
-use PKI::TPS::Common;
-
-package PKI::TPS::ReqCertInfo;
-$PKI::TPS::ReqCertInfo::VERSION = '1.00';
-
-our $cert_req_header="-----BEGIN NEW CERTIFICATE REQUEST-----";
-our $cert_req_footer="-----END NEW CERTIFICATE REQUEST-----";
-our $cert_header="-----BEGIN CERTIFICATE-----";
-our $cert_footer="-----END CERTIFICATE-----";
-
-sub new {
-    my ($class, $name, $dn, $tag) = @_;
-    my $self = {};
-    &PKI::TPS::Wizard::debug_log("ReqCertInfo: start new");
-    &PKI::TPS::Wizard::debug_log("ReqCertInfo: creating name: $name, dn: $dn, tag: $tag");
-
-    $self->{"getUserFriendlyName"} = \&get_user_friendly_name;
-    $self->{"getCertTag"} = \&get_cert_tag;
-    $self->{"getCert"} = \&get_cert;
-    $self->{"getCertpp"} = \&get_cert_pp;
-    $self->{"getRequest"} = \&get_request;
-    $self->{"getDN"} = \&get_dn;
-    $self->{"useDefaultKey"} = \&use_default_key;
-    $self->{"getCustomKeysize"} = \&get_custom_keysize;
-    &PKI::TPS::Wizard::debug_log("ReqCertInfo: end new");
-
-    $self->{name} = $name;
-    $self->{dn} = $dn;
-    $self->{tag} = $tag;
-
-    bless $self, $class;
-    return $self;
-}
-
-sub get_user_friendly_name
-{
-    my ($self) = @_;
-    &PKI::TPS::Wizard::debug_log("ReqCertInfo: get_user_friendly_name");
-    return $self->{name};
-}
-
-sub readFile
-{
-    my $fn = $_[0];
-    open FILE, "< $fn" or return "";
-    my $content =  join "",<FILE>;
-    close FILE;
-
-    return $content;
-}
-
-sub wrap_lines
-{
-   my $lines = shift;
-    my $temp ;
-    foreach my $line (split "\n", $lines) {
-	if (length $line > 59) {
-    		$line =~ s/(.{0,60})/$1\n/g;
-	}
-	# get rid of a line that is just an empty newline
-	$line =~ s/^\n$//gms;
-	$temp .= $line;
-    }
-    # collapse multiple newlines into one
-    $temp =~ s/\n+/\n/gms;
-    $temp =~ s/\n$//gms;
-    $temp;
-
-}
-
-sub get_request
-{
-    my ($self) = @_;
-    &PKI::TPS::Wizard::debug_log("ReqCertInfo: get_request");
-    # first, try to see if request has been made before
-#    my $req = readFile( "/var/lib/pki-tps/conf/$self->{tag}_cert_request.txt");
-
-    my $req = $::config->get("preop.cert.$self->{tag}.certreq");
-    
-    $req = wrap_lines($req);
-    
-    if ($req ne "") {
-        &PKI::TPS::Wizard::debug_log("ReqCertInfo: get_request found existing request");
-        return $cert_req_header."\n".$req."\n".$cert_req_footer;;
-    } else {
-        &PKI::TPS::Wizard::debug_log("ReqCertInfo: get_request existing request not found");
-    }
-
-    return $req;
-}
-
-sub get_cert
-{
-    my ($self) = @_;
-    &PKI::TPS::Wizard::debug_log("ReqCertInfo: get_cert");
-#   see if there is an existing cert
-#    my $cert =  readFile("/var/lib/pki-tps/conf/".$self->{tag}."_cert.txt");
-    my $cert = $::config->get("preop.cert.$self->{tag}.cert");
-
-    $cert = wrap_lines($cert);
-    if ($cert ne "") {
-        &PKI::TPS::Wizard::debug_log("ReqCertInfo: get_cert found existing cert");
-        return $cert_header."\n".$cert."\n".$cert_footer;;
-    } else {
-        &PKI::TPS::Wizard::debug_log("ReqCertInfo: get_cert existing cert not found");
-    }
-    if ($cert eq "") {
-        $cert = "...paste certificate here...";
-    }
-
-
-    return $cert;
-}
-
-sub get_cert_pp
-{
-    my ($self) = @_;
-    &PKI::TPS::Wizard::debug_log("ReqCertInfo: get_cert_pp");
-    my $instanceDir =  $::config->get("service.instanceDir");
-
-    my $hw;
-    my $tokenname = $::config->get("preop.module.token");
-    &PKI::TPS::Wizard::debug_log("ReqCertInfo: update got token name = $tokenname");
-
-    if (($tokenname eq "") || ($tokenname eq "NSS Certificate DB")) {
-        $hw = "";
-    } else {
-        $hw = "-h $tokenname";
-    }
-
-    my $token_pwd = $::pwdconf->get($tokenname);
-    open FILE, ">$instanceDir/conf/.pwfile";
-    system( "chmod 00660 $instanceDir/conf/.pwfile" );
-    $token_pwd  =~ s/\n//g;
-    print FILE $token_pwd;
-    close FILE;
-
-    my $nickname = $::config->get("preop.cert.$self->{tag}.nickname");
-    if ($nickname eq "") {
-#XXX
-        $nickname = "TPS ".$self->{tag}." cert";
-        &PKI::TPS::Wizard::debug_log("ReqCertInfo: get_cert_pp nickname not found for $self->{tag}  -- try $nickname");
-    }
-    my $certpp="";
-#    my $found = -e "/var/lib/pki-tps/conf/$self->{tag}_cert.txt";
-    my $cert = $::config->get("preop.cert.$self->{tag}.cert");
-
-    if ($cert ne "") {
-        &PKI::TPS::Wizard::debug_log("ReqCertInfo: get_cert_pp found request, ready to get prettyprint");
-        my $tmp = `certutil -d $instanceDir/alias $hw -f $instanceDir/conf/.pwfile -n "$nickname" -L > $instanceDir/conf/$self->{tag}_cert_pp.txt`;
-        $certpp = readFile("$instanceDir/conf/$self->{tag}_cert_pp.txt");
-        $certpp =~ s/"//g;
-        &PKI::TPS::Wizard::debug_log("ReqCertInfo: get_cert_pp pp=$certpp");
-        $tmp =`rm $instanceDir/conf/$self->{tag}_cert_pp.txt`;
-    } else {
-        &PKI::TPS::Wizard::debug_log("ReqCertInfo: get_cert_pp cert not found, will not get prettyprint");
-    }
-    my $tmp = `rm $instanceDir/conf/.pwfile`;
-
-    return $certpp;
-}
-
-sub get_cert_tag
-{
-    my ($self) = @_;
-    &PKI::TPS::Wizard::debug_log("ReqCertInfo: get_cert_tag");
-    return $self->{tag};
-}
-
-sub get_dn
-{
-    my ($self) = @_;
-    &PKI::TPS::Wizard::debug_log("ReqCertInfo: get_cert_dn");
-    return $self->{dn};
-}
-
-sub use_default_key
-{
-    my ($self) = @_;
-    &PKI::TPS::Wizard::debug_log("ReqCertInfo: use_default_key");
-    my $select = $::config->get("preop.cert.$self->{tag}.keysize.select");
-    if ($select ne "") {
-        if ($select eq "custom") {
-            &PKI::TPS::Wizard::debug_log("ReqCertInfo: use_default_key from config = $select returning 0");
-            return 0;
-        }
-    }
-
-    &PKI::TPS::Wizard::debug_log("ReqCertInfo: use_default_key returning 1");
-    return 1;
-}
-
-sub get_custom_keysize
-{
-    my ($self) = @_;
-    &PKI::TPS::Wizard::debug_log("ReqCertInfo: get_custom_keysize");
-    my $keysize = $::config->get("preop.cert.$self->{tag}.keysize.customsize");
-    if ($keysize ne "") {
-        &PKI::TPS::Wizard::debug_log("ReqCertInfo: get_custom_keysize from config = $keysize");
-        return $keysize;
-    } else {
-        &PKI::TPS::Wizard::debug_log("ReqCertInfo: get_custom_keysize not from config");
-    }
-    return 2048;
-}
-
-
-1;