projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
x86[_64] assembly pack: add optimized AES-NI OCB subroutines.
[oweals/openssl.git]
/
crypto
/
x509v3
/
v3_skey.c
diff --git
a/crypto/x509v3/v3_skey.c
b/crypto/x509v3/v3_skey.c
index 705d86cb52befe4845be22cc5767310bd7772041..cf3521304d73468ec72fd98edd57e22b4357b89c 100644
(file)
--- a/
crypto/x509v3/v3_skey.c
+++ b/
crypto/x509v3/v3_skey.c
@@
-58,8
+58,10
@@
*/
#include <stdio.h>
*/
#include <stdio.h>
-#include "cryptlib.h"
+#include "
internal/
cryptlib.h"
#include <openssl/x509v3.h>
#include <openssl/x509v3.h>
+#include "internal/x509_int.h"
+#include "ext_dat.h"
static ASN1_OCTET_STRING *s2i_skey_id(X509V3_EXT_METHOD *method,
X509V3_CTX *ctx, char *str);
static ASN1_OCTET_STRING *s2i_skey_id(X509V3_EXT_METHOD *method,
X509V3_CTX *ctx, char *str);
@@
-83,12
+85,12
@@
ASN1_OCTET_STRING *s2i_ASN1_OCTET_STRING(X509V3_EXT_METHOD *method,
ASN1_OCTET_STRING *oct;
long length;
ASN1_OCTET_STRING *oct;
long length;
- if (
!(oct = ASN1_OCTET_STRING_new())
) {
+ if (
(oct = ASN1_OCTET_STRING_new()) == NULL
) {
X509V3err(X509V3_F_S2I_ASN1_OCTET_STRING, ERR_R_MALLOC_FAILURE);
return NULL;
}
X509V3err(X509V3_F_S2I_ASN1_OCTET_STRING, ERR_R_MALLOC_FAILURE);
return NULL;
}
- if (
!(oct->data = string_to_hex(str, &length))
) {
+ if (
(oct->data = string_to_hex(str, &length)) == NULL
) {
ASN1_OCTET_STRING_free(oct);
return NULL;
}
ASN1_OCTET_STRING_free(oct);
return NULL;
}
@@
-110,7
+112,7
@@
static ASN1_OCTET_STRING *s2i_skey_id(X509V3_EXT_METHOD *method,
if (strcmp(str, "hash"))
return s2i_ASN1_OCTET_STRING(method, ctx, str);
if (strcmp(str, "hash"))
return s2i_ASN1_OCTET_STRING(method, ctx, str);
- if (
!(oct = ASN1_OCTET_STRING_new())
) {
+ if (
(oct = ASN1_OCTET_STRING_new()) == NULL
) {
X509V3err(X509V3_F_S2I_SKEY_ID, ERR_R_MALLOC_FAILURE);
return NULL;
}
X509V3err(X509V3_F_S2I_SKEY_ID, ERR_R_MALLOC_FAILURE);
return NULL;
}
@@
-124,9
+126,9
@@
static ASN1_OCTET_STRING *s2i_skey_id(X509V3_EXT_METHOD *method,
}
if (ctx->subject_req)
}
if (ctx->subject_req)
- pk = ctx->subject_req->req_info
->
pubkey->public_key;
+ pk = ctx->subject_req->req_info
.
pubkey->public_key;
else
else
- pk = ctx->subject_cert->cert_info
->
key->public_key;
+ pk = ctx->subject_cert->cert_info
.
key->public_key;
if (!pk) {
X509V3err(X509V3_F_S2I_SKEY_ID, X509V3_R_NO_PUBLIC_KEY);
if (!pk) {
X509V3err(X509V3_F_S2I_SKEY_ID, X509V3_R_NO_PUBLIC_KEY);