projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Embed X509_CINF
[openssl.git]
/
crypto
/
x509v3
/
v3_skey.c
diff --git
a/crypto/x509v3/v3_skey.c
b/crypto/x509v3/v3_skey.c
index 977844b55a4adef7b7dacf2b0c23755283df6c6d..641104ab08c3583952c032b6eda4e16d6bec87ab 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);
@@
-126,7
+128,7
@@
static ASN1_OCTET_STRING *s2i_skey_id(X509V3_EXT_METHOD *method,
if (ctx->subject_req)
pk = ctx->subject_req->req_info->pubkey->public_key;
else
if (ctx->subject_req)
pk = ctx->subject_req->req_info->pubkey->public_key;
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);