Skip to content

Commit

Permalink
HKDF-SHA1 uses ring implementation, reusing AEAD cipher instance
Browse files Browse the repository at this point in the history 
- RustCrypto/ring-compat#79
- Upgraded other dependencies
  • Loading branch information
@zonyitoo
zonyitoo committed Mar 13, 2022
1 parent ebb509d commit a9215fb
Showing 1 changed file with 23 additions and 17 deletions.
40 changes: 23 additions & 17 deletions Cargo.lock
View file

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

4 comments on commit a9215fb

@dev4u
Copy link

@dev4u dev4u commented on a9215fb Mar 24, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

编译不通过

error: no rules expected the token `aarch64_apple`
   --> /.cargo/registry/src/github.com-1ecc6299db9ec823/ring-0.16.20/src/cpu.rs:257:13
no rules expected the token `aarch64_apple`

    |
165 |     macro_rules! features {
    |     --------------------- when calling this macro
...
257 |             aarch64_apple: true,
    |             ^^^^^^^^^^^^^ no rules expected this token in macro call

error[E0425]: cannot find value `AES` in module `cpu::arm`
   --> /.cargo/registry/src/github.com-1ecc6299db9ec823/ring-0.16.20/src/aead/aes.rs:381:65
    |
381 |         if cpu::intel::AES.available(cpu_features) || cpu::arm::AES.available(cpu_features) {
    |                                                                 ^^^ not found in `cpu::arm`
    |
help: consider importing this constant
    |
15  | use crate::cpu::intel::AES;
    |

error[E0425]: cannot find value `PMULL` in module `cpu::arm`
   --> /.cargo/registry/src/github.com-1ecc6299db9ec823/ring-0.16.20/src/aead/gcm.rs:315:26
    |
315 |             || cpu::arm::PMULL.available(cpu_features)
    |                          ^^^^^ not found in `cpu::arm`

error[E0425]: cannot find value `NEON` in this scope
   --> /.cargo/registry/src/github.com-1ecc6299db9ec823/ring-0.16.20/src/cpu.rs:95:32
    |
95  |             let mut features = NEON.mask;
    |                                ^^^^ not found in this scope
    |
note: unit variant `crate::aead::gcm::Implementation::NEON` exists but is inaccessible
   --> /.cargo/registry/src/github.com-1ecc6299db9ec823/ring-0.16.20/src/aead/gcm.rs:289:5
    |
289 |     NEON,
    |     ^^^^ not accessible

error[E0425]: cannot find value `AES` in this scope
   --> /.cargo/registry/src/github.com-1ecc6299db9ec823/ring-0.16.20/src/cpu.rs:114:29
    |
114 |                 features |= AES.mask;
    |                             ^^^ not found in this scope
    |
help: consider importing this constant
    |
64  |     use crate::cpu::intel::AES;
    |

error[E0425]: cannot find value `PMULL` in this scope
   --> /.cargo/registry/src/github.com-1ecc6299db9ec823/ring-0.16.20/src/cpu.rs:117:29
    |
117 |                 features |= PMULL.mask;
    |                             ^^^^^ not found in this scope

error[E0425]: cannot find value `SHA256` in this scope
   --> /.cargo/registry/src/github.com-1ecc6299db9ec823/ring-0.16.20/src/cpu.rs:120:29
    |
120 |                 features |= SHA256.mask;
    |                             ^^^^^^ not found in this scope
    |
help: consider importing this static
    |
64  |     use crate::digest::SHA256;
    |

error[E0425]: cannot find value `ARMCAP_STATIC` in this scope
   --> /.cargo/registry/src/github.com-1ecc6299db9ec823/ring-0.16.20/src/cpu.rs:235:41
    |
235 |             if self.mask == self.mask & ARMCAP_STATIC {
    |                                         ^^^^^^^^^^^^^ not found in this scope

error[E0425]: cannot find value `ARMCAP_STATIC` in this scope
   --> /.cargo/registry/src/github.com-1ecc6299db9ec823/ring-0.16.20/src/cpu.rs:288:36
    |
288 |     static mut GFp_armcap_P: u32 = ARMCAP_STATIC;
    |                                    ^^^^^^^^^^^^^ not found in this scope

For more information about this error, try `rustc --explain E0425`.
error: could not compile `ring` due to 9 previous errors
warning: build failed, waiting for other jobs to finish...
could not compile `ring` due to 9 previous errors

build failed, waiting for other jobs to finish...

error: build failed
build failed

@zonyitoo
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should open an issue on shadowsocks-crypto.

@zonyitoo
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you build ring on your aarch64 macOS anyway?

@dev4u
Copy link

@dev4u dev4u commented on a9215fb Mar 24, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

我已经在crypto创建了issue。
#15

Please sign in to comment.