diff options
| author |   doug <doug@openbsd.org> | 2015-06-13 08:38:10 +0000 |
|---|---|---|
| committer | doug <doug@openbsd.org> | 2015-06-13 08:38:10 +0000 |
| commit | a6cc4a65ba3bbff30612fb4df44d9c809b6f436f (patch) | |
| tree | 5ef1e0d267b1755768d36aa35650e4b67d859bc7 /lib/libcrypto | |
| parent | When investigating an uninitialised variable in the armv7 resettodr() (diff) | |
| download | wireguard-openbsd-a6cc4a65ba3bbff30612fb4df44d9c809b6f436f.tar.xz wireguard-openbsd-a6cc4a65ba3bbff30612fb4df44d9c809b6f436f.zip | |
Fix bad indenting in LibreSSL.
jsg@ noticed that some of the lines in libssl and libcrypto are not
indented properly. At a quick glance, it looks like it has a different
control flow than it really does. I checked the history in our tree and
in OpenSSL to make sure these were simple mistakes.
ok miod@ jsing@
Diffstat (limited to 'lib/libcrypto')
| -rw-r--r-- | lib/libcrypto/rsa/rsa_eay.c | 4 | ||||
| -rw-r--r-- | lib/libcrypto/x509/x509type.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/libcrypto/rsa/rsa_eay.c b/lib/libcrypto/rsa/rsa_eay.c index 74d40611ee5..940964cac30 100644 --- a/lib/libcrypto/rsa/rsa_eay.c +++ b/lib/libcrypto/rsa/rsa_eay.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rsa_eay.c,v 1.38 2015/02/14 15:10:39 miod Exp $ */ +/* $OpenBSD: rsa_eay.c,v 1.39 2015/06/13 08:38:10 doug Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -393,7 +393,7 @@ RSA_eay_private_encrypt(int flen, const unsigned char *from, unsigned char *to, if (BN_bin2bn(buf, num, f) == NULL) goto err; - if (BN_ucmp(f, rsa->n) >= 0) { + if (BN_ucmp(f, rsa->n) >= 0) { /* usually the padding functions would catch this */ RSAerr(RSA_F_RSA_EAY_PRIVATE_ENCRYPT, RSA_R_DATA_TOO_LARGE_FOR_MODULUS); diff --git a/lib/libcrypto/x509/x509type.c b/lib/libcrypto/x509/x509type.c index 58335b4e642..d0dcffb2905 100644 --- a/lib/libcrypto/x509/x509type.c +++ b/lib/libcrypto/x509/x509type.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509type.c,v 1.11 2014/07/11 08:44:49 jsing Exp $ */ +/* $OpenBSD: x509type.c,v 1.12 2015/06/13 08:38:10 doug Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -121,9 +121,9 @@ X509_certificate_type(X509 *x, EVP_PKEY *pkey) } } - if (EVP_PKEY_size(pk) <= 1024/8)/* /8 because it's 1024 bits we look - for, not bytes */ - ret |= EVP_PKT_EXP; + /* /8 because it's 1024 bits we look for, not bytes */ + if (EVP_PKEY_size(pk) <= 1024 / 8) + ret |= EVP_PKT_EXP; if (pkey == NULL) EVP_PKEY_free(pk); return (ret); |