aboutsummaryrefslogtreecommitdiff
path: root/crypto/dh/dh_depr.c
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2015-01-22 03:40:55 +0000
committerMatt Caswell <matt@openssl.org>2015-01-22 09:20:09 +0000
commit0f113f3ee4d629ef9a4a30911b22b224772085e5 (patch)
treee014603da5aed1d0751f587a66d6e270b6bda3de /crypto/dh/dh_depr.c
parent22b52164aaed31d6e93dbd2d397ace041360e6aa (diff)
downloadopenssl-0f113f3ee4d629ef9a4a30911b22b224772085e5.zip
openssl-0f113f3ee4d629ef9a4a30911b22b224772085e5.tar.gz
openssl-0f113f3ee4d629ef9a4a30911b22b224772085e5.tar.bz2
Run util/openssl-format-source -v -c .
Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'crypto/dh/dh_depr.c')
-rw-r--r--crypto/dh/dh_depr.c47
1 files changed, 22 insertions, 25 deletions
diff --git a/crypto/dh/dh_depr.c b/crypto/dh/dh_depr.c
index bff3b59..7220d07 100644
--- a/crypto/dh/dh_depr.c
+++ b/crypto/dh/dh_depr.c
@@ -7,7 +7,7 @@
* are met:
*
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
+ * notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
@@ -53,7 +53,6 @@
*
*/
-
/* This file contains deprecated functions as wrappers to the new ones */
#include <stdio.h>
@@ -61,33 +60,31 @@
#include <openssl/bn.h>
#include <openssl/dh.h>
-static void *dummy=&dummy;
+static void *dummy = &dummy;
#ifndef OPENSSL_NO_DEPRECATED
DH *DH_generate_parameters(int prime_len, int generator,
- void (*callback)(int,int,void *), void *cb_arg)
- {
- BN_GENCB *cb;
- DH *ret=NULL;
+ void (*callback) (int, int, void *), void *cb_arg)
+{
+ BN_GENCB *cb;
+ DH *ret = NULL;
- if((ret=DH_new()) == NULL)
- return NULL;
- cb = BN_GENCB_new();
- if(!cb)
- {
- DH_free(ret);
- return NULL;
- }
+ if ((ret = DH_new()) == NULL)
+ return NULL;
+ cb = BN_GENCB_new();
+ if (!cb) {
+ DH_free(ret);
+ return NULL;
+ }
- BN_GENCB_set_old(cb, callback, cb_arg);
+ BN_GENCB_set_old(cb, callback, cb_arg);
- if(DH_generate_parameters_ex(ret, prime_len, generator, cb))
- {
- BN_GENCB_free(cb);
- return ret;
- }
- BN_GENCB_free(cb);
- DH_free(ret);
- return NULL;
- }
+ if (DH_generate_parameters_ex(ret, prime_len, generator, cb)) {
+ BN_GENCB_free(cb);
+ return ret;
+ }
+ BN_GENCB_free(cb);
+ DH_free(ret);
+ return NULL;
+}
#endif