X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=Util.pm;h=2b230abbfba893cf619e44dbd40f637d6620afaf;hb=eae592f7884ae95cabd41c3984a8672ecae961c2;hp=374a592a80c0382bacc0ce86d9650c5928431aa2;hpb=80ed561a914ae1af6948747933e260c4623df222;p=mirror%2Fuserdir-ldap-cgi.git
diff --git a/Util.pm b/Util.pm
index 374a592..2b230ab 100644
--- a/Util.pm
+++ b/Util.pm
@@ -7,7 +7,7 @@ package Util;
use strict;
use Date::Manip qw(ParseDate);
-use Net::LDAP qw(:all);
+use Net::LDAP qw(LDAP_SUCCESS LDAP_PROTOCOL_ERROR);
use English;
my $blocksize = 8; # A blowfish block is 8 bytes
@@ -34,12 +34,16 @@ sub CreateKey {
sub CreateCryptSalt {
# this can create either a DES type salt or a MD5 salt
- my $md5 = shift; # do we want a MD5 salt?
+ # 0 for DES, 1 for MD5 salt and 2 for apache MD5 salt
+ my $type = shift;
my $validstr = './0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
my @valid = split(//,$validstr);
my ($in, $out);
- my $cryptsaltlen = ($md5 ? 8 : 2);
+ my $cryptsaltlen = 2;
+ if (($type == 1)||($type == 2)) {
+ $cryptsaltlen = 8;
+ }
open (F, "sync;
if ($mesg->code != LDAP_SUCCESS) {
print "Content-type: text/html; charset=utf-8\n\n";
- print "STARTTLS failed: "..$mesg->error."
\n";
+ print "STARTTLS failed: ".$mesg->error."
\n";
exit(1);
};
};