-
Notifications
You must be signed in to change notification settings - Fork 919
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
fix: correctly handle calls for GetRNG() when being made from nrf devices with SoftDevice enabled #4692
Merged
Merged
fix: correctly handle calls for GetRNG() when being made from nrf devices with SoftDevice enabled #4692
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
//go:build nrf && !softdevice | ||
|
||
package machine | ||
|
||
// GetRNG returns 32 bits of non-deterministic random data based on internal thermal noise. | ||
// According to Nordic's documentation, the random output is suitable for cryptographic purposes. | ||
func GetRNG() (ret uint32, err error) { | ||
return getRNG() | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,59 @@ | ||
//go:build nrf && softdevice | ||
|
||
package machine | ||
|
||
import ( | ||
"device/arm" | ||
"device/nrf" | ||
|
||
"errors" | ||
) | ||
|
||
// avoid a heap allocation in GetRNG. | ||
var ( | ||
softdeviceEnabled uint8 | ||
bytesAvailable uint8 | ||
buf [4]uint8 | ||
|
||
errNoSoftDeviceSupport = errors.New("rng: softdevice not supported on this device") | ||
errNotEnoughRandomData = errors.New("rng: not enough random data available") | ||
) | ||
|
||
// GetRNG returns 32 bits of non-deterministic random data based on internal thermal noise. | ||
// According to Nordic's documentation, the random output is suitable for cryptographic purposes. | ||
func GetRNG() (ret uint32, err error) { | ||
// First check whether the SoftDevice is enabled. | ||
// sd_rand_application_bytes_available_get cannot be called when the SoftDevice is not enabled. | ||
arm.SVCall1(0x12, &softdeviceEnabled) // sd_softdevice_is_enabled | ||
|
||
if softdeviceEnabled == 0 { | ||
return getRNG() | ||
} | ||
|
||
// call into the SoftDevice to get random data bytes available | ||
switch nrf.Device { | ||
case "nrf51": | ||
// sd_rand_application_bytes_available_get: SOC_SVC_BASE_NOT_AVAILABLE + 4 | ||
arm.SVCall1(0x2B+4, &bytesAvailable) | ||
case "nrf52", "nrf52840", "nrf52833": | ||
// sd_rand_application_bytes_available_get: SOC_SVC_BASE_NOT_AVAILABLE + 4 | ||
arm.SVCall1(0x2C+4, &bytesAvailable) | ||
default: | ||
return 0, errNoSoftDeviceSupport | ||
} | ||
|
||
if bytesAvailable < 4 { | ||
return 0, errNotEnoughRandomData | ||
} | ||
|
||
switch nrf.Device { | ||
case "nrf51": | ||
// sd_rand_application_vector_get: SOC_SVC_BASE_NOT_AVAILABLE + 5 | ||
arm.SVCall2(0x2B+5, &buf, 4) | ||
case "nrf52", "nrf52840", "nrf52833": | ||
// sd_rand_application_vector_get: SOC_SVC_BASE_NOT_AVAILABLE + 5 | ||
arm.SVCall2(0x2C+5, &buf, 4) | ||
} | ||
|
||
return uint32(buf[0]) | uint32(buf[1])<<8 | uint32(buf[2])<<16 | uint32(buf[3])<<24, nil | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
Is there a case when we have
"nrf52840", "nrf52833"
and not"nrf52"
?I mean this can probably be dropped:
", nrf52840", "nrf52833"
?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 stole this code from https://github.com/tinygo-org/tinygo/blob/release/src/runtime/runtime_nrf_softdevice.go#L32