Merge branch 'master' into develop

This commit is contained in:
Isis Lovecruft 2019-01-18 05:58:49 +00:00
commit ebd9ad6a6e
No known key found for this signature in database
GPG key ID: AB41313533E8E812
12 changed files with 15 additions and 19 deletions

View file

@ -20,9 +20,6 @@ matrix:
# Test serde support on stable, assuming that if it works there it'll work everywhere: # Test serde support on stable, assuming that if it works there it'll work everywhere:
- rust: stable - rust: stable
env: TEST_COMMAND=test FEATURE='--features=serde' env: TEST_COMMAND=test FEATURE='--features=serde'
# Test with the optional sha2 feature enabled:
- rust: stable
env: TEST_COMMAND=test FEATURE='--features=sha2'
script: script:
- cargo $TEST_COMMAND $FEATURES - cargo $TEST_COMMAND $FEATURES

View file

@ -1,7 +1,7 @@
[package] [package]
name = "ed25519-dalek" name = "ed25519-dalek"
version = "1.0.0-pre.0" version = "1.0.0-pre.1"
authors = ["Isis Lovecruft <isis@patternsinthevoid.net>"] authors = ["isis lovecruft <isis@patternsinthevoid.net>"]
readme = "README.md" readme = "README.md"
license = "BSD-3-Clause" license = "BSD-3-Clause"
repository = "https://github.com/dalek-cryptography/ed25519-dalek" repository = "https://github.com/dalek-cryptography/ed25519-dalek"
@ -49,7 +49,6 @@ harness = false
[features] [features]
default = ["std", "u64_backend"] default = ["std", "u64_backend"]
# We don't add "rand/std" here because it would enable a bunch of Fuchsia dependencies.
std = ["curve25519-dalek/std", "rand/std", "sha2/std"] std = ["curve25519-dalek/std", "rand/std", "sha2/std"]
alloc = ["curve25519-dalek/alloc"] alloc = ["curve25519-dalek/alloc"]
nightly = ["curve25519-dalek/nightly", "rand/nightly", "clear_on_drop/nightly"] nightly = ["curve25519-dalek/nightly", "rand/nightly", "clear_on_drop/nightly"]

View file

@ -1,4 +1,4 @@
Copyright (c) 2017-2018 Isis Agora Lovecruft. All rights reserved. Copyright (c) 2017-2019 isis agora lovecruft. All rights reserved.
Redistribution and use in source and binary forms, with or without Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are modification, are permitted provided that the following conditions are

View file

@ -1,11 +1,11 @@
// -*- mode: rust; -*- // -*- mode: rust; -*-
// //
// This file is part of ed25519-dalek. // This file is part of ed25519-dalek.
// Copyright (c) 2018 Isis Lovecruft // Copyright (c) 2018-2019 isis lovecruft
// See LICENSE for licensing information. // See LICENSE for licensing information.
// //
// Authors: // Authors:
// - Isis Agora Lovecruft <isis@patternsinthevoid.net> // - isis agora lovecruft <isis@patternsinthevoid.net>
#[macro_use] #[macro_use]
extern crate criterion; extern crate criterion;

View file

@ -1,7 +1,7 @@
// -*- mode: rust; -*- // -*- mode: rust; -*-
// //
// This file is part of ed25519-dalek. // This file is part of ed25519-dalek.
// Copyright (c) 2017-2018 isis lovecruft // Copyright (c) 2017-2019 isis lovecruft
// See LICENSE for licensing information. // See LICENSE for licensing information.
// //
// Authors: // Authors:

View file

@ -1,7 +1,7 @@
// -*- mode: rust; -*- // -*- mode: rust; -*-
// //
// This file is part of ed25519-dalek. // This file is part of ed25519-dalek.
// Copyright (c) 2017-2018 isis lovecruft // Copyright (c) 2017-2019 isis lovecruft
// See LICENSE for licensing information. // See LICENSE for licensing information.
// //
// Authors: // Authors:

View file

@ -1,11 +1,11 @@
// -*- mode: rust; -*- // -*- mode: rust; -*-
// //
// This file is part of ed25519-dalek. // This file is part of ed25519-dalek.
// Copyright (c) 2017 Isis Lovecruft // Copyright (c) 2017-2019 isis lovecruft
// See LICENSE for licensing information. // See LICENSE for licensing information.
// //
// Authors: // Authors:
// - Isis Agora Lovecruft <isis@patternsinthevoid.net> // - isis agora lovecruft <isis@patternsinthevoid.net>
//! Errors which may occur when parsing keys and/or signatures to or from wire formats. //! Errors which may occur when parsing keys and/or signatures to or from wire formats.

View file

@ -1,11 +1,11 @@
// -*- mode: rust; -*- // -*- mode: rust; -*-
// //
// This file is part of ed25519-dalek. // This file is part of ed25519-dalek.
// Copyright (c) 2017-2018 Isis Lovecruft // Copyright (c) 2017-2019 isis lovecruft
// See LICENSE for licensing information. // See LICENSE for licensing information.
// //
// Authors: // Authors:
// - Isis Agora Lovecruft <isis@patternsinthevoid.net> // - isis agora lovecruft <isis@patternsinthevoid.net>
//! A Rust implementation of ed25519 key generation, signing, and verification. //! A Rust implementation of ed25519 key generation, signing, and verification.
//! //!

View file

@ -1,7 +1,7 @@
// -*- mode: rust; -*- // -*- mode: rust; -*-
// //
// This file is part of ed25519-dalek. // This file is part of ed25519-dalek.
// Copyright (c) 2017-2018 isis lovecruft // Copyright (c) 2017-2019 isis lovecruft
// See LICENSE for licensing information. // See LICENSE for licensing information.
// //
// Authors: // Authors:

View file

@ -1,7 +1,7 @@
// -*- mode: rust; -*- // -*- mode: rust; -*-
// //
// This file is part of ed25519-dalek. // This file is part of ed25519-dalek.
// Copyright (c) 2017-2018 isis lovecruft // Copyright (c) 2017-2019 isis lovecruft
// See LICENSE for licensing information. // See LICENSE for licensing information.
// //
// Authors: // Authors:

View file

@ -1,7 +1,7 @@
// -*- mode: rust; -*- // -*- mode: rust; -*-
// //
// This file is part of ed25519-dalek. // This file is part of ed25519-dalek.
// Copyright (c) 2017-2018 isis lovecruft // Copyright (c) 2017-2019 isis lovecruft
// See LICENSE for licensing information. // See LICENSE for licensing information.
// //
// Authors: // Authors:

View file

@ -1,7 +1,7 @@
// -*- mode: rust; -*- // -*- mode: rust; -*-
// //
// This file is part of ed25519-dalek. // This file is part of ed25519-dalek.
// Copyright (c) 2017-2018 isis lovecruft // Copyright (c) 2017-2019 isis lovecruft
// See LICENSE for licensing information. // See LICENSE for licensing information.
// //
// Authors: // Authors: