[openca-cvsdev] CVS: openca-0.9/src/modules/openca-pkcs7 Makefile.PL,1.5,1.6 PKCS7.pm,1.19,1.20

[<ope...@li...>]

Update of /cvsroot/openca/openca-0.9/src/modules/openca-pkcs7
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9006/openca-0.9/src/modules/openca-pkcs7

Modified Files:
	Makefile.PL PKCS7.pm 
Log Message:
added OpenCA:DN


Author of changes:  michaelbell

Index: Makefile.PL
===================================================================
RCS file: /cvsroot/openca/openca-0.9/src/modules/openca-pkcs7/Makefile.PL,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Makefile.PL	27 Dec 2002 08:54:52 -0000	1.5
--- Makefile.PL	25 Nov 2004 17:02:19 -0000	1.6
***************
*** 6,9 ****
      'VERSION_FROM' => 'PKCS7.pm', # finds $VERSION
  #    'MAN3PODS'     => {'PKCS7.pod'},
!     'PREREQ_PM'     => {'X500::DN' => '0.27'}
  );
--- 6,9 ----
      'VERSION_FROM' => 'PKCS7.pm', # finds $VERSION
  #    'MAN3PODS'     => {'PKCS7.pod'},
!     'PREREQ_PM'     => {'OpenCA::DN' => '0.9'}
  );

Index: PKCS7.pm
===================================================================
RCS file: /cvsroot/openca/openca-0.9/src/modules/openca-pkcs7/PKCS7.pm,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** PKCS7.pm	6 Jul 2004 13:04:08 -0000	1.19
--- PKCS7.pm	25 Nov 2004 17:02:19 -0000	1.20
***************
*** 64,68 ****
  
  use strict;
! use X500::DN;
  
  package OpenCA::PKCS7;
--- 64,68 ----
  
  use strict;
! use OpenCA::DN;
  
  package OpenCA::PKCS7;
***************
*** 409,427 ****
  		## load the differnt parts of the DN into DN_HASH
  		print "OpenCA::PKCS7->parseDepth: DN: ".$dn."<br>\n" if ($self->{DEBUG});
! 		my $x500_dn = X500::DN->ParseRFC2253 ($dn);
  		if (not $x500_dn) {
!         		print "OpenCA::PKCS7->parseDepth: X500::DN failed<br>\n" if ($self->{DEBUG});
  			return $self->setError (7932081,
!                                    $self->{gettext} ("OpenCA::PKCS7->parseDepth: X500::DN failed."));
  			return undef;
  		}
! 		my $rdn;
! 		foreach $rdn ($x500_dn->getRDNs()) {
! 			next if ($rdn->isMultivalued());
! 			my @attr_types = $rdn->getAttributeTypes();
! 			my $type  = $attr_types[0];
! 			my $value = $rdn->getAttributeValue ($type);
! 			push (@{$ret->{$currentDepth}->{DN_HASH}->{uc($type)}}, $value);
! 			print "OpenCA::PKCS7->parseDepth: DN_HASH: $type=$value<br>\n" if ($self->{DEBUG});
  		}
  
--- 409,427 ----
  		## load the differnt parts of the DN into DN_HASH
  		print "OpenCA::PKCS7->parseDepth: DN: ".$dn."<br>\n" if ($self->{DEBUG});
! 		my $x500_dn = OpenCA::DN->new ($dn);
  		if (not $x500_dn) {
!         		print "OpenCA::PKCS7->parseDepth: OpenCA::DN failed<br>\n" if ($self->{DEBUG});
  			return $self->setError (7932081,
!                                    $self->{gettext} ("OpenCA::PKCS7->parseDepth: OpenCA::DN failed."));
  			return undef;
  		}
! 		my @parsed = $x500_dn->get_parsed();
!                 for (my $i=0; $i < scalar @parsed; $i++)
!                 {
!                     next if (scalar @{$parsed[$i]} > 1); ## no support for multivalued RDNs
!                     my $type  = $parsed[$i][0][0];
!                     my $value = $parsed[$i][0][1];
! 		    push (@{$ret->{$currentDepth}->{DN_HASH}->{uc($type)}}, $value);
! 		    print "OpenCA::PKCS7->parseDepth: DN_HASH: $type=$value<br>\n" if ($self->{DEBUG});
  		}