Author: mcalmer Date: Mon Oct 8 18:41:29 2007 New Revision: 41286 URL: http://svn.opensuse.org/viewcvs/yast?rev=41286&view=rev Log: implement support for MS-UPN and Krb5PrincipalName in SubjectAlternativeName Extension Modified: trunk/ca-management/src/YaPI/CaManagement.pm trunk/ca-management/src/YaPI/caUtils.pm trunk/ca-management/src/new_cert_callbacks.ycp Modified: trunk/ca-management/src/YaPI/CaManagement.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/src/YaPI/CaManagement.pm?rev=41286&r1=41285&r2=41286&view=diff ============================================================================== --- trunk/ca-management/src/YaPI/CaManagement.pm (original) +++ trunk/ca-management/src/YaPI/CaManagement.pm Mon Oct 8 18:41:29 2007 @@ -1474,13 +1474,13 @@ } $e = YaST::caUtils->transformSubjectAltName($exts, - $data->{'subjectAltName'}); + $data->{'subjectAltName'}, 1); if(!defined $e) { return undef; } $e = YaST::caUtils->transformIssuerAltName($exts, - $data->{'issuerAltName'}); + $data->{'issuerAltName'}, 1); if(!defined $e) { return undef; } Modified: trunk/ca-management/src/YaPI/caUtils.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/src/YaPI/caUtils.pm?rev=41286&r1=41285&r2=41286&view=diff ============================================================================== --- trunk/ca-management/src/YaPI/caUtils.pm (original) +++ trunk/ca-management/src/YaPI/caUtils.pm Mon Oct 8 18:41:29 2007 @@ -580,7 +580,8 @@ my $self = shift; my $exts = shift; my $value = shift || ""; - + my $forDefaults = shift || 0; + my $crit = 0; my $emailCopy = 0; my $list = new LIMAL::CaMgm::LiteralValueList(); @@ -594,7 +595,23 @@ $emailCopy = 1; next; } - + if($p =~ /^MS-UPN:(.+)/) + { + if(!$forDefaults) + { + $list->push_back(new LIMAL::CaMgm::LiteralValue("1.3.6.1.4.1.311.20.2.3:$1")); + } + next; + } + if($p =~ /^K5PN:(.+)/) + { + if(!$forDefaults) + { + $list->push_back(new LIMAL::CaMgm::LiteralValue("1.3.6.1.5.2.2:$1")); + } + next; + } + $list->push_back(new LIMAL::CaMgm::LiteralValue($p)); } @@ -621,7 +638,8 @@ my $self = shift; my $exts = shift; my $value = shift || ""; - + my $forDefaults = shift || 0; + my $crit = 0; my $issuerCopy = 0; my $list = new LIMAL::CaMgm::LiteralValueList(); @@ -635,6 +653,22 @@ $issuerCopy = 1; next; } + if($p =~ /^MS-UPN:(.+)/) + { + if(!$forDefaults) + { + $list->push_back(new LIMAL::CaMgm::LiteralValue("1.3.6.1.4.1.311.20.2.3:$1")); + } + next; + } + if($p =~ /^K5PN:(.+)/) + { + if(!$forDefaults) + { + $list->push_back(new LIMAL::CaMgm::LiteralValue("1.3.6.1.5.2.2:$1")); + } + next; + } $list->push_back(new LIMAL::CaMgm::LiteralValue($p)); } @@ -1044,9 +1078,18 @@ !$list->iterator_equal($it, $list->end()); $list->iterator_incr($it)) { - - push @vals, $list->iterator_value($it)->toString(); - + if($list->iterator_value($it)->getType() eq "1.3.6.1.4.1.311.20.2.3") + { + push @vals, "MS-UPN:".$list->iterator_value($it)->getValue(); + } + elsif($list->iterator_value($it)->getType() eq "1.3.6.1.5.2.2") + { + push @vals, "K5PN:".$list->iterator_value($it)->getValue(); + } + else + { + push @vals, $list->iterator_value($it)->toString(); + } } $ret->{'subjectAltName'} = join(', ', @vals); @@ -1085,9 +1128,18 @@ !$list->iterator_equal($it, $list->end()); $list->iterator_incr($it)) { - - push @vals, $list->iterator_value($it)->toString(); - + if($list->iterator_value($it)->getType() eq "1.3.6.1.4.1.311.20.2.3") + { + push @vals, "MS-UPN:".$list->iterator_value($it)->getValue(); + } + elsif($list->iterator_value($it)->getType() eq "1.3.6.1.5.2.2") + { + push @vals, "K5PN:".$list->iterator_value($it)->getValue(); + } + else + { + push @vals, $list->iterator_value($it)->toString(); + } } $ret->{'issuerAltName'} = join(', ', @vals); @@ -1591,6 +1643,41 @@ $val =~ s/\s+$//g; $i++; next if $val =~ /^$/; + if($key eq "X509v3 Subject Alternative Name" || $key eq "X509v3 Issuer Alternative Name:") + { + my @pairs = split(/\s*,\s*/, $val); + $val = ""; + foreach my $pair (@pairs) + { + my ($k, $v) = split(/:/, $pair, 2); + if($k eq "othername") + { + next; + } + else + { + $val .= "$pair, "; + } + } + + my $list = $cert->getExtensions()->getSubjectAlternativeName()->getAlternativeNameList(); + + for(my $it = $list->begin(); + !$list->iterator_equal($it, $list->end()); + $list->iterator_incr($it)) { + + if($list->iterator_value($it)->getType() eq "1.3.6.1.4.1.311.20.2.3") + { + $val .= "MS-UPN:".$list->iterator_value($it)->getValue().", "; + + } + elsif($list->iterator_value($it)->getType() eq "1.3.6.1.5.2.2") + { + $val .= "K5PN:".$list->iterator_value($it)->getValue().", "; + } + } + } + $val =~ s/, $//; push(@{$ret->{$key}}, $val); } } else { @@ -1669,6 +1756,12 @@ my @sp1 = split(/:/, $t, 2); + if($sp1[0] eq "othername") + { + # not supported by openssl + next; + } + my $h = {}; $h->{type} = $transMap->{$sp1[0]}; if(!defined $h->{type}) { @@ -1682,10 +1775,9 @@ push( @{$newExt->{$newKey}->{value}}, $h); } - } else - { + { my @sp = split(/\s?,\s?/, $b); foreach my $t (@sp) { if(exists $transMap->{$t}) { @@ -1955,6 +2047,20 @@ $p, $key), code => "PARAM_CHECK_FAILED"); } + } elsif ($p =~ /^\s*MS-UPN:(.+)\s*$/) { + if (!defined $1 || $1 !~ /^[^@]+@[^@]+$/) { + return $self->SetError(summary => sprintf( + __("Invalid value'%s' for parameter '%s'."), + $p, $key), + code => "PARAM_CHECK_FAILED"); + } + } elsif ($p =~ /^\s*K5PN:(.+)\s*$/) { + if (!defined $1 || $1 !~ /^[^@]+@[^@]+$/) { + return $self->SetError(summary => sprintf( + __("Invalid value'%s' for parameter '%s'."), + $p, $key), + code => "PARAM_CHECK_FAILED"); + } } else { return $self->SetError(summary => sprintf( __("Invalid value'%s' for parameter '%s'."), Modified: trunk/ca-management/src/new_cert_callbacks.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/src/new_cert_callbacks.ycp?rev=41286&r1=41285&r2=41286&view=diff ============================================================================== --- trunk/ca-management/src/new_cert_callbacks.ycp (original) +++ trunk/ca-management/src/new_cert_callbacks.ycp Mon Oct 8 18:41:29 2007 @@ -350,7 +350,9 @@ `RadioButton(`id("URI"), `opt(`notify), "URI"), `RadioButton(`id("DNS"), `opt(`notify), "DNS"), `RadioButton(`id("IP"), `opt(`notify), "IP"), - `RadioButton(`id("RID"), `opt(`notify), "RID") + `RadioButton(`id("RID"), `opt(`notify), "RID"), + `RadioButton(`id("MS-UPN"), `opt(`notify), "MS-UPN"), + `RadioButton(`id("K5PN"), `opt(`notify), "K5PN") ) ), `TextEntry(`id(`name), _("&Name:")), @@ -701,7 +703,9 @@ `RadioButton(`id("URI"), `opt(`notify), "URI", true), `RadioButton(`id("DNS"), `opt(`notify), "DNS"), `RadioButton(`id("IP"), `opt(`notify), "IP"), - `RadioButton(`id("RID"), `opt(`notify), "RID") + `RadioButton(`id("RID"), `opt(`notify), "RID"), + `RadioButton(`id("MS-UPN"), `opt(`notify), "MS-UPN"), + `RadioButton(`id("K5PN"), `opt(`notify), "K5PN") ) ), `TextEntry(`id(`name), _("&Name:")), -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org