Commit 9b374626 authored by Steven Fackler's avatar Steven Fackler
Browse files

Integrate everything

parent ec8d926e
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
/.rust/
/doc/
/rust-openssl
/rust-openssl.dSYM/

LICENSE

0 → 100644
+15 −0
Original line number Diff line number Diff line
Copyright 2011 Google Inc.
          2013 Jack Lloyd
          2013 Steven Fackler

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

    http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
+3 −3
Original line number Diff line number Diff line
@@ -3,11 +3,11 @@ RUSTC ?= rustc
RUST_FLAGS ?= -Z debug-info -O

all:
	$(RUSTPKG) $(RUST_FLAGS) install crypto
	$(RUSTPKG) $(RUST_FLAGS) install

test:
	$(RUSTC) $(RUST_FLAGS) --test src/crypto/lib.rs
	./src/crypto/crypto
	$(RUSTC) $(RUST_FLAGS) --test lib.rs
	./rust-openssl

clean:
	rm -rf bin/ lib/ build/ src/crypto/lib
+2 −2
Original line number Diff line number Diff line
@@ -105,8 +105,8 @@ pub fn hash(t: HashType, data: &[u8]) -> ~[u8] {

#[cfg(test)]
mod tests {
    use hex::FromHex;
    use hex::ToHex;
    use crypto::hex::FromHex;
    use crypto::hex::ToHex;

    struct HashTest {
        input: ~[u8],
+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@
use std::libc::{c_uchar, c_int, c_uint};
use std::ptr;
use std::vec;
use hash;
use crypto::hash;

#[allow(non_camel_case_types)]
pub struct HMAC_CTX {
Loading