Fix error clash in build by paulidale · Pull Request #13640 · openssl/openssl

paulidale · 2020-12-09T04:32:45Z

A recent merge broken the build.
This fixes it.

providers/common/include/prov/providercommonerr.h

t8m · 2020-12-09T09:05:07Z

Approved, however the CIs still fail

paulidale · 2020-12-09T09:40:33Z

I think I found the problem. At least I found another problem.

t8m · 2020-12-09T09:52:07Z

The last commit (b3118eb) is already in #13635

t8m · 2020-12-09T09:53:44Z

And unfortunately 118ea31 still did not fix the seed src issues.

paulidale · 2020-12-09T09:57:13Z

I'll drop b3118eb once the CI's pass.

paulidale · 2020-12-09T10:04:33Z

Got it.

Needs freeview

t8m

LGTM now

crypto/rand/rand_lib.c

This satisfies EVP's RAND layer.

providers/implementations/rands/seed_src.c

Reviewed-by: Richard Levitte <[email protected]> Reviewed-by: Tomas Mraz <[email protected]> (Merged from #13640)

This satisfies EVP's RAND layer. Reviewed-by: Richard Levitte <[email protected]> Reviewed-by: Tomas Mraz <[email protected]> (Merged from #13640)

Reviewed-by: Richard Levitte <[email protected]> Reviewed-by: Tomas Mraz <[email protected]> (Merged from #13640)

paulidale · 2020-12-09T12:31:10Z

I've removed the fix from #13635 and merged this to master.
The CIs will still be broken until the other urgent PRs are merged.

@paulidale

If a custom seed source is specified in the config file, it can be silently ignored. For example if it is missing, fails to be created, or fails to initialize it can be silently ignored and fallback to os entropy instead. To reproduce this, perform default configuration of openssl without jitter entropy source, and then specify jitter entropy source. Currently entropy will fall back to getrandom, instead of erroring out. This is not unique to jitter entropy source, there are a few other entropy source providers out there on the market, and in all cases if one is configuring OpenSSL to use a given seed source by name, it should be honored. Currently this will output a fresh rsa key, with this change however it will now result in an error: ``` ./Configure make ./util/wrap.pl -jitter ./apps/openssl genrsa Warning: generating random key material may take a long time if the system has a poor entropy source genrsa: Error generating RSA key 80ABAB8F9F7F0000:error:0308010C:digital envelope routines:inner_evp_generic_fetch:unsupported:crypto/evp/evp_fetch.c:375:Global default library context, Algorithm (JITTER : 0), Properties (<null>) 80ABAB8F9F7F0000:error:12000090:random number generator:rand_new_seed:unable to fetch drbg:crypto/rand/rand_lib.c:613: 80ABAB8F9F7F0000:error:0308010C:digital envelope routines:inner_evp_generic_fetch:unsupported:crypto/evp/evp_fetch.c:375:Global default library context, Algorithm (JITTER : 0), Properties (<null>) 80ABAB8F9F7F0000:error:12000090:random number generator:rand_new_seed:unable to fetch drbg:crypto/rand/rand_lib.c:613: ``` IMHO, if a user is configuring a custom seed source, it should be honored without silently eating errors. Note this partially reverts 1d180bb "rand: allow seed-src to be missing", which as far as I understand was done to ensure that fallback seedsource is allowed to be missing. This new implementation preserves this behaviour by ensuring error is not raised if SEED-SRC (which since the above commit was changed to a macro define OPENSSL_DEFAULT_SEED_SRC) is used as a fallback, and it fails to be fetched. Previously all errors were popped unconditionaly, thus same behaviour is preserved if SEED-SRC is completely missing and it wasn't configured in the config file. cc @paulidale, also see: - openssl#13640

@paulidale

If a custom seed source is specified in the config file, it can be silently ignored. For example if it is missing, fails to be created, or fails to initialize it can be silently ignored and fallback to os entropy instead. To reproduce this, perform default configuration of openssl without jitter entropy source, and then specify jitter entropy source. Currently entropy will fall back to getrandom, instead of erroring out. This is not unique to jitter entropy source, there are a few other entropy source providers out there on the market, and in all cases if one is configuring OpenSSL to use a given seed source by name, it should be honored. Currently this will output a fresh rsa key, with this change however it will now result in an error: ``` ./Configure make ./util/wrap.pl -jitter ./apps/openssl genrsa Warning: generating random key material may take a long time if the system has a poor entropy source genrsa: Error generating RSA key 80ABAB8F9F7F0000:error:0308010C:digital envelope routines:inner_evp_generic_fetch:unsupported:crypto/evp/evp_fetch.c:375:Global default library context, Algorithm (JITTER : 0), Properties (<null>) 80ABAB8F9F7F0000:error:12000090:random number generator:rand_new_seed:unable to fetch drbg:crypto/rand/rand_lib.c:613: 80ABAB8F9F7F0000:error:0308010C:digital envelope routines:inner_evp_generic_fetch:unsupported:crypto/evp/evp_fetch.c:375:Global default library context, Algorithm (JITTER : 0), Properties (<null>) 80ABAB8F9F7F0000:error:12000090:random number generator:rand_new_seed:unable to fetch drbg:crypto/rand/rand_lib.c:613: ``` IMHO, if a user is configuring a custom seed source, it should be honored without silently eating errors. Note this partially reverts 1d180bb "rand: allow seed-src to be missing", which as far as I understand was done to ensure that fallback seedsource is allowed to be missing. This new implementation preserves this behaviour by ensuring error is not raised if SEED-SRC (which since the above commit was changed to a macro define OPENSSL_DEFAULT_SEED_SRC) is used as a fallback, and it fails to be fetched. Previously all errors were popped unconditionaly, thus same behaviour is preserved if SEED-SRC is completely missing and it wasn't configured in the config file. cc @paulidale, also see: - openssl#13640

@paulidale

If a custom seed source is specified in the config file, it can be silently ignored. For example if it is missing, fails to be created, or fails to initialize it can be silently ignored and fallback to os entropy instead. To reproduce this, perform default configuration of openssl without jitter entropy source, and then specify jitter entropy source. Currently entropy will fall back to getrandom, instead of erroring out. This is not unique to jitter entropy source, there are a few other entropy source providers out there on the market, and in all cases if one is configuring OpenSSL to use a given seed source by name, it should be honored. Currently this will output a fresh rsa key, with this change however it will now result in an error: ``` ./Configure make ./util/wrap.pl -jitter ./apps/openssl genrsa Warning: generating random key material may take a long time if the system has a poor entropy source genrsa: Error generating RSA key 80ABAB8F9F7F0000:error:0308010C:digital envelope routines:inner_evp_generic_fetch:unsupported:crypto/evp/evp_fetch.c:375:Global default library context, Algorithm (JITTER : 0), Properties (<null>) 80ABAB8F9F7F0000:error:12000090:random number generator:rand_new_seed:unable to fetch drbg:crypto/rand/rand_lib.c:613: 80ABAB8F9F7F0000:error:0308010C:digital envelope routines:inner_evp_generic_fetch:unsupported:crypto/evp/evp_fetch.c:375:Global default library context, Algorithm (JITTER : 0), Properties (<null>) 80ABAB8F9F7F0000:error:12000090:random number generator:rand_new_seed:unable to fetch drbg:crypto/rand/rand_lib.c:613: ``` IMHO, if a user is configuring a custom seed source, it should be honored without silently eating errors. Note this partially reverts 1d180bb "rand: allow seed-src to be missing", which as far as I understand was done to ensure that fallback seedsource is allowed to be missing. This new implementation preserves this behaviour by ensuring error is not raised if SEED-SRC (which since the above commit was changed to a macro define OPENSSL_DEFAULT_SEED_SRC) is used as a fallback, and it fails to be fetched. Previously all errors were popped unconditionaly, thus same behaviour is preserved if SEED-SRC is completely missing and it wasn't configured in the config file. cc @paulidale, also see: - openssl#13640

@paulidale

If a custom seed source is specified in the config file, it can be silently ignored. For example if it is missing, fails to be created, or fails to initialize it can be silently ignored and fallback to os entropy instead. To reproduce this, perform default configuration of openssl without jitter entropy source, and then specify jitter entropy source. Currently entropy will fall back to getrandom, instead of erroring out. This is not unique to jitter entropy source, there are a few other entropy source providers out there on the market, and in all cases if one is configuring OpenSSL to use a given seed source by name, it should be honored. Currently this will output a fresh rsa key, with this change however it will now result in an error: ``` ./Configure make ./util/wrap.pl -jitter ./apps/openssl genrsa Warning: generating random key material may take a long time if the system has a poor entropy source genrsa: Error generating RSA key 80ABAB8F9F7F0000:error:0308010C:digital envelope routines:inner_evp_generic_fetch:unsupported:crypto/evp/evp_fetch.c:375:Global default library context, Algorithm (JITTER : 0), Properties (<null>) 80ABAB8F9F7F0000:error:12000090:random number generator:rand_new_seed:unable to fetch drbg:crypto/rand/rand_lib.c:613: 80ABAB8F9F7F0000:error:0308010C:digital envelope routines:inner_evp_generic_fetch:unsupported:crypto/evp/evp_fetch.c:375:Global default library context, Algorithm (JITTER : 0), Properties (<null>) 80ABAB8F9F7F0000:error:12000090:random number generator:rand_new_seed:unable to fetch drbg:crypto/rand/rand_lib.c:613: ``` IMHO, if a user is configuring a custom seed source, it should be honored without silently eating errors. Note this partially reverts 1d180bb "rand: allow seed-src to be missing", which as far as I understand was done to ensure that fallback seedsource is allowed to be missing. This new implementation preserves this behaviour by ensuring error is not raised if SEED-SRC (which since the above commit was changed to a macro define OPENSSL_DEFAULT_SEED_SRC) is used as a fallback, and it fails to be fetched. Previously all errors were popped unconditionaly, thus same behaviour is preserved if SEED-SRC is completely missing and it wasn't configured in the config file. cc @paulidale, also see: - #13640 Reviewed-by: Eugene Syromiatnikov <[email protected]> Reviewed-by: Paul Dale <[email protected]> (Merged from #29316)

@paulidale

If a custom seed source is specified in the config file, it can be silently ignored. For example if it is missing, fails to be created, or fails to initialize it can be silently ignored and fallback to os entropy instead. To reproduce this, perform default configuration of openssl without jitter entropy source, and then specify jitter entropy source. Currently entropy will fall back to getrandom, instead of erroring out. This is not unique to jitter entropy source, there are a few other entropy source providers out there on the market, and in all cases if one is configuring OpenSSL to use a given seed source by name, it should be honored. Currently this will output a fresh rsa key, with this change however it will now result in an error: ``` ./Configure make ./util/wrap.pl -jitter ./apps/openssl genrsa Warning: generating random key material may take a long time if the system has a poor entropy source genrsa: Error generating RSA key 80ABAB8F9F7F0000:error:0308010C:digital envelope routines:inner_evp_generic_fetch:unsupported:crypto/evp/evp_fetch.c:375:Global default library context, Algorithm (JITTER : 0), Properties (<null>) 80ABAB8F9F7F0000:error:12000090:random number generator:rand_new_seed:unable to fetch drbg:crypto/rand/rand_lib.c:613: 80ABAB8F9F7F0000:error:0308010C:digital envelope routines:inner_evp_generic_fetch:unsupported:crypto/evp/evp_fetch.c:375:Global default library context, Algorithm (JITTER : 0), Properties (<null>) 80ABAB8F9F7F0000:error:12000090:random number generator:rand_new_seed:unable to fetch drbg:crypto/rand/rand_lib.c:613: ``` IMHO, if a user is configuring a custom seed source, it should be honored without silently eating errors. Note this partially reverts 1d180bb "rand: allow seed-src to be missing", which as far as I understand was done to ensure that fallback seedsource is allowed to be missing. This new implementation preserves this behaviour by ensuring error is not raised if SEED-SRC (which since the above commit was changed to a macro define OPENSSL_DEFAULT_SEED_SRC) is used as a fallback, and it fails to be fetched. Previously all errors were popped unconditionaly, thus same behaviour is preserved if SEED-SRC is completely missing and it wasn't configured in the config file. cc @paulidale, also see: - openssl#13640 Reviewed-by: Eugene Syromiatnikov <[email protected]> Reviewed-by: Paul Dale <[email protected]> (Merged from openssl#29316)

paulidale added branch: master Applies to master branch triaged: bug The issue/pr is/fixes a bug severity: urgent Fixes an urgent issue (exempt from 24h grace period) labels Dec 9, 2020

paulidale added this to the 3.0.0 beta1 milestone Dec 9, 2020

paulidale self-assigned this Dec 9, 2020

levitte reviewed Dec 9, 2020

View reviewed changes

providers/common/include/prov/providercommonerr.h Outdated Show resolved Hide resolved

slontis mentioned this pull request Dec 9, 2020

v3nametest: Make the gennames array static #13635

Closed

paulidale mentioned this pull request Dec 9, 2020

rand: add a provider side seed source. #13455

Closed

2 tasks

t8m previously approved these changes Dec 9, 2020

View reviewed changes

t8m added the approval: done This pull request has the required number of approvals label Dec 9, 2020

t8m approved these changes Dec 9, 2020

View reviewed changes

levitte requested changes Dec 9, 2020

View reviewed changes

crypto/rand/rand_lib.c Outdated Show resolved Hide resolved

paulidale added 2 commits December 9, 2020 21:46

Fix error clash in build

0cecde3

rand seed: include lock and unlock functions.

9881de3

This satisfies EVP's RAND layer.

paulidale force-pushed the build-fix branch from aec1305 to 5e76e62 Compare December 9, 2020 11:46

levitte reviewed Dec 9, 2020

View reviewed changes

providers/implementations/rands/seed_src.c Outdated Show resolved Hide resolved

levitte mentioned this pull request Dec 9, 2020

PROV: Add MSBLOB and PVK encoders #13645

Closed

levitte approved these changes Dec 9, 2020

View reviewed changes

levitte mentioned this pull request Dec 9, 2020

EVP: fix keygen for EVP_PKEY_RSA_PSS #13099

Closed

1 task

paulidale added 3 commits December 9, 2020 22:27

rand: don't leak memory

bbe36ef

rand: allow seed-src to be missing

c069eb0

fixup! rand: don't leak memory

b6a2b7c

paulidale force-pushed the build-fix branch from 549791d to b6a2b7c Compare December 9, 2020 12:27

openssl-machine pushed a commit that referenced this pull request Dec 9, 2020

Fix error clash in build

e37b307

Reviewed-by: Richard Levitte <[email protected]> Reviewed-by: Tomas Mraz <[email protected]> (Merged from #13640)

openssl-machine pushed a commit that referenced this pull request Dec 9, 2020

rand seed: include lock and unlock functions.

8389eee

This satisfies EVP's RAND layer. Reviewed-by: Richard Levitte <[email protected]> Reviewed-by: Tomas Mraz <[email protected]> (Merged from #13640)

openssl-machine pushed a commit that referenced this pull request Dec 9, 2020

rand: don't leak memory

a678506

Reviewed-by: Richard Levitte <[email protected]> Reviewed-by: Tomas Mraz <[email protected]> (Merged from #13640)

openssl-machine pushed a commit that referenced this pull request Dec 9, 2020

rand: allow seed-src to be missing

1d180bb

Reviewed-by: Richard Levitte <[email protected]> Reviewed-by: Tomas Mraz <[email protected]> (Merged from #13640)

paulidale closed this Dec 9, 2020

paulidale deleted the build-fix branch December 9, 2020 12:31

xnox mentioned this pull request Dec 5, 2025

rand_lib: do not silently ignore custom seed source failures #29316

Closed

loci-dev mentioned this pull request Dec 5, 2025

UPSTREAM PR #29316: rand_lib: do not silently ignore custom seed source failures auroralabs-loci/openssl#164

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Comments

Fix error clash in build#13640

Fix error clash in build#13640
paulidale wants to merge 5 commits intoopenssl:masterfrom
paulidale:build-fix

paulidale commented Dec 9, 2020

Uh oh!

Uh oh!

t8m commented Dec 9, 2020

Uh oh!

paulidale commented Dec 9, 2020

Uh oh!

t8m commented Dec 9, 2020 •

edited

Loading

Uh oh!

t8m commented Dec 9, 2020

Uh oh!

paulidale commented Dec 9, 2020

Uh oh!

paulidale commented Dec 9, 2020

Uh oh!

t8m left a comment

Uh oh!

Uh oh!

Uh oh!

paulidale commented Dec 9, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Uh oh!

Comments

Conversation

paulidale commented Dec 9, 2020

Uh oh!

Uh oh!

t8m commented Dec 9, 2020

Uh oh!

paulidale commented Dec 9, 2020

Uh oh!

t8m commented Dec 9, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

t8m commented Dec 9, 2020

Uh oh!

paulidale commented Dec 9, 2020

Uh oh!

paulidale commented Dec 9, 2020

Uh oh!

t8m left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

paulidale commented Dec 9, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

t8m commented Dec 9, 2020 •

edited

Loading