Skip to content

ssh-key: rename MPInt => Mpint#76

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

Merged
tarcieri merged 1 commit into from
Mar 7, 2023
Merged

ssh-key: rename MPInt => Mpint#76

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
2 changes: 1 addition & 1 deletion ssh-key/src/lib.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -177,7 +177,7 @@ pub use sha2;
pub use crate::{
certificate::Certificate,
known_hosts::KnownHosts,
mpint::MPInt,
mpint::Mpint,
signature::{Signature, SigningKey},
sshsig::SshSig,
};
Expand Down
72 changes: 36 additions & 36 deletions ssh-key/src/mpint.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,12 +39,12 @@ use zeroize::Zeroizing;
/// |-1234 | `00 00 00 02 ed cc`
/// | -deadbeef | `00 00 00 05 ff 21 52 41 11`
#[derive(Clone, PartialOrd, Ord)]
pub struct MPInt {
pub struct Mpint {
/// Inner big endian-serialized integer value
inner: Vec<u8>,
}

impl MPInt {
impl Mpint {
/// Create a new multiple precision integer from the given
/// big endian-encoded byte slice.
///
Expand DownExpand Up@@ -74,7 +74,7 @@ impl MPInt {
/// Get the big integer data encoded as big endian bytes.
///
/// This slice will contain a leading zero if the value is positive but the
/// MSB is also set. Use [`MPInt::as_positive_bytes`] to ensure the number
/// MSB is also set. Use [`Mpint::as_positive_bytes`] to ensure the number
/// is positive and strip the leading zero byte if it exists.
pub fn as_bytes(&self) -> &[u8] {
&self.inner
Expand All@@ -94,35 +94,35 @@ impl MPInt {
}
}

impl AsRef<[u8]> for MPInt {
impl AsRef<[u8]> for Mpint {
fn as_ref(&self) -> &[u8] {
self.as_bytes()
}
}

impl ConstantTimeEq for MPInt {
impl ConstantTimeEq for Mpint {
fn ct_eq(&self, other: &Self) -> Choice {
self.as_ref().ct_eq(other.as_ref())
}
}

impl Eq for MPInt {}
impl Eq for Mpint {}

impl PartialEq for MPInt {
impl PartialEq for Mpint {
fn eq(&self, other: &Self) -> bool {
self.ct_eq(other).into()
}
}

impl Decode for MPInt {
impl Decode for Mpint {
type Error = Error;

fn decode(reader: &mut impl Reader) -> Result<Self> {
Vec::decode(reader)?.try_into()
}
}

impl Encode for MPInt {
impl Encode for Mpint {
type Error = Error;

fn encoded_len(&self) -> Result<usize> {
Expand All@@ -135,15 +135,15 @@ impl Encode for MPInt {
}
}

impl TryFrom<&[u8]> for MPInt {
impl TryFrom<&[u8]> for Mpint {
type Error = Error;

fn try_from(bytes: &[u8]) -> Result<Self> {
Vec::from(bytes).try_into()
}
}

impl TryFrom<Vec<u8>> for MPInt {
impl TryFrom<Vec<u8>> for Mpint {
type Error = Error;

fn try_from(bytes: Vec<u8>) -> Result<Self> {
Expand All@@ -157,25 +157,25 @@ impl TryFrom<Vec<u8>> for MPInt {
}
}

impl Zeroize for MPInt {
impl Zeroize for Mpint {
fn zeroize(&mut self) {
self.inner.zeroize();
}
}

impl fmt::Debug for MPInt {
impl fmt::Debug for Mpint {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
write!(f, "MPInt({self:X})")
write!(f, "Mpint({self:X})")
}
}

impl fmt::Display for MPInt {
impl fmt::Display for Mpint {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
write!(f, "{self:X}")
}
}

impl fmt::LowerHex for MPInt {
impl fmt::LowerHex for Mpint {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
for byte in self.as_bytes() {
write!(f, "{byte:02x}")?;
Expand All@@ -184,7 +184,7 @@ impl fmt::LowerHex for MPInt {
}
}

impl fmt::UpperHex for MPInt {
impl fmt::UpperHex for Mpint {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
for byte in self.as_bytes() {
write!(f, "{byte:02X}")?;
Expand All@@ -194,38 +194,38 @@ impl fmt::UpperHex for MPInt {
}

#[cfg(any(feature = "dsa", feature = "rsa"))]
impl TryFrom<bigint::BigUint> for MPInt {
impl TryFrom<bigint::BigUint> for Mpint {
type Error = Error;

fn try_from(uint: bigint::BigUint) -> Result<MPInt> {
MPInt::try_from(&uint)
fn try_from(uint: bigint::BigUint) -> Result<Mpint> {
Mpint::try_from(&uint)
}
}

#[cfg(any(feature = "dsa", feature = "rsa"))]
impl TryFrom<&bigint::BigUint> for MPInt {
impl TryFrom<&bigint::BigUint> for Mpint {
type Error = Error;

fn try_from(uint: &bigint::BigUint) -> Result<MPInt> {
fn try_from(uint: &bigint::BigUint) -> Result<Mpint> {
let bytes = Zeroizing::new(uint.to_bytes_be());
MPInt::from_positive_bytes(bytes.as_slice())
Mpint::from_positive_bytes(bytes.as_slice())
}
}

#[cfg(any(feature = "dsa", feature = "rsa"))]
impl TryFrom<MPInt> for bigint::BigUint {
impl TryFrom<Mpint> for bigint::BigUint {
type Error = Error;

fn try_from(mpint: MPInt) -> Result<bigint::BigUint> {
fn try_from(mpint: Mpint) -> Result<bigint::BigUint> {
bigint::BigUint::try_from(&mpint)
}
}

#[cfg(any(feature = "dsa", feature = "rsa"))]
impl TryFrom<&MPInt> for bigint::BigUint {
impl TryFrom<&Mpint> for bigint::BigUint {
type Error = Error;

fn try_from(mpint: &MPInt) -> Result<bigint::BigUint> {
fn try_from(mpint: &Mpint) -> Result<bigint::BigUint> {
mpint
.as_positive_bytes()
.map(bigint::BigUint::from_bytes_be)
Expand All@@ -235,30 +235,30 @@ impl TryFrom<&MPInt> for bigint::BigUint {

#[cfg(test)]
mod tests {
use super::MPInt;
use super::Mpint;
use hex_literal::hex;

#[test]
fn decode_0() {
let n = MPInt::from_bytes(b"").unwrap();
let n = Mpint::from_bytes(b"").unwrap();
assert_eq!(b"", n.as_bytes())
}

#[test]
fn reject_extra_leading_zeroes() {
assert!(MPInt::from_bytes(&hex!("00")).is_err());
assert!(MPInt::from_bytes(&hex!("00 00")).is_err());
assert!(MPInt::from_bytes(&hex!("00 01")).is_err());
assert!(Mpint::from_bytes(&hex!("00")).is_err());
assert!(Mpint::from_bytes(&hex!("00 00")).is_err());
assert!(Mpint::from_bytes(&hex!("00 01")).is_err());
}

#[test]
fn decode_9a378f9b2e332a7() {
assert!(MPInt::from_bytes(&hex!("09 a3 78 f9 b2 e3 32 a7")).is_ok());
assert!(Mpint::from_bytes(&hex!("09 a3 78 f9 b2 e3 32 a7")).is_ok());
}

#[test]
fn decode_80() {
let n = MPInt::from_bytes(&hex!("00 80")).unwrap();
let n = Mpint::from_bytes(&hex!("00 80")).unwrap();

// Leading zero stripped
assert_eq!(&hex!("80"), n.as_positive_bytes().unwrap())
Expand All@@ -267,14 +267,14 @@ mod tests {
// TODO(tarcieri): drop support for negative numbers?
#[test]
fn decode_neg_1234() {
let n = MPInt::from_bytes(&hex!("ed cc")).unwrap();
let n = Mpint::from_bytes(&hex!("ed cc")).unwrap();
assert!(n.as_positive_bytes().is_none());
}

// TODO(tarcieri): drop support for negative numbers?
#[test]
fn decode_neg_deadbeef() {
let n = MPInt::from_bytes(&hex!("ff 21 52 41 11")).unwrap();
let n = Mpint::from_bytes(&hex!("ff 21 52 41 11")).unwrap();
assert!(n.as_positive_bytes().is_none());
}
}
10 changes: 5 additions & 5 deletions ssh-key/src/private/dsa.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
//! Digital Signature Algorithm (DSA) private keys.

use crate::{public::DsaPublicKey, Error, MPInt, Result};
use crate::{public::DsaPublicKey, Error, Mpint, Result};
use core::fmt;
use encoding::{CheckedSum, Decode, Encode, Reader, Writer};
use subtle::{Choice, ConstantTimeEq};
Expand All@@ -18,7 +18,7 @@ use rand_core::CryptoRngCore;
#[derive(Clone)]
pub struct DsaPrivateKey {
/// Integer representing a DSA private key.
inner: MPInt,
inner: Mpint,
}

impl DsaPrivateKey {
Expand All@@ -27,8 +27,8 @@ impl DsaPrivateKey {
self.inner.as_bytes()
}

/// Get the inner [`MPInt`].
pub fn as_mpint(&self) -> &MPInt {
/// Get the inner [`Mpint`].
pub fn as_mpint(&self) -> &Mpint {
&self.inner
}
}
Expand DownExpand Up@@ -58,7 +58,7 @@ impl Decode for DsaPrivateKey {

fn decode(reader: &mut impl Reader) -> Result<Self> {
Ok(Self {
inner: MPInt::decode(reader)?,
inner: Mpint::decode(reader)?,
})
}
}
Expand Down
22 changes: 11 additions & 11 deletions ssh-key/src/private/rsa.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
//! Rivest–Shamir–Adleman (RSA) private keys.

use crate::{public::RsaPublicKey, Error, MPInt, Result};
use crate::{public::RsaPublicKey, Error, Mpint, Result};
use core::fmt;
use encoding::{CheckedSum, Decode, Encode, Reader, Writer};
use subtle::{Choice, ConstantTimeEq};
Expand All@@ -17,16 +17,16 @@ use {
#[derive(Clone)]
pub struct RsaPrivateKey {
/// RSA private exponent.
pub d: MPInt,
pub d: Mpint,

/// CRT coefficient: `(inverse of q) mod p`.
pub iqmp: MPInt,
pub iqmp: Mpint,

/// First prime factor of `n`.
pub p: MPInt,
pub p: Mpint,

/// Second prime factor of `n`.
pub q: MPInt,
pub q: Mpint,
}

impl ConstantTimeEq for RsaPrivateKey {
Expand All@@ -50,10 +50,10 @@ impl Decode for RsaPrivateKey {
type Error = Error;

fn decode(reader: &mut impl Reader) -> Result<Self> {
let d = MPInt::decode(reader)?;
let iqmp = MPInt::decode(reader)?;
let p = MPInt::decode(reader)?;
let q = MPInt::decode(reader)?;
let d = Mpint::decode(reader)?;
let iqmp = Mpint::decode(reader)?;
let p = Mpint::decode(reader)?;
let q = Mpint::decode(reader)?;
Ok(Self { d, iqmp, p, q })
}
}
Expand DownExpand Up@@ -133,8 +133,8 @@ impl Decode for RsaKeypair {
type Error = Error;

fn decode(reader: &mut impl Reader) -> Result<Self> {
let n = MPInt::decode(reader)?;
let e = MPInt::decode(reader)?;
let n = Mpint::decode(reader)?;
let e = Mpint::decode(reader)?;
let public = RsaPublicKey { n, e };
let private = RsaPrivateKey::decode(reader)?;
Ok(RsaKeypair { public, private })
Expand Down
18 changes: 9 additions & 9 deletions ssh-key/src/public/dsa.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
//! Digital Signature Algorithm (DSA) public keys.

use crate::{Error, MPInt, Result};
use crate::{Error, Mpint, Result};
use encoding::{CheckedSum, Decode, Encode, Reader, Writer};

/// Digital Signature Algorithm (DSA) public key.
Expand All@@ -9,27 +9,27 @@ use encoding::{CheckedSum, Decode, Encode, Reader, Writer};
#[derive(Clone, Debug, Eq, PartialEq, PartialOrd, Ord)]
pub struct DsaPublicKey {
/// Prime modulus.
pub p: MPInt,
pub p: Mpint,

/// Prime divisor of `p - 1`.
pub q: MPInt,
pub q: Mpint,

/// Generator of a subgroup of order `q` in the multiplicative group
/// `GF(p)`, such that `1 < g < p`.
pub g: MPInt,
pub g: Mpint,

/// The public key, where `y = gˣ mod p`.
pub y: MPInt,
pub y: Mpint,
}

impl Decode for DsaPublicKey {
type Error = Error;

fn decode(reader: &mut impl Reader) -> Result<Self> {
let p = MPInt::decode(reader)?;
let q = MPInt::decode(reader)?;
let g = MPInt::decode(reader)?;
let y = MPInt::decode(reader)?;
let p = Mpint::decode(reader)?;
let q = Mpint::decode(reader)?;
let g = Mpint::decode(reader)?;
let y = Mpint::decode(reader)?;
Ok(Self { p, q, g, y })
}
}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
ssh-key: rename `MPInt` => `Mpint` by tarcieri · Pull Request #76 · RustCrypto/SSH · GitHub
Skip to content
ssh-key: rename MPInt => Mpint#76

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

 Merged

tarcieri
merged 1 commit into

from

Mar 7, 2023
 Merged


ssh-key: rename MPInt => Mpint#76
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


2 changes: 1 addition & 1 deletion
ssh-key/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -177,7 +177,7 @@ pub use sha2;
pub use crate::{
 certificate::Certificate,
 known_hosts::KnownHosts,
 mpint::MPInt,
 mpint::Mpint,
 signature::{Signature, SigningKey},
 sshsig::SshSig,
};
Expand Down

72 changes: 36 additions & 36 deletions
ssh-key/src/mpint.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,12 +39,12 @@ use zeroize::Zeroizing;
/// |-1234 | `00 00 00 02 ed cc`
/// | -deadbeef | `00 00 00 05 ff 21 52 41 11`
#[derive(Clone, PartialOrd, Ord)]
pub struct MPInt {
pub struct Mpint {
 /// Inner big endian-serialized integer value
 inner: Vec<u8>,
}

impl MPInt {
impl Mpint {
 /// Create a new multiple precision integer from the given
 /// big endian-encoded byte slice.
 ///
Expand DownExpand Up@@ -74,7 +74,7 @@ impl MPInt {
 /// Get the big integer data encoded as big endian bytes.
 ///
 /// This slice will contain a leading zero if the value is positive but the
 /// MSB is also set. Use [`MPInt::as_positive_bytes`] to ensure the number
 /// MSB is also set. Use [`Mpint::as_positive_bytes`] to ensure the number
 /// is positive and strip the leading zero byte if it exists.
 pub fn as_bytes(&self) -> &[u8] {
 &self.inner
Expand All@@ -94,35 +94,35 @@ impl MPInt {
 }
}

impl AsRef<[u8]> for MPInt {
impl AsRef<[u8]> for Mpint {
 fn as_ref(&self) -> &[u8] {
 self.as_bytes()
 }
}

impl ConstantTimeEq for MPInt {
impl ConstantTimeEq for Mpint {
 fn ct_eq(&self, other: &Self) -> Choice {
 self.as_ref().ct_eq(other.as_ref())
 }
}

impl Eq for MPInt {}
impl Eq for Mpint {}

impl PartialEq for MPInt {
impl PartialEq for Mpint {
 fn eq(&self, other: &Self) -> bool {
 self.ct_eq(other).into()
 }
}

impl Decode for MPInt {
impl Decode for Mpint {
 type Error = Error;

 fn decode(reader: &mut impl Reader) -> Result<Self> {
 Vec::decode(reader)?.try_into()
 }
}

impl Encode for MPInt {
impl Encode for Mpint {
 type Error = Error;

 fn encoded_len(&self) -> Result<usize> {
Expand All@@ -135,15 +135,15 @@ impl Encode for MPInt {
 }
}

impl TryFrom<&[u8]> for MPInt {
impl TryFrom<&[u8]> for Mpint {
 type Error = Error;

 fn try_from(bytes: &[u8]) -> Result<Self> {
 Vec::from(bytes).try_into()
 }
}

impl TryFrom<Vec<u8>> for MPInt {
impl TryFrom<Vec<u8>> for Mpint {
 type Error = Error;

 fn try_from(bytes: Vec<u8>) -> Result<Self> {
Expand All@@ -157,25 +157,25 @@ impl TryFrom<Vec<u8>> for MPInt {
 }
}

impl Zeroize for MPInt {
impl Zeroize for Mpint {
 fn zeroize(&mut self) {
 self.inner.zeroize();
 }
}

impl fmt::Debug for MPInt {
impl fmt::Debug for Mpint {
 fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
 write!(f, "MPInt({self:X})")
 write!(f, "Mpint({self:X})")
 }
}

impl fmt::Display for MPInt {
impl fmt::Display for Mpint {
 fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
 write!(f, "{self:X}")
 }
}

impl fmt::LowerHex for MPInt {
impl fmt::LowerHex for Mpint {
 fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
 for byte in self.as_bytes() {
 write!(f, "{byte:02x}")?;
Expand All@@ -184,7 +184,7 @@ impl fmt::LowerHex for MPInt {
 }
}

impl fmt::UpperHex for MPInt {
impl fmt::UpperHex for Mpint {
 fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
 for byte in self.as_bytes() {
 write!(f, "{byte:02X}")?;
Expand All@@ -194,38 +194,38 @@ impl fmt::UpperHex for MPInt {
}

#[cfg(any(feature = "dsa", feature = "rsa"))]
impl TryFrom<bigint::BigUint> for MPInt {
impl TryFrom<bigint::BigUint> for Mpint {
 type Error = Error;

 fn try_from(uint: bigint::BigUint) -> Result<MPInt> {
MPInt::try_from(&uint)
 fn try_from(uint: bigint::BigUint) -> Result<Mpint> {
Mpint::try_from(&uint)
 }
}

#[cfg(any(feature = "dsa", feature = "rsa"))]
impl TryFrom<&bigint::BigUint> for MPInt {
impl TryFrom<&bigint::BigUint> for Mpint {
 type Error = Error;

 fn try_from(uint: &bigint::BigUint) -> Result<MPInt> {
 fn try_from(uint: &bigint::BigUint) -> Result<Mpint> {
 let bytes = Zeroizing::new(uint.to_bytes_be());
MPInt::from_positive_bytes(bytes.as_slice())
Mpint::from_positive_bytes(bytes.as_slice())
 }
}

#[cfg(any(feature = "dsa", feature = "rsa"))]
impl TryFrom<MPInt> for bigint::BigUint {
impl TryFrom<Mpint> for bigint::BigUint {
 type Error = Error;

 fn try_from(mpint: MPInt) -> Result<bigint::BigUint> {
 fn try_from(mpint: Mpint) -> Result<bigint::BigUint> {
 bigint::BigUint::try_from(&mpint)
 }
}

#[cfg(any(feature = "dsa", feature = "rsa"))]
impl TryFrom<&MPInt> for bigint::BigUint {
impl TryFrom<&Mpint> for bigint::BigUint {
 type Error = Error;

 fn try_from(mpint: &MPInt) -> Result<bigint::BigUint> {
 fn try_from(mpint: &Mpint) -> Result<bigint::BigUint> {
 mpint
 .as_positive_bytes()
 .map(bigint::BigUint::from_bytes_be)
Expand All@@ -235,30 +235,30 @@ impl TryFrom<&MPInt> for bigint::BigUint {

#[cfg(test)]
mod tests {
 use super::MPInt;
 use super::Mpint;
 use hex_literal::hex;

 #[test]
 fn decode_0() {
 let n = MPInt::from_bytes(b"").unwrap();
 let n = Mpint::from_bytes(b"").unwrap();
 assert_eq!(b"", n.as_bytes())
 }

 #[test]
 fn reject_extra_leading_zeroes() {
 assert!(MPInt::from_bytes(&hex!("00")).is_err());
 assert!(MPInt::from_bytes(&hex!("00 00")).is_err());
 assert!(MPInt::from_bytes(&hex!("00 01")).is_err());
 assert!(Mpint::from_bytes(&hex!("00")).is_err());
 assert!(Mpint::from_bytes(&hex!("00 00")).is_err());
 assert!(Mpint::from_bytes(&hex!("00 01")).is_err());
 }

 #[test]
 fn decode_9a378f9b2e332a7() {
 assert!(MPInt::from_bytes(&hex!("09 a3 78 f9 b2 e3 32 a7")).is_ok());
 assert!(Mpint::from_bytes(&hex!("09 a3 78 f9 b2 e3 32 a7")).is_ok());
 }

 #[test]
 fn decode_80() {
 let n = MPInt::from_bytes(&hex!("00 80")).unwrap();
 let n = Mpint::from_bytes(&hex!("00 80")).unwrap();

 // Leading zero stripped
 assert_eq!(&hex!("80"), n.as_positive_bytes().unwrap())
Expand All@@ -267,14 +267,14 @@ mod tests {
 // TODO(tarcieri): drop support for negative numbers?
 #[test]
 fn decode_neg_1234() {
 let n = MPInt::from_bytes(&hex!("ed cc")).unwrap();
 let n = Mpint::from_bytes(&hex!("ed cc")).unwrap();
 assert!(n.as_positive_bytes().is_none());
 }

 // TODO(tarcieri): drop support for negative numbers?
 #[test]
 fn decode_neg_deadbeef() {
 let n = MPInt::from_bytes(&hex!("ff 21 52 41 11")).unwrap();
 let n = Mpint::from_bytes(&hex!("ff 21 52 41 11")).unwrap();
 assert!(n.as_positive_bytes().is_none());
 }
}

10 changes: 5 additions & 5 deletions
ssh-key/src/private/dsa.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
//! Digital Signature Algorithm (DSA) private keys.

use crate::{public::DsaPublicKey, Error, MPInt, Result};
use crate::{public::DsaPublicKey, Error, Mpint, Result};
use core::fmt;
use encoding::{CheckedSum, Decode, Encode, Reader, Writer};
use subtle::{Choice, ConstantTimeEq};
Expand All@@ -18,7 +18,7 @@ use rand_core::CryptoRngCore;
#[derive(Clone)]
pub struct DsaPrivateKey {
 /// Integer representing a DSA private key.
 inner: MPInt,
 inner: Mpint,
}

impl DsaPrivateKey {
Expand All@@ -27,8 +27,8 @@ impl DsaPrivateKey {
 self.inner.as_bytes()
 }

 /// Get the inner [`MPInt`].
 pub fn as_mpint(&self) -> &MPInt {
 /// Get the inner [`Mpint`].
 pub fn as_mpint(&self) -> &Mpint {
 &self.inner
 }
}
Expand DownExpand Up@@ -58,7 +58,7 @@ impl Decode for DsaPrivateKey {

 fn decode(reader: &mut impl Reader) -> Result<Self> {
 Ok(Self {
 inner: MPInt::decode(reader)?,
 inner: Mpint::decode(reader)?,
 })
 }
}
Expand Down

22 changes: 11 additions & 11 deletions
ssh-key/src/private/rsa.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
//! Rivest–Shamir–Adleman (RSA) private keys.

use crate::{public::RsaPublicKey, Error, MPInt, Result};
use crate::{public::RsaPublicKey, Error, Mpint, Result};
use core::fmt;
use encoding::{CheckedSum, Decode, Encode, Reader, Writer};
use subtle::{Choice, ConstantTimeEq};
Expand All@@ -17,16 +17,16 @@ use {
#[derive(Clone)]
pub struct RsaPrivateKey {
 /// RSA private exponent.
 pub d: MPInt,
 pub d: Mpint,

 /// CRT coefficient: `(inverse of q) mod p`.
 pub iqmp: MPInt,
 pub iqmp: Mpint,

 /// First prime factor of `n`.
 pub p: MPInt,
 pub p: Mpint,

 /// Second prime factor of `n`.
 pub q: MPInt,
 pub q: Mpint,
}

impl ConstantTimeEq for RsaPrivateKey {
Expand All@@ -50,10 +50,10 @@ impl Decode for RsaPrivateKey {
 type Error = Error;

 fn decode(reader: &mut impl Reader) -> Result<Self> {
 let d = MPInt::decode(reader)?;
 let iqmp = MPInt::decode(reader)?;
 let p = MPInt::decode(reader)?;
 let q = MPInt::decode(reader)?;
 let d = Mpint::decode(reader)?;
 let iqmp = Mpint::decode(reader)?;
 let p = Mpint::decode(reader)?;
 let q = Mpint::decode(reader)?;
 Ok(Self { d, iqmp, p, q })
 }
}
Expand DownExpand Up@@ -133,8 +133,8 @@ impl Decode for RsaKeypair {
 type Error = Error;

 fn decode(reader: &mut impl Reader) -> Result<Self> {
 let n = MPInt::decode(reader)?;
 let e = MPInt::decode(reader)?;
 let n = Mpint::decode(reader)?;
 let e = Mpint::decode(reader)?;
 let public = RsaPublicKey { n, e };
 let private = RsaPrivateKey::decode(reader)?;
 Ok(RsaKeypair { public, private })
Expand Down

18 changes: 9 additions & 9 deletions
ssh-key/src/public/dsa.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
//! Digital Signature Algorithm (DSA) public keys.

use crate::{Error, MPInt, Result};
use crate::{Error, Mpint, Result};
use encoding::{CheckedSum, Decode, Encode, Reader, Writer};

/// Digital Signature Algorithm (DSA) public key.
Expand All@@ -9,27 +9,27 @@ use encoding::{CheckedSum, Decode, Encode, Reader, Writer};
#[derive(Clone, Debug, Eq, PartialEq, PartialOrd, Ord)]
pub struct DsaPublicKey {
 /// Prime modulus.
 pub p: MPInt,
 pub p: Mpint,

 /// Prime divisor of `p - 1`.
 pub q: MPInt,
 pub q: Mpint,

 /// Generator of a subgroup of order `q` in the multiplicative group
 /// `GF(p)`, such that `1 < g < p`.
 pub g: MPInt,
 pub g: Mpint,

 /// The public key, where `y = gˣ mod p`.
 pub y: MPInt,
 pub y: Mpint,
}

impl Decode for DsaPublicKey {
 type Error = Error;

 fn decode(reader: &mut impl Reader) -> Result<Self> {
 let p = MPInt::decode(reader)?;
 let q = MPInt::decode(reader)?;
 let g = MPInt::decode(reader)?;
 let y = MPInt::decode(reader)?;
 let p = Mpint::decode(reader)?;
 let q = Mpint::decode(reader)?;
 let g = Mpint::decode(reader)?;
 let y = Mpint::decode(reader)?;
 Ok(Self { p, q, g, y })
 }
}
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
ssh-key: rename `MPInt` => `Mpint` by tarcieri · Pull Request #76 · RustCrypto/SSH · GitHub
Skip to content
ssh-key: rename MPInt => Mpint#76

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

 Merged

tarcieri
merged 1 commit into

from

Mar 7, 2023
 Merged


ssh-key: rename MPInt => Mpint#76
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


2 changes: 1 addition & 1 deletion
ssh-key/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -177,7 +177,7 @@ pub use sha2;
pub use crate::{
 certificate::Certificate,
 known_hosts::KnownHosts,
 mpint::MPInt,
 mpint::Mpint,
 signature::{Signature, SigningKey},
 sshsig::SshSig,
};
Expand Down

72 changes: 36 additions & 36 deletions
ssh-key/src/mpint.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,12 +39,12 @@ use zeroize::Zeroizing;
/// |-1234 | `00 00 00 02 ed cc`
/// | -deadbeef | `00 00 00 05 ff 21 52 41 11`
#[derive(Clone, PartialOrd, Ord)]
pub struct MPInt {
pub struct Mpint {
 /// Inner big endian-serialized integer value
 inner: Vec<u8>,
}

impl MPInt {
impl Mpint {
 /// Create a new multiple precision integer from the given
 /// big endian-encoded byte slice.
 ///
Expand DownExpand Up@@ -74,7 +74,7 @@ impl MPInt {
 /// Get the big integer data encoded as big endian bytes.
 ///
 /// This slice will contain a leading zero if the value is positive but the
 /// MSB is also set. Use [`MPInt::as_positive_bytes`] to ensure the number
 /// MSB is also set. Use [`Mpint::as_positive_bytes`] to ensure the number
 /// is positive and strip the leading zero byte if it exists.
 pub fn as_bytes(&self) -> &[u8] {
 &self.inner
Expand All@@ -94,35 +94,35 @@ impl MPInt {
 }
}

impl AsRef<[u8]> for MPInt {
impl AsRef<[u8]> for Mpint {
 fn as_ref(&self) -> &[u8] {
 self.as_bytes()
 }
}

impl ConstantTimeEq for MPInt {
impl ConstantTimeEq for Mpint {
 fn ct_eq(&self, other: &Self) -> Choice {
 self.as_ref().ct_eq(other.as_ref())
 }
}

impl Eq for MPInt {}
impl Eq for Mpint {}

impl PartialEq for MPInt {
impl PartialEq for Mpint {
 fn eq(&self, other: &Self) -> bool {
 self.ct_eq(other).into()
 }
}

impl Decode for MPInt {
impl Decode for Mpint {
 type Error = Error;

 fn decode(reader: &mut impl Reader) -> Result<Self> {
 Vec::decode(reader)?.try_into()
 }
}

impl Encode for MPInt {
impl Encode for Mpint {
 type Error = Error;

 fn encoded_len(&self) -> Result<usize> {
Expand All@@ -135,15 +135,15 @@ impl Encode for MPInt {
 }
}

impl TryFrom<&[u8]> for MPInt {
impl TryFrom<&[u8]> for Mpint {
 type Error = Error;

 fn try_from(bytes: &[u8]) -> Result<Self> {
 Vec::from(bytes).try_into()
 }
}

impl TryFrom<Vec<u8>> for MPInt {
impl TryFrom<Vec<u8>> for Mpint {
 type Error = Error;

 fn try_from(bytes: Vec<u8>) -> Result<Self> {
Expand All@@ -157,25 +157,25 @@ impl TryFrom<Vec<u8>> for MPInt {
 }
}

impl Zeroize for MPInt {
impl Zeroize for Mpint {
 fn zeroize(&mut self) {
 self.inner.zeroize();
 }
}

impl fmt::Debug for MPInt {
impl fmt::Debug for Mpint {
 fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
 write!(f, "MPInt({self:X})")
 write!(f, "Mpint({self:X})")
 }
}

impl fmt::Display for MPInt {
impl fmt::Display for Mpint {
 fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
 write!(f, "{self:X}")
 }
}

impl fmt::LowerHex for MPInt {
impl fmt::LowerHex for Mpint {
 fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
 for byte in self.as_bytes() {
 write!(f, "{byte:02x}")?;
Expand All@@ -184,7 +184,7 @@ impl fmt::LowerHex for MPInt {
 }
}

impl fmt::UpperHex for MPInt {
impl fmt::UpperHex for Mpint {
 fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
 for byte in self.as_bytes() {
 write!(f, "{byte:02X}")?;
Expand All@@ -194,38 +194,38 @@ impl fmt::UpperHex for MPInt {
}

#[cfg(any(feature = "dsa", feature = "rsa"))]
impl TryFrom<bigint::BigUint> for MPInt {
impl TryFrom<bigint::BigUint> for Mpint {
 type Error = Error;

 fn try_from(uint: bigint::BigUint) -> Result<MPInt> {
MPInt::try_from(&uint)
 fn try_from(uint: bigint::BigUint) -> Result<Mpint> {
Mpint::try_from(&uint)
 }
}

#[cfg(any(feature = "dsa", feature = "rsa"))]
impl TryFrom<&bigint::BigUint> for MPInt {
impl TryFrom<&bigint::BigUint> for Mpint {
 type Error = Error;

 fn try_from(uint: &bigint::BigUint) -> Result<MPInt> {
 fn try_from(uint: &bigint::BigUint) -> Result<Mpint> {
 let bytes = Zeroizing::new(uint.to_bytes_be());
MPInt::from_positive_bytes(bytes.as_slice())
Mpint::from_positive_bytes(bytes.as_slice())
 }
}

#[cfg(any(feature = "dsa", feature = "rsa"))]
impl TryFrom<MPInt> for bigint::BigUint {
impl TryFrom<Mpint> for bigint::BigUint {
 type Error = Error;

 fn try_from(mpint: MPInt) -> Result<bigint::BigUint> {
 fn try_from(mpint: Mpint) -> Result<bigint::BigUint> {
 bigint::BigUint::try_from(&mpint)
 }
}

#[cfg(any(feature = "dsa", feature = "rsa"))]
impl TryFrom<&MPInt> for bigint::BigUint {
impl TryFrom<&Mpint> for bigint::BigUint {
 type Error = Error;

 fn try_from(mpint: &MPInt) -> Result<bigint::BigUint> {
 fn try_from(mpint: &Mpint) -> Result<bigint::BigUint> {
 mpint
 .as_positive_bytes()
 .map(bigint::BigUint::from_bytes_be)
Expand All@@ -235,30 +235,30 @@ impl TryFrom<&MPInt> for bigint::BigUint {

#[cfg(test)]
mod tests {
 use super::MPInt;
 use super::Mpint;
 use hex_literal::hex;

 #[test]
 fn decode_0() {
 let n = MPInt::from_bytes(b"").unwrap();
 let n = Mpint::from_bytes(b"").unwrap();
 assert_eq!(b"", n.as_bytes())
 }

 #[test]
 fn reject_extra_leading_zeroes() {
 assert!(MPInt::from_bytes(&hex!("00")).is_err());
 assert!(MPInt::from_bytes(&hex!("00 00")).is_err());
 assert!(MPInt::from_bytes(&hex!("00 01")).is_err());
 assert!(Mpint::from_bytes(&hex!("00")).is_err());
 assert!(Mpint::from_bytes(&hex!("00 00")).is_err());
 assert!(Mpint::from_bytes(&hex!("00 01")).is_err());
 }

 #[test]
 fn decode_9a378f9b2e332a7() {
 assert!(MPInt::from_bytes(&hex!("09 a3 78 f9 b2 e3 32 a7")).is_ok());
 assert!(Mpint::from_bytes(&hex!("09 a3 78 f9 b2 e3 32 a7")).is_ok());
 }

 #[test]
 fn decode_80() {
 let n = MPInt::from_bytes(&hex!("00 80")).unwrap();
 let n = Mpint::from_bytes(&hex!("00 80")).unwrap();

 // Leading zero stripped
 assert_eq!(&hex!("80"), n.as_positive_bytes().unwrap())
Expand All@@ -267,14 +267,14 @@ mod tests {
 // TODO(tarcieri): drop support for negative numbers?
 #[test]
 fn decode_neg_1234() {
 let n = MPInt::from_bytes(&hex!("ed cc")).unwrap();
 let n = Mpint::from_bytes(&hex!("ed cc")).unwrap();
 assert!(n.as_positive_bytes().is_none());
 }

 // TODO(tarcieri): drop support for negative numbers?
 #[test]
 fn decode_neg_deadbeef() {
 let n = MPInt::from_bytes(&hex!("ff 21 52 41 11")).unwrap();
 let n = Mpint::from_bytes(&hex!("ff 21 52 41 11")).unwrap();
 assert!(n.as_positive_bytes().is_none());
 }
}

10 changes: 5 additions & 5 deletions
ssh-key/src/private/dsa.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
//! Digital Signature Algorithm (DSA) private keys.

use crate::{public::DsaPublicKey, Error, MPInt, Result};
use crate::{public::DsaPublicKey, Error, Mpint, Result};
use core::fmt;
use encoding::{CheckedSum, Decode, Encode, Reader, Writer};
use subtle::{Choice, ConstantTimeEq};
Expand All@@ -18,7 +18,7 @@ use rand_core::CryptoRngCore;
#[derive(Clone)]
pub struct DsaPrivateKey {
 /// Integer representing a DSA private key.
 inner: MPInt,
 inner: Mpint,
}

impl DsaPrivateKey {
Expand All@@ -27,8 +27,8 @@ impl DsaPrivateKey {
 self.inner.as_bytes()
 }

 /// Get the inner [`MPInt`].
 pub fn as_mpint(&self) -> &MPInt {
 /// Get the inner [`Mpint`].
 pub fn as_mpint(&self) -> &Mpint {
 &self.inner
 }
}
Expand DownExpand Up@@ -58,7 +58,7 @@ impl Decode for DsaPrivateKey {

 fn decode(reader: &mut impl Reader) -> Result<Self> {
 Ok(Self {
 inner: MPInt::decode(reader)?,
 inner: Mpint::decode(reader)?,
 })
 }
}
Expand Down

22 changes: 11 additions & 11 deletions
ssh-key/src/private/rsa.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
//! Rivest–Shamir–Adleman (RSA) private keys.

use crate::{public::RsaPublicKey, Error, MPInt, Result};
use crate::{public::RsaPublicKey, Error, Mpint, Result};
use core::fmt;
use encoding::{CheckedSum, Decode, Encode, Reader, Writer};
use subtle::{Choice, ConstantTimeEq};
Expand All@@ -17,16 +17,16 @@ use {
#[derive(Clone)]
pub struct RsaPrivateKey {
 /// RSA private exponent.
 pub d: MPInt,
 pub d: Mpint,

 /// CRT coefficient: `(inverse of q) mod p`.
 pub iqmp: MPInt,
 pub iqmp: Mpint,

 /// First prime factor of `n`.
 pub p: MPInt,
 pub p: Mpint,

 /// Second prime factor of `n`.
 pub q: MPInt,
 pub q: Mpint,
}

impl ConstantTimeEq for RsaPrivateKey {
Expand All@@ -50,10 +50,10 @@ impl Decode for RsaPrivateKey {
 type Error = Error;

 fn decode(reader: &mut impl Reader) -> Result<Self> {
 let d = MPInt::decode(reader)?;
 let iqmp = MPInt::decode(reader)?;
 let p = MPInt::decode(reader)?;
 let q = MPInt::decode(reader)?;
 let d = Mpint::decode(reader)?;
 let iqmp = Mpint::decode(reader)?;
 let p = Mpint::decode(reader)?;
 let q = Mpint::decode(reader)?;
 Ok(Self { d, iqmp, p, q })
 }
}
Expand DownExpand Up@@ -133,8 +133,8 @@ impl Decode for RsaKeypair {
 type Error = Error;

 fn decode(reader: &mut impl Reader) -> Result<Self> {
 let n = MPInt::decode(reader)?;
 let e = MPInt::decode(reader)?;
 let n = Mpint::decode(reader)?;
 let e = Mpint::decode(reader)?;
 let public = RsaPublicKey { n, e };
 let private = RsaPrivateKey::decode(reader)?;
 Ok(RsaKeypair { public, private })
Expand Down

18 changes: 9 additions & 9 deletions
ssh-key/src/public/dsa.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
//! Digital Signature Algorithm (DSA) public keys.

use crate::{Error, MPInt, Result};
use crate::{Error, Mpint, Result};
use encoding::{CheckedSum, Decode, Encode, Reader, Writer};

/// Digital Signature Algorithm (DSA) public key.
Expand All@@ -9,27 +9,27 @@ use encoding::{CheckedSum, Decode, Encode, Reader, Writer};
#[derive(Clone, Debug, Eq, PartialEq, PartialOrd, Ord)]
pub struct DsaPublicKey {
 /// Prime modulus.
 pub p: MPInt,
 pub p: Mpint,

 /// Prime divisor of `p - 1`.
 pub q: MPInt,
 pub q: Mpint,

 /// Generator of a subgroup of order `q` in the multiplicative group
 /// `GF(p)`, such that `1 < g < p`.
 pub g: MPInt,
 pub g: Mpint,

 /// The public key, where `y = gˣ mod p`.
 pub y: MPInt,
 pub y: Mpint,
}

impl Decode for DsaPublicKey {
 type Error = Error;

 fn decode(reader: &mut impl Reader) -> Result<Self> {
 let p = MPInt::decode(reader)?;
 let q = MPInt::decode(reader)?;
 let g = MPInt::decode(reader)?;
 let y = MPInt::decode(reader)?;
 let p = Mpint::decode(reader)?;
 let q = Mpint::decode(reader)?;
 let g = Mpint::decode(reader)?;
 let y = Mpint::decode(reader)?;
 Ok(Self { p, q, g, y })
 }
}
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
ssh-key: rename `MPInt` => `Mpint` by tarcieri · Pull Request #76 · RustCrypto/SSH · GitHub
Skip to content
ssh-key: rename MPInt => Mpint#76

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

 Merged

tarcieri
merged 1 commit into

from

Mar 7, 2023
 Merged


ssh-key: rename MPInt => Mpint#76
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


2 changes: 1 addition & 1 deletion
ssh-key/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -177,7 +177,7 @@ pub use sha2;
pub use crate::{
 certificate::Certificate,
 known_hosts::KnownHosts,
 mpint::MPInt,
 mpint::Mpint,
 signature::{Signature, SigningKey},
 sshsig::SshSig,
};
Expand Down

72 changes: 36 additions & 36 deletions
ssh-key/src/mpint.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,12 +39,12 @@ use zeroize::Zeroizing;
/// |-1234 | `00 00 00 02 ed cc`
/// | -deadbeef | `00 00 00 05 ff 21 52 41 11`
#[derive(Clone, PartialOrd, Ord)]
pub struct MPInt {
pub struct Mpint {
 /// Inner big endian-serialized integer value
 inner: Vec<u8>,
}

impl MPInt {
impl Mpint {
 /// Create a new multiple precision integer from the given
 /// big endian-encoded byte slice.
 ///
Expand DownExpand Up@@ -74,7 +74,7 @@ impl MPInt {
 /// Get the big integer data encoded as big endian bytes.
 ///
 /// This slice will contain a leading zero if the value is positive but the
 /// MSB is also set. Use [`MPInt::as_positive_bytes`] to ensure the number
 /// MSB is also set. Use [`Mpint::as_positive_bytes`] to ensure the number
 /// is positive and strip the leading zero byte if it exists.
 pub fn as_bytes(&self) -> &[u8] {
 &self.inner
Expand All@@ -94,35 +94,35 @@ impl MPInt {
 }
}

impl AsRef<[u8]> for MPInt {
impl AsRef<[u8]> for Mpint {
 fn as_ref(&self) -> &[u8] {
 self.as_bytes()
 }
}

impl ConstantTimeEq for MPInt {
impl ConstantTimeEq for Mpint {
 fn ct_eq(&self, other: &Self) -> Choice {
 self.as_ref().ct_eq(other.as_ref())
 }
}

impl Eq for MPInt {}
impl Eq for Mpint {}

impl PartialEq for MPInt {
impl PartialEq for Mpint {
 fn eq(&self, other: &Self) -> bool {
 self.ct_eq(other).into()
 }
}

impl Decode for MPInt {
impl Decode for Mpint {
 type Error = Error;

 fn decode(reader: &mut impl Reader) -> Result<Self> {
 Vec::decode(reader)?.try_into()
 }
}

impl Encode for MPInt {
impl Encode for Mpint {
 type Error = Error;

 fn encoded_len(&self) -> Result<usize> {
Expand All@@ -135,15 +135,15 @@ impl Encode for MPInt {
 }
}

impl TryFrom<&[u8]> for MPInt {
impl TryFrom<&[u8]> for Mpint {
 type Error = Error;

 fn try_from(bytes: &[u8]) -> Result<Self> {
 Vec::from(bytes).try_into()
 }
}

impl TryFrom<Vec<u8>> for MPInt {
impl TryFrom<Vec<u8>> for Mpint {
 type Error = Error;

 fn try_from(bytes: Vec<u8>) -> Result<Self> {
Expand All@@ -157,25 +157,25 @@ impl TryFrom<Vec<u8>> for MPInt {
 }
}

impl Zeroize for MPInt {
impl Zeroize for Mpint {
 fn zeroize(&mut self) {
 self.inner.zeroize();
 }
}

impl fmt::Debug for MPInt {
impl fmt::Debug for Mpint {
 fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
 write!(f, "MPInt({self:X})")
 write!(f, "Mpint({self:X})")
 }
}

impl fmt::Display for MPInt {
impl fmt::Display for Mpint {
 fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
 write!(f, "{self:X}")
 }
}

impl fmt::LowerHex for MPInt {
impl fmt::LowerHex for Mpint {
 fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
 for byte in self.as_bytes() {
 write!(f, "{byte:02x}")?;
Expand All@@ -184,7 +184,7 @@ impl fmt::LowerHex for MPInt {
 }
}

impl fmt::UpperHex for MPInt {
impl fmt::UpperHex for Mpint {
 fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
 for byte in self.as_bytes() {
 write!(f, "{byte:02X}")?;
Expand All@@ -194,38 +194,38 @@ impl fmt::UpperHex for MPInt {
}

#[cfg(any(feature = "dsa", feature = "rsa"))]
impl TryFrom<bigint::BigUint> for MPInt {
impl TryFrom<bigint::BigUint> for Mpint {
 type Error = Error;

 fn try_from(uint: bigint::BigUint) -> Result<MPInt> {
MPInt::try_from(&uint)
 fn try_from(uint: bigint::BigUint) -> Result<Mpint> {
Mpint::try_from(&uint)
 }
}

#[cfg(any(feature = "dsa", feature = "rsa"))]
impl TryFrom<&bigint::BigUint> for MPInt {
impl TryFrom<&bigint::BigUint> for Mpint {
 type Error = Error;

 fn try_from(uint: &bigint::BigUint) -> Result<MPInt> {
 fn try_from(uint: &bigint::BigUint) -> Result<Mpint> {
 let bytes = Zeroizing::new(uint.to_bytes_be());
MPInt::from_positive_bytes(bytes.as_slice())
Mpint::from_positive_bytes(bytes.as_slice())
 }
}

#[cfg(any(feature = "dsa", feature = "rsa"))]
impl TryFrom<MPInt> for bigint::BigUint {
impl TryFrom<Mpint> for bigint::BigUint {
 type Error = Error;

 fn try_from(mpint: MPInt) -> Result<bigint::BigUint> {
 fn try_from(mpint: Mpint) -> Result<bigint::BigUint> {
 bigint::BigUint::try_from(&mpint)
 }
}

#[cfg(any(feature = "dsa", feature = "rsa"))]
impl TryFrom<&MPInt> for bigint::BigUint {
impl TryFrom<&Mpint> for bigint::BigUint {
 type Error = Error;

 fn try_from(mpint: &MPInt) -> Result<bigint::BigUint> {
 fn try_from(mpint: &Mpint) -> Result<bigint::BigUint> {
 mpint
 .as_positive_bytes()
 .map(bigint::BigUint::from_bytes_be)
Expand All@@ -235,30 +235,30 @@ impl TryFrom<&MPInt> for bigint::BigUint {

#[cfg(test)]
mod tests {
 use super::MPInt;
 use super::Mpint;
 use hex_literal::hex;

 #[test]
 fn decode_0() {
 let n = MPInt::from_bytes(b"").unwrap();
 let n = Mpint::from_bytes(b"").unwrap();
 assert_eq!(b"", n.as_bytes())
 }

 #[test]
 fn reject_extra_leading_zeroes() {
 assert!(MPInt::from_bytes(&hex!("00")).is_err());
 assert!(MPInt::from_bytes(&hex!("00 00")).is_err());
 assert!(MPInt::from_bytes(&hex!("00 01")).is_err());
 assert!(Mpint::from_bytes(&hex!("00")).is_err());
 assert!(Mpint::from_bytes(&hex!("00 00")).is_err());
 assert!(Mpint::from_bytes(&hex!("00 01")).is_err());
 }

 #[test]
 fn decode_9a378f9b2e332a7() {
 assert!(MPInt::from_bytes(&hex!("09 a3 78 f9 b2 e3 32 a7")).is_ok());
 assert!(Mpint::from_bytes(&hex!("09 a3 78 f9 b2 e3 32 a7")).is_ok());
 }

 #[test]
 fn decode_80() {
 let n = MPInt::from_bytes(&hex!("00 80")).unwrap();
 let n = Mpint::from_bytes(&hex!("00 80")).unwrap();

 // Leading zero stripped
 assert_eq!(&hex!("80"), n.as_positive_bytes().unwrap())
Expand All@@ -267,14 +267,14 @@ mod tests {
 // TODO(tarcieri): drop support for negative numbers?
 #[test]
 fn decode_neg_1234() {
 let n = MPInt::from_bytes(&hex!("ed cc")).unwrap();
 let n = Mpint::from_bytes(&hex!("ed cc")).unwrap();
 assert!(n.as_positive_bytes().is_none());
 }

 // TODO(tarcieri): drop support for negative numbers?
 #[test]
 fn decode_neg_deadbeef() {
 let n = MPInt::from_bytes(&hex!("ff 21 52 41 11")).unwrap();
 let n = Mpint::from_bytes(&hex!("ff 21 52 41 11")).unwrap();
 assert!(n.as_positive_bytes().is_none());
 }
}

10 changes: 5 additions & 5 deletions
ssh-key/src/private/dsa.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
//! Digital Signature Algorithm (DSA) private keys.

use crate::{public::DsaPublicKey, Error, MPInt, Result};
use crate::{public::DsaPublicKey, Error, Mpint, Result};
use core::fmt;
use encoding::{CheckedSum, Decode, Encode, Reader, Writer};
use subtle::{Choice, ConstantTimeEq};
Expand All@@ -18,7 +18,7 @@ use rand_core::CryptoRngCore;
#[derive(Clone)]
pub struct DsaPrivateKey {
 /// Integer representing a DSA private key.
 inner: MPInt,
 inner: Mpint,
}

impl DsaPrivateKey {
Expand All@@ -27,8 +27,8 @@ impl DsaPrivateKey {
 self.inner.as_bytes()
 }

 /// Get the inner [`MPInt`].
 pub fn as_mpint(&self) -> &MPInt {
 /// Get the inner [`Mpint`].
 pub fn as_mpint(&self) -> &Mpint {
 &self.inner
 }
}
Expand DownExpand Up@@ -58,7 +58,7 @@ impl Decode for DsaPrivateKey {

 fn decode(reader: &mut impl Reader) -> Result<Self> {
 Ok(Self {
 inner: MPInt::decode(reader)?,
 inner: Mpint::decode(reader)?,
 })
 }
}
Expand Down

22 changes: 11 additions & 11 deletions
ssh-key/src/private/rsa.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
//! Rivest–Shamir–Adleman (RSA) private keys.

use crate::{public::RsaPublicKey, Error, MPInt, Result};
use crate::{public::RsaPublicKey, Error, Mpint, Result};
use core::fmt;
use encoding::{CheckedSum, Decode, Encode, Reader, Writer};
use subtle::{Choice, ConstantTimeEq};
Expand All@@ -17,16 +17,16 @@ use {
#[derive(Clone)]
pub struct RsaPrivateKey {
 /// RSA private exponent.
 pub d: MPInt,
 pub d: Mpint,

 /// CRT coefficient: `(inverse of q) mod p`.
 pub iqmp: MPInt,
 pub iqmp: Mpint,

 /// First prime factor of `n`.
 pub p: MPInt,
 pub p: Mpint,

 /// Second prime factor of `n`.
 pub q: MPInt,
 pub q: Mpint,
}

impl ConstantTimeEq for RsaPrivateKey {
Expand All@@ -50,10 +50,10 @@ impl Decode for RsaPrivateKey {
 type Error = Error;

 fn decode(reader: &mut impl Reader) -> Result<Self> {
 let d = MPInt::decode(reader)?;
 let iqmp = MPInt::decode(reader)?;
 let p = MPInt::decode(reader)?;
 let q = MPInt::decode(reader)?;
 let d = Mpint::decode(reader)?;
 let iqmp = Mpint::decode(reader)?;
 let p = Mpint::decode(reader)?;
 let q = Mpint::decode(reader)?;
 Ok(Self { d, iqmp, p, q })
 }
}
Expand DownExpand Up@@ -133,8 +133,8 @@ impl Decode for RsaKeypair {
 type Error = Error;

 fn decode(reader: &mut impl Reader) -> Result<Self> {
 let n = MPInt::decode(reader)?;
 let e = MPInt::decode(reader)?;
 let n = Mpint::decode(reader)?;
 let e = Mpint::decode(reader)?;
 let public = RsaPublicKey { n, e };
 let private = RsaPrivateKey::decode(reader)?;
 Ok(RsaKeypair { public, private })
Expand Down

18 changes: 9 additions & 9 deletions
ssh-key/src/public/dsa.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
//! Digital Signature Algorithm (DSA) public keys.

use crate::{Error, MPInt, Result};
use crate::{Error, Mpint, Result};
use encoding::{CheckedSum, Decode, Encode, Reader, Writer};

/// Digital Signature Algorithm (DSA) public key.
Expand All@@ -9,27 +9,27 @@ use encoding::{CheckedSum, Decode, Encode, Reader, Writer};
#[derive(Clone, Debug, Eq, PartialEq, PartialOrd, Ord)]
pub struct DsaPublicKey {
 /// Prime modulus.
 pub p: MPInt,
 pub p: Mpint,

 /// Prime divisor of `p - 1`.
 pub q: MPInt,
 pub q: Mpint,

 /// Generator of a subgroup of order `q` in the multiplicative group
 /// `GF(p)`, such that `1 < g < p`.
 pub g: MPInt,
 pub g: Mpint,

 /// The public key, where `y = gˣ mod p`.
 pub y: MPInt,
 pub y: Mpint,
}

impl Decode for DsaPublicKey {
 type Error = Error;

 fn decode(reader: &mut impl Reader) -> Result<Self> {
 let p = MPInt::decode(reader)?;
 let q = MPInt::decode(reader)?;
 let g = MPInt::decode(reader)?;
 let y = MPInt::decode(reader)?;
 let p = Mpint::decode(reader)?;
 let q = Mpint::decode(reader)?;
 let g = Mpint::decode(reader)?;
 let y = Mpint::decode(reader)?;
 Ok(Self { p, q, g, y })
 }
}
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
ssh-key: rename `MPInt` => `Mpint` by tarcieri · Pull Request #76 · RustCrypto/SSH · GitHub
Skip to content
ssh-key: rename MPInt => Mpint#76

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

 Merged

tarcieri
merged 1 commit into

from

Mar 7, 2023
 Merged


ssh-key: rename MPInt => Mpint#76
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


2 changes: 1 addition & 1 deletion
ssh-key/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -177,7 +177,7 @@ pub use sha2;
pub use crate::{
 certificate::Certificate,
 known_hosts::KnownHosts,
 mpint::MPInt,
 mpint::Mpint,
 signature::{Signature, SigningKey},
 sshsig::SshSig,
};
Expand Down

72 changes: 36 additions & 36 deletions
ssh-key/src/mpint.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,12 +39,12 @@ use zeroize::Zeroizing;
/// |-1234 | `00 00 00 02 ed cc`
/// | -deadbeef | `00 00 00 05 ff 21 52 41 11`
#[derive(Clone, PartialOrd, Ord)]
pub struct MPInt {
pub struct Mpint {
 /// Inner big endian-serialized integer value
 inner: Vec<u8>,
}

impl MPInt {
impl Mpint {
 /// Create a new multiple precision integer from the given
 /// big endian-encoded byte slice.
 ///
Expand DownExpand Up@@ -74,7 +74,7 @@ impl MPInt {
 /// Get the big integer data encoded as big endian bytes.
 ///
 /// This slice will contain a leading zero if the value is positive but the
 /// MSB is also set. Use [`MPInt::as_positive_bytes`] to ensure the number
 /// MSB is also set. Use [`Mpint::as_positive_bytes`] to ensure the number
 /// is positive and strip the leading zero byte if it exists.
 pub fn as_bytes(&self) -> &[u8] {
 &self.inner
Expand All@@ -94,35 +94,35 @@ impl MPInt {
 }
}

impl AsRef<[u8]> for MPInt {
impl AsRef<[u8]> for Mpint {
 fn as_ref(&self) -> &[u8] {
 self.as_bytes()
 }
}

impl ConstantTimeEq for MPInt {
impl ConstantTimeEq for Mpint {
 fn ct_eq(&self, other: &Self) -> Choice {
 self.as_ref().ct_eq(other.as_ref())
 }
}

impl Eq for MPInt {}
impl Eq for Mpint {}

impl PartialEq for MPInt {
impl PartialEq for Mpint {
 fn eq(&self, other: &Self) -> bool {
 self.ct_eq(other).into()
 }
}

impl Decode for MPInt {
impl Decode for Mpint {
 type Error = Error;

 fn decode(reader: &mut impl Reader) -> Result<Self> {
 Vec::decode(reader)?.try_into()
 }
}

impl Encode for MPInt {
impl Encode for Mpint {
 type Error = Error;

 fn encoded_len(&self) -> Result<usize> {
Expand All@@ -135,15 +135,15 @@ impl Encode for MPInt {
 }
}

impl TryFrom<&[u8]> for MPInt {
impl TryFrom<&[u8]> for Mpint {
 type Error = Error;

 fn try_from(bytes: &[u8]) -> Result<Self> {
 Vec::from(bytes).try_into()
 }
}

impl TryFrom<Vec<u8>> for MPInt {
impl TryFrom<Vec<u8>> for Mpint {
 type Error = Error;

 fn try_from(bytes: Vec<u8>) -> Result<Self> {
Expand All@@ -157,25 +157,25 @@ impl TryFrom<Vec<u8>> for MPInt {
 }
}

impl Zeroize for MPInt {
impl Zeroize for Mpint {
 fn zeroize(&mut self) {
 self.inner.zeroize();
 }
}

impl fmt::Debug for MPInt {
impl fmt::Debug for Mpint {
 fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
 write!(f, "MPInt({self:X})")
 write!(f, "Mpint({self:X})")
 }
}

impl fmt::Display for MPInt {
impl fmt::Display for Mpint {
 fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
 write!(f, "{self:X}")
 }
}

impl fmt::LowerHex for MPInt {
impl fmt::LowerHex for Mpint {
 fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
 for byte in self.as_bytes() {
 write!(f, "{byte:02x}")?;
Expand All@@ -184,7 +184,7 @@ impl fmt::LowerHex for MPInt {
 }
}

impl fmt::UpperHex for MPInt {
impl fmt::UpperHex for Mpint {
 fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
 for byte in self.as_bytes() {
 write!(f, "{byte:02X}")?;
Expand All@@ -194,38 +194,38 @@ impl fmt::UpperHex for MPInt {
}

#[cfg(any(feature = "dsa", feature = "rsa"))]
impl TryFrom<bigint::BigUint> for MPInt {
impl TryFrom<bigint::BigUint> for Mpint {
 type Error = Error;

 fn try_from(uint: bigint::BigUint) -> Result<MPInt> {
MPInt::try_from(&uint)
 fn try_from(uint: bigint::BigUint) -> Result<Mpint> {
Mpint::try_from(&uint)
 }
}

#[cfg(any(feature = "dsa", feature = "rsa"))]
impl TryFrom<&bigint::BigUint> for MPInt {
impl TryFrom<&bigint::BigUint> for Mpint {
 type Error = Error;

 fn try_from(uint: &bigint::BigUint) -> Result<MPInt> {
 fn try_from(uint: &bigint::BigUint) -> Result<Mpint> {
 let bytes = Zeroizing::new(uint.to_bytes_be());
MPInt::from_positive_bytes(bytes.as_slice())
Mpint::from_positive_bytes(bytes.as_slice())
 }
}

#[cfg(any(feature = "dsa", feature = "rsa"))]
impl TryFrom<MPInt> for bigint::BigUint {
impl TryFrom<Mpint> for bigint::BigUint {
 type Error = Error;

 fn try_from(mpint: MPInt) -> Result<bigint::BigUint> {
 fn try_from(mpint: Mpint) -> Result<bigint::BigUint> {
 bigint::BigUint::try_from(&mpint)
 }
}

#[cfg(any(feature = "dsa", feature = "rsa"))]
impl TryFrom<&MPInt> for bigint::BigUint {
impl TryFrom<&Mpint> for bigint::BigUint {
 type Error = Error;

 fn try_from(mpint: &MPInt) -> Result<bigint::BigUint> {
 fn try_from(mpint: &Mpint) -> Result<bigint::BigUint> {
 mpint
 .as_positive_bytes()
 .map(bigint::BigUint::from_bytes_be)
Expand All@@ -235,30 +235,30 @@ impl TryFrom<&MPInt> for bigint::BigUint {

#[cfg(test)]
mod tests {
 use super::MPInt;
 use super::Mpint;
 use hex_literal::hex;

 #[test]
 fn decode_0() {
 let n = MPInt::from_bytes(b"").unwrap();
 let n = Mpint::from_bytes(b"").unwrap();
 assert_eq!(b"", n.as_bytes())
 }

 #[test]
 fn reject_extra_leading_zeroes() {
 assert!(MPInt::from_bytes(&hex!("00")).is_err());
 assert!(MPInt::from_bytes(&hex!("00 00")).is_err());
 assert!(MPInt::from_bytes(&hex!("00 01")).is_err());
 assert!(Mpint::from_bytes(&hex!("00")).is_err());
 assert!(Mpint::from_bytes(&hex!("00 00")).is_err());
 assert!(Mpint::from_bytes(&hex!("00 01")).is_err());
 }

 #[test]
 fn decode_9a378f9b2e332a7() {
 assert!(MPInt::from_bytes(&hex!("09 a3 78 f9 b2 e3 32 a7")).is_ok());
 assert!(Mpint::from_bytes(&hex!("09 a3 78 f9 b2 e3 32 a7")).is_ok());
 }

 #[test]
 fn decode_80() {
 let n = MPInt::from_bytes(&hex!("00 80")).unwrap();
 let n = Mpint::from_bytes(&hex!("00 80")).unwrap();

 // Leading zero stripped
 assert_eq!(&hex!("80"), n.as_positive_bytes().unwrap())
Expand All@@ -267,14 +267,14 @@ mod tests {
 // TODO(tarcieri): drop support for negative numbers?
 #[test]
 fn decode_neg_1234() {
 let n = MPInt::from_bytes(&hex!("ed cc")).unwrap();
 let n = Mpint::from_bytes(&hex!("ed cc")).unwrap();
 assert!(n.as_positive_bytes().is_none());
 }

 // TODO(tarcieri): drop support for negative numbers?
 #[test]
 fn decode_neg_deadbeef() {
 let n = MPInt::from_bytes(&hex!("ff 21 52 41 11")).unwrap();
 let n = Mpint::from_bytes(&hex!("ff 21 52 41 11")).unwrap();
 assert!(n.as_positive_bytes().is_none());
 }
}

10 changes: 5 additions & 5 deletions
ssh-key/src/private/dsa.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
//! Digital Signature Algorithm (DSA) private keys.

use crate::{public::DsaPublicKey, Error, MPInt, Result};
use crate::{public::DsaPublicKey, Error, Mpint, Result};
use core::fmt;
use encoding::{CheckedSum, Decode, Encode, Reader, Writer};
use subtle::{Choice, ConstantTimeEq};
Expand All@@ -18,7 +18,7 @@ use rand_core::CryptoRngCore;
#[derive(Clone)]
pub struct DsaPrivateKey {
 /// Integer representing a DSA private key.
 inner: MPInt,
 inner: Mpint,
}

impl DsaPrivateKey {
Expand All@@ -27,8 +27,8 @@ impl DsaPrivateKey {
 self.inner.as_bytes()
 }

 /// Get the inner [`MPInt`].
 pub fn as_mpint(&self) -> &MPInt {
 /// Get the inner [`Mpint`].
 pub fn as_mpint(&self) -> &Mpint {
 &self.inner
 }
}
Expand DownExpand Up@@ -58,7 +58,7 @@ impl Decode for DsaPrivateKey {

 fn decode(reader: &mut impl Reader) -> Result<Self> {
 Ok(Self {
 inner: MPInt::decode(reader)?,
 inner: Mpint::decode(reader)?,
 })
 }
}
Expand Down

22 changes: 11 additions & 11 deletions
ssh-key/src/private/rsa.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
//! Rivest–Shamir–Adleman (RSA) private keys.

use crate::{public::RsaPublicKey, Error, MPInt, Result};
use crate::{public::RsaPublicKey, Error, Mpint, Result};
use core::fmt;
use encoding::{CheckedSum, Decode, Encode, Reader, Writer};
use subtle::{Choice, ConstantTimeEq};
Expand All@@ -17,16 +17,16 @@ use {
#[derive(Clone)]
pub struct RsaPrivateKey {
 /// RSA private exponent.
 pub d: MPInt,
 pub d: Mpint,

 /// CRT coefficient: `(inverse of q) mod p`.
 pub iqmp: MPInt,
 pub iqmp: Mpint,

 /// First prime factor of `n`.
 pub p: MPInt,
 pub p: Mpint,

 /// Second prime factor of `n`.
 pub q: MPInt,
 pub q: Mpint,
}

impl ConstantTimeEq for RsaPrivateKey {
Expand All@@ -50,10 +50,10 @@ impl Decode for RsaPrivateKey {
 type Error = Error;

 fn decode(reader: &mut impl Reader) -> Result<Self> {
 let d = MPInt::decode(reader)?;
 let iqmp = MPInt::decode(reader)?;
 let p = MPInt::decode(reader)?;
 let q = MPInt::decode(reader)?;
 let d = Mpint::decode(reader)?;
 let iqmp = Mpint::decode(reader)?;
 let p = Mpint::decode(reader)?;
 let q = Mpint::decode(reader)?;
 Ok(Self { d, iqmp, p, q })
 }
}
Expand DownExpand Up@@ -133,8 +133,8 @@ impl Decode for RsaKeypair {
 type Error = Error;

 fn decode(reader: &mut impl Reader) -> Result<Self> {
 let n = MPInt::decode(reader)?;
 let e = MPInt::decode(reader)?;
 let n = Mpint::decode(reader)?;
 let e = Mpint::decode(reader)?;
 let public = RsaPublicKey { n, e };
 let private = RsaPrivateKey::decode(reader)?;
 Ok(RsaKeypair { public, private })
Expand Down

18 changes: 9 additions & 9 deletions
ssh-key/src/public/dsa.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
//! Digital Signature Algorithm (DSA) public keys.

use crate::{Error, MPInt, Result};
use crate::{Error, Mpint, Result};
use encoding::{CheckedSum, Decode, Encode, Reader, Writer};

/// Digital Signature Algorithm (DSA) public key.
Expand All@@ -9,27 +9,27 @@ use encoding::{CheckedSum, Decode, Encode, Reader, Writer};
#[derive(Clone, Debug, Eq, PartialEq, PartialOrd, Ord)]
pub struct DsaPublicKey {
 /// Prime modulus.
 pub p: MPInt,
 pub p: Mpint,

 /// Prime divisor of `p - 1`.
 pub q: MPInt,
 pub q: Mpint,

 /// Generator of a subgroup of order `q` in the multiplicative group
 /// `GF(p)`, such that `1 < g < p`.
 pub g: MPInt,
 pub g: Mpint,

 /// The public key, where `y = gˣ mod p`.
 pub y: MPInt,
 pub y: Mpint,
}

impl Decode for DsaPublicKey {
 type Error = Error;

 fn decode(reader: &mut impl Reader) -> Result<Self> {
 let p = MPInt::decode(reader)?;
 let q = MPInt::decode(reader)?;
 let g = MPInt::decode(reader)?;
 let y = MPInt::decode(reader)?;
 let p = Mpint::decode(reader)?;
 let q = Mpint::decode(reader)?;
 let g = Mpint::decode(reader)?;
 let y = Mpint::decode(reader)?;
 Ok(Self { p, q, g, y })
 }
}
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
ssh-key: rename `MPInt` => `Mpint` by tarcieri · Pull Request #76 · RustCrypto/SSH · GitHub
Skip to content
ssh-key: rename MPInt => Mpint#76

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

 Merged

tarcieri
merged 1 commit into

from

Mar 7, 2023
 Merged


ssh-key: rename MPInt => Mpint#76
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


2 changes: 1 addition & 1 deletion
ssh-key/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -177,7 +177,7 @@ pub use sha2;
pub use crate::{
 certificate::Certificate,
 known_hosts::KnownHosts,
 mpint::MPInt,
 mpint::Mpint,
 signature::{Signature, SigningKey},
 sshsig::SshSig,
};
Expand Down

72 changes: 36 additions & 36 deletions
ssh-key/src/mpint.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,12 +39,12 @@ use zeroize::Zeroizing;
/// |-1234 | `00 00 00 02 ed cc`
/// | -deadbeef | `00 00 00 05 ff 21 52 41 11`
#[derive(Clone, PartialOrd, Ord)]
pub struct MPInt {
pub struct Mpint {
 /// Inner big endian-serialized integer value
 inner: Vec<u8>,
}

impl MPInt {
impl Mpint {
 /// Create a new multiple precision integer from the given
 /// big endian-encoded byte slice.
 ///
Expand DownExpand Up@@ -74,7 +74,7 @@ impl MPInt {
 /// Get the big integer data encoded as big endian bytes.
 ///
 /// This slice will contain a leading zero if the value is positive but the
 /// MSB is also set. Use [`MPInt::as_positive_bytes`] to ensure the number
 /// MSB is also set. Use [`Mpint::as_positive_bytes`] to ensure the number
 /// is positive and strip the leading zero byte if it exists.
 pub fn as_bytes(&self) -> &[u8] {
 &self.inner
Expand All@@ -94,35 +94,35 @@ impl MPInt {
 }
}

impl AsRef<[u8]> for MPInt {
impl AsRef<[u8]> for Mpint {
 fn as_ref(&self) -> &[u8] {
 self.as_bytes()
 }
}

impl ConstantTimeEq for MPInt {
impl ConstantTimeEq for Mpint {
 fn ct_eq(&self, other: &Self) -> Choice {
 self.as_ref().ct_eq(other.as_ref())
 }
}

impl Eq for MPInt {}
impl Eq for Mpint {}

impl PartialEq for MPInt {
impl PartialEq for Mpint {
 fn eq(&self, other: &Self) -> bool {
 self.ct_eq(other).into()
 }
}

impl Decode for MPInt {
impl Decode for Mpint {
 type Error = Error;

 fn decode(reader: &mut impl Reader) -> Result<Self> {
 Vec::decode(reader)?.try_into()
 }
}

impl Encode for MPInt {
impl Encode for Mpint {
 type Error = Error;

 fn encoded_len(&self) -> Result<usize> {
Expand All@@ -135,15 +135,15 @@ impl Encode for MPInt {
 }
}

impl TryFrom<&[u8]> for MPInt {
impl TryFrom<&[u8]> for Mpint {
 type Error = Error;

 fn try_from(bytes: &[u8]) -> Result<Self> {
 Vec::from(bytes).try_into()
 }
}

impl TryFrom<Vec<u8>> for MPInt {
impl TryFrom<Vec<u8>> for Mpint {
 type Error = Error;

 fn try_from(bytes: Vec<u8>) -> Result<Self> {
Expand All@@ -157,25 +157,25 @@ impl TryFrom<Vec<u8>> for MPInt {
 }
}

impl Zeroize for MPInt {
impl Zeroize for Mpint {
 fn zeroize(&mut self) {
 self.inner.zeroize();
 }
}

impl fmt::Debug for MPInt {
impl fmt::Debug for Mpint {
 fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
 write!(f, "MPInt({self:X})")
 write!(f, "Mpint({self:X})")
 }
}

impl fmt::Display for MPInt {
impl fmt::Display for Mpint {
 fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
 write!(f, "{self:X}")
 }
}

impl fmt::LowerHex for MPInt {
impl fmt::LowerHex for Mpint {
 fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
 for byte in self.as_bytes() {
 write!(f, "{byte:02x}")?;
Expand All@@ -184,7 +184,7 @@ impl fmt::LowerHex for MPInt {
 }
}

impl fmt::UpperHex for MPInt {
impl fmt::UpperHex for Mpint {
 fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
 for byte in self.as_bytes() {
 write!(f, "{byte:02X}")?;
Expand All@@ -194,38 +194,38 @@ impl fmt::UpperHex for MPInt {
}

#[cfg(any(feature = "dsa", feature = "rsa"))]
impl TryFrom<bigint::BigUint> for MPInt {
impl TryFrom<bigint::BigUint> for Mpint {
 type Error = Error;

 fn try_from(uint: bigint::BigUint) -> Result<MPInt> {
MPInt::try_from(&uint)
 fn try_from(uint: bigint::BigUint) -> Result<Mpint> {
Mpint::try_from(&uint)
 }
}

#[cfg(any(feature = "dsa", feature = "rsa"))]
impl TryFrom<&bigint::BigUint> for MPInt {
impl TryFrom<&bigint::BigUint> for Mpint {
 type Error = Error;

 fn try_from(uint: &bigint::BigUint) -> Result<MPInt> {
 fn try_from(uint: &bigint::BigUint) -> Result<Mpint> {
 let bytes = Zeroizing::new(uint.to_bytes_be());
MPInt::from_positive_bytes(bytes.as_slice())
Mpint::from_positive_bytes(bytes.as_slice())
 }
}

#[cfg(any(feature = "dsa", feature = "rsa"))]
impl TryFrom<MPInt> for bigint::BigUint {
impl TryFrom<Mpint> for bigint::BigUint {
 type Error = Error;

 fn try_from(mpint: MPInt) -> Result<bigint::BigUint> {
 fn try_from(mpint: Mpint) -> Result<bigint::BigUint> {
 bigint::BigUint::try_from(&mpint)
 }
}

#[cfg(any(feature = "dsa", feature = "rsa"))]
impl TryFrom<&MPInt> for bigint::BigUint {
impl TryFrom<&Mpint> for bigint::BigUint {
 type Error = Error;

 fn try_from(mpint: &MPInt) -> Result<bigint::BigUint> {
 fn try_from(mpint: &Mpint) -> Result<bigint::BigUint> {
 mpint
 .as_positive_bytes()
 .map(bigint::BigUint::from_bytes_be)
Expand All@@ -235,30 +235,30 @@ impl TryFrom<&MPInt> for bigint::BigUint {

#[cfg(test)]
mod tests {
 use super::MPInt;
 use super::Mpint;
 use hex_literal::hex;

 #[test]
 fn decode_0() {
 let n = MPInt::from_bytes(b"").unwrap();
 let n = Mpint::from_bytes(b"").unwrap();
 assert_eq!(b"", n.as_bytes())
 }

 #[test]
 fn reject_extra_leading_zeroes() {
 assert!(MPInt::from_bytes(&hex!("00")).is_err());
 assert!(MPInt::from_bytes(&hex!("00 00")).is_err());
 assert!(MPInt::from_bytes(&hex!("00 01")).is_err());
 assert!(Mpint::from_bytes(&hex!("00")).is_err());
 assert!(Mpint::from_bytes(&hex!("00 00")).is_err());
 assert!(Mpint::from_bytes(&hex!("00 01")).is_err());
 }

 #[test]
 fn decode_9a378f9b2e332a7() {
 assert!(MPInt::from_bytes(&hex!("09 a3 78 f9 b2 e3 32 a7")).is_ok());
 assert!(Mpint::from_bytes(&hex!("09 a3 78 f9 b2 e3 32 a7")).is_ok());
 }

 #[test]
 fn decode_80() {
 let n = MPInt::from_bytes(&hex!("00 80")).unwrap();
 let n = Mpint::from_bytes(&hex!("00 80")).unwrap();

 // Leading zero stripped
 assert_eq!(&hex!("80"), n.as_positive_bytes().unwrap())
Expand All@@ -267,14 +267,14 @@ mod tests {
 // TODO(tarcieri): drop support for negative numbers?
 #[test]
 fn decode_neg_1234() {
 let n = MPInt::from_bytes(&hex!("ed cc")).unwrap();
 let n = Mpint::from_bytes(&hex!("ed cc")).unwrap();
 assert!(n.as_positive_bytes().is_none());
 }

 // TODO(tarcieri): drop support for negative numbers?
 #[test]
 fn decode_neg_deadbeef() {
 let n = MPInt::from_bytes(&hex!("ff 21 52 41 11")).unwrap();
 let n = Mpint::from_bytes(&hex!("ff 21 52 41 11")).unwrap();
 assert!(n.as_positive_bytes().is_none());
 }
}

10 changes: 5 additions & 5 deletions
ssh-key/src/private/dsa.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
//! Digital Signature Algorithm (DSA) private keys.

use crate::{public::DsaPublicKey, Error, MPInt, Result};
use crate::{public::DsaPublicKey, Error, Mpint, Result};
use core::fmt;
use encoding::{CheckedSum, Decode, Encode, Reader, Writer};
use subtle::{Choice, ConstantTimeEq};
Expand All@@ -18,7 +18,7 @@ use rand_core::CryptoRngCore;
#[derive(Clone)]
pub struct DsaPrivateKey {
 /// Integer representing a DSA private key.
 inner: MPInt,
 inner: Mpint,
}

impl DsaPrivateKey {
Expand All@@ -27,8 +27,8 @@ impl DsaPrivateKey {
 self.inner.as_bytes()
 }

 /// Get the inner [`MPInt`].
 pub fn as_mpint(&self) -> &MPInt {
 /// Get the inner [`Mpint`].
 pub fn as_mpint(&self) -> &Mpint {
 &self.inner
 }
}
Expand DownExpand Up@@ -58,7 +58,7 @@ impl Decode for DsaPrivateKey {

 fn decode(reader: &mut impl Reader) -> Result<Self> {
 Ok(Self {
 inner: MPInt::decode(reader)?,
 inner: Mpint::decode(reader)?,
 })
 }
}
Expand Down

22 changes: 11 additions & 11 deletions
ssh-key/src/private/rsa.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
//! Rivest–Shamir–Adleman (RSA) private keys.

use crate::{public::RsaPublicKey, Error, MPInt, Result};
use crate::{public::RsaPublicKey, Error, Mpint, Result};
use core::fmt;
use encoding::{CheckedSum, Decode, Encode, Reader, Writer};
use subtle::{Choice, ConstantTimeEq};
Expand All@@ -17,16 +17,16 @@ use {
#[derive(Clone)]
pub struct RsaPrivateKey {
 /// RSA private exponent.
 pub d: MPInt,
 pub d: Mpint,

 /// CRT coefficient: `(inverse of q) mod p`.
 pub iqmp: MPInt,
 pub iqmp: Mpint,

 /// First prime factor of `n`.
 pub p: MPInt,
 pub p: Mpint,

 /// Second prime factor of `n`.
 pub q: MPInt,
 pub q: Mpint,
}

impl ConstantTimeEq for RsaPrivateKey {
Expand All@@ -50,10 +50,10 @@ impl Decode for RsaPrivateKey {
 type Error = Error;

 fn decode(reader: &mut impl Reader) -> Result<Self> {
 let d = MPInt::decode(reader)?;
 let iqmp = MPInt::decode(reader)?;
 let p = MPInt::decode(reader)?;
 let q = MPInt::decode(reader)?;
 let d = Mpint::decode(reader)?;
 let iqmp = Mpint::decode(reader)?;
 let p = Mpint::decode(reader)?;
 let q = Mpint::decode(reader)?;
 Ok(Self { d, iqmp, p, q })
 }
}
Expand DownExpand Up@@ -133,8 +133,8 @@ impl Decode for RsaKeypair {
 type Error = Error;

 fn decode(reader: &mut impl Reader) -> Result<Self> {
 let n = MPInt::decode(reader)?;
 let e = MPInt::decode(reader)?;
 let n = Mpint::decode(reader)?;
 let e = Mpint::decode(reader)?;
 let public = RsaPublicKey { n, e };
 let private = RsaPrivateKey::decode(reader)?;
 Ok(RsaKeypair { public, private })
Expand Down

18 changes: 9 additions & 9 deletions
ssh-key/src/public/dsa.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
//! Digital Signature Algorithm (DSA) public keys.

use crate::{Error, MPInt, Result};
use crate::{Error, Mpint, Result};
use encoding::{CheckedSum, Decode, Encode, Reader, Writer};

/// Digital Signature Algorithm (DSA) public key.
Expand All@@ -9,27 +9,27 @@ use encoding::{CheckedSum, Decode, Encode, Reader, Writer};
#[derive(Clone, Debug, Eq, PartialEq, PartialOrd, Ord)]
pub struct DsaPublicKey {
 /// Prime modulus.
 pub p: MPInt,
 pub p: Mpint,

 /// Prime divisor of `p - 1`.
 pub q: MPInt,
 pub q: Mpint,

 /// Generator of a subgroup of order `q` in the multiplicative group
 /// `GF(p)`, such that `1 < g < p`.
 pub g: MPInt,
 pub g: Mpint,

 /// The public key, where `y = gˣ mod p`.
 pub y: MPInt,
 pub y: Mpint,
}

impl Decode for DsaPublicKey {
 type Error = Error;

 fn decode(reader: &mut impl Reader) -> Result<Self> {
 let p = MPInt::decode(reader)?;
 let q = MPInt::decode(reader)?;
 let g = MPInt::decode(reader)?;
 let y = MPInt::decode(reader)?;
 let p = Mpint::decode(reader)?;
 let q = Mpint::decode(reader)?;
 let g = Mpint::decode(reader)?;
 let y = Mpint::decode(reader)?;
 Ok(Self { p, q, g, y })
 }
}
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
ssh-key: rename `MPInt` => `Mpint` by tarcieri · Pull Request #76 · RustCrypto/SSH · GitHub
Skip to content
ssh-key: rename MPInt => Mpint#76

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

 Merged

tarcieri
merged 1 commit into

from

Mar 7, 2023
 Merged


ssh-key: rename MPInt => Mpint#76
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


2 changes: 1 addition & 1 deletion
ssh-key/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -177,7 +177,7 @@ pub use sha2;
pub use crate::{
 certificate::Certificate,
 known_hosts::KnownHosts,
 mpint::MPInt,
 mpint::Mpint,
 signature::{Signature, SigningKey},
 sshsig::SshSig,
};
Expand Down

72 changes: 36 additions & 36 deletions
ssh-key/src/mpint.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,12 +39,12 @@ use zeroize::Zeroizing;
/// |-1234 | `00 00 00 02 ed cc`
/// | -deadbeef | `00 00 00 05 ff 21 52 41 11`
#[derive(Clone, PartialOrd, Ord)]
pub struct MPInt {
pub struct Mpint {
 /// Inner big endian-serialized integer value
 inner: Vec<u8>,
}

impl MPInt {
impl Mpint {
 /// Create a new multiple precision integer from the given
 /// big endian-encoded byte slice.
 ///
Expand DownExpand Up@@ -74,7 +74,7 @@ impl MPInt {
 /// Get the big integer data encoded as big endian bytes.
 ///
 /// This slice will contain a leading zero if the value is positive but the
 /// MSB is also set. Use [`MPInt::as_positive_bytes`] to ensure the number
 /// MSB is also set. Use [`Mpint::as_positive_bytes`] to ensure the number
 /// is positive and strip the leading zero byte if it exists.
 pub fn as_bytes(&self) -> &[u8] {
 &self.inner
Expand All@@ -94,35 +94,35 @@ impl MPInt {
 }
}

impl AsRef<[u8]> for MPInt {
impl AsRef<[u8]> for Mpint {
 fn as_ref(&self) -> &[u8] {
 self.as_bytes()
 }
}

impl ConstantTimeEq for MPInt {
impl ConstantTimeEq for Mpint {
 fn ct_eq(&self, other: &Self) -> Choice {
 self.as_ref().ct_eq(other.as_ref())
 }
}

impl Eq for MPInt {}
impl Eq for Mpint {}

impl PartialEq for MPInt {
impl PartialEq for Mpint {
 fn eq(&self, other: &Self) -> bool {
 self.ct_eq(other).into()
 }
}

impl Decode for MPInt {
impl Decode for Mpint {
 type Error = Error;

 fn decode(reader: &mut impl Reader) -> Result<Self> {
 Vec::decode(reader)?.try_into()
 }
}

impl Encode for MPInt {
impl Encode for Mpint {
 type Error = Error;

 fn encoded_len(&self) -> Result<usize> {
Expand All@@ -135,15 +135,15 @@ impl Encode for MPInt {
 }
}

impl TryFrom<&[u8]> for MPInt {
impl TryFrom<&[u8]> for Mpint {
 type Error = Error;

 fn try_from(bytes: &[u8]) -> Result<Self> {
 Vec::from(bytes).try_into()
 }
}

impl TryFrom<Vec<u8>> for MPInt {
impl TryFrom<Vec<u8>> for Mpint {
 type Error = Error;

 fn try_from(bytes: Vec<u8>) -> Result<Self> {
Expand All@@ -157,25 +157,25 @@ impl TryFrom<Vec<u8>> for MPInt {
 }
}

impl Zeroize for MPInt {
impl Zeroize for Mpint {
 fn zeroize(&mut self) {
 self.inner.zeroize();
 }
}

impl fmt::Debug for MPInt {
impl fmt::Debug for Mpint {
 fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
 write!(f, "MPInt({self:X})")
 write!(f, "Mpint({self:X})")
 }
}

impl fmt::Display for MPInt {
impl fmt::Display for Mpint {
 fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
 write!(f, "{self:X}")
 }
}

impl fmt::LowerHex for MPInt {
impl fmt::LowerHex for Mpint {
 fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
 for byte in self.as_bytes() {
 write!(f, "{byte:02x}")?;
Expand All@@ -184,7 +184,7 @@ impl fmt::LowerHex for MPInt {
 }
}

impl fmt::UpperHex for MPInt {
impl fmt::UpperHex for Mpint {
 fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
 for byte in self.as_bytes() {
 write!(f, "{byte:02X}")?;
Expand All@@ -194,38 +194,38 @@ impl fmt::UpperHex for MPInt {
}

#[cfg(any(feature = "dsa", feature = "rsa"))]
impl TryFrom<bigint::BigUint> for MPInt {
impl TryFrom<bigint::BigUint> for Mpint {
 type Error = Error;

 fn try_from(uint: bigint::BigUint) -> Result<MPInt> {
MPInt::try_from(&uint)
 fn try_from(uint: bigint::BigUint) -> Result<Mpint> {
Mpint::try_from(&uint)
 }
}

#[cfg(any(feature = "dsa", feature = "rsa"))]
impl TryFrom<&bigint::BigUint> for MPInt {
impl TryFrom<&bigint::BigUint> for Mpint {
 type Error = Error;

 fn try_from(uint: &bigint::BigUint) -> Result<MPInt> {
 fn try_from(uint: &bigint::BigUint) -> Result<Mpint> {
 let bytes = Zeroizing::new(uint.to_bytes_be());
MPInt::from_positive_bytes(bytes.as_slice())
Mpint::from_positive_bytes(bytes.as_slice())
 }
}

#[cfg(any(feature = "dsa", feature = "rsa"))]
impl TryFrom<MPInt> for bigint::BigUint {
impl TryFrom<Mpint> for bigint::BigUint {
 type Error = Error;

 fn try_from(mpint: MPInt) -> Result<bigint::BigUint> {
 fn try_from(mpint: Mpint) -> Result<bigint::BigUint> {
 bigint::BigUint::try_from(&mpint)
 }
}

#[cfg(any(feature = "dsa", feature = "rsa"))]
impl TryFrom<&MPInt> for bigint::BigUint {
impl TryFrom<&Mpint> for bigint::BigUint {
 type Error = Error;

 fn try_from(mpint: &MPInt) -> Result<bigint::BigUint> {
 fn try_from(mpint: &Mpint) -> Result<bigint::BigUint> {
 mpint
 .as_positive_bytes()
 .map(bigint::BigUint::from_bytes_be)
Expand All@@ -235,30 +235,30 @@ impl TryFrom<&MPInt> for bigint::BigUint {

#[cfg(test)]
mod tests {
 use super::MPInt;
 use super::Mpint;
 use hex_literal::hex;

 #[test]
 fn decode_0() {
 let n = MPInt::from_bytes(b"").unwrap();
 let n = Mpint::from_bytes(b"").unwrap();
 assert_eq!(b"", n.as_bytes())
 }

 #[test]
 fn reject_extra_leading_zeroes() {
 assert!(MPInt::from_bytes(&hex!("00")).is_err());
 assert!(MPInt::from_bytes(&hex!("00 00")).is_err());
 assert!(MPInt::from_bytes(&hex!("00 01")).is_err());
 assert!(Mpint::from_bytes(&hex!("00")).is_err());
 assert!(Mpint::from_bytes(&hex!("00 00")).is_err());
 assert!(Mpint::from_bytes(&hex!("00 01")).is_err());
 }

 #[test]
 fn decode_9a378f9b2e332a7() {
 assert!(MPInt::from_bytes(&hex!("09 a3 78 f9 b2 e3 32 a7")).is_ok());
 assert!(Mpint::from_bytes(&hex!("09 a3 78 f9 b2 e3 32 a7")).is_ok());
 }

 #[test]
 fn decode_80() {
 let n = MPInt::from_bytes(&hex!("00 80")).unwrap();
 let n = Mpint::from_bytes(&hex!("00 80")).unwrap();

 // Leading zero stripped
 assert_eq!(&hex!("80"), n.as_positive_bytes().unwrap())
Expand All@@ -267,14 +267,14 @@ mod tests {
 // TODO(tarcieri): drop support for negative numbers?
 #[test]
 fn decode_neg_1234() {
 let n = MPInt::from_bytes(&hex!("ed cc")).unwrap();
 let n = Mpint::from_bytes(&hex!("ed cc")).unwrap();
 assert!(n.as_positive_bytes().is_none());
 }

 // TODO(tarcieri): drop support for negative numbers?
 #[test]
 fn decode_neg_deadbeef() {
 let n = MPInt::from_bytes(&hex!("ff 21 52 41 11")).unwrap();
 let n = Mpint::from_bytes(&hex!("ff 21 52 41 11")).unwrap();
 assert!(n.as_positive_bytes().is_none());
 }
}

10 changes: 5 additions & 5 deletions
ssh-key/src/private/dsa.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
//! Digital Signature Algorithm (DSA) private keys.

use crate::{public::DsaPublicKey, Error, MPInt, Result};
use crate::{public::DsaPublicKey, Error, Mpint, Result};
use core::fmt;
use encoding::{CheckedSum, Decode, Encode, Reader, Writer};
use subtle::{Choice, ConstantTimeEq};
Expand All@@ -18,7 +18,7 @@ use rand_core::CryptoRngCore;
#[derive(Clone)]
pub struct DsaPrivateKey {
 /// Integer representing a DSA private key.
 inner: MPInt,
 inner: Mpint,
}

impl DsaPrivateKey {
Expand All@@ -27,8 +27,8 @@ impl DsaPrivateKey {
 self.inner.as_bytes()
 }

 /// Get the inner [`MPInt`].
 pub fn as_mpint(&self) -> &MPInt {
 /// Get the inner [`Mpint`].
 pub fn as_mpint(&self) -> &Mpint {
 &self.inner
 }
}
Expand DownExpand Up@@ -58,7 +58,7 @@ impl Decode for DsaPrivateKey {

 fn decode(reader: &mut impl Reader) -> Result<Self> {
 Ok(Self {
 inner: MPInt::decode(reader)?,
 inner: Mpint::decode(reader)?,
 })
 }
}
Expand Down

22 changes: 11 additions & 11 deletions
ssh-key/src/private/rsa.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
//! Rivest–Shamir–Adleman (RSA) private keys.

use crate::{public::RsaPublicKey, Error, MPInt, Result};
use crate::{public::RsaPublicKey, Error, Mpint, Result};
use core::fmt;
use encoding::{CheckedSum, Decode, Encode, Reader, Writer};
use subtle::{Choice, ConstantTimeEq};
Expand All@@ -17,16 +17,16 @@ use {
#[derive(Clone)]
pub struct RsaPrivateKey {
 /// RSA private exponent.
 pub d: MPInt,
 pub d: Mpint,

 /// CRT coefficient: `(inverse of q) mod p`.
 pub iqmp: MPInt,
 pub iqmp: Mpint,

 /// First prime factor of `n`.
 pub p: MPInt,
 pub p: Mpint,

 /// Second prime factor of `n`.
 pub q: MPInt,
 pub q: Mpint,
}

impl ConstantTimeEq for RsaPrivateKey {
Expand All@@ -50,10 +50,10 @@ impl Decode for RsaPrivateKey {
 type Error = Error;

 fn decode(reader: &mut impl Reader) -> Result<Self> {
 let d = MPInt::decode(reader)?;
 let iqmp = MPInt::decode(reader)?;
 let p = MPInt::decode(reader)?;
 let q = MPInt::decode(reader)?;
 let d = Mpint::decode(reader)?;
 let iqmp = Mpint::decode(reader)?;
 let p = Mpint::decode(reader)?;
 let q = Mpint::decode(reader)?;
 Ok(Self { d, iqmp, p, q })
 }
}
Expand DownExpand Up@@ -133,8 +133,8 @@ impl Decode for RsaKeypair {
 type Error = Error;

 fn decode(reader: &mut impl Reader) -> Result<Self> {
 let n = MPInt::decode(reader)?;
 let e = MPInt::decode(reader)?;
 let n = Mpint::decode(reader)?;
 let e = Mpint::decode(reader)?;
 let public = RsaPublicKey { n, e };
 let private = RsaPrivateKey::decode(reader)?;
 Ok(RsaKeypair { public, private })
Expand Down

18 changes: 9 additions & 9 deletions
ssh-key/src/public/dsa.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
//! Digital Signature Algorithm (DSA) public keys.

use crate::{Error, MPInt, Result};
use crate::{Error, Mpint, Result};
use encoding::{CheckedSum, Decode, Encode, Reader, Writer};

/// Digital Signature Algorithm (DSA) public key.
Expand All@@ -9,27 +9,27 @@ use encoding::{CheckedSum, Decode, Encode, Reader, Writer};
#[derive(Clone, Debug, Eq, PartialEq, PartialOrd, Ord)]
pub struct DsaPublicKey {
 /// Prime modulus.
 pub p: MPInt,
 pub p: Mpint,

 /// Prime divisor of `p - 1`.
 pub q: MPInt,
 pub q: Mpint,

 /// Generator of a subgroup of order `q` in the multiplicative group
 /// `GF(p)`, such that `1 < g < p`.
 pub g: MPInt,
 pub g: Mpint,

 /// The public key, where `y = gˣ mod p`.
 pub y: MPInt,
 pub y: Mpint,
}

impl Decode for DsaPublicKey {
 type Error = Error;

 fn decode(reader: &mut impl Reader) -> Result<Self> {
 let p = MPInt::decode(reader)?;
 let q = MPInt::decode(reader)?;
 let g = MPInt::decode(reader)?;
 let y = MPInt::decode(reader)?;
 let p = Mpint::decode(reader)?;
 let q = Mpint::decode(reader)?;
 let g = Mpint::decode(reader)?;
 let y = Mpint::decode(reader)?;
 Ok(Self { p, q, g, y })
 }
}
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
ssh-key: rename `MPInt` => `Mpint` by tarcieri · Pull Request #76 · RustCrypto/SSH · GitHub
Skip to content
ssh-key: rename MPInt => Mpint#76

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

 Merged

tarcieri
merged 1 commit into

from

Mar 7, 2023
 Merged


ssh-key: rename MPInt => Mpint#76
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


2 changes: 1 addition & 1 deletion
ssh-key/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -177,7 +177,7 @@ pub use sha2;
pub use crate::{
 certificate::Certificate,
 known_hosts::KnownHosts,
 mpint::MPInt,
 mpint::Mpint,
 signature::{Signature, SigningKey},
 sshsig::SshSig,
};
Expand Down

72 changes: 36 additions & 36 deletions
ssh-key/src/mpint.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,12 +39,12 @@ use zeroize::Zeroizing;
/// |-1234 | `00 00 00 02 ed cc`
/// | -deadbeef | `00 00 00 05 ff 21 52 41 11`
#[derive(Clone, PartialOrd, Ord)]
pub struct MPInt {
pub struct Mpint {
 /// Inner big endian-serialized integer value
 inner: Vec<u8>,
}

impl MPInt {
impl Mpint {
 /// Create a new multiple precision integer from the given
 /// big endian-encoded byte slice.
 ///
Expand DownExpand Up@@ -74,7 +74,7 @@ impl MPInt {
 /// Get the big integer data encoded as big endian bytes.
 ///
 /// This slice will contain a leading zero if the value is positive but the
 /// MSB is also set. Use [`MPInt::as_positive_bytes`] to ensure the number
 /// MSB is also set. Use [`Mpint::as_positive_bytes`] to ensure the number
 /// is positive and strip the leading zero byte if it exists.
 pub fn as_bytes(&self) -> &[u8] {
 &self.inner
Expand All@@ -94,35 +94,35 @@ impl MPInt {
 }
}

impl AsRef<[u8]> for MPInt {
impl AsRef<[u8]> for Mpint {
 fn as_ref(&self) -> &[u8] {
 self.as_bytes()
 }
}

impl ConstantTimeEq for MPInt {
impl ConstantTimeEq for Mpint {
 fn ct_eq(&self, other: &Self) -> Choice {
 self.as_ref().ct_eq(other.as_ref())
 }
}

impl Eq for MPInt {}
impl Eq for Mpint {}

impl PartialEq for MPInt {
impl PartialEq for Mpint {
 fn eq(&self, other: &Self) -> bool {
 self.ct_eq(other).into()
 }
}

impl Decode for MPInt {
impl Decode for Mpint {
 type Error = Error;

 fn decode(reader: &mut impl Reader) -> Result<Self> {
 Vec::decode(reader)?.try_into()
 }
}

impl Encode for MPInt {
impl Encode for Mpint {
 type Error = Error;

 fn encoded_len(&self) -> Result<usize> {
Expand All@@ -135,15 +135,15 @@ impl Encode for MPInt {
 }
}

impl TryFrom<&[u8]> for MPInt {
impl TryFrom<&[u8]> for Mpint {
 type Error = Error;

 fn try_from(bytes: &[u8]) -> Result<Self> {
 Vec::from(bytes).try_into()
 }
}

impl TryFrom<Vec<u8>> for MPInt {
impl TryFrom<Vec<u8>> for Mpint {
 type Error = Error;

 fn try_from(bytes: Vec<u8>) -> Result<Self> {
Expand All@@ -157,25 +157,25 @@ impl TryFrom<Vec<u8>> for MPInt {
 }
}

impl Zeroize for MPInt {
impl Zeroize for Mpint {
 fn zeroize(&mut self) {
 self.inner.zeroize();
 }
}

impl fmt::Debug for MPInt {
impl fmt::Debug for Mpint {
 fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
 write!(f, "MPInt({self:X})")
 write!(f, "Mpint({self:X})")
 }
}

impl fmt::Display for MPInt {
impl fmt::Display for Mpint {
 fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
 write!(f, "{self:X}")
 }
}

impl fmt::LowerHex for MPInt {
impl fmt::LowerHex for Mpint {
 fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
 for byte in self.as_bytes() {
 write!(f, "{byte:02x}")?;
Expand All@@ -184,7 +184,7 @@ impl fmt::LowerHex for MPInt {
 }
}

impl fmt::UpperHex for MPInt {
impl fmt::UpperHex for Mpint {
 fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
 for byte in self.as_bytes() {
 write!(f, "{byte:02X}")?;
Expand All@@ -194,38 +194,38 @@ impl fmt::UpperHex for MPInt {
}

#[cfg(any(feature = "dsa", feature = "rsa"))]
impl TryFrom<bigint::BigUint> for MPInt {
impl TryFrom<bigint::BigUint> for Mpint {
 type Error = Error;

 fn try_from(uint: bigint::BigUint) -> Result<MPInt> {
MPInt::try_from(&uint)
 fn try_from(uint: bigint::BigUint) -> Result<Mpint> {
Mpint::try_from(&uint)
 }
}

#[cfg(any(feature = "dsa", feature = "rsa"))]
impl TryFrom<&bigint::BigUint> for MPInt {
impl TryFrom<&bigint::BigUint> for Mpint {
 type Error = Error;

 fn try_from(uint: &bigint::BigUint) -> Result<MPInt> {
 fn try_from(uint: &bigint::BigUint) -> Result<Mpint> {
 let bytes = Zeroizing::new(uint.to_bytes_be());
MPInt::from_positive_bytes(bytes.as_slice())
Mpint::from_positive_bytes(bytes.as_slice())
 }
}

#[cfg(any(feature = "dsa", feature = "rsa"))]
impl TryFrom<MPInt> for bigint::BigUint {
impl TryFrom<Mpint> for bigint::BigUint {
 type Error = Error;

 fn try_from(mpint: MPInt) -> Result<bigint::BigUint> {
 fn try_from(mpint: Mpint) -> Result<bigint::BigUint> {
 bigint::BigUint::try_from(&mpint)
 }
}

#[cfg(any(feature = "dsa", feature = "rsa"))]
impl TryFrom<&MPInt> for bigint::BigUint {
impl TryFrom<&Mpint> for bigint::BigUint {
 type Error = Error;

 fn try_from(mpint: &MPInt) -> Result<bigint::BigUint> {
 fn try_from(mpint: &Mpint) -> Result<bigint::BigUint> {
 mpint
 .as_positive_bytes()
 .map(bigint::BigUint::from_bytes_be)
Expand All@@ -235,30 +235,30 @@ impl TryFrom<&MPInt> for bigint::BigUint {

#[cfg(test)]
mod tests {
 use super::MPInt;
 use super::Mpint;
 use hex_literal::hex;

 #[test]
 fn decode_0() {
 let n = MPInt::from_bytes(b"").unwrap();
 let n = Mpint::from_bytes(b"").unwrap();
 assert_eq!(b"", n.as_bytes())
 }

 #[test]
 fn reject_extra_leading_zeroes() {
 assert!(MPInt::from_bytes(&hex!("00")).is_err());
 assert!(MPInt::from_bytes(&hex!("00 00")).is_err());
 assert!(MPInt::from_bytes(&hex!("00 01")).is_err());
 assert!(Mpint::from_bytes(&hex!("00")).is_err());
 assert!(Mpint::from_bytes(&hex!("00 00")).is_err());
 assert!(Mpint::from_bytes(&hex!("00 01")).is_err());
 }

 #[test]
 fn decode_9a378f9b2e332a7() {
 assert!(MPInt::from_bytes(&hex!("09 a3 78 f9 b2 e3 32 a7")).is_ok());
 assert!(Mpint::from_bytes(&hex!("09 a3 78 f9 b2 e3 32 a7")).is_ok());
 }

 #[test]
 fn decode_80() {
 let n = MPInt::from_bytes(&hex!("00 80")).unwrap();
 let n = Mpint::from_bytes(&hex!("00 80")).unwrap();

 // Leading zero stripped
 assert_eq!(&hex!("80"), n.as_positive_bytes().unwrap())
Expand All@@ -267,14 +267,14 @@ mod tests {
 // TODO(tarcieri): drop support for negative numbers?
 #[test]
 fn decode_neg_1234() {
 let n = MPInt::from_bytes(&hex!("ed cc")).unwrap();
 let n = Mpint::from_bytes(&hex!("ed cc")).unwrap();
 assert!(n.as_positive_bytes().is_none());
 }

 // TODO(tarcieri): drop support for negative numbers?
 #[test]
 fn decode_neg_deadbeef() {
 let n = MPInt::from_bytes(&hex!("ff 21 52 41 11")).unwrap();
 let n = Mpint::from_bytes(&hex!("ff 21 52 41 11")).unwrap();
 assert!(n.as_positive_bytes().is_none());
 }
}

10 changes: 5 additions & 5 deletions
ssh-key/src/private/dsa.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
//! Digital Signature Algorithm (DSA) private keys.

use crate::{public::DsaPublicKey, Error, MPInt, Result};
use crate::{public::DsaPublicKey, Error, Mpint, Result};
use core::fmt;
use encoding::{CheckedSum, Decode, Encode, Reader, Writer};
use subtle::{Choice, ConstantTimeEq};
Expand All@@ -18,7 +18,7 @@ use rand_core::CryptoRngCore;
#[derive(Clone)]
pub struct DsaPrivateKey {
 /// Integer representing a DSA private key.
 inner: MPInt,
 inner: Mpint,
}

impl DsaPrivateKey {
Expand All@@ -27,8 +27,8 @@ impl DsaPrivateKey {
 self.inner.as_bytes()
 }

 /// Get the inner [`MPInt`].
 pub fn as_mpint(&self) -> &MPInt {
 /// Get the inner [`Mpint`].
 pub fn as_mpint(&self) -> &Mpint {
 &self.inner
 }
}
Expand DownExpand Up@@ -58,7 +58,7 @@ impl Decode for DsaPrivateKey {

 fn decode(reader: &mut impl Reader) -> Result<Self> {
 Ok(Self {
 inner: MPInt::decode(reader)?,
 inner: Mpint::decode(reader)?,
 })
 }
}
Expand Down

22 changes: 11 additions & 11 deletions
ssh-key/src/private/rsa.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
//! Rivest–Shamir–Adleman (RSA) private keys.

use crate::{public::RsaPublicKey, Error, MPInt, Result};
use crate::{public::RsaPublicKey, Error, Mpint, Result};
use core::fmt;
use encoding::{CheckedSum, Decode, Encode, Reader, Writer};
use subtle::{Choice, ConstantTimeEq};
Expand All@@ -17,16 +17,16 @@ use {
#[derive(Clone)]
pub struct RsaPrivateKey {
 /// RSA private exponent.
 pub d: MPInt,
 pub d: Mpint,

 /// CRT coefficient: `(inverse of q) mod p`.
 pub iqmp: MPInt,
 pub iqmp: Mpint,

 /// First prime factor of `n`.
 pub p: MPInt,
 pub p: Mpint,

 /// Second prime factor of `n`.
 pub q: MPInt,
 pub q: Mpint,
}

impl ConstantTimeEq for RsaPrivateKey {
Expand All@@ -50,10 +50,10 @@ impl Decode for RsaPrivateKey {
 type Error = Error;

 fn decode(reader: &mut impl Reader) -> Result<Self> {
 let d = MPInt::decode(reader)?;
 let iqmp = MPInt::decode(reader)?;
 let p = MPInt::decode(reader)?;
 let q = MPInt::decode(reader)?;
 let d = Mpint::decode(reader)?;
 let iqmp = Mpint::decode(reader)?;
 let p = Mpint::decode(reader)?;
 let q = Mpint::decode(reader)?;
 Ok(Self { d, iqmp, p, q })
 }
}
Expand DownExpand Up@@ -133,8 +133,8 @@ impl Decode for RsaKeypair {
 type Error = Error;

 fn decode(reader: &mut impl Reader) -> Result<Self> {
 let n = MPInt::decode(reader)?;
 let e = MPInt::decode(reader)?;
 let n = Mpint::decode(reader)?;
 let e = Mpint::decode(reader)?;
 let public = RsaPublicKey { n, e };
 let private = RsaPrivateKey::decode(reader)?;
 Ok(RsaKeypair { public, private })
Expand Down

18 changes: 9 additions & 9 deletions
ssh-key/src/public/dsa.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
//! Digital Signature Algorithm (DSA) public keys.

use crate::{Error, MPInt, Result};
use crate::{Error, Mpint, Result};
use encoding::{CheckedSum, Decode, Encode, Reader, Writer};

/// Digital Signature Algorithm (DSA) public key.
Expand All@@ -9,27 +9,27 @@ use encoding::{CheckedSum, Decode, Encode, Reader, Writer};
#[derive(Clone, Debug, Eq, PartialEq, PartialOrd, Ord)]
pub struct DsaPublicKey {
 /// Prime modulus.
 pub p: MPInt,
 pub p: Mpint,

 /// Prime divisor of `p - 1`.
 pub q: MPInt,
 pub q: Mpint,

 /// Generator of a subgroup of order `q` in the multiplicative group
 /// `GF(p)`, such that `1 < g < p`.
 pub g: MPInt,
 pub g: Mpint,

 /// The public key, where `y = gˣ mod p`.
 pub y: MPInt,
 pub y: Mpint,
}

impl Decode for DsaPublicKey {
 type Error = Error;

 fn decode(reader: &mut impl Reader) -> Result<Self> {
 let p = MPInt::decode(reader)?;
 let q = MPInt::decode(reader)?;
 let g = MPInt::decode(reader)?;
 let y = MPInt::decode(reader)?;
 let p = Mpint::decode(reader)?;
 let q = Mpint::decode(reader)?;
 let g = Mpint::decode(reader)?;
 let y = Mpint::decode(reader)?;
 Ok(Self { p, q, g, y })
 }
}
Expand Down
Loading