Skip to content
This repository has been archived by the owner on Nov 16, 2021. It is now read-only.

Monero: normalization fixes #173

Merged
merged 1 commit into from
Aug 23, 2018
Merged

Monero: normalization fixes #173

merged 1 commit into from
Aug 23, 2018

Conversation

ph4r05
Copy link
Contributor

@ph4r05 ph4r05 commented Aug 21, 2018

PR that came from the discussion with @onvej-sl in #169

Requires rebasing on top of the master and merging #171 and #172 first.

@ph4r05
Copy link
Contributor Author

ph4r05 commented Aug 21, 2018

Thanks for the merge guys!

If you could pls rebase this branch on the master - it would be great :)
PR needs merged changes to scalarmults.

Thanks!

@prusnak
Copy link
Member

prusnak commented Aug 21, 2018

If I get ack from @onvej-sl I'll rebase merge/rebase this in monero branch.

@ph4r05
Copy link
Contributor Author

ph4r05 commented Aug 21, 2018

OK so we need 2 confirmations from @onvej-sl

  • rebase monero branch onto current master with merged PRs fixing scalarmults
  • merging this PR 173 into monero branch

Please also consider either #174 or #175 (or both) because when given header files are included together there are macro clashes due to namespace pollution.

@onvej-sl
Copy link
Contributor

onvej-sl commented Aug 22, 2018

ACK for rebase, please trigger a travis rebuild then.

@prusnak
Copy link
Member

prusnak commented Aug 22, 2018

Merged #171, #172, #174, #175 into master, rebased monero branch on top of master.

@ph4r05 Please rebase this PR. Thank you!

@ph4r05
Copy link
Contributor Author

ph4r05 commented Aug 22, 2018

Thanks! PR rebased, Travis tests finished.

@prusnak
Copy link
Member

prusnak commented Aug 22, 2018

@onvej-sl are you OK with the change?

@onvej-sl
Copy link
Contributor

ACK

@prusnak prusnak merged commit e3cfbe0 into trezor:monero Aug 23, 2018
@prusnak
Copy link
Member

prusnak commented Aug 23, 2018

Thank you both!

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants