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

[codehealth] remove some unused stuff #2797

Closed
wants to merge 3 commits into from
Closed

Conversation

kaduk
Copy link
Contributor

@kaduk kaduk commented Feb 28, 2017

Description of change

There's probably some more low-hanging fruit in util/indent.pro and crypto/des, but I am about to be called over to something else.

@@ -1,30 +0,0 @@
/*
Copy link
Contributor

Choose a reason for hiding this comment

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

This is being removed in #2776.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Great minds think alike, I guess :)
(BTW, while I was looking at my old notes about crufty things in the tree, I ran into OPENSSL_indirect_call(), which appears to be undocumented and unused in the tree, but it has also been that way for a very long time, so I am more inclined to believe that I am misreading how it is used than that it is safe to remove.)

Copy link
Contributor

Choose a reason for hiding this comment

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

OPENSSL_indirect_call(), which appears to be undocumented

See commentary in crypto/x86cpuid.pl. Original idea was to use it with 3rd party DLLs, those that would be loaded at run-time with LoadLibrary, without having to think about calling convention.

and unused in the tree

That's correct. Idea got no traction. Yeah, it can be removed...

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Idea got no traction. Yeah, it can be removed...

Do you want to make the pull request or should I?

Copy link
Contributor

Choose a reason for hiding this comment

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

Go ahead... [Just in case, I'm signing off for today in few minutes.]

@dot-asm
Copy link
Contributor

dot-asm commented Feb 28, 2017

But removal of rpc_enc should be skipped, #2776 does it more thoroughly.

Some things were not removed from util/indent.pro when they were removed
from the code.

grep '^-T' util/indent.pro | awk '{print $2} > /tmp/a
grep -rF -f /tmp/a --exclude CHANGES --exclude 'INSTALL' --exclude 'LICENSE' --exclude 'NEWS' --exclude 'NOTES*' --exclude 'README*' --exclude indent.pro --exclude-dir corpora -o -h *|sort|uniq>/tmp/b
comm -23 <(sort /tmp/a) /tmp/b >/tmp/c
grep -v -E '(LHASH_OF|STACK_OF)' /tmp/c > /tmp/d
grep -v -Ff /tmp/d util/indent.pro > util/indent.pro

Manually adjusted to retain time_t and the ossl_*intmax_t types.
It's even removing a BUGS entry!
@mattcaswell
Copy link
Member

Technically this is an API change even though the PEM structures aren't actually used anywhere. I guess the probability of someone actually trying to declare one of these things is close to zero though??

@kaduk
Copy link
Contributor Author

kaduk commented Mar 1, 2017

Technically this is an API change even though the PEM structures aren't actually used anywhere. I guess the probability of someone actually trying to declare one of these things is close to zero though??

Yes. (Do we even promise API compatibility or just ABI?)

@mattcaswell
Copy link
Member

Yes. (Do we even promise API compatibility or just ABI?)

Yes - it must be source and ABI compatible.

@mattcaswell
Copy link
Member

I'd like other team member opinions on whether this change is ok or not.

@richsalz
Copy link
Contributor

richsalz commented Mar 1, 2017

I am in favor of this. I doubt anyone is using these structures and, if they are, we can treat it like the opaque wolrk and restore them in a bugfix.

@richsalz
Copy link
Contributor

richsalz commented Mar 1, 2017

I will plus-one this if nobody else does, but I'd rather it was from someone else.

@levitte
Copy link
Member

levitte commented Mar 1, 2017

I'm ambivalent... If you want me to make a difference, give me a couple more hours

Copy link
Contributor

@ekasper ekasper left a comment

Choose a reason for hiding this comment

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

I vote for living dangerously and removing these.

@levitte
Copy link
Member

levitte commented Mar 1, 2017

I bow to you

@ekasper ekasper added the approval: done This pull request has the required number of approvals label Mar 3, 2017
levitte pushed a commit that referenced this pull request Mar 16, 2017
Reviewed-by: Emilia Käsper <emilia@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from #2797)
levitte pushed a commit that referenced this pull request Mar 16, 2017
Some things were not removed from util/indent.pro when they were removed
from the code.

grep '^-T' util/indent.pro | awk '{print $2} > /tmp/a
grep -rF -f /tmp/a --exclude CHANGES --exclude 'INSTALL' --exclude 'LICENSE' --exclude 'NEWS' --exclude 'NOTES*' --exclude 'README*' --exclude indent.pro --exclude-dir corpora -o -h *|sort|uniq>/tmp/b
comm -23 <(sort /tmp/a) /tmp/b >/tmp/c
grep -v -E '(LHASH_OF|STACK_OF)' /tmp/c > /tmp/d
grep -v -Ff /tmp/d util/indent.pro > util/indent.pro

Manually adjusted to retain time_t and the ossl_*intmax_t types.

Reviewed-by: Emilia Käsper <emilia@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from #2797)
levitte pushed a commit that referenced this pull request Mar 16, 2017
It's even removing a BUGS entry!

Reviewed-by: Emilia Käsper <emilia@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from #2797)
@levitte
Copy link
Member

levitte commented Mar 16, 2017

Merged. f775245 to 0ae407e

@levitte levitte closed this Mar 16, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approval: done This pull request has the required number of approvals
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants