Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use consistently SHA-256 for signatures (fixes #1992) #2000

Merged
merged 2 commits into from
Apr 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/XrdCrypto/XrdCryptosslgsiAux.cc
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,7 @@ int XrdCryptosslX509CreateProxy(const char *fnc, const char *fnk,
}
//
// Sign the request
if (!(X509_REQ_sign(preq, ekPX, EVP_sha1()))) {
if (!(X509_REQ_sign(preq, ekPX, EVP_sha256()))) {
PRINT("problems signing the request");
return -kErrPX_Signing;
}
Expand Down Expand Up @@ -549,7 +549,7 @@ int XrdCryptosslX509CreateProxy(const char *fnc, const char *fnk,

//
// Sign the certificate
if (!(X509_sign(xPX, ekEEC, EVP_sha1()))) {
if (!(X509_sign(xPX, ekEEC, EVP_sha256()))) {
PRINT("problems signing the certificate");
return -kErrPX_Signing;
}
Expand Down Expand Up @@ -851,7 +851,7 @@ int XrdCryptosslX509CreateProxyReq(XrdCryptoX509 *xcpi,
}
//
// Sign the request
if (!(X509_REQ_sign(xro, ekro, EVP_sha1()))) {
if (!(X509_REQ_sign(xro, ekro, EVP_sha256()))) {
PRINT("problems signing the request");
return -kErrPX_Signing;
}
Expand Down Expand Up @@ -1155,7 +1155,7 @@ int XrdCryptosslX509SignProxyReq(XrdCryptoX509 *xcpi, XrdCryptoRSA *kcpi,

//
// Sign the certificate
if (!(X509_sign(xpo, ekpi, EVP_sha1()))) {
if (!(X509_sign(xpo, ekpi, EVP_sha256()))) {
PRINT("problems signing the certificate");
return -kErrPX_Signing;
}
Expand Down
102 changes: 0 additions & 102 deletions src/XrdCrypto/XrdCryptosslgsiAux.hh

This file was deleted.

1 change: 0 additions & 1 deletion src/XrdHeaders.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,6 @@ if( NOT XRDCL_ONLY )
XrdCrypto/XrdCryptoX509Crl.hh
XrdCrypto/XrdCryptoX509Req.hh
XrdCrypto/XrdCryptoRSA.hh
XrdCrypto/XrdCryptosslgsiAux.hh

XrdSut/XrdSutAux.hh
XrdSut/XrdSutBucket.hh
Expand Down
2 changes: 1 addition & 1 deletion src/XrdUtils.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ set ( XrdCryptoSources
XrdCrypto/XrdCryptoX509Chain.cc XrdCrypto/XrdCryptoX509Chain.hh
XrdCrypto/XrdCryptosslRSA.cc XrdCrypto/XrdCryptosslRSA.hh
XrdCrypto/XrdCryptoRSA.cc XrdCrypto/XrdCryptoRSA.hh
XrdCrypto/XrdCryptosslgsiAux.cc XrdCrypto/XrdCryptosslgsiAux.hh
XrdCrypto/XrdCryptosslgsiAux.cc
XrdCrypto/XrdCryptosslX509Req.cc XrdCrypto/XrdCryptosslX509Req.hh
XrdCrypto/XrdCryptoX509Req.cc XrdCrypto/XrdCryptoX509Req.hh
XrdCrypto/XrdCryptoAux.cc XrdCrypto/XrdCryptoAux.hh
Expand Down