projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
EVP_PKEY_CTX utility functions.
[oweals/openssl.git]
/
crypto
/
x509v3
/
v3_akey.c
diff --git
a/crypto/x509v3/v3_akey.c
b/crypto/x509v3/v3_akey.c
index 7369af1bb5cbcd28c298db37a88aa86dfaa241a9..4690292cee08817554ee67528e5b8eed3ce14cc1 100644
(file)
--- a/
crypto/x509v3/v3_akey.c
+++ b/
crypto/x509v3/v3_akey.c
@@
-1,4
+1,3
@@
-/* v3_akey.c */
/*
* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
* 1999.
/*
* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
* 1999.
@@
-58,11
+57,12
@@
*/
#include <stdio.h>
*/
#include <stdio.h>
-#include "cryptlib.h"
+#include "
internal/
cryptlib.h"
#include <openssl/conf.h>
#include <openssl/asn1.h>
#include <openssl/asn1t.h>
#include <openssl/x509v3.h>
#include <openssl/conf.h>
#include <openssl/asn1.h>
#include <openssl/asn1t.h>
#include <openssl/x509v3.h>
+#include "ext_dat.h"
static STACK_OF(CONF_VALUE) *i2v_AUTHORITY_KEYID(X509V3_EXT_METHOD *method,
AUTHORITY_KEYID *akeyid,
static STACK_OF(CONF_VALUE) *i2v_AUTHORITY_KEYID(X509V3_EXT_METHOD *method,
AUTHORITY_KEYID *akeyid,
@@
-131,13
+131,13
@@
static AUTHORITY_KEYID *v2i_AUTHORITY_KEYID(X509V3_EXT_METHOD *method,
for (i = 0; i < sk_CONF_VALUE_num(values); i++) {
cnf = sk_CONF_VALUE_value(values, i);
for (i = 0; i < sk_CONF_VALUE_num(values); i++) {
cnf = sk_CONF_VALUE_value(values, i);
- if (
!strcmp(cnf->name, "keyid")
) {
+ if (
strcmp(cnf->name, "keyid") == 0
) {
keyid = 1;
keyid = 1;
- if (cnf->value &&
!strcmp(cnf->value, "always")
)
+ if (cnf->value &&
strcmp(cnf->value, "always") == 0
)
keyid = 2;
keyid = 2;
- } else if (
!strcmp(cnf->name, "issuer")
) {
+ } else if (
strcmp(cnf->name, "issuer") == 0
) {
issuer = 1;
issuer = 1;
- if (cnf->value &&
!strcmp(cnf->value, "always")
)
+ if (cnf->value &&
strcmp(cnf->value, "always") == 0
)
issuer = 2;
} else {
X509V3err(X509V3_F_V2I_AUTHORITY_KEYID, X509V3_R_UNKNOWN_OPTION);
issuer = 2;
} else {
X509V3err(X509V3_F_V2I_AUTHORITY_KEYID, X509V3_R_UNKNOWN_OPTION);
@@
-177,12
+177,12
@@
static AUTHORITY_KEYID *v2i_AUTHORITY_KEYID(X509V3_EXT_METHOD *method,
}
}
}
}
- if (
!(akeyid = AUTHORITY_KEYID_new())
)
+ if (
(akeyid = AUTHORITY_KEYID_new()) == NULL
)
goto err;
if (isname) {
goto err;
if (isname) {
- if (
!(gens = sk_GENERAL_NAME_new_null())
- ||
!(gen = GENERAL_NAME_new())
+ if (
(gens = sk_GENERAL_NAME_new_null()) == NULL
+ ||
(gen = GENERAL_NAME_new()) == NULL
|| !sk_GENERAL_NAME_push(gens, gen)) {
X509V3err(X509V3_F_V2I_AUTHORITY_KEYID, ERR_R_MALLOC_FAILURE);
goto err;
|| !sk_GENERAL_NAME_push(gens, gen)) {
X509V3err(X509V3_F_V2I_AUTHORITY_KEYID, ERR_R_MALLOC_FAILURE);
goto err;