aboutsummaryrefslogtreecommitdiff
path: root/openssl/src/ec.rs
diff options
context:
space:
mode:
authorjohnthagen <[email protected]>2017-10-03 17:44:02 -0400
committerjohnthagen <[email protected]>2017-10-03 17:44:02 -0400
commitb5bb8de4f2bd18735346a6062a13d95bcf82bdee (patch)
tree11a6f6d11bc412fc89a4bfb3517ced56bf047012 /openssl/src/ec.rs
parentMerge pull request #743 from AndyGauge/doc-asn1 (diff)
downloadrust-openssl-b5bb8de4f2bd18735346a6062a13d95bcf82bdee.tar.xz
rust-openssl-b5bb8de4f2bd18735346a6062a13d95bcf82bdee.zip
Convert try! usage to ?
Diffstat (limited to 'openssl/src/ec.rs')
-rw-r--r--openssl/src/ec.rs22
1 files changed, 11 insertions, 11 deletions
diff --git a/openssl/src/ec.rs b/openssl/src/ec.rs
index aded95ab..02be6d22 100644
--- a/openssl/src/ec.rs
+++ b/openssl/src/ec.rs
@@ -262,12 +262,12 @@ impl EcPointRef {
ctx: &mut BigNumContextRef,
) -> Result<bool, ErrorStack> {
unsafe {
- let res = try!(cvt_n(ffi::EC_POINT_cmp(
+ let res = cvt_n(ffi::EC_POINT_cmp(
group.as_ptr(),
self.as_ptr(),
other.as_ptr(),
ctx.as_ptr(),
- )));
+ ))?;
Ok(res == 0)
}
}
@@ -323,15 +323,15 @@ impl EcPoint {
buf: &[u8],
ctx: &mut BigNumContextRef,
) -> Result<EcPoint, ErrorStack> {
- let point = try!(EcPoint::new(group));
+ let point = EcPoint::new(group)?;
unsafe {
- try!(cvt(ffi::EC_POINT_oct2point(
+ cvt(ffi::EC_POINT_oct2point(
group.as_ptr(),
point.as_ptr(),
buf.as_ptr(),
buf.len(),
ctx.as_ptr(),
- )));
+ ))?;
}
Ok(point)
}
@@ -429,17 +429,17 @@ impl EcKey {
group: &EcGroupRef,
public_key: &EcPointRef,
) -> Result<EcKey, ErrorStack> {
- let mut builder = try!(EcKeyBuilder::new());
- try!(builder.set_group(group));
- try!(builder.set_public_key(public_key));
+ let mut builder = EcKeyBuilder::new()?;
+ builder.set_group(group)?;
+ builder.set_public_key(public_key)?;
Ok(builder.build())
}
/// Generates a new public/private key pair on the specified curve.
pub fn generate(group: &EcGroupRef) -> Result<EcKey, ErrorStack> {
- let mut builder = try!(EcKeyBuilder::new());
- try!(builder.set_group(group));
- try!(builder.generate_key());
+ let mut builder = EcKeyBuilder::new()?;
+ builder.set_group(group)?;
+ builder.generate_key()?;
Ok(builder.build())
}