diff options
| author | doug <> | 2015-06-13 08:38:10 +0000 |
|---|---|---|
| committer | doug <> | 2015-06-13 08:38:10 +0000 |
| commit | ffdde82e8fceeaaea8ca893d8bffc0dcc53daf40 (patch) | |
| tree | d662b590881eb66fb307e6d2ac19b7a15cc092ba /src/lib/libc | |
| parent | 7046960ffae4141275822862cb7065584b59d3ae (diff) | |
| download | openbsd-ffdde82e8fceeaaea8ca893d8bffc0dcc53daf40.tar.gz openbsd-ffdde82e8fceeaaea8ca893d8bffc0dcc53daf40.tar.bz2 openbsd-ffdde82e8fceeaaea8ca893d8bffc0dcc53daf40.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 '')
| -rw-r--r-- | src/lib/libcrypto/rsa/rsa_eay.c | 4 | ||||
| -rw-r--r-- | src/lib/libcrypto/x509/x509type.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/libcrypto/rsa/rsa_eay.c b/src/lib/libcrypto/rsa/rsa_eay.c index 74d40611ee..940964cac3 100644 --- a/src/lib/libcrypto/rsa/rsa_eay.c +++ b/src/lib/libcrypto/rsa/rsa_eay.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: rsa_eay.c,v 1.38 2015/02/14 15:10:39 miod Exp $ */ | 1 | /* $OpenBSD: rsa_eay.c,v 1.39 2015/06/13 08:38:10 doug Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -393,7 +393,7 @@ RSA_eay_private_encrypt(int flen, const unsigned char *from, unsigned char *to, | |||
| 393 | if (BN_bin2bn(buf, num, f) == NULL) | 393 | if (BN_bin2bn(buf, num, f) == NULL) |
| 394 | goto err; | 394 | goto err; |
| 395 | 395 | ||
| 396 | if (BN_ucmp(f, rsa->n) >= 0) { | 396 | if (BN_ucmp(f, rsa->n) >= 0) { |
| 397 | /* usually the padding functions would catch this */ | 397 | /* usually the padding functions would catch this */ |
| 398 | RSAerr(RSA_F_RSA_EAY_PRIVATE_ENCRYPT, | 398 | RSAerr(RSA_F_RSA_EAY_PRIVATE_ENCRYPT, |
| 399 | RSA_R_DATA_TOO_LARGE_FOR_MODULUS); | 399 | RSA_R_DATA_TOO_LARGE_FOR_MODULUS); |
diff --git a/src/lib/libcrypto/x509/x509type.c b/src/lib/libcrypto/x509/x509type.c index 58335b4e64..d0dcffb290 100644 --- a/src/lib/libcrypto/x509/x509type.c +++ b/src/lib/libcrypto/x509/x509type.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: x509type.c,v 1.11 2014/07/11 08:44:49 jsing Exp $ */ | 1 | /* $OpenBSD: x509type.c,v 1.12 2015/06/13 08:38:10 doug Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -121,9 +121,9 @@ X509_certificate_type(X509 *x, EVP_PKEY *pkey) | |||
| 121 | } | 121 | } |
| 122 | } | 122 | } |
| 123 | 123 | ||
| 124 | if (EVP_PKEY_size(pk) <= 1024/8)/* /8 because it's 1024 bits we look | 124 | /* /8 because it's 1024 bits we look for, not bytes */ |
| 125 | for, not bytes */ | 125 | if (EVP_PKEY_size(pk) <= 1024 / 8) |
| 126 | ret |= EVP_PKT_EXP; | 126 | ret |= EVP_PKT_EXP; |
| 127 | if (pkey == NULL) | 127 | if (pkey == NULL) |
| 128 | EVP_PKEY_free(pk); | 128 | EVP_PKEY_free(pk); |
| 129 | return (ret); | 129 | return (ret); |
