projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Swap the check in ssl3_write_pending to avoid using
[openssl.git]
/
crypto
/
x509
/
x509_ext.c
diff --git
a/crypto/x509/x509_ext.c
b/crypto/x509/x509_ext.c
index b01ad127b644259cc93a7c1f9749665cf470b728..2db843760c6895d6b2cd4ba72a27ec30294fb5a5 100644
(file)
--- a/
crypto/x509/x509_ext.c
+++ b/
crypto/x509/x509_ext.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright 1995-201
6
The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-201
7
The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@
-8,7
+8,6
@@
*/
#include <stdio.h>
*/
#include <stdio.h>
-#include <openssl/stack.h>
#include "internal/cryptlib.h"
#include <openssl/asn1.h>
#include <openssl/objects.h>
#include "internal/cryptlib.h"
#include <openssl/asn1.h>
#include <openssl/objects.h>
@@
-17,37
+16,38
@@
#include "internal/x509_int.h"
#include <openssl/x509v3.h>
#include "internal/x509_int.h"
#include <openssl/x509v3.h>
-int X509_CRL_get_ext_count(X509_CRL *x)
+int X509_CRL_get_ext_count(
const
X509_CRL *x)
{
{
- return
(X509v3_get_ext_count(x->crl.extensions)
);
+ return
X509v3_get_ext_count(x->crl.extensions
);
}
}
-int X509_CRL_get_ext_by_NID(X509_CRL *x, int nid, int lastpos)
+int X509_CRL_get_ext_by_NID(
const
X509_CRL *x, int nid, int lastpos)
{
{
- return
(X509v3_get_ext_by_NID(x->crl.extensions, nid, lastpos)
);
+ return
X509v3_get_ext_by_NID(x->crl.extensions, nid, lastpos
);
}
}
-int X509_CRL_get_ext_by_OBJ(X509_CRL *x, ASN1_OBJECT *obj, int lastpos)
+int X509_CRL_get_ext_by_OBJ(const X509_CRL *x, const ASN1_OBJECT *obj,
+ int lastpos)
{
{
- return
(X509v3_get_ext_by_OBJ(x->crl.extensions, obj, lastpos)
);
+ return
X509v3_get_ext_by_OBJ(x->crl.extensions, obj, lastpos
);
}
}
-int X509_CRL_get_ext_by_critical(X509_CRL *x, int crit, int lastpos)
+int X509_CRL_get_ext_by_critical(
const
X509_CRL *x, int crit, int lastpos)
{
{
- return
(X509v3_get_ext_by_critical(x->crl.extensions, crit, lastpos)
);
+ return
X509v3_get_ext_by_critical(x->crl.extensions, crit, lastpos
);
}
}
-X509_EXTENSION *X509_CRL_get_ext(X509_CRL *x, int loc)
+X509_EXTENSION *X509_CRL_get_ext(
const
X509_CRL *x, int loc)
{
{
- return
(X509v3_get_ext(x->crl.extensions, loc)
);
+ return
X509v3_get_ext(x->crl.extensions, loc
);
}
X509_EXTENSION *X509_CRL_delete_ext(X509_CRL *x, int loc)
{
}
X509_EXTENSION *X509_CRL_delete_ext(X509_CRL *x, int loc)
{
- return
(X509v3_delete_ext(x->crl.extensions, loc)
);
+ return
X509v3_delete_ext(x->crl.extensions, loc
);
}
}
-void *X509_CRL_get_ext_d2i(X509_CRL *x, int nid, int *crit, int *idx)
+void *X509_CRL_get_ext_d2i(
const
X509_CRL *x, int nid, int *crit, int *idx)
{
return X509V3_get_d2i(x->crl.extensions, nid, crit, idx);
}
{
return X509V3_get_d2i(x->crl.extensions, nid, crit, idx);
}
@@
-63,35
+63,35
@@
int X509_CRL_add_ext(X509_CRL *x, X509_EXTENSION *ex, int loc)
return (X509v3_add_ext(&(x->crl.extensions), ex, loc) != NULL);
}
return (X509v3_add_ext(&(x->crl.extensions), ex, loc) != NULL);
}
-int X509_get_ext_count(X509 *x)
+int X509_get_ext_count(
const
X509 *x)
{
{
- return
(X509v3_get_ext_count(x->cert_info.extensions)
);
+ return
X509v3_get_ext_count(x->cert_info.extensions
);
}
}
-int X509_get_ext_by_NID(X509 *x, int nid, int lastpos)
+int X509_get_ext_by_NID(
const
X509 *x, int nid, int lastpos)
{
{
- return
(X509v3_get_ext_by_NID(x->cert_info.extensions, nid, lastpos)
);
+ return
X509v3_get_ext_by_NID(x->cert_info.extensions, nid, lastpos
);
}
}
-int X509_get_ext_by_OBJ(
X509 *x,
ASN1_OBJECT *obj, int lastpos)
+int X509_get_ext_by_OBJ(
const X509 *x, const
ASN1_OBJECT *obj, int lastpos)
{
{
- return
(X509v3_get_ext_by_OBJ(x->cert_info.extensions, obj, lastpos)
);
+ return
X509v3_get_ext_by_OBJ(x->cert_info.extensions, obj, lastpos
);
}
}
-int X509_get_ext_by_critical(X509 *x, int crit, int lastpos)
+int X509_get_ext_by_critical(
const
X509 *x, int crit, int lastpos)
{
return (X509v3_get_ext_by_critical
(x->cert_info.extensions, crit, lastpos));
}
{
return (X509v3_get_ext_by_critical
(x->cert_info.extensions, crit, lastpos));
}
-X509_EXTENSION *X509_get_ext(X509 *x, int loc)
+X509_EXTENSION *X509_get_ext(
const
X509 *x, int loc)
{
{
- return
(X509v3_get_ext(x->cert_info.extensions, loc)
);
+ return
X509v3_get_ext(x->cert_info.extensions, loc
);
}
X509_EXTENSION *X509_delete_ext(X509 *x, int loc)
{
}
X509_EXTENSION *X509_delete_ext(X509 *x, int loc)
{
- return
(X509v3_delete_ext(x->cert_info.extensions, loc)
);
+ return
X509v3_delete_ext(x->cert_info.extensions, loc
);
}
int X509_add_ext(X509 *x, X509_EXTENSION *ex, int loc)
}
int X509_add_ext(X509 *x, X509_EXTENSION *ex, int loc)
@@
-99,7
+99,7
@@
int X509_add_ext(X509 *x, X509_EXTENSION *ex, int loc)
return (X509v3_add_ext(&(x->cert_info.extensions), ex, loc) != NULL);
}
return (X509v3_add_ext(&(x->cert_info.extensions), ex, loc) != NULL);
}
-void *X509_get_ext_d2i(X509 *x, int nid, int *crit, int *idx)
+void *X509_get_ext_d2i(
const
X509 *x, int nid, int *crit, int *idx)
{
return X509V3_get_d2i(x->cert_info.extensions, nid, crit, idx);
}
{
return X509V3_get_d2i(x->cert_info.extensions, nid, crit, idx);
}
@@
-111,35
+111,35
@@
int X509_add1_ext_i2d(X509 *x, int nid, void *value, int crit,
flags);
}
flags);
}
-int X509_REVOKED_get_ext_count(X509_REVOKED *x)
+int X509_REVOKED_get_ext_count(
const
X509_REVOKED *x)
{
{
- return
(X509v3_get_ext_count(x->extensions)
);
+ return
X509v3_get_ext_count(x->extensions
);
}
}
-int X509_REVOKED_get_ext_by_NID(X509_REVOKED *x, int nid, int lastpos)
+int X509_REVOKED_get_ext_by_NID(
const
X509_REVOKED *x, int nid, int lastpos)
{
{
- return
(X509v3_get_ext_by_NID(x->extensions, nid, lastpos)
);
+ return
X509v3_get_ext_by_NID(x->extensions, nid, lastpos
);
}
}
-int X509_REVOKED_get_ext_by_OBJ(
X509_REVOKED *x,
ASN1_OBJECT *obj,
+int X509_REVOKED_get_ext_by_OBJ(
const X509_REVOKED *x, const
ASN1_OBJECT *obj,
int lastpos)
{
int lastpos)
{
- return
(X509v3_get_ext_by_OBJ(x->extensions, obj, lastpos)
);
+ return
X509v3_get_ext_by_OBJ(x->extensions, obj, lastpos
);
}
}
-int X509_REVOKED_get_ext_by_critical(X509_REVOKED *x, int crit, int lastpos)
+int X509_REVOKED_get_ext_by_critical(
const
X509_REVOKED *x, int crit, int lastpos)
{
{
- return
(X509v3_get_ext_by_critical(x->extensions, crit, lastpos)
);
+ return
X509v3_get_ext_by_critical(x->extensions, crit, lastpos
);
}
}
-X509_EXTENSION *X509_REVOKED_get_ext(X509_REVOKED *x, int loc)
+X509_EXTENSION *X509_REVOKED_get_ext(
const
X509_REVOKED *x, int loc)
{
{
- return
(X509v3_get_ext(x->extensions, loc)
);
+ return
X509v3_get_ext(x->extensions, loc
);
}
X509_EXTENSION *X509_REVOKED_delete_ext(X509_REVOKED *x, int loc)
{
}
X509_EXTENSION *X509_REVOKED_delete_ext(X509_REVOKED *x, int loc)
{
- return
(X509v3_delete_ext(x->extensions, loc)
);
+ return
X509v3_delete_ext(x->extensions, loc
);
}
int X509_REVOKED_add_ext(X509_REVOKED *x, X509_EXTENSION *ex, int loc)
}
int X509_REVOKED_add_ext(X509_REVOKED *x, X509_EXTENSION *ex, int loc)
@@
-147,7
+147,7
@@
int X509_REVOKED_add_ext(X509_REVOKED *x, X509_EXTENSION *ex, int loc)
return (X509v3_add_ext(&(x->extensions), ex, loc) != NULL);
}
return (X509v3_add_ext(&(x->extensions), ex, loc) != NULL);
}
-void *X509_REVOKED_get_ext_d2i(X509_REVOKED *x, int nid, int *crit, int *idx)
+void *X509_REVOKED_get_ext_d2i(
const
X509_REVOKED *x, int nid, int *crit, int *idx)
{
return X509V3_get_d2i(x->extensions, nid, crit, idx);
}
{
return X509V3_get_d2i(x->extensions, nid, crit, idx);
}