Skip to content

Commit b2139db

Browse files
dirkergitster
authored andcommitted
git-cvsimport: add support for cvs pserver password scrambling.
Instead of a cleartext password, the CVS pserver expects a scrambled one in the authentication request. With this patch it is possible to import CVS repositories only accessible via pserver and user/password. Signed-off-by: Dirk Hoerner <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 67e56ec commit b2139db

File tree

1 file changed

+38
-1
lines changed

1 file changed

+38
-1
lines changed

git-cvsimport.perl

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,8 @@ sub conn {
252252
}
253253
};
254254
}
255-
$pass="A" unless $pass;
255+
256+
$pass = $self->_scramble($pass);
256257

257258
my ($s, $rep);
258259
if ($proxyhost) {
@@ -484,6 +485,42 @@ sub _fetchfile {
484485
return $res;
485486
}
486487

488+
sub _scramble {
489+
my ($self, $pass) = @_;
490+
my $scrambled = "A";
491+
492+
return $scrambled unless $pass;
493+
494+
my $pass_len = length($pass);
495+
my @pass_arr = split("", $pass);
496+
my $i;
497+
498+
# from cvs/src/scramble.c
499+
my @shifts = (
500+
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
501+
16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
502+
114,120, 53, 79, 96,109, 72,108, 70, 64, 76, 67,116, 74, 68, 87,
503+
111, 52, 75,119, 49, 34, 82, 81, 95, 65,112, 86,118,110,122,105,
504+
41, 57, 83, 43, 46,102, 40, 89, 38,103, 45, 50, 42,123, 91, 35,
505+
125, 55, 54, 66,124,126, 59, 47, 92, 71,115, 78, 88,107,106, 56,
506+
36,121,117,104,101,100, 69, 73, 99, 63, 94, 93, 39, 37, 61, 48,
507+
58,113, 32, 90, 44, 98, 60, 51, 33, 97, 62, 77, 84, 80, 85,223,
508+
225,216,187,166,229,189,222,188,141,249,148,200,184,136,248,190,
509+
199,170,181,204,138,232,218,183,255,234,220,247,213,203,226,193,
510+
174,172,228,252,217,201,131,230,197,211,145,238,161,179,160,212,
511+
207,221,254,173,202,146,224,151,140,196,205,130,135,133,143,246,
512+
192,159,244,239,185,168,215,144,139,165,180,157,147,186,214,176,
513+
227,231,219,169,175,156,206,198,129,164,150,210,154,177,134,127,
514+
182,128,158,208,162,132,167,209,149,241,153,251,237,236,171,195,
515+
243,233,253,240,194,250,191,155,142,137,245,235,163,242,178,152
516+
);
517+
518+
for ($i = 0; $i < $pass_len; $i++) {
519+
$scrambled .= pack("C", $shifts[ord($pass_arr[$i])]);
520+
}
521+
522+
return $scrambled;
523+
}
487524

488525
package main;
489526

0 commit comments

Comments
 (0)