Skip to content

Commit

Permalink
Revert "FAB-14693 Vendor updated fabric-amcl package"
Browse files Browse the repository at this point in the history 
This reverts commit bf085a2.

Change-Id: Id67ed4dc9b79b8d21617c3b116eac5e2822eca39
Signed-off-by: Matthew Sykes <sykesmat@us.ibm.com>
  • Loading branch information
@sykesm @denyeart
sykesm authored and denyeart committed Jan 28, 2020
1 parent 5138d25 commit 679985f
Show file tree
Hide file tree
Showing 71 changed files with 9,783 additions and 12,430 deletions.
12 changes: 6 additions & 6 deletions Gopkg.lock
View file

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
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ package bridge_test
import (
"testing"

amcl "github.com/hyperledger/fabric-amcl/core"
"github.com/hyperledger/fabric-amcl/amcl"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)
Expand Down
2 changes: 1 addition & 1 deletion bccsp/idemix/bridge/bridge_test.go
View file
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/core/FP256BN"
"github.com/hyperledger/fabric-amcl/amcl/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
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"bytes"

"github.com/golang/protobuf/proto"
amcl "github.com/hyperledger/fabric-amcl/core"
"github.com/hyperledger/fabric-amcl/core/FP256BN"
"github.com/hyperledger/fabric-amcl/amcl"
"github.com/hyperledger/fabric-amcl/amcl/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
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"bytes"

"github.com/golang/protobuf/proto"
amcl "github.com/hyperledger/fabric-amcl/core"
"github.com/hyperledger/fabric-amcl/amcl"
"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
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"fmt"

"github.com/golang/protobuf/proto"
amcl "github.com/hyperledger/fabric-amcl/core"
"github.com/hyperledger/fabric-amcl/amcl"
"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
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/core/FP256BN"
"github.com/hyperledger/fabric-amcl/amcl/FP256BN"
"github.com/hyperledger/fabric/idemix"
)

Expand Down
2 changes: 1 addition & 1 deletion bccsp/idemix/bridge/nymsignaturescheme.go
View file
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 (
amcl "github.com/hyperledger/fabric-amcl/core"
"github.com/hyperledger/fabric-amcl/amcl"
"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
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 (
amcl "github.com/hyperledger/fabric-amcl/core"
"github.com/hyperledger/fabric-amcl/amcl"
cryptolib "github.com/hyperledger/fabric/idemix"
)

Expand Down
2 changes: 1 addition & 1 deletion bccsp/idemix/bridge/revocation.go
View file
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/core/FP256BN"
"github.com/hyperledger/fabric-amcl/amcl/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
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"crypto/ecdsa"

"github.com/golang/protobuf/proto"
amcl "github.com/hyperledger/fabric-amcl/core"
"github.com/hyperledger/fabric-amcl/core/FP256BN"
"github.com/hyperledger/fabric-amcl/amcl"
"github.com/hyperledger/fabric-amcl/amcl/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
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 (
amcl "github.com/hyperledger/fabric-amcl/core"
"github.com/hyperledger/fabric-amcl/core/FP256BN"
"github.com/hyperledger/fabric-amcl/amcl"
"github.com/hyperledger/fabric-amcl/amcl/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
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/core/FP256BN"
"github.com/hyperledger/fabric-amcl/amcl/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
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 (
amcl "github.com/hyperledger/fabric-amcl/core"
"github.com/hyperledger/fabric-amcl/core/FP256BN"
"github.com/hyperledger/fabric-amcl/amcl"
"github.com/hyperledger/fabric-amcl/amcl/FP256BN"
"github.com/pkg/errors"
)

Expand Down
4 changes: 2 additions & 2 deletions idemix/credrequest.go
View file
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 (
amcl "github.com/hyperledger/fabric-amcl/core"
"github.com/hyperledger/fabric-amcl/core/FP256BN"
"github.com/hyperledger/fabric-amcl/amcl"
"github.com/hyperledger/fabric-amcl/amcl/FP256BN"
"github.com/pkg/errors"
)

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

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

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

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

Expand Down
4 changes: 2 additions & 2 deletions idemix/nonrevocation-prover.go
View file
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 (
amcl "github.com/hyperledger/fabric-amcl/core"
"github.com/hyperledger/fabric-amcl/core/FP256BN"
"github.com/hyperledger/fabric-amcl/amcl"
"github.com/hyperledger/fabric-amcl/amcl/FP256BN"
"github.com/pkg/errors"
)

Expand Down
2 changes: 1 addition & 1 deletion idemix/nonrevocation-verifier.go
View file
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/core/FP256BN"
"github.com/hyperledger/fabric-amcl/amcl/FP256BN"
"github.com/pkg/errors"
)

Expand Down
4 changes: 2 additions & 2 deletions idemix/nymsignature.go
View file
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 (
amcl "github.com/hyperledger/fabric-amcl/core"
"github.com/hyperledger/fabric-amcl/core/FP256BN"
"github.com/hyperledger/fabric-amcl/amcl"
"github.com/hyperledger/fabric-amcl/amcl/FP256BN"
"github.com/pkg/errors"
)

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

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

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

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

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

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

Expand Down Expand Up @@ -68,10 +68,7 @@ func EcpToBytes(E *FP256BN.ECP) []byte {
}
func appendBytesG2(data []byte, index int, E *FP256BN.ECP2) int {
length := 4 * FieldBytes
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:])
E.ToBytes(data[index : index+length])
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
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 (
amcl "github.com/hyperledger/fabric-amcl/core"
"github.com/hyperledger/fabric-amcl/core/FP256BN"
"github.com/hyperledger/fabric-amcl/amcl"
"github.com/hyperledger/fabric-amcl/amcl/FP256BN"
"github.com/pkg/errors"
)

Expand Down
Loading

0 comments on commit 679985f

Please sign in to comment.