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
Openssl uefi #2961
Openssl uefi #2961
Conversation
Add OPENSSL_SYS_UEFI to remove unused syslog and uid stuffs for more clean UEFI build.
Variable 'pktype' was set but not used under OPENSSL_NO_GOST. This change will fix the build warning under [-Werror=unused-but-set-variable].
These are bugfixes for a supported build config, so 1.1.0 as well as master. |
dang button mistake! |
ssl/statem/statem_lib.c
Outdated
@@ -279,9 +279,10 @@ MSG_PROCESS_RETURN tls_process_cert_verify(SSL *s, PACKET *pkt) | |||
const unsigned char *data; | |||
#ifndef OPENSSL_NO_GOST | |||
unsigned char *gost_data = NULL; | |||
int pktype; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Remove this line.
ssl/statem/statem_lib.c
Outdated
@@ -384,6 +384,7 @@ MSG_PROCESS_RETURN tls_process_cert_verify(SSL *s, PACKET *pkt) | |||
} | |||
#ifndef OPENSSL_NO_GOST | |||
{ | |||
pktype = EVP_PKEY_id(pkey); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Change this line to int pktype = EVP_PKEY_id(pkey);
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's possible that gost_data
can be moved here in a similar manner
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's OK for me to move them to the position of first usage.
Do we have any rule against the variable declaration: declare all variables in one location or declare them when we first use them?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we don't have any strong rules. we try to move things to an inner block if possible, but we don't create blocks just to limit variable scope.
Done on ICLA & CCLA.
From: Rich Salz [mailto:notifications@github.com]
Sent: Wednesday, March 15, 2017 11:54 PM
To: openssl/openssl <openssl@noreply.github.com>
Cc: Long, Qin <qin.long@intel.com>; Mention <mention@noreply.github.com>
Subject: Re: [openssl/openssl] Openssl uefi (#2961)
These are bugfixes for a supported build config, so 1.1.0 as well as master.
But @qloong<https://github.com/qloong> we'll need you to sign an individual CLA as well. And if you're not LuGong you need to get Dan Zimmerman to add you to the Intel corporate CLA as well.
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub<#2961 (comment)>, or mute the thread<https://github.com/notifications/unsubscribe-auth/AFlyP47xHdN-ztjNPGxstjPxmPYSBmC6ks5rmAm0gaJpZM4MeImn>.
|
ssl/statem/statem_lib.c
Outdated
@@ -277,11 +277,8 @@ MSG_PROCESS_RETURN tls_process_cert_verify(SSL *s, PACKET *pkt) | |||
{ | |||
EVP_PKEY *pkey = NULL; | |||
const unsigned char *data; | |||
#ifndef OPENSSL_NO_GOST | |||
unsigned char *gost_data = NULL; | |||
#endif |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm sorry, I misled you regarding this one. There's now an OPENSSL_free
further down that's missing its variable...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Exactly. I also didn't notice this issue. So moving the gost_data declaration to the original position.
Move the declaration of gost_data to the original position (the last move will cause OPENSSL_free missing its variable...)
ssl/statem/statem_lib.c
Outdated
@@ -278,10 +278,10 @@ MSG_PROCESS_RETURN tls_process_cert_verify(SSL *s, PACKET *pkt) | |||
EVP_PKEY *pkey = NULL; | |||
const unsigned char *data; | |||
#ifndef OPENSSL_NO_GOST | |||
unsigned char *gost_data = NULL; | |||
unsigned char *gost_data = NULL; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmm, just noticed Travis complains here. Seems like it's a hard space, would you mind just rewriting those spaces?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Rewriting spaces. (So silly mistake. Not sure if it's caused by my online-editing.)
Fix hard space issue when editing.
@qloong, there's one detail missing, as explained in the mail you replied to: you need to get Dan Zimmerman to add you to the Intel corporate CLA as well. |
CLA now ok. Ping @levitte |
Add OPENSSL_SYS_UEFI to remove unused syslog and uid stuffs for more clean UEFI build. Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from #2961)
Variable 'pktype' was set but not used under OPENSSL_NO_GOST. This change will fix the build warning under [-Werror=unused-but-set-variable]. Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from #2961)
Cleaning-up CRT Library Wrapper for the third-party cryptography library building. The changes includes 1. Rename OpenSslSupport.h to CrtLibSupport.h for future alternative crypto provider support. 2. Remove all un-referenced CRT APIs and headers. (NOTE: More cleans-up could be possible after OpenSSL integrate the extra PR request: openssl/openssl#2961) Cc: Ting Ye <ting.ye@intel.com> Cc: Laszlo Ersek <lersek@redhat.com> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org> Cc: Gary Lin <glin@suse.com> Cc: Ronald Cron <ronald.cron@arm.com> Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Qin Long <qin.long@intel.com> Reviewed-by: Ting Ye <ting.ye@intel.com> Tested-by: Laszlo Ersek <lersek@redhat.com> Tested-by: Gary Lin <glin@suse.com>
Checklist
Description of change