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.

Sign up for GitHub

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

Jump to bottom

Various cleanup #1906

Closed
wants to merge 2 commits into from
Closed

Various cleanup #1906

wants to merge 2 commits into from
+7 −79

Conversation

FdaSilvaYY
Copy link
Contributor

@FdaSilvaYY FdaSilvaYY commented Nov 11, 2016 •
edited

Description of change
  • discard one unused variable,
  • remove one useless,
  • disable some old dead Err defines, and discard associated macros.

Targets:

  • master
  • branch 1.1.0
  • branch 1.0.2 ( p5_pbev2.c only concerned, and if you want)

levitte
levitte requested changes Nov 11, 2016
View reviewed changes
crypto/asn1/p5_pbev2.c
@@ -41,27 +41,25 @@ X509_ALGOR *PKCS5_pbe2_set_iv(const EVP_CIPHER *cipher, int iter,
unsigned char *salt, int saltlen,
unsigned char *aiv, int prf_nid)
{
X509_ALGOR *scheme = NULL, *kalg = NULL, *ret = NULL;
X509_ALGOR *scheme, *ret = NULL;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please keep the initialization of scheme

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed !

@richsalz richsalz added 1.1.0 branch: master Merge to master branch labels Nov 13, 2016
richsalz
richsalz suggested changes Nov 13, 2016
View reviewed changes
Copy link
Contributor

@richsalz richsalz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know if it's worth porting that single commit back to 1.0.2 but I don't care much.

include/openssl/err.h
@@ -84,12 +84,12 @@ typedef struct err_state_st {
# define ERR_LIB_COMP 41
# define ERR_LIB_ECDSA 42
# define ERR_LIB_ECDH 43
# define ERR_LIB_STORE 44
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

don't edit this file; these things will come back when someone does 'make errs'

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure, but who do you explain that some defines (like 15-lines or more above) are commented ?
I have not yet dig the pelr/mkerr code.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh right, i was confused and thinking of error codes.

@richsalz
Copy link
Contributor

+1

@FdaSilvaYY FdaSilvaYY force-pushed the pbev2-cleanup branch 3 times, most recently from 417e6a1 to 780f25f Compare November 18, 2016 20:44
@FdaSilvaYY
Copy link
Contributor Author

@levitte : changes done .
PR rebased.

@FdaSilvaYY FdaSilvaYY force-pushed the pbev2-cleanup branch 3 times, most recently from b5d6086 to 2e4014f Compare December 1, 2016 21:08
@FdaSilvaYY FdaSilvaYY force-pushed the pbev2-cleanup branch 4 times, most recently from 6e321ee to 25cb651 Compare December 10, 2016 16:33
@FdaSilvaYY FdaSilvaYY force-pushed the pbev2-cleanup branch 2 times, most recently from 8b6da18 to 3d64b5e Compare January 9, 2017 18:54
levitte pushed a commit that referenced this pull request Jan 18, 2017
@FdaSilvaYY @levitte
Clean one unused variable, plus an useless one.
2191dc8 
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from #1906)
levitte pushed a commit that referenced this pull request Jan 18, 2017
@FdaSilvaYY @levitte
Clean dead macros and defines
31a5115 
... mostly related to some old discarded modules .

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from #1906)
levitte pushed a commit that referenced this pull request Jan 18, 2017
@FdaSilvaYY @levitte
Clean one unused variable, plus an useless one.
17f4d25 
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from #1906)
(cherry picked from commit 2191dc8)
levitte pushed a commit that referenced this pull request Jan 18, 2017
@FdaSilvaYY @levitte
Clean dead macros and defines
bb2efac 
... mostly related to some old discarded modules .

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from #1906)
(cherry picked from commit 31a5115)
levitte pushed a commit that referenced this pull request Jan 18, 2017
@FdaSilvaYY @levitte
Clean one unused variable, plus an useless one.
52b703f 
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from #1906)
(cherry picked from commit 2191dc8)
@levitte
Copy link
Member

levitte commented Jan 18, 2017

Merged (I did the port to 1.0.2 as well)

@levitte levitte closed this Jan 18, 2017
@FdaSilvaYY
Copy link
Contributor Author

Thanks !

@FdaSilvaYY FdaSilvaYY deleted the pbev2-cleanup branch January 18, 2017 23:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@levitte levitte levitte approved these changes

@richsalz richsalz richsalz approved these changes

Assignees
No one assigned
Labels
branch: master Merge to master branch
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@FdaSilvaYY @richsalz @levitte