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

Vendor updated fabric-amcl package #370

Merged
merged 1 commit into from
Dec 6, 2019
Merged

Vendor updated fabric-amcl package #370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Gopkg.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion bccsp/idemix/bridge/bridge_suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ package bridge_test
import (
"testing"

"github.com/hyperledger/fabric-amcl/amcl"
amcl "github.com/hyperledger/fabric-amcl/core"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)
Expand Down
2 changes: 1 addition & 1 deletion bccsp/idemix/bridge/bridge_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"fmt"

"github.com/golang/protobuf/proto"
"github.com/hyperledger/fabric-amcl/amcl/FP256BN"
"github.com/hyperledger/fabric-amcl/core/FP256BN"
"github.com/hyperledger/fabric/bccsp"
"github.com/hyperledger/fabric/bccsp/idemix/bridge"
"github.com/hyperledger/fabric/bccsp/idemix/handlers"
Expand Down
4 changes: 2 additions & 2 deletions bccsp/idemix/bridge/credential.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"bytes"

"github.com/golang/protobuf/proto"
"github.com/hyperledger/fabric-amcl/amcl"
"github.com/hyperledger/fabric-amcl/amcl/FP256BN"
amcl "github.com/hyperledger/fabric-amcl/core"
"github.com/hyperledger/fabric-amcl/core/FP256BN"
"github.com/hyperledger/fabric/bccsp"
"github.com/hyperledger/fabric/bccsp/idemix/handlers"
cryptolib "github.com/hyperledger/fabric/idemix"
Expand Down
2 changes: 1 addition & 1 deletion bccsp/idemix/bridge/credrequest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"bytes"

"github.com/golang/protobuf/proto"
"github.com/hyperledger/fabric-amcl/amcl"
amcl "github.com/hyperledger/fabric-amcl/core"
"github.com/hyperledger/fabric/bccsp/idemix/handlers"
cryptolib "github.com/hyperledger/fabric/idemix"
"github.com/pkg/errors"
Expand Down
2 changes: 1 addition & 1 deletion bccsp/idemix/bridge/issuer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"fmt"

"github.com/golang/protobuf/proto"
"github.com/hyperledger/fabric-amcl/amcl"
amcl "github.com/hyperledger/fabric-amcl/core"
"github.com/hyperledger/fabric/bccsp"
"github.com/hyperledger/fabric/bccsp/idemix/handlers"
cryptolib "github.com/hyperledger/fabric/idemix"
Expand Down
2 changes: 1 addition & 1 deletion bccsp/idemix/bridge/math.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ SPDX-License-Identifier: Apache-2.0
package bridge

import (
"github.com/hyperledger/fabric-amcl/amcl/FP256BN"
"github.com/hyperledger/fabric-amcl/core/FP256BN"
"github.com/hyperledger/fabric/idemix"
)

Expand Down
2 changes: 1 addition & 1 deletion bccsp/idemix/bridge/nymsignaturescheme.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ SPDX-License-Identifier: Apache-2.0
package bridge

import (
"github.com/hyperledger/fabric-amcl/amcl"
amcl "github.com/hyperledger/fabric-amcl/core"
"github.com/hyperledger/fabric/bccsp/idemix/handlers"

"github.com/golang/protobuf/proto"
Expand Down
2 changes: 1 addition & 1 deletion bccsp/idemix/bridge/rand.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ SPDX-License-Identifier: Apache-2.0
package bridge

import (
"github.com/hyperledger/fabric-amcl/amcl"
amcl "github.com/hyperledger/fabric-amcl/core"
cryptolib "github.com/hyperledger/fabric/idemix"
)

Expand Down
2 changes: 1 addition & 1 deletion bccsp/idemix/bridge/revocation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"crypto/ecdsa"

"github.com/golang/protobuf/proto"
"github.com/hyperledger/fabric-amcl/amcl/FP256BN"
"github.com/hyperledger/fabric-amcl/core/FP256BN"
"github.com/hyperledger/fabric/bccsp"
cryptolib "github.com/hyperledger/fabric/idemix"
"github.com/pkg/errors"
Expand Down
4 changes: 2 additions & 2 deletions bccsp/idemix/bridge/signaturescheme.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"crypto/ecdsa"

"github.com/golang/protobuf/proto"
"github.com/hyperledger/fabric-amcl/amcl"
"github.com/hyperledger/fabric-amcl/amcl/FP256BN"
amcl "github.com/hyperledger/fabric-amcl/core"
"github.com/hyperledger/fabric-amcl/core/FP256BN"
"github.com/hyperledger/fabric/bccsp"
"github.com/hyperledger/fabric/bccsp/idemix/handlers"
cryptolib "github.com/hyperledger/fabric/idemix"
Expand Down
4 changes: 2 additions & 2 deletions bccsp/idemix/bridge/user.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ SPDX-License-Identifier: Apache-2.0
package bridge

import (
"github.com/hyperledger/fabric-amcl/amcl"
"github.com/hyperledger/fabric-amcl/amcl/FP256BN"
amcl "github.com/hyperledger/fabric-amcl/core"
"github.com/hyperledger/fabric-amcl/core/FP256BN"
"github.com/hyperledger/fabric/bccsp/idemix/handlers"
cryptolib "github.com/hyperledger/fabric/idemix"
"github.com/pkg/errors"
Expand Down
2 changes: 1 addition & 1 deletion common/tools/idemixgen/idemixca/idemixca.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"crypto/ecdsa"

"github.com/golang/protobuf/proto"
"github.com/hyperledger/fabric-amcl/amcl/FP256BN"
"github.com/hyperledger/fabric-amcl/core/FP256BN"
m "github.com/hyperledger/fabric-protos-go/msp"
"github.com/hyperledger/fabric/idemix"
"github.com/hyperledger/fabric/msp"
Expand Down
4 changes: 2 additions & 2 deletions idemix/credential.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ SPDX-License-Identifier: Apache-2.0
package idemix

import (
"github.com/hyperledger/fabric-amcl/amcl"
"github.com/hyperledger/fabric-amcl/amcl/FP256BN"
amcl "github.com/hyperledger/fabric-amcl/core"
"github.com/hyperledger/fabric-amcl/core/FP256BN"
"github.com/pkg/errors"
)

Expand Down
4 changes: 2 additions & 2 deletions idemix/credrequest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ SPDX-License-Identifier: Apache-2.0
package idemix

import (
"github.com/hyperledger/fabric-amcl/amcl"
"github.com/hyperledger/fabric-amcl/amcl/FP256BN"
amcl "github.com/hyperledger/fabric-amcl/core"
"github.com/hyperledger/fabric-amcl/core/FP256BN"
"github.com/pkg/errors"
)

Expand Down
2 changes: 1 addition & 1 deletion idemix/idemix_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"bytes"
"testing"

"github.com/hyperledger/fabric-amcl/amcl/FP256BN"
"github.com/hyperledger/fabric-amcl/core/FP256BN"
"github.com/stretchr/testify/assert"
)

Expand Down
4 changes: 2 additions & 2 deletions idemix/issuerkey.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ package idemix

import (
"github.com/golang/protobuf/proto"
"github.com/hyperledger/fabric-amcl/amcl"
"github.com/hyperledger/fabric-amcl/amcl/FP256BN"
amcl "github.com/hyperledger/fabric-amcl/core"
"github.com/hyperledger/fabric-amcl/core/FP256BN"
"github.com/pkg/errors"
)

Expand Down
4 changes: 2 additions & 2 deletions idemix/nonrevocation-prover.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ SPDX-License-Identifier: Apache-2.0
package idemix

import (
"github.com/hyperledger/fabric-amcl/amcl"
"github.com/hyperledger/fabric-amcl/amcl/FP256BN"
amcl "github.com/hyperledger/fabric-amcl/core"
"github.com/hyperledger/fabric-amcl/core/FP256BN"
"github.com/pkg/errors"
)

Expand Down
2 changes: 1 addition & 1 deletion idemix/nonrevocation-verifier.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ SPDX-License-Identifier: Apache-2.0
package idemix

import (
"github.com/hyperledger/fabric-amcl/amcl/FP256BN"
"github.com/hyperledger/fabric-amcl/core/FP256BN"
"github.com/pkg/errors"
)

Expand Down
4 changes: 2 additions & 2 deletions idemix/nymsignature.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ SPDX-License-Identifier: Apache-2.0
package idemix

import (
"github.com/hyperledger/fabric-amcl/amcl"
"github.com/hyperledger/fabric-amcl/amcl/FP256BN"
amcl "github.com/hyperledger/fabric-amcl/core"
"github.com/hyperledger/fabric-amcl/core/FP256BN"
"github.com/pkg/errors"
)

Expand Down
4 changes: 2 additions & 2 deletions idemix/revocation_authority.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import (
"math/big"

"github.com/golang/protobuf/proto"
"github.com/hyperledger/fabric-amcl/amcl"
"github.com/hyperledger/fabric-amcl/amcl/FP256BN"
amcl "github.com/hyperledger/fabric-amcl/core"
"github.com/hyperledger/fabric-amcl/core/FP256BN"
"github.com/pkg/errors"
)

Expand Down
4 changes: 2 additions & 2 deletions idemix/signature.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"crypto/ecdsa"
"sort"

"github.com/hyperledger/fabric-amcl/amcl"
"github.com/hyperledger/fabric-amcl/amcl/FP256BN"
amcl "github.com/hyperledger/fabric-amcl/core"
"github.com/hyperledger/fabric-amcl/core/FP256BN"
"github.com/pkg/errors"
)

Expand Down
9 changes: 6 additions & 3 deletions idemix/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"crypto/rand"
"crypto/sha256"

"github.com/hyperledger/fabric-amcl/amcl"
"github.com/hyperledger/fabric-amcl/amcl/FP256BN"
amcl "github.com/hyperledger/fabric-amcl/core"
"github.com/hyperledger/fabric-amcl/core/FP256BN"
"github.com/pkg/errors"
)

Expand Down Expand Up @@ -68,7 +68,10 @@ func EcpToBytes(E *FP256BN.ECP) []byte {
}
func appendBytesG2(data []byte, index int, E *FP256BN.ECP2) int {
length := 4 * FieldBytes
E.ToBytes(data[index : index+length])
bytes := make([]byte, length+1)
E.ToBytes(bytes, false)
// need to strip first byte as ToBytes now adds an extra byte for type
copy(data[index:index+length], bytes[1:])
return index + length
}
func appendBytesBig(data []byte, index int, B *FP256BN.BIG) int {
Expand Down
4 changes: 2 additions & 2 deletions idemix/weak-bb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ SPDX-License-Identifier: Apache-2.0
package idemix

import (
"github.com/hyperledger/fabric-amcl/amcl"
"github.com/hyperledger/fabric-amcl/amcl/FP256BN"
amcl "github.com/hyperledger/fabric-amcl/core"
"github.com/hyperledger/fabric-amcl/core/FP256BN"
"github.com/pkg/errors"
)

Expand Down
Loading