projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add default operations to EC_METHOD
[oweals/openssl.git]
/
crypto
/
rsa
/
rsa_depr.c
diff --git
a/crypto/rsa/rsa_depr.c
b/crypto/rsa/rsa_depr.c
index a6ec38548b6512c8ae2e17c27ca703dfaf6f31be..18e406594a76f3a555917ed761ef1cc0eca98844 100644
(file)
--- a/
crypto/rsa/rsa_depr.c
+++ b/
crypto/rsa/rsa_depr.c
@@
-1,4
+1,3
@@
-/* crypto/rsa/rsa_depr.c */
/* ====================================================================
* Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved.
*
/* ====================================================================
* Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved.
*
@@
-58,18
+57,18
@@
* "new" versions).
*/
* "new" versions).
*/
-#include <stdio.h>
-#include <time.h>
-#include "cryptlib.h"
-#include <openssl/bn.h>
-#include <openssl/rsa.h>
-
-#ifdef OPENSSL_NO_DEPRECATED
-
-static void *dummy = &dummy;
+#include <openssl/opensslconf.h>
+#if OPENSSL_API_COMPAT >= 0x00908000L
+NON_EMPTY_TRANSLATION_UNIT
#else
#else
+# include <stdio.h>
+# include <time.h>
+# include "internal/cryptlib.h"
+# include <openssl/bn.h>
+# include <openssl/rsa.h>
+
RSA *RSA_generate_key(int bits, unsigned long e_value,
void (*callback) (int, int, void *), void *cb_arg)
{
RSA *RSA_generate_key(int bits, unsigned long e_value,
void (*callback) (int, int, void *), void *cb_arg)
{
@@
-78,7
+77,7
@@
RSA *RSA_generate_key(int bits, unsigned long e_value,
RSA *rsa = RSA_new();
BIGNUM *e = BN_new();
RSA *rsa = RSA_new();
BIGNUM *e = BN_new();
- if (
!cb || !rsa || !e
)
+ if (
cb == NULL || rsa == NULL || e == NULL
)
goto err;
/*
goto err;
/*
@@
-99,12
+98,9
@@
RSA *RSA_generate_key(int bits, unsigned long e_value,
return rsa;
}
err:
return rsa;
}
err:
- if (e)
- BN_free(e);
- if (rsa)
- RSA_free(rsa);
- if (cb)
- BN_GENCB_free(cb);
+ BN_free(e);
+ RSA_free(rsa);
+ BN_GENCB_free(cb);
return 0;
}
#endif
return 0;
}
#endif