Changeset 2365


Ignore:
Timestamp:
Feb 26, 2019, 1:37:40 AM (3 weeks ago)
Author:
bruno
Message:

Fix ECDSA lack of support for RHEL7 and avoid : in release tags

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • 0.14.6/pb/bin/pb

    r2327 r2365  
    46974697
    46984698# We still favour RSA and fall back to ECDSA if not available
    4699 $keyfile = "$ENV{'HOME'}/.ssh/id_rsa" if (-s "$ENV{'HOME'}/.ssh/id_rsa");
     4699#$keyfile = "$ENV{'HOME'}/.ssh/id_rsa" if (-s "$ENV{'HOME'}/.ssh/id_rsa");
    47004700if ($rsa != 0) {
    47014701    # And we favour a specific key over a generic one except if in delivery to ftp server
  • devel/pb/bin/pb

    r2362 r2365  
    12431243        }
    12441244
     1245        if (($pbtag =~ /:/) && ($scheme =~ /svn/)) {
     1246            die "RPM doesn't support release tag with ':'. Try to svn up before running pb";
     1247        }
     1248
    12451249        pb_log(0,"\n");
    12461250        pb_log(0,"Management of $pbpkg $pbver-$pbtag\n");
     
    48164820}
    48174821
    4818 # Some ECDSA implementation are not working correctly e.g. RHEL7, Fedora 20/21
    48194822if (!(-e "$ENV{'HOME'}/.ssh/pb_rsa") && ($create eq 1)) {
    48204823    pb_system("ssh-keygen -q -b 2048 -N '' -f $ENV{'HOME'}/.ssh/pb_rsa -t rsa","Generating RSA SSH keys for pb");
     
    48224825
    48234826# We still favour RSA and fall back to ECDSA if not available
    4824 $keyfile = "$ENV{'HOME'}/.ssh/id_rsa" if (-s "$ENV{'HOME'}/.ssh/id_rsa");
     4827# Some ECDSA implementation are not working correctly e.g. RHEL7, Fedora 20/21
     4828#$keyfile = "$ENV{'HOME'}/.ssh/pb_rsa" if (-s "$ENV{'HOME'}/.ssh/pb_rsa");
    48254829if ($rsa != 0) {
    48264830    # And we favour a specific key over a generic one except if in delivery to ftp server
Note: See TracChangeset for help on using the changeset viewer.