diff options
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libcrypto/evp/names.c | 244 |
1 files changed, 41 insertions, 203 deletions
diff --git a/src/lib/libcrypto/evp/names.c b/src/lib/libcrypto/evp/names.c index e0774da20d..eb9f4329cd 100644 --- a/src/lib/libcrypto/evp/names.c +++ b/src/lib/libcrypto/evp/names.c | |||
| @@ -58,228 +58,66 @@ | |||
| 58 | 58 | ||
| 59 | #include <stdio.h> | 59 | #include <stdio.h> |
| 60 | #include "cryptlib.h" | 60 | #include "cryptlib.h" |
| 61 | #include "evp.h" | 61 | #include <openssl/evp.h> |
| 62 | #include "objects.h" | 62 | #include <openssl/objects.h> |
| 63 | #include <openssl/x509.h> | ||
| 63 | 64 | ||
| 64 | typedef struct aliases_st { | 65 | int EVP_add_cipher(const EVP_CIPHER *c) |
| 65 | char *alias; | ||
| 66 | /* This must be the last field becaue I will allocate things | ||
| 67 | * so they go off the end of it */ | ||
| 68 | char name[4]; | ||
| 69 | } ALIASES; | ||
| 70 | |||
| 71 | static STACK /* ALIASES */ *aliases=NULL; | ||
| 72 | static STACK /* EVP_CIPHERS */ *ciphers=NULL; | ||
| 73 | static STACK /* EVP_MD */ *digests=NULL; | ||
| 74 | |||
| 75 | static int cipher_nid_cmp(a,b) | ||
| 76 | EVP_CIPHER **a,**b; | ||
| 77 | { return((*a)->nid - (*b)->nid); } | ||
| 78 | |||
| 79 | static int digest_type_cmp(a,b) | ||
| 80 | EVP_MD **a,**b; | ||
| 81 | { return((*a)->pkey_type - (*b)->pkey_type); } | ||
| 82 | |||
| 83 | int EVP_add_cipher(c) | ||
| 84 | EVP_CIPHER *c; | ||
| 85 | { | ||
| 86 | int i; | ||
| 87 | |||
| 88 | if (ciphers == NULL) | ||
| 89 | { | ||
| 90 | ciphers=sk_new(cipher_nid_cmp); | ||
| 91 | if (ciphers == NULL) return(0); | ||
| 92 | } | ||
| 93 | if ((i=sk_find(ciphers,(char *)c)) >= 0) | ||
| 94 | { | ||
| 95 | if (sk_value(ciphers,i) == (char *)c) | ||
| 96 | return(1); | ||
| 97 | sk_delete(ciphers,i); | ||
| 98 | } | ||
| 99 | return(sk_push(ciphers,(char *)c)); | ||
| 100 | } | ||
| 101 | |||
| 102 | int EVP_add_digest(md) | ||
| 103 | EVP_MD *md; | ||
| 104 | { | 66 | { |
| 105 | int i; | 67 | int r; |
| 106 | char *n; | ||
| 107 | 68 | ||
| 108 | if (digests == NULL) | 69 | r=OBJ_NAME_add(OBJ_nid2sn(c->nid),OBJ_NAME_TYPE_CIPHER_METH,(char *)c); |
| 109 | { | 70 | if (r == 0) return(0); |
| 110 | digests=sk_new(digest_type_cmp); | 71 | r=OBJ_NAME_add(OBJ_nid2ln(c->nid),OBJ_NAME_TYPE_CIPHER_METH,(char *)c); |
| 111 | if (digests == NULL) return(0); | 72 | return(r); |
| 112 | } | ||
| 113 | if ((i=sk_find(digests,(char *)md)) >= 0) | ||
| 114 | { | ||
| 115 | if (sk_value(digests,i) == (char *)md) | ||
| 116 | return(1); | ||
| 117 | sk_delete(digests,i); | ||
| 118 | } | ||
| 119 | if (md->type != md->pkey_type) | ||
| 120 | { | ||
| 121 | n=OBJ_nid2sn(md->pkey_type); | ||
| 122 | EVP_add_alias(n,OBJ_nid2sn(md->type)); | ||
| 123 | EVP_add_alias(n,OBJ_nid2ln(md->type)); | ||
| 124 | } | ||
| 125 | sk_push(digests,(char *)md); | ||
| 126 | return(1); | ||
| 127 | } | ||
| 128 | |||
| 129 | static int alias_cmp(a,b) | ||
| 130 | ALIASES **a,**b; | ||
| 131 | { | ||
| 132 | return(strcmp((*a)->alias,(*b)->alias)); | ||
| 133 | } | 73 | } |
| 134 | 74 | ||
| 135 | int EVP_add_alias(name,aname) | 75 | int EVP_add_digest(const EVP_MD *md) |
| 136 | char *name; | ||
| 137 | char *aname; | ||
| 138 | { | 76 | { |
| 139 | int l1,l2,i; | 77 | int r; |
| 140 | ALIASES *a; | 78 | const char *name; |
| 141 | char *p; | ||
| 142 | 79 | ||
| 143 | if ((name == NULL) || (aname == NULL)) return(0); | 80 | name=OBJ_nid2sn(md->type); |
| 144 | l1=strlen(name)+1; | 81 | r=OBJ_NAME_add(name,OBJ_NAME_TYPE_MD_METH,(char *)md); |
| 145 | l2=strlen(aname)+1; | 82 | if (r == 0) return(0); |
| 146 | i=sizeof(ALIASES)+l1+l2; | 83 | r=OBJ_NAME_add(OBJ_nid2ln(md->type),OBJ_NAME_TYPE_MD_METH,(char *)md); |
| 147 | if ((a=(ALIASES *)Malloc(i)) == NULL) | 84 | if (r == 0) return(0); |
| 148 | return(0); | ||
| 149 | strcpy(a->name,name); | ||
| 150 | p= &(a->name[l1]); | ||
| 151 | strcpy(p,aname); | ||
| 152 | a->alias=p; | ||
| 153 | 85 | ||
| 154 | if (aliases == NULL) | 86 | if (md->type != md->pkey_type) |
| 155 | { | ||
| 156 | aliases=sk_new(alias_cmp); | ||
| 157 | if (aliases == NULL) goto err; | ||
| 158 | } | ||
| 159 | |||
| 160 | if ((i=sk_find(aliases,(char *)a)) >= 0) | ||
| 161 | { | 87 | { |
| 162 | Free(sk_delete(aliases,i)); | 88 | r=OBJ_NAME_add(OBJ_nid2sn(md->pkey_type), |
| 89 | OBJ_NAME_TYPE_MD_METH|OBJ_NAME_ALIAS,name); | ||
| 90 | if (r == 0) return(0); | ||
| 91 | r=OBJ_NAME_add(OBJ_nid2ln(md->pkey_type), | ||
| 92 | OBJ_NAME_TYPE_MD_METH|OBJ_NAME_ALIAS,name); | ||
| 163 | } | 93 | } |
| 164 | if (!sk_push(aliases,(char *)a)) goto err; | 94 | return(r); |
| 165 | return(1); | ||
| 166 | err: | ||
| 167 | return(0); | ||
| 168 | } | 95 | } |
| 169 | 96 | ||
| 170 | int EVP_delete_alias(name) | 97 | const EVP_CIPHER *EVP_get_cipherbyname(const char *name) |
| 171 | char *name; | ||
| 172 | { | 98 | { |
| 173 | ALIASES a; | 99 | const EVP_CIPHER *cp; |
| 174 | int i; | ||
| 175 | 100 | ||
| 176 | if (aliases != NULL) | 101 | cp=(const EVP_CIPHER *)OBJ_NAME_get(name,OBJ_NAME_TYPE_CIPHER_METH); |
| 177 | { | 102 | return(cp); |
| 178 | a.alias=name; | ||
| 179 | if ((i=sk_find(aliases,(char *)&a)) >= 0) | ||
| 180 | { | ||
| 181 | Free(sk_delete(aliases,i)); | ||
| 182 | return(1); | ||
| 183 | } | ||
| 184 | } | ||
| 185 | return(0); | ||
| 186 | } | 103 | } |
| 187 | 104 | ||
| 188 | EVP_CIPHER *EVP_get_cipherbyname(name) | 105 | const EVP_MD *EVP_get_digestbyname(const char *name) |
| 189 | char *name; | ||
| 190 | { | 106 | { |
| 191 | int nid,num=6,i; | 107 | const EVP_MD *cp; |
| 192 | EVP_CIPHER c,*cp; | ||
| 193 | ALIASES a,*ap; | ||
| 194 | |||
| 195 | if (ciphers == NULL) return(NULL); | ||
| 196 | for (;;) | ||
| 197 | { | ||
| 198 | if (num-- <= 0) return(NULL); | ||
| 199 | if (aliases != NULL) | ||
| 200 | { | ||
| 201 | a.alias=name; | ||
| 202 | i=sk_find(aliases,(char *)&a); | ||
| 203 | if (i >= 0) | ||
| 204 | { | ||
| 205 | ap=(ALIASES *)sk_value(aliases,i); | ||
| 206 | name=ap->name; | ||
| 207 | continue; | ||
| 208 | } | ||
| 209 | } | ||
| 210 | 108 | ||
| 211 | nid=OBJ_txt2nid(name); | 109 | cp=(const EVP_MD *)OBJ_NAME_get(name,OBJ_NAME_TYPE_MD_METH); |
| 212 | if (nid == NID_undef) return(NULL); | 110 | return(cp); |
| 213 | c.nid=nid; | ||
| 214 | i=sk_find(ciphers,(char *)&c); | ||
| 215 | if (i >= 0) | ||
| 216 | { | ||
| 217 | cp=(EVP_CIPHER *)sk_value(ciphers,i); | ||
| 218 | return(cp); | ||
| 219 | } | ||
| 220 | else | ||
| 221 | return(NULL); | ||
| 222 | } | ||
| 223 | } | 111 | } |
| 224 | 112 | ||
| 225 | EVP_MD *EVP_get_digestbyname(name) | 113 | void EVP_cleanup(void) |
| 226 | char *name; | ||
| 227 | { | 114 | { |
| 228 | int nid,num=6,i; | 115 | OBJ_NAME_cleanup(OBJ_NAME_TYPE_CIPHER_METH); |
| 229 | EVP_MD c,*cp; | 116 | OBJ_NAME_cleanup(OBJ_NAME_TYPE_MD_METH); |
| 230 | ALIASES a,*ap; | 117 | /* The above calls will only clean out the contents of the name |
| 231 | 118 | hash table, but not the hash table itself. The following line | |
| 232 | if (digests == NULL) return(NULL); | 119 | does that part. -- Richard Levitte */ |
| 233 | 120 | OBJ_NAME_cleanup(-1); | |
| 234 | for (;;) | 121 | |
| 235 | { | 122 | EVP_PBE_cleanup(); |
| 236 | if (num-- <= 0) return(NULL); | ||
| 237 | |||
| 238 | if (aliases != NULL) | ||
| 239 | { | ||
| 240 | a.alias=name; | ||
| 241 | i=sk_find(aliases,(char *)&a); | ||
| 242 | if (i >= 0) | ||
| 243 | { | ||
| 244 | ap=(ALIASES *)sk_value(aliases,i); | ||
| 245 | name=ap->name; | ||
| 246 | continue; | ||
| 247 | } | ||
| 248 | } | ||
| 249 | |||
| 250 | nid=OBJ_txt2nid(name); | ||
| 251 | if (nid == NID_undef) return(NULL); | ||
| 252 | c.pkey_type=nid; | ||
| 253 | i=sk_find(digests,(char *)&c); | ||
| 254 | if (i >= 0) | ||
| 255 | { | ||
| 256 | cp=(EVP_MD *)sk_value(digests,i); | ||
| 257 | return(cp); | ||
| 258 | } | ||
| 259 | else | ||
| 260 | return(NULL); | ||
| 261 | } | ||
| 262 | } | ||
| 263 | |||
| 264 | void EVP_cleanup() | ||
| 265 | { | ||
| 266 | int i; | ||
| 267 | |||
| 268 | if (aliases != NULL) | ||
| 269 | { | ||
| 270 | for (i=0; i<sk_num(aliases); i++) | ||
| 271 | Free(sk_value(aliases,i)); | ||
| 272 | sk_free(aliases); | ||
| 273 | aliases=NULL; | ||
| 274 | } | ||
| 275 | if (ciphers != NULL) | ||
| 276 | { | ||
| 277 | sk_free(ciphers); | ||
| 278 | ciphers=NULL; | ||
| 279 | } | ||
| 280 | if (digests != NULL) | ||
| 281 | { | ||
| 282 | sk_free(digests); | ||
| 283 | digests=NULL; | ||
| 284 | } | ||
| 285 | } | 123 | } |
