mirror of
https://github.com/guanzhi/GmSSL.git
synced 2026-08-11 16:33:40 +08:00
update
This commit is contained in:
@@ -5,21 +5,21 @@
|
||||
* This package is an SSL implementation written
|
||||
* by Eric Young (eay@cryptsoft.com).
|
||||
* The implementation was written so as to conform with Netscapes SSL.
|
||||
*
|
||||
*
|
||||
* This library is free for commercial and non-commercial use as long as
|
||||
* the following conditions are aheared to. The following conditions
|
||||
* apply to all code found in this distribution, be it the RC4, RSA,
|
||||
* lhash, DES, etc., code; not just the SSL code. The SSL documentation
|
||||
* included with this distribution is covered by the same copyright terms
|
||||
* except that the holder is Tim Hudson (tjh@cryptsoft.com).
|
||||
*
|
||||
*
|
||||
* Copyright remains Eric Young's, and as such any Copyright notices in
|
||||
* the code are not to be removed.
|
||||
* If this package is used in a product, Eric Young should be given attribution
|
||||
* as the author of the parts of the library used.
|
||||
* This can be in the form of a textual message at program startup or
|
||||
* in documentation (online or textual) provided with the package.
|
||||
*
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
@@ -34,10 +34,10 @@
|
||||
* Eric Young (eay@cryptsoft.com)"
|
||||
* The word 'cryptographic' can be left out if the rouines from the library
|
||||
* being used are not cryptographic related :-).
|
||||
* 4. If you include any Windows specific code (or a derivative thereof) from
|
||||
* 4. If you include any Windows specific code (or a derivative thereof) from
|
||||
* the apps directory (application code) you must include an acknowledgement:
|
||||
* "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
|
||||
*
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
@@ -49,7 +49,7 @@
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
*
|
||||
* The licence and distribution terms for any publically available version or
|
||||
* derivative of this code cannot be changed. i.e. this code cannot simply be
|
||||
* copied and put under another distribution licence
|
||||
@@ -63,63 +63,65 @@
|
||||
#include <openssl/x509.h>
|
||||
|
||||
int X509_certificate_type(X509 *x, EVP_PKEY *pkey)
|
||||
{
|
||||
EVP_PKEY *pk;
|
||||
int ret=0,i;
|
||||
{
|
||||
EVP_PKEY *pk;
|
||||
int ret = 0, i;
|
||||
|
||||
if (x == NULL) return(0);
|
||||
if (x == NULL)
|
||||
return (0);
|
||||
|
||||
if (pkey == NULL)
|
||||
pk=X509_get_pubkey(x);
|
||||
else
|
||||
pk=pkey;
|
||||
if (pkey == NULL)
|
||||
pk = X509_get_pubkey(x);
|
||||
else
|
||||
pk = pkey;
|
||||
|
||||
if (pk == NULL) return(0);
|
||||
if (pk == NULL)
|
||||
return (0);
|
||||
|
||||
switch (pk->type)
|
||||
{
|
||||
case EVP_PKEY_RSA:
|
||||
ret=EVP_PK_RSA|EVP_PKT_SIGN;
|
||||
/* if (!sign only extension) */
|
||||
ret|=EVP_PKT_ENC;
|
||||
break;
|
||||
case EVP_PKEY_DSA:
|
||||
ret=EVP_PK_DSA|EVP_PKT_SIGN;
|
||||
break;
|
||||
case EVP_PKEY_EC:
|
||||
ret=EVP_PK_EC|EVP_PKT_SIGN|EVP_PKT_EXCH;
|
||||
break;
|
||||
case EVP_PKEY_DH:
|
||||
ret=EVP_PK_DH|EVP_PKT_EXCH;
|
||||
break;
|
||||
case NID_id_GostR3410_94:
|
||||
case NID_id_GostR3410_2001:
|
||||
ret=EVP_PKT_EXCH|EVP_PKT_SIGN;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
switch (pk->type) {
|
||||
case EVP_PKEY_RSA:
|
||||
ret = EVP_PK_RSA | EVP_PKT_SIGN;
|
||||
/* if (!sign only extension) */
|
||||
ret |= EVP_PKT_ENC;
|
||||
break;
|
||||
case EVP_PKEY_DSA:
|
||||
ret = EVP_PK_DSA | EVP_PKT_SIGN;
|
||||
break;
|
||||
case EVP_PKEY_EC:
|
||||
ret = EVP_PK_EC | EVP_PKT_SIGN | EVP_PKT_EXCH;
|
||||
break;
|
||||
case EVP_PKEY_DH:
|
||||
ret = EVP_PK_DH | EVP_PKT_EXCH;
|
||||
break;
|
||||
case NID_id_GostR3410_94:
|
||||
case NID_id_GostR3410_2001:
|
||||
ret = EVP_PKT_EXCH | EVP_PKT_SIGN;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
i=X509_get_signature_type(x);
|
||||
switch (i)
|
||||
{
|
||||
case EVP_PKEY_RSA:
|
||||
ret|=EVP_PKS_RSA;
|
||||
break;
|
||||
case EVP_PKEY_DSA:
|
||||
ret|=EVP_PKS_DSA;
|
||||
break;
|
||||
case EVP_PKEY_EC:
|
||||
ret|=EVP_PKS_EC;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
i = OBJ_obj2nid(x->sig_alg->algorithm);
|
||||
if (i && OBJ_find_sigid_algs(i, NULL, &i)) {
|
||||
|
||||
if (EVP_PKEY_size(pk) <= 1024/8)/* /8 because it's 1024 bits we look
|
||||
for, not bytes */
|
||||
ret|=EVP_PKT_EXP;
|
||||
if(pkey==NULL) EVP_PKEY_free(pk);
|
||||
return(ret);
|
||||
}
|
||||
switch (i) {
|
||||
case NID_rsaEncryption:
|
||||
case NID_rsa:
|
||||
ret |= EVP_PKS_RSA;
|
||||
break;
|
||||
case NID_dsa:
|
||||
case NID_dsa_2:
|
||||
ret |= EVP_PKS_DSA;
|
||||
break;
|
||||
case NID_X9_62_id_ecPublicKey:
|
||||
ret |= EVP_PKS_EC;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (pkey == NULL)
|
||||
EVP_PKEY_free(pk);
|
||||
return (ret);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user