projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't output bogus errors in PKCS12_parse
[openssl.git]
/
crypto
/
dh
/
dh_pmeth.c
diff --git
a/crypto/dh/dh_pmeth.c
b/crypto/dh/dh_pmeth.c
index be44c0b2016022487d8081a7456f41975814434a..763e42fe22723600bdca19978686ed07f5f7c1d9 100644
(file)
--- a/
crypto/dh/dh_pmeth.c
+++ b/
crypto/dh/dh_pmeth.c
@@
-57,7
+57,7
@@
*/
#include <stdio.h>
*/
#include <stdio.h>
-#include "cryptlib.h"
+#include "
internal/
cryptlib.h"
#include <openssl/asn1t.h>
#include <openssl/x509.h>
#include <openssl/evp.h>
#include <openssl/asn1t.h>
#include <openssl/x509.h>
#include <openssl/evp.h>
@@
-98,7
+98,7
@@
typedef struct {
static int pkey_dh_init(EVP_PKEY_CTX *ctx)
{
DH_PKEY_CTX *dctx;
static int pkey_dh_init(EVP_PKEY_CTX *ctx)
{
DH_PKEY_CTX *dctx;
- dctx = OPENSSL_malloc(sizeof(
DH_PKEY_CTX
));
+ dctx = OPENSSL_malloc(sizeof(
*dctx
));
if (!dctx)
return 0;
dctx->prime_len = 1024;
if (!dctx)
return 0;
dctx->prime_len = 1024;
@@
-259,12
+259,12
@@
static int pkey_dh_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
static int pkey_dh_ctrl_str(EVP_PKEY_CTX *ctx,
const char *type, const char *value)
{
static int pkey_dh_ctrl_str(EVP_PKEY_CTX *ctx,
const char *type, const char *value)
{
- if (
!strcmp(type, "dh_paramgen_prime_len")
) {
+ if (
strcmp(type, "dh_paramgen_prime_len") == 0
) {
int len;
len = atoi(value);
return EVP_PKEY_CTX_set_dh_paramgen_prime_len(ctx, len);
}
int len;
len = atoi(value);
return EVP_PKEY_CTX_set_dh_paramgen_prime_len(ctx, len);
}
- if (
!strcmp(type, "dh_rfc5114")
) {
+ if (
strcmp(type, "dh_rfc5114") == 0
) {
DH_PKEY_CTX *dctx = ctx->data;
int len;
len = atoi(value);
DH_PKEY_CTX *dctx = ctx->data;
int len;
len = atoi(value);
@@
-273,17
+273,17
@@
static int pkey_dh_ctrl_str(EVP_PKEY_CTX *ctx,
dctx->rfc5114_param = len;
return 1;
}
dctx->rfc5114_param = len;
return 1;
}
- if (
!strcmp(type, "dh_paramgen_generator")
) {
+ if (
strcmp(type, "dh_paramgen_generator") == 0
) {
int len;
len = atoi(value);
return EVP_PKEY_CTX_set_dh_paramgen_generator(ctx, len);
}
int len;
len = atoi(value);
return EVP_PKEY_CTX_set_dh_paramgen_generator(ctx, len);
}
- if (
!strcmp(type, "dh_paramgen_subprime_len")
) {
+ if (
strcmp(type, "dh_paramgen_subprime_len") == 0
) {
int len;
len = atoi(value);
return EVP_PKEY_CTX_set_dh_paramgen_subprime_len(ctx, len);
}
int len;
len = atoi(value);
return EVP_PKEY_CTX_set_dh_paramgen_subprime_len(ctx, len);
}
- if (
!strcmp(type, "dh_paramgen_type")
) {
+ if (
strcmp(type, "dh_paramgen_type") == 0
) {
int typ;
typ = atoi(value);
return EVP_PKEY_CTX_set_dh_paramgen_type(ctx, typ);
int typ;
typ = atoi(value);
return EVP_PKEY_CTX_set_dh_paramgen_type(ctx, typ);